symbolic: avoid segmented states for battery

helps with issue #6

8 files changed, 68 insertions, 79 deletions

diff --git a/Adwaita/scalable/status/battery-caution-charging-symbolic.svg b/Adwaita/scalable/status/battery-caution-charging-symbolic.svg
index bf289b248..3ee649a88 100644
--- a/Adwaita/scalable/status/battery-caution-charging-symbolic.svg
+++ b/Adwaita/scalable/status/battery-caution-charging-symbolic.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path class="error" d="M5 11v2h3v-2z" fill="#ef2929"/>
-    <path d="M5.469.012c-.49 0-.796.215-1.032.455C4.202.707 4 1.023 4 1.497V2H2v14h8v-2H4V4h2V2.012h4V4h2v3h2V2h-2v-.395l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.279-.62-.584-1.2-.552z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#474747"/>
-    <path d="M12.957 8.002a1 1 0 0 0-.664.291l-3 3A1 1 0 0 0 10 13h2.104l-.96 1.404a1 1 0 0 0 1.524 1.28l3.031-2.97A1 1 0 0 0 15 11h-2.13l.962-1.445a1 1 0 0 0-.875-1.553z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#474747"/>
-    <path d="M15 11h1v1h-1zM9 12h1v1H9zM13 8h1v1h-1zM10.969 14.968h1v1h-1z" style="marker:none" color="#bebebe" overflow="visible" fill="#474747"/>
+    <path class="error" d="M5 12v1h3v-1z" fill="#ef2929"/>
+    <path d="M5.469.012c-.49 0-.796.215-1.032.455C4.202.707 4 1.023 4 1.497V2H2v14h8v-2H4V4h2V2.012h4V4h2v3h2V2h-2v-.395l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.279-.62-.584-1.2-.552z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible" fill="#2e3436"/>
+    <path d="M12.957 8.002a1 1 0 0 0-.664.291l-3 3A1 1 0 0 0 10 13h2.104l-.96 1.404a1 1 0 0 0 1.524 1.28l3.031-2.97A1 1 0 0 0 15 11h-2.13l.962-1.445a1 1 0 0 0-.875-1.553z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible" fill="#2e3436"/>
+    <path d="M15 11h1v1h-1zM9 12h1v1H9zM13 8h1v1h-1zM10.969 14.968h1v1h-1z" style="marker:none" color="#bebebe" overflow="visible" fill="#2e3436"/>
 </svg>
diff --git a/Adwaita/scalable/status/battery-caution-symbolic.svg b/Adwaita/scalable/status/battery-caution-symbolic.svg
index 1ebdc2423..e8ff29924 100644
--- a/Adwaita/scalable/status/battery-caution-symbolic.svg
+++ b/Adwaita/scalable/status/battery-caution-symbolic.svg
@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path class="error" d="M5 11v2h2v-2z" fill="#c00"/>
-    <path d="M5.469.012c-.49 0-.796.215-1.032.455C4.202.707 4 1.023 4 1.497V2H2v14h5v-2H4V4h2V2.012h4V4h2v3h2V2h-2v-.395l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.278-.62-.584-1.2-.552z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible" fill="#2e3436"/>
+    <path class="error" d="M5 12v1h2v-1z" fill="#c00"/>
+    <path d="M5.469.012c-.49 0-.796.215-1.032.455C4.202.707 4 1.023 4 1.497V2H2v14h5v-2H4V4h2V2.012h4V4h2v3h2V2h-2v-.395l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.278-.62-.584-1.2-.552z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible" fill="#2e3436"/>
     <path class="warning" d="M8.875 8A.863.863 0 0 0 8 8.875v6.25c0 .492.383.875.875.875h6.25a.863.863 0 0 0 .875-.875v-6.25A.863.863 0 0 0 15.125 8zM11 9h2v2.5s0 .5-.5.5h-1c-.5 0-.5-.5-.5-.5zm.5 4h1c.277 0 .5.223.5.5v1c0 .277-.223.5-.5.5h-1a.499.499 0 0 1-.5-.5v-1c0-.277.223-.5.5-.5z" style="marker:none" color="#bebebe" overflow="visible" fill="#f57900"/>
 </svg>
diff --git a/Adwaita/scalable/status/battery-full-charging-symbolic.svg b/Adwaita/scalable/status/battery-full-charging-symbolic.svg
index 60feeada4..7248cce3b 100644
--- a/Adwaita/scalable/status/battery-full-charging-symbolic.svg
+++ b/Adwaita/scalable/status/battery-full-charging-symbolic.svg
@@ -1,8 +1,8 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#474747">
-        <path d="M5 5v2h6V5zM5 8v2h4l1-1 1-1zm0 3v2h3v-2z"/>
-        <path d="M5.469.012c-.49 0-.796.215-1.032.455C4.202.707 4 1.023 4 1.497V2H2v14h8v-2H4V4h2V2.012h4V4h2v3h2V2h-2v-.395l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.279-.62-.584-1.2-.552z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
-        <path d="M12.957 8.002a1 1 0 0 0-.664.291l-3 3A1 1 0 0 0 10 13h2.104l-.96 1.404a1 1 0 0 0 1.524 1.28l3.031-2.97A1 1 0 0 0 15 11h-2.13l.962-1.445a1 1 0 0 0-.875-1.553z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
+    <g fill="#2e3436">
+        <path d="M5 5v8h3v-2l2-2 1-1V5z"/>
+        <path d="M5.469.012c-.49 0-.796.215-1.032.455C4.202.707 4 1.023 4 1.497V2H2v14h8v-2H4V4h2V2.012h4V4h2v3h2V2h-2v-.395l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.279-.62-.584-1.2-.552z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible"/>
+        <path d="M12.957 8.002a1 1 0 0 0-.664.291l-3 3A1 1 0 0 0 10 13h2.104l-.96 1.404a1 1 0 0 0 1.524 1.28l3.031-2.97A1 1 0 0 0 15 11h-2.13l.962-1.445a1 1 0 0 0-.875-1.553z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible"/>
         <path d="M15 11h1v1h-1zM9 12h1v1H9zM13 8h1v1h-1zM10.969 14.968h1v1h-1z" style="marker:none" color="#bebebe" overflow="visible"/>
     </g>
 </svg>
diff --git a/Adwaita/scalable/status/battery-full-symbolic.svg b/Adwaita/scalable/status/battery-full-symbolic.svg
index 38bec21df..994474aa6 100644
--- a/Adwaita/scalable/status/battery-full-symbolic.svg
+++ b/Adwaita/scalable/status/battery-full-symbolic.svg
@@ -1,7 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16.001">
-    <g fill="#474747">
-        <path d="M5 5v2h6V5z" style="marker:none" color="#000" overflow="visible"/>
-        <path d="M5.469 0c-.49 0-.796.216-1.032.456C4.202.696 4 1.012 4 1.486V2H2v14h12V2h-2v-.406l-.002-.028a1.616 1.616 0 0 0-.416-1.012c-.236-.278-.62-.584-1.2-.552L10.438 0zM6 2h4v2h2v10H4V4h2z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
-        <path d="M5 8v2h6V8zM5 11v2h6v-2z" style="marker:none" color="#000" overflow="visible"/>
+    <g fill="#2e3436">
+        <path d="M5.469 0c-.49 0-.796.216-1.032.456C4.202.696 4 1.012 4 1.486V2H2v14h12V2h-2v-.406l-.002-.028a1.616 1.616 0 0 0-.416-1.012c-.236-.278-.62-.584-1.2-.552L10.438 0zM6 2h4v2h2v10H4V4h2z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible"/>
+        <path d="M5 5v8h6V5z" style="marker:none" color="#000" overflow="visible"/>
     </g>
 </svg>
diff --git a/Adwaita/scalable/status/battery-good-charging-symbolic.svg b/Adwaita/scalable/status/battery-good-charging-symbolic.svg
index abc0a965c..262cd2a88 100644
--- a/Adwaita/scalable/status/battery-good-charging-symbolic.svg
+++ b/Adwaita/scalable/status/battery-good-charging-symbolic.svg
@@ -1,8 +1,8 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#474747">
-        <path d="M5 8v2h4l1-1 1-1zm0 3v2h3v-2z"/>
-        <path d="M5.469.012c-.49 0-.796.215-1.032.455C4.202.707 4 1.023 4 1.497V2H2v14h8v-2H4V4h2V2.012h4V4h2v3h2V2h-2v-.395l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.279-.62-.584-1.2-.552z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
-        <path d="M12.957 8.002a1 1 0 0 0-.664.291l-3 3A1 1 0 0 0 10 13h2.104l-.96 1.404a1 1 0 0 0 1.524 1.28l3.031-2.97A1 1 0 0 0 15 11h-2.13l.962-1.445a1 1 0 0 0-.875-1.553z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
+    <g fill="#2e3436">
+        <path d="M5 8v5h3v-2l2-2 1-1z"/>
+        <path d="M5.469.012c-.49 0-.796.215-1.032.455C4.202.707 4 1.023 4 1.497V2H2v14h8v-2H4V4h2V2.012h4V4h2v3h2V2h-2v-.395l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.279-.62-.584-1.2-.552z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible"/>
+        <path d="M12.957 8.002a1 1 0 0 0-.664.291l-3 3A1 1 0 0 0 10 13h2.104l-.96 1.404a1 1 0 0 0 1.524 1.28l3.031-2.97A1 1 0 0 0 15 11h-2.13l.962-1.445a1 1 0 0 0-.875-1.553z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible"/>
         <path d="M15 11h1v1h-1zM9 12h1v1H9zM13 8h1v1h-1zM10.969 14.968h1v1h-1z" style="marker:none" color="#bebebe" overflow="visible"/>
     </g>
 </svg>
diff --git a/Adwaita/scalable/status/battery-good-symbolic.svg b/Adwaita/scalable/status/battery-good-symbolic.svg
index f10404528..64abc5777 100644
--- a/Adwaita/scalable/status/battery-good-symbolic.svg
+++ b/Adwaita/scalable/status/battery-good-symbolic.svg
@@ -1,7 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#474747">
-        <path d="M5 8v2h6V8z"/>
-        <path d="M5.469.014c-.49 0-.796.214-1.032.455C4.202.709 4 1.025 4 1.498V2H2v14h12V2h-2v-.393l-.002-.027a1.622 1.622 0 0 0-.416-1.014c-.236-.279-.62-.584-1.2-.552zm.531 2h4V4h2v10H4V4h2z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
-        <path d="M5 11v2h6v-2z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16.001">
+    <g fill="#2e3436">
+        <path d="M5.469 0c-.49 0-.796.216-1.032.456C4.202.696 4 1.012 4 1.486V2H2v14h12V2h-2v-.406l-.002-.028a1.616 1.616 0 0 0-.416-1.012c-.236-.278-.62-.584-1.2-.552L10.439 0zM6 2h4v2h2v10H4V4h2z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible"/>
+        <path d="M5 6v7h6V6z" style="marker:none" color="#000" overflow="visible"/>
     </g>
 </svg>
diff --git a/Adwaita/scalable/status/battery-low-symbolic.svg b/Adwaita/scalable/status/battery-low-symbolic.svg
index f9cf12d0b..f353e239a 100644
--- a/Adwaita/scalable/status/battery-low-symbolic.svg
+++ b/Adwaita/scalable/status/battery-low-symbolic.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16.001">
-    <g fill="#474747">
+    <g fill="#2e3436">
         <path d="M5 11v2h6v-2z"/>
-        <path d="M5.469 0c-.49 0-.796.216-1.032.456C4.202.696 4 1.012 4 1.486V2H2v14h12V2h-2v-.406l-.002-.028a1.616 1.616 0 0 0-.416-1.012c-.236-.278-.62-.584-1.2-.552L10.439 0zM6 2h4v2h2v10H4V4h2z" 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;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
+        <path d="M5.469 0c-.49 0-.796.216-1.032.456C4.202.696 4 1.012 4 1.486V2H2v14h12V2h-2v-.406l-.002-.028a1.616 1.616 0 0 0-.416-1.012c-.236-.278-.62-.584-1.2-.552L10.439 0zM6 2h4v2h2v10H4V4h2z" 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;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" overflow="visible"/>
     </g>
 </svg>
diff --git a/src/symbolic/gnome-stencils.svg b/src/symbolic/gnome-stencils.svg
index 568cb9036..df52bf599 100644
--- a/src/symbolic/gnome-stencils.svg
+++ b/src/symbolic/gnome-stencils.svg
@@ -33,13 +33,13 @@
      inkscape:window-height="1016"
      id="namedview88"
      showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="99.467952"
-     inkscape:cy="38.843925"
+     inkscape:zoom="4"
+     inkscape:cx="42.477703"
+     inkscape:cy="981.95932"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer10"
+     inkscape:current-layer="layer1"
      showborder="false"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
@@ -1017,10 +1017,10 @@
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2.32782054;marker:none;enable-background:accumulate;" />
     </g>
     <g
-       style="display:inline;"
+       style="display:inline"
        id="g3728"
-       inkscape:label="battery-full"
-       transform="rotate(90,128,136)">
+       inkscape:label="battery-full-old-alt"
+       transform="rotate(90,-32,-24)">
       <rect
          transform="scale(1,-1)"
          y="-247"
@@ -1028,22 +1028,22 @@
          height="6"
          width="2"
          id="rect2928"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate;" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate" />
       <path
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccccc"
          id="path2930"
          d="m 35,239 v 10 H 23 v -2 H 21.484375 C 21.25,247 21,246.75 21,246.53125 V 241.5625 C 20.98437,241.28125 21.340963,241.01563 21.622213,241 H 23 v -2 z"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;" />
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
       <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none"
          id="rect3704-3"
          width="16"
          height="16"
          x="20"
          y="236" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate;"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate"
          id="rect4227"
          width="2"
          height="6"
@@ -1057,15 +1057,15 @@
          height="6"
          width="2"
          id="rect4229"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate;" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate" />
     </g>
     <g
-       style="display:inline;"
-       inkscape:label="battery-good"
+       style="display:inline"
+       inkscape:label="battery-good-old-alt"
        id="g3733"
-       transform="rotate(90,138,146)">
+       transform="rotate(90,-22,-14)">
       <rect
-         style="fill:#2e3436;fill-opacity:1;stroke:none;"
+         style="fill:#2e3436;fill-opacity:1;stroke:none"
          id="rect3735"
          width="2"
          height="6"
@@ -1074,7 +1074,7 @@
          transform="scale(1,-1)" />
       <path
          inkscape:connector-curvature="0"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
          d="m 35,239 v 10 H 23 v -2 h -1.502681 c -0.234375,0 -0.484375,-0.25 -0.484375,-0.46875 v -4.96875 c -0.01563,-0.28125 0.340963,-0.54687 0.622213,-0.5625 H 23 v -2 z"
          id="path3737"
          sodipodi:nodetypes="ccccccccccc" />
@@ -1084,7 +1084,7 @@
          height="16"
          width="16"
          id="rect3739"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;" />
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none" />
       <rect
          transform="scale(1,-1)"
          y="-247"
@@ -1092,7 +1092,7 @@
          height="6"
          width="2"
          id="rect10870"
-         style="fill:#2e3436;fill-opacity:1;stroke:none;" />
+         style="fill:#2e3436;fill-opacity:1;stroke:none" />
     </g>
     <g
        style="display:inline;"
@@ -1137,8 +1137,8 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccc"
          id="rect6060-0"
-         d="m 30.99975,247 h 1.999995 v -2.00025 h -2 z"
-         style="display:inline;fill:#cc0000;fill-opacity:1;stroke:none;"
+         d="m 32.000005,247 h 0.99974 v -2.00025 H 32 Z"
+         style="display:inline;fill:#cc0000;fill-opacity:1;stroke:none"
          class="error" />
       <path
          inkscape:connector-curvature="0"
@@ -1357,12 +1357,10 @@
        inkscape:label="battery-good-charging"
        transform="rotate(90,209,217)">
       <path
-         style="fill:#2e3436;fill-opacity:1;stroke:none;"
-         d="m -37,8 v 2 h 4 l 1,-1 1,-1 z m 0,3 v 2 h 3 v -2 z"
-         transform="rotate(-90,116,96)"
-         id="path6257"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccc" />
+         style="fill:#2e3436;fill-opacity:1;stroke:none"
+         d="M 177 100 L 177 103 L 177 105 L 180 105 L 180 103 L 182 101 L 183 100 L 177 100 z "
+         transform="rotate(-90,177,249)"
+         id="path6257" />
       <path
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccccc"
@@ -5394,17 +5392,10 @@
        inkscape:label="battery-full-charging"
        style="">
       <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#2e3436;fill-opacity:1;stroke:none;"
-         d="m 137,33 v 2 h 6 v -2 z"
-         id="rect6060"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path12865"
-         d="m 137,36 v 2 h 4 l 1,-1 1,-1 z m 0,3 v 2 h 3 v -2 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:none;" />
+         style="fill:#2e3436;fill-opacity:1;stroke:none"
+         d="M 137 97 L 137 100 L 137 103 L 137 105 L 140 105 L 140 103 L 142 101 L 143 100 L 143 97 L 137 97 z "
+         transform="translate(0,-64)"
+         id="rect6060" />
       <path
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;"
          d="M 142.00025,42.99975 135,43 V 31 h 2 v -1.504577 c 0,-0.234375 0.25,-0.484375 0.46875,-0.484375 h 4.96875 c 0.28125,-0.01563 0.54687,0.340963 0.5625,0.622213 V 31 h 2 l 2.5e-4,3.99975"
@@ -5577,8 +5568,8 @@
        inkscape:label="battery-caution-charging"
        transform="rotate(90,229,237)">
       <path
-         style="fill:#ef2929;fill-opacity:1;stroke:none;"
-         d="m -37,11 v 2 h 3 v -2 z"
+         style="fill:#ef2929;fill-opacity:1;stroke:none"
+         d="m -37,12 v 1 h 3 v -1 z"
          transform="rotate(-90,116,96)"
          id="path12963"
          inkscape:connector-curvature="0"
@@ -6766,12 +6757,12 @@
          style="fill:#2e3436;fill-opacity:1;stroke:none;" />
     </g>
     <g
-       transform="rotate(90,38,26)"
-       inkscape:label="battery-level-80-alt"
+       transform="rotate(90,138,146)"
+       inkscape:label="battery-good"
        id="g3643"
-       style="display:inline;">
+       style="display:inline">
       <path
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
          d="m 35,239 v 10 H 23 v -2 H 21.484375 C 21.25,247 21,246.75 21,246.53125 V 241.5625 C 20.98437,241.28125 21.340963,241.01563 21.622213,241 H 23 v -2 z"
          id="path3637"
          sodipodi:nodetypes="ccccccccccc"
@@ -6782,9 +6773,9 @@
          height="16"
          width="16"
          id="rect3639"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;" />
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none" />
       <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate;"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate"
          id="rect3641"
          width="7"
          height="6"
@@ -7478,18 +7469,18 @@
          sodipodi:nodetypes="ccccc" />
     </g>
     <g
-       style="display:inline;"
+       style="display:inline"
        id="g4045"
-       inkscape:label="battery-full-alt"
-       transform="rotate(90,18,6)">
+       inkscape:label="battery-full"
+       transform="rotate(90,128,136)">
       <path
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccccccccc"
          id="path4038"
          d="m 35,239 v 10 H 23 v -2 H 21.484375 C 21.25,247 21,246.75 21,246.53125 V 241.5625 C 20.98437,241.28125 21.340963,241.01563 21.622213,241 H 23 v -2 z"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;" />
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
       <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none;"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none"
          id="rect4041"
          width="16"
          height="16"
@@ -7502,7 +7493,7 @@
          height="6"
          width="8"
          id="rect4043"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate;" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate" />
     </g>
     <g
        transform="rotate(90,8,16)"
@@ -12065,14 +12056,14 @@
        id="g23282"
        inkscape:label="battery">
       <use
-         transform="translate(100,410)"
+         transform="translate(420,410)"
          height="1"
          width="1"
          id="use20789"
          xlink:href="#g3728"
          y="0"
          x="0"
-         style="display:inline;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-opacity:1;" />
+         style="display:inline;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-opacity:1" />
     </g>
     <g
        style="display:inline;"