diff --git a/src/apps/22/speedometer-symbolic.svg b/src/apps/22/speedometer-symbolic.svg
new file mode 100644
index 00000000..686a4031
--- /dev/null
+++ b/src/apps/22/speedometer-symbolic.svg
@@ -0,0 +1,9 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+                color:#363636;
+            }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m10.992 4a8 8 0 0 0-8 8 8 8 0 0 0 3.3496 6.5098l0.58203-0.81445a7 7 0 0 1-2.9316-5.6953 7 7 0 0 1 6.9062-7 7 7 0 0 1 0.09375 0 7 7 0 0 1 7 7 7 7 0 0 1-2.9316 5.6973l0.58008 0.8125a8 8 0 0 0 3.3516-6.5098 8 8 0 0 0-8-8zm0.0059 3c-0.277 0-0.5 0.223-0.5 0.5v3.6328a1 1 0 0 0-0.50586 0.86719 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0-0.49414-0.86133v-3.6387c0-0.277-0.223-0.5-0.5-0.5z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m14.992 12c-0.26024 1.5016-0.63096 2.471-1.8476 3.3888l2.4961 3.1211c2.1611-1.6767 3.0899-3.7887 3.3672-6.5098z" fill="currentColor" opacity=".25"/>
+</svg>
diff --git a/src/apps/symbolic/speedometer-symbolic.svg b/src/apps/symbolic/speedometer-symbolic.svg
index 633e3831..ff06ef6d 100644
--- a/src/apps/symbolic/speedometer-symbolic.svg
+++ b/src/apps/symbolic/speedometer-symbolic.svg
@@ -1,12 +1,9 @@
-<svg width="16.011" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m5.1777 5.6719c-0.12781 0-0.25558 0.04855-0.35352 0.14648-0.19587 0.19587-0.19587 0.51116 0 0.70703l2.4746 2.4746h1.4141l-3.1816-3.1816c-0.097934-0.097934-0.22571-0.14648-0.35352-0.14648z" fill="#363636" style="paint-order:stroke fill markers"/>
- <path d="m8 1a8 8 0 0 0-8 8 8 8 0 0 0 3.3496 6.5098l0.58203-0.81445a7 7 0 0 1-2.9316-5.6953 7 7 0 0 1 6.9062-7 7 7 0 0 1 0.09375 0 7 7 0 0 1 7 7 7 7 0 0 1-2.9316 5.6973l0.58008 0.8125a8 8 0 0 0 3.3516-6.5098 8 8 0 0 0-8-8z" fill="#363636" style="paint-order:stroke fill markers"/>
- <circle cx="8" cy="9" r="1" fill="#363636" style="paint-order:stroke fill markers"/>
- <rect x="7.5055" y="1.5261" width="1" height="1.4739" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
- <rect transform="rotate(45)" x="11.525" y="-6.7707" width="1" height="1.4739" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
- <rect transform="rotate(45)" x="11.525" y="6.7032" width="1" height="1.4739" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
- <rect transform="rotate(90)" x="8.5" y="-15.479" width="1" height="1.4739" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
- <rect transform="rotate(90)" x="8.5" y="-2.0055" width="1" height="1.4739" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
- <rect transform="rotate(135)" x=".20322" y="-19.499" width="1" height="1.4739" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
- <rect transform="rotate(135)" x=".20322" y="-6.0247" width="1" height="1.4739" rx="0" ry="0" fill="#363636" style="paint-order:stroke fill markers"/>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+                color:#363636;
+            }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m8 1a8 8 0 0 0-8 8 8 8 0 0 0 3.3496 6.5098l0.58203-0.81445a7 7 0 0 1-2.9316-5.6953 7 7 0 0 1 6.9062-7 7 7 0 0 1 0.09375 0 7 7 0 0 1 7 7 7 7 0 0 1-2.9316 5.6973l0.58008 0.8125a8 8 0 0 0 3.3516-6.5098 8 8 0 0 0-8-8zm0.00586 3c-0.277 0-0.5 0.223-0.5 0.5v3.6328a1 1 0 0 0-0.50586 0.86719 1 1 0 0 0 1 1 1 1 0 0 0 1-1 1 1 0 0 0-0.49414-0.86133v-3.6387c0-0.277-0.223-0.5-0.5-0.5z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m11.992 9c-0.26024 1.5016-0.63096 2.471-1.8476 3.3888l2.4961 3.1211c2.1611-1.6767 3.0899-3.7887 3.3672-6.5098z" fill="currentColor" opacity=".25"/>
 </svg>
diff --git a/src/status/22/disk-quota-critical.svg b/src/status/22/disk-quota-critical.svg
index 35e2b513..9a21fbd2 100644
--- a/src/status/22/disk-quota-critical.svg
+++ b/src/status/22/disk-quota-critical.svg
@@ -1,21 +1,13 @@
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-Text {
+<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-NegativeText {
                 color:#da4453;
-            }
-        </style>
-    </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="M 16 12 C 14.343146 12 13 12.447715 13 13 L 13 18 C 13 18.552285 14.343146 19 16 19 C 17.656854 19 19 18.552285 19 18 L 19 13 C 19 12.447715 17.656854 12 16 12 z M 16 13 C 16.739186 13.00087 17.451386 13.09268 18 13.257812 L 18 13.744141 C 17.450517 13.908567 16.738413 13.999666 16 14 C 15.260814 13.99913 14.548614 13.90732 14 13.742188 L 14 13.255859 C 14.549483 13.091433 15.261587 13.000334 16 13 z "
-        class="ColorScheme-NegativeText"/>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="m 9,6 v 5 h 2 V 6 Z m 0,6 v 2 h 2 v -2 z"
-        class="ColorScheme-NegativeText"/>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="m 4,3 v 16 h 8 V 16 H 7 L 5,14 V 11.9 C 5.6,11.7 6,11.1 6,10.5 6,9.9 5.6,9.3 5,9.1 V 7 C 5,5.3 6.3,4 8,4 h 4 c 1.66,0 3,1.34 3,3 v 2.1 c -0.6,0.2 -1,0.8 -1,1.4 6.76e-4,0.2 0,0.3 0.1,0.5 H 16 V 3 Z m 2,14 h 5 v 1 H 6 Z"
-        class="ColorScheme-Text"/>
+            }</style>
+ </defs>
+ <path class="ColorScheme-NegativeText" d="m16 12c-1.6569 0-3 0.44772-3 1v5c0 0.55228 1.3431 1 3 1s3-0.44772 3-1v-5c0-0.55228-1.3431-1-3-1zm0 1c0.73919 8.7e-4 1.4514 0.09268 2 0.25781v0.48633c-0.54948 0.16443-1.2616 0.25552-2 0.25586-0.73919-8.7e-4 -1.4514-0.09268-2-0.25781v-0.48633c0.54948-0.16443 1.2616-0.25552 2-0.25586z" fill="currentColor"/>
+ <path class="ColorScheme-NegativeText" d="m9 6v5h2v-5zm0 6v2h2v-2z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m7 3c-1.662 0-3 1.338-3 3v10c0 1.662 1.338 3 3 3h5v-3h-5l-2-2v-2.0996c0.6-0.2 1-0.80039 1-1.4004s-0.4-1.2004-1-1.4004v-3.0996c0-1.108 0.892-2 2-2h6c1.108 0 2 0.892 2 2v3.0996c-0.6 0.2-1 0.80039-1 1.4004 6.76e-4 0.2-3.92e-4 0.3 0.09961 0.5h1.9004v-5c0-1.662-1.338-3-3-3zm0 14a0.5 0.5 0 0 1 0.025391 0h3.9746v1h-4a0.5 0.5 0 0 1-0.5-0.5 0.5 0.5 0 0 1 0.5-0.5z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/disk-quota-high.svg b/src/status/22/disk-quota-high.svg
index 91c2911d..07eb1926 100644
--- a/src/status/22/disk-quota-high.svg
+++ b/src/status/22/disk-quota-high.svg
@@ -1,18 +1,12 @@
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-Text {
+<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-NegativeText {
                 color:#da4453;
-            }
-        </style>
-    </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="M 16 12 A 3 1 0 0 0 13 13 L 13 18 A 3 1 0 0 0 16 19 A 3 1 0 0 0 19 18 L 19 13 A 3 1 0 0 0 16 12 z M 15.9 13 A 3 1 0 0 1 16 13 A 3 1 0 0 1 18 13.257812 L 18 13.74 A 3 1 0 0 1 16 14 A 3 1 0 0 1 14 13.7 L 14 13.2 A 3 1 0 0 1 15.9 13 z M 14 14.74 A 3 1 0 0 0 16 15 A 3 1 0 0 0 18 14.74 L 18 15.74 A 3 1 0 0 1 16 16 A 3 1 0 0 1 14 15.7 L 14 14.74 z M 14 16.74 A 3 1 0 0 0 16 17 A 3 1 0 0 0 18 16.74 L 18 17.74 A 3 1 0 0 1 16 18 A 3 1 0 0 1 14 17.7 L 14 16.74 z "
-        class="ColorScheme-NegativeText"/>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="m 4,3 v 16 h 8 V 16 H 7 L 5,14 V 11.9 C 5.6,11.7 6,11.1 6,10.5 6,9.9 5.6,9.3 5,9.1 V 7 C 5,5.3 6.3,4 8,4 h 4 c 1.66,0 3,1.34 3,3 V 9.1 C 14.4,9.3 14,9.9 14,10.5 c 6.76e-4,0.2 0,0.3 0.1,0.5 H 16 V 3 Z m 2,14 h 5 v 1 H 6 Z"
-        class="ColorScheme-Text"/>
+            }</style>
+ </defs>
+ <path class="ColorScheme-NegativeText" d="m16 12a3 1 0 0 0-3 1v5a3 1 0 0 0 3 1 3 1 0 0 0 3-1v-5a3 1 0 0 0-3-1zm-0.1 1a3 1 0 0 1 0.1 0 3 1 0 0 1 2 0.25781v0.48219a3 1 0 0 1-2 0.26 3 1 0 0 1-2-0.3v-0.5a3 1 0 0 1 1.9-0.2zm-1.9 1.74a3 1 0 0 0 2 0.26 3 1 0 0 0 2-0.26v1a3 1 0 0 1-2 0.26 3 1 0 0 1-2-0.3v-0.96zm0 2a3 1 0 0 0 2 0.26 3 1 0 0 0 2-0.26v1a3 1 0 0 1-2 0.26 3 1 0 0 1-2-0.3v-0.96z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m7 3c-1.662 0-3 1.338-3 3v10c0 1.662 1.338 3 3 3h5v-3h-5l-2-2v-2.0996c0.6-0.2 1-0.80039 1-1.4004s-0.4-1.2004-1-1.4004v-3.0996c0-1.108 0.892-2 2-2h6c1.108 0 2 0.892 2 2v3.0996c-0.6 0.2-1 0.80039-1 1.4004 6.76e-4 0.2-3.92e-4 0.3 0.09961 0.5h1.9004v-5c0-1.662-1.338-3-3-3zm0 14a0.5 0.5 0 0 1 0.025391 0h3.9746v1h-4a0.5 0.5 0 0 1-0.5-0.5 0.5 0.5 0 0 1 0.5-0.5z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/disk-quota-low.svg b/src/status/22/disk-quota-low.svg
index d2540288..c84730b2 100644
--- a/src/status/22/disk-quota-low.svg
+++ b/src/status/22/disk-quota-low.svg
@@ -1,18 +1,12 @@
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-Text {
+<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-NeutralText {
                 color:#f67400;
-            }
-        </style>
-    </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="m 16,12 c -1.656854,0 -3,0.447715 -3,1 v 5 c 0,0.552285 1.343146,1 3,1 1.656854,0 3,-0.447715 3,-1 v -5 c 0,-0.552285 -1.343146,-1 -3,-1 z m -0.1,1 c 0.03333,-1.85e-4 0.06667,-1.85e-4 0.1,0 0.739186,8.7e-4 1.451386,0.09268 2,0.257812 V 13.74 c -0.547637,0.16593 -1.259945,0.25853 -2,0.26 -0.756362,-0.01228 -1.470815,-0.119444 -2,-0.3 v -0.5 c 0.546482,-0.136873 1.216806,-0.207434 1.9,-0.2 z M 14,14.74 c 0.547637,0.16593 1.259945,0.25853 2,0.26 0.740055,-0.0015 1.452363,-0.09407 2,-0.26 v 1 c -0.547637,0.16593 -1.259945,0.25853 -2,0.26 -0.756362,-0.01228 -1.470815,-0.119444 -2,-0.3 z"
-        class="ColorScheme-NeutralText"/>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="m 4,3 v 16 h 8 V 16 H 7 L 5,14 V 11.9 C 5.6,11.7 6,11.1 6,10.5 6,9.9 5.6,9.3 5,9.1 V 7 C 5,5.3 6.3,4 8,4 h 4 c 1.66,0 3,1.34 3,3 V 9.1 C 14.4,9.3 14,9.9 14,10.5 c 6.76e-4,0.2 0,0.3 0.1,0.5 H 16 V 3 Z m 2,14 h 5 v 1 H 6 Z"
-        class="ColorScheme-Text"/>
+            }</style>
+ </defs>
+ <path class="ColorScheme-NeutralText" d="m16 12c-1.6569 0-3 0.44772-3 1v5c0 0.55228 1.3431 1 3 1s3-0.44772 3-1v-5c0-0.55228-1.3431-1-3-1zm-0.1 1c0.03333-1.85e-4 0.06667-1.85e-4 0.1 0 0.73919 8.7e-4 1.4514 0.09268 2 0.25781v0.48219c-0.54764 0.16593-1.2599 0.25853-2 0.26-0.75636-0.01228-1.4708-0.11944-2-0.3v-0.5c0.54648-0.13687 1.2168-0.20743 1.9-0.2zm-1.9 1.74c0.54764 0.16593 1.2599 0.25853 2 0.26 0.74006-0.0015 1.4524-0.09407 2-0.26v1c-0.54764 0.16593-1.2599 0.25853-2 0.26-0.75636-0.01228-1.4708-0.11944-2-0.3z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m7 3c-1.662 0-3 1.338-3 3v10c0 1.662 1.338 3 3 3h5v-3h-5l-2-2v-2.0996c0.6-0.2 1-0.80039 1-1.4004s-0.4-1.2004-1-1.4004v-3.0996c0-1.108 0.892-2 2-2h6c1.108 0 2 0.892 2 2v3.0996c-0.6 0.2-1 0.80039-1 1.4004 6.76e-4 0.2-3.92e-4 0.3 0.09961 0.5h1.9004v-5c0-1.662-1.338-3-3-3zm0 14a0.5 0.5 0 0 1 0.025391 0h3.9746v1h-4a0.5 0.5 0 0 1-0.5-0.5 0.5 0.5 0 0 1 0.5-0.5z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/disk-quota.svg b/src/status/22/disk-quota.svg
index 59bfb482..1e1dcc16 100644
--- a/src/status/22/disk-quota.svg
+++ b/src/status/22/disk-quota.svg
@@ -1,15 +1,9 @@
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-Text {
+<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;
-            }
-        </style>
-    </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="M 16 12 A 3 1 0 0 0 13 13 L 13 18 A 3 1 0 0 0 16 19 A 3 1 0 0 0 19 18 L 19 13 A 3 1 0 0 0 16 12 z M 15.9 13 A 3 1 0 0 1 16 13 A 3 1 0 0 1 18 13.257812 L 18 13.74 A 3 1 0 0 1 16 14 A 3 1 0 0 1 14 13.7 L 14 13.2 A 3 1 0 0 1 15.9 13 z M 14 14.74 A 3 1 0 0 0 16 15 A 3 1 0 0 0 18 14.74 L 18 15.74 A 3 1 0 0 1 16 16 A 3 1 0 0 1 14 15.7 L 14 14.74 z M 14 16.74 A 3 1 0 0 0 16 17 A 3 1 0 0 0 18 16.74 L 18 17.74 A 3 1 0 0 1 16 18 A 3 1 0 0 1 14 17.7 L 14 16.74 z "
-        class="ColorScheme-Text"/>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none"
-        d="m 4,3 v 16 h 8 V 16 H 7 L 5,14 V 11.9 C 5.6,11.7 6,11.1 6,10.5 6,9.9 5.6,9.3 5,9.1 V 7 C 5,5.3 6.3,4 8,4 h 4 c 1.66,0 3,1.34 3,3 V 9.1 C 14.4,9.3 14,9.9 14,10.5 c 6.76e-4,0.2 0,0.3 0.1,0.5 H 16 V 3 Z m 2,14 h 5 v 1 H 6 Z"
-        class="ColorScheme-Text"/>
+            }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m16 12a3 1 0 0 0-3 1v5a3 1 0 0 0 3 1 3 1 0 0 0 3-1v-5a3 1 0 0 0-3-1zm-0.1 1a3 1 0 0 1 0.1 0 3 1 0 0 1 2 0.25781v0.48219a3 1 0 0 1-2 0.26 3 1 0 0 1-2-0.3v-0.5a3 1 0 0 1 1.9-0.2zm-1.9 1.74a3 1 0 0 0 2 0.26 3 1 0 0 0 2-0.26v1a3 1 0 0 1-2 0.26 3 1 0 0 1-2-0.3v-0.96zm0 2a3 1 0 0 0 2 0.26 3 1 0 0 0 2-0.26v1a3 1 0 0 1-2 0.26 3 1 0 0 1-2-0.3v-0.96z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m7 3c-1.662 0-3 1.338-3 3v10c0 1.662 1.338 3 3 3h5v-3h-5l-2-2v-2.0996c0.6-0.2 1-0.80039 1-1.4004s-0.4-1.2004-1-1.4004v-1.0996-1-1c0-1.108 0.892-2 2-2h1 4 1c1.108 0 2 0.892 2 2v1 1 1.0996c-0.6 0.2-1 0.80039-1 1.4004 6.76e-4 0.2-3.92e-4 0.3 0.099609 0.5h1.9004v-5c0-1.662-1.338-3-3-3h-6zm0 14a0.5 0.5 0 0 1 0.025391 0h3.9746v1h-4a0.5 0.5 0 0 1-0.5-0.5 0.5 0.5 0 0 1 0.5-0.5z" fill="currentColor"/>
 </svg>
diff --git a/src/status/32/apport.svg b/src/status/32/apport.svg
index a83181f3..71e11b9b 100644
--- a/src/status/32/apport.svg
+++ b/src/status/32/apport.svg
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="32" height="32">
-    <style type="text/css" id="current-color-scheme">
-      .ColorScheme-Text {
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
-      }
-      </style>
-    <g id="apport" transform="translate(-22,0)">
-    <path id="path12" class="ColorScheme-Text" d="M 26 4 L 26 28 L 50 28 L 50 4 L 26 4 z M 27 5 L 49 5 L 49 27 L 27 27 L 27 5 z M 29 7 L 29 9 L 31 9 L 31 7 L 29 7 z M 31 9 L 31 12 L 34 12 L 34 9 L 31 9 z M 34 9 L 36 9 L 36 7 L 34 7 L 34 9 z M 34 12 L 34 14 L 36 14 L 36 12 L 34 12 z M 31 12 L 29 12 L 29 14 L 31 14 L 31 12 z M 40 7 L 40 9 L 42 9 L 42 7 L 40 7 z M 42 9 L 42 12 L 45 12 L 45 9 L 42 9 z M 45 9 L 47 9 L 47 7 L 45 7 L 45 9 z M 45 12 L 45 14 L 47 14 L 47 12 L 45 12 z M 42 12 L 40 12 L 40 14 L 42 14 L 42 12 z M 34 17 L 34 19 L 42 19 L 42 17 L 34 17 z M 42 19 L 42 21 L 44 21 L 44 19 L 42 19 z M 44 21 L 44 23 L 46 23 L 46 21 L 44 21 z M 34 19 L 32 19 L 32 21 L 34 21 L 34 19 z M 32 21 L 30 21 L 30 23 L 32 23 L 32 21 z " style="fill:currentColor;fill-opacity:1;stroke:none"/>
-    <path id="path14" d="M 22 0 L 22 32 L 54 32 L 54 0 L 22 0 z " style="opacity:1;fill:none"/>
-  </g>
+      }</style>
+ <g id="apport" transform="translate(-22)">
+  <path class="ColorScheme-Text" d="m29 4c-1.662 0-3 1.338-3 3v18c0 1.662 1.338 3 3 3h18c1.662 0 3-1.338 3-3v-18c0-1.662-1.338-3-3-3h-18zm0 1h18c1.108 0 2 0.892 2 2v18c0 1.108-0.892 2-2 2h-18c-1.108 0-2-0.892-2-2v-18c0-1.108 0.892-2 2-2zm0 2v2h2v-2h-2zm2 2v3h3v-3h-3zm3 0h2v-2h-2v2zm0 3v2h2v-2h-2zm-3 0h-2v2h2v-2zm9-5v2h2v-2h-2zm2 2v3h3v-3h-3zm3 0h2v-2h-2v2zm0 3v2h2v-2h-2zm-3 0h-2v2h2v-2zm-8 5v2h8v-2h-8zm8 2v2h2v-2h-2zm2 2v2h2v-2h-2zm-10-2h-2v2h2v-2zm-2 2h-2v2h2v-2z" fill="currentColor"/>
+  <path d="m22 0v32h32v-32h-32z" fill="none"/>
+ </g>
 </svg>
diff --git a/src/status/32/battery-ups.svg b/src/status/32/battery-ups.svg
index 936236a4..13c2cf15 100644
--- a/src/status/32/battery-ups.svg
+++ b/src/status/32/battery-ups.svg
@@ -1,40 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="32"
-   height="32"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="battery-ups.svg"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     id="namedview8"
-     pagecolor="#f2f2f2"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="205"
-     inkscape:cy="-151"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg6" />
-  <style
-     type="text/css"
-     id="current-color-scheme">
-      .ColorScheme-Text {
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
       }
       .ColorScheme-Background{
@@ -42,24 +7,7 @@
       }
       .ColorScheme-ButtonText {
         color:#f2f2f2;
-      }
-</style>
-  <g
-     id="battery-ups"
-     transform="translate(-182.53572,-428.50504)">
-    <rect
-       y="428.50504"
-       x="182.53572"
-       height="31.999998"
-       width="31.999998"
-       id="rect4447"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="rect4411"
-       d="m 189.53572,432.50504 v 24 h 18 v -24 z m 1,1 h 16 v 22 h -16 z m 8,2 -3,7 h 3 v 4 l 3,-7 h -3 z m -6,15 v 3 h 1 v -3 z m 2,0 v 3 h 1 v -3 z m 2,0 v 3 h 1 v -3 z m 2,0 v 3 h 1 v -3 z m 4.5,0 c -0.82843,0 -1.5,0.67157 -1.5,1.5 0,0.82843 0.67157,1.5 1.5,1.5 0.82843,0 1.5,-0.67157 1.5,-1.5 0,-0.82843 -0.67157,-1.5 -1.5,-1.5 z"
-       style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
-       class="ColorScheme-Text"
-       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccsssss" />
-  </g>
+      }</style>
+ <path class="ColorScheme-Text" d="m16 8-3 7h3v4l3-7h-3zm-6 15v3h1v-3zm2 0v3h1v-3zm2 0v3h1v-3zm2 0v3h1v-3zm4.5 0c-0.82843 0-1.5 0.67157-1.5 1.5s0.67157 1.5 1.5 1.5 1.5-0.67157 1.5-1.5-0.67157-1.5-1.5-1.5z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m7 26.5c0 2.493 2.007 4.5 4.5 4.5h9c2.493 0 4.5-2.007 4.5-4.5v-18c0-2.493-2.007-4.5-4.5-4.5h-9c-2.493 0-4.5 2.007-4.5 4.5zm1 0v-18c0-1.939 1.561-3.5 3.5-3.5h9c1.939 0 3.5 1.561 3.5 3.5v18c0 1.939-1.561 3.5-3.5 3.5h-9c-1.939 0-3.5-1.561-3.5-3.5zm5.5-23.5h5c0-1.1046-1.1193-2-2.5-2s-2.5 0.89543-2.5 2z" fill="currentColor" opacity=".45"/>
 </svg>
diff --git a/src/status/32/disk-quota.svg b/src/status/32/disk-quota.svg
new file mode 100644
index 00000000..09cb7f9c
--- /dev/null
+++ b/src/status/32/disk-quota.svg
@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#f2f2f2; }</style>
+ </defs>
+ <path class="ColorScheme-Text" d="m9 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h14c1.108 0 2-0.892 2-2v-20c0-1.108-0.892-2-2-2zm0 1h14c0.554 0 1 0.446 1 1v6.1738a3 3 0 0 0-2 2.8262 3 3 0 0 0 2 2.8281v6.1719c0 0.554-0.446 1-1 1h-14c-0.554 0-1-0.446-1-1v-6.1719a3 3 0 0 0 2-2.8281 3 3 0 0 0-2-2.8262v-6.1738c0-0.554 0.446-1 1-1zm0.48828 1a0.5 0.5 0 0 0-0.48828 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.5 0.5 0.5 0 0 0-0.011719 0zm13 0a0.5 0.5 0 0 0-0.48828 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.5 0.5 0.5 0 0 0-0.011719 0zm-14.488 7.2695a2 2 0 0 1 1 1.7305 2 2 0 0 1-1 1.7305zm16 0v3.4609a2 2 0 0 1-1-1.7305 2 2 0 0 1 1-1.7305zm-14.512 9.7305a0.5 0.5 0 0 0-0.48828 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.5 0.5 0.5 0 0 0-0.011719 0zm13 0a0.5 0.5 0 0 0-0.48828 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.5 0.5 0.5 0 0 0-0.011719 0zm-11.988 3h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5zm9 0h2c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-2c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m16 11a3 1 0 0 0-3 1v5a3 1 0 0 0 3 1 3 1 0 0 0 3-1v-5a3 1 0 0 0-3-1zm0 1a3 1 0 0 1 2 0.3v0.4a3 1 0 0 1-2 0.3 3 1 0 0 1-2-0.3v-0.4a3 1 0 0 1 2-0.3zm-2 1.7a3 1 0 0 0 2 0.3 3 1 0 0 0 2-0.3v1a3 1 0 0 1-2 0.3 3 1 0 0 1-2-0.3zm0 2a3 1 0 0 0 2 0.3 3 1 0 0 0 2-0.3v1a3 1 0 0 1-2 0.3 3 1 0 0 1-2-0.3z" fill="currentColor"/>
+</svg>
diff --git a/src/status/32/input-caps-on.svg b/src/status/32/input-caps-on.svg
index 6e8e2b2f..41c18aad 100644
--- a/src/status/32/input-caps-on.svg
+++ b/src/status/32/input-caps-on.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="32" height="32">
-    <style type="text/css" id="current-color-scheme">.ColorScheme-Text {
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
       }
       .ColorScheme-Background {
@@ -11,10 +10,7 @@
       }
       .ColorScheme-ButtonText {
         color:#f2f2f2;
-      }
-    </style>
-    <g id="input-caps-on" transform="translate(19,48.000003) translate(-38,-160)">
-        <rect x="19" y="112" width="32" height="32" opacity=".00100002"/>
-        <path class="ColorScheme-Text" d="m25 116v20l10 4 10-4v-20h-1zm1 1h18v16h-18zm8.40625 3-4.40625 10h1.30078l1.32227-3h4.72265l1.34961 3h1.30469l-4.5-10zm0.55273 1.69531 1.9375 4.30469h-3.83398zm-8.95898 12.30469h18v1h-18z" fill="currentColor"/>
-    </g>
+      }</style>
+ <path class="ColorScheme-Text" d="m10.995 5.496c-2.77 0-5 2.23-5 5v11c0 2.77 3 4.2 5 5l5 2 5-2c2-0.8 5-2.23 5-5v-11c0-2.77-2.23-5-5-5zm-0.02539 1.5h10.051c1.9251 0 3.4746 1.5496 3.4746 3.4746v9.0508c0 1.9251-1.5496 3.4746-3.4746 3.4746h-10.051c-1.9251 0-3.4746-1.5496-3.4746-3.4746v-9.0508c0-1.9251 1.5496-3.4746 3.4746-3.4746z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m14.882 9.996-3.8086 10h1.6055l0.95313-2.5h4.7266l0.95313 2.5h1.6055l-3.8086-10zm1.1133 1.2969 1.793 4.7031h-3.5859z" fill="currentColor"/>
 </svg>
diff --git a/src/status/32/input-combo-on.svg b/src/status/32/input-combo-on.svg
index 6f2e005c..e5b7f576 100644
--- a/src/status/32/input-combo-on.svg
+++ b/src/status/32/input-combo-on.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="32" height="32">
-    <style type="text/css" id="current-color-scheme">.ColorScheme-Text {
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
       }
       .ColorScheme-Background {
@@ -11,10 +10,8 @@
       }
       .ColorScheme-ButtonText {
         color:#f2f2f2;
-      }
-    </style>
-    <g id="input-combo-on" transform="translate(19,111.99999) translate(-38,-224)">
-        <rect x="19" y="112" width="32" height="32" opacity=".00100002"/>
-        <path class="ColorScheme-Text" d="m25 116v20l10 4 10-4v-20h-1zm1 1h18v16h-18zm0 17h18v1h-18zm6.40625-12.99999-4.40625 10h1.30078l1.32227-3h4.72265l1.34961 3h1.30469l-4.5-10zm0.55273 1.69531 1.9375 4.30469h-3.83398zm7.04102-3.69531v1.8h-2v0.9h2v5.4h-2v0.9h5v-0.9h-2v-8.1z" fill="currentColor"/>
-    </g>
+      }</style>
+ <path class="ColorScheme-Text" d="m10.995 5.496c-2.77 0-5 2.23-5 5v11c0 2.77 3 4.2 5 5l5 2 5-2c2-0.8 5-2.23 5-5v-11c0-2.77-2.23-5-5-5zm-0.02539 1.5h10.051c1.9251 0 3.4746 1.5496 3.4746 3.4746v9.0508c0 1.9251-1.5496 3.4746-3.4746 3.4746h-10.051c-1.9251 0-3.4746-1.5496-3.4746-3.4746v-9.0508c0-1.9251 1.5496-3.4746 3.4746-3.4746z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m21 8v1h-1v1h1v2h-1v1h3v-1h-1v-4z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m14.882 9.996-3.8086 10h1.6055l0.95313-2.5h4.7266l0.95313 2.5h1.6055l-3.8086-10zm1.1133 1.2969 1.793 4.7031h-3.5859z" color="#f2f2f2" fill="currentColor"/>
 </svg>
diff --git a/src/status/32/input-keyboard-battery.svg b/src/status/32/input-keyboard-battery.svg
index 36a1a3c9..8fad04e8 100644
--- a/src/status/32/input-keyboard-battery.svg
+++ b/src/status/32/input-keyboard-battery.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="32" height="32">
-    <style type="text/css" id="current-color-scheme">.ColorScheme-Text {
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
       }
       .ColorScheme-Background {
@@ -11,10 +10,8 @@
       }
       .ColorScheme-ButtonText {
         color:#f2f2f2;
-      }
-    </style>
-    <g id="input-keyboard-battery" transform="translate(-332,-428.36237) translate(-38,-128)">
-        <rect x="370" y="556.36237" width="32" height="32" ry="0" fill="none"/>
-        <path class="ColorScheme-Text" transform="translate(332,428.36237)" d="m44 132v20l10 4 10-4v-11h-1v8h-18v-16h14v-1zm18 0-2 5h2v3l2-5h-2zm-8.59375 4-4.40625 10h1.300781l1.322266-3h4.722656l1.349609 3h1.304688l-4.5-10zm0.552734 1.69531 1.9375 4.30469h-3.833984zm-8.958984 12.30469h18v1h-18z" fill="currentColor"/>
-    </g>
+      }</style>
+ <path class="ColorScheme-Text" d="m24 4-2 5h2v3l2-5h-2z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m10.99 5.5c-2.77 0-5 2.23-5 5v11c0 2.77 3 4.2 5 5l5 2 5-2c2-0.8 5-2.23 5-5v-9h-1.5v7.0254c0 1.9251-1.5496 3.4746-3.4746 3.4746h-10.051c-1.9251 0-3.4746-1.5496-3.4746-3.4746v-9.0508c0-1.9251 1.5496-3.4746 3.4746-3.4746h10.025v-1.5z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m14.877 10-3.8086 10h1.6055l0.95312-2.5h4.7266l0.95312 2.5h1.6055l-3.8086-10zm1.1133 1.2969 1.793 4.7031h-3.5859z" fill="currentColor"/>
 </svg>
diff --git a/src/status/32/input-keyboard-brightness.svg b/src/status/32/input-keyboard-brightness.svg
index 8d7c8d0c..f3e8e722 100644
--- a/src/status/32/input-keyboard-brightness.svg
+++ b/src/status/32/input-keyboard-brightness.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="32" height="32">
-    <style type="text/css" id="current-color-scheme">.ColorScheme-Text {
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
       }
       .ColorScheme-Background {
@@ -11,11 +10,8 @@
       }
       .ColorScheme-ButtonText {
         color:#f2f2f2;
-      }
-    </style>
-    <g id="input-keyboard-brightness" transform="translate(-364,-460.36237) translate(-38,-96)">
-        <rect x="402" y="556.36237" width="32" height="32" ry="0" fill="none"/>
-        <path class="ColorScheme-Text" transform="translate(364,460.36237)" d="m44 100v20l10 4 10-4v-10h-1v7h-18v-16h12v-1zm9.40625 4-4.40625 10h1.300781l1.322266-3h4.722656l1.349609 3h1.304688l-4.5-10zm0.552734 1.69531 1.9375 4.30469h-3.833984zm-8.958984 12.30469h18v1h-18z" fill="currentColor"/>
-        <path class="ColorScheme-Text" transform="translate(326,534.3622)" d="m100 25c-0.277 0-0.5 0.223-0.5 0.5v1c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-1c0-0.277-0.223-0.5-0.5-0.5zm-3.181641 1.318359c-0.127809 0-0.255581 0.04855-0.353515 0.146485-0.195869 0.195868-0.195869 0.511162 0 0.707031l0.707031 0.707031c0.195869 0.195869 0.511163 0.195869 0.707031 0 0.195869-0.195868 0.195869-0.511162 0-0.707031l-0.707031-0.707031c-0.09793-0.09793-0.225706-0.146485-0.353516-0.146485zm6.363281 0c-0.12781 0-0.25558 0.04855-0.35352 0.146485l-0.70703 0.707031c-0.19586 0.195869-0.19586 0.511163 0 0.707031 0.19587 0.195869 0.51117 0.195869 0.70703 0l0.70704-0.707031c0.19586-0.195869 0.19586-0.511163 0-0.707031-0.0979-0.09793-0.22571-0.146485-0.35352-0.146485zm-3.18164 1.681641c-1.104569 0-2 0.895431-2 2s0.895431 2 2 2c1.10457 0 2-0.895431 2-2s-0.89543-2-2-2zm0 1v2c-0.552285 0-1-0.447715-1-1s0.447715-1 1-1zm-4.5 0.5c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h1c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm8 0c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h1c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm-5.974609 2.474609c-0.12781 0-0.255582 0.04855-0.353516 0.146485l-0.707031 0.707031c-0.195869 0.195869-0.195869 0.511163 0 0.707031 0.195868 0.195869 0.511162 0.195869 0.707031 0l0.707031-0.707031c0.195869-0.195869 0.195869-0.511163 0-0.707031-0.09793-0.09793-0.225706-0.146485-0.353515-0.146485zm4.949219 0c-0.12781 0-0.25558 0.04855-0.35352 0.146485-0.19586 0.195868-0.19586 0.511162 0 0.707031l0.70703 0.707031c0.19587 0.195869 0.51117 0.195869 0.70704 0 0.19586-0.195868 0.19586-0.511162 0-0.707031l-0.70704-0.707031c-0.0979-0.09793-0.2257-0.146485-0.35351-0.146485zm-2.47461 1.025391c-0.277 0-0.5 0.223-0.5 0.5v1c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-1c0-0.277-0.223-0.5-0.5-0.5z" fill="currentColor"/>
-    </g>
+      }</style>
+ <path class="ColorScheme-Text" d="m10.995 5.496c-2.77 0-5 2.23-5 5v11c0 2.77 3 4.2 5 5l5 2 5-2c2-0.8 5-2.23 5-5v-7h-1.5v5.0254c0 1.9251-1.5496 3.4746-3.4746 3.4746h-10.051c-1.9251 0-3.4746-1.5496-3.4746-3.4746v-9.0508c0-1.9251 1.5496-3.4746 3.4746-3.4746h7.0254v-1.5z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m22.995 3.996c-0.277 0-0.5 0.223-0.5 0.5v1c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-1c0-0.277-0.223-0.5-0.5-0.5zm-3.1816 1.3184c-0.12781 0-0.25558 0.0485-0.35352 0.14648-0.19587 0.19587-0.19587 0.51117 0 0.70704l0.70703 0.70703c0.19587 0.19587 0.51116 0.19587 0.70703 0s0.19587-0.51116 0-0.70703l-0.70703-0.70704c-0.09793-0.0979-0.22571-0.14648-0.35352-0.14648zm6.3633 0c-0.12781 0-0.25558 0.0485-0.35352 0.14648l-0.70703 0.70704c-0.19586 0.19587-0.19586 0.51116 0 0.70703 0.19587 0.19587 0.51117 0.19587 0.70703 0l0.70703-0.70703c0.19586-0.19587 0.19586-0.51117 0-0.70704-0.0979-0.0979-0.2257-0.14648-0.35352-0.14648zm-3.1816 1.6816c-1.1046 0-2 0.89543-2 2s0.89543 2 2 2c1.1046 0 2-0.89543 2-2s-0.89543-2-2-2zm0 1v2c-0.55228 0-1-0.44772-1-1s0.44772-1 1-1zm-4.5 0.5c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h1c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm8 0c-0.277 0-0.5 0.223-0.5 0.5s0.223 0.5 0.5 0.5h1c0.277 0 0.5-0.223 0.5-0.5s-0.223-0.5-0.5-0.5zm-5.9746 2.4746c-0.12781 0-0.25558 0.0486-0.35352 0.14648l-0.70703 0.70704c-0.19587 0.19586-0.19587 0.51116 0 0.70703s0.51116 0.19587 0.70703 0l0.70703-0.70703c0.19587-0.19587 0.19587-0.51117 0-0.70704-0.09793-0.0979-0.2257-0.14648-0.35352-0.14648zm4.9492 0c-0.12781 0-0.25558 0.0486-0.35352 0.14648-0.19586 0.19587-0.19586 0.51117 0 0.70704l0.70703 0.70703c0.19587 0.19587 0.51116 0.19587 0.70703 0 0.19586-0.19587 0.19586-0.51117 0-0.70703l-0.70703-0.70704c-0.0979-0.0979-0.22571-0.14648-0.35352-0.14648zm-2.4746 1.0254c-0.277 0-0.5 0.223-0.5 0.5v1c0 0.277 0.223 0.5 0.5 0.5s0.5-0.223 0.5-0.5v-1c0-0.277-0.223-0.5-0.5-0.5z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m14.882 9.996-3.8086 10h1.6055l0.95312-2.5h4.7266l0.95312 2.5h1.6055l-3.8086-10zm1.1133 1.2969 1.793 4.7031h-3.5859z" fill="currentColor"/>
 </svg>
diff --git a/src/status/32/input-keyboard-color.svg b/src/status/32/input-keyboard-color.svg
index 7dd0ebd4..e160b2b5 100644
--- a/src/status/32/input-keyboard-color.svg
+++ b/src/status/32/input-keyboard-color.svg
@@ -1,13 +1,9 @@
-<svg id="svg2" version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
-    <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
+<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
       }</style>
-    <g id="input-keyboard-color" transform="translate(-402 -556.36237)">
-        <rect id="rect1" x="402" y="556.36237" width="32" height="32" ry="0" fill="none"/>
-        <g id="g1" fill="currentColor">
-            <path id="path1" class="ColorScheme-Text" transform="translate(364,460.36237)" d="m44 100v20l10 4 10-4v-10h-1v7h-18v-16h12v-1zm9.40625 4-4.40625 10h1.300781l1.322266-3h4.722656l1.349609 3h1.304688l-4.5-10zm0.552734 1.69531 1.9375 4.30469h-3.833984zm-8.958984 12.30469h18v1h-18z" fill="currentColor"/>
-            <path id="path2" class="ColorScheme-Text" transform="translate(402,556.36237)" d="m24.203 4.176c-0.464 1.0928-1.07 2.008-1.597 2.8048-0.357 0.5552-0.76 1.1632-1.029 1.8392-0.07 0.236-0.116 0.4808-0.116 0.7296 0 0.8648 0.444 1.6264 1.121 2.1032 0.232 0.05102 0.469 0.07723 0.706 0.07816 1.767 0 3.2-1.366698 3.2-3.05312 0-0.231536-0.03-0.462186-0.08-0.687504 0.03 0.03735 0.05 0.07539 0.08 0.114064-0.217-0.3968-0.457-0.7728-0.683-1.1232-0.526-0.7968-1.133-1.712-1.597-2.8048" stroke-width=".8" fill="currentColor"/>
-            <path id="path3" class="ColorScheme-Text" transform="translate(402,556.36237)" d="m24.203 3c-0.133 0.4552-0.311 0.9-0.505 1.336-0.985 2.16-2.529 3.6384-2.678 5.0016 0 0.02-0.01 0.0424-0.02 0.0624l0.01 0.0048c0 0.0472-0.01 0.0936-0.01 0.1408 0 1.6872 1.433 3.0544 3.2 3.0544s3.2-1.368 3.2-3.0544c0-0.0464-0.01-0.0936-0.01-0.1408l0.01-0.0048c0-0.02-0.01-0.0424-0.02-0.0624-0.149-1.3632-1.692-2.8416-2.678-5.0016-0.194-0.436-0.372-0.8808-0.505-1.336m0 1.172c0.464 1.0928 1.07 2.008 1.597 2.8048 0.357 0.5552 0.76 1.1632 1.029 1.8392 0.07 0.236 0.116 0.4808 0.116 0.7296 0 1.4456-1.227 2.6184-2.742 2.6184s-2.742-1.1728-2.742-2.6184c0-0.2488 0.04-0.4936 0.116-0.7296 0.269-0.6752 0.673-1.284 1.029-1.8392 0.527-0.7968 1.133-1.712 1.597-2.8048" fill="currentColor"/>
-        </g>
-    </g>
+ <path class="ColorScheme-Text" d="m24.203 3.576c-0.464 1.0928-1.07 2.008-1.597 2.8048-0.357 0.5552-0.76 1.1632-1.029 1.8392-0.07 0.236-0.116 0.4808-0.116 0.7296 0 0.8648 0.444 1.6264 1.121 2.1032 0.232 0.05102 0.469 0.07723 0.706 0.07816 1.767 0 3.2-1.3667 3.2-3.0531 0-0.23154-0.03-0.46219-0.08-0.6875 0.03 0.03735 0.05 0.07539 0.08 0.11406-0.217-0.3968-0.457-0.7728-0.683-1.1232-0.526-0.7968-1.133-1.712-1.597-2.8048" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m24.203 2.4c-0.133 0.4552-0.311 0.9-0.505 1.336-0.985 2.16-2.529 3.6384-2.678 5.0016 0 0.02-0.01 0.0424-0.02 0.0624l0.01 0.0048c0 0.0472-0.01 0.0936-0.01 0.1408 0 1.6872 1.433 3.0544 3.2 3.0544s3.2-1.368 3.2-3.0544c0-0.0464-0.01-0.0936-0.01-0.1408l0.01-0.0048c0-0.02-0.01-0.0424-0.02-0.0624-0.149-1.3632-1.692-2.8416-2.678-5.0016-0.194-0.436-0.372-0.8808-0.505-1.336m0 1.172c0.464 1.0928 1.07 2.008 1.597 2.8048 0.357 0.5552 0.76 1.1632 1.029 1.8392 0.07 0.236 0.116 0.4808 0.116 0.7296 0 1.4456-1.227 2.6184-2.742 2.6184s-2.742-1.1728-2.742-2.6184c0-0.2488 0.04-0.4936 0.116-0.7296 0.269-0.6752 0.673-1.284 1.029-1.8392 0.527-0.7968 1.133-1.712 1.597-2.8048" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m10.99 5.5c-2.77 0-5 2.23-5 5v11c0 2.77 3 4.2 5 5l5 2 5-2c2-0.8 5-2.23 5-5v-8.5h-1.5v6.5254c0 1.9251-1.5496 3.4746-3.4746 3.4746h-10.051c-1.9251 0-3.4746-1.5496-3.4746-3.4746v-9.0508c0-1.9251 1.5496-3.4746 3.4746-3.4746h10.025v-1.5z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m14.877 10-3.8086 10h1.6055l0.95312-2.5h4.7266l0.95312 2.5h1.6055l-3.8086-10zm1.1133 1.2969 1.793 4.7031h-3.5859z" fill="currentColor"/>
 </svg>
diff --git a/src/status/32/input-num-on.svg b/src/status/32/input-num-on.svg
index 9ec1441b..84b46920 100644
--- a/src/status/32/input-num-on.svg
+++ b/src/status/32/input-num-on.svg
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="32" height="32">
-    <style type="text/css" id="current-color-scheme">.ColorScheme-Text {
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#f2f2f2;
       }
       .ColorScheme-Background {
@@ -11,10 +10,7 @@
       }
       .ColorScheme-ButtonText {
         color:#f2f2f2;
-      }
-    </style>
-    <g id="input-num-on" transform="translate(19,79.999986) translate(-38,-192)">
-        <rect x="19" y="112" width="32" height="32" opacity=".00100002"/>
-        <path class="ColorScheme-Text" d="m25 116v20l10 4 10-4v-20h-1zm1 1h18v16h-18zm9 3v2h-2v1h2v6h-2v1h5v-1h-2v-9zm-9 14h18v1h-18z" fill="currentColor"/>
-    </g>
+      }</style>
+ <path class="ColorScheme-Text" d="m10.995 5.496c-2.77 0-5 2.23-5 5v11c0 2.77 3 4.2 5 5l5 2 5-2c2-0.8 5-2.23 5-5v-11c0-2.77-2.23-5-5-5zm-0.02539 1.5h10.051c1.9251 0 3.4746 1.5496 3.4746 3.4746v9.0508c0 1.9251-1.5496 3.4746-3.4746 3.4746h-10.051c-1.9251 0-3.4746-1.5496-3.4746-3.4746v-9.0508c0-1.9251 1.5496-3.4746 3.4746-3.4746z" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m14.995 9.996v2h-2v2h2v4h-2v2h6v-2h-2v-8z" fill="currentColor"/>
 </svg>