Port of upstream battery icons for the panel

26 files changed, 4064 insertions, 2164 deletions

diff --git a/elementary-xfce-dark/panel/22/gpm-battery-000-charging.svg b/elementary-xfce-dark/panel/22/gpm-battery-000-charging.svg
index d62b784f..870b503d 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-000-charging.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-000-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="22"
    height="22"
-   id="svg3887"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="xfpm-ups-000-charging.svg">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-000-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.41016949"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,7 +57,38 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+    <linearGradient
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="12"
        y1="1.9895233"
@@ -66,43 +97,114 @@
        id="linearGradient2843"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
+       gradientTransform="translate(18.101695,0.0391365)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3785">
       <stop
-         id="stop3680"
+         id="stop3787"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         id="stop3682"
+         id="stop3789"
          offset="1"
          style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
   </defs>
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,7)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
+  <g
+     transform="translate(1,6)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
   <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.50000000000000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:1;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z" />
   <path
-     d="m 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,13 10.047499,8 10,11 6,9 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="opacity:1;fill:url(#linearGradient2836);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-000.svg b/elementary-xfce-dark/panel/22/gpm-battery-000.svg
index e9c530f2..4e80d302 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-000.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-000.svg
@@ -7,26 +7,14 @@
    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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="22"
    height="22"
-   id="svg3718"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="xfpm-primary-missing.svg">
-  <metadata
-     id="metadata7634">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg4598"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-000.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,93 +24,48 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview7632"
+     inkscape:window-width="1007"
+     inkscape:window-height="682"
+     id="namedview7"
      showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.41016941"
-     inkscape:cy="11"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3718" />
+     inkscape:zoom="14.75"
+     inkscape:cx="18"
+     inkscape:cy="8"
+     inkscape:window-x="674"
+     inkscape:window-y="116"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4598" />
   <defs
-     id="defs3720">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7300"
-       id="linearGradient7287"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-0.9999995)"
-       x1="11.376964"
-       y1="14.98917"
-       x2="11.376964"
-       y2="17.01939" />
-    <linearGradient
-       id="linearGradient7300">
-      <stop
-         offset="0"
-         style="stop-color:#ff5a5a;stop-opacity:1;"
-         id="stop7302" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#de4040;stop-opacity:1;"
-         id="stop7304" />
-      <stop
-         offset="1"
-         style="stop-color:#bd2121;stop-opacity:1;"
-         id="stop7306" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7300"
-       id="linearGradient7290"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-0.9999995)"
-       x1="11.376964"
-       y1="7"
-       x2="11.376964"
-       y2="17.01939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7300"
-       id="linearGradient7293"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-0.9999995)"
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21" />
-  </defs>
-  <path
-     d="m 11,7.0000005 c -0.554,0 -1,0.446 -1,1 L 10,13 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-4.9999995 c 0,-0.554 -0.446,-1 -1,-1 z M 10.75,15 C 10.3345,15 10,15.3345 10,15.75 l 0,0.5 c 0,0.4155 0.3345,0.75 0.75,0.75 l 0.5,0 C 11.6655,17 12,16.6655 12,16.25 l 0,-0.5 C 12,15.3345 11.6655,15 11.25,15 l -0.5,0 z"
-     id="path3471-5"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.749992"
-     y="7.249999"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-3-3"
-     style="opacity:0.3;fill:none;stroke:#f00000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,19.5 0,-13.9999995 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815505 c 7e-4,-0.32804 0.002,-0.65608 0.002,-0.98411 0.0408,-0.59782 0.6496,-0.97673 1.2122,-0.89747 0.53292,0.0234 1.17689,-0.12412 1.55486,0.36319 0.35076,0.43848 0.19141,1.0212 0.2278,1.53721"
-     id="path3208-4-8"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-13.9999995 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815505 c 7e-4,-0.32804 0.002,-0.65608 0.002,-0.98411 0.0408,-0.59782 0.6496,-0.97673 1.2122,-0.89747 0.53292,0.0234 1.17689,-0.12412 1.55486,0.36319 0.35076,0.43848 0.19141,1.0212 0.2278,1.53721"
-     id="rect2442-4-8"
-     style="opacity:1;fill:none;stroke:url(#linearGradient7293);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 11,6.0000005 c 0.554,0 1,0.446 1,1 L 12,12 c 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 l 0,-4.9999995 c 0,-0.554 0.446,-1 1,-1 z"
-     id="path3467-3"
-     style="opacity:1;fill:url(#linearGradient7290);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 10.75,14 0.5,0 c 0.4155,0 0.75,0.3345 0.75,0.75 l 0,0.5 C 12,15.6655 11.6655,16 11.25,16 l -0.5,0 C 10.3345,16 10,15.6655 10,15.25 l 0,-0.5 C 10,14.3345 10.3345,14 10.75,14 z"
-     id="rect3448-1"
-     style="opacity:1;fill:url(#linearGradient7287);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     id="defs4600" />
+  <metadata
+     id="metadata4603">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(4,4)"
+     id="g2984"
+     style="opacity:0.5;fill:#000000;fill-opacity:1">
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2986"
+       inkscape:connector-curvature="0"
+       d="M 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 L 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 z m -1,0.5 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 z m -2,-3 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 l 11,0 C 12.777,4 13,4.223 13,4.5 z" />
+  </g>
+  <g
+     id="layer1"
+     transform="translate(4,3)">
+    <path
+       d="M 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 L 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 z m -1,0.5 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 z m -2,-3 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 l 11,0 C 12.777,4 13,4.223 13,4.5 z"
+       inkscape:connector-curvature="0"
+       id="rect2998"
+       style="color:#000000;fill:#d33636;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-020-charging.svg b/elementary-xfce-dark/panel/22/gpm-battery-020-charging.svg
index 8a65a18d..0b4017ca 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-020-charging.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-020-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="22"
    height="22"
-   id="svg3887"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="xfpm-ups-020-charging.svg">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-020-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-11.820339"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,16 +57,18 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -75,65 +77,141 @@
        id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.12581702,-9.798735,14.086873)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientTransform="translate(0,-1)" />
   </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:1;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <g
-     id="g3634"
-     style="opacity:0.4">
-    <rect
-       style="opacity:0.50000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="16"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="3"
-       width="6" />
-    <rect
-       style="opacity:1;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="15"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="3"
-       width="6" />
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,7)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
   </g>
+  <g
+     transform="translate(1,6)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <path
+     d="M 6.25,8 C 6.1115,8 6,8.1115 6,8.25 L 6,9 8,10 8,8 z M 6,10 6,13.75 C 6,13.8885 6.1115,14 6.25,14 L 8,14 8.0387737,11.706038 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="sscccscssccc" />
   <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z" />
   <path
-     d="m 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,13 10.047499,8 10,11 6,9 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="opacity:1;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-020.svg b/elementary-xfce-dark/panel/22/gpm-battery-020.svg
index 4f2d3c08..e5cd803e 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-020.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-020.svg
@@ -10,119 +10,212 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="22"
    height="22"
-   id="svg2518"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="xfpm-primary-020.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-020.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="753"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="-24.963855"
-     inkscape:cy="11.807229"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="800"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="20.85965"
+     inkscape:cx="12.310329"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:current-layer="layer1"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs2520">
+     id="defs3006">
     <linearGradient
-       x1="92.50988"
-       y1="37.83659"
-       x2="92.50988"
-       y2="30.517714"
-       id="linearGradient2516"
-       xlink:href="#linearGradient7300"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,-0.4101105,-25.63626,30.515635)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+    <linearGradient
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="12"
        y1="1.9895233"
        x2="12"
        y2="21"
-       id="linearGradient2392"
+       id="linearGradient2843"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
+       gradientTransform="translate(18.101695,0.0391365)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3785">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3787"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3789"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient7300">
-      <stop
-         id="stop7302"
-         style="stop-color:#ff5a5a;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop7304"
-         style="stop-color:#de4040;stop-opacity:1;"
-         offset="0.704952" />
-      <stop
-         id="stop7306"
-         style="stop-color:#bd2121;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4449"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15"
+       gradientTransform="translate(4,3)" />
   </defs>
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <g
-     id="layer1">
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-18.75"
-       y="7.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       style="opacity:0.29999999999999999;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 8.0500002,16 C 10.05,16 12.05,16 14.05,16 c 0,1 0,2 0,3 -2,0 -4,0 -5.9999998,0 0,-1 0,-2 0,-3 z"
-       id="rect3728-9"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 6.5,19.5 L 6.5,5.5 C 6.5,4.946 6.946,4.5 7.5,4.5 L 14.5,4.5 C 15.054,4.5 15.5,4.946 15.5,5.5 L 15.5,19.5 C 15.5,20.054 15.054,20.5 14.5,20.5 L 7.5,20.5 C 6.946,20.5 6.5,20.054 6.5,19.5 z M 9.50264,4.381549 C 9.50334,4.053509 9.504168,3.725473 9.505144,3.397441 C 9.545901,2.799616 10.15474,2.420708 10.717338,2.499967 C 11.25026,2.5234 11.894234,2.375846 12.272203,2.863162 C 12.622964,3.30164 12.463608,3.884362 12.5,4.400369"
-       id="path3208"
-       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 8.0500002,18 C 10.05,18 12.05,18 14.05,18 c 0,-1 0,-2 0,-3 -2,0 -4,0 -5.9999998,0 0,1 0,2 0,3 z"
-       id="rect3728"
-       style="fill:url(#linearGradient2516);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="opacity:0.5;fill:#000000;fill-opacity:1"
+     id="g4306"
+     transform="translate(4,4)">
     <path
-       d="M 6.5,18.5 L 6.5,4.5 C 6.5,3.946 6.946,3.5 7.5,3.5 L 14.5,3.5 C 15.054,3.5 15.5,3.946 15.5,4.5 L 15.5,18.5 C 15.5,19.054 15.054,19.5 14.5,19.5 L 7.5,19.5 C 6.946,19.5 6.5,19.054 6.5,18.5 z M 9.50264,3.381549 C 9.50334,3.053509 9.504168,2.725473 9.505144,2.397441 C 9.545901,1.799616 10.15474,1.420708 10.717338,1.499967 C 11.25026,1.5234 11.894234,1.375846 12.272203,1.863162 C 12.622964,2.30164 12.463608,2.884362 12.5,3.400369"
-       id="rect2442"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 1.5,0 C 3.8885,11 4,10.8885 4,10.75 L 4,5.25 C 4,5.1115 3.8885,5 3.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
   </g>
+  <path
+     d="M 6.25,8 C 6.1115,8 6,8.1115 6,8.25 l 0,5.5 C 6,13.8885 6.1115,14 6.25,14 l 1.5,0 C 7.8885,14 8,13.8885 8,13.75 L 8,8.25 C 8,8.1115 7.8885,8 7.75,8 z"
+     inkscape:connector-curvature="0"
+     id="path4451"
+     style="color:#bebebe;fill:#d33636;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="sssssssss" />
+  <path
+     sodipodi:nodetypes="sssssscsssscsssssssssssscsssscc"
+     style="color:#bebebe;fill:url(#linearGradient4449);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3206-7"
+     inkscape:connector-curvature="0"
+     d="M 5,6 C 4.446,6 4,6.446 4,7 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 C 20,9.446 19.554,9 19,9 L 18,9 18,7 C 18,6.446 17.554,6 17,6 z m 0.5,1 11,0 C 16.777,7 17,7.223 17,7.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 5.223,15 5,14.777 5,14.5 l 0,-7 C 5,7.223 5.223,7 5.5,7 z m 12.5,3 0.5,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,1 C 19,11.777 18.777,12 18.5,12 L 18,12 z" />
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-040-charging.svg b/elementary-xfce-dark/panel/22/gpm-battery-040-charging.svg
index 257c81f0..ad53916a 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-040-charging.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-040-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="22"
    height="22"
-   id="svg3887"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="xfpm-ups-040-charging.svg">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-040-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.41016949"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,16 +57,18 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -75,65 +77,141 @@
        id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.20969504,-9.798735,11.478122)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientTransform="translate(0,-1)" />
   </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:1;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <g
-     id="g3634"
-     style="opacity:0.4">
-    <rect
-       style="opacity:0.50000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="14"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="5"
-       width="6" />
-    <rect
-       style="opacity:1;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="13"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="5"
-       width="6" />
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,7)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
   </g>
+  <g
+     transform="translate(1,6)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <path
+     d="M 6.25,8 C 6.1115,8 6,8.1115 6,8.25 L 6,9 l 4,3 0,-2 0,-2 z M 6,10 6,13.75 C 6,13.8885 6.1115,14 6.25,14 l 3.75,0 0,-0.652815 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="ssccccscssccc" />
   <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z" />
   <path
-     d="m 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,13 10.047499,8 10,11 6,9 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="opacity:1;fill:url(#linearGradient2836);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-040.svg b/elementary-xfce-dark/panel/22/gpm-battery-040.svg
index ed258dbe..28c3e38f 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-040.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-040.svg
@@ -10,106 +10,201 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="22"
    height="22"
-   id="svg3239"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="xfpm-ups-040.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-040.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="753"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="-5.3854361"
-     inkscape:cy="12"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="800"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="12.310329"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:current-layer="svg3239"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3241">
+     id="defs3006">
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient2395"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.2096951,-9.7987346,11.478122)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3789"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
   </defs>
-  <rect
-     width="6"
-     height="5"
-     rx="0.5"
-     ry="0.49999994"
-     x="8.0500002"
-     y="14"
-     id="rect3206"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.29999999999999999;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 6.5,19.5 L 6.5,5.5 C 6.5,4.946 6.946,4.5 7.5,4.5 L 14.5,4.5 C 15.054,4.5 15.5,4.946 15.5,5.5 L 15.5,19.5 C 15.5,20.054 15.054,20.5 14.5,20.5 L 7.5,20.5 C 6.946,20.5 6.5,20.054 6.5,19.5 z M 9.50264,4.381549 C 9.50334,4.053509 9.504168,3.725473 9.505144,3.397441 C 9.545901,2.799616 10.15474,2.420708 10.717338,2.499967 C 11.25026,2.5234 11.894234,2.375846 12.272203,2.863162 C 12.622964,3.30164 12.463608,3.884362 12.5,4.400369"
-     id="path3208"
-     style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 8.0500002,13 C 10.05,13 12.05,13 14.05,13 C 14.05,14.666666 14.05,16.333334 14.05,18 C 12.05,18 10.05,18 8.0500002,18 C 8.0500002,16.333334 8.0500002,14.666666 8.0500002,13 z"
-     id="rect3728"
-     style="opacity:1;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 6.5,18.5 L 6.5,4.5 C 6.5,3.946 6.946,3.5 7.5,3.5 L 14.5,3.5 C 15.054,3.5 15.5,3.946 15.5,4.5 L 15.5,18.5 C 15.5,19.054 15.054,19.5 14.5,19.5 L 7.5,19.5 C 6.946,19.5 6.5,19.054 6.5,18.5 z M 9.50264,3.381549 C 9.50334,3.053509 9.504168,2.725473 9.505144,2.397441 C 9.545901,1.799616 10.15474,1.420708 10.717338,1.499967 C 11.25026,1.5234 11.894234,1.375846 12.272203,1.863162 C 12.622964,2.30164 12.463608,2.884362 12.5,3.400369"
-     id="rect2442"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1"
+     id="g4306"
+     transform="translate(4,4)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 3.5,0 C 5.8885,11 6,10.8885 6,10.75 L 6,5.25 C 6,5.1115 5.8885,5 5.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
+  <g
+     transform="translate(4,3)"
+     id="layer1-8"
+     style="fill:url(#linearGradient4302);fill-opacity:1">
+    <path
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 3.5,0 C 5.8885,11 6,10.8885 6,10.75 L 6,5.25 C 6,5.1115 5.8885,5 5.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       inkscape:connector-curvature="0"
+       id="rect3206-7"
+       style="color:#bebebe;fill:url(#linearGradient4304);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-060-charging.svg b/elementary-xfce-dark/panel/22/gpm-battery-060-charging.svg
index 71f1af43..1e862c1a 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-060-charging.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-060-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="22"
    height="22"
-   id="svg3887"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="xfpm-primary-060-charging.svg">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-060-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.41016949"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,16 +57,18 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -77,63 +79,139 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         id="stop3680"
+         id="stop3780"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         id="stop3682"
+         id="stop3782"
          offset="1"
          style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientTransform="translate(0,-1)" />
   </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.20000000000000001;fill:none;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:1;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,7)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
   <g
-     id="g3645"
-     style="opacity:0.4">
-    <rect
-       style="opacity:0.50000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="11"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="8"
-       width="6" />
-    <rect
-       style="opacity:1;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="10"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="8"
-       width="6" />
+     transform="translate(1,6)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     d="M 6.25,8 C 6.1115,8 6,8.1115 6,8.25 L 6,9 l 4,3 2,-2 C 11.9375,10 12,8 12,8.25 11.946254,8.122353 11.8885,8 11.75,8 z m 5.75,4 0,2 z M 6,10 6,13.75 C 6,13.8885 6.1115,14 6.25,14 l 4.5625,0 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="ssccccssccccsscc" />
+  <path
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z" />
   <path
-     d="m 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,13 10.047499,8 10,11 6,9 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="opacity:1;fill:url(#linearGradient2836);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-060.svg b/elementary-xfce-dark/panel/22/gpm-battery-060.svg
index 100d7475..8d853419 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-060.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-060.svg
@@ -10,106 +10,201 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="22"
    height="22"
-   id="svg3239"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="gpm-ups-060.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-060.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="753"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="-4.302926"
-     inkscape:cy="12"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="800"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.310329"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:current-layer="svg3239"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3241">
+     id="defs3006">
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient2395"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.3355121,-9.7987346,7.5649955)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3789"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
   </defs>
-  <rect
-     width="6"
-     height="8"
-     rx="0.5"
-     ry="0.49999994"
-     x="8.0500002"
-     y="11"
-     id="rect3206"
-     style="opacity:0.50000000000000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.29999999999999999;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 6.5,19.5 L 6.5,5.5 C 6.5,4.946 6.946,4.5 7.5,4.5 L 14.5,4.5 C 15.054,4.5 15.5,4.946 15.5,5.5 L 15.5,19.5 C 15.5,20.054 15.054,20.5 14.5,20.5 L 7.5,20.5 C 6.946,20.5 6.5,20.054 6.5,19.5 z M 9.50264,4.381549 C 9.50334,4.053509 9.504168,3.725473 9.505144,3.397441 C 9.545901,2.799616 10.15474,2.420708 10.717338,2.499967 C 11.25026,2.5234 11.894234,2.375846 12.272203,2.863162 C 12.622964,3.30164 12.463608,3.884362 12.5,4.400369"
-     id="path3208"
-     style="opacity:0.50000000000000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 8.0500002,10 C 10.05,10 12.05,10 14.05,10 C 14.05,12.666666 14.05,15.333334 14.05,18 C 12.05,18 10.05,18 8.0500002,18 C 8.0500002,15.333334 8.0500002,12.666666 8.0500002,10 z"
-     id="rect3728"
-     style="opacity:1;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 6.5,18.5 L 6.5,4.5 C 6.5,3.946 6.946,3.5 7.5,3.5 L 14.5,3.5 C 15.054,3.5 15.5,3.946 15.5,4.5 L 15.5,18.5 C 15.5,19.054 15.054,19.5 14.5,19.5 L 7.5,19.5 C 6.946,19.5 6.5,19.054 6.5,18.5 z M 9.50264,3.381549 C 9.50334,3.053509 9.504168,2.725473 9.505144,2.397441 C 9.545901,1.799616 10.15474,1.420708 10.717338,1.499967 C 11.25026,1.5234 11.894234,1.375846 12.272203,1.863162 C 12.622964,2.30164 12.463608,2.884362 12.5,3.400369"
-     id="rect2442"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1"
+     id="g4306"
+     transform="translate(4,4)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 5.5,0 C 7.8885,11 8,10.8885 8,10.75 L 8,5.25 C 8,5.1115 7.8885,5 7.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
+  <g
+     transform="translate(4,3)"
+     id="layer1-8"
+     style="fill:url(#linearGradient4302);fill-opacity:1">
+    <path
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 5.5,0 C 7.8885,11 8,10.8885 8,10.75 L 8,5.25 C 8,5.1115 7.8885,5 7.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       inkscape:connector-curvature="0"
+       id="rect3206-7"
+       style="color:#bebebe;fill:url(#linearGradient4304);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-080-charging.svg b/elementary-xfce-dark/panel/22/gpm-battery-080-charging.svg
index 6a9174ed..df99e9a0 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-080-charging.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-080-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="22"
    height="22"
-   id="svg3887"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="gpm-ups-080-charging.svg">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-080-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview27"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.41016949"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,16 +57,18 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -75,65 +77,159 @@
        id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.41939008,-9.798735,4.9562442)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3787"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3789"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4070"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4091"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientTransform="translate(0,-1)" />
   </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.20000000000000001;fill:none;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:1;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,7)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
   <g
-     id="g3638"
-     style="opacity:0.4">
-    <rect
-       style="opacity:0.50000000000000000;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="9"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="10"
-       width="6" />
-    <rect
-       style="opacity:1;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="8"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="10"
-       width="6" />
+     transform="translate(1,6)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     d="M 6.25,8 C 6.1115,8 6,8.1115 6,8.25 L 6,9 10,12 10.0625,9 C 12.019898,10.36509 14,13 14,13 L 14,8.25 C 14,8.1115 13.8885,8 13.75,8 z M 13.906125,13.9375 14,13 l -2,-1 0,2 1.749875,0 c 0.05886,0 0.113628,-0.02871 0.15625,-0.0625 z M 6,10 6,13.75 C 6,13.8885 6.1115,14 6.25,14 l 4.5625,0 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="ssccccsssccccsccsscc" />
+  <path
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z" />
   <path
-     d="m 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,13 10.047499,8 10,11 6,9 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="opacity:1;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-080.svg b/elementary-xfce-dark/panel/22/gpm-battery-080.svg
index c70386a7..16b66113 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-080.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-080.svg
@@ -10,106 +10,201 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="22"
    height="22"
-   id="svg3239"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="gpm-primary-080.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-080.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="753"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="-10.216867"
-     inkscape:cy="12"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="800"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="12.310329"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:current-layer="svg3239"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3241">
+     id="defs3006">
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient2395"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.4193901,-9.7987346,4.9562444)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3789"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
   </defs>
-  <rect
-     width="6"
-     height="10"
-     rx="0.5"
-     ry="0.49999997"
-     x="8.0500002"
-     y="9"
-     id="rect3206"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.29999999999999999;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 6.5,19.5 L 6.5,5.5 C 6.5,4.946 6.946,4.5 7.5,4.5 L 14.5,4.5 C 15.054,4.5 15.5,4.946 15.5,5.5 L 15.5,19.5 C 15.5,20.054 15.054,20.5 14.5,20.5 L 7.5,20.5 C 6.946,20.5 6.5,20.054 6.5,19.5 z M 9.50264,4.381549 C 9.50334,4.053509 9.504168,3.725473 9.505144,3.397441 C 9.545901,2.799616 10.15474,2.420708 10.717338,2.499967 C 11.25026,2.5234 11.894234,2.375846 12.272203,2.863162 C 12.622964,3.30164 12.463608,3.884362 12.5,4.400369"
-     id="path3208"
-     style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 8.0500002,8 C 10.05,8 12.05,8 14.05,8 C 14.05,11.333333 14.05,14.666667 14.05,18 C 12.05,18 10.05,18 8.0500002,18 C 8.0500002,14.666667 8.0500002,11.333333 8.0500002,8 z"
-     id="rect3728"
-     style="opacity:1;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 6.5,18.5 L 6.5,4.5 C 6.5,3.946 6.946,3.5 7.5,3.5 L 14.5,3.5 C 15.054,3.5 15.5,3.946 15.5,4.5 L 15.5,18.5 C 15.5,19.054 15.054,19.5 14.5,19.5 L 7.5,19.5 C 6.946,19.5 6.5,19.054 6.5,18.5 z M 9.50264,3.381549 C 9.50334,3.053509 9.504168,2.725473 9.505144,2.397441 C 9.545901,1.799616 10.15474,1.420708 10.717338,1.499967 C 11.25026,1.5234 11.894234,1.375846 12.272203,1.863162 C 12.622964,2.30164 12.463608,2.884362 12.5,3.400369"
-     id="rect2442"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;fill:#000000;fill-opacity:1"
+     id="g4306"
+     transform="translate(4,4)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 7.5,0 C 9.8885,11 10,10.8885 10,10.75 l 0,-5.5 C 10,5.1115 9.8885,5 9.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
+  <g
+     transform="translate(4,3)"
+     id="layer1-8"
+     style="fill:url(#linearGradient4302);fill-opacity:1">
+    <path
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 7.5,0 C 9.8885,11 10,10.8885 10,10.75 l 0,-5.5 C 10,5.1115 9.8885,5 9.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       inkscape:connector-curvature="0"
+       id="rect3206-7"
+       style="color:#bebebe;fill:url(#linearGradient4304);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-100-charging.svg b/elementary-xfce-dark/panel/22/gpm-battery-100-charging.svg
index 4eca2683..f38e6626 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-100-charging.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-100-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="22"
    height="22"
-   id="svg3887"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="gpm-primary-100-charging.svg">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-100-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,108 +28,199 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview25"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
      showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.41016949"
-     inkscape:cy="11"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004" />
   <defs
-     id="defs3889">
+     id="defs3006">
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
        id="linearGradient3678">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3680"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3682"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient2865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)"
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
-       y2="31.112288" />
-    <linearGradient
-       inkscape:collect="always"
+       y2="31.112288"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
-       id="linearGradient2872"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)"
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+    <linearGradient
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
        x1="12"
        y1="1.9895233"
        x2="12"
-       y2="21" />
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3648"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)"
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288" />
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4070"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4091"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientTransform="translate(0,-1)" />
   </defs>
-  <path
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3208-6"
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
-  <rect
-     style="opacity:0.20000000000000001;fill:none;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3236-1"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="7.25"
-     x="-18.75"
-     ry="0.25"
-     rx="0.25"
-     height="7.5"
-     width="14.5" />
-  <path
-     style="opacity:1;fill:none;stroke:url(#linearGradient2872);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect2442-9"
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,7)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
   <g
-     style="opacity:0.4"
-     id="g3611"
-     transform="translate(0,6)">
-    <rect
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="0"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="13"
-       width="6" />
-    <rect
-       style="opacity:1;color:#000000;fill:url(#linearGradient3648);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="-1"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="13"
-       width="6" />
+     transform="translate(1,6)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <path
-     style="opacity:0.40000000000000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3172-0"
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z" />
+     d="M 6.25,8 C 6.1115,8 6,8.1115 6,8.25 L 6,9 10,12 10.0625,9 C 12.019898,10.36509 16,13 16,13 L 16,8.25 C 16,8.1115 15.8885,8 15.75,8 z M 15.90625,13.9375 12,12 l 0,2 3.75,0 c 0.05886,0 0.113628,-0.02871 0.15625,-0.0625 z M 6,10 6,13.75 C 6,13.8885 6.1115,14 6.25,14 l 4.5625,0 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z" />
   <path
-     style="opacity:1;fill:url(#linearGradient2865);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     d="M 16,13 10.047499,8 10,11 6,9 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     d="m 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-100.svg b/elementary-xfce-dark/panel/22/gpm-battery-100.svg
index 59fa03a9..7a3c4bd7 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-100.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-100.svg
@@ -10,130 +10,227 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="22"
    height="22"
-   id="svg3239"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="gpm-primary-100.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-100.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="712"
-     inkscape:window-width="1062"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="3.9394818"
-     inkscape:cy="12"
-     inkscape:window-x="30"
-     inkscape:window-y="35"
-     inkscape:current-layer="layer1"
-     inkscape:window-maximized="0" />
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3241">
+     id="defs3006">
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient3235"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.7987346,1.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+    <linearGradient
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="12"
        y1="1.9895233"
        x2="12"
        y2="21"
-       id="linearGradient3204"
+       id="linearGradient2843"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
+       gradientTransform="translate(18.101695,0.0391365)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3785">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3787"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3789"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,78.029995,-3.8459034)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3678"
-       id="linearGradient2388"
-       y2="38.279892"
-       x2="159.68553"
-       y1="14.403693"
-       x1="159.68553" />
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4289"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4294"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientTransform="translate(-19,7)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
   </defs>
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <g
-     id="layer1">
-    <rect
-       width="6"
-       height="13"
-       rx="0.5"
-       ry="0.5"
-       x="8.0500002"
-       y="6"
-       id="rect3206"
-       style="opacity:0.50000000000000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-18.75"
-       y="7.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       style="opacity:0.29999999999999999;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="opacity:0.5;fill:#000000;fill-opacity:1"
+     id="g4306"
+     transform="translate(4,4)">
     <path
-       d="M 6.5,19.5 L 6.5,5.5 C 6.5,4.946 6.946,4.5 7.5,4.5 L 14.5,4.5 C 15.054,4.5 15.5,4.946 15.5,5.5 L 15.5,19.5 C 15.5,20.054 15.054,20.5 14.5,20.5 L 7.5,20.5 C 6.946,20.5 6.5,20.054 6.5,19.5 z M 9.50264,4.381549 C 9.50334,4.053509 9.504168,3.725473 9.505144,3.397441 C 9.545901,2.799616 10.15474,2.420708 10.717338,2.499967 C 11.25026,2.5234 11.894234,2.375846 12.272203,2.863162 C 12.622964,3.30164 12.463608,3.884362 12.5,4.400369"
-       id="path3208"
-       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 8.0500002,5 C 10.05,5 12.05,5 14.05,5 C 14.05,9.333333 14.05,13.666667 14.05,18 C 12.05,18 10.05,18 8.0500002,18 C 8.0500002,13.666667 8.0500002,9.333333 8.0500002,5 z"
-       id="rect3728"
-       style="opacity:1;fill:url(#linearGradient3235);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 L 1,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 9.5,0 C 11.8885,11 12,10.8885 12,10.75 l 0,-5.5 C 12,5.1115 11.8885,5 11.75,5 L 2.25,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 14,7 z" />
+  </g>
+  <g
+     transform="translate(4,3)"
+     id="layer1-8"
+     style="fill:url(#linearGradient4302);fill-opacity:1">
     <path
-       d="M 6.5,18.5 L 6.5,4.5 C 6.5,3.946 6.946,3.5 7.5,3.5 L 14.5,3.5 C 15.054,3.5 15.5,3.946 15.5,4.5 L 15.5,18.5 C 15.5,19.054 15.054,19.5 14.5,19.5 L 7.5,19.5 C 6.946,19.5 6.5,19.054 6.5,18.5 z M 9.50264,3.381549 C 9.50334,3.053509 9.504168,2.725473 9.505144,2.397441 C 9.545901,1.799616 10.15474,1.420708 10.717338,1.499967 C 11.25026,1.5234 11.894234,1.375846 12.272203,1.863162 C 12.622964,2.30164 12.463608,2.884362 12.5,3.400369"
-       id="rect2442"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3204);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="g2847"
-       transform="translate(-49.204819,-22.73494)">
-      <path
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path2410"
-         d="m 10.5,5 c 4.692,0 8.5,2.9120003 8.5,6.5 0,0.550338 -0.112625,1.083288 -0.28125,1.59375 L 22,15.90625 16.625,16 C 15.077862,17.23217 12.908496,18 10.5,18 5.808,18 1.999999,15.088 2,11.5 2,7.9120001 5.808,4.9999999 10.5,5 z" />
-      <path
-         style="fill:url(#linearGradient2388);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path2396"
-         d="m 10.5,4 c 4.692,0 8.5,2.9120003 8.5,6.5 0,0.550338 -0.112625,1.083288 -0.28125,1.59375 L 22,14.90625 16.625,15 C 15.077862,16.23217 12.908496,17 10.5,17 5.808,17 1.999999,14.088 2,10.5 2,6.9120001 5.808,3.9999999 10.5,4 z" />
-    </g>
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 L 1,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 9.5,0 C 11.8885,11 12,10.8885 12,10.75 l 0,-5.5 C 12,5.1115 11.8885,5 11.75,5 L 2.25,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 14,7 z"
+       inkscape:connector-curvature="0"
+       id="rect3206-7"
+       style="color:#bebebe;fill:url(#linearGradient4304);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/22/gpm-battery-charged.svg b/elementary-xfce-dark/panel/22/gpm-battery-charged.svg
index 3d4461b5..23935b8b 100644
--- a/elementary-xfce-dark/panel/22/gpm-battery-charged.svg
+++ b/elementary-xfce-dark/panel/22/gpm-battery-charged.svg
@@ -10,105 +10,143 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
    width="22"
    height="22"
-   id="svg3701"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="xfpm-ups-charged.svg">
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-charged.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="3.2702566"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004" />
   <defs
-     id="defs3703">
+     id="defs3006">
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2485"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-7.0000003)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient2488"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3895"
+       x1="9.6440678"
+       y1="3.2711864"
+       x2="9.6440678"
+       y2="19.235813"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,0)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.098901"
-     inkscape:cx="-5.7851486"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
   <metadata
-     id="metadata3706">
+     id="metadata3009">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,6)">
-    <path
-       d="M 8.0625,-3.0146495e-7 C 8.0625,1.9999995 8.0625,3.9999996 8.0625,6 l 6,-6.00000030146495 c -2,0 -4,0 -6,0 z m 6,0 L 12.0625,5 l 2,0 c 0,-1.666667 0,-3.3333338 0,-5.00000030146495 z M 14.0625,6.15625 8.0625,13 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
-       id="rect3728-9"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 6.5,13.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,13.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-1.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208"
-       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-12.75"
-       y="7.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       style="opacity:0.29999999999999999;fill:none;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 8.0625,-1.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5 2,0 c 0,-1.6666667 0,-3.3333335 0,-5 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
-       id="rect3728"
-       style="opacity:1;fill:url(#linearGradient2488);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 6.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-2.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442"
-       style="opacity:1;fill:none;stroke:url(#linearGradient2485);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
+  <path
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3949"
+     inkscape:connector-curvature="0"
+     d="M 5,7 C 4.446,7 4,7.446 4,8 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-2 C 18,7.446 17.554,7 17,7 L 5,7 z m 0.5,1 11,0 C 16.777,8 17,8.223 17,8.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 5.223,16 5,15.777 5,15.5 l 0,-7 C 5,8.223 5.223,8 5.5,8 z M 6.25,9 C 6.1115,9 6,9.1115 6,9.25 L 6,10 10,12 10.0625,9 6.25,9 z M 10.0625,9 16,14 16,9.25 C 16,9.1115 15.8885,9 15.75,9 L 10.0625,9 z M 16,14 l -4,-2 0,3 3.75,0 C 15.8885,15 16,14.8885 16,14.75 L 16,14 z m -4,1 -6,-5 0,4.75 C 6,14.8885 6.1115,15 6.25,15 L 12,15 z m 6,-4 0.5,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,1 c 0,0.277 -0.223,0.5 -0.5,0.5 l -0.5,0 0,-2 z" />
+  <path
+     d="M 5,6 C 4.446,6 4,6.446 4,7 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 C 20,9.446 19.554,9 19,9 L 18,9 18,7 C 18,6.446 17.554,6 17,6 L 5,6 z m 0.5,1 11,0 C 16.777,7 17,7.223 17,7.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 5.223,15 5,14.777 5,14.5 l 0,-7 C 5,7.223 5.223,7 5.5,7 z M 6.25,8 C 6.1115,8 6,8.1115 6,8.25 L 6,9 10,11 10.0625,8 6.25,8 z M 10.0625,8 16,13 16,8.25 C 16,8.1115 15.8885,8 15.75,8 L 10.0625,8 z M 16,13 l -4,-2 0,3 3.75,0 C 15.8885,14 16,13.8885 16,13.75 L 16,13 z M 12,14 6,9 6,13.75 C 6,13.8885 6.1115,14 6.25,14 L 12,14 z m 6,-4 0.5,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,1 c 0,0.277 -0.223,0.5 -0.5,0.5 l -0.5,0 0,-2 z"
+     inkscape:connector-curvature="0"
+     id="rect3206-25"
+     style="color:#bebebe;fill:url(#linearGradient3895);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-000-charging.svg b/elementary-xfce-dark/panel/24/gpm-battery-000-charging.svg
index 39065cf2..11b01939 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-000-charging.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-000-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="24"
    height="24"
-   id="svg3887"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-000-charging.svg">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-000-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="751"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.26101695"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,7 +57,38 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+    <linearGradient
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="12"
        y1="1.9895233"
@@ -65,47 +96,114 @@
        y2="21"
        id="linearGradient2843"
        xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3785">
       <stop
-         id="stop3680"
+         id="stop3787"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         id="stop3682"
+         id="stop3789"
          offset="1"
          style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
   </defs>
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,8)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
+  <g
+     transform="translate(1,7)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
   <path
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,15 10.047499,10 10,13 6,11 l 6,5 0,-3 z" />
   <path
-     d="m 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-000.svg b/elementary-xfce-dark/panel/24/gpm-battery-000.svg
index 9b80af04..23dc4b93 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-000.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-000.svg
@@ -7,26 +7,14 @@
    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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="24"
    height="24"
-   id="svg3718"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-000.svg">
-  <metadata
-     id="metadata7634">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg4598"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="battery-empty-symbolic.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,95 +24,48 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="751"
-     id="namedview7632"
+     inkscape:window-width="1007"
+     inkscape:window-height="682"
+     id="namedview7"
      showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.26101687"
-     inkscape:cy="11"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3718" />
+     inkscape:zoom="14.75"
+     inkscape:cx="-2.8813559"
+     inkscape:cy="8"
+     inkscape:window-x="674"
+     inkscape:window-y="116"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4598" />
   <defs
-     id="defs3720">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7300"
-       id="linearGradient7287"
-       gradientUnits="userSpaceOnUse"
-       x1="11.376964"
-       y1="14.98917"
-       x2="11.376964"
-       y2="17.01939" />
-    <linearGradient
-       id="linearGradient7300">
-      <stop
-         offset="0"
-         style="stop-color:#ff5a5a;stop-opacity:1;"
-         id="stop7302" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#de4040;stop-opacity:1;"
-         id="stop7304" />
-      <stop
-         offset="1"
-         style="stop-color:#bd2121;stop-opacity:1;"
-         id="stop7306" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7300"
-       id="linearGradient7290"
-       gradientUnits="userSpaceOnUse"
-       x1="11.376964"
-       y1="7"
-       x2="11.376964"
-       y2="17.01939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7300"
-       id="linearGradient7293"
-       gradientUnits="userSpaceOnUse"
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21" />
-  </defs>
-  <path
-     d="m 12,8.0000005 c -0.554,0 -1,0.446 -1,0.9999995 l 0,5 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 L 13,9 C 13,8.4460005 12.554,8.0000005 12,8.0000005 z M 11.75,16 C 11.3345,16 11,16.3345 11,16.75 l 0,0.5 c 0,0.4155 0.3345,0.75 0.75,0.75 l 0.5,0 C 12.6655,18 13,17.6655 13,17.25 l 0,-0.5 C 13,16.3345 12.6655,16 12.25,16 l -0.5,0 z"
-     id="path3471-5"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.749992"
-     y="8.249999"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-3-3"
-     style="opacity:0.3;fill:none;stroke:#f00000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,20.5 0,-13.9999995 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815505 c 7e-4,-0.32804 0.002,-0.65608 0.002,-0.98411 0.0408,-0.59782 0.6496,-0.97673 1.2122,-0.89747 0.53292,0.0234 1.17689,-0.12412 1.55486,0.36319 0.35076,0.43848 0.19141,1.0212 0.2278,1.53721"
-     id="path3208-4-8"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 7.5,19.5 0,-13.9999995 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815505 c 7e-4,-0.32804 0.002,-0.65608 0.002,-0.98411 0.0408,-0.59782 0.6496,-0.97673 1.2122,-0.89747 0.53292,0.0234 1.17689,-0.12412 1.55486,0.36319 0.35076,0.43848 0.19141,1.0212 0.2278,1.53721"
-     id="rect2442-4-8"
-     style="fill:none;stroke:url(#linearGradient7293);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 12,7.0000005 c 0.554,0 1,0.446 1,1 L 13,13 c 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 l 0,-4.9999995 c 0,-0.554 0.446,-1 1,-1 z"
-     id="path3467-3"
-     style="fill:url(#linearGradient7290);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 11.75,15 0.5,0 c 0.4155,0 0.75,0.3345 0.75,0.75 l 0,0.5 C 13,16.6655 12.6655,17 12.25,17 l -0.5,0 C 11.3345,17 11,16.6655 11,16.25 l 0,-0.5 C 11,15.3345 11.3345,15 11.75,15 z"
-     id="rect3448-1"
-     style="fill:url(#linearGradient7287);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     id="defs4600" />
+  <metadata
+     id="metadata4603">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(4,5)"
+     id="g2984"
+     style="fill:#000000;fill-opacity:1;opacity:0.5">
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2986"
+       inkscape:connector-curvature="0"
+       d="M 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 L 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 z m -1,0.5 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 z m -2,-3 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 l 11,0 C 12.777,4 13,4.223 13,4.5 z" />
+  </g>
+  <g
+     id="layer1"
+     transform="translate(4,4)">
+    <path
+       d="M 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 L 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 z m -1,0.5 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 z m -2,-3 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 l 11,0 C 12.777,4 13,4.223 13,4.5 z"
+       inkscape:connector-curvature="0"
+       id="rect2998"
+       style="color:#000000;fill:#d33636;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-020-charging.svg b/elementary-xfce-dark/panel/24/gpm-battery-020-charging.svg
index 91ef0431..cd36d135 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-020-charging.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-020-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="24"
    height="24"
-   id="svg3887"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-020-charging.svg">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-020-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="751"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-11.671186"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,15 +57,18 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -74,70 +77,139 @@
        id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.12581702,-9.798735,14.086873)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
   </defs>
-  <path
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,8)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
   <g
-     id="g3634"
-     style="opacity:0.4"
-     transform="translate(1,1)">
-    <rect
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="16"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="3"
-       width="6" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="15"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="3"
-       width="6" />
+     transform="translate(1,7)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <path
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     d="M 6.25,9 C 6.1115,9 6,9.1115 6,9.25 L 6,10 8,11 8,9 z M 6,11 6,14.75 C 6,14.8885 6.1115,15 6.25,15 L 8,15 8.0387737,12.706038 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="sscccscssccc" />
+  <path
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,15 10.047499,10 10,13 6,11 l 6,5 0,-3 z" />
   <path
-     d="m 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-020.svg b/elementary-xfce-dark/panel/24/gpm-battery-020.svg
index eb9c23b3..d54a13b5 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-020.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-020.svg
@@ -10,124 +10,212 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="24"
    height="24"
-   id="svg2518"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-020.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-040.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="751"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="-24.771084"
-     inkscape:cy="11.807229"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1606"
+     inkscape:window-height="934"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="41.7193"
+     inkscape:cx="12.26239"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="layer1"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs2520">
+     id="defs3006">
     <linearGradient
-       x1="92.50988"
-       y1="37.83659"
-       x2="92.50988"
-       y2="30.517714"
-       id="linearGradient2516"
-       xlink:href="#linearGradient7300"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,-0.4101105,-24.63626,29.515635)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+    <linearGradient
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="12"
        y1="1.9895233"
        x2="12"
        y2="21"
-       id="linearGradient2392"
+       id="linearGradient2843"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-2)" />
+       gradientTransform="translate(18.101695,0.0391365)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3785">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3787"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3789"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient7300">
-      <stop
-         id="stop7302"
-         style="stop-color:#ff5a5a;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop7304"
-         style="stop-color:#de4040;stop-opacity:1;"
-         offset="0.704952" />
-      <stop
-         id="stop7306"
-         style="stop-color:#bd2121;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4449"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15"
+       gradientTransform="translate(4,4)" />
   </defs>
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <g
-     id="layer1"
-     transform="translate(0,2)">
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-17.75"
-       y="8.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 9.0500002,15 C 11.05,15 13.05,15 15.05,15 c 0,1 0,2 0,3 -2,0 -4,0 -5.9999998,0 0,-1 0,-2 0,-3 z"
-       id="rect3728-9"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 7.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,3.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208"
-       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 9.0500002,17 C 11.05,17 13.05,17 15.05,17 c 0,-1 0,-2 0,-3 -2,0 -4,0 -5.9999998,0 0,1 0,2 0,3 z"
-       id="rect3728"
-       style="fill:url(#linearGradient2516);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+     style="fill:#000000;fill-opacity:1;opacity:0.5"
+     id="g4306"
+     transform="translate(4,5)">
     <path
-       d="m 7.5,17.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,2.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442"
-       style="fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 1.5,0 C 3.8885,11 4,10.8885 4,10.75 L 4,5.25 C 4,5.1115 3.8885,5 3.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
   </g>
+  <path
+     d="M 6.25,9 C 6.1115,9 6,9.1115 6,9.25 l 0,5.5 C 6,14.8885 6.1115,15 6.25,15 l 1.5,0 C 7.8885,15 8,14.8885 8,14.75 L 8,9.25 C 8,9.1115 7.8885,9 7.75,9 z"
+     inkscape:connector-curvature="0"
+     id="path4451"
+     style="color:#bebebe;fill:#d33636;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="sssssssss" />
+  <path
+     sodipodi:nodetypes="sssssscsssscsssssssssssscsssscc"
+     style="color:#bebebe;fill:url(#linearGradient4449);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3206-7"
+     inkscape:connector-curvature="0"
+     d="M 5,7 C 4.446,7 4,7.446 4,8 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-2 C 18,7.446 17.554,7 17,7 z m 0.5,1 11,0 C 16.777,8 17,8.223 17,8.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 5.223,16 5,15.777 5,15.5 l 0,-7 C 5,8.223 5.223,8 5.5,8 z m 12.5,3 0.5,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,1 C 19,12.777 18.777,13 18.5,13 L 18,13 z" />
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-040-charging.svg b/elementary-xfce-dark/panel/24/gpm-battery-040-charging.svg
index 85dd5d20..c9443af7 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-040-charging.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-040-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="24"
    height="24"
-   id="svg3887"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-040-charging.svg">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-040-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="751"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.26101695"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,15 +57,18 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -74,70 +77,139 @@
        id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.20969504,-9.798735,11.478122)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
   </defs>
-  <path
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,8)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
   <g
-     id="g3634"
-     style="opacity:0.4"
-     transform="translate(1,1)">
-    <rect
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="14"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="5"
-       width="6" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="13"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="5"
-       width="6" />
+     transform="translate(1,7)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <path
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     d="M 6.25,9 C 6.1115,9 6,9.1115 6,9.25 l 0,0.75 4,3 0,-2 0,-2 z M 6,11 6,14.75 C 6,14.8885 6.1115,15 6.25,15 l 3.75,0 0,-0.652815 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="ssccccscssccc" />
+  <path
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,15 10.047499,10 10,13 6,11 l 6,5 0,-3 z" />
   <path
-     d="m 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-040.svg b/elementary-xfce-dark/panel/24/gpm-battery-040.svg
index 51c64864..afc26123 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-040.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-040.svg
@@ -10,108 +10,201 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="24"
    height="24"
-   id="svg3239"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-040.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-060.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="751"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="-5.192665"
-     inkscape:cy="12"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1606"
+     inkscape:window-height="934"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="41.7193"
+     inkscape:cx="12.26239"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg3239"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3241">
+     id="defs3006">
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
        xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient2395"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.2096951,-8.7987346,12.478122)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
   </defs>
-  <rect
-     width="6"
-     height="5"
-     rx="0.5"
-     ry="0.49999994"
-     x="9.0500002"
-     y="15"
-     id="rect3206"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,20.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.649596,-0.976733 1.212194,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 9.0500002,14 C 11.05,14 13.05,14 15.05,14 c 0,1.666666 0,3.333334 0,5 -2,0 -4,0 -5.9999998,0 0,-1.666666 0,-3.333334 0,-5 z"
-     id="rect3728"
-     style="fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 7.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.649596,-0.976733 1.212194,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442"
-     style="fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="fill:#000000;fill-opacity:1;opacity:0.5"
+     id="g4306"
+     transform="translate(4,5)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 3.5,0 C 5.8885,11 6,10.8885 6,10.75 L 6,5.25 C 6,5.1115 5.8885,5 5.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
+  <g
+     transform="translate(4,4)"
+     id="layer1-8"
+     style="fill:url(#linearGradient4302);fill-opacity:1.0">
+    <path
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 3.5,0 C 5.8885,11 6,10.8885 6,10.75 L 6,5.25 C 6,5.1115 5.8885,5 5.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       inkscape:connector-curvature="0"
+       id="rect3206-7"
+       style="color:#bebebe;fill:url(#linearGradient4304);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-060-charging.svg b/elementary-xfce-dark/panel/24/gpm-battery-060-charging.svg
index 1b798deb..218bf42d 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-060-charging.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-060-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="24"
    height="24"
-   id="svg3887"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-060-charging.svg">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-080-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="751"
-     id="namedview23"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.26101695"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,15 +57,18 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -76,68 +79,137 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         id="stop3680"
+         id="stop3780"
          offset="0"
          style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         id="stop3682"
+         id="stop3782"
          offset="1"
          style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
   </defs>
-  <path
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,8)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
   <g
-     id="g3645"
-     style="opacity:0.4"
-     transform="translate(1,1)">
-    <rect
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="11"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="8"
-       width="6" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="10"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="8"
-       width="6" />
+     transform="translate(1,7)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <path
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     d="M 6.25,9 C 6.1115,9 6,9.1115 6,9.25 l 0,0.75 4,3 2,-2 C 11.9375,11 12,9 12,9.25 11.946254,9.1223535 11.8885,9 11.75,9 z m 5.75,4 0,2 z M 6,11 6,14.75 C 6,14.8885 6.1115,15 6.25,15 l 4.5625,0 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="ssccccssccccsscc" />
+  <path
+     style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,15 10.047499,10 10,13 6,11 l 6,5 0,-3 z" />
   <path
-     d="m 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-060.svg b/elementary-xfce-dark/panel/24/gpm-battery-060.svg
index efed5ac8..4b6bade5 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-060.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-060.svg
@@ -10,108 +10,201 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="24"
    height="24"
-   id="svg3239"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-060.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-080.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="751"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="-4.1101549"
-     inkscape:cy="12"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1606"
+     inkscape:window-height="934"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="41.7193"
+     inkscape:cx="12.26239"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg3239"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3241">
+     id="defs3006">
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
        xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient2395"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.3355121,-8.7987346,8.5649955)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
   </defs>
-  <rect
-     width="6"
-     height="8"
-     rx="0.5"
-     ry="0.49999994"
-     x="9.0500002"
-     y="12"
-     id="rect3206"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,20.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.649596,-0.976733 1.212194,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 9.0500002,11 C 11.05,11 13.05,11 15.05,11 c 0,2.666666 0,5.333334 0,8 -2,0 -4,0 -5.9999998,0 0,-2.666666 0,-5.333334 0,-8 z"
-     id="rect3728"
-     style="fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 7.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.649596,-0.976733 1.212194,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442"
-     style="fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="fill:#000000;fill-opacity:1;opacity:0.5"
+     id="g4306"
+     transform="translate(4,5)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 5.5,0 C 7.8885,11 8,10.8885 8,10.75 L 8,5.25 C 8,5.1115 7.8885,5 7.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
+  <g
+     transform="translate(4,4)"
+     id="layer1-8"
+     style="fill:url(#linearGradient4302);fill-opacity:1.0">
+    <path
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 5.5,0 C 7.8885,11 8,10.8885 8,10.75 L 8,5.25 C 8,5.1115 7.8885,5 7.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       inkscape:connector-curvature="0"
+       id="rect3206-7"
+       style="color:#bebebe;fill:url(#linearGradient4304);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-080-charging.svg b/elementary-xfce-dark/panel/24/gpm-battery-080-charging.svg
index 91c68df0..f7c058a8 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-080-charging.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-080-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="24"
    height="24"
-   id="svg3887"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-080-charging.svg">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-100-charging_.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,19 +28,27 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="751"
-     id="namedview27"
-     showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.26101695"
-     inkscape:cy="11"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="29.5"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3889">
+     id="defs3006">
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -57,15 +57,18 @@
        id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
@@ -74,70 +77,157 @@
        id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.41939008,-9.798735,4.9562442)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4070"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4091"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
   </defs>
-  <path
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,8)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
   <g
-     id="g3638"
-     style="opacity:0.4"
-     transform="translate(1,1)">
-    <rect
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="9"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="10"
-       width="6" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="8"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="10"
-       width="6" />
+     transform="translate(1,7)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <path
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     d="M 6.25,9 C 6.1115,9 6,9.1115 6,9.25 l 0,0.75 4,3 0.0625,-3 C 12.019898,11.36509 14,14 14,14 L 14,9.25 C 14,9.1115 13.8885,9 13.75,9 z M 13.906125,14.9375 14,14 l -2,-1 0,2 1.749875,0 c 0.05886,0 0.113628,-0.02871 0.15625,-0.0625 z M 6,11 6,14.75 C 6,14.8885 6.1115,15 6.25,15 l 4.5625,0 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     sodipodi:nodetypes="ssccccsssccccsccsscc" />
+  <path
+     style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,15 10.047499,10 10,13 6,11 l 6,5 0,-3 z" />
   <path
-     d="m 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     style="fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-080.svg b/elementary-xfce-dark/panel/24/gpm-battery-080.svg
index 2543b33e..3556eca8 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-080.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-080.svg
@@ -10,108 +10,201 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="24"
    height="24"
-   id="svg3239"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-080.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-100.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="751"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="10.375"
-     inkscape:cx="-10.024096"
-     inkscape:cy="19.710843"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1606"
+     inkscape:window-height="934"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="41.7193"
+     inkscape:cx="12.26239"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:current-layer="svg3239"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3241">
+     id="defs3006">
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
        xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient2395"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.4193901,-8.7987346,5.9562444)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
   </defs>
-  <rect
-     width="6"
-     height="10"
-     rx="0.5"
-     ry="0.49999997"
-     x="9.0500002"
-     y="10"
-     id="rect3206"
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,20.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.649596,-0.976733 1.212194,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208"
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 9.0500002,9 C 11.05,9 13.05,9 15.05,9 c 0,3.333333 0,6.666667 0,10 -2,0 -4,0 -5.9999998,0 0,-3.333333 0,-6.666667 0,-10 z"
-     id="rect3728"
-     style="fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 7.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.649596,-0.976733 1.212194,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442"
-     style="fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="fill:#000000;fill-opacity:1;opacity:0.5"
+     id="g4306"
+     transform="translate(4,5)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 7.5,0 C 9.8885,11 10,10.8885 10,10.75 l 0,-5.5 C 10,5.1115 9.8885,5 9.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
+  <g
+     transform="translate(4,4)"
+     id="layer1-8"
+     style="fill:url(#linearGradient4302);fill-opacity:1.0">
+    <path
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 7.5,0 C 9.8885,11 10,10.8885 10,10.75 l 0,-5.5 C 10,5.1115 9.8885,5 9.75,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 z"
+       inkscape:connector-curvature="0"
+       id="rect3206-7"
+       style="color:#bebebe;fill:url(#linearGradient4304);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="sssssscsssscssssssssssssssssssssscsssscc" />
+  </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-100-charging.svg b/elementary-xfce-dark/panel/24/gpm-battery-100-charging.svg
index fdcc8aa8..1face26c 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-100-charging.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-100-charging.svg
@@ -13,20 +13,12 @@
    version="1.1"
    width="24"
    height="24"
-   id="svg3887"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-100-charging.svg">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-100-charging_.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,111 +28,197 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="751"
-     id="namedview25"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
      showgrid="false"
-     inkscape:zoom="13.409091"
-     inkscape:cx="-0.26101695"
-     inkscape:cy="11"
+     inkscape:zoom="14.75"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
      inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3887" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004" />
   <defs
-     id="defs3889">
+     id="defs3006">
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
     <linearGradient
        id="linearGradient3678">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3680"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3682"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient2865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)"
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
-       y2="31.112288" />
-    <linearGradient
-       inkscape:collect="always"
+       y2="31.112288"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
-       id="linearGradient2872"
        gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+    <linearGradient
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
        x1="12"
        y1="1.9895233"
        x2="12"
-       y2="21" />
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3648"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)"
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288" />
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4070"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4091"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4094"
+       gradientUnits="userSpaceOnUse"
+       x1="11.084745"
+       y1="5.2203388"
+       x2="11.084745"
+       y2="20.000038" />
   </defs>
-  <path
-     style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3208-6"
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     inkscape:connector-curvature="0" />
-  <rect
-     style="opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3236-1"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="8.25"
-     x="-19.75"
-     ry="0.25"
-     rx="0.25"
-     height="7.5"
-     width="14.5" />
-  <path
-     style="fill:none;stroke:url(#linearGradient2872);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect2442-9"
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="g4030"
+     transform="translate(1,8)">
+    <path
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4032"
+       inkscape:connector-curvature="0"
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z" />
+  </g>
   <g
-     style="opacity:0.4"
-     id="g3611"
-     transform="translate(1,7)">
-    <rect
-       style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965-9"
-       y="0"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="13"
-       width="6" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient3648);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3965"
-       y="-1"
-       x="8"
-       ry="0"
-       rx="0.25"
-       height="13"
-       width="6" />
+     transform="translate(1,7)"
+     id="layer1"
+     style="color:#bebebe;fill:url(#linearGradient4011);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate">
+    <path
+       d="M 4,0 C 3.446,0 3,0.446 3,1 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 19,4 C 19,3.446 18.554,3 18,3 L 17,3 17,1 C 17,0.446 16.554,0 16,0 z m 0.5,1 11,0 C 15.777,1 16,1.223 16,1.5 l 0,7 C 16,8.777 15.777,9 15.5,9 L 4.5,9 C 4.223,9 4,8.777 4,8.5 l 0,-7 C 4,1.223 4.223,1 4.5,1 z M 17,4 17.5,4 C 17.777,4 18,4.223 18,4.5 l 0,1 C 18,5.777 17.777,6 17.5,6 L 17,6 z"
+       inkscape:connector-curvature="0"
+       id="rect3206"
+       style="color:#bebebe;fill:url(#linearGradient3997);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <path
-     style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3172-0"
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     inkscape:connector-curvature="0" />
+     d="M 6.25,9 C 6.1115,9 6,9.1115 6,9.25 l 0,0.75 4,3 0.0625,-3 C 12.019898,11.36509 16,14 16,14 L 16,9.25 C 16,9.1115 15.8885,9 15.75,9 z M 15.90625,14.9375 12,13 l 0,2 3.75,0 c 0.05886,0 0.113628,-0.02871 0.15625,-0.0625 z M 6,11 6,14.75 C 6,14.8885 6.1115,15 6.25,15 l 4.5625,0 z"
+     inkscape:connector-curvature="0"
+     id="rect3085"
+     style="opacity:0.4;color:#bebebe;fill:url(#linearGradient4094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.5"
+     id="path4080"
+     inkscape:connector-curvature="0"
+     d="M 16,15 10.047499,10 10,13 6,11 l 6,5 0,-3 z" />
   <path
-     style="fill:url(#linearGradient2865);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     d="M 16,14 10.047499,9 10,12 6,10 l 6,5 0,-3 z"
+     inkscape:connector-curvature="0"
      id="path3172"
-     d="m 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     inkscape:connector-curvature="0" />
+     style="color:#bebebe;fill:url(#linearGradient4009);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-100.svg b/elementary-xfce-dark/panel/24/gpm-battery-100.svg
index 4e60f9b1..6ce33065 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-100.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-100.svg
@@ -10,122 +10,227 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
+   version="1.1"
    width="24"
    height="24"
-   id="svg3239"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="gpm-battery-100.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gpm-battery-000-charging.svg"
+   inkscape:export-filename="/home/ochosi/Nerdstuff/shimmer/elementary-xfce/elementary-xfce-dark/panel/24/gpm-battery-charged.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
   <sodipodi:namedview
-     inkscape:window-height="712"
-     inkscape:window-width="1062"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
      pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="5.1875"
-     inkscape:cx="3.9394818"
-     inkscape:cy="12"
-     inkscape:window-x="30"
-     inkscape:window-y="35"
-     inkscape:current-layer="layer1"
-     inkscape:window-maximized="0" />
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="12.070632"
+     inkscape:cy="13.423729"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4097"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
-     id="defs3241">
+     id="defs3006">
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient3235"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.7987346,0.0431177)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+    <linearGradient
+       id="linearGradient3778">
+      <stop
+         id="stop3780"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3782"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="12"
        y1="1.9895233"
        x2="12"
        y2="21"
-       id="linearGradient3204"
+       id="linearGradient2843"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-2)" />
+       gradientTransform="translate(18.101695,0.0391365)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3785">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3787"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3789"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,78.029995,-3.8459034)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3678"
-       id="linearGradient2388"
-       y2="38.279892"
-       x2="159.68553"
-       y1="14.403693"
-       x1="159.68553" />
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3997"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4009"
+       x1="10.915255"
+       y1="4.6101694"
+       x2="10.915255"
+       y2="19.537899"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4011"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4289"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4294"
+       gradientUnits="userSpaceOnUse"
+       x1="9.9152546"
+       y1="-2.3898306"
+       x2="9.9152546"
+       y2="12.537899"
+       gradientTransform="translate(-19,7)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4302"
+       x1="0"
+       y1="8"
+       x2="16"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient4304"
+       gradientUnits="userSpaceOnUse"
+       x1="7"
+       y1="1"
+       x2="7"
+       y2="15" />
   </defs>
+  <metadata
+     id="metadata3009">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <g
-     id="layer1"
-     transform="translate(0,2)">
-    <rect
-       width="6"
-       height="13"
-       rx="0.5"
-       ry="0.5"
-       x="9.0500002"
-       y="5"
-       id="rect3206"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-17.75"
-       y="8.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     style="fill:#000000;fill-opacity:1;opacity:0.5"
+     id="g4306"
+     transform="translate(4,5)">
     <path
-       d="m 7.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,3.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.649596,-0.976733 1.212194,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208"
-       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 9.0500002,4 C 11.05,4 13.05,4 15.05,4 c 0,4.333333 0,8.666667 0,13 -2,0 -4,0 -5.9999998,0 0,-4.333333 0,-8.666667 0,-13 z"
-       id="rect3728"
-       style="fill:url(#linearGradient3235);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       style="color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4308"
+       inkscape:connector-curvature="0"
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 L 1,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 9.5,0 C 11.8885,11 12,10.8885 12,10.75 l 0,-5.5 C 12,5.1115 11.8885,5 11.75,5 L 2.25,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 14,7 z" />
+  </g>
+  <g
+     transform="translate(4,4)"
+     id="layer1-8"
+     style="fill:url(#linearGradient4302);fill-opacity:1.0">
     <path
-       d="m 7.5,17.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,2.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.649596,-0.976733 1.212194,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442"
-       style="fill:none;stroke:url(#linearGradient3204);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       d="M 1,3 C 0.446,3 0,3.446 0,4 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 L 16,7 C 16,6.446 15.554,6 15,6 L 14,6 14,4 C 14,3.446 13.554,3 13,3 L 1,3 z m 0.5,1 11,0 C 12.777,4 13,4.223 13,4.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 1.223,12 1,11.777 1,11.5 l 0,-7 C 1,4.223 1.223,4 1.5,4 z M 2.25,5 C 2.1115,5 2,5.1115 2,5.25 l 0,5.5 C 2,10.8885 2.1115,11 2.25,11 l 9.5,0 C 11.8885,11 12,10.8885 12,10.75 l 0,-5.5 C 12,5.1115 11.8885,5 11.75,5 L 2.25,5 z M 14,7 14.5,7 C 14.777,7 15,7.223 15,7.5 l 0,1 C 15,8.777 14.777,9 14.5,9 L 14,9 14,7 z"
+       inkscape:connector-curvature="0"
+       id="rect3206-7"
+       style="color:#bebebe;fill:url(#linearGradient4304);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
 </svg>
diff --git a/elementary-xfce-dark/panel/24/gpm-battery-charged.svg b/elementary-xfce-dark/panel/24/gpm-battery-charged.svg
index 8a0be107..4dcd722f 100644
--- a/elementary-xfce-dark/panel/24/gpm-battery-charged.svg
+++ b/elementary-xfce-dark/panel/24/gpm-battery-charged.svg
@@ -10,109 +10,143 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
    width="24"
    height="24"
-   id="svg3701"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
+   id="svg3004"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="gpm-battery-charged.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1159"
+     inkscape:window-height="723"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="3.2702566"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3004" />
   <defs
-     id="defs3703">
+     id="defs3006">
     <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2485"
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-8.0000003)" />
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,9.3029609,2.0822545)" />
+    <linearGradient
+       id="linearGradient3678">
+      <stop
+         id="stop3680"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3682"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
     <linearGradient
        x1="51.780437"
        y1="7.2575765"
        x2="51.780437"
        y2="31.112288"
-       id="linearGradient2488"
+       id="linearGradient2852"
        xlink:href="#linearGradient3678"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798735,-5.9568826)" />
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
     <linearGradient
-       id="linearGradient3678">
+       id="linearGradient3778">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3780"
          offset="0"
-         id="stop3680" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
+         id="stop3782"
          offset="1"
-         id="stop3682" />
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.101695,0.0391365)" />
+    <linearGradient
+       id="linearGradient3785">
+      <stop
+         id="stop3787"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3789"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3813"
+       x1="3"
+       y1="5"
+       x2="19"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="10.79661"
+       y1="-3.1355932"
+       x2="10.79661"
+       y2="13.475821" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3895"
+       x1="9.6440678"
+       y1="3.2711864"
+       x2="9.6440678"
+       y2="19.235813"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,1)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.098901"
-     inkscape:cx="-5.6049506"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="751"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
   <metadata
-     id="metadata3706">
+     id="metadata3009">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,8)">
-    <path
-       d="m 9.0625,-1.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5.0000003 2,0 c 0,-1.666667 0,-3.3333338 0,-5.0000003 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
-       id="rect3728-9"
-       style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 7.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z m 3.00264,-15.1184513 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208"
-       style="opacity:0.5;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-11.75"
-       y="8.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 9.0625,-2.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5 2,0 c 0,-1.6666667 0,-3.3333335 0,-5 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
-       id="rect3728"
-       style="fill:url(#linearGradient2488);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 7.5,11.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,11.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z m 3.00264,-15.1184513 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442"
-       style="fill:none;stroke:url(#linearGradient2485);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-  </g>
+  <path
+     style="opacity:0.5;color:#bebebe;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3949"
+     inkscape:connector-curvature="0"
+     d="M 5,8 C 4.446,8 4,8.446 4,9 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-2 C 18,8.446 17.554,8 17,8 L 5,8 z m 0.5,1 11,0 C 16.777,9 17,9.223 17,9.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 5.223,17 5,16.777 5,16.5 l 0,-7 C 5,9.223 5.223,9 5.5,9 z m 0.75,1 C 6.1115,10 6,10.1115 6,10.25 L 6,11 10,13 10.0625,10 6.25,10 z M 10.0625,10 16,15 16,10.25 C 16,10.1115 15.8885,10 15.75,10 l -5.6875,0 z M 16,15 l -4,-2 0,3 3.75,0 C 15.8885,16 16,15.8885 16,15.75 L 16,15 z m -4,1 -6,-5 0,4.75 C 6,15.8885 6.1115,16 6.25,16 L 12,16 z m 6,-4 0.5,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,1 c 0,0.277 -0.223,0.5 -0.5,0.5 l -0.5,0 0,-2 z" />
+  <path
+     d="M 5,7 C 4.446,7 4,7.446 4,8 l 0,8 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 1,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-2 C 18,7.446 17.554,7 17,7 L 5,7 z m 0.5,1 11,0 C 16.777,8 17,8.223 17,8.5 l 0,7 c 0,0.277 -0.223,0.5 -0.5,0.5 l -11,0 C 5.223,16 5,15.777 5,15.5 l 0,-7 C 5,8.223 5.223,8 5.5,8 z M 6.25,9 C 6.1115,9 6,9.1115 6,9.25 L 6,10 10,12 10.0625,9 6.25,9 z M 10.0625,9 16,14 16,9.25 C 16,9.1115 15.8885,9 15.75,9 L 10.0625,9 z M 16,14 l -4,-2 0,3 3.75,0 C 15.8885,15 16,14.8885 16,14.75 L 16,14 z m -4,1 -6,-5 0,4.75 C 6,14.8885 6.1115,15 6.25,15 L 12,15 z m 6,-4 0.5,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,1 c 0,0.277 -0.223,0.5 -0.5,0.5 l -0.5,0 0,-2 z"
+     inkscape:connector-curvature="0"
+     id="rect3206-25"
+     style="color:#bebebe;fill:url(#linearGradient3895);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>