Use UPower's icon names directly for the panel-plugin

This also means the power-manager's panel-plugin is now compatible with
most modern icon-themes.

18 files changed, 116 insertions, 885 deletions

diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index a5108f33..7dbd34c5 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -3,51 +3,49 @@ EXTRA_DIST =				\
 
 Datadir = $(datadir)/icons/hicolor/scalable/status
 
-Data_DATA =				\
-    computer.svg			\
-    display-brightness-symbolic.svg     \
-    keyboard.svg			\
-    mouse.svg			\
-    multimedia-player.svg		\
-    pda.svg				\
-    phone.svg			\
-    tablet.svg			\
-    video-display.svg		\
-    xfpm-ac-adapter.svg		\
-    xfpm-ac-adapter-symbolic.svg		\
-    xfpm-primary-000.svg		\
-    xfpm-primary-000-symbolic.svg		\
-    xfpm-primary-020.svg		\
-    xfpm-primary-020-symbolic.svg		\
-    xfpm-primary-040.svg		\
-    xfpm-primary-040-symbolic.svg		\
-    xfpm-primary-060.svg		\
-    xfpm-primary-060-symbolic.svg		\
-    xfpm-primary-080.svg		\
-    xfpm-primary-080-symbolic.svg		\
-    xfpm-primary-100.svg		\
-    xfpm-primary-100-symbolic.svg		\
-    xfpm-primary-000-charging.svg	\
-    xfpm-primary-000-charging-symbolic.svg	\
-    xfpm-primary-020-charging.svg	\
-    xfpm-primary-020-charging-symbolic.svg	\
-    xfpm-primary-040-charging.svg	\
-    xfpm-primary-040-charging-symbolic.svg	\
-    xfpm-primary-060-charging.svg	\
-    xfpm-primary-060-charging-symbolic.svg	\
-    xfpm-primary-080-charging.svg	\
-    xfpm-primary-080-charging-symbolic.svg	\
-    xfpm-primary-100-charging.svg	\
-    xfpm-primary-100-charging-symbolic.svg	\
-    xfpm-primary-charged.svg		\
-    xfpm-primary-charged-symbolic.svg		\
-    xfpm-primary-missing.svg		\
-    xfpm-primary-missing-symbolic.svg		\
-    xfpm-ups-000.svg		\
-    xfpm-ups-020.svg		\
-    xfpm-ups-040.svg		\
-    xfpm-ups-060.svg		\
-    xfpm-ups-080.svg		\
-    xfpm-ups-100.svg		\
-    xfpm-brightness-keyboard.svg    \
+Data_DATA =				                    \
+    battery-caution-charging-symbolic.svg   \
+    battery-caution-symbolic.svg            \
+    battery-empty-charging-symbolic.svg     \
+    battery-empty-symbolic.svg              \
+    battery-full-charged-symbolic.svg       \
+    battery-full-charging-symbolic.svg      \
+    battery-full-symbolic.svg               \
+    battery-good-charging-symbolic.svg      \
+    battery-good-symbolic.svg               \
+    battery-low-charging-symbolic.svg       \
+    battery-low-symbolic.svg                \
+    battery-missing-symbolic.svg            \
+    computer.svg			                \
+    display-brightness-symbolic.svg         \
+    keyboard.svg			                \
+    mouse.svg			                    \
+    multimedia-player.svg		            \
+    pda.svg				                    \
+    phone.svg			                    \
+    tablet.svg			                    \
+    video-display.svg		                \
+    xfpm-ac-adapter.svg		                \
+    xfpm-ac-adapter-symbolic.svg		    \
+    xfpm-primary-000.svg		            \
+    xfpm-primary-020.svg		            \
+    xfpm-primary-040.svg		            \
+    xfpm-primary-060.svg		            \
+    xfpm-primary-080.svg		            \
+    xfpm-primary-100.svg		            \
+    xfpm-primary-000-charging.svg	        \
+    xfpm-primary-020-charging.svg	        \
+    xfpm-primary-040-charging.svg	        \
+    xfpm-primary-060-charging.svg	        \
+    xfpm-primary-080-charging.svg	        \
+    xfpm-primary-100-charging.svg	        \
+    xfpm-primary-charged.svg		        \
+    xfpm-primary-missing.svg		        \
+    xfpm-ups-000.svg		                \
+    xfpm-ups-020.svg		                \
+    xfpm-ups-040.svg		                \
+    xfpm-ups-060.svg		                \
+    xfpm-ups-080.svg		                \
+    xfpm-ups-100.svg		                \
+    xfpm-brightness-keyboard.svg            \
     xfpm-brightness-lcd.svg
diff --git a/data/icons/scalable/xfpm-primary-000-charging-symbolic.svg b/data/icons/scalable/battery-caution-charging-symbolic.svg
index 7b3359dd..7b3359dd 100644
--- a/data/icons/scalable/xfpm-primary-000-charging-symbolic.svg
+++ b/data/icons/scalable/battery-caution-charging-symbolic.svg
diff --git a/data/icons/scalable/xfpm-primary-000-symbolic.svg b/data/icons/scalable/battery-caution-symbolic.svg
index d2922621..d2922621 100644
--- a/data/icons/scalable/xfpm-primary-000-symbolic.svg
+++ b/data/icons/scalable/battery-caution-symbolic.svg
diff --git a/data/icons/scalable/battery-empty-charging-symbolic.svg b/data/icons/scalable/battery-empty-charging-symbolic.svg
new file mode 100644
index 00000000..a368abe2
--- /dev/null
+++ b/data/icons/scalable/battery-empty-charging-symbolic.svg
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-empty-charging-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.48.4 r9939' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-40.433576' inkscape:cy='3.5909509' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1402' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='2560' inkscape:window-y='0' inkscape:zoom='32'>
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='-20px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-261.0002,-217)'>
+    <path inkscape:connector-curvature='0' d='m 266.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 265.20232,217.70904 265,218.02725 265,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z' id='path11308' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
+    
+    <path inkscape:connector-curvature='0' d='M 273.84375,224.96875 A 1.0001,1.0001 0 0 0 273.25,225.25 l -3,3 a 1.0001,1.0001 0 0 0 0.71875,1.71875 l 2.5625,0 L 272.25,231.25 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 3,-3 a 1.0001,1.0001 0 0 0 -0.71875,-1.71875 l -2.5625,0 1.28125,-1.28125 a 1.0001,1.0001 0 0 0 -0.84375,-1.71875 z' id='path11312' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <rect height='1' id='rect11314' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='275.96921' y='227.96851'/>
+    <rect height='1' id='rect11316' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='269.96921' y='228.96851'/>
+    <rect height='1' id='rect11318' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='273.96921' y='224.96851'/>
+    <rect height='1' id='rect11320' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='271.96921' y='231.96851'/>
+    <path inkscape:connector-curvature='0' d='m 273.125,225.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z' id='path11322' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 274.125,228.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z' id='path11324' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-261.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-261.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-261.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-261.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-261.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-261.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-261.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-261.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/battery-empty-symbolic.svg b/data/icons/scalable/battery-empty-symbolic.svg
new file mode 100644
index 00000000..796cc6e5
--- /dev/null
+++ b/data/icons/scalable/battery-empty-symbolic.svg
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-empty-symbolic.svg' height='16.000004' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16.000004' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='131.28381' inkscape:cy='-421.9103' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='702' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='100px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+    <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' id='grid5968' opacity='0.1254902' originx='100px' originy='0px' snapvisiblegridlinesonly='true' spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-141.0002,-217)'>
+    
+    <path inkscape:connector-curvature='0' d='m 146.46875,217 c -0.49202,0 -0.79615,0.22777 -1.03125,0.46875 C 145.2024,217.70973 145,218.02759 145,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.43046 -0.17041,-0.72033 -0.40625,-1 -0.22357,-0.26511 -0.62489,-0.52941 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z m 0.53125,2 4,0 0,1 0,1 1,0 1,0 0,10 -8,0 0,-10 1,0 1,0 0,-1 0,-1 z' id='path3434' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2.00264454;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/>
+    
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-141.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-141.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-141.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-141.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-141.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-141.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-141.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-141.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-charged-symbolic.svg b/data/icons/scalable/battery-full-charged-symbolic.svg
index da9e9643..da9e9643 100644
--- a/data/icons/scalable/xfpm-primary-charged-symbolic.svg
+++ b/data/icons/scalable/battery-full-charged-symbolic.svg
diff --git a/data/icons/scalable/xfpm-primary-100-charging-symbolic.svg b/data/icons/scalable/battery-full-charging-symbolic.svg
index 89ed55cb..89ed55cb 100644
--- a/data/icons/scalable/xfpm-primary-100-charging-symbolic.svg
+++ b/data/icons/scalable/battery-full-charging-symbolic.svg
diff --git a/data/icons/scalable/xfpm-primary-100-symbolic.svg b/data/icons/scalable/battery-full-symbolic.svg
index afef8366..afef8366 100644
--- a/data/icons/scalable/xfpm-primary-100-symbolic.svg
+++ b/data/icons/scalable/battery-full-symbolic.svg
diff --git a/data/icons/scalable/xfpm-primary-060-charging-symbolic.svg b/data/icons/scalable/battery-good-charging-symbolic.svg
index 78679393..78679393 100644
--- a/data/icons/scalable/xfpm-primary-060-charging-symbolic.svg
+++ b/data/icons/scalable/battery-good-charging-symbolic.svg
diff --git a/data/icons/scalable/xfpm-primary-060-symbolic.svg b/data/icons/scalable/battery-good-symbolic.svg
index f488c4c3..f488c4c3 100644
--- a/data/icons/scalable/xfpm-primary-060-symbolic.svg
+++ b/data/icons/scalable/battery-good-symbolic.svg
diff --git a/data/icons/scalable/xfpm-primary-020-charging-symbolic.svg b/data/icons/scalable/battery-low-charging-symbolic.svg
index fef8ddee..fef8ddee 100644
--- a/data/icons/scalable/xfpm-primary-020-charging-symbolic.svg
+++ b/data/icons/scalable/battery-low-charging-symbolic.svg
diff --git a/data/icons/scalable/xfpm-primary-020-symbolic.svg b/data/icons/scalable/battery-low-symbolic.svg
index 99f15c7f..99f15c7f 100644
--- a/data/icons/scalable/xfpm-primary-020-symbolic.svg
+++ b/data/icons/scalable/battery-low-symbolic.svg
diff --git a/data/icons/scalable/xfpm-primary-missing-symbolic.svg b/data/icons/scalable/battery-missing-symbolic.svg
index 84c05d00..84c05d00 100644
--- a/data/icons/scalable/xfpm-primary-missing-symbolic.svg
+++ b/data/icons/scalable/battery-missing-symbolic.svg
diff --git a/data/icons/scalable/xfpm-ac-adapter-symbolic.svg b/data/icons/scalable/xfpm-ac-adapter-symbolic.svg
deleted file mode 100644
index 6cfeb4a7..00000000
--- a/data/icons/scalable/xfpm-ac-adapter-symbolic.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="xfpm-ac-adapter-symbolic.svg"
-   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   height="16.001423"
-   id="svg7384"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="16">
-  <metadata
-     id="metadata90">
-    <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>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="true"
-     bordercolor="#666666"
-     borderopacity="1"
-     inkscape:current-layer="layer9"
-     inkscape:cx="-5.9624183"
-     inkscape:cy="6.8129416"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="false"
-     inkscape:object-paths="false"
-     objecttolerance="10"
-     pagecolor="#3a3b39"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="false"
-     showgrid="false"
-     showguides="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="749"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1280"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="11.313708">
-    <inkscape:grid
-       dotted="false"
-       empspacing="2"
-       enabled="true"
-       id="grid4866"
-       originx="60px"
-       originy="0.0014224199px"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       type="xygrid"
-       visible="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline"
-     transform="translate(-181.0002,-217)">
-    <path
-       inkscape:connector-curvature="0"
-       d="m 189.7795,222.00771 c -0.17789,0.0489 -0.3419,0.14729 -0.46875,0.28125 l -3.03125,3 c -0.2353,0.23074 -0.34458,0.58284 -0.28125,0.90625 l 0,0.8125 0.8125,0 0.1875,0 1.4707,0 -1.1875,1.27359 c -0.21461,0.21931 -0.32135,0.53954 -0.28125,0.84375 -0.001,0.0312 -0.001,0.0625 0,0.0937 l 0,0.78125 0.84375,0 0.15625,0 c 0.26386,0.004 0.52791,-0.099 0.71875,-0.28125 l 3,-2.99234 c 0.18369,-0.18976 0.28735,-0.45466 0.28125,-0.7187 0.003,-0.0416 0.003,-0.0834 0,-0.125 l 0,-0.875 -0.84375,0 -0.15625,0 -1.56445,0 1.3125,-1.28125 c 0.21461,-0.2193 0.32135,-0.53953 0.28125,-0.84375 10e-4,-0.0312 10e-4,-0.0625 0,-0.0937 l 0,-0.7813 -0.84375,0 -0.0937,0 c -0.0208,-6.4e-4 -0.0417,-6.4e-4 -0.0625,0 -0.0829,-0.0103 -0.16709,-0.0103 -0.25,0 z"
-       id="path10747"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccc"
-       style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:xx-small;line-height:normal;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 186.46875,217.00586 c -0.49202,0 -0.7981,0.21605 -1.0332,0.45703 -0.2351,0.24098 -0.43555,0.55689 -0.43555,1.0293 l 0,0.50781 -2,0 0,14 12.00195,0.002 0,-1.00195 0,-12.99805 -2,0 0,-0.39843 -0.002,-0.0274 c -0.0239,-0.43046 -0.18017,-0.734 -0.41602,-1.01367 -0.23584,-0.27967 -0.62045,-0.58711 -1.20117,-0.55469 l 0.0566,-0.002 -4.9707,0 z m 0.5332,2.00195 3.99805,0.002 0,1.99414 1.99805,0 0,9.99414 -7.9961,0 0,-9.9961 2,0 0,-1.99414 z"
-       id="path3434-5"
-       style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.00264454;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices"
-     style="display:inline"
-     transform="translate(-181.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer11"
-     inkscape:label="apps"
-     transform="translate(-181.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer13"
-     inkscape:label="places"
-     style="display:inline"
-     transform="translate(-181.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes"
-     transform="translate(-181.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline"
-     transform="translate(-181.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g71291"
-     inkscape:label="emotes"
-     style="display:inline"
-     transform="translate(-181.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g4953"
-     inkscape:label="categories"
-     style="display:inline"
-     transform="translate(-181.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions"
-     style="display:inline"
-     transform="translate(-181.0002,-217)" />
-</svg>
diff --git a/data/icons/scalable/xfpm-primary-040-charging-symbolic.svg b/data/icons/scalable/xfpm-primary-040-charging-symbolic.svg
deleted file mode 100644
index fd2bce68..00000000
--- a/data/icons/scalable/xfpm-primary-040-charging-symbolic.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="xfpm-primary-040-charging-symbolic.svg"
-   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   height="16"
-   id="svg7384"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="16">
-  <metadata
-     id="metadata90">
-    <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>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="true"
-     bordercolor="#666666"
-     borderopacity="1"
-     inkscape:current-layer="layer9"
-     inkscape:cx="14.410174"
-     inkscape:cy="3.5284509"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="false"
-     inkscape:object-paths="false"
-     objecttolerance="10"
-     pagecolor="#3a3b39"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="false"
-     showgrid="false"
-     showguides="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="749"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1280"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="32">
-    <inkscape:grid
-       dotted="false"
-       empspacing="2"
-       enabled="true"
-       id="grid4866"
-       originx="40px"
-       originy="0px"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       type="xygrid"
-       visible="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline"
-     transform="translate(-201.0002,-217)">
-    <path
-       inkscape:connector-curvature="0"
-       d="m 206.0002,226 0,1 4,0 1,-1 z m 0,2 0,2 3,0 0,-2 z"
-       id="path6257"
-       sodipodi:nodetypes="cccccccccc"
-       style="fill:#bebebe;fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 206.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 205.20232,217.70904 205,218.02725 205,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z"
-       id="path6259"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <path
-       inkscape:connector-curvature="0"
-       d="M 213.84375,224.96875 A 1.0001,1.0001 0 0 0 213.25,225.25 l -3,3 a 1.0001,1.0001 0 0 0 0.71875,1.71875 l 2.5625,0 L 212.25,231.25 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 3,-3 a 1.0001,1.0001 0 0 0 -0.71875,-1.71875 l -2.5625,0 1.28125,-1.28125 a 1.0001,1.0001 0 0 0 -0.84375,-1.71875 z"
-       id="path6264"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <rect
-       height="1"
-       id="rect6266"
-       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
-       width="1"
-       x="215.96919"
-       y="227.96851" />
-    <rect
-       height="1"
-       id="rect6268"
-       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
-       width="1"
-       x="209.96919"
-       y="228.96851" />
-    <rect
-       height="1"
-       id="rect6270"
-       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
-       width="1"
-       x="213.96919"
-       y="224.96851" />
-    <rect
-       height="1"
-       id="rect6272"
-       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
-       width="1"
-       x="211.96919"
-       y="231.96851" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 213.125,225.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z"
-       id="path6274"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 214.125,228.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z"
-       id="path6276"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices"
-     style="display:inline"
-     transform="translate(-201.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer11"
-     inkscape:label="apps"
-     transform="translate(-201.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer13"
-     inkscape:label="places"
-     style="display:inline"
-     transform="translate(-201.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes"
-     transform="translate(-201.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline"
-     transform="translate(-201.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g71291"
-     inkscape:label="emotes"
-     style="display:inline"
-     transform="translate(-201.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g4953"
-     inkscape:label="categories"
-     style="display:inline"
-     transform="translate(-201.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions"
-     style="display:inline"
-     transform="translate(-201.0002,-217)" />
-</svg>
diff --git a/data/icons/scalable/xfpm-primary-040-symbolic.svg b/data/icons/scalable/xfpm-primary-040-symbolic.svg
deleted file mode 100644
index 7884900d..00000000
--- a/data/icons/scalable/xfpm-primary-040-symbolic.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="xfpm-primary-040-symbolic.svg"
-   height="16"
-   id="svg7384"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   width="16">
-  <metadata
-     id="metadata90">
-    <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>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="true"
-     bordercolor="#666666"
-     borderopacity="1"
-     inkscape:current-layer="layer9"
-     inkscape:cx="7.392937"
-     inkscape:cy="7.4248373"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="false"
-     inkscape:object-paths="false"
-     objecttolerance="10"
-     pagecolor="#3a3b39"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="false"
-     showgrid="false"
-     showguides="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="749"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1280"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="11.313708">
-    <inkscape:grid
-       empspacing="2"
-       enabled="true"
-       id="grid4866"
-       originx="180px"
-       originy="0px"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       type="xygrid"
-       visible="true" />
-    <inkscape:grid
-       color="#000000"
-       empcolor="#000000"
-       empopacity="0"
-       empspacing="4"
-       enabled="true"
-       id="grid5968"
-       opacity="0.1254902"
-       originx="180px"
-       originy="0px"
-       snapvisiblegridlinesonly="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       type="xygrid"
-       visible="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline"
-     transform="translate(-61.0002,-217)">
-    <rect
-       height="6"
-       id="rect3735"
-       style="fill:#bebebe;fill-opacity:1;stroke:none"
-       transform="matrix(0,1,1,0,0,0)"
-       width="1"
-       x="226"
-       y="66.000198" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 66.46875,217 c -0.490327,0 -0.796068,0.22845 -1.03125,0.46875 C 65.202318,217.70905 65,218.02726 65,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 c -0.02393,-0.4306 -0.170236,-0.75229 -0.40625,-1.03125 -0.223734,-0.26444 -0.626687,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z M 67,219 l 4,0 0,1 0,1 1,0 1,0 0,10 -8,0 0,-10 1,0 1,0 0,-1 0,-1 z"
-       id="path3737"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <rect
-       height="6"
-       id="rect10870"
-       style="fill:#bebebe;fill-opacity:1;stroke:none"
-       transform="matrix(0,1,1,0,0,0)"
-       width="2"
-       x="228"
-       y="66.000198" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices"
-     style="display:inline"
-     transform="translate(-61.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer11"
-     inkscape:label="apps"
-     transform="translate(-61.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer13"
-     inkscape:label="places"
-     style="display:inline"
-     transform="translate(-61.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes"
-     transform="translate(-61.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline"
-     transform="translate(-61.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g71291"
-     inkscape:label="emotes"
-     style="display:inline"
-     transform="translate(-61.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g4953"
-     inkscape:label="categories"
-     style="display:inline"
-     transform="translate(-61.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions"
-     style="display:inline"
-     transform="translate(-61.0002,-217)" />
-</svg>
diff --git a/data/icons/scalable/xfpm-primary-080-charging-symbolic.svg b/data/icons/scalable/xfpm-primary-080-charging-symbolic.svg
deleted file mode 100644
index 6f5502bf..00000000
--- a/data/icons/scalable/xfpm-primary-080-charging-symbolic.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="xfpm-primary-080-charging-symbolic.svg"
-   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   height="16"
-   id="svg7384"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="16">
-  <metadata
-     id="metadata90">
-    <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>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="true"
-     bordercolor="#666666"
-     borderopacity="1"
-     inkscape:current-layer="layer9"
-     inkscape:cx="0.269374"
-     inkscape:cy="7.1609489"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="false"
-     inkscape:object-paths="false"
-     objecttolerance="10"
-     pagecolor="#3a3b39"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="false"
-     showgrid="false"
-     showguides="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="749"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1280"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="32">
-    <inkscape:grid
-       dotted="false"
-       empspacing="2"
-       enabled="true"
-       id="grid4866"
-       originx="80px"
-       originy="0px"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       type="xygrid"
-       visible="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline"
-     transform="translate(-161.0002,-217)">
-    <path
-       inkscape:connector-curvature="0"
-       d="m 166.0002,223 0,1 6,0 0,-1 z m 0,2 0,2 4,0 0.25,-0.125 1.75,-1.75 0,-0.125 z m 0,3.0625 0,1.9375 3,0 0,-0.8125 0,-1.125 z"
-       id="rect6060"
-       style="fill:#bebebe;fill-opacity:1;stroke:none"
-       sodipodi:nodetypes="cccccccccccccccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 166.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 165.20232,217.70904 165,218.02725 165,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z"
-       id="path6062"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 173.71895,224.96875 c -0.17789,0.0489 -0.3419,0.14729 -0.46875,0.28125 l -3,2.96875 c -0.2353,0.23073 -0.34458,0.61409 -0.28125,0.9375 l 0,0.8125 1,0 2.125,0 -0.84375,1.25 c -0.15169,0.14917 -0.24515,0.35304 -0.28125,0.5625 l 0,0.375 0,0.8125 1,0 c 0.26386,0.004 0.52791,-0.13024 0.71875,-0.3125 l 3,-3 c 0.1837,-0.18978 0.28737,-0.42344 0.28125,-0.6875 0.003,-0.0416 0.003,-0.0834 0,-0.125 l 0,-0.875 -0.84375,0 -0.0937,0 c -0.0208,-6.5e-4 -0.0417,-6.5e-4 -0.0625,0 l -2.125,0 0.84375,-1.3125 c 0.15164,-0.14917 0.2451,-0.33095 0.2812,-0.53125 l 0,-0.375 0,-0.78125 -1.25,0 z"
-       id="path6217"
-       style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices"
-     style="display:inline"
-     transform="translate(-161.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer11"
-     inkscape:label="apps"
-     transform="translate(-161.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer13"
-     inkscape:label="places"
-     style="display:inline"
-     transform="translate(-161.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes"
-     transform="translate(-161.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline"
-     transform="translate(-161.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g71291"
-     inkscape:label="emotes"
-     style="display:inline"
-     transform="translate(-161.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g4953"
-     inkscape:label="categories"
-     style="display:inline"
-     transform="translate(-161.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions"
-     style="display:inline"
-     transform="translate(-161.0002,-217)" />
-</svg>
diff --git a/data/icons/scalable/xfpm-primary-080-symbolic.svg b/data/icons/scalable/xfpm-primary-080-symbolic.svg
deleted file mode 100644
index 78c08cee..00000000
--- a/data/icons/scalable/xfpm-primary-080-symbolic.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="xfpm-primary-080-symbolic.svg"
-   height="16"
-   id="svg7384"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   width="16">
-  <metadata
-     id="metadata90">
-    <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>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:bbox-nodes="false"
-     inkscape:bbox-paths="true"
-     bordercolor="#666666"
-     borderopacity="1"
-     inkscape:current-layer="layer9"
-     inkscape:cx="46.667339"
-     inkscape:cy="21.566973"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="false"
-     inkscape:object-paths="false"
-     objecttolerance="10"
-     pagecolor="#3a3b39"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="false"
-     showgrid="false"
-     showguides="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="749"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1280"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="5.6568542">
-    <inkscape:grid
-       empspacing="2"
-       enabled="true"
-       id="grid4866"
-       originx="200px"
-       originy="0px"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       type="xygrid"
-       visible="true" />
-    <inkscape:grid
-       color="#000000"
-       empcolor="#000000"
-       empopacity="0"
-       empspacing="4"
-       enabled="true"
-       id="grid5968"
-       opacity="0.1254902"
-       originx="200px"
-       originy="0px"
-       snapvisiblegridlinesonly="true"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       type="xygrid"
-       visible="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline"
-     transform="translate(-41.0002,-217)">
-    <rect
-       height="6"
-       id="rect2928"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate"
-       transform="matrix(0,1,1,0,0,0)"
-       width="1"
-       x="223"
-       y="46.000198" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 46.46875,217 c -0.490327,0 -0.796069,0.22846 -1.03125,0.46875 -0.235181,0.24029 -0.4375,0.52725 -0.4375,1 L 45,219 l -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.02393,-0.4306 -0.170232,-0.72105 -0.40625,-1 -0.223737,-0.26444 -0.626697,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z M 47,219 l 4,0 0,1 0,1 1,0 1,0 0,10 -8,0 0,-10 1,0 1,0 0,-1 0,-1 z"
-       id="path2930"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <rect
-       height="6"
-       id="rect4227"
-       style="color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="matrix(0,1,1,0,0,0)"
-       width="2"
-       x="225"
-       y="46.000198" />
-    <rect
-       height="6"
-       id="rect4229"
-       style="color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       transform="matrix(0,1,1,0,0,0)"
-       width="2"
-       x="228"
-       y="46.000198" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices"
-     style="display:inline"
-     transform="translate(-41.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer11"
-     inkscape:label="apps"
-     transform="translate(-41.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer13"
-     inkscape:label="places"
-     style="display:inline"
-     transform="translate(-41.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes"
-     transform="translate(-41.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline"
-     transform="translate(-41.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g71291"
-     inkscape:label="emotes"
-     style="display:inline"
-     transform="translate(-41.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g4953"
-     inkscape:label="categories"
-     style="display:inline"
-     transform="translate(-41.0002,-217)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions"
-     style="display:inline"
-     transform="translate(-41.0002,-217)" />
-</svg>