diff --git a/core/layout.lua b/core/layout.lua
index f7c5231..191e1a0 100644
--- a/core/layout.lua
+++ b/core/layout.lua
@@ -75,22 +75,38 @@ awful.screen.connect_for_each_screen(function(s)
         layout = wibox.layout.align.horizontal,
         { -- Left widgets
             layout = wibox.layout.fixed.horizontal,
-            require("core.widgets.menu_launcher"),
+            {
+                {
+                    require("core.widgets.menu_launcher"),
+                    widget = wibox.container.place,
+                    halign = "center"
+                },
+                bg = "#26262633",
+                widget = wibox.container.background,
+                forced_width = require("beautiful.xresources").apply_dpi(61),
+            },
             --require("widgets.polylauncher")({vertical = false}),
             --s.mytaglist,
             s.mypromptbox,
+            require("widgets.current_window")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
             spacing = 3
         },
         -- Middle widget
         {
-            widget = wibox.container.background
+            --[[require("widgets.polytasklist")({
+                vertical = false,
+                stretch = false,
+                constraint = 180,
+                names = true,
+                margins = 5
+            })(s),]]
+            layout = wibox.layout.fixed.horizontal
         },
         { -- Right widgets
-            wibox.widget.textclock(),
-            {
-                widget = wibox.container.background,
-                forced_width = (math.abs(s.geometry.width/2)-200)
-            },
             layout = wibox.layout.fixed.horizontal,
             awful.widget.keyboardlayout(),
             require("widgets.wallpapers")({
@@ -119,6 +135,12 @@ awful.screen.connect_for_each_screen(function(s)
                     icon_bg_normal = beautiful.topbar_bg
                 }
             }),
+            wibox.widget.textclock(),
+            require("widgets.username")({
+                style = {
+                    icon_bg_normal = beautiful.topbar_bg
+                }
+            }),
             s.mylayoutbox,
             spacing = 4
         },
diff --git a/core/titlebar.lua b/core/titlebar.lua
index 43c6c31..af98678 100644
--- a/core/titlebar.lua
+++ b/core/titlebar.lua
@@ -88,23 +88,36 @@ return function(c)
     return awful.titlebar(c) : setup {
         { -- Left 
             c.menu_button,
-            spacing = 10,
             layout  = wibox.layout.fixed.horizontal
         },
         { -- Middle
-            {
-                widget = awful.titlebar.widget.titlewidget(c),
-                align = "center"
-            },
+            awful.titlebar.widget.titlewidget(c),
             buttons = buttons,
             layout  = wibox.layout.flex.horizontal
         },
         { -- Right
-            awful.titlebar.widget.maximizedbutton(c),
-            awful.titlebar.widget.minimizebutton (c),
-            awful.titlebar.widget.closebutton    (c),
-            layout = wibox.layout.fixed.horizontal(),
+            {
+                {
+                    awful.titlebar.widget.maximizedbutton(c),
+                    awful.titlebar.widget.minimizebutton (c),
+                    awful.titlebar.widget.closebutton    (c),
+                    layout = wibox.layout.fixed.horizontal(),
+                    widget = wibox.container.margin,
+                    margins = 3            
+                },
+                widget = wibox.container.background,
+                shape = gears.shape.rounded_bar,
+                bg = {
+                    type = "linear",
+                    from = { 0, 15 },
+                    to = { 0, 0},
+                    stops = { { 0, "#5d5d5955"} , {1, "39383555"} }
+                },
+            },
+            widget = wibox.container.margin,
+            margins = 2
         },
+        spacing = 10,
         layout = wibox.layout.align.horizontal,
     }
 end
diff --git a/core/vars.lua b/core/vars.lua
index d7bc1cb..9c6ef06 100644
--- a/core/vars.lua
+++ b/core/vars.lua
@@ -5,7 +5,7 @@ global = {}
 global.awesome_dir = os.getenv("HOME").."/.config/awesome/"
 global.config_dir = os.getenv("HOME").."/.awesome/"
 global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/"
-global.theme = global.awesome_dir .. "themes/unity2/theme.lua"
+global.theme = global.awesome_dir .. "themes/unity/theme.lua"
 global.terminal = "xterm"
 global.editor = os.getenv("EDITOR") or "vim"
 global.editor_cmd = global.terminal .. " -e ".. global.editor
diff --git a/themes/unity/icons/battery-caution-charging-symbolic.svg b/themes/unity/icons/battery-caution-charging-symbolic.svg
index 56fe444..84410f5 100644
--- a/themes/unity/icons/battery-caution-charging-symbolic.svg
+++ b/themes/unity/icons/battery-caution-charging-symbolic.svg
@@ -1,12 +1,138 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-            .ColorScheme-PositiveText {
-                color:#27ae60;
-            }
-        </style>
-    </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M3 4l1 8H2V4zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/><path d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z" class="ColorScheme-PositiveText" fill="currentColor"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="battery-caution-charging-symbolic.svg"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="8"
+     inkscape:cx="12.75"
+     inkscape:cy="8.375"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g952"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14673;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect3560"
+         width="0.71062315"
+         height="3.6072021"
+         x="1.843727"
+         y="4.5463986"
+         ry="0" />
+      <g
+         id="g7225-0"
+         transform="translate(0.5386392,-0.2244544)"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           id="rect5668-9-3"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="rect5668-9-4-0"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
+  <metadata
+     id="metadata4105">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/themes/unity/icons/battery-caution-symbolic.svg b/themes/unity/icons/battery-caution-symbolic.svg
index 3fb7d4a..eb31e2a 100644
--- a/themes/unity/icons/battery-caution-symbolic.svg
+++ b/themes/unity/icons/battery-caution-symbolic.svg
@@ -1,9 +1,123 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-        </style>
-    </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M3 4l1 8H2V4zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="battery-caution-symbolic.svg"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="16"
+     inkscape:cx="12.4375"
+     inkscape:cy="17.375"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g946"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14673;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect3560"
+         width="0.71062315"
+         height="3.6072021"
+         x="1.843727"
+         y="4.5463986"
+         ry="0" />
+    </g>
+  </g>
+  <metadata
+     id="metadata4105">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/themes/unity/icons/battery-empty-charging-symbolic.svg b/themes/unity/icons/battery-empty-charging-symbolic.svg
index e3e8620..6054506 100644
--- a/themes/unity/icons/battery-empty-charging-symbolic.svg
+++ b/themes/unity/icons/battery-empty-charging-symbolic.svg
@@ -1,12 +1,148 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-            .ColorScheme-PositiveText {
-                color:#27ae60;
-            }
-        </style>
-    </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/><path d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z" class="ColorScheme-PositiveText" fill="currentColor"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="battery-empty-charging-symbolic.svg"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="16"
+     inkscape:cx="4.125"
+     inkscape:cy="22.625"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect5696"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5692">
+      <path
+         id="path5694"
+         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="ccccccc" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1046"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-6"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <g
+         id="g7225-0"
+         transform="translate(0.5386392,-0.2244544)"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           id="rect5668-9-3"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="rect5668-9-4-0"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
+  <metadata
+     id="metadata4105">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/themes/unity/icons/battery-empty-symbolic.svg b/themes/unity/icons/battery-empty-symbolic.svg
index 710c02b..cf392d7 100644
--- a/themes/unity/icons/battery-empty-symbolic.svg
+++ b/themes/unity/icons/battery-empty-symbolic.svg
@@ -1,9 +1,147 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-    <defs id="defs1">
-        <style type="text/css" id="current-color-scheme">
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-        </style>
-    </defs>
-    <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText" d="M0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="battery-empty-symbolic.svg"
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-19.533824"
+     inkscape:cy="17.677669"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect5696"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5692">
+      <path
+         id="path5694"
+         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="ccccccc" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect2493">
+      <path
+         id="path2491"
+         style="color:#000000;fill:#000000;stroke-width:1;stroke-linecap:round;-inkscape-stroke:none"
+         d="m 4.0963908,4.8798054 a 0.1322915,0.1322915 0 0 0 -0.079065,0.038241 0.1322915,0.1322915 0 0 0 0,0.1855181 L 5.2642781,6.35 4.0173259,7.5959187 a 0.1322915,0.1322915 0 0 0 0,0.1870689 0.1322915,0.1322915 0 0 0 0.1875854,0 L 5.4508299,6.5365519 6.6972656,7.7829876 a 0.1322915,0.1322915 0 0 0 0.1855184,0 0.1322915,0.1322915 0 0 0 0,-0.1870689 L 5.6368654,6.35 6.882784,5.1035643 a 0.1322915,0.1322915 0 0 0 0,-0.1855181 0.1322915,0.1322915 0 0 0 -0.1855184,0 L 5.4508299,6.1639648 4.2049113,4.9180462 A 0.1322915,0.1322915 0 0 0 4.0963908,4.8798054 Z" />
+    </mask>
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect2493"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect2493"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+       id="rect846"
+       width="9.6418304"
+       height="5.442944"
+       x="1.0906231"
+       y="3.6285279"
+       sodipodi:type="rect"
+       ry="0.22999418"
+       d="m 1.3206173,3.6285279 h 9.1818417 c 0.127417,0 0.229995,0.1025774 0.229995,0.2299942 v 4.9829557 c 0,0.1274167 -0.102578,0.2299941 -0.229995,0.2299941 H 1.3206173 c -0.1274168,0 -0.2299942,-0.1025774 -0.2299942,-0.2299941 V 3.8585221 c 0,-0.1274168 0.1025774,-0.2299942 0.2299942,-0.2299942 z" />
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:0.5568;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect2450-6"
+       width="0.86209512"
+       height="2.135709"
+       x="10.747282"
+       y="5.2821455"
+       ry="0.14228392" />
+  </g>
+  <metadata
+     id="metadata4105">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/themes/unity/icons/battery-full-charged-symbolic.svg b/themes/unity/icons/battery-full-charged-symbolic.svg
index ae88a8c..0652e7e 100644
--- a/themes/unity/icons/battery-full-charged-symbolic.svg
+++ b/themes/unity/icons/battery-full-charged-symbolic.svg
@@ -1,70 +1,165 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   id="svg2037"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
    sodipodi:docname="battery-full-charged-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="16"
+     inkscape:cx="4.125"
+     inkscape:cy="22.625"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect5696"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5692">
+      <path
+         id="path5694"
+         style="display:none;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="lpe_path-effect5696"
+         style="display:inline;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         class="powerclip"
+         d="M -3.156273,-0.45360136 H 13.949959 V 13.153601 H -3.156273 Z M 5.7456705,5.3712486 2.6792642,6.9044518 5.2801724,6.6323131 5.5112954,7.3282799 8.5796549,5.7950767 5.977827,6.0676867 Z" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g956"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.464002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect3560"
+         width="7.1062322"
+         height="3.6072021"
+         x="1.843727"
+         y="4.5463986"
+         ry="0"
+         clip-path="url(#clipPath5692)"
+         inkscape:path-effect="#path-effect5696"
+         d="M 1.843727,4.5463986 H 8.9499592 V 8.1536007 H 1.843727 Z"
+         sodipodi:type="rect" />
+      <g
+         id="g7225-0"
+         transform="translate(0.5386392,-0.2244544)"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           id="rect5668-9-3"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="rect5668-9-4-0"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
   <metadata
-     id="metadata2041">
+     id="metadata4105">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1036"
-     id="namedview2039"
-     showgrid="false"
-     inkscape:zoom="55.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2037" />
-  <defs
-     id="defs1">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-            .ColorScheme-Text {
-                color:#232629;
-            }
-            .ColorScheme-PositiveText {
-                color:#27ae60;
-            }
-        </style>
-  </defs>
-  <path
-     id="path2033"
-     style="fill:currentColor;fill-opacity:1;stroke:none"
-     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 13 12 L 13 4 L 2 4 z M 9 4.5 L 9.5 4.5 L 9.5 5.5 L 11.5 5.5 L 11.5 7.5 L 9.5 7.5 L 9.5 8.5 L 11.5 8.5 L 11.5 10.5 L 9.5 10.5 L 9.5 11.5 L 9 11.5 C 7.666557 11.498032 6.5431396 10.671338 5.9570312 9.5 L 4.5 9.5 L 4.5 6.5 L 5.9550781 6.5 C 6.5415944 5.3280543 7.6657892 4.5010796 9 4.5 z M 8.5 5.6601562 C 7.6694626 5.8434029 6.9366841 6.3396817 6.6445312 7.1660156 L 6.5273438 7.5 L 5.5 7.5 L 5.5 8.5 L 6.5292969 8.5 L 6.6464844 8.8339844 C 6.9384669 9.6598387 7.6700159 10.156243 8.5 10.339844 L 8.5 9.5 L 8.5 6.5 L 8.5 5.6601562 z " />
-  <path
-     d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z"
-     class="ColorScheme-PositiveText"
-     fill="currentColor"
-     id="path2035"
-     style="fill:#27ae60;stroke:none;stroke-opacity:1;fill-opacity:1" />
 </svg>
diff --git a/themes/unity/icons/battery-full-charging-symbolic.svg b/themes/unity/icons/battery-full-charging-symbolic.svg
index 2db325e..b11ab4c 100644
--- a/themes/unity/icons/battery-full-charging-symbolic.svg
+++ b/themes/unity/icons/battery-full-charging-symbolic.svg
@@ -1,69 +1,165 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   id="svg942"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
    sodipodi:docname="battery-full-charging-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="8"
+     inkscape:cx="-4.625"
+     inkscape:cy="18.5"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect5696"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5692">
+      <path
+         id="path5694"
+         style="display:none;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="lpe_path-effect5696"
+         style="display:inline;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         class="powerclip"
+         d="M -3.156273,-0.45360136 H 13.949959 V 13.153601 H -3.156273 Z M 5.7456705,5.3712486 2.6792642,6.9044518 5.2801724,6.6323131 5.5112954,7.3282799 8.5796549,5.7950767 5.977827,6.0676867 Z" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1036"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.464002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect3560"
+         width="7.1062322"
+         height="3.6072021"
+         x="1.843727"
+         y="4.5463986"
+         ry="0"
+         clip-path="url(#clipPath5692)"
+         inkscape:path-effect="#path-effect5696"
+         d="M 1.843727,4.5463986 H 8.9499592 V 8.1536007 H 1.843727 Z"
+         sodipodi:type="rect" />
+      <g
+         id="g7225-0"
+         transform="translate(0.5386392,-0.2244544)"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           id="rect5668-9-3"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="rect5668-9-4-0"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
   <metadata
-     id="metadata946">
+     id="metadata4105">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1036"
-     id="namedview944"
-     showgrid="false"
-     inkscape:zoom="48.6875"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg942" />
-  <defs
-     id="defs1">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-            .ColorScheme-Text {
-                color:#232629;
-            }
-            .ColorScheme-PositiveText {
-                color:#27ae60;
-            }
-        </style>
-  </defs>
-  <path
-     id="path938"
-     style="fill:currentColor;fill-opacity:1;stroke:none"
-     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 13 12 L 13 4 L 2 4 z M 9 4.5 L 9.5 4.5 L 9.5 5.5 L 11.5 5.5 L 11.5 7.5 L 9.5 7.5 L 9.5 8.5 L 11.5 8.5 L 11.5 10.5 L 9.5 10.5 L 9.5 11.5 L 9 11.5 C 7.666557 11.498032 6.5431396 10.671338 5.9570312 9.5 L 4.5 9.5 L 4.5 6.5 L 5.9550781 6.5 C 6.5415944 5.3280543 7.6657892 4.5010796 9 4.5 z M 8.5 5.6601562 C 7.6694626 5.8434029 6.9366841 6.3396817 6.6445312 7.1660156 L 6.5273438 7.5 L 5.5 7.5 L 5.5 8.5 L 6.5292969 8.5 L 6.6464844 8.8339844 C 6.9384669 9.6598387 7.6700159 10.156243 8.5 10.339844 L 8.5 9.5 L 8.5 6.5 L 8.5 5.6601562 z " />
-  <path
-     d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z"
-     class="ColorScheme-PositiveText"
-     fill="currentColor"
-     id="path940" />
 </svg>
diff --git a/themes/unity/icons/battery-full-symbolic.svg b/themes/unity/icons/battery-full-symbolic.svg
index 7daa418..3241dad 100644
--- a/themes/unity/icons/battery-full-symbolic.svg
+++ b/themes/unity/icons/battery-full-symbolic.svg
@@ -1,62 +1,109 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   id="svg1375"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
    sodipodi:docname="battery-full-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="17.577516"
+     inkscape:cx="1.4222715"
+     inkscape:cy="23.609707"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g938"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect3560"
+         width="7.1062317"
+         height="3.6072021"
+         x="1.843727"
+         y="4.5463986"
+         ry="0" />
+    </g>
+  </g>
   <metadata
-     id="metadata1379">
+     id="metadata4105">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1036"
-     id="namedview1377"
-     showgrid="false"
-     inkscape:zoom="55.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1375" />
-  <defs
-     id="defs1">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-            .ColorScheme-Text {
-                color:#232629;
-            }
-        </style>
-  </defs>
-  <path
-     style="fill:#000000;fill-opacity:1;stroke:none"
-     class="ColorScheme-Text"
-     d="M2 4h11v8H2zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"
-     id="path1373" />
 </svg>
diff --git a/themes/unity/icons/battery-good-charging-symbolic.svg b/themes/unity/icons/battery-good-charging-symbolic.svg
index 0b54f56..c7ece05 100644
--- a/themes/unity/icons/battery-good-charging-symbolic.svg
+++ b/themes/unity/icons/battery-good-charging-symbolic.svg
@@ -1,69 +1,165 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   id="svg1149"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
    sodipodi:docname="battery-good-charging-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-17.324115"
+     inkscape:cy="22.008698"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect4014"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4010">
+      <path
+         id="path4012"
+         style="display:none;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         id="lpe_path-effect4014"
+         style="display:inline;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         class="powerclip"
+         d="M -3.156273,-0.45360136 H 11.53384 V 13.153601 H -3.156273 Z M 5.7456705,5.3712486 2.6792642,6.9044518 5.2801724,6.6323131 5.5112954,7.3282799 8.5796549,5.7950767 5.977827,6.0676867 Z" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g956"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.376956;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect3560"
+         width="4.6901131"
+         height="3.6072023"
+         x="1.843727"
+         y="4.5463986"
+         ry="0"
+         clip-path="url(#clipPath4010)"
+         inkscape:path-effect="#path-effect4014"
+         d="M 1.843727,4.5463986 H 6.5338401 V 8.1536009 H 1.843727 Z"
+         sodipodi:type="rect" />
+      <g
+         id="g7225-0"
+         transform="translate(0.5386392,-0.2244544)"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           id="rect5668-9-3"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="rect5668-9-4-0"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
   <metadata
-     id="metadata1153">
+     id="metadata4105">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1036"
-     id="namedview1151"
-     showgrid="false"
-     inkscape:zoom="55.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1149" />
-  <defs
-     id="defs1">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-            .ColorScheme-Text {
-                color:#232629;
-            }
-            .ColorScheme-PositiveText {
-                color:#27ae60;
-            }
-        </style>
-  </defs>
-  <path
-     id="path1145"
-     style="fill:currentColor;fill-opacity:1;stroke:none"
-     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 10 12 L 9.8125 10.5 L 9.5 10.5 L 9.5 11.5 L 9 11.5 C 7.666557 11.498032 6.5431396 10.671338 5.9570312 9.5 L 4.5 9.5 L 4.5 6.5 L 5.9550781 6.5 C 6.5415944 5.3280543 7.6657892 4.5010796 9 4.5 L 9.0625 4.5 L 9 4 L 2 4 z M 8.5 5.6601562 C 7.6694626 5.8434029 6.9366841 6.3396817 6.6445312 7.1660156 L 6.5273438 7.5 L 5.5 7.5 L 5.5 8.5 L 6.5292969 8.5 L 6.6464844 8.8339844 C 6.9384669 9.6598387 7.6700159 10.156243 8.5 10.339844 L 8.5 9.5 L 8.5 6.5 L 8.5 5.6601562 z M 9.5 8 L 9.5 8.5 L 9.5625 8.5 L 9.5 8 z " />
-  <path
-     d="M9 5a3 3 0 0 0-2.826 2H5v2h1.176A3 3 0 0 0 9 11v-1h2V9H9V7h2V6H9z"
-     class="ColorScheme-PositiveText"
-     fill="currentColor"
-     id="path1147" />
 </svg>
diff --git a/themes/unity/icons/battery-good-symbolic.svg b/themes/unity/icons/battery-good-symbolic.svg
index b55a8e0..4d654b4 100644
--- a/themes/unity/icons/battery-good-symbolic.svg
+++ b/themes/unity/icons/battery-good-symbolic.svg
@@ -1,62 +1,140 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   id="svg2062"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
    sodipodi:docname="battery-good-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-7.9549509"
+     inkscape:cy="24.837125"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect4014"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4010">
+      <path
+         id="path4012"
+         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="ccccccc" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1051"
+       transform="matrix(1.2,0,0,1.2,-0.55902554,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993"
+         width="0.71799999" />
+      <rect
+         style="display:inline;opacity:1;fill:#000000;stroke-width:0.0649999;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4609"
+         width="4.6901131"
+         height="3.6072018"
+         x="1.8437274"
+         y="4.5463986" />
+    </g>
+  </g>
   <metadata
-     id="metadata2066">
+     id="metadata4105">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1036"
-     id="namedview2064"
-     showgrid="false"
-     inkscape:zoom="55.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2062" />
-  <defs
-     id="defs1">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-            .ColorScheme-Text {
-                color:#232629;
-            }
-        </style>
-  </defs>
-  <path
-     style="fill:#000000;fill-opacity:1;stroke:none"
-     class="ColorScheme-Text"
-     d="M2 4h7l1 8H2zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"
-     id="path2060" />
 </svg>
diff --git a/themes/unity/icons/battery-low-charging-symbolic.svg b/themes/unity/icons/battery-low-charging-symbolic.svg
index 56fb9cc..3f12fbe 100644
--- a/themes/unity/icons/battery-low-charging-symbolic.svg
+++ b/themes/unity/icons/battery-low-charging-symbolic.svg
@@ -1,71 +1,165 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   id="svg186"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
    sodipodi:docname="battery-low-charging-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-19.091882"
+     inkscape:cy="15.291183"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect2566"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2562">
+      <path
+         id="path2564"
+         style="display:none;stroke-width:0.464;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 6.1284829,6.5216392 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="cccc" />
+      <path
+         id="lpe_path-effect2566"
+         style="stroke-width:0.464;stroke-linecap:round"
+         class="powerclip"
+         d="M -3.156273,-0.45360136 H 9.1887835 V 13.153601 H -3.156273 Z M 5.7456705,5.3712486 2.6792642,6.9044518 6.1284829,6.5216392 Z" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g956"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.266548;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect3560"
+         width="2.3450565"
+         height="3.6072023"
+         x="1.843727"
+         y="4.5463986"
+         ry="0"
+         clip-path="url(#clipPath2562)"
+         inkscape:path-effect="#path-effect2566"
+         d="M 1.843727,4.5463986 H 4.1887835 V 8.1536009 H 1.843727 Z"
+         sodipodi:type="rect" />
+      <g
+         id="g7225-0"
+         transform="translate(0.5386392,-0.2244544)"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           id="rect5668-9-3"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 5.3225173,6.5744543 5.0903606,5.878016 3.2331064,6.8066004 Z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="rect5668-9-4-0"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+           d="M 4.8582037,6.5744543 5.0903604,7.2708926 6.9476146,6.3423082 Z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+  </g>
   <metadata
-     id="metadata190">
+     id="metadata4105">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1036"
-     id="namedview188"
-     showgrid="false"
-     inkscape:zoom="55.625"
-     inkscape:cx="4.8629213"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg186"
-     inkscape:document-rotation="0" />
-  <defs
-     id="defs1">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-            .ColorScheme-Text {
-                color:#232629;
-            }
-            .ColorScheme-PositiveText {
-                color:#27ae60;
-            }
-        </style>
-  </defs>
-  <path
-     id="path182"
-     style="fill:currentColor;fill-opacity:1;stroke:none"
-     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 7 12 L 6.9023438 11.216797 C 6.3121937 10.79667 5.8272405 10.219642 5.5019531 9.5390625 L 3.8105469 9.5390625 L 3.8105469 6.1386719 L 5.5 6.1386719 C 5.6724011 5.7776582 5.8893752 5.4445919 6.1425781 5.1484375 L 6 4 L 2 4 z M 6.3164062 6.5195312 C 6.2712485 6.6120311 6.2247627 6.704817 6.1894531 6.8046875 L 6.0722656 7.1386719 L 4.8105469 7.1386719 L 4.8105469 8.5390625 L 6.0742188 8.5390625 L 6.1933594 8.8710938 C 6.3129661 9.2093939 6.4966297 9.5009695 6.71875 9.7539062 L 6.3164062 6.5195312 z " />
-  <path
-     d="M 9.1101126,4.2382021 A 3.6000002,3.6000001 0 0 0 5.7189123,6.6382022 H 4.3101122 v 2.4000001 h 1.4112001 a 3.6000002,3.6000001 0 0 0 3.3888003,2.3999997 v -1.2 H 11.510112 V 9.0382023 H 9.1101126 V 6.6382022 H 11.510112 V 5.4382021 H 9.1101126 Z"
-     class="ColorScheme-PositiveText"
-     fill="currentColor"
-     id="path184"
-     style="color:#27ae60;stroke-width:1.2;stroke-miterlimit:4;stroke-dasharray:none;fill:#44ae60;fill-opacity:1;paint-order:markers fill stroke" />
 </svg>
diff --git a/themes/unity/icons/battery-low-symbolic.svg b/themes/unity/icons/battery-low-symbolic.svg
index ab50fc2..b209891 100644
--- a/themes/unity/icons/battery-low-symbolic.svg
+++ b/themes/unity/icons/battery-low-symbolic.svg
@@ -1,62 +1,141 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   id="svg2762"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
    sodipodi:docname="battery-low-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="16"
+     inkscape:cx="-6.4375"
+     inkscape:cy="17.5"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect2153"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2149">
+      <path
+         id="path2151"
+         style="display:block;stroke-width:0.464;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 6.1284829,6.5216392 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="cccc" />
+    </clipPath>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g949"
+       transform="matrix(1.2,0,0,1.2,-0.55927308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.446;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-3"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <rect
+         style="display:inline;fill:#000000;stroke-width:0.464;stroke-linecap:round"
+         id="rect2592"
+         width="2.3450565"
+         height="3.6072018"
+         x="1.8437271"
+         y="4.5463986"
+         ry="0" />
+    </g>
+  </g>
   <metadata
-     id="metadata2766">
+     id="metadata4105">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1036"
-     id="namedview2764"
-     showgrid="false"
-     inkscape:zoom="55.625"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2762" />
-  <defs
-     id="defs1">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-            .ColorScheme-Text {
-                color:#232629;
-            }
-        </style>
-  </defs>
-  <path
-     style="fill:#000000;fill-opacity:1;stroke:none"
-     class="ColorScheme-Text"
-     d="M2 4h4l1 8H2zM0 2v12h15v-4h.5c.277 0 .5-.223.5-.5v-3c0-.277-.223-.5-.5-.5H15V2zm1 1h13v10H1z"
-     id="path2760" />
 </svg>
diff --git a/themes/unity/icons/battery-missing-symbolic.svg b/themes/unity/icons/battery-missing-symbolic.svg
index f96c4b2..83b380b 100644
--- a/themes/unity/icons/battery-missing-symbolic.svg
+++ b/themes/unity/icons/battery-missing-symbolic.svg
@@ -1,69 +1,186 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="16"
-   width="16"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   id="svg258"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
    sodipodi:docname="battery-missing-symbolic.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+   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"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-19.533824"
+     inkscape:cy="17.677669"
+     inkscape:window-width="1856"
+     inkscape:window-height="1030"
+     inkscape:window-x="62"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="powerclip"
+       id="path-effect5696"
+       is_visible="true"
+       lpeversion="1"
+       inverse="true"
+       flatten="false"
+       hide_clip="false"
+       message="Use fill-rule evenodd on &lt;b&gt;fill and stroke&lt;/b&gt; dialog if no flatten result after convert clip to paths." />
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lstart"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lstart"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(12.5,0)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path2933" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="DotL"
+       inkscape:isstock="true">
+      <path
+         transform="scale(0.8) translate(7.4, 1)"
+         style="fill-rule:evenodd;fill:context-stroke;stroke:context-stroke;stroke-width:1.0pt"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         id="path1555" />
+    </marker>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5692">
+      <path
+         id="path5694"
+         style="display:block;opacity:0.35806;stroke-width:0.0649999;stroke-linecap:round"
+         d="M 5.7456705,5.3712486 5.977827,6.0676867 8.5796549,5.7950767 5.5112954,7.3282799 5.2801724,6.6323131 2.6792642,6.9044518 Z"
+         sodipodi:nodetypes="ccccccc" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask-powermask-path-effect2493">
+      <path
+         id="mask-powermask-path-effect2493_box"
+         style="fill:#ffffff;fill-opacity:1"
+         d="M 2.6473281,3.5463986 H 8.2545304 V 9.1536007 H 2.6473281 Z" />
+      <path
+         id="path2491"
+         style="color:#000000;fill:#000000;stroke-width:1;stroke-linecap:round;-inkscape-stroke:none"
+         d="m 4.0963908,4.8798054 a 0.1322915,0.1322915 0 0 0 -0.079065,0.038241 0.1322915,0.1322915 0 0 0 0,0.1855181 L 5.2642781,6.35 4.0173259,7.5959187 a 0.1322915,0.1322915 0 0 0 0,0.1870689 0.1322915,0.1322915 0 0 0 0.1875854,0 L 5.4508299,6.5365519 6.6972656,7.7829876 a 0.1322915,0.1322915 0 0 0 0.1855184,0 0.1322915,0.1322915 0 0 0 0,-0.1870689 L 5.6368654,6.35 6.882784,5.1035643 a 0.1322915,0.1322915 0 0 0 0,-0.1855181 0.1322915,0.1322915 0 0 0 -0.1855184,0 L 5.4508299,6.1639648 4.2049113,4.9180462 A 0.1322915,0.1322915 0 0 0 4.0963908,4.8798054 Z" />
+    </mask>
+    <inkscape:path-effect
+       effect="powermask"
+       id="path-effect2493"
+       is_visible="true"
+       lpeversion="1"
+       uri="#mask-powermask-path-effect2493"
+       invert="false"
+       hide_mask="false"
+       background="true"
+       background_color="#ffffffff" />
+    <filter
+       id="mask-powermask-path-effect2493_inverse"
+       inkscape:label="filtermask-powermask-path-effect2493"
+       style="color-interpolation-filters:sRGB"
+       height="100"
+       width="100"
+       x="-50"
+       y="-50">
+      <feColorMatrix
+         id="mask-powermask-path-effect2493_primitive1"
+         values="1"
+         type="saturate"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         id="mask-powermask-path-effect2493_primitive2"
+         values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0 "
+         in="fbSourceGraphic" />
+    </filter>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1195"
+       transform="matrix(1.2,0,0,1.2,-0.56467308,-1.27)">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+         id="rect846"
+         width="8.0348587"
+         height="4.5357866"
+         x="1.3794135"
+         y="4.0821066"
+         sodipodi:type="rect"
+         ry="0.19166182"
+         d="m 1.5710753,4.0821066 h 7.6515351 c 0.1061806,0 0.1916618,0.085481 0.1916618,0.1916618 v 4.152463 c 0,0.1061806 -0.085481,0.1916618 -0.1916618,0.1916618 H 1.5710753 c -0.1061806,0 -0.1916618,-0.085481 -0.1916618,-0.1916618 v -4.152463 c 0,-0.1061806 0.085481,-0.1916618 0.1916618,-0.1916618 z" />
+      <rect
+         style="fill:none;stroke:#000000;stroke-width:0.464;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect2450-6"
+         width="0.71841258"
+         height="1.7797576"
+         x="9.4266291"
+         y="5.4601212"
+         ry="0.11856993" />
+      <path
+         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.330586;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="rect3560-6"
+         width="3.6072023"
+         height="3.6072021"
+         x="3.6473281"
+         y="4.5463986"
+         ry="0.2215627"
+         sodipodi:type="rect"
+         mask="url(#mask-powermask-path-effect2493)"
+         inkscape:path-effect="#path-effect2493"
+         transform="translate(-0.06601804,-0.02563844)"
+         d="m 3.8688908,4.5463986 h 3.1640769 c 0.1227458,0 0.2215627,0.098817 0.2215627,0.2215627 V 7.932038 c 0,0.1227457 -0.098817,0.2215627 -0.2215627,0.2215627 H 3.8688908 c -0.1227457,0 -0.2215627,-0.098817 -0.2215627,-0.2215627 V 4.7679613 c 0,-0.1227457 0.098817,-0.2215627 0.2215627,-0.2215627 z" />
+    </g>
+  </g>
   <metadata
-     id="metadata262">
+     id="metadata4105">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1026"
-     inkscape:window-height="856"
-     id="namedview260"
-     showgrid="true"
-     inkscape:zoom="32"
-     inkscape:cx="5.2458034"
-     inkscape:cy="7.7083638"
-     inkscape:window-x="49"
-     inkscape:window-y="143"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg258"
-     showguides="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid348" />
-  </sodipodi:namedview>
-  <defs
-     id="defs1">
-    <style
-       type="text/css"
-       id="current-color-scheme">
-            .ColorScheme-Text {
-                color:#232629;
-            }
-            .ColorScheme-NegativeText {
-                color:#da4453;
-            }
-        </style>
-  </defs>
-  <path
-     id="path252"
-     style="fill:currentColor;fill-opacity:1;stroke:none"
-     d="M 0 2 L 0 14 L 15 14 L 15 10 L 15.5 10 C 15.777 10 16 9.777 16 9.5 L 16 6.5 C 16 6.223 15.777 6 15.5 6 L 15 6 L 15 2 L 3 2 L 0 2 z M 1 3 L 14 3 L 14 13 L 1 13 L 1 3 z M 2 4 L 2 12 L 13 12 L 13 4 L 2 4 z M 5.4140625 5 L 7.7070312 7.2929688 L 10 5 L 10.707031 5.7070312 L 8.4140625 8 L 10.707031 10.292969 L 10 11 L 7.7070312 8.7070312 L 5.4140625 11 L 4.7070312 10.292969 L 7 8 L 4.7070312 5.7070312 L 5.4140625 5 z " />
 </svg>