diff --git a/links/actions/symbolic/funnel-outline-symbolic.svg b/links/actions/symbolic/funnel-outline-symbolic.svg
new file mode 120000
index 00000000..a14a1662
--- /dev/null
+++ b/links/actions/symbolic/funnel-outline-symbolic.svg
@@ -0,0 +1 @@
+funnel-symbolic.svg
\ No newline at end of file
diff --git a/links/actions/symbolic/nautilus-file-chooser-options-symbolic.svg b/links/actions/symbolic/nautilus-file-chooser-options-symbolic.svg
new file mode 120000
index 00000000..73796e4c
--- /dev/null
+++ b/links/actions/symbolic/nautilus-file-chooser-options-symbolic.svg
@@ -0,0 +1 @@
+nautilus-search-filters-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/org.gnome.Settings-accessibility-hearing-symbolic.svg b/links/apps/symbolic/org.gnome.Settings-accessibility-hearing-symbolic.svg
new file mode 120000
index 00000000..64f16239
--- /dev/null
+++ b/links/apps/symbolic/org.gnome.Settings-accessibility-hearing-symbolic.svg
@@ -0,0 +1 @@
+hearing-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/org.gnome.Settings-accessibility-seeing-symbolic.svg b/links/apps/symbolic/org.gnome.Settings-accessibility-seeing-symbolic.svg
new file mode 120000
index 00000000..101c597a
--- /dev/null
+++ b/links/apps/symbolic/org.gnome.Settings-accessibility-seeing-symbolic.svg
@@ -0,0 +1 @@
+seeing-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/org.gnome.Settings-accessibility-typing-symbolic.svg b/links/apps/symbolic/org.gnome.Settings-accessibility-typing-symbolic.svg
new file mode 120000
index 00000000..9114063b
--- /dev/null
+++ b/links/apps/symbolic/org.gnome.Settings-accessibility-typing-symbolic.svg
@@ -0,0 +1 @@
+preferences-desktop-keyboard-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/org.gnome.Settings-camera-access-symbolic.svg b/links/apps/symbolic/org.gnome.Settings-camera-access-symbolic.svg
new file mode 120000
index 00000000..98d7bc4e
--- /dev/null
+++ b/links/apps/symbolic/org.gnome.Settings-camera-access-symbolic.svg
@@ -0,0 +1 @@
+camera-app-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/org.gnome.Settings-microphone-access-symbolic.svg b/links/apps/symbolic/org.gnome.Settings-microphone-access-symbolic.svg
new file mode 120000
index 00000000..c8c9ddc6
--- /dev/null
+++ b/links/apps/symbolic/org.gnome.Settings-microphone-access-symbolic.svg
@@ -0,0 +1 @@
+org.gnome.Settings-microphone-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/org.gnome.Settings-secure-shell-symbolic.svg b/links/apps/symbolic/org.gnome.Settings-secure-shell-symbolic.svg
new file mode 120000
index 00000000..a58bcde5
--- /dev/null
+++ b/links/apps/symbolic/org.gnome.Settings-secure-shell-symbolic.svg
@@ -0,0 +1 @@
+utilities-terminal-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/org.gnome.Settings-symbolic.Source.svg b/links/apps/symbolic/org.gnome.Settings-symbolic.Source.svg
new file mode 120000
index 00000000..41107bcb
--- /dev/null
+++ b/links/apps/symbolic/org.gnome.Settings-symbolic.Source.svg
@@ -0,0 +1 @@
+preferences-bluetooth-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/org.gnome.Settings-thunderbolt-access-symbolic.svg b/links/apps/symbolic/org.gnome.Settings-thunderbolt-access-symbolic.svg
new file mode 120000
index 00000000..855c6477
--- /dev/null
+++ b/links/apps/symbolic/org.gnome.Settings-thunderbolt-access-symbolic.svg
@@ -0,0 +1 @@
+org.gnome.Settings-thunderbolt-symbolic.svg
\ No newline at end of file
diff --git a/links/apps/symbolic/preferences-system-bluetooth-symbolic.svg b/links/apps/symbolic/preferences-system-bluetooth-symbolic.svg
new file mode 120000
index 00000000..41107bcb
--- /dev/null
+++ b/links/apps/symbolic/preferences-system-bluetooth-symbolic.svg
@@ -0,0 +1 @@
+preferences-bluetooth-symbolic.svg
\ No newline at end of file
diff --git a/links/status/16/battery-caution-charging.svg b/links/status/16/battery-caution-charging.svg
new file mode 120000
index 00000000..9fe8cd6d
--- /dev/null
+++ b/links/status/16/battery-caution-charging.svg
@@ -0,0 +1 @@
+battery-010-charging.svg
\ No newline at end of file
diff --git a/links/status/16/battery-caution.svg b/links/status/16/battery-caution.svg
new file mode 120000
index 00000000..d85bda41
--- /dev/null
+++ b/links/status/16/battery-caution.svg
@@ -0,0 +1 @@
+battery-010.svg
\ No newline at end of file
diff --git a/src/actions/symbolic/emblem-readonly-symbolic.svg b/src/actions/symbolic/emblem-readonly-symbolic.svg
new file mode 100644
index 00000000..09de922d
--- /dev/null
+++ b/src/actions/symbolic/emblem-readonly-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.9883 0c-1.6555 0-2.9883 1.3328-2.9883 2.9883v10.023c0 1.6555 1.3328 2.9883 2.9883 2.9883h10.023c1.6555 0 2.9883-1.3328 2.9883-2.9883v-10.023c0-1.6555-1.3328-2.9883-2.9883-2.9883h-10.023zm5.0117 3c1.662 0 3 1.338 3 3v1h0.033203c0.53585 0 0.9668 0.43096 0.9668 0.9668v3.0664c0 0.53585-0.43096 0.9668-0.9668 0.9668h-6.0664c-0.53585 0-0.9668-0.43096-0.9668-0.9668v-3.0664c0-0.53585 0.43096-0.9668 0.9668-0.9668h0.033203v-1c0-1.662 1.338-3 3-3zm0 1c-1.108 0-2 0.892-2 2v1h4v-1c0-1.108-0.892-2-2-2zm-3 4v3h6v-3h-6z" fill="#363636"/>
+</svg>
diff --git a/src/actions/symbolic/emblem-symbolic-link-symbolic.svg b/src/actions/symbolic/emblem-symbolic-link-symbolic.svg
new file mode 100644
index 00000000..d99ac19c
--- /dev/null
+++ b/src/actions/symbolic/emblem-symbolic-link-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.9883 0c-1.6555 0-2.9883 1.3328-2.9883 2.9883v10.023c0 1.6555 1.3328 2.9883 2.9883 2.9883h10.023c1.6555 0 2.9883-1.3328 2.9883-2.9883v-10.023c0-1.6555-1.3328-2.9883-2.9883-2.9883h-10.023zm3.5117 3h6c0.277 0 0.5 0.223 0.5 0.5v6c0 0.277-0.223 0.5-0.5 0.5s-0.5-0.223-0.5-0.5v-4.793l-8.1465 8.1465c-0.19587 0.19587-0.51116 0.19587-0.70703 0-0.19587-0.19587-0.19587-0.51116 0-0.70703l8.1465-8.1465h-4.793c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" fill="#363636"/>
+</svg>
diff --git a/src/actions/symbolic/emblem-unwriteable-symbolic.svg b/src/actions/symbolic/emblem-unwriteable-symbolic.svg
new file mode 100644
index 00000000..b60db59d
--- /dev/null
+++ b/src/actions/symbolic/emblem-unwriteable-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.9883 0c-1.6555 0-2.9883 1.3328-2.9883 2.9883v10.023c0 1.6555 1.3328 2.9883 2.9883 2.9883h10.023c1.6555 0 2.9883-1.3328 2.9883-2.9883v-10.023c0-1.6555-1.3328-2.9883-2.9883-2.9883h-10.023zm1.0117 3.5a0.5 0.5 0 0 1 0.35352 0.14648l3.6465 3.6465 3.6465-3.6465a0.5 0.5 0 0 1 0.35352-0.14648 0.5 0.5 0 0 1 0.35352 0.14648 0.5 0.5 0 0 1 0 0.70703l-3.6465 3.6465 3.6465 3.6465a0.5 0.5 0 0 1 0 0.70703 0.5 0.5 0 0 1-0.70703 0l-3.6465-3.6465-3.6465 3.6465a0.5 0.5 0 0 1-0.70703 0 0.5 0.5 0 0 1 0-0.70703l3.6465-3.6465-3.6465-3.6465a0.5 0.5 0 0 1 0-0.70703 0.5 0.5 0 0 1 0.35352-0.14648z" fill="#363636"/>
+</svg>
diff --git a/src/actions/symbolic/list-high-priority-symbolic.svg b/src/actions/symbolic/list-high-priority-symbolic.svg
new file mode 100644
index 00000000..6a60d322
--- /dev/null
+++ b/src/actions/symbolic/list-high-priority-symbolic.svg
@@ -0,0 +1,7 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <rect y="2" width="8" height="1" rx="0" ry="0" fill="#363636" opacity=".35" style="paint-order:stroke fill markers"/>
+ <rect y="6" width="8" height="1" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
+ <rect y="10" width="8" height="1" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
+ <rect y="14" width="8" height="1" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
+ <path d="m10 2v0.50586 0.49414 0.50781 4.4922h1v-4.3359a5.25 5.25 0 0 1 4 5.0859 5.25 5.25 0 0 1-5 5.2305v1.002a6.25 6.25 0 0 0 6-6.2324 6.25 6.25 0 0 0-3.8203-5.75h3.8203v-1h-5-1z" fill="#363636" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/actions/symbolic/mouse-test-click-symbolic.svg b/src/actions/symbolic/mouse-test-click-symbolic.svg
new file mode 100644
index 00000000..d6bda3df
--- /dev/null
+++ b/src/actions/symbolic/mouse-test-click-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.9863 0.16992c-0.080564 0.0021761-0.16136 0.023125-0.23633 0.066406-0.23989 0.1385-0.32209 0.4437-0.18359 0.68359l1 1.7324c0.1385 0.23989 0.4437 0.32014 0.68359 0.18164 0.23989-0.1385 0.32209-0.44175 0.18359-0.68164l-1-1.7324c-0.095219-0.16492-0.27003-0.25479-0.44727-0.25zm4.9785 0c-0.15998 0.011184-0.31188 0.10007-0.39844 0.25l-1 1.7324c-0.1385 0.23989-0.056295 0.54314 0.18359 0.68164 0.23989 0.1385 0.54509 0.058248 0.68359-0.18164l1-1.7324c0.1385-0.23989 0.056295-0.54509-0.18359-0.68359-0.089958-0.051937-0.18917-0.073116-0.28516-0.066406zm-7.4648 4.3301c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-2zm8 0c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-2zm-1.5273 1.502c-0.036102 0.00128-0.073242 0.0043857-0.10938 0.0097657-0.09375 0.011719-0.1875 0.035156-0.27344 0.074219-0.35937 0.16406-0.58984 0.51953-0.58984 0.91406v6c0 0.40625 0.24219 0.76953 0.61719 0.92188 0.375 0.15625 0.80469 0.07031 1.0898-0.21484l1.1309-1.1875 1.0742 1.6992c0.3624 0.62769 0.6543 0.92188 1.1191 0.625 0.46875-0.29297-0.02286-0.84122-0.36133-1.375l-0.91797-1.4688h1.748c0.41406 0 0.78906-0.25781 0.93359-0.64453 0.14844-0.39062 0.04297-0.82812-0.26953-1.1055l-4.5-4c-0.19141-0.16748-0.43869-0.25702-0.69141-0.24805zm0.03125 0.99805h0.0058594c-0.00866 0.00129-0.0063662-1.938e-4 -0.0039062 0.0019531l4.4941 3.9961v0.001953h-0.001953l-2.8047 0.0625-0.0078125 0.015625-1.6836 1.9199h-0.0019531v-5.9961h0.0039062v-0.0019531zm-2.9902 0.097656c-0.17724-0.0047874-0.35205 0.085076-0.44727 0.25l-1 1.7324c-0.1385 0.23989-0.056295 0.54509 0.18359 0.68359 0.23989 0.1385 0.54509 0.056295 0.68359-0.18359l1-1.7324c0.1385-0.23989 0.056295-0.54314-0.18359-0.68164-0.074965-0.043281-0.15576-0.066183-0.23633-0.068359z" fill="#363636"/>
+</svg>
diff --git a/src/actions/symbolic/mouse-test-scroll-symbolic.svg b/src/actions/symbolic/mouse-test-scroll-symbolic.svg
new file mode 100644
index 00000000..9edfca84
--- /dev/null
+++ b/src/actions/symbolic/mouse-test-scroll-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m4 0c-2.216 0-4 1.784-4 4v8c0 2.216 1.784 4 4 4h3v-1h-3c-1.662 0-3-1.338-3-3v-8c0-1.662 1.338-3 3-3h3v-1h-3zm8 0.20703c-0.12781 0-0.25558 0.04855-0.35352 0.14648l-3.5352 3.5352c-0.19587 0.19587-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l2.6816-2.6816v10.379l-2.6816-2.6816c-0.19587-0.19587-0.51116-0.19587-0.70703 0-0.19587 0.19587-0.19587 0.51116 0 0.70703l3.5352 3.5352c0.097935 0.097935 0.22571 0.14648 0.35352 0.14648s0.25558-0.048549 0.35352-0.14648l3.5352-3.5352c0.19587-0.19587 0.19587-0.51116 0-0.70703-0.19587-0.19587-0.51116-0.19587-0.70703 0l-2.6816 2.6816v-10.379l2.6816 2.6816c0.19587 0.19587 0.51116 0.19587 0.70703 0 0.19587-0.19587 0.19587-0.51116 0-0.70703l-3.5352-3.5352c-0.097934-0.097934-0.22571-0.14648-0.35352-0.14648zm-6 2.793v5h1v-5h-1z" fill="#363636" stroke-linecap="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/actions/symbolic/system-update-symbolic.svg b/src/actions/symbolic/system-update-symbolic.svg
new file mode 100644
index 00000000..a63c7340
--- /dev/null
+++ b/src/actions/symbolic/system-update-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m14 1v3.4375a7 7 0 0 0-5.834-3.4355 7 7 0 0 0-1.9785 0.23633 7 7 0 0 0-5.1035 5.7617h1.0254a6 6 0 0 1 4.3379-4.7949 6 6 0 0 1 6.7129 2.7949h-3.1602v1h4 0.69727 0.30273v-1-4h-1zm-0.10938 8a6 6 0 0 1-4.3379 4.7949 6 6 0 0 1-6.7129-2.7949h3.1602v-1h-4-0.69727-0.30273v1 4h1v-3.4375a7 7 0 0 0 7.8125 3.1992 7 7 0 0 0 5.1035-5.7617h-1.0254z" fill="#363636" stroke-linecap="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/apps/symbolic/camera-app-symbolic.svg b/src/apps/symbolic/camera-app-symbolic.svg
index 02eb1f76..301b17fe 100644
--- a/src/apps/symbolic/camera-app-symbolic.svg
+++ b/src/apps/symbolic/camera-app-symbolic.svg
@@ -1,3 +1,4 @@
 <svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m3 1v1h0.994c-1.258 0.015-2.179-0.03-2.931 0.385a1.88 1.88 0 0 0-0.838 0.998c-0.165 0.439-0.225 0.96-0.225 1.617v6c0 0.658 0.06 1.179 0.225 1.617 0.164 0.439 0.461 0.79 0.838 0.998 0.752 0.416 1.673 0.37 2.931 0.385h8.012c1.258-0.014 2.179 0.03 2.932-0.385a1.88 1.88 0 0 0 0.838-0.998c0.164-0.438 0.224-0.96 0.224-1.617v-6c0-0.658-0.06-1.178-0.225-1.617a1.88 1.88 0 0 0-0.837-0.998c-0.753-0.416-1.674-0.37-2.932-0.385h-7.006v-1zm1 2h8c1.259 0.015 2.087 0.06 2.453 0.262 0.184 0.101 0.29 0.213 0.387 0.472 0.097 0.26 0.16 0.674 0.16 1.266v6c0 0.592-0.063 1.006-0.16 1.266-0.098 0.26-0.203 0.371-0.387 0.472-0.366 0.202-1.194 0.247-2.453 0.262h-8c-1.259-0.015-2.09-0.06-2.455-0.262-0.183-0.1-0.287-0.212-0.385-0.472-0.097-0.26-0.16-0.674-0.16-1.266v-6c0-0.592 0.063-1.006 0.16-1.266 0.098-0.26 0.202-0.371 0.385-0.472 0.366-0.202 1.195-0.247 2.455-0.262zm4 1a4 4 0 0 0-4 4 4 4 0 0 0 4 4 4 4 0 0 0 4-4 4 4 0 0 0-4-4zm5.5 0a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5 0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5zm-5.5 1a3 3 0 0 1 3 3 3 3 0 0 1-3 3 3 3 0 0 1-3-3 3 3 0 0 1 3-3zm-0.084 1.004a2 2 0 0 0-1.916 1.996 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-1.9-1.994 1 1 0 0 1 0.9 0.994 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 0.916-0.996z" color="#000000" fill="#363636" font-family="sans-serif" font-weight="400" overflow="visible" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+ <path d="m6 1-2 2h-1c-1.108 0-2 0.89201-2 2v7c0 1.108 0.89201 2 2 2h10c1.108 0 2-0.89201 2-2v-7c0-1.108-0.89201-2-2-2h-1l-2-2zm0.41406 1h3.1719l2 2h1.414c0.55399 0 1 0.446 1 1v7c0 0.55399-0.44601 1-1 1h-10c-0.554 0-1-0.44601-1-1v-7c0-0.554 0.446-1 1-1h1.414z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+ <path d="m8 5a3 3 0 0 0-3 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2 2 2 0 0 1 2-2z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:stroke fill markers"/>
 </svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-accessibility-pointing-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-accessibility-pointing-symbolic.svg
new file mode 100644
index 00000000..743e2081
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-accessibility-pointing-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3 1c-1.662 0-3 1.338-3 3v7c0 1.662 1.338 3 3 3h3v-1h-3c-1.108 0-2-0.892-2-2v-7c0-1.108 0.892-2 2-2h9c1.108 0 2 0.892 2 2v3h1v-3c0-1.662-1.338-3-3-3h-9z" fill="#363636" stroke-linecap="round" stroke-width="2" style="paint-order:stroke fill markers"/>
+ <path d="m7.0332 6.002a1.0001 1.0001 0 0 0-0.96875 1.3496l3 8a1.0001 1.0001 0 0 0 1.8535 0.044922l1.3691-3.1641 3.1016-1.3105a1.0001 1.0001 0 0 0-0.03711-1.8574l-8-3a1.0001 1.0001 0 0 0-0.31836-0.0625zm-0.033203 0.99805 8 3-3.4707 1.4668-1.5293 3.5332-3-8z" color="#000000" fill="#363636" stroke-linecap="round" stroke-linejoin="round" style="-inkscape-stroke:none;paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-accessibility-zoom-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-accessibility-zoom-symbolic.svg
new file mode 100644
index 00000000..a2bdf00a
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-accessibility-zoom-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path class="ColorScheme-Text" d="m6.5 1c3.0376 0 5.5 2.4624 5.5 5.5 0 1.3388-0.4783 2.5659-1.2734 3.5196l4.127 4.1268c0.1952 0.1953 0.1952 0.5119 0 0.7072-0.1736 0.1735-0.443 0.1928-0.6379 0.0578l-0.0693-0.0578-4.1268-4.127c-0.9537 0.7951-2.1808 1.2734-3.5196 1.2734-3.0376 0-5.5-2.4624-5.5-5.5s2.4624-5.5 5.5-5.5zm0 1c-2.4853 0-4.5 2.0147-4.5 4.5s2.0147 4.5 4.5 4.5 4.5-2.0147 4.5-4.5-2.0147-4.5-4.5-4.5z" color="#363636" fill="currentColor"/>
+ <path d="m6.5 4c-0.277 0-0.5 0.223-0.5 0.5v1.5h-1.5c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h1.5v1.5c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-1.5h1.5c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-1.5v-1.5c0-0.277-0.223-0.5-0.5-0.5z" fill="#363636" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-desktop-sharing-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-desktop-sharing-symbolic.svg
new file mode 100644
index 00000000..8cb56a63
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-desktop-sharing-symbolic.svg
@@ -0,0 +1,5 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9.5 5c-0.27734 0-0.5 0.22266-0.5 0.5s0.22266 0.5 0.5 0.5h1.793l-3.1484 3.1445c-0.19141 0.19531-0.19141 0.51562 0 0.71094 0.19531 0.19141 0.51562 0.19141 0.71094 0l3.1445-3.1484v1.793c0 0.27734 0.22266 0.5 0.5 0.5s0.5-0.22266 0.5-0.5v-3.5z" fill="#363636"/>
+ <path d="m4.5 14h7c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-7c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" fill="#363636"/>
+ <path d="m2 2c-1.108 0-2 0.892-2 2v7c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-7c0-1.108-0.892-2-2-2zm0 1h12c0.554 0 1 0.446 1 1v7c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-7c0-0.554 0.446-1 1-1z" fill="#363636"/>
+</svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-device-diagnostics-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-device-diagnostics-symbolic.svg
new file mode 100644
index 00000000..552777a9
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-device-diagnostics-symbolic.svg
@@ -0,0 +1,5 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8.4844 4c-0.21094 0.007812-0.39453 0.14453-0.45703 0.34375l-1.5273 4.5742-0.52734-1.5742c-0.066406-0.20703-0.25781-0.34375-0.47266-0.34375h-4.5v1h4.1406l0.88672 2.6562c0.066406 0.20703 0.25781 0.34375 0.47266 0.34375s0.40625-0.13672 0.47266-0.34375l1.5703-4.6992 1.4922 3.7305c0.07422 0.1875 0.25391 0.30859 0.45703 0.3125 0.20312 0.0039 0.38672-0.11719 0.46484-0.30078l0.73047-1.6992h3.3125v-1h-3.6406c-0.19922 0-0.37891 0.12109-0.45703 0.30078l-0.38672 0.89453-1.5508-3.8828c-0.078125-0.19531-0.26953-0.32031-0.48047-0.3125z" fill="#363636"/>
+ <path d="m4.5 14h7c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-7c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" fill="#363636"/>
+ <path d="m2 2c-1.108 0-2 0.892-2 2v7c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-7c0-1.108-0.892-2-2-2zm0 1h12c0.554 0 1 0.446 1 1v7c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-7c0-0.554 0.446-1 1-1z" fill="#363636"/>
+</svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-device-security-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-device-security-symbolic.svg
new file mode 100644
index 00000000..c5b490dd
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-device-security-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.5 0c-1.3672 0-2.5 1.1328-2.5 2.5v6c0 1.8945 0.94922 3.668 2.5234 4.7188l3.9219 2.6133c0.33594 0.22266 0.77344 0.22266 1.1094 0l3.9219-2.6133c1.5742-1.0508 2.5234-2.8242 2.5234-4.7188v-6c0-1.3672-1.1328-2.5-2.5-2.5zm0 1h9c0.8148 0 1.5 0.68519 1.5 1.5v6c0 1.5605-0.78165 3.0213-2.0781 3.8867l-3.9199 2.6113c-0.00268 0.0018-0.00123 0.0018-0.00391 0l-3.9199-2.6113c-1.2965-0.86539-2.0781-2.3262-2.0781-3.8867v-6c0-0.81481 0.68519-1.5 1.5-1.5z" fill="#363636"/>
+ <path d="m8 4a2 2 0 0 0-2 2 2 2 0 0 0 1 1.7266v2.2734c0 0.554 0.446 1 1 1s1-0.446 1-1v-2.2734a2 2 0 0 0 1-1.7266 2 2 0 0 0-2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-location-access-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-location-access-symbolic.svg
new file mode 100644
index 00000000..ab6fe5de
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-location-access-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8 0c-3.8555 0-7 3.1484-7 7 0 0.875 0.16406 1.7148 0.45703 2.4844 0.13672 0.39062 0.32813 0.76953 0.55859 1.1484 0.058594 0.09375 0.11328 0.18359 0.17188 0.27344h0.0039062c0.73047 1.1094 1.9961 2.2539 3.1172 3.2109 1.1211 0.95703 2.0938 1.6836 2.0938 1.6836 0.17578 0.13281 0.38623 0.19922 0.59766 0.19922s0.42188-0.066406 0.59766-0.19922c1e-7 0 0.97265-0.72656 2.0937-1.6836 1.1211-0.95703 2.3867-2.1016 3.1172-3.2109h0.003906c0.058594-0.089844 0.11328-0.17969 0.17188-0.27344 0.23047-0.3789 0.42188-0.75781 0.55859-1.1484 0.29297-0.76953 0.45703-1.6094 0.45703-2.4844 0-3.8516-3.1445-7-7-7zm0 1c3.311 0 6 2.6927 6 6 0 0.75-0.13958 1.4695-0.39062 2.1289-0.0034 0.008419-0.006666 0.016881-0.009766 0.025391-0.10605 0.303-0.26166 0.61721-0.46289 0.94922-0.0018 0.0029-0.002107 0.005012-0.003907 0.007812l-0.001953 0.001953c-0.057644 0.092365-0.10779 0.16968-0.15234 0.23828-2e-3 0.0013-0.00396 0.002607-0.00586 0.003907-0.61243 0.93011-1.8254 2.0592-2.9297 3.002-1.0939 0.93385-2.043 1.6426-2.043 1.6426s-0.94902-0.70872-2.043-1.6426c-1.1043-0.94271-2.3173-2.0718-2.9297-3.002-0.00195-0.0013-0.0038994-0.002607-0.0058594-0.003907-0.044553-0.068598-0.094696-0.14592-0.15234-0.23828l-0.0019531-0.001953c-0.00178-0.0028-0.0021063-0.004912-0.0039063-0.007812-0.20123-0.33201-0.35684-0.64622-0.46289-0.94922-0.0031399-0.0085075-0.0063954-0.016972-0.0097656-0.025391-0.25106-0.65944-0.39062-1.3789-0.39062-2.1289 0-3.3073 2.689-6 6-6z" fill="#363636"/>
+ <path d="m8 4a3 3 0 0 0-3 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2 2 2 0 0 1 2-2z" fill="#363636" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-network-proxy-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-network-proxy-symbolic.svg
new file mode 100644
index 00000000..910f35ce
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-network-proxy-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.5 1a2.5 2.5 0 0 0-2.4375 1.9727c-0.0042947 0.018098-0.0078605 0.036444-0.011719 0.054688a2.5 2.5 0 0 0-0.029297 0.17188c-0.013133 0.098847-0.021484 0.19866-0.021484 0.30078 0 0.10212 0.0083518 0.20193 0.021484 0.30078a2.5 2.5 0 0 0 0.029297 0.17188c0.0038583 0.018244 0.007424 0.036589 0.011719 0.054688a2.5 2.5 0 0 0 2.4375 1.9727 2.5 2.5 0 0 0 0.11523-0.0078125c0.056567 0.0030489 0.11247 0.0078125 0.16992 0.0078125h4.7148v2.5c0 1.108-0.892 2-2 2h-1.5645a2 2 0 0 0-1.9355-1.5 2 2 0 0 0-2 2 2 2 0 0 0 2 2 2 2 0 0 0 1.9336-1.5h1.5664c0.76959 0 1.47-0.28666 2-0.75977v1.3262a2 2 0 0 0-1.5 1.9336 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0-1.5-1.9355v-1.3242c0.52997 0.4731 1.2304 0.75977 2 0.75977h1.5664a2 2 0 0 0 1.9336 1.5 2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-1.9336 1.5h-1.5664c-1.108 0-2-0.892-2-2v-2.5h4.7148c1.5426 0 2.7852-1.115 2.7852-2.5s-1.2425-2.5-2.7852-2.5h-10.43c-0.042921 0-0.084517 0.0041513-0.12695 0.0058594a2.5 2.5 0 0 0-0.1582-0.0058594zm0 1a1.5 1.5 0 0 1 1.5 1.5 1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-0.24414-0.021484 1.5 1.5 0 0 1-0.025391-0.0039062 1.5 1.5 0 0 1-0.23242-0.0625 1.5 1.5 0 0 1-0.023438-0.0078125 1.5 1.5 0 0 1-0.22461-0.10547 1.5 1.5 0 0 1-0.21484-0.15039 1.5 1.5 0 0 1-0.18359-0.18359 1.5 1.5 0 0 1-0.15039-0.21484 1.5 1.5 0 0 1-0.10547-0.22461 1.5 1.5 0 0 1-0.0078125-0.023438 1.5 1.5 0 0 1-0.0625-0.23242 1.5 1.5 0 0 1-0.0039062-0.025391 1.5 1.5 0 0 1-0.021484-0.24414 1.5 1.5 0 0 1 0.021484-0.24414 1.5 1.5 0 0 1 0.0039062-0.025391 1.5 1.5 0 0 1 0.0625-0.23242 1.5 1.5 0 0 1 0.0078125-0.023438 1.5 1.5 0 0 1 0.10547-0.22461 1.5 1.5 0 0 1 0.15039-0.21484 1.5 1.5 0 0 1 0.18359-0.18359 1.5 1.5 0 0 1 0.21484-0.15039 1.5 1.5 0 0 1 0.22461-0.10547 1.5 1.5 0 0 1 0.023438-0.0078125 1.5 1.5 0 0 1 0.23242-0.0625 1.5 1.5 0 0 1 0.025391-0.0039062 1.5 1.5 0 0 1 0.24414-0.021484zm1.998 0h9.002c0.831 0 1.5 0.669 1.5 1.5s-0.669 1.5-1.5 1.5h-5-1-3.0078a2.5 2.5 0 0 0 0.50781-1.5 2.5 2.5 0 0 0-0.50195-1.5zm-2.498 8a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1zm12 0a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1zm-6 3a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1z" fill="#363636" stroke-width="0" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-trash-file-history-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-trash-file-history-symbolic.svg
new file mode 100644
index 00000000..f2e33954
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-trash-file-history-symbolic.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; }</style>
+ </defs>
+ <path d="m6 0c-0.554 0-1 0.446-1 1v1h-4.5c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h0.49805l0.54688 11.061c0.0612 1.0155 0.90615 1.9395 1.998 1.9395h7.9141c1.0919 0 1.9368-0.92391 1.998-1.9395l0.54688-11.061h0.49805c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5h-4.5v-1c0-0.554-0.446-1-1-1h-3zm0 1h3v1h-3v-1zm-4 2h11l-0.54297 11c-0.03333 0.553-0.446 1-1 1h-7.9141c-0.554 0-0.96667-0.447-1-1l-0.54297-11zm2.5 2c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5zm3 0c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5zm3 0c-0.277 0-0.5 0.223-0.5 0.5v7c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-7c0-0.277-0.223-0.5-0.5-0.5z" style="fill:currentColor" class="ColorScheme-Text"/>
+</svg>
diff --git a/src/apps/symbolic/org.gnome.Settings-wellbeing-symbolic.svg b/src/apps/symbolic/org.gnome.Settings-wellbeing-symbolic.svg
new file mode 100644
index 00000000..d331f7e4
--- /dev/null
+++ b/src/apps/symbolic/org.gnome.Settings-wellbeing-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5 6c-2.1973 0-4 1.8027-4 4 0 1.0988 0.44935 2.1056 1.1719 2.8281 0.301 0.301 0.59732 0.46769 1.0059 0.71289 0.40854 0.2452 0.89695 0.51644 1.4141 0.79492 1.0342 0.55695 2.1826 1.1444 2.9375 1.5469a1.0001 1.0001 0 0 0 0.94141 0c0.75492-0.40245 1.9033-0.98992 2.9375-1.5469 0.51712-0.27848 1.0055-0.54972 1.4141-0.79492 0.40854-0.2452 0.70486-0.41189 1.0059-0.71289 0.72253-0.72253 1.1719-1.7293 1.1719-2.8281 0-2.1973-1.8027-4-4-4-0.75719 0-1.9375 0.38416-3 1.2949-1.0625-0.91076-2.2428-1.2949-3-1.2949zm0 1c0.82843 0 2.0156 0.15192 2.998 1.5254l0.0019531 1.4746 0.0019531-1.4746c0.98243-1.3735 2.1696-1.5254 2.998-1.5254 1.6568 0 3 1.3431 3 3 0 0.82842-0.33602 1.5782-0.87891 2.1211-0.54289 0.54289-3.5801 2.0574-5.1211 2.8789-1.5409-0.82147-4.5782-2.336-5.1211-2.8789-0.54289-0.54289-0.87891-1.2927-0.87891-2.1211 0-1.6569 1.3431-3 3-3z" color="#000000" fill="#363636" stroke-linecap="round" stroke-linejoin="round" style="-inkscape-stroke:none;paint-order:stroke fill markers"/>
+ <path d="m8 0a3 3 0 0 0-3 3 3 3 0 0 0 3 3 3 3 0 0 0 3-3 3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2 2 2 0 0 1 2-2z" fill="#363636" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/apps/symbolic/preferences-desktop-appearance-symbolic.svg b/src/apps/symbolic/preferences-desktop-appearance-symbolic.svg
index 6939de18..bacced70 100644
--- a/src/apps/symbolic/preferences-desktop-appearance-symbolic.svg
+++ b/src/apps/symbolic/preferences-desktop-appearance-symbolic.svg
@@ -1,5 +1,5 @@
 <svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <path d="m2.002 1a0.999 0.999 0 0 0-1.002 1v10c0 0.554 0.44695 1 1.002 1h11.996a0.999 0.999 0 0 0 1.002-1v-9.8789l-1 1.002v8.877h-12v-10h8.877l1.002-1h-9.877z" fill="#363636"/>
- <rect x="4" y="14" width="8" height="1" rx="0" ry="0" fill="#363636" paint-order="markers stroke fill"/>
  <path d="m14.293 0-3.8418 3.8418c0.26432 0.20518 0.50185 0.44271 0.70703 0.70703l4.5488-4.5488h-1.4141zm-6.2813 4c-1.6563 0-3 1.3398-3 3v3h3c1.6602 0.0078 3-1.3438 3-3 0-1.6602-1.3398-3-3-3zm-0.011719 1a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-2v-2a2 2 0 0 1 2-2z" color="#000000" fill="#363636" stroke-width="2" style="-inkscape-stroke:none"/>
+ <path d="m4.5 14h7c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-7c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" fill="#363636"/>
+ <path d="m2 2c-1.108 0-2 0.892-2 2v7c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-7c0-0.78163-0.44522-1.4539-1.0957-1.7832l-0.79102 0.79102c0.49971 0.056443 0.88672 0.4769 0.88672 0.99219v7c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-7c0-0.554 0.446-1 1-1h6.0117 1.8672l1-1h-8.8789z" fill="#363636"/>
 </svg>
diff --git a/src/apps/symbolic/preferences-system-bluetooth-symbolic.svg b/src/apps/symbolic/preferences-system-bluetooth-symbolic.svg
deleted file mode 100644
index e2191a31..00000000
--- a/src/apps/symbolic/preferences-system-bluetooth-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
-        color:#363636;
-      }</style>
- <path class="ColorScheme-Text" d="m7.2953 1.0449a0.50005 0.50005 0 0 0-0.29492 0.45508v5.2852l-2.7344-1.709a0.5 0.5 0 0 0-0.68945 0.1582 0.5 0.5 0 0 0 0.1582 0.68945l3.2656 2.041v0.07031l-3.2656 2.041a0.5 0.5 0 0 0-0.1582 0.68945 0.5 0.5 0 0 0 0.68945 0.1582l2.7344-1.709v5.2852a0.50005 0.50005 0 0 0 0.83203 0.37305l4.5-4a0.50005 0.50005 0 0 0-0.06641-0.79688l-3.3223-2.0762 3.3223-2.0762a0.50005 0.50005 0 0 0 0.06641-0.79688l-4.5-4a0.50005 0.50005 0 0 0-0.53711-0.08203zm0.70508 1.5684 3.1699 2.8164-3.1699 1.9805zm0 5.9766 3.1699 1.9805-3.1699 2.8164z" fill="currentColor"/>
-</svg>
diff --git a/src/devices/16/phone-battery.svg b/src/devices/16/phone-battery.svg
new file mode 100644
index 00000000..bbf366fd
--- /dev/null
+++ b/src/devices/16/phone-battery.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; } .ColorScheme-Highlight { color:#5294e2; }</style>
+ </defs>
+ <path class="ColorScheme-Text" x="4" d="m4.9609 0c-1.0865 0-1.9609 0.87448-1.9609 1.9609v12.078c0 1.0865 0.87448 1.9609 1.9609 1.9609h6.0781c1.0865 0 1.9609-0.87448 1.9609-1.9609v-12.078c0-1.0865-0.87448-1.9609-1.9609-1.9609h-6.0781zm0.039062 1h6c0.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" width="4" height="2" rx="1" ry="1" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m6.6375 13h2.7251c0.35315 0 0.63746 0.223 0.63746 0.5s-0.28431 0.5-0.63746 0.5h-2.7251c-0.35315 0-0.63746-0.223-0.63746-0.5s0.28431-0.5 0.63746-0.5z" fill="currentColor" opacity=".5"/>
+ <path class="ColorScheme-Text" d="m9 3-3 5h2l-1 4 3-5h-2z" fill="currentColor"/>
+</svg>
diff --git a/src/devices/22/phone-battery.svg b/src/devices/22/phone-battery.svg
index 394a5cc8..70ca4ddc 100644
--- a/src/devices/22/phone-battery.svg
+++ b/src/devices/22/phone-battery.svg
@@ -4,6 +4,6 @@
           color:#363636;
         }</style>
  </defs>
- <path class="ColorScheme-Text" d="m6.9609 2c-1.0865 0-1.9609 0.87452-1.9609 1.9609v14.078c0 1.0865 0.87452 1.9609 1.9609 1.9609h8.0782c1.0865 0 1.9609-0.87452 1.9609-1.9609v-14.078c0-1.0865-0.87452-1.9609-1.9609-1.9609h-6.0391zm0.039062 1h1c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v14c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-14c0-0.554 0.446-1 1-1zm4 3-3 5h4l-1 4 3-5h-4z" fill="currentColor"/>
- <rect class="ColorScheme-Text" x="8" y="17.5" width="6" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
+ <path class="ColorScheme-Text" d="m6.9609 1c-1.0865 0-1.9609 0.87452-1.9609 1.9609v16.078c0 1.0865 0.87452 1.9609 1.9609 1.9609h8.0782c1.0865 0 1.9609-0.87452 1.9609-1.9609v-16.078c0-1.0865-0.87452-1.9609-1.9609-1.9609h-6.0391zm0.039062 1h1c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v16c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1zm4 4-2 5h2l-3.8e-5 4 2-5h-2z" fill="currentColor"/>
+ <rect class="ColorScheme-Text" x="8" y="18.5" width="6" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
 </svg>
diff --git a/src/devices/22/phone.svg b/src/devices/22/phone.svg
index 83cb02df..c6e3c13d 100644
--- a/src/devices/22/phone.svg
+++ b/src/devices/22/phone.svg
@@ -1,7 +1,9 @@
-<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<svg version="1.1" viewBox="0 0 22 22" 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>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+          color:#363636;
+        }</style>
  </defs>
- <path class="ColorScheme-Text" d="m6.9609 2c-1.0865 0-1.9609 0.87452-1.9609 1.9609v14.078c0 1.0865 0.87452 1.9609 1.9609 1.9609h8.0781c1.0865 0 1.9609-0.87452 1.9609-1.9609v-14.078c0-1.0865-0.87452-1.9609-1.9609-1.9609h-8.0782zm0.039062 1h1c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v14c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-14c0-0.554 0.446-1 1-1z" fill="currentColor"/>
- <rect class="ColorScheme-Text" x="8" y="17.5" width="6" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
+ <path class="ColorScheme-Text" d="m6.9609 1c-1.0865 0-1.9609 0.87452-1.9609 1.9609v16.078c0 1.0865 0.87452 1.9609 1.9609 1.9609h8.0782c1.0865 0 1.9609-0.87452 1.9609-1.9609v-16.078c0-1.0865-0.87452-1.9609-1.9609-1.9609h-6.0391zm0.039062 1h1c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v16c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+ <rect class="ColorScheme-Text" x="8" y="18.5" width="6" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
 </svg>
diff --git a/src/devices/24/phone-battery.svg b/src/devices/24/phone-battery.svg
new file mode 100644
index 00000000..31c06940
--- /dev/null
+++ b/src/devices/24/phone-battery.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" 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" d="m7.9609 2.0001c-1.0865 0-1.9609 0.87452-1.9609 1.9609v16.078c0 1.0865 0.87452 1.9609 1.9609 1.9609h8.0782c1.0865 0 1.9609-0.87452 1.9609-1.9609v-16.078c0-1.0865-0.87452-1.9609-1.9609-1.9609h-6.0391zm0.039062 1h1c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v16c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1zm4 4-2 5h2l-3.8e-5 4 2-5h-2z" fill="currentColor"/>
+ <rect class="ColorScheme-Text" x="9" y="19.5" width="6" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
+</svg>
diff --git a/src/devices/24/phone.svg b/src/devices/24/phone.svg
index a4910799..68d2c9ab 100644
--- a/src/devices/24/phone.svg
+++ b/src/devices/24/phone.svg
@@ -2,9 +2,6 @@
  <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 x="4" d="m7.9804 3.0001c-1.0865 0-1.9609 0.87448-1.9609 1.9609v14.078c0 1.0865 0.87448 1.9609 1.9609 1.9609h8.0587c1.0865 0 1.9609-0.87448 1.9609-1.9609v-14.078c0-1.0865-0.87448-1.9609-1.9609-1.9609zm0.039062 1h7.9806c0.554 0 1 0.446 1 1v14c0 0.554-0.446 1-1 1h-7.9806c-0.554 0-1-0.446-1-1v-14c0-0.554 0.446-1 1-1z"/>
-  <rect x="9.0196" y="3.0001" width="6" height="2" rx="1" ry="1"/>
-  <rect x="9" y="18.5" width="6" height=".5" rx=".25" ry=".25" opacity=".5"/>
- </g>
+ <path class="ColorScheme-Text" d="m7.9609 2.0001c-1.0865 0-1.9609 0.87452-1.9609 1.9609v16.078c0 1.0865 0.87452 1.9609 1.9609 1.9609h8.0782c1.0865 0 1.9609-0.87452 1.9609-1.9609v-16.078c0-1.0865-0.87452-1.9609-1.9609-1.9609h-6.0391zm0.039062 1h1c0 0.554 0.446 1 1 1h4c0.554 0 1-0.446 1-1h1c0.554 0 1 0.446 1 1v16c0 0.554-0.446 1-1 1h-8c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+ <rect class="ColorScheme-Text" x="9" y="19.5" width="6" height=".5" rx=".25" ry=".25" fill="currentColor" opacity=".5"/>
 </svg>
diff --git a/src/status/16/battery-010-charging.svg b/src/status/16/battery-010-charging.svg
index 8aee41ae..8d9383c9 100644
--- a/src/status/16/battery-010-charging.svg
+++ b/src/status/16/battery-010-charging.svg
@@ -1,11 +1,11 @@
-<svg width="20" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<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-NegativeText {
                 color:#da4453;
             }</style>
  </defs>
- <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" fill="#d33636"/>
- <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" fill="#d33636"/>
- <rect x="2" y="5" width="1" height="6" fill="#d33636"/>
- <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" fill="#d33636"/>
+ <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1z" fill="#ff8080"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#ff8080"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#ff8080"/>
+ <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" fill="#f2f2f2"/>
 </svg>
diff --git a/src/status/16/battery-030-charging.svg b/src/status/16/battery-030-charging.svg
index 95946fc4..6f103919 100644
--- a/src/status/16/battery-030-charging.svg
+++ b/src/status/16/battery-030-charging.svg
@@ -1,11 +1,11 @@
-<svg width="20" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<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;
             }</style>
  </defs>
- <rect x="2" y="5" width="4" height="6" rx=".58168" ry=".58168" fill="#f2f2f2"/>
- <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" fill="#f2f2f2"/>
- <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" fill="#f2f2f2"/>
- <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new" fill="#f2f2f2"/>
+ <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h1c0.554 0 1-0.446 1-1h-1a1.0001 1.0001 0 0 1-0.83203-1.5547l1.7988-2.6973c-0.11134-0.43096-0.50009-0.74805-0.9668-0.74805h-1z" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
+ <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" color="#000000" fill="#f2f2f2" stroke-linecap="round" stroke-linejoin="round" style="-inkscape-stroke:none"/>
 </svg>
diff --git a/src/status/16/battery-050-charging.svg b/src/status/16/battery-050-charging.svg
index a1c12223..2494204e 100644
--- a/src/status/16/battery-050-charging.svg
+++ b/src/status/16/battery-050-charging.svg
@@ -1,11 +1,11 @@
-<svg width="20" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<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;
             }</style>
  </defs>
- <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" fill="#f2f2f2"/>
- <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" fill="#f2f2f2"/>
- <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new" fill="#f2f2f2"/>
- <path d="m2.6055 5c-0.33577 0-0.60547 0.2697-0.60547 0.60547v4.7891c0 0.33577 0.2697 0.60547 0.60547 0.60547h4.3633l0.25-1h-1.7188a1.0001 1.0001 0 0 1-0.83203-1.5547l2.2969-3.4453h-4.3594zm5.084 2.5176-0.32031 0.48242h1.1309a1.0001 1.0001 0 0 1-0.81055-0.48242zm0.81055 0.48242a1.0001 1.0001 0 0 1 0.5 0.16797v-0.16797h-0.5z" fill="#f2f2f2"/>
+ <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h2.4688l0.25-1h-1.7188a1.0001 1.0001 0 0 1-0.83203-1.5547l2.2969-3.4453h-2.4648zm3.1895 2.5176-0.32031 0.48242h1.1309a1.0001 1.0001 0 0 1-0.81055-0.48242z" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
+ <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" color="#000000" fill="#f2f2f2" stroke-linecap="round" stroke-linejoin="round" style="-inkscape-stroke:none"/>
 </svg>
diff --git a/src/status/16/battery-070-charging.svg b/src/status/16/battery-070-charging.svg
index 23fbcefa..a75c9ea6 100644
--- a/src/status/16/battery-070-charging.svg
+++ b/src/status/16/battery-070-charging.svg
@@ -1,13 +1,11 @@
-<svg width="20" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<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;
             }</style>
  </defs>
- <g fill="#f2f2f2">
-  <path d="m2.5742 5c-0.31767 0-0.57422 0.25655-0.57422 0.57422v4.8516c0 0.31767 0.25655 0.57422 0.57422 0.57422h4.3945l0.25-1h-1.7188a1.0001 1.0001 0 0 1-0.83203-1.5547l2.2969-3.4453h-4.3906zm7.457 0-0.25 1h1.7188a1.0001 1.0001 0 0 1 0.5 0.13477v-0.56055c0-0.31767-0.25655-0.57422-0.57422-0.57422h-1.3945zm-2.3418 2.5176-0.32031 0.48242h1.1309a1.0001 1.0001 0 0 1-0.81055-0.48242zm0.81055 0.48242a1.0001 1.0001 0 0 1 0.80859 0.48438l0.32227-0.48438h-1.1309zm3.5 0.052734-1.9648 2.9473h1.3906c0.31767 0 0.57422-0.25655 0.57422-0.57422v-2.373z" stroke-width="1.1952"/>
-  <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new" fill="#f2f2f2"/>
-  <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z"/>
-  <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z"/>
- </g>
+ <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h2.4688l0.25-1h-1.7188a1.0001 1.0001 0 0 1-0.83203-1.5547l2.2969-3.4453h-2.4648zm5.498 0.13281-0.2168 0.86719h0.71875c0-0.37216-0.20189-0.69497-0.50195-0.86719zm-2.3086 2.3848-0.32031 0.48242h1.1309a1.0001 1.0001 0 0 1-0.81055-0.48242zm0.81055 0.48242a1.0001 1.0001 0 0 1 0.80859 0.48438l0.32227-0.48438h-1.1309zm1.8457 2.5332-0.033203 0.050781c0.011755-0.016369 0.022436-0.033686 0.033203-0.050781z" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
+ <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" color="#000000" fill="#f2f2f2" stroke-linecap="round" stroke-linejoin="round" style="-inkscape-stroke:none"/>
 </svg>
diff --git a/src/status/16/battery-090-charging.svg b/src/status/16/battery-090-charging.svg
index ff965fac..e3588913 100644
--- a/src/status/16/battery-090-charging.svg
+++ b/src/status/16/battery-090-charging.svg
@@ -4,7 +4,7 @@
                 color:#f2f2f2;
             }</style>
  </defs>
- <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h2.4688l0.25-1h-1.7188a1.0001 1.0001 0 0 1-0.83203-1.5547l2.2969-3.4453h-2.4648zm5.5312 0-0.25 1h1.7188a1.0001 1.0001 0 0 1 0.83203 1.5547l-2.2969 3.4453h2.4648c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-2.4688zm-2.3418 2.5176-0.32031 0.48242h1.1309a1.0001 1.0001 0 0 1-0.81055-0.48242zm0.81055 0.48242a1.0001 1.0001 0 0 1 0.80859 0.48438l0.32227-0.48438h-1.1309z" fill="#f2f2f2"/>
+ <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h2.4688l0.25-1h-1.7188c-0.7986-1.655e-4 -1.2749-0.89014-0.83203-1.5547l2.2969-3.4453h-2.4648zm5.5312 0-0.25 1h1.7188c0.7986 1.655e-4 1.2749 0.89014 0.83203 1.5547l-2.2969 3.4453h1.4649c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-1.4689z" fill="#f2f2f2"/>
  <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
  <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
  <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new" fill="#f2f2f2"/>
diff --git a/src/status/16/battery-090.svg b/src/status/16/battery-090.svg
index cabeac6f..686e1c01 100644
--- a/src/status/16/battery-090.svg
+++ b/src/status/16/battery-090.svg
@@ -4,7 +4,7 @@
                 color:#f2f2f2;
             }</style>
  </defs>
- <rect x="2" y="5" width="10" height="6" rx="1" ry="1" fill="#f2f2f2"/>
+ <rect x="2" y="5" width="9" height="6" rx="1" ry="1" fill="#f2f2f2"/>
  <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
  <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
 </svg>
diff --git a/src/status/16/battery-caution-charging.svg b/src/status/16/battery-caution-charging.svg
deleted file mode 100644
index 3c8df26f..00000000
--- a/src/status/16/battery-caution-charging.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(-1)" fill="#f2f2f2">
-  <g transform="translate(1)">
-   <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-   <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-   <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new"/>
-  </g>
-  <path d="m3.4824 5c-0.26703 0-0.48242 0.24253-0.48242 0.54492v4.9102c0 0.3024 0.21539 0.54492 0.48242 0.54492h2.0352c0.26703 0 0.48242-0.24253 0.48242-0.54492v-0.5918c-0.46977-0.27296-0.67079-0.90961-0.33203-1.418l0.33203-0.49805v-2.4023c0-0.3024-0.21539-0.54492-0.48242-0.54492h-2.0352z" enable-background="new" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
- </g>
-</svg>
diff --git a/src/status/16/battery-caution.svg b/src/status/16/battery-caution.svg
deleted file mode 100644
index 3b657ac7..00000000
--- a/src/status/16/battery-caution.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#d33636" fill-rule="evenodd">
-  <rect x="2" y="5" width="3" height="6" rx=".5048" ry=".54584" style="paint-order:stroke fill markers"/>
-  <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" style="paint-order:stroke fill markers"/>
-  <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" style="paint-order:stroke fill markers"/>
- </g>
-</svg>
diff --git a/src/status/16/battery-empty-charging.svg b/src/status/16/battery-empty-charging.svg
index 3fe9ff42..193962ba 100644
--- a/src/status/16/battery-empty-charging.svg
+++ b/src/status/16/battery-empty-charging.svg
@@ -1,7 +1,5 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#f2f2f2">
-  <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-  <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-  <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new"/>
- </g>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#ff8080"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#ff8080"/>
+ <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" color="#000000" fill="#f2f2f2" stroke-linecap="round" stroke-linejoin="round" style="-inkscape-stroke:none"/>
 </svg>
diff --git a/src/status/16/battery-empty.svg b/src/status/16/battery-empty.svg
index 86c86881..bd8d9c5b 100644
--- a/src/status/16/battery-empty.svg
+++ b/src/status/16/battery-empty.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" fill="#d33636" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
- <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" fill="#d33636" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#ff8080"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#ff8080"/>
 </svg>
diff --git a/src/status/16/battery-full-charging.svg b/src/status/16/battery-full-charging.svg
index 2126fea4..f07c20b7 100644
--- a/src/status/16/battery-full-charging.svg
+++ b/src/status/16/battery-full-charging.svg
@@ -1,10 +1,6 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#f2f2f2">
-  <g fill-rule="evenodd">
-   <path d="m2.5215 5c-0.28865 0-0.52148 0.24253-0.52148 0.54492v4.9102c0 0.30239 0.23284 0.54492 0.52148 0.54492h4.4473l0.25-1h-1.7188c-0.79859-1.712e-4 -1.2749-0.89013-0.83203-1.5547l2.2969-3.4453h-4.4434zm7.5098 0-0.25 1h1.7188c0.79859 1.713e-4 1.2749 0.89013 0.83203 1.5547l-2.2969 3.4453h4.4434c0.28865 0 0.52148-0.24253 0.52148-0.54492v-4.9102c0-0.30239-0.23284-0.54492-0.52148-0.54492h-4.4473z" style="paint-order:stroke fill markers"/>
-   <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" style="paint-order:stroke fill markers"/>
-   <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" style="paint-order:stroke fill markers"/>
-  </g>
-  <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new"/>
- </g>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h2.4688l0.25-1h-1.7188a1.0001 1.0001 0 0 1-0.83203-1.5547l2.2969-3.4453h-2.4648zm5.5312 0-0.25 1h1.7188a1.0001 1.0001 0 0 1 0.83203 1.5547l-2.2969 3.4453h2.4648c0.554 0 1-0.446 1-1v-4c0-0.554-0.446-1-1-1h-2.4688zm-2.3418 2.5176-0.32031 0.48242h1.1309a1.0001 1.0001 0 0 1-0.81055-0.48242zm0.81055 0.48242a1.0001 1.0001 0 0 1 0.80859 0.48438l0.32227-0.48438h-1.1309z" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
+ <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new" fill="#f2f2f2"/>
 </svg>
diff --git a/src/status/16/battery-full.svg b/src/status/16/battery-full.svg
index 5c8bb24e..93984888 100644
--- a/src/status/16/battery-full.svg
+++ b/src/status/16/battery-full.svg
@@ -1,7 +1,5 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#f2f2f2" fill-rule="evenodd">
-  <rect x="2" y="5" width="13" height="6" rx=".52103" ry=".54584" style="paint-order:stroke fill markers"/>
-  <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" style="paint-order:stroke fill markers"/>
-  <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" style="paint-order:stroke fill markers"/>
- </g>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="5" width="10" height="6" rx="1" ry="1" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
 </svg>
diff --git a/src/status/16/battery-good-charging.svg b/src/status/16/battery-good-charging.svg
index 81b04748..d5c21aa3 100644
--- a/src/status/16/battery-good-charging.svg
+++ b/src/status/16/battery-good-charging.svg
@@ -1,10 +1,6 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#f2f2f2">
-  <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new"/>
-  <g fill-rule="evenodd">
-   <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" style="paint-order:stroke fill markers"/>
-   <path d="m2.5508 5c-0.30514 0-0.55078 0.24564-0.55078 0.55078v4.8984c0 0.30514 0.24564 0.55078 0.55078 0.55078h4.418l0.25-1h-1.7188c-0.79859-1.712e-4 -1.2749-0.89013-0.83203-1.5547l2.2969-3.4453h-4.4141zm7.4805 0-0.25 1h1.7188c0.1877 4.03e-5 0.35566 0.052848 0.5 0.13672v-0.58594c0-0.30514-0.24564-0.55078-0.55078-0.55078h-1.418zm1.9688 3.0527-1.9648 2.9473h1.4141c0.30514 0 0.55078-0.24564 0.55078-0.55078v-2.3965z" enable-background="new" style="paint-order:stroke fill markers"/>
-   <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" style="paint-order:stroke fill markers"/>
-  </g>
- </g>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1h2.4688l0.25-1h-1.7188a1.0001 1.0001 0 0 1-0.83203-1.5547l2.2969-3.4453h-2.4648zm5.5312 0-0.25 1h1.7188c0-0.554-0.446-1-1-1h-0.46875zm-2.3418 2.5176-0.32031 0.48242h1.1309a1.0001 1.0001 0 0 1-0.81055-0.48242zm0.81055 0.48242a1.0001 1.0001 0 0 1 0.80859 0.48438l0.32227-0.48438h-1.1309zm3 0.80273-1.4648 2.1973h0.46484c0.554 0 1-0.446 1-1v-1.1973z" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
+ <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" color="#000000" fill="#f2f2f2" stroke-linecap="round" stroke-linejoin="round" style="-inkscape-stroke:none"/>
 </svg>
diff --git a/src/status/16/battery-good.svg b/src/status/16/battery-good.svg
index 39946514..e785de3f 100644
--- a/src/status/16/battery-good.svg
+++ b/src/status/16/battery-good.svg
@@ -1,7 +1,5 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#f2f2f2" fill-rule="evenodd">
-  <rect x="2" y="5" width="10" height="6" rx=".5236" ry=".54584" style="paint-order:stroke fill markers"/>
-  <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" style="paint-order:stroke fill markers"/>
-  <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" style="paint-order:stroke fill markers"/>
- </g>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="5" width="8" height="6" rx="1" ry="1" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
 </svg>
diff --git a/src/status/16/battery-low-charging.svg b/src/status/16/battery-low-charging.svg
index 249d9444..e73e1888 100644
--- a/src/status/16/battery-low-charging.svg
+++ b/src/status/16/battery-low-charging.svg
@@ -1,10 +1,6 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#f2f2f2">
-  <g fill-rule="evenodd">
-   <path d="m2.5312 5c-0.29412 0-0.53125 0.24253-0.53125 0.54492v4.9102c0 0.30239 0.23713 0.54492 0.53125 0.54492h3.9375c0.29412 0 0.53125-0.24253 0.53125-0.54492v-0.45508h-1.5c-0.79859-1.712e-4 -1.2749-0.89013-0.83203-1.5547l2.1836-3.2754c-0.096507-0.10352-0.23169-0.16992-0.38281-0.16992h-3.9375z" style="paint-order:stroke fill markers"/>
-   <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" style="paint-order:stroke fill markers"/>
-   <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" style="paint-order:stroke fill markers"/>
-  </g>
-  <path d="m8.834 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" enable-background="new"/>
- </g>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3 5c-0.554 0-1 0.446-1 1v4c0 0.554 0.446 1 1 1s1-0.446 1-1a1.0001 1.0001 0 0 1-0.83203-1.5547l0.83203-1.248v-1.1973c0-0.554-0.446-1-1-1z" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
+ <path d="m7.334 4-3.334 5h3l-0.75 3h0.41602l3.334-5h-3l0.75-3z" color="#000000" fill="#f2f2f2" stroke-linecap="round" stroke-linejoin="round" style="-inkscape-stroke:none"/>
 </svg>
diff --git a/src/status/16/battery-low.svg b/src/status/16/battery-low.svg
index 85e6e278..938e1704 100644
--- a/src/status/16/battery-low.svg
+++ b/src/status/16/battery-low.svg
@@ -1,7 +1,5 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#f2f2f2" fill-rule="evenodd">
-  <rect x="2" y="5" width="5" height="6" rx=".53373" ry=".54584" style="paint-order:stroke fill markers"/>
-  <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" style="paint-order:stroke fill markers"/>
-  <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" style="paint-order:stroke fill markers"/>
- </g>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="5" width="2" height="6" rx="1" ry="1" fill="#f2f2f2"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
 </svg>
diff --git a/src/status/16/battery-missing.svg b/src/status/16/battery-missing.svg
index a549b2cc..0979bc5f 100644
--- a/src/status/16/battery-missing.svg
+++ b/src/status/16/battery-missing.svg
@@ -1,7 +1,5 @@
-<svg width="20" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#f2f2f2">
-  <path d="m8.4961 5c0.49322 0 0.89418 0.14677 1.2031 0.43945 0.30894 0.28726 0.46289 0.6556 0.46289 1.1055 0 0.19512-0.05132 0.39321-0.1543 0.59375s-0.19409 0.34297-0.27539 0.42969c-0.07588 0.081301-0.18525 0.18828-0.32617 0.31836l-0.03906 0.041016c-0.33062 0.2981-0.4961 0.59447-0.4961 0.89258v0.32617h-0.76562v-0.38281c0-0.2439 0.051316-0.45156 0.1543-0.625 0.10298-0.17886 0.28476-0.38847 0.54492-0.62695 0.14634-0.1355 0.24897-0.23574 0.30859-0.30078 0.06504-0.070461 0.12788-0.16396 0.1875-0.2832 0.06504-0.12466 0.09766-0.25273 0.09766-0.38281 0-0.24932-0.08154-0.4498-0.24414-0.60156-0.15718-0.15176-0.37636-0.22852-0.6582-0.22852-0.46612 0-0.78554 0.26092-0.95898 0.78125l-0.69922-0.29297c0.11382-0.30894 0.30951-0.58618 0.58594-0.83008 0.28184-0.24932 0.63866-0.37305 1.0723-0.37305zm-0.0078 4.8945c0.15718 0 0.28764 0.05371 0.39062 0.16211 0.1084 0.1084 0.16211 0.23886 0.16211 0.39062s-0.05371 0.28222-0.16211 0.39062c-0.10298 0.1084-0.23345 0.16211-0.39063 0.16211s-0.29004-0.05371-0.39844-0.16211c-0.10298-0.1084-0.1543-0.23886-0.1543-0.39062s0.051316-0.28222 0.1543-0.39062c0.1084-0.1084 0.24126-0.16211 0.39844-0.16211z" enable-background="new" fill="#f55"/>
-  <path d="m2 3c-1.108 0-2 0.892-2 2v6c0 1.108 0.892 2 2 2h13c1.108 0 2-0.892 2-2v-6c0-1.108-0.892-2-2-2zm0 1h13c0.554 0 1 0.446 1 1v6c0 0.554-0.446 1-1 1h-13c-0.554 0-1-0.446-1-1v-6c0-0.554 0.446-1 1-1z" enable-background="new" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
-  <path d="m18 6v4a2 2 0 0 0 2-2 2 2 0 0 0-2-2z" enable-background="new" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
- </g>
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m7 5c0.49322 0 0.89418 0.14677 1.2031 0.43945 0.30894 0.28726 0.46289 0.6556 0.46289 1.1055 0 0.19512-0.05132 0.39321-0.1543 0.59375s-0.19409 0.34297-0.27539 0.42969c-0.07588 0.081301-0.18525 0.18828-0.32617 0.31836l-0.03906 0.041016c-0.33062 0.2981-0.4961 0.59447-0.4961 0.89258v0.32617h-0.76562v-0.38281c0-0.2439 0.051316-0.45156 0.1543-0.625 0.10298-0.17886 0.28476-0.38847 0.54492-0.62695 0.14634-0.1355 0.24897-0.23574 0.30859-0.30078 0.06504-0.070461 0.12788-0.16396 0.1875-0.2832 0.06504-0.12466 0.09766-0.25273 0.09766-0.38281 0-0.24932-0.08154-0.4498-0.24414-0.60156-0.15718-0.15176-0.37636-0.22852-0.6582-0.22852-0.46612 0-0.78554 0.26092-0.95898 0.78125l-0.69922-0.29297c0.11382-0.30894 0.30951-0.58618 0.58594-0.83008 0.28184-0.24932 0.63866-0.37305 1.0723-0.37305zm-0.0078 4.8945c0.15718 0 0.28764 0.05371 0.39062 0.16211 0.1084 0.1084 0.16211 0.23886 0.16211 0.39062s-0.05371 0.28222-0.16211 0.39062c-0.10298 0.1084-0.23345 0.16211-0.39063 0.16211s-0.29004-0.05371-0.39844-0.16211c-0.10298-0.1084-0.1543-0.23886-0.1543-0.39062s0.051316-0.28222 0.1543-0.39062c0.1084-0.1084 0.24126-0.16211 0.39844-0.16211z" fill="#ff8080"/>
+ <path d="m15 6v4a1 2 0 0 0 1-2 1 2 0 0 0-1-2z" fill="#f2f2f2"/>
+ <path d="m3 3c-1.662 0-3 1.338-3 3v4c0 1.662 1.338 3 3 3h8c1.662 0 3-1.338 3-3v-4c0-1.662-1.338-3-3-3zm0 1h8c1.108 0 2 0.892 2 2v4c0 1.108-0.892 2-2 2h-8c-1.108 0-2-0.892-2-2v-4c0-1.108 0.892-2 2-2z" fill="#f2f2f2"/>
 </svg>
diff --git a/src/status/22/data-error.svg b/src/status/22/data-error.svg
index 6fc3137e..353fefeb 100644
--- a/src/status/22/data-error.svg
+++ b/src/status/22/data-error.svg
@@ -1,9 +1,7 @@
 <svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <style type="text/css" id="current-color-scheme">
-        .ColorScheme-NegativeText {
+ <style id="current-color-scheme" type="text/css">.ColorScheme-NegativeText {
             color:#da4453;
-        }
-    </style>
-    <rect class="ColorScheme-NegativeText" x="3" y="3" width="16" height="16" rx="2" fill="currentColor"/>
-    <path d="M 6.414,5 5,6.414 9.586,11 5,15.586 6.414,17 11,12.414 15.586,17 17,15.586 12.414,11 17,6.414 15.586,5 11,9.586 Z" fill="#fff"/>
+        }</style>
+ <path class="ColorScheme-NegativeText" d="m5 3c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2zm0 1h12c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+ <path class="ColorScheme-NegativeText" d="M 6.414,5 5,6.414 9.586,11 5,15.586 6.414,17 11,12.414 15.586,17 17,15.586 12.414,11 17,6.414 15.586,5 11,9.586 Z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/data-information.svg b/src/status/22/data-information.svg
index f77d91b7..2a7e6547 100644
--- a/src/status/22/data-information.svg
+++ b/src/status/22/data-information.svg
@@ -1,9 +1,7 @@
 <svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <style type="text/css" id="current-color-scheme">
-        .ColorScheme-Highlight {
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Highlight {
             color:#3daee9;
-        }
-    </style>
-    <rect class="ColorScheme-Highlight" x="3" y="3" width="16" height="16" rx="2" fill="currentColor"/>
-    <path d="m10 6v2h2v-2zm0 4v6h2v-6z" fill="#fff"/>
+        }</style>
+ <path class="ColorScheme-Highlight" d="m5 3c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-12zm0 1h12c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1z" fill="currentColor"/>
+ <path class="ColorScheme-Highlight" d="m10 6v2h2v-2zm0 4v6h2v-6z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/data-success.svg b/src/status/22/data-success.svg
index 2ce16b86..e6f4389c 100644
--- a/src/status/22/data-success.svg
+++ b/src/status/22/data-success.svg
@@ -1,10 +1,9 @@
-<svg id="svg9" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <style id="current-color-scheme" type="text/css">.ColorScheme-PositiveText {
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-PositiveText {
             color:#27ae60;
         }
         .ColorScheme-Text {
-            color:#f2f2f2;
+            color:#363636;
         }</style>
-    <rect id="rect3" class="ColorScheme-PositiveText" x="3" y="3" width="16" height="16" rx="1.4545455" fill="currentColor"/>
-    <path id="path5" d="M 18.99323,4.3805651 9,14 5.7332785,10.623339 4.3852425,12.059327 9,16.828 l 10,-10 z" fill="#fff"/>
+ <path class="ColorScheme-PositiveText" d="m5 3c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-10.172-1.8281c0-0.032964-0.002345-0.065092-0.003906-0.097656l-0.001953-0.52148-0.072266 0.070312c-0.23772-0.83901-1.0047-1.4512-1.9219-1.4512h-12zm0 1h12c0.554 0 1 0.446 1 1v0.33789l-9 8.6621-3.2676-3.377-1.3477 1.4355 4.6152 4.7695 9-9v9.1719c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/data-warning.svg b/src/status/22/data-warning.svg
index 91ce5615..e6a3ae99 100644
--- a/src/status/22/data-warning.svg
+++ b/src/status/22/data-warning.svg
@@ -1,9 +1,6 @@
 <svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <style type="text/css" id="current-color-scheme">
-        .ColorScheme-NeutralText {
+ <style id="current-color-scheme" type="text/css">.ColorScheme-NeutralText {
             color:#f67400;
-        }
-    </style>
-    <path class="ColorScheme-NeutralText" d="m11.006318 3.0000261a0.72728737 0.72727154 0 0 0-0.65674 0.4021811l-7.2728738 14.545431a0.72728737 0.72727154 0 0 0 0.6509222 1.052362h14.545748a0.72728737 0.72727154 0 0 0 0.650922-1.052362l-7.272874-14.545431a0.72728737 0.72727154 0 0 0-0.645104-0.4021811z" fill="currentColor"/>
-    <path d="m10 7v5h2v-5zm0 7v2h2v-2z" fill="#fff"/>
+        }</style>
+ <path class="ColorScheme-NeutralText" d="m11.014 2c-0.6567-0.0048028-1.265 0.36751-1.5586 0.95508l-7.2734 14.545c-0.55535 1.1113 0.30451 2.5006 1.5469 2.5h14.545c1.2424 5.79e-4 2.1003-1.3887 1.5449-2.5l-7.2734-14.545h0.001953c-0.28926-0.5788-0.88435-0.94946-1.5312-0.95508h-0.001953zm-0.007813 1a0.72729 0.72727 0 0 1 0.64648 0.40234l7.2715 14.545a0.72729 0.72727 0 0 1-0.65039 1.0527h-14.545a0.72729 0.72727 0 0 1-0.65234-1.0527l7.2734-14.545a0.72729 0.72727 0 0 1 0.65625-0.40234zm-1.0059 5v5h2v-5h-2zm0 7v2h2v-2h-2z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/dialog-password.svg b/src/status/22/dialog-password.svg
index 5557e36b..11fac1d3 100644
--- a/src/status/22/dialog-password.svg
+++ b/src/status/22/dialog-password.svg
@@ -1,7 +1,6 @@
 <svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <style type="text/css">.ColorScheme-Text {
-            color:#f2f2f2;
+ <style type="text/css">.ColorScheme-Text {
+            color:#727272;
         }</style>
-    <rect x="3" y="3" width="16" height="16" rx="2" fill="#7f8c8d"/>
-    <path d="m11 5a3 3 0 0 0-3 3v3h-2v6h10v-6h-2v-3a3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2v3h-4v-3a2 2 0 0 1 2-2z" fill="#fff"/>
+ <path class="ColorScheme-Text" d="m5 3c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-12zm0 1h12c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1zm6 1a3 3 0 0 0-3 3v3h-2v6h10v-6h-2v-3a3 3 0 0 0-3-3zm0 1a2 2 0 0 1 2 2v3h-4v-3a2 2 0 0 1 2-2z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/dialog-question.svg b/src/status/22/dialog-question.svg
index 838bd3f6..afd475a6 100644
--- a/src/status/22/dialog-question.svg
+++ b/src/status/22/dialog-question.svg
@@ -1,7 +1,6 @@
 <svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <style type="text/css">.ColorScheme-Text {
-            color:#f2f2f2;
+ <style type="text/css">.ColorScheme-Text {
+            color:#363636;
         }</style>
-    <rect x="3" y="3" width="16" height="16" rx="2" fill="#9b59b6"/>
-    <path d="m11 5a4 4 0 0 0-4 4h2a2 2 0 0 1 2-2 2 2 0 0 1 2 2 2 2 0 0 1-2 2h-1v3h2v-1.133a4 4 0 0 0 3-3.867 4 4 0 0 0-4-4zm-1 10v2h2v-2z" fill="#fff"/>
+ <path d="m5 3c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h12c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2h-12zm0 1h12c0.554 0 1 0.446 1 1v12c0 0.554-0.446 1-1 1h-12c-0.554 0-1-0.446-1-1v-12c0-0.554 0.446-1 1-1zm6 1a4 4 0 0 0-4 4h2a2 2 0 0 1 2-2 2 2 0 0 1 2 2 2 2 0 0 1-2 2h-1v3h2v-1.1328a4 4 0 0 0 3-3.8672 4 4 0 0 0-4-4zm-1 10v2h2v-2h-2z" fill="#9b59b6"/>
 </svg>
diff --git a/src/status/22/smartphone-disconnected.svg b/src/status/22/smartphone-disconnected.svg
index bcf15d59..60e141f7 100644
--- a/src/status/22/smartphone-disconnected.svg
+++ b/src/status/22/smartphone-disconnected.svg
@@ -1,6 +1,12 @@
 <svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#f2f2f2; } .ColorScheme-Highlight { color:#4285f4; }</style>
- </defs>
- <path class="ColorScheme-Text" transform="matrix(.02764.00247-.00247.02764 6.99 5.728)" d="m309.91 276.39-47.11-47.11c-9.383-9.345-24.92-9.06-34.63 0.652l-23.732 23.727c-1.499-0.826-3.051-1.69-4.683-2.605-14.987-8.304-35.498-19.685-57.08-41.29-21.648-21.646-33.04-42.19-41.37-57.19-0.879-1.589-1.721-3.121-2.553-4.575l15.928-15.904 7.831-7.84c9.724-9.727 9.993-25.26 0.632-34.633l-47.11-47.12c-9.361-9.359-24.906-9.08-34.63 0.652l-13.276 13.352 0.363 0.36c-4.452 5.68-8.172 12.232-10.94 19.296-2.552 6.725-4.141 13.14-4.867 19.572-6.22 51.565 17.344 98.69 81.29 162.64 88.4 88.39 159.63 81.71 162.71 81.39 6.693-0.8 13.11-2.399 19.627-4.931 7-2.736 13.55-6.45 19.227-10.893l0.29 0.258 13.45-13.17c9.704-9.725 9.984-25.26 0.627-34.651m138.11-125.98a288.24 288.24 0 0 1-261.45 312.75 288.24 288.24 0 0 1-312.75-261.45 288.24 288.24 0 0 1 261.45-312.75 288.24 288.24 0 0 1 312.75 261.45" fill="currentColor" opacity=".35"/>
+    <defs>
+        <style id="current-color-scheme" type="text/css">.ColorScheme-NeutralText {
+            color:#f67400;
+        }
+        .ColorScheme-Text {
+            color:#f2f2f2;
+        }</style>
+    </defs>
+    <path id="smartphone" class="ColorScheme-Text" d="m8 3c-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-2zm0 1h6c0.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-1zm0.5 1a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5 0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5zm1 11c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h3c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5z" fill="currentColor"/>
+    <path class="ColorScheme-NeutralText" d="m10.766 7.5137a2 2 0 0 0-1.7676 1.8965 2 2 0 0 0 0 0.08984h1a1 1 0 0 1 0.88281-0.99414h0.11524v-0.99219h-0.23047zm0.23242 2e-3v1a1 1 0 0 1 0.99414 0.88281v0.11523h0.0059a1 1 0 0 1-0.88281 0.99414l-0.11528-4.7e-5v-0.0078a2 2 0 0 0-0.19922 2e-3 2 2 0 0 0-0.80078 0.2187v-0.20703h-2e-3v2h1v-1.0137h0.23247a2 2 0 0 0 1.7676-1.8965 2 2 0 0 0 0-0.08984h-0.01367v-0.23047a2 2 0 0 0-1.8965-1.7676 2 2 0 0 0-0.08984 0zm-0.99805 5.9843v1h1v-1z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/smartphone-trusted.svg b/src/status/22/smartphone-trusted.svg
index 1193da61..041a1b63 100644
--- a/src/status/22/smartphone-trusted.svg
+++ b/src/status/22/smartphone-trusted.svg
@@ -1,8 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
- <defs>
-  <style id="current-color-scheme" type="text/css">
-   .ColorScheme-Text { color:#f2f2f2; } .ColorScheme-Highlight { color:#4285f4; }
-  </style>
- </defs>
-<path d="m309.91 276.39l-47.11-47.11c-9.383-9.345-24.92-9.06-34.63.652l-23.732 23.727c-1.499-.826-3.051-1.69-4.683-2.605-14.987-8.304-35.498-19.685-57.08-41.29-21.648-21.646-33.04-42.19-41.37-57.19-.879-1.589-1.721-3.121-2.553-4.575l15.928-15.904 7.831-7.84c9.724-9.727 9.993-25.26.632-34.633l-47.11-47.12c-9.361-9.359-24.906-9.08-34.63.652l-13.276 13.352.363.36c-4.452 5.68-8.172 12.232-10.94 19.296-2.552 6.725-4.141 13.14-4.867 19.572-6.22 51.565 17.344 98.69 81.29 162.64 88.4 88.39 159.63 81.71 162.71 81.39 6.693-.8 13.11-2.399 19.627-4.931 7-2.736 13.55-6.45 19.227-10.893l.29.258 13.45-13.17c9.704-9.725 9.984-25.26.627-34.651m138.10649-125.98263a288.23938 288.23938 0 0 1 -261.44662 312.74517 288.23938 288.23938 0 0 1 -312.74517 -261.44662 288.23938 288.23938 0 0 1 261.44662 -312.74518 288.23938 288.23938 0 0 1 312.74517 261.44663" class="ColorScheme-Text" fill="currentColor" transform="matrix(.02764.00247-.00247.02764 6.99 5.728)"/>
+<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
+    <style id="current-color-scheme" type="text/css">.ColorScheme-Highlight {
+  color:#3daee9;
+}
+.ColorScheme-Text {
+  color:#f2f2f2;
+}</style>
+    <path id="smartphone" class="ColorScheme-Text" d="m8 3c-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-2zm0 1h6c0.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-1zm0.5 1a0.5 0.5 0 0 0-0.5 0.5 0.5 0.5 0 0 0 0.5 0.5 0.5 0.5 0 0 0 0.5-0.5 0.5 0.5 0 0 0-0.5-0.5zm1 11c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h3c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5z" fill="currentColor"/>
+    <path class="ColorScheme-Highlight" d="m11 7.9961-0.3418 0.31836c-0.28297 0.26453-0.34587 0.37525-0.56836 0.48633-0.22249 0.11108-0.67875 0.24295-1.6582 0.37695l-0.43164 0.060547v0.43555s0.01651 3.1354 2.8145 4.2539l0.18555 0.074219 0.18555-0.074219c2.798-1.1179 2.8145-4.2539 2.8145-4.2539v-0.43555l-0.43164-0.060547c-0.97468-0.13461-1.4295-0.26502-1.6543-0.37695-0.22482-0.11194-0.29206-0.22582-0.57422-0.48828zm2e-3 1.3242c0.13645 0.12922 0.23454 0.25937 0.4668 0.375 0.29874 0.14874 0.86702 0.24653 1.457 0.35156-0.03231 0.49912-0.24398 2.0079-1.9258 2.8223-1.6806-0.81412-1.8932-2.3195-1.9258-2.8203 0.5928-0.10459 1.1619-0.20227 1.4609-0.35156 0.2328-0.11623 0.33093-0.24702 0.4668-0.37695z" fill="currentColor"/>
 </svg>
diff --git a/src/status/24/audio-volume-muted-blocking-panel.svg b/src/status/24/audio-volume-muted-blocking-panel.svg
index de7678a4..61e8696d 100644
--- a/src/status/24/audio-volume-muted-blocking-panel.svg
+++ b/src/status/24/audio-volume-muted-blocking-panel.svg
@@ -1,4 +1,4 @@
 <svg width="24" height="24" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m16.738 5.2902c-0.37563 0.026826-0.62454 0.48828-0.2832 0.86914 1.6202 1.5104 2.5416 3.6249 2.5449 5.8398-0.0026 2.2205-0.92792 4.3401-2.5547 5.8516-0.44531 0.47165 0.18064 1.1484 0.67774 0.72852 1.8304-1.6992 2.8725-4.0825 2.877-6.5801-0.0026-2.4925-1.0386-4.8722-2.8613-6.5723-0.13636-0.10693-0.27518-0.14566-0.40039-0.13672zm-2.3906 1.416c-0.39562 0.01189-0.64227 0.53363-0.25586 0.91406 1.2147 1.1326 1.9056 2.7181 1.9082 4.3789-0.0019 1.6654-0.69596 3.2551-1.916 4.3887-0.46835 0.44623 0.17346 1.1467 0.67969 0.72852 1.423-1.3216 2.233-3.1751 2.2363-5.1172-0.0019-1.9383-0.8074-3.789-2.2246-5.1113-0.14685-0.13372-0.29586-0.1856-0.42774-0.18164zm-4.3477 0.29297-3 3h-2c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h2l3 3zm2.0176 1.1836c-0.37603 0.01638-0.64465 0.51365-0.29102 0.89648 0.81045 0.75501 1.2715 1.8123 1.2734 2.9199-0.0013 1.1103-0.464 2.1701-1.2773 2.9258-0.47259 0.42993 0.13957 1.1522 0.67969 0.73047 1.0168-0.94425 1.5955-2.2686 1.5977-3.6562-0.0017-1.3844-0.57742-2.7062-1.5898-3.6504-0.13024-0.12342-0.26724-0.17148-0.39258-0.16602z" fill="#f2f2f2"/>
+ <path d="m16.738 5.2902c-0.37563 0.026826-0.62454 0.48828-0.2832 0.86914 1.6202 1.5104 2.5416 3.6249 2.5449 5.8398-0.0026 2.2205-0.92792 4.3401-2.5547 5.8516-0.44531 0.47165 0.18064 1.1484 0.67774 0.72852 1.8304-1.6992 2.8725-4.0825 2.877-6.5801-0.0026-2.4925-1.0386-4.8722-2.8613-6.5723-0.13636-0.10693-0.27518-0.14566-0.40039-0.13672zm-2.3906 1.416c-0.39562 0.01189-0.64227 0.53363-0.25586 0.91406 1.2147 1.1326 1.9056 2.7181 1.9082 4.3789-0.0019 1.6654-0.69596 3.2551-1.916 4.3887-0.46835 0.44623 0.17346 1.1467 0.67969 0.72852 1.423-1.3216 2.233-3.1751 2.2363-5.1172-0.0019-1.9383-0.8074-3.789-2.2246-5.1113-0.14685-0.13372-0.29586-0.1856-0.42774-0.18164zm-4.3477 0.29297-3 3h-2c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h2l3 3zm2.0176 1.1836c-0.37603 0.01638-0.64465 0.51365-0.29102 0.89648 0.81045 0.75501 1.2715 1.8123 1.2734 2.9199-0.0013 1.1103-0.464 2.1701-1.2773 2.9258-0.47259 0.42993 0.13957 1.1522 0.67969 0.73047 1.0168-0.94425 1.5955-2.2686 1.5977-3.6562-0.0017-1.3844-0.57742-2.7062-1.5898-3.6504-0.13024-0.12342-0.26724-0.17148-0.39258-0.16602z" fill="#f2f2f2" opacity=".35"/>
  <rect transform="rotate(45)" x="7" y="-.5" width="20" height="1" rx=".5" ry=".5" fill="#f2f2f2"/>
 </svg>
diff --git a/src/status/24/fcitx-bopomofo-libpinyin.svg b/src/status/24/fcitx-bopomofo-libpinyin.svg
index ad806e5c..54554e3e 100644
--- a/src/status/24/fcitx-bopomofo-libpinyin.svg
+++ b/src/status/24/fcitx-bopomofo-libpinyin.svg
@@ -1,6 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="24" height="24" viewBox="0 0 24 24">
-  <style type="text/css" id="current-color-scheme">
-      .ColorScheme-Text {
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
       }
       .ColorScheme-Background {
@@ -10,18 +9,7 @@
         color:#3daee9;
       }
       .ColorScheme-ButtonText {
-        color:#f2f2f2;
-      }
-      </style>
-  <g transform="translate(1,1)">
-    <g id="fcitx-bopomofo-libpinyin" transform="translate(66,22) translate(-66,-22)" style="fill:#cccccc">
-      <rect y="0" x="0" height="22" width="22" id="rect4147" style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
-      <path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" d="m 3,3.0000076 0,16.0000004 16,0 0,-16.0000004 -16,0 z" id="path4274"/>
-      <path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" d="m 11.300781,4.5996166 -0.601562,0.800782 2,1.5 0.601562,-0.800782 -2,-1.5 z" id="path4270"/>
-      <path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" d="m 5.3535156,4.6464866 -0.7070312,0.707032 2,2 0.7070312,-0.707032 -2,-2 z" id="path4268"/>
-      <path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" d="m 8,7.0000076 0,1 4,0 0,3.0000004 -3,0 0,1 3,0 0,4 -4,0 0,1 9,0 0,-1 -4,0 0,-4 3,0 0,-1 -3,0 0,-3.0000004 4,0 0,-1 -9,0 z" id="path4266"/>
-      <path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" d="m 5.3535156,7.6464916 -0.7070312,0.707032 2,2.0000004 0.7070312,-0.7070324 -2,-2 z" id="path4264"/>
-      <path class="ColorScheme-Text" style="fill:currentColor;fill-opacity:1;stroke:none" d="m 6.5253906,10.841805 -2,6 0.9492188,0.316406 2,-6 -0.9492188,-0.316406 z" id="path4166"/>
-    </g>
-  </g>
+        color:#363636;
+      }</style>
+ <path class="ColorScheme-Text" d="m4 4v16h16v-16h-16zm8.3008 1.5996 2 1.5-0.60156 0.80078-2-1.5 0.60156-0.80078zm-5.9473 0.046875 2 2-0.70703 0.70703-2-2 0.70703-0.70703zm2.6465 2.3535h9v1h-4v3h3v1h-3v4h4v1h-9v-1h4v-4h-3v-1h3v-3h-4v-1zm-2.6465 0.64648 2 2-0.70703 0.70703-2-2 0.70703-0.70703zm1.1719 3.1953 0.94922 0.31641-2 6-0.94922-0.31641 2-6z" fill="currentColor"/>
 </svg>
diff --git a/src/status/32/fingerprint-detection-complete-symbolic.svg b/src/status/32/fingerprint-detection-complete-symbolic.svg
new file mode 100644
index 00000000..e14c07ea
--- /dev/null
+++ b/src/status/32/fingerprint-detection-complete-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 8.467 8.467"><path style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" d="M16.133.99a12.982 12.982 0 0 0-6.477 1.653c-1.173.646-.194 2.404.973 1.748A10.999 10.999 0 0 1 27 13.994v2c0 1.334 2 1.334 2 0v-2c0-.033-.001-.066-.004-.1a13.007 13.007 0 0 0-6.418-11.119A12.995 12.995 0 0 0 16.133.99ZM5.762 6.64a1 1 0 0 0-.801.485 12.999 12.999 0 0 0-1.957 6.77 1 1 0 0 0-.004.1v10.128c0 1.334 2 1.334 2 0V13.994c0-2.055.575-4.07 1.66-5.814a1 1 0 0 0-.898-1.54ZM16 6.993c-3.813 0-6.928 3.082-6.994 6.881a1 1 0 0 0-.006.121v2c0 1.333 2 1.333 2 0v-2a4.986 4.986 0 0 1 5-5.002c2.773 0 5 2.228 5 5.002v8.131a3 3 0 0 1 1.123.752l.877.877v-9.76a.994.994 0 0 0-.006-.115c-.062-3.802-3.179-6.887-6.994-6.887Zm-.016 5.987A1 1 0 0 0 15 13.994v10.004s0 1.094.27 2.445c.27 1.351.787 3.028 2.023 4.264.942.982 2.395-.471 1.414-1.414-.69-.69-1.139-1.835-1.39-2.898l-.003-.002a3 3 0 0 1-.302-2.14 17.252 17.252 0 0 0-.012-.255V13.994a1 1 0 0 0-1.016-1.015zm-6 8.001A1 1 0 0 0 9 21.996v6.002c0 1.334 2 1.334 2 0v-6.002a1 1 0 0 0-1.016-1.016zm20.998.006a1 1 0 0 0-.687.303l-6.297 6.29-3.291-3.294a1 1 0 1 0-1.41 1.418l4.701 4.703 7.707-7.707a1 1 0 0 0-.723-1.713z" transform="scale(.26458)" class="success" fill="#33d17a"/></svg>
diff --git a/src/status/32/fingerprint-detection-symbolic.svg b/src/status/32/fingerprint-detection-symbolic.svg
new file mode 100644
index 00000000..1b8a20e6
--- /dev/null
+++ b/src/status/32/fingerprint-detection-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 8.467 8.467"><path d="M4.268 288.795a3.435 3.435 0 0 0-1.713.438.265.265 0 1 0 .257.462 2.91 2.91 0 0 1 4.332 2.541v.53a.265.265 0 1 0 .529 0v-.53a.265.265 0 0 0-.001-.026 3.442 3.442 0 0 0-3.404-3.415zm-2.744 1.495a.265.265 0 0 0-.211.128 3.44 3.44 0 0 0-.518 1.792.265.265 0 0 0-.001.026v2.68a.265.265 0 0 0 .529 0v-2.68c0-.544.152-1.077.44-1.538a.265.265 0 0 0-.239-.408zm2.71.093a1.856 1.856 0 0 0-1.851 1.82.265.265 0 0 0-.002.033v.529a.265.265 0 1 0 .53 0v-.53c0-.733.589-1.323 1.322-1.323.734 0 1.323.59 1.323 1.324v2.647s.002.182.08.414c.077.232.231.535.527.831a.265.265 0 1 0 .374-.374 1.595 1.595 0 0 1-.399-.624c-.055-.165-.053-.247-.053-.247v-2.647a.265.265 0 0 0-.001-.03 1.856 1.856 0 0 0-1.85-1.823zm-.005 1.584a.265.265 0 0 0-.26.269v2.647s0 .29.071.647c.072.357.208.8.535 1.128a.265.265 0 1 0 .375-.374c-.203-.203-.33-.553-.391-.858-.06-.304-.061-.543-.061-.543v-2.647a.265.265 0 0 0-.269-.269zm-1.587 2.117a.265.265 0 0 0-.26.27v1.587a.265.265 0 1 0 .528 0v-1.588a.265.265 0 0 0-.268-.269zm4.762 0a.265.265 0 0 0-.26.268v.53a.265.265 0 1 0 .529 0v-.53a.265.265 0 0 0-.269-.268z" fill="#363636" transform="translate(0 -288.533)"/></svg>
diff --git a/src/status/32/fingerprint-detection-warning-symbolic.svg b/src/status/32/fingerprint-detection-warning-symbolic.svg
new file mode 100644
index 00000000..115ae367
--- /dev/null
+++ b/src/status/32/fingerprint-detection-warning-symbolic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 8.467 8.467"><path overflow="visible" font-weight="400" d="M4.268.262a3.435 3.435 0 0 0-1.713.437.265.265 0 1 0 .257.463 2.91 2.91 0 0 1 4.332 2.54v.53a.265.265 0 1 0 .529 0v-.53a.265.265 0 0 0-.001-.026A3.441 3.441 0 0 0 4.268.262ZM1.524 1.757a.265.265 0 0 0-.211.128 3.44 3.44 0 0 0-.518 1.791.265.265 0 0 0-.001.027v2.68a.265.265 0 0 0 .529 0v-2.68c0-.544.152-1.077.44-1.539a.265.265 0 0 0-.239-.407Zm2.71.093a1.856 1.856 0 0 0-1.851 1.82.265.265 0 0 0-.002.033v.529a.265.265 0 0 0 .53 0v-.53c0-.733.589-1.323 1.322-1.323.734 0 1.323.59 1.323 1.324v.708a1.05 1.05 0 0 1 .53-.385v-.323a.265.265 0 0 0-.002-.03 1.856 1.856 0 0 0-1.85-1.823Zm-.005 1.584a.265.265 0 0 0-.26.269v2.646s0 .29.071.647c.009.044.022.092.033.138l.425-.787V3.703a.265.265 0 0 0-.269-.27Zm2.096 1.089c-.139-.008-.275.075-.38.256L4.29 7.846c-.141.255.013.62.29.62h3.48c.26 0 .504-.306.323-.62l-1.67-3.05c-.106-.171-.25-.266-.389-.273ZM2.642 5.55a.265.265 0 0 0-.26.269v1.588a.265.265 0 1 0 .528 0V5.82a.265.265 0 0 0-.268-.269Zm3.7.013a.275.275 0 0 1 .272.273V6.88a.272.272 0 0 1-.264.265.272.272 0 0 1-.265-.265V5.837a.273.273 0 0 1 .215-.264.195.195 0 0 1 .042-.008zm.008 1.844a.265.265 0 1 1 0 .53.265.265 0 0 1 0-.53z" class="warning" fill="#ff7800"/></svg>
diff --git a/src/status/fcitx.svg b/src/status/fcitx.svg
deleted file mode 100644
index a912ccfb..00000000
--- a/src/status/fcitx.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
- <defs>
-  <linearGradient id="linearGradient840" x1="1" x2="47" gradientUnits="userSpaceOnUse">
-   <stop style="stop-color:#5e6670" offset="0"/>
-   <stop style="stop-color:#67707b" offset="1"/>
-  </linearGradient>
- </defs>
- <path d="m36.31 5c5.859 4.062 9.688 10.831 9.688 18.5 0 12.426-10.07 22.5-22.5 22.5-7.669 0-14.438-3.828-18.5-9.688 1.037 1.822 2.306 3.499 3.781 4.969 4.085 3.712 9.514 5.969 15.469 5.969 12.703 0 23-10.298 23-23 0-5.954-2.256-11.384-5.969-15.469-1.469-1.475-3.147-2.744-4.969-3.781zm4.969 3.781c3.854 4.113 6.219 9.637 6.219 15.719 0 12.703-10.297 23-23 23-6.081 0-11.606-2.364-15.719-6.219 4.16 4.144 9.883 6.719 16.219 6.719 12.703 0 23-10.298 23-23 0-6.335-2.575-12.06-6.719-16.219z" style="opacity:.05"/>
- <path d="m41.28 8.781c3.712 4.085 5.969 9.514 5.969 15.469 0 12.703-10.297 23-23 23-5.954 0-11.384-2.256-15.469-5.969 4.113 3.854 9.637 6.219 15.719 6.219 12.703 0 23-10.298 23-23 0-6.081-2.364-11.606-6.219-15.719z" style="opacity:.1"/>
- <path d="m31.25 2.375c8.615 3.154 14.75 11.417 14.75 21.13 0 12.426-10.07 22.5-22.5 22.5-9.708 0-17.971-6.135-21.12-14.75a23 23 0 0 0 44.875-7 23 23 0 0 0-16-21.875z" style="opacity:.2"/>
- <g transform="matrix(0,-1,1,0,0,48)" style="fill:#501616">
-  <path d="m24 1c12.703 0 23 10.297 23 23s-10.297 23-23 23-23-10.297-23-23 10.297-23 23-23z" style="fill:url(#linearGradient840)"/>
- </g>
- <path d="m40.03 7.531c3.712 4.084 5.969 9.514 5.969 15.469 0 12.703-10.297 23-23 23-5.954 0-11.384-2.256-15.469-5.969 4.178 4.291 10.01 6.969 16.469 6.969 12.703 0 23-10.298 23-23 0-6.462-2.677-12.291-6.969-16.469z" style="opacity:.1"/>
- <path d="m14 14c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1zm12 0c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h1v11c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-20c0-0.554-0.446-1-1-1h-8zm7 7h2v8.5c0 1.3689-1.1311 2.5-2.5 2.5h-1.5v1l-2-2 2-2v1h1.5c0.28799 0 0.5-0.21201 0.5-0.5zm-19 5c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1z" style="opacity:.1;paint-order:stroke fill markers"/>
- <path d="m13 13c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1zm12 0c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h1v11c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-20c0-0.554-0.446-1-1-1h-8zm7 7h2v8.5c0 1.3689-1.1311 2.5-2.5 2.5h-1.5v1l-2-2 2-2v1h1.5c0.28799 0 0.5-0.21201 0.5-0.5zm-19 5c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1z" style="fill:#eee;paint-order:stroke fill markers"/>
-</svg>
diff --git a/src/status/symbolic/warning-small-symbolic.svg b/src/status/symbolic/warning-small-symbolic.svg
new file mode 100644
index 00000000..65645c23
--- /dev/null
+++ b/src/status/symbolic/warning-small-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path class="warning" d="m8 0a1.0001 1.0001 0 0 0-0.89453 0.55273l-7 14a1.0001 1.0001 0 0 0 0.89453 1.4473h14a1.0001 1.0001 0 0 0 0.89453-1.4473l-7-14a1.0001 1.0001 0 0 0-0.89453-0.55273zm0 3.2363 5.3828 10.764h-10.766l5.3828-10.764zm-0.044922 2.7637c-0.52858 0-0.95508 0.446-0.95508 1v2c0 0.554 0.42649 1 0.95508 1h0.089844c0.52858 0 0.95508-0.446 0.95508-1v-2c0-0.554-0.42649-1-0.95508-1h-0.089844zm0.044922 5a1 1 0 0 0-1 1 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0-1-1z" fill="#ff7800"/>
+</svg>