diff --git a/global.cpp b/global.cpp
index 6a8427a..51d8922 100644
--- a/global.cpp
+++ b/global.cpp
@@ -3,6 +3,7 @@
 #include <QApplication>
 #include <QPalette>
 #include <QIcon>
+#include <QDebug>
 
 Shared::Message::Message(Shared::Message::Type p_type):
     jFrom(),
@@ -281,3 +282,34 @@ QIcon Shared::subscriptionStateIcon(Shared::SubscriptionState ss, bool big)
     return QIcon::fromTheme(subscriptionStateThemeIcons[ss], QIcon(fallback[ss]));
 }
 
+QIcon Shared::connectionStateIcon(Shared::ConnectionState cs, bool big)
+{
+    const std::deque<QString>& fallback = QApplication::palette().window().color().lightnessF() > 0.5 ? 
+    big ? 
+    Shared::fallbackConnectionStateThemeIconsDarkBig:
+    Shared::fallbackConnectionStateThemeIconsDarkSmall:
+    big ? 
+    Shared::fallbackConnectionStateThemeIconsLightBig:
+    Shared::fallbackConnectionStateThemeIconsLightSmall;
+    
+    return QIcon::fromTheme(connectionStateThemeIcons[cs], QIcon(fallback[cs]));
+}
+
+static const QString ds = ":images/fallback/dark/small/";
+static const QString db = ":images/fallback/dark/big/";
+static const QString ls = ":images/fallback/light/small/";
+static const QString lb = ":images/fallback/light/big/";
+
+QIcon Shared::icon(const QString& name, bool big)
+{
+    std::map<QString, std::pair<QString, QString>>::const_iterator itr = icons.find(name);
+    if (itr != icons.end()) {
+        const QString& prefix = QApplication::palette().window().color().lightnessF() > 0.5 ? 
+            big ? db : ds:
+            big ? lb : ls;
+        return QIcon::fromTheme(itr->second.first, QIcon(prefix + itr->second.second));
+    } else {
+        qDebug() << "Icon" << name << "not found";
+        throw 1;
+    }
+}
diff --git a/global.h b/global.h
index fdaab1b..f18ea53 100644
--- a/global.h
+++ b/global.h
@@ -40,7 +40,7 @@ static const SubscriptionState subscriptionStateHighest = unknown;
 static const SubscriptionState subscriptionStateLowest = none;
 
 static const std::deque<QString> connectionStateNames = {"Disconnected", "Connecting", "Connected", "Error"};
-static const std::deque<QString> connectionStateThemeIcons = {"network-disconnect", "view-refresh", "network-connect", "state-error"};
+static const std::deque<QString> connectionStateThemeIcons = {"state-offline", "state-sync", "state-ok", "state-error"};
 
 static const std::deque<QString> availabilityThemeIcons = {
     "user-online",
@@ -138,6 +138,13 @@ static const std::deque<QString> fallbackSubscriptionStateThemeIconsLightBig = {
     ":images/fallback/light/big/question.svg"
 };
 
+static const std::deque<QString> fallbackConnectionStateThemeIconsLightBig = {
+    ":images/fallback/light/big/state-offline.svg",
+    ":images/fallback/light/big/state-sync.svg",
+    ":images/fallback/light/big/state-ok.svg",
+    ":images/fallback/light/big/state-error.svg"
+};
+
 static const std::deque<QString> fallbackAvailabilityThemeIconsLightSmall = {
     ":images/fallback/light/small/online.svg",
     ":images/fallback/light/small/away.svg",
@@ -156,6 +163,13 @@ static const std::deque<QString> fallbackSubscriptionStateThemeIconsLightSmall =
     ":images/fallback/light/small/question.svg"
 };
 
+static const std::deque<QString> fallbackConnectionStateThemeIconsLightSmall = {
+    ":images/fallback/light/small/state-offline.svg",
+    ":images/fallback/light/small/state-sync.svg",
+    ":images/fallback/light/small/state-ok.svg",
+    ":images/fallback/light/small/state-error.svg"
+};
+
 static const std::deque<QString> fallbackAvailabilityThemeIconsDarkBig = {
     ":images/fallback/dark/big/online.svg",
     ":images/fallback/dark/big/away.svg",
@@ -174,6 +188,13 @@ static const std::deque<QString> fallbackSubscriptionStateThemeIconsDarkBig = {
     ":images/fallback/dark/big/question.svg"
 };
 
+static const std::deque<QString> fallbackConnectionStateThemeIconsDarkBig = {
+    ":images/fallback/dark/big/state-offline.svg",
+    ":images/fallback/dark/big/state-sync.svg",
+    ":images/fallback/dark/big/state-ok.svg",
+    ":images/fallback/dark/big/state-error.svg"
+};
+
 static const std::deque<QString> fallbackAvailabilityThemeIconsDarkSmall = {
     ":images/fallback/dark/small/online.svg",
     ":images/fallback/dark/small/away.svg",
@@ -192,8 +213,46 @@ static const std::deque<QString> fallbackSubscriptionStateThemeIconsDarkSmall =
     ":images/fallback/dark/small/question.svg"
 };
 
+static const std::deque<QString> fallbackConnectionStateThemeIconsDarkSmall = {
+    ":images/fallback/dark/small/state-offline.svg",
+    ":images/fallback/dark/small/state-sync.svg",
+    ":images/fallback/dark/small/state-ok.svg",
+    ":images/fallback/dark/small/state-error.svg"
+};
+
 QIcon availabilityIcon(Availability av, bool big = false);
 QIcon subscriptionStateIcon(SubscriptionState ss, bool big = false);
+QIcon connectionStateIcon(ConnectionState cs, bool big = false);
+QIcon icon(const QString& name, bool big = false);
+
+static const std::map<QString, std::pair<QString, QString>> icons = {
+    {"user-online", {"user-online", "online"}},
+    {"user-away", {"user-away", "away"}},
+    {"user-away-extended", {"user-away-extended", "absent"}},
+    {"user-busy", {"user-busy", "busy"}},
+    {"user-chatty", {"chatty", "chatty"}},
+    {"user-invisible", {"user-invisible", "invisible"}},
+    {"user-offline", {"offline", "offline"}},
+    {"edit-none", {"edit-none", "edit-none"}}, 
+    {"arrow-down-double", {"arrow-down-double", "arrow-down-double"}}, 
+    {"arrow-up-double", {"arrow-up-double", "arrow-up-double"}}, 
+    {"dialog-ok", {"dialog-ok", "dialog-ok"}}, 
+    {"question", {"question", "question"}},
+    {"state-offline", {"state-offline", "state-offline"}}, 
+    {"state-sync", {"state-sync", "state-sync"}}, 
+    {"state-ok", {"state-ok", "state-ok"}}, 
+    {"state-error", {"state-error", "state-error"}},
+    
+    {"edit-delete", {"edit-delete", "edit-delete"}},
+    {"mail-message", {"mail-message", "mail-message"}},
+    {"network-connect", {"network-connect", "network-connect"}},
+    {"network-disconnect", {"network-disconnect", "network-disconnect"}},
+    {"news-subscribe", {"news-subscribe", "news-subscribe"}},
+    {"news-unsubscribe", {"news-unsubscribe", "news-unsubscribe"}},
+    {"view-refresh", {"view-refresh", "view-refresh"}},
+    {"send", {"document-send", "send"}},
+    {"clean", {"edit-clear-all", "clean"}},
+};
 
 };
 
diff --git a/resources/images/fallback/dark/big/edit-delete.svg b/resources/images/fallback/dark/big/edit-delete.svg
new file mode 100644
index 0000000..c9e2f4e
--- /dev/null
+++ b/resources/images/fallback/dark/big/edit-delete.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+    <defs id="defs3051">
+        <style type="text/css" id="current-color-scheme">
+        .ColorScheme-NegativeText {
+            color:#da4453;
+        }
+        </style>
+    </defs>
+    <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+        d="M8 3v2h1V4h4v1h1V3H8M4 6v1h14V6H4m2 2v11h10V8h-1v10H7V8H6"/>
+</svg>
diff --git a/resources/images/fallback/dark/big/mail-message.svg b/resources/images/fallback/dark/big/mail-message.svg
new file mode 100644
index 0000000..f66ff27
--- /dev/null
+++ b/resources/images/fallback/dark/big/mail-message.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 1 3 L 1 4 L 1 18 L 1 18.414062 L 1 19 L 2 19 L 21 19 L 21 18.414062 L 21 18 L 21 17 L 21 3 L 20.951172 3 L 20 3 L 2.4628906 3 L 2 3 L 1 3 z M 2 4 L 2.0488281 4 L 8.0234375 9.9765625 L 2 16 L 2 4 z M 3.4628906 4 L 18.537109 4 L 11 11.537109 L 3.4628906 4 z M 19.951172 4 L 20 4 L 20 16 L 13.976562 9.9765625 L 19.951172 4 z M 8.7304688 10.683594 L 11 12.951172 L 13.269531 10.683594 L 19.537109 16.951172 L 20 17.414062 L 20 18 L 2 18 L 2 17.414062 L 2.4628906 16.951172 L 8.7304688 10.683594 z "
+    class="ColorScheme-Text"
+    />  
+</svg>
diff --git a/resources/images/fallback/dark/big/network-connect.svg b/resources/images/fallback/dark/big/network-connect.svg
new file mode 100644
index 0000000..e7d2b62
--- /dev/null
+++ b/resources/images/fallback/dark/big/network-connect.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/dark/big/network-disconnect.svg b/resources/images/fallback/dark/big/network-disconnect.svg
new file mode 100644
index 0000000..bb87f59
--- /dev/null
+++ b/resources/images/fallback/dark/big/network-disconnect.svg
@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 9.5 8.7929688 L 11 10.292969 L 11.707031 11 L 13.207031 12.5 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z M 8.7929688 9.5 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 12.5 13.207031 L 11 11.707031 L 10.292969 11 L 8.7929688 9.5 z "
+     class="ColorScheme-Text"
+     />
+    <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 14.833984 14 L 14 14.833984 L 15.666016 16.5 L 14 18.166016 L 14.833984 19 L 16.5 17.333984 L 18.166016 19 L 19 18.166016 L 17.333984 16.5 L 19 14.833984 L 18.166016 14 L 16.5 15.666016 L 14.833984 14 z "
+     class="ColorScheme-NegativeText"
+     />
+</svg>
diff --git a/resources/images/fallback/dark/big/news-subscribe.svg b/resources/images/fallback/dark/big/news-subscribe.svg
new file mode 100644
index 0000000..ed5e01d
--- /dev/null
+++ b/resources/images/fallback/dark/big/news-subscribe.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 4 3 L 4 5 L 3 5 L 3 6 L 3 19 L 4 19 L 19 19 L 19 18 L 19 6 L 19 5 L 18 5 L 18 3 L 5 3 L 4 3 z M 5 4 L 17 4 L 17 5 L 5 5 L 5 4 z M 4 6 L 18 6 L 18 18 L 4 18 L 4 6 z M 5 7 L 5 11 L 9 11 L 9 7 L 5 7 z M 11 7 L 11 8 L 17 8 L 17 7 L 11 7 z M 11 10 L 11 11 L 17 11 L 17 10 L 11 10 z M 5 12 L 5 17 L 17 17 L 17 12 L 5 12 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/dark/big/news-unsubscribe.svg b/resources/images/fallback/dark/big/news-unsubscribe.svg
new file mode 100644
index 0000000..219442f
--- /dev/null
+++ b/resources/images/fallback/dark/big/news-unsubscribe.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+    <defs id="defs3051">
+        <style type="text/css" id="current-color-scheme">
+            .ColorScheme-NegativeText {
+                color:#da4453;
+            }
+        </style>
+    </defs>
+    <path
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        class="ColorScheme-NegativeText"
+        d="m4 3v2h-1v1 13h1 15v-1-12-1h-1v-2h-13-1m1 1h12v1h-12v-1m-1 2h14v12h-14v-12m1 1v4h4v-4h-4m6 0v1h6v-1h-6m0 3v1h6v-1h-6m-6 2v5h12v-5h-12"/>
+</svg>
diff --git a/resources/images/fallback/dark/big/state-error.svg b/resources/images/fallback/dark/big/state-error.svg
new file mode 100644
index 0000000..f1d4489
--- /dev/null
+++ b/resources/images/fallback/dark/big/state-error.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-NeutralText {
+        color:#f67400;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z " 
+        class="ColorScheme-Text"/>
+  <path
+     style="color:#da4453;fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 13 12 C 12.445981 12 12 12.446 12 13 L 12 19 C 12 19.5541 12.445981 20 13 20 L 19 20 C 19.554019 20 20 19.5541 20 19 L 20 13 C 20 12.446 19.554019 12 19 12 L 13 12 z "
+     id="path8" />
+  <path
+     style="fill:#ffffff"
+     d="M 14 13 L 13 14 L 15 16 L 13 18 L 14 19 L 16 17 L 18 19 L 19 18 L 17 16 L 19 14 L 18 13 L 16 15 L 14 13 z "
+     id="path10" />
+</svg>
diff --git a/resources/images/fallback/dark/big/state-offline.svg b/resources/images/fallback/dark/big/state-offline.svg
new file mode 100644
index 0000000..33af526
--- /dev/null
+++ b/resources/images/fallback/dark/big/state-offline.svg
@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(-421.71429,-525.79074)">
+    <path
+       style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
+       d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z "
+       transform="translate(421.71429,525.79074)"
+       class="ColorScheme-Text"
+       id="path4196" />
+    <path
+       style="opacity:1;fill:#bdc3c7;fill-opacity:1;stroke:none"
+       d="m 442.71429,540.29071 a 4.5,4.5 0 0 1 -4.5,4.5 4.5,4.5 0 0 1 -4.5,-4.5 4.5,4.5 0 0 1 4.5,-4.5 4.5,4.5 0 0 1 4.5,4.5 z"
+       id="path4306" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-linecap:round"
+       d="M 14 14 L 14 15 L 15 15 L 15 14 L 14 14 z M 16 14 L 16 15 L 17 15 L 17 14 L 16 14 z M 18 14 L 18 15 L 19 15 L 19 14 L 18 14 z "
+       transform="translate(421.71429,525.79074)"
+       id="rect4521" />
+  </g>
+</svg>
diff --git a/resources/images/fallback/dark/big/state-ok.svg b/resources/images/fallback/dark/big/state-ok.svg
new file mode 100644
index 0000000..83968b8
--- /dev/null
+++ b/resources/images/fallback/dark/big/state-ok.svg
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z " 
+        class="ColorScheme-Text"/>
+  <path
+     style="color:#27ae60;fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 16 12 C 13.784 12 12 13.784 12 16 C 12 18.216 13.784 20 16 20 C 18.216 20 20 18.216 20 16 C 20 13.784 18.216 12 16 12 z "
+     id="path8" />
+  <path
+     style="opacity:1;fill:#ffffff"
+     d="M 18 14 L 15 17 L 14 16 L 13 17 L 14 18 L 15 19 L 19 15 L 18 14 z "
+     id="path10" />
+</svg>
diff --git a/resources/images/fallback/dark/big/state-sync.svg b/resources/images/fallback/dark/big/state-sync.svg
new file mode 100644
index 0000000..299f07d
--- /dev/null
+++ b/resources/images/fallback/dark/big/state-sync.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-NeutralText {
+        color:#f67400;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z " 
+        class="ColorScheme-Text"/>
+  <path
+     style="color:#3daee9;fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 16 12 C 13.784 12 12 13.784 12 16 C 12 18.216 13.784 20 16 20 C 18.216 20 20 18.216 20 16 C 20 13.784 18.216 12 16 12 z "
+     id="path8" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-linecap:butt;stroke-linejoin:round"
+     d="M 15.949219 13.003906 A 3 3 0 0 0 14.265625 13.558594 L 14.984375 14.277344 A 2 2 0 0 1 17.414062 14.585938 A 2 2 0 0 1 17.720703 17.013672 L 18.445312 17.738281 A 3 3 0 0 0 18.121094 13.878906 A 3 3 0 0 0 15.949219 13.003906 z M 13.554688 14.261719 A 3 3 0 0 0 13.878906 18.121094 A 3 3 0 0 0 17.734375 18.441406 L 17.015625 17.722656 A 2 2 0 0 1 14.585938 17.414062 A 2 2 0 0 1 14.279297 14.986328 L 13.554688 14.261719 z "
+     id="path10" />
+</svg>
diff --git a/resources/images/fallback/dark/big/view-refresh.svg b/resources/images/fallback/dark/big/view-refresh.svg
new file mode 100644
index 0000000..b887d28
--- /dev/null
+++ b/resources/images/fallback/dark/big/view-refresh.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 11 3 C 9.558286 3 8.2107109 3.3829219 7.0449219 4.0449219 L 7.7832031 4.7832031 C 7.7832031 4.7832031 7.7851562 4.78125 7.7851562 4.78125 L 10.564453 7.5585938 L 11.271484 6.8515625 L 8.7890625 4.3710938 C 9.4846855 4.1384172 10.223912 4 11 4 C 14.87797 4 18 7.122 18 11 C 18 12.1625 17.714172 13.253897 17.216797 14.216797 L 17.955078 14.955078 C 18.617129 13.789278 19 12.4417 19 11 C 19 6.568 15.431966 3 11 3 z M 4.0449219 7.0449219 C 3.3828709 8.2107219 3 9.5583 3 11 C 3 15.432 6.568034 19 11 19 C 12.441714 19 13.789289 18.617078 14.955078 17.955078 L 14.271484 17.271484 L 14.273438 17.269531 L 11.445312 14.441406 L 10.738281 15.148438 L 13.216797 17.626953 C 12.519497 17.860874 11.778264 18 11 18 C 7.12203 18 4 14.878 4 11 C 4 9.8375 4.2858291 8.7461031 4.7832031 7.7832031 L 4.0449219 7.0449219 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/dark/small/edit-delete.svg b/resources/images/fallback/dark/small/edit-delete.svg
new file mode 100644
index 0000000..9dfb2e0
--- /dev/null
+++ b/resources/images/fallback/dark/small/edit-delete.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+     d="m5 2v2h1v-1h4v1h1v-2h-5zm-3 3v1h2v8h8v-8h2v-1zm3 1h6v7h-6z" 
+     />
+</svg>
diff --git a/resources/images/fallback/dark/small/mail-message.svg b/resources/images/fallback/dark/small/mail-message.svg
new file mode 100644
index 0000000..49f4419
--- /dev/null
+++ b/resources/images/fallback/dark/small/mail-message.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 1 2 L 1 14 L 15 14 L 15 2 L 1 2 z M 2.7070312 3 L 13.292969 3 L 8 8.2929688 L 2.7070312 3 z M 2 3.7070312 L 5.9335938 7.640625 L 2 12.230469 L 2 3.7070312 z M 14 3.7070312 L 14 12.232422 L 10.066406 7.640625 L 14 3.7070312 z M 6.6425781 8.3496094 L 8 9.7070312 L 9.3574219 8.3496094 L 13.341797 13 L 2.65625 13 L 6.6425781 8.3496094 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/dark/small/network-connect.svg b/resources/images/fallback/dark/small/network-connect.svg
new file mode 100644
index 0000000..73fdf9f
--- /dev/null
+++ b/resources/images/fallback/dark/small/network-connect.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 13.300781 2 L 10.650391 4.6503906 L 9.5859375 3.5859375 L 3.5859375 9.5859375 L 4.6503906 10.650391 L 2 13.300781 L 2.6992188 14 L 5.3496094 11.349609 L 6.4140625 12.414062 L 12.414062 6.4140625 L 11.349609 5.3496094 L 14 2.6992188 L 13.300781 2 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/dark/small/network-disconnect.svg b/resources/images/fallback/dark/small/network-disconnect.svg
new file mode 100644
index 0000000..95caabc
--- /dev/null
+++ b/resources/images/fallback/dark/small/network-disconnect.svg
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 13.300781 2 L 10.650391 4.6503906 L 9.5859375 3.5859375 L 6.5859375 6.5859375 L 9.4140625 9.4140625 L 12.414062 6.4140625 L 11.349609 5.3496094 L 14 2.6992188 L 13.300781 2 z M 5.5859375 7.5859375 L 3.5859375 9.5859375 L 4.6503906 10.650391 L 2 13.300781 L 2.6992188 14 L 5.3496094 11.349609 L 6.4140625 12.414062 L 8.4140625 10.414062 L 5.5859375 7.5859375 z "
+     class="ColorScheme-Text"
+     />
+   <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 9,9.83 10.667,11.497 9,13.164 9.833,13.997 11.5,12.33 13.167,13.997 14,13.164 12.333,11.497 14,9.83 13.167,8.997 11.5,10.664 9.833,8.997 Z" 
+     class="ColorScheme-NegativeText"
+     />
+</svg>
diff --git a/resources/images/fallback/dark/small/news-subscribe.svg b/resources/images/fallback/dark/small/news-subscribe.svg
new file mode 100644
index 0000000..3e3ebe9
--- /dev/null
+++ b/resources/images/fallback/dark/small/news-subscribe.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m2 2v12h12v-12zm1 1h10v10h-10zm1 1v3h3v-3zm4 0v1h4v-1zm0 2v1h4v-1zm-4 2v4h8v-4z"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/dark/small/news-unsubscribe.svg b/resources/images/fallback/dark/small/news-unsubscribe.svg
new file mode 100644
index 0000000..c4e5759
--- /dev/null
+++ b/resources/images/fallback/dark/small/news-unsubscribe.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+    d="M 2 2 L 2 14 L 14 14 L 14 2 L 2 2 z M 3 3 L 13 3 L 13 13 L 3 13 L 3 3 z M 4 4 L 4 7 L 7 7 L 7 4 L 4 4 z M 8 4 L 8 5 L 12 5 L 12 4 L 8 4 z M 8 6 L 8 7 L 12 7 L 12 6 L 8 6 z M 4 8 L 4 12 L 12 12 L 12 8 L 4 8 z " />
+</svg>
diff --git a/resources/images/fallback/dark/small/state-error.svg b/resources/images/fallback/dark/small/state-error.svg
new file mode 100644
index 0000000..493f2b4
--- /dev/null
+++ b/resources/images/fallback/dark/small/state-error.svg
@@ -0,0 +1,30 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 7.5,2 C 5.0147186,2 3,4.0147186 3,6.5 3.0015312,6.7197442 3.0191564,6.939081 3.0527344,7.15625 1.8279505,7.563833 1.0011929,8.7091793 1,10 c 0,1.656854 1.3431458,3 3,3 l 7.5,0 c 1.932997,0 3.321429,-1.477717 3.321429,-3.4107143 -0.343605,-1.177246 -1.384105,-2.7716808 -2.839605,-3.4058395 -0.02988,-0.013019 0.01902,-0.1361103 -0.01112,-0.14829 C 11.732775,3.7441623 9.803314,2.0026739 7.5,2 Z m 0,1 C 9.4329966,3 11,4.5670034 11,6.5 10.998359,6.6892144 10.981376,6.8779841 10.949219,7.0644531 11.129854,7.0226102 11.314584,7.0009929 11.5,7 12.880712,7 14,8.1192881 14,9.5 14,10.880712 12.880712,12 11.5,12 L 4,12 C 2.8954305,12 2,11.104569 2,10 2,8.8954305 2.8954305,8 4,8 4.119895,8.000332 4.2395173,8.0114445 4.3574219,8.0332031 4.1233957,7.5559094 4.0011632,7.031579 4,6.5 4,4.5670034 5.5670034,3 7.5,3 Z"
+       transform="translate(0,1036.3622)"
+       id="path4139"
+       class="ColorScheme-Text" />
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+       d="m 8.0000348,1042.3622 5.9999302,0 c 0.554019,0 1.000035,0.446 1.000035,1 l 0,5.9999 c 0,0.5541 -0.446016,1.0001 -1.000035,1.0001 l -5.9999302,0 C 7.4460155,1050.3622 7,1049.9162 7,1049.3621 l 0,-5.9999 c 0,-0.554 0.4460155,-1 1.0000348,-1 z"
+       id="rect4153-8" />
+    <path
+       style="fill:#ffffff;stroke-opacity:1"
+       d="m 9,1043.3622 -1,1 2,2 -2,2 1,1 2,-2 2,2 1,-1 -2,-2 2,-2 -1,-1 -2,2 -2,-2 z"
+       id="path4141" />
+  </g>
+</svg>
diff --git a/resources/images/fallback/dark/small/state-offline.svg b/resources/images/fallback/dark/small/state-offline.svg
new file mode 100644
index 0000000..34d6ef8
--- /dev/null
+++ b/resources/images/fallback/dark/small/state-offline.svg
@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none"
+        d="M 7.5 2 C 5.0147186 2 3 4.0147186 3 6.5 C 3.0015312 6.7197442 3.0191564 6.939081 3.0527344 7.15625 C 1.8279505 7.563833 1.0011929 8.7091793 1 10 C 1 11.656854 2.3431458 13 4 13 L 11.5 13 C 13.432997 13 15 11.432997 15 9.5 C 14.656395 8.322754 13.437922 6.8177524 11.982422 6.1835938 C 11.952541 6.1705745 12.000846 6.047336 11.970703 6.0351562 C 11.732775 3.7441623 9.803314 2.0026739 7.5 2 z M 7.5 3 C 9.4329966 3 11 4.5670034 11 6.5 C 10.998359 6.6892144 10.981376 6.8779841 10.949219 7.0644531 C 11.129854 7.0226102 11.314584 7.0009929 11.5 7 C 12.880712 7 14 8.1192881 14 9.5 C 14 10.880712 12.880712 12 11.5 12 L 4 12 C 2.8954305 12 2 11.104569 2 10 C 2 8.8954305 2.8954305 8 4 8 C 4.119895 8.000332 4.2395173 8.0114445 4.3574219 8.0332031 C 4.1233957 7.5559094 4.0011632 7.031579 4 6.5 C 4 4.5670034 5.5670034 3 7.5 3 z "
+        class="ColorScheme-Text"
+        />
+  <path
+     style="opacity:1;fill:#bdc3c7"
+     d="M 11 6 A 4 4 0 0 0 7 10 A 4 4 0 0 0 11 14 A 4 4 0 0 0 15 10 A 4 4 0 0 0 11 6 z " />
+  <path
+     style="opacity:1;fill:#ffffff"
+     d="M 9 9 L 9 11 L 10 11 L 10 9 L 9 9 z M 12 9 L 12 11 L 13 11 L 13 9 L 12 9 z " />
+</svg>
diff --git a/resources/images/fallback/dark/small/state-ok.svg b/resources/images/fallback/dark/small/state-ok.svg
new file mode 100644
index 0000000..378a7e8
--- /dev/null
+++ b/resources/images/fallback/dark/small/state-ok.svg
@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-PositiveText {
+        color:#27ae60;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 7.5,2 C 5.0147186,2 3,4.0147186 3,6.5 3.0015312,6.7197442 3.0191564,6.939081 3.0527344,7.15625 1.8279505,7.563833 1.0011929,8.7091793 1,10 c 0,1.656854 1.3431458,3 3,3 l 7.5,0 c 1.932997,0 3.321429,-1.477717 3.321429,-3.4107143 -0.343605,-1.177246 -1.384105,-2.7716808 -2.839605,-3.4058395 -0.02988,-0.013019 0.01902,-0.1361103 -0.01112,-0.14829 C 11.732775,3.7441623 9.803314,2.0026739 7.5,2 Z m 0,1 C 9.4329966,3 11,4.5670034 11,6.5 10.998359,6.6892144 10.981376,6.8779841 10.949219,7.0644531 11.129854,7.0226102 11.314584,7.0009929 11.5,7 12.880712,7 14,8.1192881 14,9.5 14,10.880712 12.880712,12 11.5,12 L 4,12 C 2.8954305,12 2,11.104569 2,10 2,8.8954305 2.8954305,8 4,8 4.119895,8.000332 4.2395173,8.0114445 4.3574219,8.0332031 4.1233957,7.5559094 4.0011632,7.031579 4,6.5 4,4.5670034 5.5670034,3 7.5,3 Z"
+       transform="translate(0,1036.3622)"
+       class="ColorScheme-Text" />
+    <path
+       d="m 11,1042.3622 c 2.216,0 4,1.784 4,4 0,2.216 -1.784,4 -4,4 -2.216,0 -4,-1.784 -4,-4 0,-2.216 1.784,-4 4,-4 z"
+      style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-PositiveText" />
+    <path
+       d="m 13,1044.3622 -3,3 -1,-1 -1,1 1,1 1,1 4,-4 -1,-1 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/resources/images/fallback/dark/small/state-sync.svg b/resources/images/fallback/dark/small/state-sync.svg
new file mode 100644
index 0000000..07aea4f
--- /dev/null
+++ b/resources/images/fallback/dark/small/state-sync.svg
@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none"
+        d="M 7.5 2 C 5.0147186 2 3 4.0147186 3 6.5 C 3.0015312 6.7197442 3.0191564 6.939081 3.0527344 7.15625 C 1.8279505 7.563833 1.0011929 8.7091793 1 10 C 1 11.656854 2.3431458 13 4 13 L 11.5 13 C 13.432997 13 15 11.432997 15 9.5 C 14.656395 8.322754 13.437922 6.8177523 11.982422 6.1835938 C 11.952541 6.1705745 12.000846 6.047336 11.970703 6.0351562 C 11.732775 3.7441623 9.803314 2.0026739 7.5 2 z M 7.5 3 C 9.4329966 3 11 4.5670034 11 6.5 C 10.998359 6.6892144 10.981376 6.8779841 10.949219 7.0644531 C 11.129854 7.0226102 11.314584 7.0009929 11.5 7 C 12.880712 7 14 8.1192881 14 9.5 C 14 10.880712 12.880712 12 11.5 12 L 4 12 C 2.8954305 12 2 11.104569 2 10 C 2 8.8954305 2.8954305 8 4 8 C 4.119895 8.000332 4.2395173 8.0114445 4.3574219 8.0332031 C 4.1233957 7.5559094 4.0011632 7.031579 4 6.5 C 4 4.5670034 5.5670034 3 7.5 3 z "
+        class="ColorScheme-Text"
+        />
+  <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none"
+        d="M 11 6 C 8.784 6 7 7.784 7 10 C 7 12.216 8.784 14 11 14 C 13.216 14 15 12.216 15 10 C 15 7.784 13.216 6 11 6 z "
+        class="ColorScheme-Highlight"
+        />
+    <path
+       style="opacity:1;fill:#ffffff"
+       d="M 11.050781 7.0039062 A 3 3 0 0 0 8.8789062 7.8789062 A 3 3 0 0 0 8.5546875 11.738281 L 9.2792969 11.013672 A 2 2 0 0 1 9.5859375 8.5859375 A 2 2 0 0 1 12.015625 8.2773438 L 12.734375 7.5585938 A 3 3 0 0 0 11.050781 7.0039062 z M 13.445312 8.2617188 L 12.720703 8.9863281 A 2 2 0 0 1 12.414062 11.414062 A 2 2 0 0 1 9.984375 11.722656 L 9.265625 12.441406 A 3 3 0 0 0 13.121094 12.121094 A 3 3 0 0 0 13.445312 8.2617188 z "
+       />
+</svg>
diff --git a/resources/images/fallback/dark/small/view-refresh.svg b/resources/images/fallback/dark/small/view-refresh.svg
new file mode 100644
index 0000000..d32165e
--- /dev/null
+++ b/resources/images/fallback/dark/small/view-refresh.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#232629;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 8 2 C 6.8911827 2 5.8599294 2.3193334 4.96875 2.84375 L 5.53125 3.40625 L 5.71875 3.59375 L 7.65625 5.53125 L 8.375 4.8125 L 6.75 3.1875 C 6.94534 3.1364099 7.1398623 3.0897842 7.34375 3.0625 C 7.3961563 3.0547113 7.4470287 3.0373165 7.5 3.03125 C 7.6680854 3.01418 7.827411 3 8 3 C 10.761424 3 13 5.2385759 13 8 C 13 8.243024 12.97155 8.4855082 12.9375 8.71875 C 12.917545 8.8549993 12.905714 8.9925532 12.875 9.125 C 12.80805 9.4115815 12.708353 9.672624 12.59375 9.9375 C 12.580478 9.9681753 12.576374 10.000899 12.5625 10.03125 C 12.521539 10.122908 12.454245 10.194583 12.40625 10.28125 C 12.401797 10.289291 12.410582 10.304303 12.40625 10.3125 L 13.15625 11.03125 C 13.680667 10.140071 14 9.108818 14 8 C 14 4.6862909 11.313707 2 8 2 z M 2.84375 4.96875 C 2.3193332 5.8599294 2 6.891182 2 8 C 2 11.313709 4.6862934 14 8 14 C 9.1088173 14 10.140071 13.680667 11.03125 13.15625 L 10.46875 12.59375 L 10.28125 12.40625 L 8.34375 10.5 L 7.65625 11.1875 L 9.25 12.8125 C 9.05466 12.86359 8.8601377 12.910216 8.65625 12.9375 C 8.6038437 12.945289 8.5529713 12.962684 8.5 12.96875 C 8.3319146 12.98582 8.172589 13 8 13 C 7.827411 13 7.6680854 12.98582 7.5 12.96875 C 7.3319147 12.95168 7.162744 12.939552 7 12.90625 C 4.7215847 12.440019 3 10.416246 3 8 C 3 7.7517374 3.0275593 7.5198138 3.0625 7.28125 C 3.0824555 7.1450007 3.0942865 7.0074468 3.125 6.875 C 3.1919502 6.5884185 3.2916465 6.327376 3.40625 6.0625 C 3.4192426 6.031782 3.4239145 5.9991506 3.4375 5.96875 C 3.4781185 5.8798895 3.5461122 5.8040145 3.59375 5.71875 L 3.59375 5.6875 L 2.84375 4.96875 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/light/big/edit-delete.svg b/resources/images/fallback/light/big/edit-delete.svg
new file mode 100644
index 0000000..c9e2f4e
--- /dev/null
+++ b/resources/images/fallback/light/big/edit-delete.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+    <defs id="defs3051">
+        <style type="text/css" id="current-color-scheme">
+        .ColorScheme-NegativeText {
+            color:#da4453;
+        }
+        </style>
+    </defs>
+    <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+        d="M8 3v2h1V4h4v1h1V3H8M4 6v1h14V6H4m2 2v11h10V8h-1v10H7V8H6"/>
+</svg>
diff --git a/resources/images/fallback/light/big/mail-message.svg b/resources/images/fallback/light/big/mail-message.svg
new file mode 100644
index 0000000..7374f7c
--- /dev/null
+++ b/resources/images/fallback/light/big/mail-message.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+    style="fill:currentColor;fill-opacity:1;stroke:none" 
+    d="M 1 3 L 1 4 L 1 18 L 1 18.414062 L 1 19 L 2 19 L 21 19 L 21 18.414062 L 21 18 L 21 17 L 21 3 L 20.951172 3 L 20 3 L 2.4628906 3 L 2 3 L 1 3 z M 2 4 L 2.0488281 4 L 8.0234375 9.9765625 L 2 16 L 2 4 z M 3.4628906 4 L 18.537109 4 L 11 11.537109 L 3.4628906 4 z M 19.951172 4 L 20 4 L 20 16 L 13.976562 9.9765625 L 19.951172 4 z M 8.7304688 10.683594 L 11 12.951172 L 13.269531 10.683594 L 19.537109 16.951172 L 20 17.414062 L 20 18 L 2 18 L 2 17.414062 L 2.4628906 16.951172 L 8.7304688 10.683594 z "
+    class="ColorScheme-Text"
+    />  
+</svg>
diff --git a/resources/images/fallback/light/big/network-connect.svg b/resources/images/fallback/light/big/network-connect.svg
new file mode 100644
index 0000000..20625fd
--- /dev/null
+++ b/resources/images/fallback/light/big/network-connect.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/light/big/network-disconnect.svg b/resources/images/fallback/light/big/network-disconnect.svg
new file mode 100644
index 0000000..ac38590
--- /dev/null
+++ b/resources/images/fallback/light/big/network-disconnect.svg
@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 18.292969 3 L 14.792969 6.5 L 13.292969 5 L 11.292969 7 L 9.5 8.7929688 L 11 10.292969 L 11.707031 11 L 13.207031 12.5 L 15 10.707031 L 17 8.7070312 L 15.5 7.2070312 L 19 3.7070312 L 18.292969 3 z M 8.7929688 9.5 L 8 10.292969 L 6 12.292969 L 7.5 13.792969 L 3 18.292969 L 3.7070312 19 L 8.2070312 14.5 L 9.7070312 16 L 11.707031 14 L 12.5 13.207031 L 11 11.707031 L 10.292969 11 L 8.7929688 9.5 z "
+     class="ColorScheme-Text"
+     />
+    <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 14.833984 14 L 14 14.833984 L 15.666016 16.5 L 14 18.166016 L 14.833984 19 L 16.5 17.333984 L 18.166016 19 L 19 18.166016 L 17.333984 16.5 L 19 14.833984 L 18.166016 14 L 16.5 15.666016 L 14.833984 14 z "
+     class="ColorScheme-NegativeText"
+     />
+</svg>
diff --git a/resources/images/fallback/light/big/news-subscribe.svg b/resources/images/fallback/light/big/news-subscribe.svg
new file mode 100644
index 0000000..202a9dd
--- /dev/null
+++ b/resources/images/fallback/light/big/news-subscribe.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 4 3 L 4 5 L 3 5 L 3 6 L 3 19 L 4 19 L 19 19 L 19 18 L 19 6 L 19 5 L 18 5 L 18 3 L 5 3 L 4 3 z M 5 4 L 17 4 L 17 5 L 5 5 L 5 4 z M 4 6 L 18 6 L 18 18 L 4 18 L 4 6 z M 5 7 L 5 11 L 9 11 L 9 7 L 5 7 z M 11 7 L 11 8 L 17 8 L 17 7 L 11 7 z M 11 10 L 11 11 L 17 11 L 17 10 L 11 10 z M 5 12 L 5 17 L 17 17 L 17 12 L 5 12 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/light/big/news-unsubscribe.svg b/resources/images/fallback/light/big/news-unsubscribe.svg
new file mode 100644
index 0000000..219442f
--- /dev/null
+++ b/resources/images/fallback/light/big/news-unsubscribe.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+    <defs id="defs3051">
+        <style type="text/css" id="current-color-scheme">
+            .ColorScheme-NegativeText {
+                color:#da4453;
+            }
+        </style>
+    </defs>
+    <path
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        class="ColorScheme-NegativeText"
+        d="m4 3v2h-1v1 13h1 15v-1-12-1h-1v-2h-13-1m1 1h12v1h-12v-1m-1 2h14v12h-14v-12m1 1v4h4v-4h-4m6 0v1h6v-1h-6m0 3v1h6v-1h-6m-6 2v5h12v-5h-12"/>
+</svg>
diff --git a/resources/images/fallback/light/big/state-error.svg b/resources/images/fallback/light/big/state-error.svg
new file mode 100644
index 0000000..452d49e
--- /dev/null
+++ b/resources/images/fallback/light/big/state-error.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-NeutralText {
+        color:#f67400;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z " 
+        class="ColorScheme-Text"/>
+  <path
+     style="color:#da4453;fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 13 12 C 12.445981 12 12 12.446 12 13 L 12 19 C 12 19.5541 12.445981 20 13 20 L 19 20 C 19.554019 20 20 19.5541 20 19 L 20 13 C 20 12.446 19.554019 12 19 12 L 13 12 z "
+     id="path8" />
+  <path
+     style="fill:#ffffff"
+     d="M 14 13 L 13 14 L 15 16 L 13 18 L 14 19 L 16 17 L 18 19 L 19 18 L 17 16 L 19 14 L 18 13 L 16 15 L 14 13 z "
+     id="path10" />
+</svg>
diff --git a/resources/images/fallback/light/big/state-offline.svg b/resources/images/fallback/light/big/state-offline.svg
new file mode 100644
index 0000000..ebc4a46
--- /dev/null
+++ b/resources/images/fallback/light/big/state-offline.svg
@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(-421.71429,-525.79074)">
+    <path
+       style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
+       d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z "
+       transform="translate(421.71429,525.79074)"
+       class="ColorScheme-Text"
+       id="path4196" />
+    <path
+       style="opacity:1;fill:#bdc3c7;fill-opacity:1;stroke:none"
+       d="m 442.71429,540.29071 a 4.5,4.5 0 0 1 -4.5,4.5 4.5,4.5 0 0 1 -4.5,-4.5 4.5,4.5 0 0 1 4.5,-4.5 4.5,4.5 0 0 1 4.5,4.5 z"
+       id="path4306" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-linecap:round"
+       d="M 14 14 L 14 15 L 15 15 L 15 14 L 14 14 z M 16 14 L 16 15 L 17 15 L 17 14 L 16 14 z M 18 14 L 18 15 L 19 15 L 19 14 L 18 14 z "
+       transform="translate(421.71429,525.79074)"
+       id="rect4521" />
+  </g>
+</svg>
diff --git a/resources/images/fallback/light/big/state-ok.svg b/resources/images/fallback/light/big/state-ok.svg
new file mode 100644
index 0000000..3279e53
--- /dev/null
+++ b/resources/images/fallback/light/big/state-ok.svg
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z " 
+        class="ColorScheme-Text"/>
+  <path
+     style="color:#27ae60;fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 16 12 C 13.784 12 12 13.784 12 16 C 12 18.216 13.784 20 16 20 C 18.216 20 20 18.216 20 16 C 20 13.784 18.216 12 16 12 z "
+     id="path8" />
+  <path
+     style="opacity:1;fill:#ffffff"
+     d="M 18 14 L 15 17 L 14 16 L 13 17 L 14 18 L 15 19 L 19 15 L 18 14 z "
+     id="path10" />
+</svg>
diff --git a/resources/images/fallback/light/big/state-sync.svg b/resources/images/fallback/light/big/state-sync.svg
new file mode 100644
index 0000000..2bfd3ba
--- /dev/null
+++ b/resources/images/fallback/light/big/state-sync.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-NeutralText {
+        color:#f67400;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 11 4 A 6 6 0 0 0 5 10 A 6 6 0 0 0 5.0039062 10.128906 A 4 4 0 0 0 2 14 A 4 4 0 0 0 6 18 L 15 18 A 5 5 0 0 0 20 13 A 5 5 0 0 0 16.757812 8.3242188 A 6 6 0 0 0 11 4 z M 11 5 A 5 5 0 0 1 15.919922 9.1113281 A 4.0000019 4.0000019 0 0 1 19 13 A 4.0000019 4.0000019 0 0 1 15 17 L 6 17 A 2.9999979 2.9999979 0 0 1 3 14 A 2.9999979 2.9999979 0 0 1 6 11 A 2.9999979 2.9999979 0 0 1 6.1074219 11.005859 A 5 5 0 0 1 6 10 A 5 5 0 0 1 11 5 z " 
+        class="ColorScheme-Text"/>
+  <path
+     style="color:#3daee9;fill:currentColor;fill-opacity:1;stroke:none"
+     d="M 16 12 C 13.784 12 12 13.784 12 16 C 12 18.216 13.784 20 16 20 C 18.216 20 20 18.216 20 16 C 20 13.784 18.216 12 16 12 z "
+     id="path8" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-linecap:butt;stroke-linejoin:round"
+     d="M 15.949219 13.003906 A 3 3 0 0 0 14.265625 13.558594 L 14.984375 14.277344 A 2 2 0 0 1 17.414062 14.585938 A 2 2 0 0 1 17.720703 17.013672 L 18.445312 17.738281 A 3 3 0 0 0 18.121094 13.878906 A 3 3 0 0 0 15.949219 13.003906 z M 13.554688 14.261719 A 3 3 0 0 0 13.878906 18.121094 A 3 3 0 0 0 17.734375 18.441406 L 17.015625 17.722656 A 2 2 0 0 1 14.585938 17.414062 A 2 2 0 0 1 14.279297 14.986328 L 13.554688 14.261719 z "
+     id="path10" />
+</svg>
diff --git a/resources/images/fallback/light/big/view-refresh.svg b/resources/images/fallback/light/big/view-refresh.svg
new file mode 100644
index 0000000..cc01cb2
--- /dev/null
+++ b/resources/images/fallback/light/big/view-refresh.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 11 3 C 9.558286 3 8.2107109 3.3829219 7.0449219 4.0449219 L 7.7832031 4.7832031 C 7.7832031 4.7832031 7.7851562 4.78125 7.7851562 4.78125 L 10.564453 7.5585938 L 11.271484 6.8515625 L 8.7890625 4.3710938 C 9.4846855 4.1384172 10.223912 4 11 4 C 14.87797 4 18 7.122 18 11 C 18 12.1625 17.714172 13.253897 17.216797 14.216797 L 17.955078 14.955078 C 18.617129 13.789278 19 12.4417 19 11 C 19 6.568 15.431966 3 11 3 z M 4.0449219 7.0449219 C 3.3828709 8.2107219 3 9.5583 3 11 C 3 15.432 6.568034 19 11 19 C 12.441714 19 13.789289 18.617078 14.955078 17.955078 L 14.271484 17.271484 L 14.273438 17.269531 L 11.445312 14.441406 L 10.738281 15.148438 L 13.216797 17.626953 C 12.519497 17.860874 11.778264 18 11 18 C 7.12203 18 4 14.878 4 11 C 4 9.8375 4.2858291 8.7461031 4.7832031 7.7832031 L 4.0449219 7.0449219 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/light/small/edit-delete.svg b/resources/images/fallback/light/small/edit-delete.svg
new file mode 100644
index 0000000..9dfb2e0
--- /dev/null
+++ b/resources/images/fallback/light/small/edit-delete.svg
@@ -0,0 +1,14 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+     d="m5 2v2h1v-1h4v1h1v-2h-5zm-3 3v1h2v8h8v-8h2v-1zm3 1h6v7h-6z" 
+     />
+</svg>
diff --git a/resources/images/fallback/light/small/mail-message.svg b/resources/images/fallback/light/small/mail-message.svg
new file mode 100644
index 0000000..3befb4e
--- /dev/null
+++ b/resources/images/fallback/light/small/mail-message.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 1 2 L 1 14 L 15 14 L 15 2 L 1 2 z M 2.7070312 3 L 13.292969 3 L 8 8.2929688 L 2.7070312 3 z M 2 3.7070312 L 5.9335938 7.640625 L 2 12.230469 L 2 3.7070312 z M 14 3.7070312 L 14 12.232422 L 10.066406 7.640625 L 14 3.7070312 z M 6.6425781 8.3496094 L 8 9.7070312 L 9.3574219 8.3496094 L 13.341797 13 L 2.65625 13 L 6.6425781 8.3496094 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/light/small/network-connect.svg b/resources/images/fallback/light/small/network-connect.svg
new file mode 100644
index 0000000..16e25c5
--- /dev/null
+++ b/resources/images/fallback/light/small/network-connect.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 13.300781 2 L 10.650391 4.6503906 L 9.5859375 3.5859375 L 3.5859375 9.5859375 L 4.6503906 10.650391 L 2 13.300781 L 2.6992188 14 L 5.3496094 11.349609 L 6.4140625 12.414062 L 12.414062 6.4140625 L 11.349609 5.3496094 L 14 2.6992188 L 13.300781 2 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/light/small/network-disconnect.svg b/resources/images/fallback/light/small/network-disconnect.svg
new file mode 100644
index 0000000..5e5cc3b
--- /dev/null
+++ b/resources/images/fallback/light/small/network-disconnect.svg
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 13.300781 2 L 10.650391 4.6503906 L 9.5859375 3.5859375 L 6.5859375 6.5859375 L 9.4140625 9.4140625 L 12.414062 6.4140625 L 11.349609 5.3496094 L 14 2.6992188 L 13.300781 2 z M 5.5859375 7.5859375 L 3.5859375 9.5859375 L 4.6503906 10.650391 L 2 13.300781 L 2.6992188 14 L 5.3496094 11.349609 L 6.4140625 12.414062 L 8.4140625 10.414062 L 5.5859375 7.5859375 z "
+     class="ColorScheme-Text"
+     />
+   <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 9,9.83 10.667,11.497 9,13.164 9.833,13.997 11.5,12.33 13.167,13.997 14,13.164 12.333,11.497 14,9.83 13.167,8.997 11.5,10.664 9.833,8.997 Z" 
+     class="ColorScheme-NegativeText"
+     />
+</svg>
diff --git a/resources/images/fallback/light/small/news-subscribe.svg b/resources/images/fallback/light/small/news-subscribe.svg
new file mode 100644
index 0000000..a2ff0c8
--- /dev/null
+++ b/resources/images/fallback/light/small/news-subscribe.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m2 2v12h12v-12zm1 1h10v10h-10zm1 1v3h3v-3zm4 0v1h4v-1zm0 2v1h4v-1zm-4 2v4h8v-4z"
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/images/fallback/light/small/news-unsubscribe.svg b/resources/images/fallback/light/small/news-unsubscribe.svg
new file mode 100644
index 0000000..073ade6
--- /dev/null
+++ b/resources/images/fallback/light/small/news-unsubscribe.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+    d="M 2 2 L 2 14 L 14 14 L 14 2 L 2 2 z M 3 3 L 13 3 L 13 13 L 3 13 L 3 3 z M 4 4 L 4 7 L 7 7 L 7 4 L 4 4 z M 8 4 L 8 5 L 12 5 L 12 4 L 8 4 z M 8 6 L 8 7 L 12 7 L 12 6 L 8 6 z M 4 8 L 4 12 L 12 12 L 12 8 L 4 8 z " />
+</svg>
diff --git a/resources/images/fallback/light/small/state-error.svg b/resources/images/fallback/light/small/state-error.svg
new file mode 100644
index 0000000..4745eba
--- /dev/null
+++ b/resources/images/fallback/light/small/state-error.svg
@@ -0,0 +1,30 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-NegativeText {
+        color:#da4453;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 7.5,2 C 5.0147186,2 3,4.0147186 3,6.5 3.0015312,6.7197442 3.0191564,6.939081 3.0527344,7.15625 1.8279505,7.563833 1.0011929,8.7091793 1,10 c 0,1.656854 1.3431458,3 3,3 l 7.5,0 c 1.932997,0 3.321429,-1.477717 3.321429,-3.4107143 -0.343605,-1.177246 -1.384105,-2.7716808 -2.839605,-3.4058395 -0.02988,-0.013019 0.01902,-0.1361103 -0.01112,-0.14829 C 11.732775,3.7441623 9.803314,2.0026739 7.5,2 Z m 0,1 C 9.4329966,3 11,4.5670034 11,6.5 10.998359,6.6892144 10.981376,6.8779841 10.949219,7.0644531 11.129854,7.0226102 11.314584,7.0009929 11.5,7 12.880712,7 14,8.1192881 14,9.5 14,10.880712 12.880712,12 11.5,12 L 4,12 C 2.8954305,12 2,11.104569 2,10 2,8.8954305 2.8954305,8 4,8 4.119895,8.000332 4.2395173,8.0114445 4.3574219,8.0332031 4.1233957,7.5559094 4.0011632,7.031579 4,6.5 4,4.5670034 5.5670034,3 7.5,3 Z"
+       transform="translate(0,1036.3622)"
+       id="path4139"
+       class="ColorScheme-Text" />
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-NegativeText"
+       d="m 8.0000348,1042.3622 5.9999302,0 c 0.554019,0 1.000035,0.446 1.000035,1 l 0,5.9999 c 0,0.5541 -0.446016,1.0001 -1.000035,1.0001 l -5.9999302,0 C 7.4460155,1050.3622 7,1049.9162 7,1049.3621 l 0,-5.9999 c 0,-0.554 0.4460155,-1 1.0000348,-1 z"
+       id="rect4153-8" />
+    <path
+       style="fill:#ffffff;stroke-opacity:1"
+       d="m 9,1043.3622 -1,1 2,2 -2,2 1,1 2,-2 2,2 1,-1 -2,-2 2,-2 -1,-1 -2,2 -2,-2 z"
+       id="path4141" />
+  </g>
+</svg>
diff --git a/resources/images/fallback/light/small/state-offline.svg b/resources/images/fallback/light/small/state-offline.svg
new file mode 100644
index 0000000..1e9b4fa
--- /dev/null
+++ b/resources/images/fallback/light/small/state-offline.svg
@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none"
+        d="M 7.5 2 C 5.0147186 2 3 4.0147186 3 6.5 C 3.0015312 6.7197442 3.0191564 6.939081 3.0527344 7.15625 C 1.8279505 7.563833 1.0011929 8.7091793 1 10 C 1 11.656854 2.3431458 13 4 13 L 11.5 13 C 13.432997 13 15 11.432997 15 9.5 C 14.656395 8.322754 13.437922 6.8177524 11.982422 6.1835938 C 11.952541 6.1705745 12.000846 6.047336 11.970703 6.0351562 C 11.732775 3.7441623 9.803314 2.0026739 7.5 2 z M 7.5 3 C 9.4329966 3 11 4.5670034 11 6.5 C 10.998359 6.6892144 10.981376 6.8779841 10.949219 7.0644531 C 11.129854 7.0226102 11.314584 7.0009929 11.5 7 C 12.880712 7 14 8.1192881 14 9.5 C 14 10.880712 12.880712 12 11.5 12 L 4 12 C 2.8954305 12 2 11.104569 2 10 C 2 8.8954305 2.8954305 8 4 8 C 4.119895 8.000332 4.2395173 8.0114445 4.3574219 8.0332031 C 4.1233957 7.5559094 4.0011632 7.031579 4 6.5 C 4 4.5670034 5.5670034 3 7.5 3 z "
+        class="ColorScheme-Text"
+        />
+  <path
+     style="opacity:1;fill:#bdc3c7"
+     d="M 11 6 A 4 4 0 0 0 7 10 A 4 4 0 0 0 11 14 A 4 4 0 0 0 15 10 A 4 4 0 0 0 11 6 z " />
+  <path
+     style="opacity:1;fill:#ffffff"
+     d="M 9 9 L 9 11 L 10 11 L 10 9 L 9 9 z M 12 9 L 12 11 L 13 11 L 13 9 L 12 9 z " />
+</svg>
diff --git a/resources/images/fallback/light/small/state-ok.svg b/resources/images/fallback/light/small/state-ok.svg
new file mode 100644
index 0000000..86a9c5d
--- /dev/null
+++ b/resources/images/fallback/light/small/state-ok.svg
@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-PositiveText {
+        color:#27ae60;
+      }
+      </style>
+  </defs>
+  <g
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 7.5,2 C 5.0147186,2 3,4.0147186 3,6.5 3.0015312,6.7197442 3.0191564,6.939081 3.0527344,7.15625 1.8279505,7.563833 1.0011929,8.7091793 1,10 c 0,1.656854 1.3431458,3 3,3 l 7.5,0 c 1.932997,0 3.321429,-1.477717 3.321429,-3.4107143 -0.343605,-1.177246 -1.384105,-2.7716808 -2.839605,-3.4058395 -0.02988,-0.013019 0.01902,-0.1361103 -0.01112,-0.14829 C 11.732775,3.7441623 9.803314,2.0026739 7.5,2 Z m 0,1 C 9.4329966,3 11,4.5670034 11,6.5 10.998359,6.6892144 10.981376,6.8779841 10.949219,7.0644531 11.129854,7.0226102 11.314584,7.0009929 11.5,7 12.880712,7 14,8.1192881 14,9.5 14,10.880712 12.880712,12 11.5,12 L 4,12 C 2.8954305,12 2,11.104569 2,10 2,8.8954305 2.8954305,8 4,8 4.119895,8.000332 4.2395173,8.0114445 4.3574219,8.0332031 4.1233957,7.5559094 4.0011632,7.031579 4,6.5 4,4.5670034 5.5670034,3 7.5,3 Z"
+       transform="translate(0,1036.3622)"
+       class="ColorScheme-Text" />
+    <path
+       d="m 11,1042.3622 c 2.216,0 4,1.784 4,4 0,2.216 -1.784,4 -4,4 -2.216,0 -4,-1.784 -4,-4 0,-2.216 1.784,-4 4,-4 z"
+      style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-PositiveText" />
+    <path
+       d="m 13,1044.3622 -3,3 -1,-1 -1,1 1,1 1,1 4,-4 -1,-1 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/resources/images/fallback/light/small/state-sync.svg b/resources/images/fallback/light/small/state-sync.svg
new file mode 100644
index 0000000..7823794
--- /dev/null
+++ b/resources/images/fallback/light/small/state-sync.svg
@@ -0,0 +1,26 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      .ColorScheme-Highlight {
+        color:#3daee9;
+      }
+      </style>
+  </defs>
+  <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none"
+        d="M 7.5 2 C 5.0147186 2 3 4.0147186 3 6.5 C 3.0015312 6.7197442 3.0191564 6.939081 3.0527344 7.15625 C 1.8279505 7.563833 1.0011929 8.7091793 1 10 C 1 11.656854 2.3431458 13 4 13 L 11.5 13 C 13.432997 13 15 11.432997 15 9.5 C 14.656395 8.322754 13.437922 6.8177523 11.982422 6.1835938 C 11.952541 6.1705745 12.000846 6.047336 11.970703 6.0351562 C 11.732775 3.7441623 9.803314 2.0026739 7.5 2 z M 7.5 3 C 9.4329966 3 11 4.5670034 11 6.5 C 10.998359 6.6892144 10.981376 6.8779841 10.949219 7.0644531 C 11.129854 7.0226102 11.314584 7.0009929 11.5 7 C 12.880712 7 14 8.1192881 14 9.5 C 14 10.880712 12.880712 12 11.5 12 L 4 12 C 2.8954305 12 2 11.104569 2 10 C 2 8.8954305 2.8954305 8 4 8 C 4.119895 8.000332 4.2395173 8.0114445 4.3574219 8.0332031 C 4.1233957 7.5559094 4.0011632 7.031579 4 6.5 C 4 4.5670034 5.5670034 3 7.5 3 z "
+        class="ColorScheme-Text"
+        />
+  <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none"
+        d="M 11 6 C 8.784 6 7 7.784 7 10 C 7 12.216 8.784 14 11 14 C 13.216 14 15 12.216 15 10 C 15 7.784 13.216 6 11 6 z "
+        class="ColorScheme-Highlight"
+        />
+    <path
+       style="opacity:1;fill:#ffffff"
+       d="M 11.050781 7.0039062 A 3 3 0 0 0 8.8789062 7.8789062 A 3 3 0 0 0 8.5546875 11.738281 L 9.2792969 11.013672 A 2 2 0 0 1 9.5859375 8.5859375 A 2 2 0 0 1 12.015625 8.2773438 L 12.734375 7.5585938 A 3 3 0 0 0 11.050781 7.0039062 z M 13.445312 8.2617188 L 12.720703 8.9863281 A 2 2 0 0 1 12.414062 11.414062 A 2 2 0 0 1 9.984375 11.722656 L 9.265625 12.441406 A 3 3 0 0 0 13.121094 12.121094 A 3 3 0 0 0 13.445312 8.2617188 z "
+       />
+</svg>
diff --git a/resources/images/fallback/light/small/view-refresh.svg b/resources/images/fallback/light/small/view-refresh.svg
new file mode 100644
index 0000000..cddb324
--- /dev/null
+++ b/resources/images/fallback/light/small/view-refresh.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 8 2 C 6.8911827 2 5.8599294 2.3193334 4.96875 2.84375 L 5.53125 3.40625 L 5.71875 3.59375 L 7.65625 5.53125 L 8.375 4.8125 L 6.75 3.1875 C 6.94534 3.1364099 7.1398623 3.0897842 7.34375 3.0625 C 7.3961563 3.0547113 7.4470287 3.0373165 7.5 3.03125 C 7.6680854 3.01418 7.827411 3 8 3 C 10.761424 3 13 5.2385759 13 8 C 13 8.243024 12.97155 8.4855082 12.9375 8.71875 C 12.917545 8.8549993 12.905714 8.9925532 12.875 9.125 C 12.80805 9.4115815 12.708353 9.672624 12.59375 9.9375 C 12.580478 9.9681753 12.576374 10.000899 12.5625 10.03125 C 12.521539 10.122908 12.454245 10.194583 12.40625 10.28125 C 12.401797 10.289291 12.410582 10.304303 12.40625 10.3125 L 13.15625 11.03125 C 13.680667 10.140071 14 9.108818 14 8 C 14 4.6862909 11.313707 2 8 2 z M 2.84375 4.96875 C 2.3193332 5.8599294 2 6.891182 2 8 C 2 11.313709 4.6862934 14 8 14 C 9.1088173 14 10.140071 13.680667 11.03125 13.15625 L 10.46875 12.59375 L 10.28125 12.40625 L 8.34375 10.5 L 7.65625 11.1875 L 9.25 12.8125 C 9.05466 12.86359 8.8601377 12.910216 8.65625 12.9375 C 8.6038437 12.945289 8.5529713 12.962684 8.5 12.96875 C 8.3319146 12.98582 8.172589 13 8 13 C 7.827411 13 7.6680854 12.98582 7.5 12.96875 C 7.3319147 12.95168 7.162744 12.939552 7 12.90625 C 4.7215847 12.440019 3 10.416246 3 8 C 3 7.7517374 3.0275593 7.5198138 3.0625 7.28125 C 3.0824555 7.1450007 3.0942865 7.0074468 3.125 6.875 C 3.1919502 6.5884185 3.2916465 6.327376 3.40625 6.0625 C 3.4192426 6.031782 3.4239145 5.9991506 3.4375 5.96875 C 3.4781185 5.8798895 3.5461122 5.8040145 3.59375 5.71875 L 3.59375 5.6875 L 2.84375 4.96875 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/resources/resources.qrc b/resources/resources.qrc
index 2c9505b..6a59b26 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -17,6 +17,21 @@
     <file>images/fallback/dark/big/edit-none.svg</file>
     <file>images/fallback/dark/big/question.svg</file>
     
+    <file>images/fallback/dark/big/state-ok.svg</file>
+    <file>images/fallback/dark/big/state-sync.svg</file>
+    <file>images/fallback/dark/big/state-offline.svg</file>
+    <file>images/fallback/dark/big/state-error.svg</file>
+    
+    <file>images/fallback/dark/big/edit-delete.svg</file>
+    <file>images/fallback/dark/big/mail-message.svg</file>
+    <file>images/fallback/dark/big/network-connect.svg</file>
+    <file>images/fallback/dark/big/network-disconnect.svg</file>
+    <file>images/fallback/dark/big/news-subscribe.svg</file>
+    <file>images/fallback/dark/big/news-unsubscribe.svg</file>
+    <file>images/fallback/dark/big/view-refresh.svg</file>
+    <file>images/fallback/dark/big/clean.svg</file>
+    <file>images/fallback/dark/big/send.svg</file>
+    
     
     <file>images/fallback/dark/small/absent.svg</file>
     <file>images/fallback/dark/small/away.svg</file>
@@ -33,6 +48,21 @@
     <file>images/fallback/dark/small/edit-none.svg</file>
     <file>images/fallback/dark/small/question.svg</file>
     
+    <file>images/fallback/dark/small/state-ok.svg</file>
+    <file>images/fallback/dark/small/state-sync.svg</file>
+    <file>images/fallback/dark/small/state-offline.svg</file>
+    <file>images/fallback/dark/small/state-error.svg</file>
+    
+    <file>images/fallback/dark/small/edit-delete.svg</file>
+    <file>images/fallback/dark/small/mail-message.svg</file>
+    <file>images/fallback/dark/small/network-connect.svg</file>
+    <file>images/fallback/dark/small/network-disconnect.svg</file>
+    <file>images/fallback/dark/small/news-subscribe.svg</file>
+    <file>images/fallback/dark/small/news-unsubscribe.svg</file>
+    <file>images/fallback/dark/small/view-refresh.svg</file>
+    <file>images/fallback/dark/small/clean.svg</file>
+    <file>images/fallback/dark/small/send.svg</file>
+    
     
     <file>images/fallback/light/big/absent.svg</file>
     <file>images/fallback/light/big/away.svg</file>
@@ -49,6 +79,21 @@
     <file>images/fallback/light/big/edit-none.svg</file>
     <file>images/fallback/light/big/question.svg</file>
     
+    <file>images/fallback/light/big/state-ok.svg</file>
+    <file>images/fallback/light/big/state-sync.svg</file>
+    <file>images/fallback/light/big/state-offline.svg</file>
+    <file>images/fallback/light/big/state-error.svg</file>
+    
+    <file>images/fallback/light/big/edit-delete.svg</file>
+    <file>images/fallback/light/big/mail-message.svg</file>
+    <file>images/fallback/light/big/network-connect.svg</file>
+    <file>images/fallback/light/big/network-disconnect.svg</file>
+    <file>images/fallback/light/big/news-subscribe.svg</file>
+    <file>images/fallback/light/big/news-unsubscribe.svg</file>
+    <file>images/fallback/light/big/view-refresh.svg</file>
+    <file>images/fallback/light/big/clean.svg</file>
+    <file>images/fallback/light/big/send.svg</file>
+    
     
     <file>images/fallback/light/small/absent.svg</file>
     <file>images/fallback/light/small/away.svg</file>
@@ -64,5 +109,20 @@
     <file>images/fallback/light/small/dialog-ok.svg</file>
     <file>images/fallback/light/small/edit-none.svg</file>
     <file>images/fallback/light/small/question.svg</file>
+    
+    <file>images/fallback/light/small/state-ok.svg</file>
+    <file>images/fallback/light/small/state-sync.svg</file>
+    <file>images/fallback/light/small/state-offline.svg</file>
+    <file>images/fallback/light/small/state-error.svg</file>
+    
+    <file>images/fallback/light/small/edit-delete.svg</file>
+    <file>images/fallback/light/small/mail-message.svg</file>
+    <file>images/fallback/light/small/network-connect.svg</file>
+    <file>images/fallback/light/small/network-disconnect.svg</file>
+    <file>images/fallback/light/small/news-subscribe.svg</file>
+    <file>images/fallback/light/small/news-unsubscribe.svg</file>
+    <file>images/fallback/light/small/view-refresh.svg</file>
+    <file>images/fallback/light/small/clean.svg</file>
+    <file>images/fallback/light/small/send.svg</file>
 </qresource>
 </RCC>
diff --git a/ui/conversation.cpp b/ui/conversation.cpp
index 1829986..52e98d8 100644
--- a/ui/conversation.cpp
+++ b/ui/conversation.cpp
@@ -255,7 +255,7 @@ void Conversation::onSliderValueChanged(int value)
             scroll = down;
         } else {
             if (!requestingHistory && value == 0) {
-                m_ui->historyStatus->setPixmap(QIcon::fromTheme("view-refresh").pixmap(25));
+                m_ui->historyStatus->setPixmap(Shared::icon("view-refresh", true).pixmap(25));
                 requestingHistory = true;
                 emit requestArchive(line->firstMessageId());
             }
@@ -279,7 +279,7 @@ void Conversation::showEvent(QShowEvent* event)
 {
     if (!everShown) {
         everShown = true;
-        m_ui->historyStatus->setPixmap(QIcon::fromTheme("view-refresh").pixmap(25));
+        m_ui->historyStatus->setPixmap(Shared::icon("view-refresh", true).pixmap(25));
         requestingHistory = true;
         emit requestArchive(line->firstMessageId());
     }
diff --git a/ui/models/account.cpp b/ui/models/account.cpp
index 383ee1c..196206a 100644
--- a/ui/models/account.cpp
+++ b/ui/models/account.cpp
@@ -76,7 +76,7 @@ QIcon Models::Account::getStatusIcon(bool big) const
     } else if (state == Shared::disconnected) {
         return Shared::availabilityIcon(Shared::offline, big);
     } else {
-        return QIcon::fromTheme(Shared::connectionStateThemeIcons[state]);
+        return Shared::connectionStateIcon(state);
     }
 }
 
diff --git a/ui/models/accounts.cpp b/ui/models/accounts.cpp
index e64e2c3..c8b7129 100644
--- a/ui/models/accounts.cpp
+++ b/ui/models/accounts.cpp
@@ -31,7 +31,7 @@ QVariant Models::Accounts::data (const QModelIndex& index, int role) const
             break;
         case Qt::DecorationRole:
             if (index.column() == 2) {
-                answer = QIcon::fromTheme(Shared::connectionStateThemeIcons[accs[index.row()]->getState()]);
+                answer = Shared::connectionStateIcon(accs[index.row()]->getState());
             }
             break;
         default:
diff --git a/ui/models/contact.cpp b/ui/models/contact.cpp
index d2d03af..0397a0c 100644
--- a/ui/models/contact.cpp
+++ b/ui/models/contact.cpp
@@ -219,7 +219,7 @@ void Models::Contact::setState(Shared::SubscriptionState p_state)
 QIcon Models::Contact::getStatusIcon(bool big) const
 {
     if (getMessagesCount() > 0) {
-        return QIcon::fromTheme("mail-message");
+        return Shared::icon("mail-message");
     } else if (state == Shared::both) {
         return Shared::availabilityIcon(availability, big);;
     } else {
diff --git a/ui/models/presence.cpp b/ui/models/presence.cpp
index 623df61..be2f8c9 100644
--- a/ui/models/presence.cpp
+++ b/ui/models/presence.cpp
@@ -143,7 +143,7 @@ void Models::Presence::dropMessages()
 QIcon Models::Presence::getStatusIcon(bool big) const
 {
     if (getMessagesCount() > 0) {
-        return QIcon::fromTheme("mail-message");
+        return Shared::icon("mail-message");
     } else {
         return Shared::availabilityIcon(availability, big);
     }
diff --git a/ui/squawk.cpp b/ui/squawk.cpp
index c5bff2c..92114a1 100644
--- a/ui/squawk.cpp
+++ b/ui/squawk.cpp
@@ -16,9 +16,9 @@ Squawk::Squawk(QWidget *parent) :
     m_ui->roster->setModel(&rosterModel);
     m_ui->roster->setContextMenuPolicy(Qt::CustomContextMenu);
     
-    const std::deque<QString>& fallback = palette().window().color().lightnessF() > 0.5 ? Shared::fallbackAvailabilityThemeIconsDarkSmall : Shared::fallbackAvailabilityThemeIconsLightSmall;
-    for (int i = 0; i < Shared::availabilityNames.size(); ++i) {
-        m_ui->comboBox->addItem(QIcon::fromTheme(Shared::availabilityThemeIcons[i], QIcon(fallback[i])), Shared::availabilityNames[i]);
+    for (unsigned int i = Shared::availabilityLowest; i < Shared::availabilityHighest + 1; ++i) {
+        Shared::Availability av = static_cast<Shared::Availability>(i);
+        m_ui->comboBox->addItem(Shared::availabilityIcon(av), Shared::availabilityNames[av]);
     }
     m_ui->comboBox->setCurrentIndex(Shared::offline);
     
@@ -356,18 +356,18 @@ void Squawk::onRosterContextMenu(const QPoint& point)
                 QString name = acc->getName();
                 
                 if (acc->getState() != Shared::disconnected) {
-                    QAction* con = contextMenu->addAction(QIcon::fromTheme("network-disconnect"), "Disconnect");
+                    QAction* con = contextMenu->addAction(Shared::icon("network-disconnect"), "Disconnect");
                     connect(con, &QAction::triggered, [this, name]() {
                         emit disconnectAccount(name);
                     });
                 } else {
-                    QAction* con = contextMenu->addAction(QIcon::fromTheme("network-connect"), "Connect");
+                    QAction* con = contextMenu->addAction(Shared::icon("network-connect"), "Connect");
                     connect(con, &QAction::triggered, [this, name]() {
                         emit connectAccount(name);
                     });
                 }
                 
-                QAction* remove = contextMenu->addAction(QIcon::fromTheme("edit-delete"), "Remove");
+                QAction* remove = contextMenu->addAction(Shared::icon("edit-delete"), "Remove");
                 connect(remove, &QAction::triggered, [this, name]() {
                     emit removeAccount(name);
                 });
@@ -378,7 +378,7 @@ void Squawk::onRosterContextMenu(const QPoint& point)
                 Models::Contact* cnt = static_cast<Models::Contact*>(item);
                 hasMenu = true;
                 
-                QAction* dialog = contextMenu->addAction(QIcon::fromTheme("mail-message"), "Open dialog");
+                QAction* dialog = contextMenu->addAction(Shared::icon("mail-message"), "Open dialog");
                 connect(dialog, &QAction::triggered, [this, index]() {
                     onRosterItemDoubleClicked(index);
                 });
@@ -387,7 +387,7 @@ void Squawk::onRosterContextMenu(const QPoint& point)
                 switch (state) {
                     case Shared::both:
                     case Shared::to: {
-                        QAction* unsub = contextMenu->addAction(QIcon::fromTheme("news-unsubscribe"), "Unsubscribe");
+                        QAction* unsub = contextMenu->addAction(Shared::icon("news-unsubscribe"), "Unsubscribe");
                         connect(unsub, &QAction::triggered, [this, cnt]() {
                             emit unsubscribeContact(cnt->getAccountName(), cnt->getJid(), "");
                         });
@@ -396,14 +396,14 @@ void Squawk::onRosterContextMenu(const QPoint& point)
                     case Shared::from:
                     case Shared::unknown:
                     case Shared::none: {
-                        QAction* sub = contextMenu->addAction(QIcon::fromTheme("news-subscribe"), "Subscribe");
+                        QAction* sub = contextMenu->addAction(Shared::icon("news-subscribe"), "Subscribe");
                         connect(sub, &QAction::triggered, [this, cnt]() {
                             emit subscribeContact(cnt->getAccountName(), cnt->getJid(), "");
                         });
                     }    
                 }
                 
-                QAction* remove = contextMenu->addAction(QIcon::fromTheme("edit-delete"), "Remove");
+                QAction* remove = contextMenu->addAction(Shared::icon("edit-delete"), "Remove");
                 connect(remove, &QAction::triggered, [this, cnt]() {
                     emit removeContactRequest(cnt->getAccountName(), cnt->getJid());
                 });