diff --git a/install.sh b/install.sh
index f828ecba..404d0779 100755
--- a/install.sh
+++ b/install.sh
@@ -118,7 +118,7 @@ install() {
     mkdir -p                                                                                 "${THEME_DIR}"/{apps,categories,emblems,devices,mimes,places,status}
 
     cp -r "${SRC_DIR}"/src/actions                                                           "${THEME_DIR}"
-    cp -r "${SRC_DIR}"/src/apps/{22,32,symbolic}                                             "${THEME_DIR}"/apps
+    cp -r "${SRC_DIR}"/src/apps/{16,22,32,symbolic}                                          "${THEME_DIR}"/apps
     cp -r "${SRC_DIR}"/src/categories/{22,symbolic}                                          "${THEME_DIR}"/categories
     cp -r "${SRC_DIR}"/src/emblems/symbolic                                                  "${THEME_DIR}"/emblems
     cp -r "${SRC_DIR}"/src/mimes/symbolic                                                    "${THEME_DIR}"/mimes
@@ -151,7 +151,7 @@ install() {
 
     # Change icon color for dark theme
     sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,devices,places}/{16,22,24}/*.svg
-    sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/apps/{22,32}/*.svg
+    sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/apps/{16,22,32}/*.svg
     sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/categories/22/*.svg
     sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,devices}/32/*.svg
     sed -i "s/#363636/#dedede/g" "${THEME_DIR}"/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/*.svg
@@ -159,7 +159,7 @@ install() {
     cp -r "${SRC_DIR}"/links/actions/{16,22,24,32,symbolic}                                  "${THEME_DIR}"/actions
     cp -r "${SRC_DIR}"/links/devices/{16,22,24,32,symbolic}                                  "${THEME_DIR}"/devices
     cp -r "${SRC_DIR}"/links/places/{16,22,24,scalable,symbolic}                             "${THEME_DIR}"/places
-    cp -r "${SRC_DIR}"/links/apps/{22,symbolic}                                              "${THEME_DIR}"/apps
+    cp -r "${SRC_DIR}"/links/apps/{16,22,32,symbolic}                                        "${THEME_DIR}"/apps
     cp -r "${SRC_DIR}"/links/categories/{22,symbolic}                                        "${THEME_DIR}"/categories
     cp -r "${SRC_DIR}"/links/mimes/symbolic                                                  "${THEME_DIR}"/mimes
     cp -r "${SRC_DIR}"/links/status/symbolic                                                 "${THEME_DIR}"/status
diff --git a/links/actions/22/utilities-terminal.svg b/links/actions/22/utilities-terminal.svg
deleted file mode 120000
index b6181fcf..00000000
--- a/links/actions/22/utilities-terminal.svg
+++ /dev/null
@@ -1 +0,0 @@
-terminal.svg
\ No newline at end of file
diff --git a/links/actions/16/utilities-terminal.svg b/links/apps/16/utilities-terminal.svg
similarity index 100%
rename from links/actions/16/utilities-terminal.svg
rename to links/apps/16/utilities-terminal.svg
diff --git a/links/devices/16/kdeconnect.svg b/links/devices/16/kdeconnect.svg
deleted file mode 120000
index 383406fc..00000000
--- a/links/devices/16/kdeconnect.svg
+++ /dev/null
@@ -1 +0,0 @@
-phone.svg
\ No newline at end of file
diff --git a/links/devices/22/kdeconnect-symbolic.svg b/links/devices/22/kdeconnect-symbolic.svg
deleted file mode 120000
index af028f18..00000000
--- a/links/devices/22/kdeconnect-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-kdeconnect.svg
\ No newline at end of file
diff --git a/links/devices/22/kdeconnect.svg b/links/devices/22/kdeconnect.svg
deleted file mode 120000
index 383406fc..00000000
--- a/links/devices/22/kdeconnect.svg
+++ /dev/null
@@ -1 +0,0 @@
-phone.svg
\ No newline at end of file
diff --git a/links/devices/24/kdeconnect.svg b/links/devices/24/kdeconnect.svg
deleted file mode 120000
index 383406fc..00000000
--- a/links/devices/24/kdeconnect.svg
+++ /dev/null
@@ -1 +0,0 @@
-phone.svg
\ No newline at end of file
diff --git a/links/devices/32/kdeconnect-symbolic.svg b/links/devices/32/kdeconnect-symbolic.svg
deleted file mode 120000
index af028f18..00000000
--- a/links/devices/32/kdeconnect-symbolic.svg
+++ /dev/null
@@ -1 +0,0 @@
-kdeconnect.svg
\ No newline at end of file
diff --git a/src/actions/16/kdeconnect.svg b/src/actions/16/kdeconnect.svg
deleted file mode 100644
index dce11bc9..00000000
--- a/src/actions/16/kdeconnect.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#5294e2; }</style>
- </defs>
- <path class="ColorScheme-Text" d="m5 0c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-2-2-2zm0 1h1c0 0.554 0.446 1 1 1h2c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-6c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1z" fill="currentColor"/>
- <rect class="ColorScheme-Text" x="6" y="13.5" width="4" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
-</svg>
diff --git a/src/apps/16/filelight.svg b/src/apps/16/filelight.svg
new file mode 100644
index 00000000..c49b6423
--- /dev/null
+++ b/src/apps/16/filelight.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
+ </defs>
+ <g class="ColorScheme-Text" transform="translate(-.000182 -1)" fill="currentColor">
+  <path d="m6.0001 2c-1.4995 0-2.5425 1.0366-2.9316 2.0332l-2.8691 7.4844c-0.003232 0.0076-0.004654 0.01581-0.007813 0.02344l-0.058594 0.15039h0.011719c-0.08705 0.25475-0.14453 0.52362-0.14453 0.80859 0 1.385 1.115 2.5 2.5 2.5h11c1.385 0 2.5-1.115 2.5-2.5 0-0.28498-0.05748-0.55384-0.14453-0.80859h0.01172l-0.05859-0.15039-0.0039-0.01563c-0.0011-0.0027-0.0028-0.0051-0.0039-0.0078l-2.8692-7.4844c-0.38916-0.99659-1.4322-2.0332-2.9316-2.0332h-2.0001zm0 1h4c1.108 0 1.7085 0.6499 2 1.3965l2.1875 5.7109c-0.21961-0.0627-0.44722-0.10742-0.6875-0.10742h-11c-0.24028 0-0.46789 0.04472-0.6875 0.10742l2.1875-5.7109c0.29153-0.74658 0.892-1.3965 2-1.3965zm-3.5 8h11c0.831 0 1.5 0.669 1.5 1.5s-0.669 1.5-1.5 1.5h-11c-0.831 0-1.5-0.669-1.5-1.5s0.669-1.5 1.5-1.5z"/>
+  <circle cx="12.5" cy="12.5" r=".5"/>
+  <circle cx="10.5" cy="12.5" r=".5"/>
+  <circle cx="8.5" cy="12.5" r=".5"/>
+ </g>
+</svg>
diff --git a/src/apps/16/gwenview.svg b/src/apps/16/gwenview.svg
new file mode 100644
index 00000000..092f2278
--- /dev/null
+++ b/src/apps/16/gwenview.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Text { color:#363636; }</style>
+ </defs>
+ <path d="m2 1c-1.108 0-2 0.892-2 2v9c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-9c0-1.108-0.892-2-2-2zm0 1h12c0.554 0 1 0.446 1 1v9l-5-5-3.4794 4-2.5206-2-3 3v-9c0-0.554 0.446-1 1-1zm2.5 2c-0.82843 0-1.5 0.67157-1.5 1.5s0.67157 1.5 1.5 1.5 1.5-0.67157 1.5-1.5-0.67157-1.5-1.5-1.5z" style="fill:currentColor" class="ColorScheme-Text"/>
+</svg>
diff --git a/src/apps/16/kdeconnect-symbolic.svg b/src/apps/16/kdeconnect-symbolic.svg
new file mode 100644
index 00000000..9fcfed16
--- /dev/null
+++ b/src/apps/16/kdeconnect-symbolic.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#5294e2; }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m5 0c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-6zm0 1h1c0 0.554 0.446 1 1 1h2c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-6c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+ <rect class="ColorScheme-Text" x="6" y="13.5" width="4" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
+ <path class="ColorScheme-Text" d="m6.6501 5a0.33375 0.33373 0 1 0 0.01725 0zm2.3505 0-0.6675 0.66671 1.3342 1.3334-1.3335 1.3334 0.66675 0.66596 1.3335-1.3327 0.666-0.66746-0.666-0.66596zm-3.3338 2.0001a0.66675 0.66671 0 1 0 0 1.3334 0.66675 0.66671 0 0 0 0-1.3334m1.6672 1.9994a1.0005 1.0004 0 1 0 0 2.0001 1.0005 1.0004 0 0 0 0-2.0001" fill="currentColor"/>
+</svg>
diff --git a/src/actions/16/preferences-advanced.svg b/src/apps/16/preferences-advanced.svg
similarity index 100%
rename from src/actions/16/preferences-advanced.svg
rename to src/apps/16/preferences-advanced.svg
diff --git a/src/actions/16/preferences-bittorrent.svg b/src/apps/16/preferences-bittorrent.svg
similarity index 100%
rename from src/actions/16/preferences-bittorrent.svg
rename to src/apps/16/preferences-bittorrent.svg
diff --git a/src/actions/16/preferences-desktop-display-randr.svg b/src/apps/16/preferences-desktop-display-randr.svg
similarity index 100%
rename from src/actions/16/preferences-desktop-display-randr.svg
rename to src/apps/16/preferences-desktop-display-randr.svg
diff --git a/src/apps/16/preferences-desktop-locale.svg b/src/apps/16/preferences-desktop-locale.svg
new file mode 100644
index 00000000..c4539b53
--- /dev/null
+++ b/src/apps/16/preferences-desktop-locale.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+        color:#363636;
+      }</style>
+ </defs>
+ <path class="ColorScheme-Text" fill="currentColor" d="m7 0c-1.108 0-2 0.892-2 2v7c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-7c0-1.108-0.892-2-2-2h-7zm0 1h7c0.554 0 1 0.446 1 1v7c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-7c0-0.554 0.446-1 1-1zm2.5918 1-2.2656 7h1.4922l0.48242-1.6602h2.4043l0.47656 1.6602h1.4922l-2.2754-7h-1.8066zm0.91016 0.98242c0.015893 0.11126 0.043885 0.24535 0.082031 0.4043 0.038147 0.15895 0.077814 0.31957 0.11914 0.47852 0.044507 0.15577 0.0849 0.2974 0.12305 0.42773 0.038147 0.13034 0.066864 0.22403 0.085937 0.28125l0.44922 1.5273h-1.7031l0.44336-1.5273c0.00954-0.034973 0.023896-0.088996 0.042969-0.16211 0.022254-0.073107 0.046833-0.15658 0.072266-0.25195 0.025433-0.095373 0.051471-0.19661 0.080078-0.30469 0.028607-0.10808 0.056598-0.21541 0.082031-0.32031 0.028614-0.10809 0.051239-0.20932 0.070313-0.30469 0.022253-0.095373 0.040021-0.17811 0.052734-0.24805z"/>
+ <path class="ColorScheme-Text" fill="currentColor" d="m2 5c-1.108 0-2 0.892-2 2v7c0 1.108 0.892 2 2 2h7c1.108 0 2-0.892 2-2v-2h-1v2c0 0.554-0.446 1-1 1h-7c-0.554 0-1-0.446-1-1v-7c0-0.554 0.446-1 1-1h1v-1zm0.11133 2.7227v5.0156h0.45312v-0.74609h1.123v-1.0996c-0.17996-0.2199-0.34104-0.45677-0.45312-0.72266v1.291h-0.66992v-3.207h0.43555v-0.53125h-0.88867zm2.2871 3.8086c-0.2619 0.79515-0.59351 1.6615-0.85547 2.1992l0.5 0.26953c0.26364-0.63828 0.56751-1.4745 0.8125-2.2266-0.16079-0.06611-0.31184-0.15041-0.45703-0.24219zm1.0566 0.41406c-0.059049 0.35177-0.11882 0.73737-0.17383 1.0078h2.5312c-0.038462 0.23077-0.092759 0.37792-0.1543 0.43945-0.076923 0.09231-0.15427 0.10742-0.27734 0.10742-0.13846 0-0.49222-0.0083-0.86914-0.03906 0.084615 0.13846 0.13879 0.33822 0.14648 0.48437 0.36154 0.01538 0.72188 0.02319 0.92188 0.0078 0.22308-0.02308 0.36935-0.08479 0.50781-0.26172 0.1-0.12308 0.16905-0.33828 0.23828-0.73828h0.43945v-0.48438h-0.37695c0.014938-0.12548 0.026067-0.32071 0.039062-0.46875h-0.49219c-0.012996 0.14768-0.024125 0.34925-0.039062 0.46875h-2.0156c0.021088-0.14159 0.049009-0.31698 0.072266-0.47266-0.17027-0.0026-0.33594-0.02114-0.49805-0.05078zm1.4062 0.05469c0.16757 0.15351 0.31455 0.30677 0.4043 0.43164l0.30664-0.30078c-0.030305-0.03879-0.089385-0.08822-0.12891-0.13086z" opacity=".35"/>
+</svg>
diff --git a/src/actions/16/preferences-desktop.svg b/src/apps/16/preferences-desktop.svg
similarity index 100%
rename from src/actions/16/preferences-desktop.svg
rename to src/apps/16/preferences-desktop.svg
diff --git a/src/actions/16/terminal.svg b/src/apps/16/terminal.svg
similarity index 100%
rename from src/actions/16/terminal.svg
rename to src/apps/16/terminal.svg
diff --git a/src/apps/22/filelight-symbolic.svg b/src/apps/22/filelight-symbolic.svg
new file mode 100644
index 00000000..329d53f4
--- /dev/null
+++ b/src/apps/22/filelight-symbolic.svg
@@ -0,0 +1,11 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
+ </defs>
+ <g class="ColorScheme-Text" transform="translate(2.9999 3)" fill="currentColor">
+  <path d="m5.0001 2c-1.4995 0-2.5425 1.0366-2.9316 2.0332l-2.8691 7.4844c-0.003232 0.0076-0.004654 0.01581-0.007813 0.02344l-0.058594 0.15039h0.011719c-0.08705 0.25475-0.14453 0.52362-0.14453 0.80859 0 1.385 1.115 2.5 2.5 2.5h13c1.385 0 2.5-1.115 2.5-2.5 0-0.28498-0.05748-0.55384-0.14453-0.80859h0.01172l-0.05859-0.15039-0.0039-0.01563c-0.0011-0.0027-0.0028-0.0051-0.0039-0.0078l-2.8692-7.4844c-0.38916-0.99659-1.4322-2.0332-2.9316-2.0332h-3.0001zm0 1h6c1.108 0 1.7085 0.6499 2 1.3965l2.1875 5.7109c-0.21961-0.0627-0.44722-0.10742-0.6875-0.10742h-13c-0.24028 0-0.46789 0.04472-0.6875 0.10742l2.1875-5.7109c0.29153-0.74658 0.892-1.3965 2-1.3965zm-3.5 8h13c0.831 0 1.5 0.669 1.5 1.5s-0.669 1.5-1.5 1.5h-13c-0.831 0-1.5-0.669-1.5-1.5s0.669-1.5 1.5-1.5z"/>
+  <circle cx="12.5" cy="12.5" r=".5"/>
+  <circle cx="10.5" cy="12.5" r=".5"/>
+  <circle cx="8.5" cy="12.5" r=".5"/>
+ </g>
+</svg>
diff --git a/src/actions/22/terminal.svg b/src/apps/22/terminal.svg
similarity index 100%
rename from src/actions/22/terminal.svg
rename to src/apps/22/terminal.svg
diff --git a/src/devices/32/kdeconnect.svg b/src/apps/32/kdeconnect-symbolic.svg
similarity index 100%
rename from src/devices/32/kdeconnect.svg
rename to src/apps/32/kdeconnect-symbolic.svg
diff --git a/src/apps/symbolic/filelight-symbolic.svg b/src/apps/symbolic/filelight-symbolic.svg
new file mode 100644
index 00000000..c49b6423
--- /dev/null
+++ b/src/apps/symbolic/filelight-symbolic.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; }</style>
+ </defs>
+ <g class="ColorScheme-Text" transform="translate(-.000182 -1)" fill="currentColor">
+  <path d="m6.0001 2c-1.4995 0-2.5425 1.0366-2.9316 2.0332l-2.8691 7.4844c-0.003232 0.0076-0.004654 0.01581-0.007813 0.02344l-0.058594 0.15039h0.011719c-0.08705 0.25475-0.14453 0.52362-0.14453 0.80859 0 1.385 1.115 2.5 2.5 2.5h11c1.385 0 2.5-1.115 2.5-2.5 0-0.28498-0.05748-0.55384-0.14453-0.80859h0.01172l-0.05859-0.15039-0.0039-0.01563c-0.0011-0.0027-0.0028-0.0051-0.0039-0.0078l-2.8692-7.4844c-0.38916-0.99659-1.4322-2.0332-2.9316-2.0332h-2.0001zm0 1h4c1.108 0 1.7085 0.6499 2 1.3965l2.1875 5.7109c-0.21961-0.0627-0.44722-0.10742-0.6875-0.10742h-11c-0.24028 0-0.46789 0.04472-0.6875 0.10742l2.1875-5.7109c0.29153-0.74658 0.892-1.3965 2-1.3965zm-3.5 8h11c0.831 0 1.5 0.669 1.5 1.5s-0.669 1.5-1.5 1.5h-11c-0.831 0-1.5-0.669-1.5-1.5s0.669-1.5 1.5-1.5z"/>
+  <circle cx="12.5" cy="12.5" r=".5"/>
+  <circle cx="10.5" cy="12.5" r=".5"/>
+  <circle cx="8.5" cy="12.5" r=".5"/>
+ </g>
+</svg>
diff --git a/src/apps/symbolic/goa-account-symbolic.svg b/src/apps/symbolic/goa-account-symbolic.svg
new file mode 100644
index 00000000..b28df4ff
--- /dev/null
+++ b/src/apps/symbolic/goa-account-symbolic.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg4043"
+   sodipodi:docname="goa-account-symbolic.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="838"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4043" />
+  <defs
+     id="defs4037" />
+  <metadata
+     id="metadata4040">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/src/devices/22/kdeconnect.svg b/src/devices/22/kdeconnect.svg
deleted file mode 100644
index 2280db3e..00000000
--- a/src/devices/22/kdeconnect.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#5294e2; }</style>
- </defs>
- <g class="ColorScheme-Text" fill="currentColor">
-  <path class="ColorScheme-Text" x="4" d="m6.9609 2c-1.0865 0-1.9609 0.87448-1.9609 1.9609v14.078c0 1.0865 0.87448 1.9609 1.9609 1.9609h8.0391c1.0865 0 1.9609-0.87448 1.9609-1.9609v-14.078c0-1.0865-0.87448-1.9609-1.9609-1.9609zm0.039062 1h7.961c0.554 0 1 0.446 1 1v14c0 0.554-0.446 1-1 1h-7.961c-0.554 0-1-0.446-1-1v-14c0-0.554 0.446-1 1-1z"/>
-  <rect class="ColorScheme-Text" x="8" y="2" width="6" height="2" rx="1" ry="1"/>
- </g>
- <path class="ColorScheme-Text" d="m10.562 7.5-0.24267 0.96897c-0.22061 0.0588-0.43261 0.14612-0.63062 0.25977l-0.85449-0.5127-0.61865 0.61865 0.5127 0.85449c-0.11497 0.19838-0.20345 0.41096-0.26318 0.63233l-0.96556 0.24097v0.875l0.96897 0.24267c0.0588 0.22061 0.14612 0.43261 0.25977 0.63062l-0.5127 0.85449 0.61865 0.61865 0.85449-0.5127c0.19838 0.11497 0.41096 0.20345 0.63233 0.26318l0.24097 0.96556h0.875l0.24267-0.96897c0.22061-0.0588 0.43261-0.14612 0.63062-0.25977l0.85449 0.5127 0.61865-0.61865-0.5127-0.85449c0.11497-0.19838 0.20345-0.41096 0.26318-0.63233l0.96556-0.24097v-0.875l-0.96897-0.24267c-0.0588-0.22061-0.14612-0.43261-0.25977-0.63062l0.5127-0.85449-0.61865-0.61865-0.85449 0.5127c-0.19838-0.11497-0.41096-0.20345-0.63233-0.26318l-0.24097-0.96556zm0.4375 1.75c0.05819 1.7e-5 0.11639 0.0026 0.17432 0.0087 0.05793 0.0053 0.11553 0.01426 0.1726 0.02564 0.05766 0.0119 0.11472 0.02678 0.1709 0.04445 0.05565 0.01724 0.11041 0.03719 0.16406 0.05985 0.05364 0.0224 0.10609 0.04751 0.15722 0.07516 0.0511 0.02826 0.1007 0.05906 0.14869 0.09229 0.04847 0.03299 0.09523 0.06834 0.14013 0.10595 0.04471 0.03771 0.0875 0.07761 0.12818 0.11963 0.04025 0.04139 0.07849 0.0847 0.1145 0.12988 0.03657 0.04611 0.07079 0.09401 0.10253 0.14355 0.03159 0.04917 0.06064 0.09998 0.08715 0.1521 0.02599 0.0518 0.04935 0.10482 0.07009 0.15894 0.02161 0.05425 0.04042 0.1096 0.05644 0.16577 0.0154 0.05626 0.02791 0.11335 0.03763 0.1709 0.0097 0.05775 0.01654 0.1159 0.02047 0.17431 0.0035 0.04095 0.0053 0.08199 0.0053 0.12302-1.8e-5 0.05819-0.0026 0.11639-0.0087 0.17432-0.0053 0.05793-0.01426 0.11553-0.02564 0.1726-0.0119 0.05766-0.02678 0.11472-0.04445 0.1709-0.01724 0.05565-0.03719 0.11041-0.05985 0.16406-0.0224 0.05364-0.04751 0.10609-0.07516 0.15722-0.02826 0.0511-0.05906 0.1007-0.09229 0.14869-0.03299 0.04847-0.06834 0.09523-0.10596 0.14013-0.03771 0.04471-0.07761 0.0875-0.11963 0.12818-0.04139 0.04025-0.0847 0.07849-0.12988 0.1145-0.04611 0.03657-0.09401 0.07079-0.14356 0.10253-0.04917 0.03159-0.09997 0.06064-0.15209 0.08715-0.0518 0.02599-0.10482 0.04935-0.15894 0.07009-0.05425 0.02153-0.10961 0.04034-0.16578 0.05635-0.05626 0.0154-0.11334 0.02791-0.1709 0.03763-0.05775 0.0097-0.1159 0.01654-0.17432 0.02048-0.02441 0.0035-0.04891 0.0061-0.0735 0.0087h-0.11963c-0.03482-0.0018-0.06956-0.0044-0.10425-0.0087-0.05793-0.0053-0.11554-0.01426-0.17261-0.02564-0.05766-0.0119-0.11471-0.02678-0.1709-0.04445-0.05565-0.01724-0.11041-0.03719-0.16406-0.05985-0.05364-0.0224-0.1061-0.04751-0.15723-0.07516-0.0511-0.02826-0.10069-0.05906-0.14868-0.09228-0.04847-0.03299-0.09523-0.06834-0.14014-0.10596-0.02634-0.02319-0.05198-0.04708-0.07691-0.07175l-0.07691-0.07691c-0.03089-0.03246-0.06055-0.06606-0.08887-0.10083-0.03658-0.04611-0.07079-0.09401-0.10254-0.14356-0.03159-0.04917-0.06064-0.09997-0.08715-0.15209-0.02599-0.0518-0.04935-0.10482-0.07009-0.15894-0.02161-0.05425-0.04043-0.10961-0.05644-0.16578-0.0154-0.05626-0.02791-0.11334-0.03763-0.1709-0.0097-0.05775-0.01654-0.1159-0.02047-0.17432-0.0035-0.04095-0.0053-0.08199-0.0053-0.12304 1.8e-5 -0.05819 0.0026-0.11639 0.0088-0.17432 0.0053-0.05793 0.01426-0.11554 0.02564-0.17261 0.0119-0.05766 0.02678-0.11471 0.04445-0.1709 0.01724-0.05565 0.03719-0.11041 0.05985-0.16406 0.0224-0.05364 0.04751-0.1061 0.07516-0.15723 0.02826-0.0511 0.05906-0.10069 0.09229-0.14868 0.03299-0.04847 0.06834-0.09523 0.10596-0.14014 0.03771-0.04471 0.07761-0.0875 0.11963-0.12817 0.04139-0.04025 0.0847-0.07849 0.12988-0.1145 0.04611-0.03658 0.09401-0.07079 0.14356-0.10254 0.04917-0.03159 0.09997-0.06064 0.15209-0.08715 0.0518-0.02599 0.10482-0.04935 0.15894-0.07009 0.05425-0.02153 0.10961-0.04043 0.16578-0.05644 0.05626-0.0154 0.11334-0.02791 0.1709-0.03763 0.05775-0.0097 0.1159-0.01654 0.17432-0.02047 0.04086-0.0044 0.0819-7e-3 0.12304-0.0088z" fill="currentColor"/>
- <rect class="ColorScheme-Text" x="8" y="17.5" width="6" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
-</svg>
diff --git a/src/devices/32/printer.svg b/src/devices/32/printer.svg
index dfec92d5..b93ee69c 100644
--- a/src/devices/32/printer.svg
+++ b/src/devices/32/printer.svg
@@ -1,36 +1,6 @@
 <svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#363636;
-      }
-      .ColorScheme-Background{
-        color:#EFF0F1;
-      }
-      .ColorScheme-Highlight{
-        color:#3DAEE6;
-      }
-      .ColorScheme-ViewText {
-        color:#7B7C7E;
-      }
-      .ColorScheme-ViewBackground{
-        color:#FCFCFC;
-      }
-      .ColorScheme-ViewHover {
-        color:#3DAEE6;
-      }
-      .ColorScheme-ViewFocus{
-        color:#1E92FF;
-      }
-      .ColorScheme-ButtonText {
-        color:#7B7C7E;
-      }
-      .ColorScheme-ButtonBackground{
-        color:#EFF0F1;
-      }
-      .ColorScheme-ButtonHover {
-        color:#3DAEE6;
-      }
-      .ColorScheme-ButtonFocus{
-        color:#1E92FF;
       }</style>
  <path class="ColorScheme-Text" d="m11 4c-1.385 0-2.5 1.115-2.5 2.5v2h-1c-1.939 0-3.5 1.561-3.5 3.5v9.5c0 1.939 1.561 3.5 3.5 3.5h1v1.5c0 1.385 1.115 2.5 2.5 2.5h10c1.385 0 2.5-1.115 2.5-2.5v-1.5h1c1.939 0 3.5-1.561 3.5-3.5v-9.5c0-1.939-1.561-3.5-3.5-3.5h-1v-2c0-1.385-1.115-2.5-2.5-2.5zm0 1.5h10c0.554 0 1 0.446 1 1v2h-12v-2c0-0.554 0.446-1 1-1zm-3.5 4.5h17c1.108 0 2 0.892 2 2v9.5c0 1.108-0.892 2-2 2h-1v-6c0-1.385-1.115-2.5-2.5-2.5h-10c-1.385 0-2.5 1.115-2.5 2.5v6h-1c-1.108 0-2-0.892-2-2v-9.5c0-1.108 0.892-2 2-2zm15 1.5c-0.55228 0-1 0.44772-1 1s0.44772 1 1 1 1-0.44772 1-1-0.44772-1-1-1zm-11.5 5h10c0.554 0 1 0.446 1 1v9c0 0.554-0.446 1-1 1h-10c-0.554 0-1-0.446-1-1v-9c0-0.554 0.446-1 1-1z" fill="currentColor"/>
 </svg>
diff --git a/src/index.theme b/src/index.theme
index 58738f3a..03ca886f 100644
--- a/src/index.theme
+++ b/src/index.theme
@@ -26,8 +26,8 @@ FollowsColorScheme=true
 KDE-Extensions=.svg
 
 # Directory list
-Directories=actions/16,actions/22,actions/24,actions/32,actions/symbolic,animations/16,animations/22,animations/24,apps/22,apps/32,apps/scalable,apps/symbolic,categories/22,categories/32,categories/symbolic,places/symbolic,places/scalable,places/16,places/22,places/24,mimes/16,mimes/22,mimes/scalable,mimes/symbolic,devices/16,devices/22,devices/24,devices/32,devices/scalable,devices/symbolic,emotes/22,emblems/16,emblems/22,emblems/24,emblems/symbolic,status/16,status/22,status/24,status/32,status/symbolic,preferences/32
-ScaledDirectories=actions@2x/16,actions@2x/22,actions@2x/24,actions@2x/32,actions@2x/symbolic,animations@2x/16,animations@2x/22,animations@2x/24,apps@2x/22,apps@2x/32,apps@2x/scalable,apps@2x/symbolic,categories@2x/22,categories@2x/32,categories@2x/symbolic,places@2x/symbolic,places@2x/scalable,places@2x/16,places@2x/22,places@2x/24,mimes@2x/16,mimes@2x/22,mimes@2x/scalable,mimes@2x/symbolic,devices@2x/16,devices@2x/22,devices@2x/24,devices@2x/32,devices@2x/scalable,devices@2x/symbolic,emotes@2x/22,emblems@2x/16,emblems@2x/22,emblems@2x/24,emblems@2x/symbolic,status@2x/16,status@2x/22,status@2x/24,status@2x/32,status@2x/symbolic,preferences@2x/32
+Directories=actions/16,actions/22,actions/24,actions/32,actions/symbolic,animations/16,animations/22,animations/24,apps/16,apps/22,apps/32,apps/scalable,apps/symbolic,categories/22,categories/32,categories/symbolic,places/symbolic,places/scalable,places/16,places/22,places/24,mimes/16,mimes/22,mimes/scalable,mimes/symbolic,devices/16,devices/22,devices/24,devices/32,devices/scalable,devices/symbolic,emotes/22,emblems/16,emblems/22,emblems/24,emblems/symbolic,status/16,status/22,status/24,status/32,status/symbolic,preferences/32
+ScaledDirectories=actions@2x/16,actions@2x/22,actions@2x/24,actions@2x/32,actions@2x/symbolic,animations@2x/16,animations@2x/22,animations@2x/24,apps@2x/16,apps@2x/22,apps@2x/32,apps@2x/scalable,apps@2x/symbolic,categories@2x/22,categories@2x/32,categories@2x/symbolic,places@2x/symbolic,places@2x/scalable,places@2x/16,places@2x/22,places@2x/24,mimes@2x/16,mimes@2x/22,mimes@2x/scalable,mimes@2x/symbolic,devices@2x/16,devices@2x/22,devices@2x/24,devices@2x/32,devices@2x/scalable,devices@2x/symbolic,emotes@2x/22,emblems@2x/16,emblems@2x/22,emblems@2x/24,emblems@2x/symbolic,status@2x/16,status@2x/22,status@2x/24,status@2x/32,status@2x/symbolic,preferences@2x/32
 
 [actions/16]
 Size=16
@@ -80,6 +80,11 @@ MinSize=32
 MaxSize=256
 Type=Scalable
 
+[apps/16]
+Size=16
+Context=Applications
+Type=Fixed
+
 [apps/22]
 Size=22
 Context=Applications
@@ -360,6 +365,12 @@ MinSize=16
 MaxSize=512
 Type=Scalable
 
+[apps@2x/16]
+Size=16
+Scale=2
+Context=Applications
+Type=Fixed
+
 [categories@2x/22]
 Size=22
 Scale=2
diff --git a/src/status/16/kdeconnect-tray.svg b/src/status/16/kdeconnect-tray.svg
index fd6f295e..dfa9c4f3 100644
--- a/src/status/16/kdeconnect-tray.svg
+++ b/src/status/16/kdeconnect-tray.svg
@@ -1,13 +1,8 @@
-<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:#f2f2f2;
-      }
-      </style>
-  </defs>
-    <path
-       style="fill:currentColor;fill-opacity:1;stroke:none" 
-       d="M 4 2 L 4 14 L 6 14 L 6 13 L 6 12 L 5 12 L 5 5 L 11 5 L 11 6 L 12 6 L 12 2 L 4 2 z M 7 3 L 9 3 L 9 4 L 7 4 L 7 3 z M 9.5 6 L 9.2226562 7.1074219 C 8.9705339 7.1746178 8.728255 7.2744183 8.5019531 7.4042969 L 7.5253906 6.8183594 L 6.8183594 7.5253906 L 7.4042969 8.5019531 C 7.2729063 8.7286688 7.1717853 8.9716217 7.1035156 9.2246094 L 6 9.5 L 6 10.5 L 7.1074219 10.777344 C 7.1746179 11.029466 7.2744183 11.271745 7.4042969 11.498047 L 6.8183594 12.474609 L 7.5253906 13.181641 L 8.5019531 12.595703 C 8.7286688 12.727094 8.9716218 12.828214 9.2246094 12.896484 L 9.5 14 L 10.5 14 L 10.777344 12.892578 C 11.029466 12.825378 11.271745 12.725582 11.498047 12.595703 L 12.474609 13.181641 L 13.181641 12.474609 L 12.595703 11.498047 C 12.727094 11.271331 12.828214 11.028379 12.896484 10.775391 L 14 10.5 L 14 9.5 L 12.892578 9.2226562 C 12.825382 8.9705339 12.725582 8.728255 12.595703 8.5019531 L 13.181641 7.5253906 L 12.474609 6.8183594 L 11.498047 7.4042969 C 11.271331 7.2729063 11.028379 7.1717853 10.775391 7.1035156 L 10.5 6 L 9.5 6 z M 10 8 A 2 2 0 0 1 12 10 A 2 2 0 0 1 10 12 A 2 2 0 0 1 8 10 A 2 2 0 0 1 10 8 z "
-       class="ColorScheme-Text"/>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#f2f2f2; } .ColorScheme-Highlight { color:#5294e2; }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m5 0c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h6c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-6zm0 1h1c0 0.554 0.446 1 1 1h2c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-6c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+ <rect class="ColorScheme-Text" x="6" y="13.5" width="4" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
+ <path class="ColorScheme-Text" d="m6.6501 5a0.33375 0.33373 0 1 0 0.01725 0zm2.3505 0-0.6675 0.66671 1.3342 1.3334-1.3335 1.3334 0.66675 0.66596 1.3335-1.3327 0.666-0.66746-0.666-0.66596zm-3.3338 2.0001a0.66675 0.66671 0 1 0 0 1.3334 0.66675 0.66671 0 0 0 0-1.3334m1.6672 1.9994a1.0005 1.0004 0 1 0 0 2.0001 1.0005 1.0004 0 0 0 0-2.0001" fill="currentColor"/>
 </svg>