diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-000.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-000.svg
deleted file mode 120000
index c4af08695..000000000
--- a/elementary-xfce-dark/panel/16/gpm-keyboard-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-keyboard-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-000.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-000.svg
new file mode 100644
index 000000000..3af902366
--- /dev/null
+++ b/elementary-xfce-dark/panel/16/gpm-keyboard-000.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1213 -81)"
+     id="g4">
+    <path
+       style="color:#000000;overflow:visible;fill:#c6262e;marker:none;fill-opacity:1"
+       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.554 2 12 2.446 12 3 L 12 10.501953 A 2.5 2.5 0 0 1 13 10.054688 L 13 3 C 13 1.892 12.108 1 11 1 L 2 1 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.99956 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844063 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071063 9.0570651 8.5664062 9.0644531 z "
+       transform="translate(1213,81)"
+       id="path6" />
+    <circle
+       cx="1227"
+       cy="94"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#c6262e;fill-opacity:1;marker:none"
+       id="ellipse8"
+       r="2" />
+  </g>
+</svg>
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-020.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-020.svg
deleted file mode 120000
index 5c04e0e9a..000000000
--- a/elementary-xfce-dark/panel/16/gpm-keyboard-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-keyboard-030.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-020.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-020.svg
new file mode 100644
index 000000000..a3b154a16
--- /dev/null
+++ b/elementary-xfce-dark/panel/16/gpm-keyboard-020.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1213 -81)"
+     id="g4">
+    <path
+       style="color:#000000;overflow:visible;fill:#fcfcfc;marker:none;fill-opacity:1"
+       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.554 2 12 2.446 12 3 L 12 10.501953 A 2.5 2.5 0 0 1 13 10.054688 L 13 3 C 13 1.892 12.108 1 11 1 L 2 1 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.99956 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844063 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071063 9.0570651 8.5664062 9.0644531 z "
+       transform="translate(1213,81)"
+       id="path6" />
+    <circle
+       cx="1227"
+       cy="94"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse8"
+       r="2" />
+  </g>
+</svg>
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-040.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-040.svg
index 5c04e0e9a..513754da6 120000
--- a/elementary-xfce-dark/panel/16/gpm-keyboard-040.svg
+++ b/elementary-xfce-dark/panel/16/gpm-keyboard-040.svg
@@ -1 +1 @@
-xfpm-keyboard-030.svg
\ No newline at end of file
+gpm-keyboard-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-060.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-060.svg
deleted file mode 120000
index d92f041f5..000000000
--- a/elementary-xfce-dark/panel/16/gpm-keyboard-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-keyboard-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-060.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-060.svg
new file mode 100644
index 000000000..0504383b0
--- /dev/null
+++ b/elementary-xfce-dark/panel/16/gpm-keyboard-060.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1213 -81)"
+     id="g4">
+    <path
+       id="path6"
+       transform="translate(1213,81)"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;marker:none;fill-opacity:1"
+       d="M 2,1 C 0.892,1 0,1.892 0,3 v 10 c 0,1.108 0.892,2 2,2 h 9 c 0.441001,0 0.843886,-0.144774 1.173828,-0.384766 a 2.5,2.5 0 0 1 -1.123047,-1.625 C 11.033042,12.991162 11.017978,13 11,13 H 2 C 1.446,13 1,12.554 1,12 V 3 C 1,2.446 1.446,2 2,2 h 9 c 0.554,0 1,0.446 1,1 V 5.5019531 A 2.5,2.5 0 0 1 13,5.0546875 V 3 C 13,1.892 12.108,1 11,1 Z m 6.65625,4.9941406 c -0.79,0 -1.5472969,0.257 -2.2792969,0.75 L 6.75,7.59375 C 7.062,7.38375 7.36625,7.234 7.65625,7.125 c 0.298,-0.116 0.57,-0.15625 0.875,-0.15625 0.449,0 0.79225,0.10375 1.03125,0.34375 C 9.8025,7.5445 10,7.86125 10,8.28125 v 0.3066406 c -0.21,-0.08 -0.52025,-0.1435 -0.78125,-0.1875 -0.2577,-0.04608 -0.51955,-0.06734 -0.78125,-0.0625 -0.356,0 -0.67175,0.038 -0.96875,0.125 -0.29,0.087 -0.56425,0.215 -0.78125,0.375 -0.21,0.16 -0.35275,0.3455 -0.46875,0.5625 -0.116,0.218 -0.1875,0.5493594 -0.1875,0.8183594 0,0.254 0.06225,0.50075 0.15625,0.71875 0.101,0.217 0.208,0.4025 0.375,0.5625 0.174,0.16 0.393,0.28 0.625,0.375 0.239,0.087 0.50525,0.125 0.78125,0.125 0.428,0 0.8175,-0.076 1.1875,-0.25 0.377,-0.181 0.6835,-0.44825 0.9375,-0.78125 L 10.125,11.3125 c 0.022,0.166197 0.09875,0.320702 0.21875,0.4375 0.123,0.109 0.29925,0.1725 0.53125,0.1875 0.05444,0 0.124486,1.16e-4 0.191406,0 A 2.5,2.5 0 0 1 11.46875,11.046875 V 10.875 C 11.34475,10.868 11.165234,10.83925 11.115234,10.78125 11.042234,10.69354 11.0014,10.582869 11,10.46875 V 8.3378906 c 0,-0.747 -0.09625,-1.31975 -0.53125,-1.71875 -0.435,-0.399 -1.0295,-0.625 -1.8125,-0.625 z m -0.089844,3.0703125 c 0.2180003,0 0.6070313,0.04975 0.8320313,0.09375 C 9.6304379,9.2022031 9.797,9.26375 10,9.34375 v 0.75 c 0,0.145 -0.12925,0.3075 -0.28125,0.4375 C 9.29175,10.91125 8.77925,10.961 8.28125,11 7.95525,11 7.5478906,11.01713 7.3378906,10.828125 7.1278906,10.632125 7,10.408 7,10.125 7,9.82 7.2945,9.556 7.5625,9.375 7.8551,9.166329 8.207107,9.0570651 8.5664062,9.0644531 Z M 12,9.9453125 v 0.1503905 c 0.01678,-0.01252 0.03285,-0.02571 0.04883,-0.03906 4.11e-4,-0.01446 -8.32e-4,-0.02871 -0.002,-0.04297 -0.0056,-0.0071 -0.01813,-0.0064 -0.02148,-0.015625 -0.0035,-0.011187 -0.0096,-0.031039 -0.01563,-0.048828 -0.0062,-0.00347 -0.0026,9.84e-5 -0.0098,-0.00391 z m 0.04687,0.068359 c 0.0062,0.0077 0.01329,0.01385 0.02148,0.01953 -0.0017,-0.01821 -0.0029,-0.036454 -0.0039,-0.054687 -0.003,-0.0017 -0.01205,-0.00667 -0.01758,-0.00977 0.0012,0.014927 -0.0011,0.029979 0,0.044922 z m 0.142578,0.15625 c 0.0055,0.0074 0.0063,0.0084 0.01172,0.01563 0.0015,-0.0038 0.0023,-0.0079 0.0039,-0.01172 -0.0051,-0.0012 -0.01066,-0.0026 -0.01563,-0.0039 z" />
+    <path
+       id="ellipse8-1"
+       transform="translate(1213,81)"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       d="m 14.099609,6 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 z" />
+    <circle
+       r="2"
+       cx="1227"
+       cy="94"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse8-1-2" />
+  </g>
+</svg>
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-080.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-080.svg
index d92f041f5..333fc3207 120000
--- a/elementary-xfce-dark/panel/16/gpm-keyboard-080.svg
+++ b/elementary-xfce-dark/panel/16/gpm-keyboard-080.svg
@@ -1 +1 @@
-xfpm-keyboard-060.svg
\ No newline at end of file
+gpm-keyboard-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-100.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-100.svg
deleted file mode 120000
index cc1d449e2..000000000
--- a/elementary-xfce-dark/panel/16/gpm-keyboard-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-keyboard-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-keyboard-100.svg b/elementary-xfce-dark/panel/16/gpm-keyboard-100.svg
new file mode 100644
index 000000000..0a13d7fc7
--- /dev/null
+++ b/elementary-xfce-dark/panel/16/gpm-keyboard-100.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1213 -81)"
+     id="g4">
+    <path
+       style="color:#000000;overflow:visible;fill:#fcfcfc;marker:none;fill-opacity:1"
+       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.017614 2 11.033487 2.0048207 11.050781 2.0058594 A 2.5 2.5 0 0 1 11.458984 1.0585938 C 11.311247 1.0232117 11.15928 1 11 1 L 2 1 z M 12 5.4960938 L 12 6.5019531 A 2.5 2.5 0 0 1 13 6.0546875 L 13 5.9492188 A 2.5 2.5 0 0 1 12 5.4960938 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.999486 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.5 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844065 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071066 9.0570651 8.5664062 9.0644531 z M 12 10.496094 L 12 10.501953 A 2.5 2.5 0 0 1 12.003906 10.5 A 2.5 2.5 0 0 1 12 10.496094 z "
+       transform="translate(1213,81)"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1227"
+       cy="84"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse8" />
+    <circle
+       r="2"
+       cx="1227.1"
+       cy="89.049995"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse8-7" />
+    <circle
+       r="2"
+       cx="1227"
+       cy="94"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse8-7-3" />
+  </g>
+</svg>
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-000.svg b/elementary-xfce-dark/panel/16/gpm-mouse-000.svg
deleted file mode 120000
index 19cf5a11a..000000000
--- a/elementary-xfce-dark/panel/16/gpm-mouse-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-mouse-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-000.svg b/elementary-xfce-dark/panel/16/gpm-mouse-000.svg
new file mode 100644
index 000000000..9bd0ec5a2
--- /dev/null
+++ b/elementary-xfce-dark/panel/16/gpm-mouse-000.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16.004"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1233 -81)"
+     id="g4">
+    <path
+       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
+       font-weight="400"
+       overflow="visible"
+       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#c6262e;fill-opacity:1"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="94.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#c6262e;fill-opacity:1;marker:none"
+       id="ellipse8" />
+  </g>
+</svg>
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-020.svg b/elementary-xfce-dark/panel/16/gpm-mouse-020.svg
deleted file mode 120000
index fb30d2184..000000000
--- a/elementary-xfce-dark/panel/16/gpm-mouse-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-mouse-030.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-020.svg b/elementary-xfce-dark/panel/16/gpm-mouse-020.svg
new file mode 100644
index 000000000..b681b73df
--- /dev/null
+++ b/elementary-xfce-dark/panel/16/gpm-mouse-020.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16.004"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1233 -81)"
+     id="g4">
+    <path
+       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
+       font-weight="400"
+       overflow="visible"
+       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#fcfcfc;fill-opacity:1"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="94.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse8" />
+  </g>
+</svg>
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-040.svg b/elementary-xfce-dark/panel/16/gpm-mouse-040.svg
index fb30d2184..daf1600af 120000
--- a/elementary-xfce-dark/panel/16/gpm-mouse-040.svg
+++ b/elementary-xfce-dark/panel/16/gpm-mouse-040.svg
@@ -1 +1 @@
-xfpm-mouse-030.svg
\ No newline at end of file
+gpm-mouse-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-060.svg b/elementary-xfce-dark/panel/16/gpm-mouse-060.svg
deleted file mode 120000
index 98a3a0df5..000000000
--- a/elementary-xfce-dark/panel/16/gpm-mouse-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-mouse-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-060.svg b/elementary-xfce-dark/panel/16/gpm-mouse-060.svg
new file mode 100644
index 000000000..b3661a709
--- /dev/null
+++ b/elementary-xfce-dark/panel/16/gpm-mouse-060.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16.004"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1233 -81)"
+     id="g4">
+    <path
+       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
+       font-weight="400"
+       overflow="visible"
+       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#fcfcfc;fill-opacity:1"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="94.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse8" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="89.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse10" />
+  </g>
+</svg>
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-080.svg b/elementary-xfce-dark/panel/16/gpm-mouse-080.svg
index 98a3a0df5..7d3125fb5 120000
--- a/elementary-xfce-dark/panel/16/gpm-mouse-080.svg
+++ b/elementary-xfce-dark/panel/16/gpm-mouse-080.svg
@@ -1 +1 @@
-xfpm-mouse-060.svg
\ No newline at end of file
+gpm-mouse-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-100.svg b/elementary-xfce-dark/panel/16/gpm-mouse-100.svg
deleted file mode 120000
index 9a9d3f1d3..000000000
--- a/elementary-xfce-dark/panel/16/gpm-mouse-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-mouse-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/gpm-mouse-100.svg b/elementary-xfce-dark/panel/16/gpm-mouse-100.svg
new file mode 100644
index 000000000..d20e60d4a
--- /dev/null
+++ b/elementary-xfce-dark/panel/16/gpm-mouse-100.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16.004"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1233 -81)"
+     id="g4">
+    <path
+       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
+       font-weight="400"
+       overflow="visible"
+       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#fcfcfc;fill-opacity:1"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="94.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse8" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="89.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse10" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="84.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
+       id="ellipse12" />
+  </g>
+</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-ac-adapter.svg b/elementary-xfce-dark/panel/16/xfpm-ac-adapter.svg
deleted file mode 120000
index 462da4e23..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ac-adapter.svg
+++ /dev/null
@@ -1 +0,0 @@
-ac-adapter.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-keyboard-000.svg b/elementary-xfce-dark/panel/16/xfpm-keyboard-000.svg
deleted file mode 100644
index 3af902366..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-keyboard-000.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1213 -81)"
-     id="g4">
-    <path
-       style="color:#000000;overflow:visible;fill:#c6262e;marker:none;fill-opacity:1"
-       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.554 2 12 2.446 12 3 L 12 10.501953 A 2.5 2.5 0 0 1 13 10.054688 L 13 3 C 13 1.892 12.108 1 11 1 L 2 1 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.99956 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844063 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071063 9.0570651 8.5664062 9.0644531 z "
-       transform="translate(1213,81)"
-       id="path6" />
-    <circle
-       cx="1227"
-       cy="94"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#c6262e;fill-opacity:1;marker:none"
-       id="ellipse8"
-       r="2" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-keyboard-030.svg b/elementary-xfce-dark/panel/16/xfpm-keyboard-030.svg
deleted file mode 100644
index a3b154a16..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-keyboard-030.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1213 -81)"
-     id="g4">
-    <path
-       style="color:#000000;overflow:visible;fill:#fcfcfc;marker:none;fill-opacity:1"
-       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.554 2 12 2.446 12 3 L 12 10.501953 A 2.5 2.5 0 0 1 13 10.054688 L 13 3 C 13 1.892 12.108 1 11 1 L 2 1 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.99956 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844063 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071063 9.0570651 8.5664062 9.0644531 z "
-       transform="translate(1213,81)"
-       id="path6" />
-    <circle
-       cx="1227"
-       cy="94"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse8"
-       r="2" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-keyboard-060.svg b/elementary-xfce-dark/panel/16/xfpm-keyboard-060.svg
deleted file mode 100644
index 0504383b0..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-keyboard-060.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1213 -81)"
-     id="g4">
-    <path
-       id="path6"
-       transform="translate(1213,81)"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;marker:none;fill-opacity:1"
-       d="M 2,1 C 0.892,1 0,1.892 0,3 v 10 c 0,1.108 0.892,2 2,2 h 9 c 0.441001,0 0.843886,-0.144774 1.173828,-0.384766 a 2.5,2.5 0 0 1 -1.123047,-1.625 C 11.033042,12.991162 11.017978,13 11,13 H 2 C 1.446,13 1,12.554 1,12 V 3 C 1,2.446 1.446,2 2,2 h 9 c 0.554,0 1,0.446 1,1 V 5.5019531 A 2.5,2.5 0 0 1 13,5.0546875 V 3 C 13,1.892 12.108,1 11,1 Z m 6.65625,4.9941406 c -0.79,0 -1.5472969,0.257 -2.2792969,0.75 L 6.75,7.59375 C 7.062,7.38375 7.36625,7.234 7.65625,7.125 c 0.298,-0.116 0.57,-0.15625 0.875,-0.15625 0.449,0 0.79225,0.10375 1.03125,0.34375 C 9.8025,7.5445 10,7.86125 10,8.28125 v 0.3066406 c -0.21,-0.08 -0.52025,-0.1435 -0.78125,-0.1875 -0.2577,-0.04608 -0.51955,-0.06734 -0.78125,-0.0625 -0.356,0 -0.67175,0.038 -0.96875,0.125 -0.29,0.087 -0.56425,0.215 -0.78125,0.375 -0.21,0.16 -0.35275,0.3455 -0.46875,0.5625 -0.116,0.218 -0.1875,0.5493594 -0.1875,0.8183594 0,0.254 0.06225,0.50075 0.15625,0.71875 0.101,0.217 0.208,0.4025 0.375,0.5625 0.174,0.16 0.393,0.28 0.625,0.375 0.239,0.087 0.50525,0.125 0.78125,0.125 0.428,0 0.8175,-0.076 1.1875,-0.25 0.377,-0.181 0.6835,-0.44825 0.9375,-0.78125 L 10.125,11.3125 c 0.022,0.166197 0.09875,0.320702 0.21875,0.4375 0.123,0.109 0.29925,0.1725 0.53125,0.1875 0.05444,0 0.124486,1.16e-4 0.191406,0 A 2.5,2.5 0 0 1 11.46875,11.046875 V 10.875 C 11.34475,10.868 11.165234,10.83925 11.115234,10.78125 11.042234,10.69354 11.0014,10.582869 11,10.46875 V 8.3378906 c 0,-0.747 -0.09625,-1.31975 -0.53125,-1.71875 -0.435,-0.399 -1.0295,-0.625 -1.8125,-0.625 z m -0.089844,3.0703125 c 0.2180003,0 0.6070313,0.04975 0.8320313,0.09375 C 9.6304379,9.2022031 9.797,9.26375 10,9.34375 v 0.75 c 0,0.145 -0.12925,0.3075 -0.28125,0.4375 C 9.29175,10.91125 8.77925,10.961 8.28125,11 7.95525,11 7.5478906,11.01713 7.3378906,10.828125 7.1278906,10.632125 7,10.408 7,10.125 7,9.82 7.2945,9.556 7.5625,9.375 7.8551,9.166329 8.207107,9.0570651 8.5664062,9.0644531 Z M 12,9.9453125 v 0.1503905 c 0.01678,-0.01252 0.03285,-0.02571 0.04883,-0.03906 4.11e-4,-0.01446 -8.32e-4,-0.02871 -0.002,-0.04297 -0.0056,-0.0071 -0.01813,-0.0064 -0.02148,-0.015625 -0.0035,-0.011187 -0.0096,-0.031039 -0.01563,-0.048828 -0.0062,-0.00347 -0.0026,9.84e-5 -0.0098,-0.00391 z m 0.04687,0.068359 c 0.0062,0.0077 0.01329,0.01385 0.02148,0.01953 -0.0017,-0.01821 -0.0029,-0.036454 -0.0039,-0.054687 -0.003,-0.0017 -0.01205,-0.00667 -0.01758,-0.00977 0.0012,0.014927 -0.0011,0.029979 0,0.044922 z m 0.142578,0.15625 c 0.0055,0.0074 0.0063,0.0084 0.01172,0.01563 0.0015,-0.0038 0.0023,-0.0079 0.0039,-0.01172 -0.0051,-0.0012 -0.01066,-0.0026 -0.01563,-0.0039 z" />
-    <path
-       id="ellipse8-1"
-       transform="translate(1213,81)"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       d="m 14.099609,6 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 z" />
-    <circle
-       r="2"
-       cx="1227"
-       cy="94"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse8-1-2" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-keyboard-100.svg b/elementary-xfce-dark/panel/16/xfpm-keyboard-100.svg
deleted file mode 100644
index 0a13d7fc7..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-keyboard-100.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1213 -81)"
-     id="g4">
-    <path
-       style="color:#000000;overflow:visible;fill:#fcfcfc;marker:none;fill-opacity:1"
-       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.017614 2 11.033487 2.0048207 11.050781 2.0058594 A 2.5 2.5 0 0 1 11.458984 1.0585938 C 11.311247 1.0232117 11.15928 1 11 1 L 2 1 z M 12 5.4960938 L 12 6.5019531 A 2.5 2.5 0 0 1 13 6.0546875 L 13 5.9492188 A 2.5 2.5 0 0 1 12 5.4960938 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.999486 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.5 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844065 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071066 9.0570651 8.5664062 9.0644531 z M 12 10.496094 L 12 10.501953 A 2.5 2.5 0 0 1 12.003906 10.5 A 2.5 2.5 0 0 1 12 10.496094 z "
-       transform="translate(1213,81)"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1227"
-       cy="84"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse8" />
-    <circle
-       r="2"
-       cx="1227.1"
-       cy="89.049995"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse8-7" />
-    <circle
-       r="2"
-       cx="1227"
-       cy="94"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse8-7-3" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-mouse-000.svg b/elementary-xfce-dark/panel/16/xfpm-mouse-000.svg
deleted file mode 100644
index 9bd0ec5a2..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-mouse-000.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16.004"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1233 -81)"
-     id="g4">
-    <path
-       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
-       font-weight="400"
-       overflow="visible"
-       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#c6262e;fill-opacity:1"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="94.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#c6262e;fill-opacity:1;marker:none"
-       id="ellipse8" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-mouse-030.svg b/elementary-xfce-dark/panel/16/xfpm-mouse-030.svg
deleted file mode 100644
index b681b73df..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-mouse-030.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16.004"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1233 -81)"
-     id="g4">
-    <path
-       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
-       font-weight="400"
-       overflow="visible"
-       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#fcfcfc;fill-opacity:1"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="94.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse8" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-mouse-060.svg b/elementary-xfce-dark/panel/16/xfpm-mouse-060.svg
deleted file mode 100644
index b3661a709..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-mouse-060.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16.004"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1233 -81)"
-     id="g4">
-    <path
-       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
-       font-weight="400"
-       overflow="visible"
-       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#fcfcfc;fill-opacity:1"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="94.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse8" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="89.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse10" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-mouse-100.svg b/elementary-xfce-dark/panel/16/xfpm-mouse-100.svg
deleted file mode 100644
index d20e60d4a..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-mouse-100.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16.004"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1233 -81)"
-     id="g4">
-    <path
-       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
-       font-weight="400"
-       overflow="visible"
-       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#fcfcfc;fill-opacity:1"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="94.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse8" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="89.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse10" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="84.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#fcfcfc;fill-opacity:1;marker:none"
-       id="ellipse12" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-000-charging.svg b/elementary-xfce-dark/panel/16/xfpm-primary-000-charging.svg
deleted file mode 120000
index 26a81ae46..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-000.svg b/elementary-xfce-dark/panel/16/xfpm-primary-000.svg
deleted file mode 120000
index e222aedae..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-020-charging.svg b/elementary-xfce-dark/panel/16/xfpm-primary-020-charging.svg
deleted file mode 120000
index 7566c7e1f..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-caution-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-020.svg b/elementary-xfce-dark/panel/16/xfpm-primary-020.svg
deleted file mode 120000
index 819f26d4d..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-caution.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-040-charging.svg b/elementary-xfce-dark/panel/16/xfpm-primary-040-charging.svg
deleted file mode 120000
index cec45284a..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-040.svg b/elementary-xfce-dark/panel/16/xfpm-primary-040.svg
deleted file mode 120000
index 43b99e111..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-060-charging.svg b/elementary-xfce-dark/panel/16/xfpm-primary-060-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-060.svg b/elementary-xfce-dark/panel/16/xfpm-primary-060.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-080-charging.svg b/elementary-xfce-dark/panel/16/xfpm-primary-080-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-080.svg b/elementary-xfce-dark/panel/16/xfpm-primary-080.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-100-charging.svg b/elementary-xfce-dark/panel/16/xfpm-primary-100-charging.svg
deleted file mode 120000
index fa569ef59..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-100.svg b/elementary-xfce-dark/panel/16/xfpm-primary-100.svg
deleted file mode 120000
index a3be8f7c4..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-charged.svg b/elementary-xfce-dark/panel/16/xfpm-primary-charged.svg
deleted file mode 120000
index eddb86a90..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-primary-missing.svg b/elementary-xfce-dark/panel/16/xfpm-primary-missing.svg
deleted file mode 120000
index 245b4cabc..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-primary-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-000-charging.svg b/elementary-xfce-dark/panel/16/xfpm-ups-000-charging.svg
deleted file mode 120000
index 26a81ae46..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-000.svg b/elementary-xfce-dark/panel/16/xfpm-ups-000.svg
deleted file mode 120000
index e222aedae..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-020-charging.svg b/elementary-xfce-dark/panel/16/xfpm-ups-020-charging.svg
deleted file mode 120000
index 7566c7e1f..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-caution-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-020.svg b/elementary-xfce-dark/panel/16/xfpm-ups-020.svg
deleted file mode 120000
index 819f26d4d..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-caution.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-040-charging.svg b/elementary-xfce-dark/panel/16/xfpm-ups-040-charging.svg
deleted file mode 120000
index cec45284a..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-040.svg b/elementary-xfce-dark/panel/16/xfpm-ups-040.svg
deleted file mode 120000
index 43b99e111..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-060-charging.svg b/elementary-xfce-dark/panel/16/xfpm-ups-060-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-060.svg b/elementary-xfce-dark/panel/16/xfpm-ups-060.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-080-charging.svg b/elementary-xfce-dark/panel/16/xfpm-ups-080-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-080.svg b/elementary-xfce-dark/panel/16/xfpm-ups-080.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-100-charging.svg b/elementary-xfce-dark/panel/16/xfpm-ups-100-charging.svg
deleted file mode 120000
index fa569ef59..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-100.svg b/elementary-xfce-dark/panel/16/xfpm-ups-100.svg
deleted file mode 120000
index a3be8f7c4..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-charged.svg b/elementary-xfce-dark/panel/16/xfpm-ups-charged.svg
deleted file mode 120000
index e3c4e4262..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/xfpm-ups-missing.svg b/elementary-xfce-dark/panel/16/xfpm-ups-missing.svg
deleted file mode 120000
index 245b4cabc..000000000
--- a/elementary-xfce-dark/panel/16/xfpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ac-adapter.svg b/elementary-xfce-dark/panel/22/xfpm-ac-adapter.svg
deleted file mode 120000
index e1ebcd6c2..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ac-adapter.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-ac-adapter.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-brightness-lcd.svg b/elementary-xfce-dark/panel/22/xfpm-brightness-lcd.svg
deleted file mode 100644
index 96ce1b196..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-brightness-lcd.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   id="svg7384"
-   height="22"
-   width="22"
-   version="1.1">
-  <defs
-     id="defs21">
-    <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
-       xlink:href="#linearGradient3678"
-       id="linearGradient3834"
-       x1="15"
-       y1="0.5593192"
-       x2="15"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <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>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <g
-     style="opacity:0.5;fill:#000000;fill-opacity:1"
-     id="g3853"
-     transform="translate(0,1.000006)">
-    <path
-       d="M 10.981825,5.9999997 C 8.2405524,5.9999997 6,8.240552 6,10.981823 6,13.723095 8.2405524,16 10.981825,16 13.723097,16 16,13.723095 16,10.981823 16,8.240552 13.723096,5.9999997 10.981825,5.9999997 z m 0,2.5453764 c 1.376947,0 2.472673,1.0593871 2.472673,2.4363209 0,1.376935 -1.095752,2.472674 -2.472673,2.472674 -1.3769225,0 -2.4363222,-1.095751 -2.4363222,-2.472674 0,-1.3769212 1.059387,-2.4363209 2.4363222,-2.4363209 z M 5.5565622,7.1069996 3.7829935,5.3334309 C 3.4907977,5.0412351 3.4329597,4.6286063 3.6533119,4.4082541 L 4.2720303,3.7895357 C 4.4923825,3.5691836 4.9050113,3.6270216 5.197207,3.9192173 L 6.9707757,5.692786 C 7.2629716,5.9849818 7.3208096,6.3976107 7.1004574,6.6179628 L 6.481739,7.2366813 C 6.2613868,7.4570334 5.848758,7.3991954 5.5565622,7.1069996 z M 16.679586,18.202399 14.921704,16.444516 c -0.296541,-0.296541 -0.357877,-0.712668 -0.137525,-0.93302 l 0.618718,-0.618719 c 0.220352,-0.220352 0.63648,-0.159015 0.93302,0.137526 l 1.757883,1.757882 c 0.296541,0.296541 0.357876,0.712667 0.137524,0.93302 l -0.618718,0.618718 c -0.220352,0.220352 -0.636479,0.159016 -0.93302,-0.137524 z M 10,4.2541025 10,1.7458975 C 10,1.3326703 10.250875,1 10.5625,1 l 0.875,0 C 11.749125,1 12,1.3326703 12,1.7458975 l 0,2.508205 C 12,4.6673297 11.749125,5 11.4375,5 l -0.875,0 C 10.250875,5 10,4.6673297 10,4.2541025 z m 0,15.9889025 0,-2.486021 c 0,-0.419372 0.250875,-0.75699 0.5625,-0.75699 l 0.875,0 c 0.311625,0 0.5625,0.337618 0.5625,0.75699 l 0,2.486021 c 0,0.419372 -0.250875,0.756989 -0.5625,0.756989 l -0.875,0 C 10.250875,20.999994 10,20.662377 10,20.243005 z M 15.007739,5.4461956 16.781308,3.6726268 c 0.292196,-0.2921957 0.704825,-0.3500339 0.925177,-0.1296817 l 0.618718,0.6187184 c 0.220352,0.2203522 0.162514,0.6329811 -0.129682,0.9251769 L 16.421953,6.8604092 C 16.129757,7.1526049 15.717128,7.2104429 15.496776,6.9900908 L 14.878058,6.3713723 C 14.657705,6.1510202 14.715543,5.7383914 15.007739,5.4461956 z M 3.6552399,17.041524 5.4131221,15.283642 c 0.2965409,-0.296541 0.7126678,-0.357877 0.93302,-0.137525 l 0.6187184,0.618718 c 0.2203522,0.220352 0.1590161,0.636479 -0.1375248,0.93302 l -1.7578823,1.757882 c -0.2965409,0.296541 -0.712668,0.357878 -0.9330202,0.137525 L 3.5177148,17.974544 C 3.2973627,17.754192 3.3586989,17.338065 3.6552399,17.041524 z M 17.745898,10 20.254102,10 C 20.66733,10 21,10.250875 21,10.5625 l 0,0.875 C 21,11.749125 20.66733,12 20.254102,12 l -2.508204,0 C 17.33267,12 17,11.749125 17,11.4375 l 0,-0.875 C 17,10.250875 17.33267,10 17.745898,10 z m -15.9889037,0 2.4860209,0 c 0.4193722,0 0.7569896,0.250875 0.7569896,0.5625 l 0,0.875 C 5.0000048,11.749125 4.6623874,12 4.2430152,12 L 1.7569943,12 C 1.3376221,12 1.0000048,11.749125 1.0000048,11.4375 l 0,-0.875 C 1.0000048,10.250875 1.3376221,10 1.7569943,10 z"
-       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#000000;fill-opacity:1"
-       id="path3855" />
-  </g>
-  <g
-     id="g3049"
-     style="fill-opacity:1;fill:url(#linearGradient3834)">
-    <path
-       id="path32729"
-       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:url(#linearGradient3834);fill-opacity:1.0"
-       d="M 10.981825,5.9999997 C 8.2405524,5.9999997 6,8.240552 6,10.981823 6,13.723095 8.2405524,16 10.981825,16 13.723097,16 16,13.723095 16,10.981823 16,8.240552 13.723096,5.9999997 10.981825,5.9999997 z m 0,2.5453764 c 1.376947,0 2.472673,1.0593871 2.472673,2.4363209 0,1.376935 -1.095752,2.472674 -2.472673,2.472674 -1.3769225,0 -2.4363222,-1.095751 -2.4363222,-2.472674 0,-1.3769212 1.059387,-2.4363209 2.4363222,-2.4363209 z M 5.5565622,7.1069996 3.7829935,5.3334309 C 3.4907977,5.0412351 3.4329597,4.6286063 3.6533119,4.4082541 L 4.2720303,3.7895357 C 4.4923825,3.5691836 4.9050113,3.6270216 5.197207,3.9192173 L 6.9707757,5.692786 C 7.2629716,5.9849818 7.3208096,6.3976107 7.1004574,6.6179628 L 6.481739,7.2366813 C 6.2613868,7.4570334 5.848758,7.3991954 5.5565622,7.1069996 z M 16.679586,18.202399 14.921704,16.444516 c -0.296541,-0.296541 -0.357877,-0.712668 -0.137525,-0.93302 l 0.618718,-0.618719 c 0.220352,-0.220352 0.63648,-0.159015 0.93302,0.137526 l 1.757883,1.757882 c 0.296541,0.296541 0.357876,0.712667 0.137524,0.93302 l -0.618718,0.618718 c -0.220352,0.220352 -0.636479,0.159016 -0.93302,-0.137524 z M 10,4.2541025 10,1.7458975 C 10,1.3326703 10.250875,1 10.5625,1 l 0.875,0 C 11.749125,1 12,1.3326703 12,1.7458975 l 0,2.508205 C 12,4.6673297 11.749125,5 11.4375,5 l -0.875,0 C 10.250875,5 10,4.6673297 10,4.2541025 z m 0,15.9889025 0,-2.486021 c 0,-0.419372 0.250875,-0.75699 0.5625,-0.75699 l 0.875,0 c 0.311625,0 0.5625,0.337618 0.5625,0.75699 l 0,2.486021 c 0,0.419372 -0.250875,0.756989 -0.5625,0.756989 l -0.875,0 C 10.250875,20.999994 10,20.662377 10,20.243005 z M 15.007739,5.4461956 16.781308,3.6726268 c 0.292196,-0.2921957 0.704825,-0.3500339 0.925177,-0.1296817 l 0.618718,0.6187184 c 0.220352,0.2203522 0.162514,0.6329811 -0.129682,0.9251769 L 16.421953,6.8604092 C 16.129757,7.1526049 15.717128,7.2104429 15.496776,6.9900908 L 14.878058,6.3713723 C 14.657705,6.1510202 14.715543,5.7383914 15.007739,5.4461956 z M 3.6552399,17.041524 5.4131221,15.283642 c 0.2965409,-0.296541 0.7126678,-0.357877 0.93302,-0.137525 l 0.6187184,0.618718 c 0.2203522,0.220352 0.1590161,0.636479 -0.1375248,0.93302 l -1.7578823,1.757882 c -0.2965409,0.296541 -0.712668,0.357878 -0.9330202,0.137525 L 3.5177148,17.974544 C 3.2973627,17.754192 3.3586989,17.338065 3.6552399,17.041524 z M 17.745898,10 20.254102,10 C 20.66733,10 21,10.250875 21,10.5625 l 0,0.875 C 21,11.749125 20.66733,12 20.254102,12 l -2.508204,0 C 17.33267,12 17,11.749125 17,11.4375 l 0,-0.875 C 17,10.250875 17.33267,10 17.745898,10 z m -15.9889037,0 2.4860209,0 c 0.4193722,0 0.7569896,0.250875 0.7569896,0.5625 l 0,0.875 C 5.0000048,11.749125 4.6623874,12 4.2430152,12 L 1.7569943,12 C 1.3376221,12 1.0000048,11.749125 1.0000048,11.4375 l 0,-0.875 C 1.0000048,10.250875 1.3376221,10 1.7569943,10 z" />
-  </g>
-</svg>
diff --git a/elementary-xfce-dark/panel/22/xfpm-keyboard-000.svg b/elementary-xfce-dark/panel/22/xfpm-keyboard-000.svg
deleted file mode 120000
index 70e678879..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-keyboard-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-keyboard-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-keyboard-030.svg b/elementary-xfce-dark/panel/22/xfpm-keyboard-030.svg
deleted file mode 100644
index 3c1fdf1e0..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-keyboard-030.svg
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg3204">
-  <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" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3206">
-    <linearGradient
-       xlink:href="#linearGradient3678"
-       id="linearGradient2395"
-       gradientUnits="userSpaceOnUse"
-       x1="7.2891564"
-       y1="5"
-       x2="7.2891564"
-       y2="20.011145"
-       gradientTransform="translate(-1,-1)" />
-    <linearGradient
-       xlink:href="#linearGradient3678"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-24.710843,-1.9586168)"
-       x1="41.73494"
-       y1="3.9481401"
-       x2="41.73494"
-       y2="20.989416" />
-    <linearGradient
-       xlink:href="#linearGradient3678"
-       id="linearGradient2402"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.19825709,-33.509578,10.848909)"
-       x1="121.69988"
-       y1="10.850004"
-       x2="121.69988"
-       y2="31.026016" />
-    <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>
-  </defs>
-  <rect
-     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"
-     id="rect3236"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="13.25"
-     x="-17.75"
-     ry="0.24999999"
-     rx="0.25"
-     height="5.4999995"
-     width="12.5" />
-  <rect
-     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="rect3296"
-     y="14"
-     x="14"
-     ry="0"
-     rx="0"
-     height="4"
-     width="4" />
-  <path
-     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-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3214"
-     d="M 12.5,18.5 L 12.5,6.5 C 12.5,5.946 12.946,5.5 13.5,5.5 L 18.5,5.5 C 19.054,5.5 19.5,5.946 19.5,6.5 L 19.5,18.5 C 19.5,19.054 19.054,19.5 18.5,19.5 L 13.5,19.5 C 12.946,19.5 12.5,19.054 12.5,18.5 z M 14.50264,5.381549 C 14.50334,5.053509 14.504168,4.725473 14.505144,4.397441 C 14.545901,3.799616 15.15474,3.420708 15.717338,3.499967 C 16.25026,3.5234 16.894234,3.375846 17.272203,3.863162 C 17.622964,4.30164 17.463608,4.884362 17.5,5.400369" />
-  <rect
-     style="fill:url(#linearGradient2402);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3728"
-     y="13"
-     x="14"
-     ry="0"
-     rx="0"
-     height="4"
-     width="4" />
-  <path
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2399);stroke-width:1;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"
-     id="rect2442"
-     d="M 12.5,17.5 L 12.5,5.5 C 12.5,4.946 12.946,4.5 13.5,4.5 L 18.5,4.5 C 19.054,4.5 19.5,4.946 19.5,5.5 L 19.5,17.5 C 19.5,18.054 19.054,18.5 18.5,18.5 L 13.5,18.5 C 12.946,18.5 12.5,18.054 12.5,17.5 z M 14.50264,4.381549 C 14.50334,4.053509 14.504168,3.725473 14.505144,3.397441 C 14.545901,2.799616 15.15474,2.420708 15.717338,2.499967 C 16.25026,2.5234 16.894234,2.375846 17.272203,2.863162 C 17.622964,3.30164 17.463608,3.884362 17.5,4.400369" />
-  <path
-     style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999992999999994;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"
-     id="path2424"
-     d="M 3,5 C 2.446,5 2,5.446 2,6 L 2,19 C 2,19.554 2.446,20 3,20 L 9,20 C 9.554,20 10,19.554 10,19 L 10,6 C 10,5.446 9.554,5 9,5 L 3,5 z M 3,8 L 4,8 L 4,9 L 3,9 L 3,8 z M 5,8 L 6,8 L 6,9 L 5,9 L 5,8 z M 8,9 L 9,9 L 9,16 L 8,16 L 8,9 z M 3,10 L 4,10 L 4,11 L 3,11 L 3,10 z M 5,10 L 6,10 L 6,11 L 5,11 L 5,10 z M 3,12 L 4,12 L 4,13 L 3,13 L 3,12 z M 5,12 L 6,12 L 6,13 L 5,13 L 5,12 z M 3,14 L 4,14 L 4,15 L 3,15 L 3,14 z M 5,14 L 6,14 L 6,15 L 5,15 L 5,14 z M 3,16 L 4,16 L 4,17 L 3,17 L 3,16 z M 5,16 L 6,16 L 6,17 L 5,17 L 5,16 z" />
-  <path
-     style="opacity:1;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999992999999994;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"
-     id="path2408"
-     d="M 3,4 C 2.446,4 2,4.446 2,5 L 2,18 C 2,18.554 2.446,19 3,19 L 9,19 C 9.554,19 10,18.554 10,18 L 10,5 C 10,4.446 9.554,4 9,4 L 3,4 z M 3,7 L 4,7 L 4,8 L 3,8 L 3,7 z M 5,7 L 6,7 L 6,8 L 5,8 L 5,7 z M 8,8 L 9,8 L 9,15 L 8,15 L 8,8 z M 3,9 L 4,9 L 4,10 L 3,10 L 3,9 z M 5,9 L 6,9 L 6,10 L 5,10 L 5,9 z M 3,11 L 4,11 L 4,12 L 3,12 L 3,11 z M 5,11 L 6,11 L 6,12 L 5,12 L 5,11 z M 3,13 L 4,13 L 4,14 L 3,14 L 3,13 z M 5,13 L 6,13 L 6,14 L 5,14 L 5,13 z M 3,15 L 4,15 L 4,16 L 3,16 L 3,15 z M 5,15 L 6,15 L 6,16 L 5,16 L 5,15 z" />
-</svg>
diff --git a/elementary-xfce-dark/panel/22/xfpm-keyboard-060.svg b/elementary-xfce-dark/panel/22/xfpm-keyboard-060.svg
deleted file mode 120000
index 333fc3207..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-keyboard-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-keyboard-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-keyboard-100.svg b/elementary-xfce-dark/panel/22/xfpm-keyboard-100.svg
deleted file mode 120000
index 6193d8ed9..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-keyboard-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-keyboard-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-mouse-000.svg b/elementary-xfce-dark/panel/22/xfpm-mouse-000.svg
deleted file mode 120000
index 241917e7e..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-mouse-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-mouse-030.svg b/elementary-xfce-dark/panel/22/xfpm-mouse-030.svg
deleted file mode 100644
index a81a80e91..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-mouse-030.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg3804">
-  <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" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3806">
-    <linearGradient
-       x1="165.47679"
-       y1="11.019586"
-       x2="165.47679"
-       y2="33.049465"
-       id="linearGradient3208"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4100229,0,0,0.5447147,-56.849273,-1.0025304)" />
-    <linearGradient
-       x1="14"
-       y1="4"
-       x2="14"
-       y2="20"
-       id="linearGradient3204"
-       xlink:href="#linearGradient3678"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682" />
-    </linearGradient>
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="m 8,14 0,2 c 0,1.108 1.338,2 3,2 l 1,0 c 1.662,0 3,-0.892 3,-2 l 0,-2 z"
-       id="path3291"
-       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 7.25,15.450001 C 7.252844,12.443791 7.2443067,9.437377 7.254278,6.4312954 C 7.3659022,5.2690397 8.5191399,4.5697645 9.566642,4.3530654 C 10.038101,4.263253 10.75,4.245207 10.75,4.245207 C 10.75,4.245207 10.75,7.5 10.75,7.5 C 10.75,7.5 10.808301,8.25 11.548532,8.25 C 12.271982,8.25 12.25,7.5 12.25,7.5 C 12.25,7.5 12.25,4.2547836 12.25,4.2547836 C 13.812167,4.1767742 15,4.7723811 15.60212,5.8645854 C 15.846484,6.473714 15.717337,7.1417097 15.75,7.7816055 C 15.747159,10.37728 15.75569,12.973159 15.745722,15.568705 C 15.634098,16.730961 14.48086,17.430235 13.433358,17.646935 C 12.506212,17.823555 11.557192,17.723572 10.619145,17.75 C 9.387631,17.764194 7.9779253,17.310668 7.3978805,16.135415 C 7.3019013,15.920455 7.2495712,15.685646 7.25,15.450001 z"
-       id="rect3236"
-       style="opacity:0.29999999999999999;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.49999993999999998;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 10.5,4.499999 L 12.5,4.499999 C 14.716,4.499999 16.5,5.837999 16.5,7.499999 L 16.5,16.5 C 16.5,18.162 14.716,19.5 12.5,19.5 L 10.5,19.5 C 8.2839999,19.5 6.5,18.162 6.5,16.5 L 6.5,7.499999 C 6.5,5.837999 8.2839999,4.499999 10.5,4.499999 z M 11.541885,4.5 L 11.541885,8.5"
-       id="path3212"
-       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994000000003;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,13 0,2 c 0,1.108 1.338,2 3,2 l 1,0 c 1.662,0 3,-0.892 3,-2 l 0,-2 z"
-       id="rect3728"
-       style="fill:url(#linearGradient3208);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.5,3.499999 L 12.5,3.499999 C 14.716,3.499999 16.5,4.837999 16.5,6.499999 L 16.5,15.5 C 16.5,17.162 14.716,18.5 12.5,18.5 L 10.5,18.5 C 8.2839999,18.5 6.5,17.162 6.5,15.5 L 6.5,6.499999 C 6.5,4.837999 8.2839999,3.499999 10.5,3.499999 z M 11.5,3.5 L 11.5,7.5"
-       id="path3231"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3204);stroke-width:0.99999994000000003;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>
-</svg>
diff --git a/elementary-xfce-dark/panel/22/xfpm-mouse-060.svg b/elementary-xfce-dark/panel/22/xfpm-mouse-060.svg
deleted file mode 120000
index 7d3125fb5..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-mouse-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-mouse-100.svg b/elementary-xfce-dark/panel/22/xfpm-mouse-100.svg
deleted file mode 120000
index 544289bd7..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-mouse-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-phone-000.svg b/elementary-xfce-dark/panel/22/xfpm-phone-000.svg
deleted file mode 120000
index 56bf8773f..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-phone-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-phone-030.svg b/elementary-xfce-dark/panel/22/xfpm-phone-030.svg
deleted file mode 100644
index 80d837e9b..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-phone-030.svg
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg3218">
-  <metadata
-     id="metadata20">
-    <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>
-  <defs
-     id="defs3220">
-    <linearGradient
-       xlink:href="#linearGradient3678"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-33.509578,0.0845009)"
-       x1="95.494781"
-       y1="7.181673"
-       x2="95.494781"
-       y2="34.699265" />
-    <linearGradient
-       xlink:href="#linearGradient3678"
-       id="linearGradient2401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-24.710843,-1.9586168)"
-       x1="41.73494"
-       y1="3.9481401"
-       x2="41.73494"
-       y2="20.989416" />
-    <linearGradient
-       xlink:href="#linearGradient3678"
-       id="linearGradient2404"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.19825709,-33.509578,10.848909)"
-       x1="121.69988"
-       y1="10.850004"
-       x2="121.69988"
-       y2="31.026016" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682" />
-    </linearGradient>
-  </defs>
-  <rect
-     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"
-     id="rect3236"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="13.25"
-     x="-17.75"
-     ry="0.24999999"
-     rx="0.25"
-     height="5.4999995"
-     width="12.5" />
-  <rect
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3296"
-     y="14"
-     x="14"
-     ry="0"
-     rx="0"
-     height="4"
-     width="4" />
-  <path
-     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-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3214"
-     d="M 12.5,18.5 L 12.5,6.5 C 12.5,5.946 12.946,5.5 13.5,5.5 L 18.5,5.5 C 19.054,5.5 19.5,5.946 19.5,6.5 L 19.5,18.5 C 19.5,19.054 19.054,19.5 18.5,19.5 L 13.5,19.5 C 12.946,19.5 12.5,19.054 12.5,18.5 z M 14.50264,5.381549 C 14.50334,5.053509 14.504168,4.725473 14.505144,4.397441 C 14.545901,3.799616 15.15474,3.420708 15.717338,3.499967 C 16.25026,3.5234 16.894234,3.375846 17.272203,3.863162 C 17.622964,4.30164 17.463608,4.884362 17.5,5.400369" />
-  <rect
-     style="fill:url(#linearGradient2404);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3728"
-     y="13"
-     x="14"
-     ry="0"
-     rx="0"
-     height="4"
-     width="4" />
-  <path
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2401);stroke-width:1;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"
-     id="rect2442"
-     d="M 12.5,17.5 L 12.5,5.5 C 12.5,4.946 12.946,4.5 13.5,4.5 L 18.5,4.5 C 19.054,4.5 19.5,4.946 19.5,5.5 L 19.5,17.5 C 19.5,18.054 19.054,18.5 18.5,18.5 L 13.5,18.5 C 12.946,18.5 12.5,18.054 12.5,17.5 z M 14.50264,4.381549 C 14.50334,4.053509 14.504168,3.725473 14.505144,3.397441 C 14.545901,2.799616 15.15474,2.420708 15.717338,2.499967 C 16.25026,2.5234 16.894234,2.375846 17.272203,2.863162 C 17.622964,3.30164 17.463608,3.884362 17.5,4.400369" />
-  <rect
-     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"
-     id="rect3204"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="3.25"
-     x="-12.750001"
-     ry="0.24999999"
-     rx="0.25"
-     height="5.4999995"
-     width="7.5000005" />
-  <path
-     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"
-     id="path2442"
-     d="M 3,5 C 2.446,5 2,5.446 2,6 L 2,19 C 2,19.554 2.446,20 3,20 L 9,20 C 9.554,20 10,19.554 10,19 L 10,6 C 10,5.446 9.554,5 9,5 L 3,5 z M 3.5,6 L 8.5,6 C 8.777,6 9,6.223 9,6.5 L 9,13.5 C 9,13.777 8.777,14 8.5,14 L 3.5,14 C 3.223,14 3,13.777 3,13.5 L 3,6.5 C 3,6.223 3.223,6 3.5,6 z M 3.5,16 C 3.777,16 4,16.223 4,16.5 C 4,16.777 3.777,17 3.5,17 C 3.223,17 3,16.777 3,16.5 C 3,16.223 3.223,16 3.5,16 z M 5.5,16 C 5.777,16 6,16.223 6,16.5 C 6,16.223 6.223,16 6.5,16 C 6.777,16 7,16.223 7,16.5 C 7,16.777 6.777,17 6.5,17 C 6.223,17 6,16.777 6,16.5 C 6,16.777 5.777,17 5.5,17 C 5.223,17 5,16.777 5,16.5 C 5,16.223 5.223,16 5.5,16 z M 8.5,16 C 8.777,16 9,16.223 9,16.5 C 9,16.777 8.777,17 8.5,17 C 8.223,17 8,16.777 8,16.5 C 8,16.223 8.223,16 8.5,16 z M 3.5,18 C 3.777,18 4,18.223 4,18.5 C 4,18.777 3.777,19 3.5,19 C 3.223,19 3,18.777 3,18.5 C 3,18.223 3.223,18 3.5,18 z M 5.5,18 C 5.777,18 6,18.223 6,18.5 C 6,18.223 6.223,18 6.5,18 C 6.777,18 7,18.223 7,18.5 C 7,18.777 6.777,19 6.5,19 C 6.223,19 6,18.777 6,18.5 C 6,18.777 5.777,19 5.5,19 C 5.223,19 5,18.777 5,18.5 C 5,18.223 5.223,18 5.5,18 z M 8.5,18 C 8.777,18 9,18.223 9,18.5 C 9,18.777 8.777,19 8.5,19 C 8.223,19 8,18.777 8,18.5 C 8,18.223 8.223,18 8.5,18 z" />
-  <path
-     style="opacity:1;fill:url(#linearGradient2396);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"
-     id="rect2397"
-     d="M 3,4 C 2.446,4 2,4.446 2,5 L 2,18 C 2,18.554 2.446,19 3,19 L 9,19 C 9.554,19 10,18.554 10,18 L 10,5 C 10,4.446 9.554,4 9,4 L 3,4 z M 3.5,5 L 8.5,5 C 8.777,5 9,5.223 9,5.5 L 9,12.5 C 9,12.777 8.777,13 8.5,13 L 3.5,13 C 3.223,13 3,12.777 3,12.5 L 3,5.5 C 3,5.223 3.223,5 3.5,5 z M 3.5,15 C 3.777,15 4,15.223 4,15.5 C 4,15.777 3.777,16 3.5,16 C 3.223,16 3,15.777 3,15.5 C 3,15.223 3.223,15 3.5,15 z M 5.5,15 C 5.777,15 6,15.223 6,15.5 C 6,15.223 6.223,15 6.5,15 C 6.777,15 7,15.223 7,15.5 C 7,15.777 6.777,16 6.5,16 C 6.223,16 6,15.777 6,15.5 C 6,15.777 5.777,16 5.5,16 C 5.223,16 5,15.777 5,15.5 C 5,15.223 5.223,15 5.5,15 z M 8.5,15 C 8.777,15 9,15.223 9,15.5 C 9,15.777 8.777,16 8.5,16 C 8.223,16 8,15.777 8,15.5 C 8,15.223 8.223,15 8.5,15 z M 3.5,17 C 3.777,17 4,17.223 4,17.5 C 4,17.777 3.777,18 3.5,18 C 3.223,18 3,17.777 3,17.5 C 3,17.223 3.223,17 3.5,17 z M 5.5,17 C 5.777,17 6,17.223 6,17.5 C 6,17.223 6.223,17 6.5,17 C 6.777,17 7,17.223 7,17.5 C 7,17.777 6.777,18 6.5,18 C 6.223,18 6,17.777 6,17.5 C 6,17.777 5.777,18 5.5,18 C 5.223,18 5,17.777 5,17.5 C 5,17.223 5.223,17 5.5,17 z M 8.5,17 C 8.777,17 9,17.223 9,17.5 C 9,17.777 8.777,18 8.5,18 C 8.223,18 8,17.777 8,17.5 C 8,17.223 8.223,17 8.5,17 z" />
-</svg>
diff --git a/elementary-xfce-dark/panel/22/xfpm-phone-060.svg b/elementary-xfce-dark/panel/22/xfpm-phone-060.svg
deleted file mode 120000
index 4beb3892e..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-phone-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-phone-100.svg b/elementary-xfce-dark/panel/22/xfpm-phone-100.svg
deleted file mode 120000
index a174b0ac5..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-phone-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-000-charging.svg b/elementary-xfce-dark/panel/22/xfpm-primary-000-charging.svg
deleted file mode 120000
index aa6dd36b9..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-000.svg b/elementary-xfce-dark/panel/22/xfpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-020-charging.svg b/elementary-xfce-dark/panel/22/xfpm-primary-020-charging.svg
deleted file mode 120000
index 17e5c8a06..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-020.svg b/elementary-xfce-dark/panel/22/xfpm-primary-020.svg
deleted file mode 120000
index 85dbbfcb0..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-040-charging.svg b/elementary-xfce-dark/panel/22/xfpm-primary-040-charging.svg
deleted file mode 120000
index 70af98bb3..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-040.svg b/elementary-xfce-dark/panel/22/xfpm-primary-040.svg
deleted file mode 120000
index 3eafb6fad..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-040.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-060-charging.svg b/elementary-xfce-dark/panel/22/xfpm-primary-060-charging.svg
deleted file mode 120000
index 9eace6f21..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-060.svg b/elementary-xfce-dark/panel/22/xfpm-primary-060.svg
deleted file mode 120000
index 3b2d3aa1c..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-080-charging.svg b/elementary-xfce-dark/panel/22/xfpm-primary-080-charging.svg
deleted file mode 120000
index a7087d713..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-080.svg b/elementary-xfce-dark/panel/22/xfpm-primary-080.svg
deleted file mode 120000
index 1b9ff2e7d..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-080.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-100-charging.svg b/elementary-xfce-dark/panel/22/xfpm-primary-100-charging.svg
deleted file mode 120000
index 89884c066..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-100.svg b/elementary-xfce-dark/panel/22/xfpm-primary-100.svg
deleted file mode 120000
index 19652d770..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-charged.svg b/elementary-xfce-dark/panel/22/xfpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-primary-missing.svg b/elementary-xfce-dark/panel/22/xfpm-primary-missing.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-primary-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-000-charging.svg b/elementary-xfce-dark/panel/22/xfpm-ups-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-000.svg b/elementary-xfce-dark/panel/22/xfpm-ups-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-020-charging.svg b/elementary-xfce-dark/panel/22/xfpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-020.svg b/elementary-xfce-dark/panel/22/xfpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-040-charging.svg b/elementary-xfce-dark/panel/22/xfpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-040.svg b/elementary-xfce-dark/panel/22/xfpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-060-charging.svg b/elementary-xfce-dark/panel/22/xfpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-060.svg b/elementary-xfce-dark/panel/22/xfpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-080-charging.svg b/elementary-xfce-dark/panel/22/xfpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-080.svg b/elementary-xfce-dark/panel/22/xfpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-100-charging.svg b/elementary-xfce-dark/panel/22/xfpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-100.svg b/elementary-xfce-dark/panel/22/xfpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-charged.svg b/elementary-xfce-dark/panel/22/xfpm-ups-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/22/xfpm-ups-missing.svg b/elementary-xfce-dark/panel/22/xfpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce-dark/panel/22/xfpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ac-adapter.svg b/elementary-xfce-dark/panel/24/xfpm-ac-adapter.svg
deleted file mode 120000
index e1ebcd6c2..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ac-adapter.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-ac-adapter.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-000-charging.svg b/elementary-xfce-dark/panel/24/xfpm-primary-000-charging.svg
deleted file mode 120000
index aa6dd36b9..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-000.svg b/elementary-xfce-dark/panel/24/xfpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-020-charging.svg b/elementary-xfce-dark/panel/24/xfpm-primary-020-charging.svg
deleted file mode 120000
index 17e5c8a06..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-020.svg b/elementary-xfce-dark/panel/24/xfpm-primary-020.svg
deleted file mode 120000
index 85dbbfcb0..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-040-charging.svg b/elementary-xfce-dark/panel/24/xfpm-primary-040-charging.svg
deleted file mode 120000
index 70af98bb3..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-040.svg b/elementary-xfce-dark/panel/24/xfpm-primary-040.svg
deleted file mode 120000
index 3eafb6fad..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-040.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-060-charging.svg b/elementary-xfce-dark/panel/24/xfpm-primary-060-charging.svg
deleted file mode 120000
index 9eace6f21..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-060.svg b/elementary-xfce-dark/panel/24/xfpm-primary-060.svg
deleted file mode 120000
index 3b2d3aa1c..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-080-charging.svg b/elementary-xfce-dark/panel/24/xfpm-primary-080-charging.svg
deleted file mode 120000
index a7087d713..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-080.svg b/elementary-xfce-dark/panel/24/xfpm-primary-080.svg
deleted file mode 120000
index 1b9ff2e7d..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-080.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-100-charging.svg b/elementary-xfce-dark/panel/24/xfpm-primary-100-charging.svg
deleted file mode 120000
index 89884c066..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-100.svg b/elementary-xfce-dark/panel/24/xfpm-primary-100.svg
deleted file mode 120000
index 19652d770..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-charged.svg b/elementary-xfce-dark/panel/24/xfpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-primary-missing.svg b/elementary-xfce-dark/panel/24/xfpm-primary-missing.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-primary-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-000-charging.svg b/elementary-xfce-dark/panel/24/xfpm-ups-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-000.svg b/elementary-xfce-dark/panel/24/xfpm-ups-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-020-charging.svg b/elementary-xfce-dark/panel/24/xfpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-020.svg b/elementary-xfce-dark/panel/24/xfpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-040-charging.svg b/elementary-xfce-dark/panel/24/xfpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-040.svg b/elementary-xfce-dark/panel/24/xfpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-060-charging.svg b/elementary-xfce-dark/panel/24/xfpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-060.svg b/elementary-xfce-dark/panel/24/xfpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-080-charging.svg b/elementary-xfce-dark/panel/24/xfpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-080.svg b/elementary-xfce-dark/panel/24/xfpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-100-charging.svg b/elementary-xfce-dark/panel/24/xfpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-100.svg b/elementary-xfce-dark/panel/24/xfpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-charged.svg b/elementary-xfce-dark/panel/24/xfpm-ups-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/24/xfpm-ups-missing.svg b/elementary-xfce-dark/panel/24/xfpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce-dark/panel/24/xfpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/32/xfpm-brightness-lcd.svg b/elementary-xfce-dark/panel/32/xfpm-brightness-lcd.svg
deleted file mode 120000
index 07498629e..000000000
--- a/elementary-xfce-dark/panel/32/xfpm-brightness-lcd.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/32/xfpm-brightness-lcd.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-brightness-keyboard.svg b/elementary-xfce-dark/panel/48/xfpm-brightness-keyboard.svg
deleted file mode 120000
index 210a46adf..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-brightness-keyboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/xfpm-brightness-keyboard.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-brightness-lcd.svg b/elementary-xfce-dark/panel/48/xfpm-brightness-lcd.svg
deleted file mode 120000
index 3647b4285..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-brightness-lcd.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/xfpm-brightness-lcd.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-mouse-000.svg b/elementary-xfce-dark/panel/48/xfpm-mouse-000.svg
deleted file mode 120000
index 691f8ce4d..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-mouse-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-mouse-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-mouse-060.svg b/elementary-xfce-dark/panel/48/xfpm-mouse-060.svg
deleted file mode 120000
index 53011f16a..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-mouse-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-mouse-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-mouse-100.svg b/elementary-xfce-dark/panel/48/xfpm-mouse-100.svg
deleted file mode 120000
index e081e90d3..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-mouse-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-mouse-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-phone-000.svg b/elementary-xfce-dark/panel/48/xfpm-phone-000.svg
deleted file mode 120000
index 28804a5a2..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-phone-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-phone-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-phone-060.svg b/elementary-xfce-dark/panel/48/xfpm-phone-060.svg
deleted file mode 120000
index 5e6a7e742..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-phone-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-phone-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-phone-100.svg b/elementary-xfce-dark/panel/48/xfpm-phone-100.svg
deleted file mode 120000
index 680c64922..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-phone-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-phone-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-keyboard-000.svg b/elementary-xfce/panel/16/gpm-keyboard-000.svg
deleted file mode 120000
index c4af08695..000000000
--- a/elementary-xfce/panel/16/gpm-keyboard-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-keyboard-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-keyboard-000.svg b/elementary-xfce/panel/16/gpm-keyboard-000.svg
new file mode 100644
index 000000000..3af902366
--- /dev/null
+++ b/elementary-xfce/panel/16/gpm-keyboard-000.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1213 -81)"
+     id="g4">
+    <path
+       style="color:#000000;overflow:visible;fill:#c6262e;marker:none;fill-opacity:1"
+       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.554 2 12 2.446 12 3 L 12 10.501953 A 2.5 2.5 0 0 1 13 10.054688 L 13 3 C 13 1.892 12.108 1 11 1 L 2 1 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.99956 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844063 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071063 9.0570651 8.5664062 9.0644531 z "
+       transform="translate(1213,81)"
+       id="path6" />
+    <circle
+       cx="1227"
+       cy="94"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#c6262e;fill-opacity:1;marker:none"
+       id="ellipse8"
+       r="2" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/16/gpm-keyboard-020.svg b/elementary-xfce/panel/16/gpm-keyboard-020.svg
deleted file mode 120000
index 5c04e0e9a..000000000
--- a/elementary-xfce/panel/16/gpm-keyboard-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-keyboard-030.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-keyboard-020.svg b/elementary-xfce/panel/16/gpm-keyboard-020.svg
new file mode 100644
index 000000000..9e624682f
--- /dev/null
+++ b/elementary-xfce/panel/16/gpm-keyboard-020.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1213 -81)"
+     id="g4">
+    <path
+       style="color:#000000;overflow:visible;fill:#666666;marker:none;fill-opacity:1"
+       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.554 2 12 2.446 12 3 L 12 10.501953 A 2.5 2.5 0 0 1 13 10.054688 L 13 3 C 13 1.892 12.108 1 11 1 L 2 1 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.99956 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844063 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071063 9.0570651 8.5664062 9.0644531 z "
+       transform="translate(1213,81)"
+       id="path6" />
+    <circle
+       cx="1227"
+       cy="94"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse8"
+       r="2" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/16/gpm-keyboard-040.svg b/elementary-xfce/panel/16/gpm-keyboard-040.svg
index 5c04e0e9a..513754da6 120000
--- a/elementary-xfce/panel/16/gpm-keyboard-040.svg
+++ b/elementary-xfce/panel/16/gpm-keyboard-040.svg
@@ -1 +1 @@
-xfpm-keyboard-030.svg
\ No newline at end of file
+gpm-keyboard-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-keyboard-060.svg b/elementary-xfce/panel/16/gpm-keyboard-060.svg
deleted file mode 120000
index d92f041f5..000000000
--- a/elementary-xfce/panel/16/gpm-keyboard-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-keyboard-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-keyboard-060.svg b/elementary-xfce/panel/16/gpm-keyboard-060.svg
new file mode 100644
index 000000000..5c72e7a60
--- /dev/null
+++ b/elementary-xfce/panel/16/gpm-keyboard-060.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1213 -81)"
+     id="g4">
+    <path
+       id="path6"
+       transform="translate(1213,81)"
+       style="color:#000000;overflow:visible;fill:#666666;marker:none;fill-opacity:1"
+       d="M 2,1 C 0.892,1 0,1.892 0,3 v 10 c 0,1.108 0.892,2 2,2 h 9 c 0.441001,0 0.843886,-0.144774 1.173828,-0.384766 a 2.5,2.5 0 0 1 -1.123047,-1.625 C 11.033042,12.991162 11.017978,13 11,13 H 2 C 1.446,13 1,12.554 1,12 V 3 C 1,2.446 1.446,2 2,2 h 9 c 0.554,0 1,0.446 1,1 V 5.5019531 A 2.5,2.5 0 0 1 13,5.0546875 V 3 C 13,1.892 12.108,1 11,1 Z m 6.65625,4.9941406 c -0.79,0 -1.5472969,0.257 -2.2792969,0.75 L 6.75,7.59375 C 7.062,7.38375 7.36625,7.234 7.65625,7.125 c 0.298,-0.116 0.57,-0.15625 0.875,-0.15625 0.449,0 0.79225,0.10375 1.03125,0.34375 C 9.8025,7.5445 10,7.86125 10,8.28125 v 0.3066406 c -0.21,-0.08 -0.52025,-0.1435 -0.78125,-0.1875 -0.2577,-0.04608 -0.51955,-0.06734 -0.78125,-0.0625 -0.356,0 -0.67175,0.038 -0.96875,0.125 -0.29,0.087 -0.56425,0.215 -0.78125,0.375 -0.21,0.16 -0.35275,0.3455 -0.46875,0.5625 -0.116,0.218 -0.1875,0.5493594 -0.1875,0.8183594 0,0.254 0.06225,0.50075 0.15625,0.71875 0.101,0.217 0.208,0.4025 0.375,0.5625 0.174,0.16 0.393,0.28 0.625,0.375 0.239,0.087 0.50525,0.125 0.78125,0.125 0.428,0 0.8175,-0.076 1.1875,-0.25 0.377,-0.181 0.6835,-0.44825 0.9375,-0.78125 L 10.125,11.3125 c 0.022,0.166197 0.09875,0.320702 0.21875,0.4375 0.123,0.109 0.29925,0.1725 0.53125,0.1875 0.05444,0 0.124486,1.16e-4 0.191406,0 A 2.5,2.5 0 0 1 11.46875,11.046875 V 10.875 C 11.34475,10.868 11.165234,10.83925 11.115234,10.78125 11.042234,10.69354 11.0014,10.582869 11,10.46875 V 8.3378906 c 0,-0.747 -0.09625,-1.31975 -0.53125,-1.71875 -0.435,-0.399 -1.0295,-0.625 -1.8125,-0.625 z m -0.089844,3.0703125 c 0.2180003,0 0.6070313,0.04975 0.8320313,0.09375 C 9.6304379,9.2022031 9.797,9.26375 10,9.34375 v 0.75 c 0,0.145 -0.12925,0.3075 -0.28125,0.4375 C 9.29175,10.91125 8.77925,10.961 8.28125,11 7.95525,11 7.5478906,11.01713 7.3378906,10.828125 7.1278906,10.632125 7,10.408 7,10.125 7,9.82 7.2945,9.556 7.5625,9.375 7.8551,9.166329 8.207107,9.0570651 8.5664062,9.0644531 Z M 12,9.9453125 v 0.1503905 c 0.01678,-0.01252 0.03285,-0.02571 0.04883,-0.03906 4.11e-4,-0.01446 -8.32e-4,-0.02871 -0.002,-0.04297 -0.0056,-0.0071 -0.01813,-0.0064 -0.02148,-0.015625 -0.0035,-0.011187 -0.0096,-0.031039 -0.01563,-0.048828 -0.0062,-0.00347 -0.0026,9.84e-5 -0.0098,-0.00391 z m 0.04687,0.068359 c 0.0062,0.0077 0.01329,0.01385 0.02148,0.01953 -0.0017,-0.01821 -0.0029,-0.036454 -0.0039,-0.054687 -0.003,-0.0017 -0.01205,-0.00667 -0.01758,-0.00977 0.0012,0.014927 -0.0011,0.029979 0,0.044922 z m 0.142578,0.15625 c 0.0055,0.0074 0.0063,0.0084 0.01172,0.01563 0.0015,-0.0038 0.0023,-0.0079 0.0039,-0.01172 -0.0051,-0.0012 -0.01066,-0.0026 -0.01563,-0.0039 z" />
+    <path
+       id="ellipse8-1"
+       transform="translate(1213,81)"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       d="m 14.099609,6 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 z" />
+    <circle
+       r="2"
+       cx="1227"
+       cy="94"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse8-1-2" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/16/gpm-keyboard-080.svg b/elementary-xfce/panel/16/gpm-keyboard-080.svg
index d92f041f5..333fc3207 120000
--- a/elementary-xfce/panel/16/gpm-keyboard-080.svg
+++ b/elementary-xfce/panel/16/gpm-keyboard-080.svg
@@ -1 +1 @@
-xfpm-keyboard-060.svg
\ No newline at end of file
+gpm-keyboard-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-keyboard-100.svg b/elementary-xfce/panel/16/gpm-keyboard-100.svg
deleted file mode 120000
index cc1d449e2..000000000
--- a/elementary-xfce/panel/16/gpm-keyboard-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-keyboard-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-keyboard-100.svg b/elementary-xfce/panel/16/gpm-keyboard-100.svg
new file mode 100644
index 000000000..366393ed3
--- /dev/null
+++ b/elementary-xfce/panel/16/gpm-keyboard-100.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1213 -81)"
+     id="g4">
+    <path
+       id="path6"
+       transform="translate(1213,81)"
+       style="color:#000000;overflow:visible;fill:#666666;marker:none;fill-opacity:1"
+       d="M 2,1 C 0.892,1 0,1.892 0,3 v 10 c 0,1.108 0.892,2 2,2 h 9 c 0.441001,0 0.843886,-0.144774 1.173828,-0.384766 a 2.5,2.5 0 0 1 -1.123047,-1.625 C 11.033042,12.991162 11.017978,13 11,13 H 2 C 1.446,13 1,12.554 1,12 V 3 C 1,2.446 1.446,2 2,2 h 9 c 0.01761,0 0.03349,0.00482 0.05078,0.00586 A 2.5,2.5 0 0 1 11.458984,1.0585938 C 11.311247,1.0232117 11.15928,1 11,1 Z m 6.65625,4.9941406 c -0.79,0 -1.5472969,0.257 -2.2792969,0.75 L 6.75,7.59375 C 7.062,7.38375 7.36625,7.234 7.65625,7.125 c 0.298,-0.116 0.57,-0.15625 0.875,-0.15625 0.449,0 0.79225,0.10375 1.03125,0.34375 C 9.8025,7.5445 10,7.86125 10,8.28125 v 0.3066406 c -0.21,-0.08 -0.52025,-0.1435 -0.78125,-0.1875 -0.2577,-0.04608 -0.51955,-0.06734 -0.78125,-0.0625 -0.356,0 -0.67175,0.038 -0.96875,0.125 -0.29,0.087 -0.56425,0.215 -0.78125,0.375 -0.21,0.16 -0.35275,0.3455 -0.46875,0.5625 -0.116,0.218 -0.1875,0.5493594 -0.1875,0.8183594 0,0.254 0.06225,0.50075 0.15625,0.71875 0.101,0.217 0.208,0.4025 0.375,0.5625 0.174,0.16 0.393,0.28 0.625,0.375 0.239,0.087 0.50525,0.125 0.78125,0.125 0.428,0 0.8175,-0.076 1.1875,-0.25 0.377,-0.181 0.6835,-0.44825 0.9375,-0.78125 L 10.125,11.3125 c 0.022,0.166197 0.09875,0.320702 0.21875,0.4375 0.123,0.109 0.29925,0.1725 0.53125,0.1875 0.05444,0 0.124486,1.16e-4 0.191406,0 A 2.5,2.5 0 0 1 11.46875,11.046875 V 10.875 C 11.34475,10.868 11.165234,10.83925 11.115234,10.78125 11.042234,10.69354 11.0014,10.582869 11,10.46875 V 8.5 8.3378906 c 0,-0.747 -0.09625,-1.31975 -0.53125,-1.71875 -0.435,-0.399 -1.0295,-0.625 -1.8125,-0.625 z m -0.089844,3.0703125 c 0.2180003,0 0.6070313,0.04975 0.8320313,0.09375 C 9.6304375,9.2022031 9.797,9.26375 10,9.34375 v 0.75 c 0,0.145 -0.12925,0.3075 -0.28125,0.4375 C 9.29175,10.91125 8.77925,10.961 8.28125,11 7.95525,11 7.5478906,11.01713 7.3378906,10.828125 7.1278906,10.632125 7,10.408 7,10.125 7,9.82 7.2945,9.556 7.5625,9.375 7.8551,9.166329 8.2071068,9.0570651 8.5664062,9.0644531 Z M 12,10.496094 v 0.0059 A 2.5,2.5 0 0 1 12.003906,10.5 2.5,2.5 0 0 1 12,10.496094 Z" />
+    <circle
+       r="2"
+       cx="1227"
+       cy="84"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse8" />
+    <path
+       id="ellipse8-7"
+       transform="translate(1213,81)"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       d="m 14.099609,6.0507812 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,1.9999998 2,2 0 0 0 2,-1.9999998 2,2 0 0 0 -2,-2 z" />
+    <circle
+       r="2"
+       cx="1227"
+       cy="94"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse8-7-3" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/16/gpm-mouse-000.svg b/elementary-xfce/panel/16/gpm-mouse-000.svg
deleted file mode 120000
index 19cf5a11a..000000000
--- a/elementary-xfce/panel/16/gpm-mouse-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-mouse-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-mouse-000.svg b/elementary-xfce/panel/16/gpm-mouse-000.svg
new file mode 100644
index 000000000..9bd0ec5a2
--- /dev/null
+++ b/elementary-xfce/panel/16/gpm-mouse-000.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16.004"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1233 -81)"
+     id="g4">
+    <path
+       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
+       font-weight="400"
+       overflow="visible"
+       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#c6262e;fill-opacity:1"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="94.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#c6262e;fill-opacity:1;marker:none"
+       id="ellipse8" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/16/gpm-mouse-020.svg b/elementary-xfce/panel/16/gpm-mouse-020.svg
deleted file mode 120000
index fb30d2184..000000000
--- a/elementary-xfce/panel/16/gpm-mouse-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-mouse-030.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-mouse-020.svg b/elementary-xfce/panel/16/gpm-mouse-020.svg
new file mode 100644
index 000000000..c9c8d78fe
--- /dev/null
+++ b/elementary-xfce/panel/16/gpm-mouse-020.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16.004"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1233 -81)"
+     id="g4">
+    <path
+       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
+       font-weight="400"
+       overflow="visible"
+       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;fill-opacity:1"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="94.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse8" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/16/gpm-mouse-040.svg b/elementary-xfce/panel/16/gpm-mouse-040.svg
index fb30d2184..daf1600af 120000
--- a/elementary-xfce/panel/16/gpm-mouse-040.svg
+++ b/elementary-xfce/panel/16/gpm-mouse-040.svg
@@ -1 +1 @@
-xfpm-mouse-030.svg
\ No newline at end of file
+gpm-mouse-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-mouse-060.svg b/elementary-xfce/panel/16/gpm-mouse-060.svg
deleted file mode 120000
index 98a3a0df5..000000000
--- a/elementary-xfce/panel/16/gpm-mouse-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-mouse-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-mouse-060.svg b/elementary-xfce/panel/16/gpm-mouse-060.svg
new file mode 100644
index 000000000..bf69a43d8
--- /dev/null
+++ b/elementary-xfce/panel/16/gpm-mouse-060.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16.004"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1233 -81)"
+     id="g4">
+    <path
+       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
+       font-weight="400"
+       overflow="visible"
+       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;fill-opacity:1"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="94.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse8" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="89.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse10" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/16/gpm-mouse-080.svg b/elementary-xfce/panel/16/gpm-mouse-080.svg
index 98a3a0df5..7d3125fb5 120000
--- a/elementary-xfce/panel/16/gpm-mouse-080.svg
+++ b/elementary-xfce/panel/16/gpm-mouse-080.svg
@@ -1 +1 @@
-xfpm-mouse-060.svg
\ No newline at end of file
+gpm-mouse-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-mouse-100.svg b/elementary-xfce/panel/16/gpm-mouse-100.svg
deleted file mode 120000
index 9a9d3f1d3..000000000
--- a/elementary-xfce/panel/16/gpm-mouse-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-xfpm-mouse-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-mouse-100.svg b/elementary-xfce/panel/16/gpm-mouse-100.svg
new file mode 100644
index 000000000..4b17fd815
--- /dev/null
+++ b/elementary-xfce/panel/16/gpm-mouse-100.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   height="16.004"
+   width="16"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata12">
+    <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>
+  <defs
+     id="defs10" />
+  <g
+     transform="translate(-1233 -81)"
+     id="g4">
+    <path
+       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
+       font-weight="400"
+       overflow="visible"
+       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;fill-opacity:1"
+       id="path6" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="94.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse8" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="89.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse10" />
+    <circle
+       r="2"
+       cx="1246.8431"
+       cy="84.087013"
+       overflow="visible"
+       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
+       id="ellipse12" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/16/xfpm-keyboard-000.svg b/elementary-xfce/panel/16/xfpm-keyboard-000.svg
deleted file mode 100644
index 3af902366..000000000
--- a/elementary-xfce/panel/16/xfpm-keyboard-000.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1213 -81)"
-     id="g4">
-    <path
-       style="color:#000000;overflow:visible;fill:#c6262e;marker:none;fill-opacity:1"
-       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.554 2 12 2.446 12 3 L 12 10.501953 A 2.5 2.5 0 0 1 13 10.054688 L 13 3 C 13 1.892 12.108 1 11 1 L 2 1 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.99956 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844063 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071063 9.0570651 8.5664062 9.0644531 z "
-       transform="translate(1213,81)"
-       id="path6" />
-    <circle
-       cx="1227"
-       cy="94"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#c6262e;fill-opacity:1;marker:none"
-       id="ellipse8"
-       r="2" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/16/xfpm-keyboard-030.svg b/elementary-xfce/panel/16/xfpm-keyboard-030.svg
deleted file mode 100644
index 9e624682f..000000000
--- a/elementary-xfce/panel/16/xfpm-keyboard-030.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1213 -81)"
-     id="g4">
-    <path
-       style="color:#000000;overflow:visible;fill:#666666;marker:none;fill-opacity:1"
-       d="M 2 1 C 0.892 1 0 1.892 0 3 L 0 13 C 0 14.108 0.892 15 2 15 L 11 15 C 11.441001 15 11.843886 14.855226 12.173828 14.615234 A 2.5 2.5 0 0 1 11.050781 12.990234 C 11.033042 12.991162 11.017978 13 11 13 L 2 13 C 1.446 13 1 12.554 1 12 L 1 3 C 1 2.446 1.446 2 2 2 L 11 2 C 11.554 2 12 2.446 12 3 L 12 10.501953 A 2.5 2.5 0 0 1 13 10.054688 L 13 3 C 13 1.892 12.108 1 11 1 L 2 1 z M 8.65625 5.9941406 C 7.86625 5.9941406 7.1089531 6.2511406 6.3769531 6.7441406 L 6.75 7.59375 C 7.062 7.38375 7.36625 7.234 7.65625 7.125 C 7.95425 7.009 8.22625 6.96875 8.53125 6.96875 C 8.98025 6.96875 9.3235 7.0725 9.5625 7.3125 C 9.8025 7.5445 10 7.86125 10 8.28125 L 10 8.5878906 C 9.79 8.5078906 9.47975 8.4443906 9.21875 8.4003906 C 8.96105 8.3543106 8.6992 8.3330506 8.4375 8.3378906 C 8.0815 8.3378906 7.76575 8.3758906 7.46875 8.4628906 C 7.17875 8.5498906 6.9045 8.6778906 6.6875 8.8378906 C 6.4775 8.9978906 6.33475 9.1833906 6.21875 9.4003906 C 6.10275 9.6183906 6.03125 9.94975 6.03125 10.21875 C 6.03125 10.47275 6.0935 10.7195 6.1875 10.9375 C 6.2885 11.1545 6.3955 11.34 6.5625 11.5 C 6.7365 11.66 6.9555 11.78 7.1875 11.875 C 7.4265 11.962 7.69275 12 7.96875 12 C 8.39675 12 8.78625 11.924 9.15625 11.75 C 9.53325 11.569 9.83975 11.30175 10.09375 10.96875 L 10.125 11.3125 C 10.147 11.478697 10.22375 11.633202 10.34375 11.75 C 10.46675 11.859 10.643 11.9225 10.875 11.9375 C 10.929444 11.9375 10.99956 11.937616 11.066406 11.9375 A 2.5 2.5 0 0 1 11.46875 11.046875 L 11.46875 10.875 C 11.34475 10.868 11.165234 10.83925 11.115234 10.78125 C 11.042234 10.69354 11.0014 10.582869 11 10.46875 L 11 8.3378906 C 11 7.5908906 10.90375 7.0181406 10.46875 6.6191406 C 10.03375 6.2201406 9.43925 5.9941406 8.65625 5.9941406 z M 8.5664062 9.0644531 C 8.7844063 9.0644531 9.1734375 9.1142031 9.3984375 9.1582031 C 9.6304375 9.2022031 9.797 9.26375 10 9.34375 L 10 10.09375 C 10 10.23875 9.87075 10.40125 9.71875 10.53125 C 9.29175 10.91125 8.77925 10.961 8.28125 11 C 7.95525 11 7.5478906 11.017125 7.3378906 10.828125 C 7.1278906 10.632125 7 10.408 7 10.125 C 7 9.82 7.2945 9.556 7.5625 9.375 C 7.8551 9.166329 8.2071063 9.0570651 8.5664062 9.0644531 z "
-       transform="translate(1213,81)"
-       id="path6" />
-    <circle
-       cx="1227"
-       cy="94"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse8"
-       r="2" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/16/xfpm-keyboard-060.svg b/elementary-xfce/panel/16/xfpm-keyboard-060.svg
deleted file mode 100644
index 5c72e7a60..000000000
--- a/elementary-xfce/panel/16/xfpm-keyboard-060.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1213 -81)"
-     id="g4">
-    <path
-       id="path6"
-       transform="translate(1213,81)"
-       style="color:#000000;overflow:visible;fill:#666666;marker:none;fill-opacity:1"
-       d="M 2,1 C 0.892,1 0,1.892 0,3 v 10 c 0,1.108 0.892,2 2,2 h 9 c 0.441001,0 0.843886,-0.144774 1.173828,-0.384766 a 2.5,2.5 0 0 1 -1.123047,-1.625 C 11.033042,12.991162 11.017978,13 11,13 H 2 C 1.446,13 1,12.554 1,12 V 3 C 1,2.446 1.446,2 2,2 h 9 c 0.554,0 1,0.446 1,1 V 5.5019531 A 2.5,2.5 0 0 1 13,5.0546875 V 3 C 13,1.892 12.108,1 11,1 Z m 6.65625,4.9941406 c -0.79,0 -1.5472969,0.257 -2.2792969,0.75 L 6.75,7.59375 C 7.062,7.38375 7.36625,7.234 7.65625,7.125 c 0.298,-0.116 0.57,-0.15625 0.875,-0.15625 0.449,0 0.79225,0.10375 1.03125,0.34375 C 9.8025,7.5445 10,7.86125 10,8.28125 v 0.3066406 c -0.21,-0.08 -0.52025,-0.1435 -0.78125,-0.1875 -0.2577,-0.04608 -0.51955,-0.06734 -0.78125,-0.0625 -0.356,0 -0.67175,0.038 -0.96875,0.125 -0.29,0.087 -0.56425,0.215 -0.78125,0.375 -0.21,0.16 -0.35275,0.3455 -0.46875,0.5625 -0.116,0.218 -0.1875,0.5493594 -0.1875,0.8183594 0,0.254 0.06225,0.50075 0.15625,0.71875 0.101,0.217 0.208,0.4025 0.375,0.5625 0.174,0.16 0.393,0.28 0.625,0.375 0.239,0.087 0.50525,0.125 0.78125,0.125 0.428,0 0.8175,-0.076 1.1875,-0.25 0.377,-0.181 0.6835,-0.44825 0.9375,-0.78125 L 10.125,11.3125 c 0.022,0.166197 0.09875,0.320702 0.21875,0.4375 0.123,0.109 0.29925,0.1725 0.53125,0.1875 0.05444,0 0.124486,1.16e-4 0.191406,0 A 2.5,2.5 0 0 1 11.46875,11.046875 V 10.875 C 11.34475,10.868 11.165234,10.83925 11.115234,10.78125 11.042234,10.69354 11.0014,10.582869 11,10.46875 V 8.3378906 c 0,-0.747 -0.09625,-1.31975 -0.53125,-1.71875 -0.435,-0.399 -1.0295,-0.625 -1.8125,-0.625 z m -0.089844,3.0703125 c 0.2180003,0 0.6070313,0.04975 0.8320313,0.09375 C 9.6304379,9.2022031 9.797,9.26375 10,9.34375 v 0.75 c 0,0.145 -0.12925,0.3075 -0.28125,0.4375 C 9.29175,10.91125 8.77925,10.961 8.28125,11 7.95525,11 7.5478906,11.01713 7.3378906,10.828125 7.1278906,10.632125 7,10.408 7,10.125 7,9.82 7.2945,9.556 7.5625,9.375 7.8551,9.166329 8.207107,9.0570651 8.5664062,9.0644531 Z M 12,9.9453125 v 0.1503905 c 0.01678,-0.01252 0.03285,-0.02571 0.04883,-0.03906 4.11e-4,-0.01446 -8.32e-4,-0.02871 -0.002,-0.04297 -0.0056,-0.0071 -0.01813,-0.0064 -0.02148,-0.015625 -0.0035,-0.011187 -0.0096,-0.031039 -0.01563,-0.048828 -0.0062,-0.00347 -0.0026,9.84e-5 -0.0098,-0.00391 z m 0.04687,0.068359 c 0.0062,0.0077 0.01329,0.01385 0.02148,0.01953 -0.0017,-0.01821 -0.0029,-0.036454 -0.0039,-0.054687 -0.003,-0.0017 -0.01205,-0.00667 -0.01758,-0.00977 0.0012,0.014927 -0.0011,0.029979 0,0.044922 z m 0.142578,0.15625 c 0.0055,0.0074 0.0063,0.0084 0.01172,0.01563 0.0015,-0.0038 0.0023,-0.0079 0.0039,-0.01172 -0.0051,-0.0012 -0.01066,-0.0026 -0.01563,-0.0039 z" />
-    <path
-       id="ellipse8-1"
-       transform="translate(1213,81)"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       d="m 14.099609,6 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 z" />
-    <circle
-       r="2"
-       cx="1227"
-       cy="94"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse8-1-2" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/16/xfpm-keyboard-100.svg b/elementary-xfce/panel/16/xfpm-keyboard-100.svg
deleted file mode 100644
index 366393ed3..000000000
--- a/elementary-xfce/panel/16/xfpm-keyboard-100.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1213 -81)"
-     id="g4">
-    <path
-       id="path6"
-       transform="translate(1213,81)"
-       style="color:#000000;overflow:visible;fill:#666666;marker:none;fill-opacity:1"
-       d="M 2,1 C 0.892,1 0,1.892 0,3 v 10 c 0,1.108 0.892,2 2,2 h 9 c 0.441001,0 0.843886,-0.144774 1.173828,-0.384766 a 2.5,2.5 0 0 1 -1.123047,-1.625 C 11.033042,12.991162 11.017978,13 11,13 H 2 C 1.446,13 1,12.554 1,12 V 3 C 1,2.446 1.446,2 2,2 h 9 c 0.01761,0 0.03349,0.00482 0.05078,0.00586 A 2.5,2.5 0 0 1 11.458984,1.0585938 C 11.311247,1.0232117 11.15928,1 11,1 Z m 6.65625,4.9941406 c -0.79,0 -1.5472969,0.257 -2.2792969,0.75 L 6.75,7.59375 C 7.062,7.38375 7.36625,7.234 7.65625,7.125 c 0.298,-0.116 0.57,-0.15625 0.875,-0.15625 0.449,0 0.79225,0.10375 1.03125,0.34375 C 9.8025,7.5445 10,7.86125 10,8.28125 v 0.3066406 c -0.21,-0.08 -0.52025,-0.1435 -0.78125,-0.1875 -0.2577,-0.04608 -0.51955,-0.06734 -0.78125,-0.0625 -0.356,0 -0.67175,0.038 -0.96875,0.125 -0.29,0.087 -0.56425,0.215 -0.78125,0.375 -0.21,0.16 -0.35275,0.3455 -0.46875,0.5625 -0.116,0.218 -0.1875,0.5493594 -0.1875,0.8183594 0,0.254 0.06225,0.50075 0.15625,0.71875 0.101,0.217 0.208,0.4025 0.375,0.5625 0.174,0.16 0.393,0.28 0.625,0.375 0.239,0.087 0.50525,0.125 0.78125,0.125 0.428,0 0.8175,-0.076 1.1875,-0.25 0.377,-0.181 0.6835,-0.44825 0.9375,-0.78125 L 10.125,11.3125 c 0.022,0.166197 0.09875,0.320702 0.21875,0.4375 0.123,0.109 0.29925,0.1725 0.53125,0.1875 0.05444,0 0.124486,1.16e-4 0.191406,0 A 2.5,2.5 0 0 1 11.46875,11.046875 V 10.875 C 11.34475,10.868 11.165234,10.83925 11.115234,10.78125 11.042234,10.69354 11.0014,10.582869 11,10.46875 V 8.5 8.3378906 c 0,-0.747 -0.09625,-1.31975 -0.53125,-1.71875 -0.435,-0.399 -1.0295,-0.625 -1.8125,-0.625 z m -0.089844,3.0703125 c 0.2180003,0 0.6070313,0.04975 0.8320313,0.09375 C 9.6304375,9.2022031 9.797,9.26375 10,9.34375 v 0.75 c 0,0.145 -0.12925,0.3075 -0.28125,0.4375 C 9.29175,10.91125 8.77925,10.961 8.28125,11 7.95525,11 7.5478906,11.01713 7.3378906,10.828125 7.1278906,10.632125 7,10.408 7,10.125 7,9.82 7.2945,9.556 7.5625,9.375 7.8551,9.166329 8.2071068,9.0570651 8.5664062,9.0644531 Z M 12,10.496094 v 0.0059 A 2.5,2.5 0 0 1 12.003906,10.5 2.5,2.5 0 0 1 12,10.496094 Z" />
-    <circle
-       r="2"
-       cx="1227"
-       cy="84"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse8" />
-    <path
-       id="ellipse8-7"
-       transform="translate(1213,81)"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       d="m 14.099609,6.0507812 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,1.9999998 2,2 0 0 0 2,-1.9999998 2,2 0 0 0 -2,-2 z" />
-    <circle
-       r="2"
-       cx="1227"
-       cy="94"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse8-7-3" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/16/xfpm-mouse-000.svg b/elementary-xfce/panel/16/xfpm-mouse-000.svg
deleted file mode 100644
index 9bd0ec5a2..000000000
--- a/elementary-xfce/panel/16/xfpm-mouse-000.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16.004"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1233 -81)"
-     id="g4">
-    <path
-       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
-       font-weight="400"
-       overflow="visible"
-       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#c6262e;fill-opacity:1"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="94.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#c6262e;fill-opacity:1;marker:none"
-       id="ellipse8" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/16/xfpm-mouse-030.svg b/elementary-xfce/panel/16/xfpm-mouse-030.svg
deleted file mode 100644
index c9c8d78fe..000000000
--- a/elementary-xfce/panel/16/xfpm-mouse-030.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16.004"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1233 -81)"
-     id="g4">
-    <path
-       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
-       font-weight="400"
-       overflow="visible"
-       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;fill-opacity:1"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="94.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse8" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/16/xfpm-mouse-060.svg b/elementary-xfce/panel/16/xfpm-mouse-060.svg
deleted file mode 100644
index bf69a43d8..000000000
--- a/elementary-xfce/panel/16/xfpm-mouse-060.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16.004"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1233 -81)"
-     id="g4">
-    <path
-       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
-       font-weight="400"
-       overflow="visible"
-       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;fill-opacity:1"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="94.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse8" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="89.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse10" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/16/xfpm-mouse-100.svg b/elementary-xfce/panel/16/xfpm-mouse-100.svg
deleted file mode 100644
index 4b17fd815..000000000
--- a/elementary-xfce/panel/16/xfpm-mouse-100.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   height="16.004"
-   width="16"
-   id="svg2"
-   version="1.1">
-  <metadata
-     id="metadata12">
-    <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>
-  <defs
-     id="defs10" />
-  <g
-     transform="translate(-1233 -81)"
-     id="g4">
-    <path
-       d="m 1237.5,82.004 a 4.501,4.501 0 0 0 -4.5,4.5 v 6 c 0,2.484 2.016,4.5 4.5,4.5 h 2 c 2.484,0 4.5,-2.016 4.5,-4.5 v -6 c 0,-2.484 -2.016,-4.5 -4.5,-4.5 z m 0,1 h 0.5 v 4 h -4 v -0.5 c 0,-1.948 1.553,-3.5 3.5,-3.5 z m 1.5,0 h 0.5 c 1.948,0 3.5,1.552 3.5,3.5 v 0.5 h -4 z m -5,5 h 9 v 4.5 c 0,1.948 -1.552,3.5 -3.5,3.5 h -2 a 3.481,3.481 0 0 1 -3.5,-3.5 z"
-       font-weight="400"
-       overflow="visible"
-       style="color:#000000;font-weight:400;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;overflow:visible;isolation:auto;mix-blend-mode:normal;fill:#666666;fill-opacity:1"
-       id="path6" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="94.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse8" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="89.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse10" />
-    <circle
-       r="2"
-       cx="1246.8431"
-       cy="84.087013"
-       overflow="visible"
-       style="color:#000000;overflow:visible;fill:#666666;fill-opacity:1;marker:none"
-       id="ellipse12" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/22/xfpm-brightness-lcd.svg b/elementary-xfce/panel/22/xfpm-brightness-lcd.svg
deleted file mode 100644
index 1ab13020a..000000000
--- a/elementary-xfce/panel/22/xfpm-brightness-lcd.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   id="svg7384"
-   height="22"
-   width="22"
-   version="1.1">
-  <defs
-     id="defs21">
-    <linearGradient
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient3834"
-       x1="15"
-       y1="0.5593192"
-       x2="15"
-       y2="22"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3589-9-2-2" />
-      <stop
-         offset="1"
-         style="stop-color:#363636;stop-opacity:1"
-         id="stop3591-7-4-73" />
-    </linearGradient>
-  </defs>
-  <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>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <g
-     style="opacity:0.59999999999999998;fill:#ffffff;fill-opacity:1"
-     id="g3853"
-     transform="translate(0,1.000006)">
-    <path
-       d="M 10.981825,5.9999997 C 8.2405524,5.9999997 6,8.240552 6,10.981823 6,13.723095 8.2405524,16 10.981825,16 13.723097,16 16,13.723095 16,10.981823 16,8.240552 13.723096,5.9999997 10.981825,5.9999997 z m 0,2.5453764 c 1.376947,0 2.472673,1.0593871 2.472673,2.4363209 0,1.376935 -1.095752,2.472674 -2.472673,2.472674 -1.3769225,0 -2.4363222,-1.095751 -2.4363222,-2.472674 0,-1.3769212 1.059387,-2.4363209 2.4363222,-2.4363209 z M 5.5565622,7.1069996 3.7829935,5.3334309 C 3.4907977,5.0412351 3.4329597,4.6286063 3.6533119,4.4082541 L 4.2720303,3.7895357 C 4.4923825,3.5691836 4.9050113,3.6270216 5.197207,3.9192173 L 6.9707757,5.692786 C 7.2629716,5.9849818 7.3208096,6.3976107 7.1004574,6.6179628 L 6.481739,7.2366813 C 6.2613868,7.4570334 5.848758,7.3991954 5.5565622,7.1069996 z M 16.679586,18.202399 14.921704,16.444516 c -0.296541,-0.296541 -0.357877,-0.712668 -0.137525,-0.93302 l 0.618718,-0.618719 c 0.220352,-0.220352 0.63648,-0.159015 0.93302,0.137526 l 1.757883,1.757882 c 0.296541,0.296541 0.357876,0.712667 0.137524,0.93302 l -0.618718,0.618718 c -0.220352,0.220352 -0.636479,0.159016 -0.93302,-0.137524 z M 10,4.2541025 10,1.7458975 C 10,1.3326703 10.250875,1 10.5625,1 l 0.875,0 C 11.749125,1 12,1.3326703 12,1.7458975 l 0,2.508205 C 12,4.6673297 11.749125,5 11.4375,5 l -0.875,0 C 10.250875,5 10,4.6673297 10,4.2541025 z m 0,15.9889025 0,-2.486021 c 0,-0.419372 0.250875,-0.75699 0.5625,-0.75699 l 0.875,0 c 0.311625,0 0.5625,0.337618 0.5625,0.75699 l 0,2.486021 c 0,0.419372 -0.250875,0.756989 -0.5625,0.756989 l -0.875,0 C 10.250875,20.999994 10,20.662377 10,20.243005 z M 15.007739,5.4461956 16.781308,3.6726268 c 0.292196,-0.2921957 0.704825,-0.3500339 0.925177,-0.1296817 l 0.618718,0.6187184 c 0.220352,0.2203522 0.162514,0.6329811 -0.129682,0.9251769 L 16.421953,6.8604092 C 16.129757,7.1526049 15.717128,7.2104429 15.496776,6.9900908 L 14.878058,6.3713723 C 14.657705,6.1510202 14.715543,5.7383914 15.007739,5.4461956 z M 3.6552399,17.041524 5.4131221,15.283642 c 0.2965409,-0.296541 0.7126678,-0.357877 0.93302,-0.137525 l 0.6187184,0.618718 c 0.2203522,0.220352 0.1590161,0.636479 -0.1375248,0.93302 l -1.7578823,1.757882 c -0.2965409,0.296541 -0.712668,0.357878 -0.9330202,0.137525 L 3.5177148,17.974544 C 3.2973627,17.754192 3.3586989,17.338065 3.6552399,17.041524 z M 17.745898,10 20.254102,10 C 20.66733,10 21,10.250875 21,10.5625 l 0,0.875 C 21,11.749125 20.66733,12 20.254102,12 l -2.508204,0 C 17.33267,12 17,11.749125 17,11.4375 l 0,-0.875 C 17,10.250875 17.33267,10 17.745898,10 z m -15.9889037,0 2.4860209,0 c 0.4193722,0 0.7569896,0.250875 0.7569896,0.5625 l 0,0.875 C 5.0000048,11.749125 4.6623874,12 4.2430152,12 L 1.7569943,12 C 1.3376221,12 1.0000048,11.749125 1.0000048,11.4375 l 0,-0.875 C 1.0000048,10.250875 1.3376221,10 1.7569943,10 z"
-       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#ffffff;fill-opacity:1"
-       id="path3855" />
-  </g>
-  <g
-     id="g3049"
-     style="fill-opacity:1;fill:url(#linearGradient3834);opacity:0.7">
-    <path
-       id="path32729"
-       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:url(#linearGradient3834);fill-opacity:1"
-       d="M 10.981825,5.9999997 C 8.2405524,5.9999997 6,8.240552 6,10.981823 6,13.723095 8.2405524,16 10.981825,16 13.723097,16 16,13.723095 16,10.981823 16,8.240552 13.723096,5.9999997 10.981825,5.9999997 z m 0,2.5453764 c 1.376947,0 2.472673,1.0593871 2.472673,2.4363209 0,1.376935 -1.095752,2.472674 -2.472673,2.472674 -1.3769225,0 -2.4363222,-1.095751 -2.4363222,-2.472674 0,-1.3769212 1.059387,-2.4363209 2.4363222,-2.4363209 z M 5.5565622,7.1069996 3.7829935,5.3334309 C 3.4907977,5.0412351 3.4329597,4.6286063 3.6533119,4.4082541 L 4.2720303,3.7895357 C 4.4923825,3.5691836 4.9050113,3.6270216 5.197207,3.9192173 L 6.9707757,5.692786 C 7.2629716,5.9849818 7.3208096,6.3976107 7.1004574,6.6179628 L 6.481739,7.2366813 C 6.2613868,7.4570334 5.848758,7.3991954 5.5565622,7.1069996 z M 16.679586,18.202399 14.921704,16.444516 c -0.296541,-0.296541 -0.357877,-0.712668 -0.137525,-0.93302 l 0.618718,-0.618719 c 0.220352,-0.220352 0.63648,-0.159015 0.93302,0.137526 l 1.757883,1.757882 c 0.296541,0.296541 0.357876,0.712667 0.137524,0.93302 l -0.618718,0.618718 c -0.220352,0.220352 -0.636479,0.159016 -0.93302,-0.137524 z M 10,4.2541025 10,1.7458975 C 10,1.3326703 10.250875,1 10.5625,1 l 0.875,0 C 11.749125,1 12,1.3326703 12,1.7458975 l 0,2.508205 C 12,4.6673297 11.749125,5 11.4375,5 l -0.875,0 C 10.250875,5 10,4.6673297 10,4.2541025 z m 0,15.9889025 0,-2.486021 c 0,-0.419372 0.250875,-0.75699 0.5625,-0.75699 l 0.875,0 c 0.311625,0 0.5625,0.337618 0.5625,0.75699 l 0,2.486021 c 0,0.419372 -0.250875,0.756989 -0.5625,0.756989 l -0.875,0 C 10.250875,20.999994 10,20.662377 10,20.243005 z M 15.007739,5.4461956 16.781308,3.6726268 c 0.292196,-0.2921957 0.704825,-0.3500339 0.925177,-0.1296817 l 0.618718,0.6187184 c 0.220352,0.2203522 0.162514,0.6329811 -0.129682,0.9251769 L 16.421953,6.8604092 C 16.129757,7.1526049 15.717128,7.2104429 15.496776,6.9900908 L 14.878058,6.3713723 C 14.657705,6.1510202 14.715543,5.7383914 15.007739,5.4461956 z M 3.6552399,17.041524 5.4131221,15.283642 c 0.2965409,-0.296541 0.7126678,-0.357877 0.93302,-0.137525 l 0.6187184,0.618718 c 0.2203522,0.220352 0.1590161,0.636479 -0.1375248,0.93302 l -1.7578823,1.757882 c -0.2965409,0.296541 -0.712668,0.357878 -0.9330202,0.137525 L 3.5177148,17.974544 C 3.2973627,17.754192 3.3586989,17.338065 3.6552399,17.041524 z M 17.745898,10 20.254102,10 C 20.66733,10 21,10.250875 21,10.5625 l 0,0.875 C 21,11.749125 20.66733,12 20.254102,12 l -2.508204,0 C 17.33267,12 17,11.749125 17,11.4375 l 0,-0.875 C 17,10.250875 17.33267,10 17.745898,10 z m -15.9889037,0 2.4860209,0 c 0.4193722,0 0.7569896,0.250875 0.7569896,0.5625 l 0,0.875 C 5.0000048,11.749125 4.6623874,12 4.2430152,12 L 1.7569943,12 C 1.3376221,12 1.0000048,11.749125 1.0000048,11.4375 l 0,-0.875 C 1.0000048,10.250875 1.3376221,10 1.7569943,10 z" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/22/xfpm-keyboard-000.svg b/elementary-xfce/panel/22/xfpm-keyboard-000.svg
deleted file mode 120000
index 70e678879..000000000
--- a/elementary-xfce/panel/22/xfpm-keyboard-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-keyboard-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-keyboard-030.svg b/elementary-xfce/panel/22/xfpm-keyboard-030.svg
deleted file mode 100644
index 10591a7e9..000000000
--- a/elementary-xfce/panel/22/xfpm-keyboard-030.svg
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg3204">
-  <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" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3206">
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient2395"
-       gradientUnits="userSpaceOnUse"
-       x1="7.2891564"
-       y1="5"
-       x2="7.2891564"
-       y2="20.011145"
-       gradientTransform="translate(-1,-1)" />
-    <linearGradient
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient2399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-24.710843,-1.9586168)"
-       x1="41.73494"
-       y1="3.9481401"
-       x2="41.73494"
-       y2="20.989416" />
-    <linearGradient
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient2402"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.19825709,-33.509578,10.848909)"
-       x1="121.69988"
-       y1="10.850004"
-       x2="121.69988"
-       y2="31.026016" />
-  </defs>
-  <rect
-     style="opacity:0.3;fill:none;stroke:#000000;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"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="13.25"
-     x="-17.75"
-     ry="0.24999999"
-     rx="0.25"
-     height="5.4999995"
-     width="12.5" />
-  <rect
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3296"
-     y="14"
-     x="14"
-     ry="0"
-     rx="0"
-     height="4"
-     width="4" />
-  <path
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;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="path3214"
-     d="m 12.5,18.5 0,-12 c 0,-0.554 0.446,-1 1,-1 l 5,0 c 0.554,0 1,0.446 1,1 l 0,12 c 0,0.554 -0.446,1 -1,1 l -5,0 c -0.554,0 -1,-0.446 -1,-1 z M 14.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" />
-  <rect
-     style="opacity:0.7;fill:url(#linearGradient2402);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3728"
-     y="13"
-     x="14"
-     ry="0"
-     rx="0"
-     height="4"
-     width="4" />
-  <path
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2399);stroke-width:1;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="rect2442"
-     d="m 12.5,17.5 0,-12 c 0,-0.554 0.446,-1 1,-1 l 5,0 c 0.554,0 1,0.446 1,1 l 0,12 c 0,0.554 -0.446,1 -1,1 l -5,0 c -0.554,0 -1,-0.446 -1,-1 z M 14.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" />
-  <path
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path2424"
-     d="M 3,5 C 2.446,5 2,5.446 2,6 l 0,13 c 0,0.554 0.446,1 1,1 l 6,0 c 0.554,0 1,-0.446 1,-1 L 10,6 C 10,5.446 9.554,5 9,5 L 3,5 z M 3,8 4,8 4,9 3,9 3,8 z M 5,8 6,8 6,9 5,9 5,8 z m 3,1 1,0 0,7 -1,0 0,-7 z m -5,1 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z m -2,2 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z m -2,2 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z m -2,2 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z" />
-  <path
-     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.69999993;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path2408"
-     d="M 3,4 C 2.446,4 2,4.446 2,5 l 0,13 c 0,0.554 0.446,1 1,1 l 6,0 c 0.554,0 1,-0.446 1,-1 L 10,5 C 10,4.446 9.554,4 9,4 L 3,4 z M 3,7 4,7 4,8 3,8 3,7 z M 5,7 6,7 6,8 5,8 5,7 z M 8,8 9,8 9,15 8,15 8,8 z M 3,9 4,9 4,10 3,10 3,9 z m 2,0 1,0 0,1 -1,0 0,-1 z m -2,2 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z m -2,2 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z m -2,2 1,0 0,1 -1,0 0,-1 z m 2,0 1,0 0,1 -1,0 0,-1 z" />
-</svg>
diff --git a/elementary-xfce/panel/22/xfpm-keyboard-060.svg b/elementary-xfce/panel/22/xfpm-keyboard-060.svg
deleted file mode 120000
index 333fc3207..000000000
--- a/elementary-xfce/panel/22/xfpm-keyboard-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-keyboard-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-keyboard-100.svg b/elementary-xfce/panel/22/xfpm-keyboard-100.svg
deleted file mode 120000
index 6193d8ed9..000000000
--- a/elementary-xfce/panel/22/xfpm-keyboard-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-keyboard-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-mouse-000.svg b/elementary-xfce/panel/22/xfpm-mouse-000.svg
deleted file mode 120000
index 241917e7e..000000000
--- a/elementary-xfce/panel/22/xfpm-mouse-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-mouse-030.svg b/elementary-xfce/panel/22/xfpm-mouse-030.svg
deleted file mode 100644
index efce23dc5..000000000
--- a/elementary-xfce/panel/22/xfpm-mouse-030.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="15"
-   height="22"
-   id="svg3804">
-  <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" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3806">
-    <linearGradient
-       x1="165.47679"
-       y1="11.019586"
-       x2="165.47679"
-       y2="33.049465"
-       id="linearGradient3208"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4100229,0,0,0.5447147,-61.849273,-1.0025304)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="14"
-       y1="4"
-       x2="14"
-       y2="20"
-       id="linearGradient3204"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-6,-1)" />
-  </defs>
-  <g
-     id="layer1"
-     transform="translate(0.99999997,0)">
-    <path
-       d="m 3,14 0,2 c 0,1.108 1.338,2 3,2 l 1,0 c 1.662,0 3,-0.892 3,-2 l 0,-2 z"
-       id="path3291"
-       style="opacity:0.6;fill:#ffffff;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 2.25,15.450001 C 2.252844,12.443791 2.2443067,9.437377 2.254278,6.4312954 2.3659022,5.2690397 3.5191399,4.5697645 4.566642,4.3530654 5.038101,4.263253 5.75,4.245207 5.75,4.245207 c 0,0 0,3.254793 0,3.254793 0,0 0.058301,0.75 0.798532,0.75 C 7.271982,8.25 7.25,7.5 7.25,7.5 c 0,0 0,-3.2452164 0,-3.2452164 1.562167,-0.078009 2.75,0.5175975 3.35212,1.6098018 0.244364,0.6091286 0.115217,1.2771243 0.14788,1.9170201 -0.0028,2.5956745 0.0057,5.1915535 -0.0043,7.7870995 -0.111624,1.162256 -1.264862,1.86153 -2.312364,2.07823 C 7.506212,17.823555 6.557192,17.723572 5.619145,17.75 4.387631,17.764194 2.9779253,17.310668 2.3978805,16.135415 2.3019013,15.920455 2.2495712,15.685646 2.25,15.450001 z"
-       id="rect3236"
-       style="opacity:0.3;fill:none;stroke:#000000;stroke-width:0.49999994;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 5.5,4.499999 2,0 c 2.216,0 4,1.338 4,3 L 11.5,16.5 c 0,1.662 -1.784,3 -4,3 l -2,0 c -2.2160001,0 -4,-1.338 -4,-3 l 0,-9.000001 c 0,-1.662 1.7839999,-3 4,-3 z m 1.041885,1e-6 0,4"
-       id="path3212"
-       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:0.99999994;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 3,13 0,2 c 0,1.108 1.338,2 3,2 l 1,0 c 1.662,0 3,-0.892 3,-2 l 0,-2 z"
-       id="rect3728"
-       style="opacity:0.7;fill:url(#linearGradient3208);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 5.5,3.499999 2,0 c 2.216,0 4,1.338 4,3 L 11.5,15.5 c 0,1.662 -1.784,3 -4,3 l -2,0 c -2.2160001,0 -4,-1.338 -4,-3 l 0,-9.000001 c 0,-1.662 1.7839999,-3 4,-3 z m 1,1e-6 0,4"
-       id="path3231"
-       style="opacity:0.7;fill:none;stroke:url(#linearGradient3204);stroke-width:0.99999994;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>
-</svg>
diff --git a/elementary-xfce/panel/22/xfpm-mouse-060.svg b/elementary-xfce/panel/22/xfpm-mouse-060.svg
deleted file mode 120000
index 7d3125fb5..000000000
--- a/elementary-xfce/panel/22/xfpm-mouse-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-mouse-100.svg b/elementary-xfce/panel/22/xfpm-mouse-100.svg
deleted file mode 120000
index 544289bd7..000000000
--- a/elementary-xfce/panel/22/xfpm-mouse-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-phone-000.svg b/elementary-xfce/panel/22/xfpm-phone-000.svg
deleted file mode 120000
index 56bf8773f..000000000
--- a/elementary-xfce/panel/22/xfpm-phone-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-phone-030.svg b/elementary-xfce/panel/22/xfpm-phone-030.svg
deleted file mode 100644
index 4bbb71e05..000000000
--- a/elementary-xfce/panel/22/xfpm-phone-030.svg
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg3218">
-  <metadata
-     id="metadata20">
-    <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>
-  <defs
-     id="defs3220">
-    <linearGradient
-       id="linearGradient3587-6-5-3">
-      <stop
-         id="stop3589-9-2-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient2396"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-33.509578,0.0845009)"
-       x1="95.494781"
-       y1="7.181673"
-       x2="95.494781"
-       y2="34.699265" />
-    <linearGradient
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient2401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-24.710843,-1.9586168)"
-       x1="41.73494"
-       y1="3.9481401"
-       x2="41.73494"
-       y2="20.989416" />
-    <linearGradient
-       xlink:href="#linearGradient3587-6-5-3"
-       id="linearGradient2404"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.19825709,-33.509578,10.848909)"
-       x1="121.69988"
-       y1="10.850004"
-       x2="121.69988"
-       y2="31.026016" />
-  </defs>
-  <rect
-     style="opacity:0.3;fill:none;stroke:#000000;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"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="13.25"
-     x="-17.75"
-     ry="0.24999999"
-     rx="0.25"
-     height="5.4999995"
-     width="12.5" />
-  <rect
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3296"
-     y="14"
-     x="14"
-     ry="0"
-     rx="0"
-     height="4"
-     width="4" />
-  <path
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;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="path3214"
-     d="m 12.5,18.5 0,-12 c 0,-0.554 0.446,-1 1,-1 l 5,0 c 0.554,0 1,0.446 1,1 l 0,12 c 0,0.554 -0.446,1 -1,1 l -5,0 c -0.554,0 -1,-0.446 -1,-1 z M 14.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" />
-  <rect
-     style="opacity:0.7;fill:url(#linearGradient2404);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3728"
-     y="13"
-     x="14"
-     ry="0"
-     rx="0"
-     height="4"
-     width="4" />
-  <path
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2401);stroke-width:1;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="rect2442"
-     d="m 12.5,17.5 0,-12 c 0,-0.554 0.446,-1 1,-1 l 5,0 c 0.554,0 1,0.446 1,1 l 0,12 c 0,0.554 -0.446,1 -1,1 l -5,0 c -0.554,0 -1,-0.446 -1,-1 z M 14.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" />
-  <rect
-     style="opacity:0.3;fill:none;stroke:#000000;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="rect3204"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="3.25"
-     x="-12.750001"
-     ry="0.24999999"
-     rx="0.25"
-     height="5.4999995"
-     width="7.5000005" />
-  <path
-     style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path2442"
-     d="M 3,5 C 2.446,5 2,5.446 2,6 l 0,13 c 0,0.554 0.446,1 1,1 l 6,0 c 0.554,0 1,-0.446 1,-1 L 10,6 C 10,5.446 9.554,5 9,5 L 3,5 z m 0.5,1 5,0 C 8.777,6 9,6.223 9,6.5 l 0,7 C 9,13.777 8.777,14 8.5,14 l -5,0 C 3.223,14 3,13.777 3,13.5 l 0,-7 C 3,6.223 3.223,6 3.5,6 z m 0,10 C 3.777,16 4,16.223 4,16.5 4,16.777 3.777,17 3.5,17 3.223,17 3,16.777 3,16.5 3,16.223 3.223,16 3.5,16 z m 2,0 C 5.777,16 6,16.223 6,16.5 6,16.223 6.223,16 6.5,16 6.777,16 7,16.223 7,16.5 7,16.777 6.777,17 6.5,17 6.223,17 6,16.777 6,16.5 6,16.777 5.777,17 5.5,17 5.223,17 5,16.777 5,16.5 5,16.223 5.223,16 5.5,16 z m 3,0 C 8.777,16 9,16.223 9,16.5 9,16.777 8.777,17 8.5,17 8.223,17 8,16.777 8,16.5 8,16.223 8.223,16 8.5,16 z m -5,2 C 3.777,18 4,18.223 4,18.5 4,18.777 3.777,19 3.5,19 3.223,19 3,18.777 3,18.5 3,18.223 3.223,18 3.5,18 z m 2,0 C 5.777,18 6,18.223 6,18.5 6,18.223 6.223,18 6.5,18 6.777,18 7,18.223 7,18.5 7,18.777 6.777,19 6.5,19 6.223,19 6,18.777 6,18.5 6,18.777 5.777,19 5.5,19 5.223,19 5,18.777 5,18.5 5,18.223 5.223,18 5.5,18 z m 3,0 C 8.777,18 9,18.223 9,18.5 9,18.777 8.777,19 8.5,19 8.223,19 8,18.777 8,18.5 8,18.223 8.223,18 8.5,18 z" />
-  <path
-     style="opacity:0.7;fill:url(#linearGradient2396);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect2397"
-     d="M 3,4 C 2.446,4 2,4.446 2,5 l 0,13 c 0,0.554 0.446,1 1,1 l 6,0 c 0.554,0 1,-0.446 1,-1 L 10,5 C 10,4.446 9.554,4 9,4 L 3,4 z m 0.5,1 5,0 C 8.777,5 9,5.223 9,5.5 l 0,7 C 9,12.777 8.777,13 8.5,13 l -5,0 C 3.223,13 3,12.777 3,12.5 l 0,-7 C 3,5.223 3.223,5 3.5,5 z m 0,10 C 3.777,15 4,15.223 4,15.5 4,15.777 3.777,16 3.5,16 3.223,16 3,15.777 3,15.5 3,15.223 3.223,15 3.5,15 z m 2,0 C 5.777,15 6,15.223 6,15.5 6,15.223 6.223,15 6.5,15 6.777,15 7,15.223 7,15.5 7,15.777 6.777,16 6.5,16 6.223,16 6,15.777 6,15.5 6,15.777 5.777,16 5.5,16 5.223,16 5,15.777 5,15.5 5,15.223 5.223,15 5.5,15 z m 3,0 C 8.777,15 9,15.223 9,15.5 9,15.777 8.777,16 8.5,16 8.223,16 8,15.777 8,15.5 8,15.223 8.223,15 8.5,15 z m -5,2 C 3.777,17 4,17.223 4,17.5 4,17.777 3.777,18 3.5,18 3.223,18 3,17.777 3,17.5 3,17.223 3.223,17 3.5,17 z m 2,0 C 5.777,17 6,17.223 6,17.5 6,17.223 6.223,17 6.5,17 6.777,17 7,17.223 7,17.5 7,17.777 6.777,18 6.5,18 6.223,18 6,17.777 6,17.5 6,17.777 5.777,18 5.5,18 5.223,18 5,17.777 5,17.5 5,17.223 5.223,17 5.5,17 z m 3,0 C 8.777,17 9,17.223 9,17.5 9,17.777 8.777,18 8.5,18 8.223,18 8,17.777 8,17.5 8,17.223 8.223,17 8.5,17 z" />
-</svg>
diff --git a/elementary-xfce/panel/22/xfpm-phone-060.svg b/elementary-xfce/panel/22/xfpm-phone-060.svg
deleted file mode 120000
index 4beb3892e..000000000
--- a/elementary-xfce/panel/22/xfpm-phone-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-phone-100.svg b/elementary-xfce/panel/22/xfpm-phone-100.svg
deleted file mode 120000
index a174b0ac5..000000000
--- a/elementary-xfce/panel/22/xfpm-phone-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-mouse-000.svg b/elementary-xfce/panel/48/xfpm-mouse-000.svg
deleted file mode 120000
index 241917e7e..000000000
--- a/elementary-xfce/panel/48/xfpm-mouse-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-mouse-060.svg b/elementary-xfce/panel/48/xfpm-mouse-060.svg
deleted file mode 120000
index 7d3125fb5..000000000
--- a/elementary-xfce/panel/48/xfpm-mouse-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-mouse-100.svg b/elementary-xfce/panel/48/xfpm-mouse-100.svg
deleted file mode 120000
index 544289bd7..000000000
--- a/elementary-xfce/panel/48/xfpm-mouse-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-mouse-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-phone-000.svg b/elementary-xfce/panel/48/xfpm-phone-000.svg
deleted file mode 120000
index 56bf8773f..000000000
--- a/elementary-xfce/panel/48/xfpm-phone-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-phone-060.svg b/elementary-xfce/panel/48/xfpm-phone-060.svg
deleted file mode 120000
index 4beb3892e..000000000
--- a/elementary-xfce/panel/48/xfpm-phone-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-phone-100.svg b/elementary-xfce/panel/48/xfpm-phone-100.svg
deleted file mode 120000
index a174b0ac5..000000000
--- a/elementary-xfce/panel/48/xfpm-phone-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-phone-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/xfpm-brightness-lcd.svg b/elementary-xfce/status/32/xfpm-brightness-lcd.svg
deleted file mode 100644
index 7cf379161..000000000
--- a/elementary-xfce/status/32/xfpm-brightness-lcd.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="32"
-   height="32"
-   id="svg3173">
-  <defs
-     id="defs3175">
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-4-1-9">
-      <stop
-         offset="0"
-         style="stop-color:#737373;stop-opacity:1"
-         id="stop5430-5-0-3" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#636363;stop-opacity:1"
-         id="stop5432-2-0-5" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#4b4b4b;stop-opacity:1"
-         id="stop5434-9-6-0" />
-      <stop
-         offset="1"
-         style="stop-color:#3f3f3f;stop-opacity:1"
-         id="stop5436-2-7-9" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-4-1-9"
-       id="radialGradient3961"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.8333334e-7,5.3333334,-5.3333334,2.8333334e-7,23.999998,-39.666666)"
-       cx="8"
-       cy="1.5"
-       fx="8"
-       fy="1.5"
-       r="6" />
-  </defs>
-  <metadata
-     id="metadata3178">
-    <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.35;fill:#ffffff;fill-opacity:1"
-     transform="matrix(2,0,0,2,0,1)"
-     id="g3811">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="path3813"
-       d="M 7.75,2 C 7.6115,2 7.5,2.1115 7.5,2.25 l 0,1.5 C 7.5,3.8885 7.6115,4 7.75,4 l 0.5,0 C 8.3885,4 8.5,3.8885 8.5,3.75 l 0,-1.5 C 8.5,2.1115 8.3885,2 8.25,2 L 7.75,2 z M 4.125,3.5 C 4.061095,3.5 3.9864671,3.544783 3.9375,3.59375 L 3.59375,3.9375 c -0.097934,0.097934 -0.097934,0.2458157 0,0.34375 l 1.0625,1.0625 C 4.754184,5.441684 4.9020657,5.441684 5,5.34375 L 5.34375,5 c 0.097934,-0.097934 0.097934,-0.2458157 0,-0.34375 L 4.28125,3.59375 C 4.2322829,3.5447829 4.1889048,3.5 4.125,3.5 z m 7.75,0 c -0.06391,0 -0.107283,0.044783 -0.15625,0.09375 l -1.0625,1.0625 c -0.09793,0.097934 -0.09793,0.2458157 0,0.34375 L 11,5.34375 c 0.09793,0.097934 0.245816,0.097934 0.34375,0 l 1.0625,-1.0625 c 0.09793,-0.097934 0.09793,-0.2458157 0,-0.34375 L 12.0625,3.59375 C 12.013533,3.5447829 11.938905,3.5 11.875,3.5 z M 8,5 C 6.3431457,5 5,6.3431457 5,8 5,9.6568543 6.3431457,11 8,11 9.6568543,11 11,9.6568543 11,8 11,6.3431457 9.6568543,5 8,5 z m 0,1 c 1.1045695,0 2,0.8954305 2,2 0,1.1045695 -0.8954305,2 -2,2 C 6.8954305,10 6,9.1045695 6,8 6,6.8954305 6.8954305,6 8,6 z M 2.25,7.5 C 2.1115,7.5 2,7.6115 2,7.75 l 0,0.5 C 2,8.3885 2.1115,8.5 2.25,8.5 l 1.5,0 C 3.8885,8.5 4,8.3885 4,8.25 L 4,7.75 C 4,7.6115 3.8885,7.5 3.75,7.5 l -1.5,0 z m 10,0 C 12.1115,7.5 12,7.6115 12,7.75 l 0,0.5 c 0,0.1385 0.1115,0.25 0.25,0.25 l 1.5,0 C 13.8885,8.5 14,8.3885 14,8.25 l 0,-0.5 C 14,7.6115 13.8885,7.5 13.75,7.5 l -1.5,0 z m -7.4375,3.09375 c -0.063905,0 -0.1072829,0.01353 -0.15625,0.0625 l -1.0625,1.0625 c -0.097934,0.09793 -0.097934,0.245816 0,0.34375 l 0.34375,0.34375 c 0.097934,0.09793 0.2458157,0.09793 0.34375,0 l 1.0625,-1.0625 C 5.441684,11.24582 5.441684,11.097934 5.34375,11 L 5,10.65625 C 4.951033,10.60728 4.8764048,10.59375 4.8125,10.59375 z m 6.375,0 c -0.06391,0 -0.138533,0.01353 -0.1875,0.0625 L 10.65625,11 c -0.09793,0.09793 -0.09793,0.245816 0,0.34375 l 1.0625,1.0625 c 0.09793,0.09793 0.245816,0.09793 0.34375,0 l 0.34375,-0.34375 c 0.09793,-0.09793 0.09793,-0.245816 0,-0.34375 l -1.0625,-1.0625 c -0.04897,-0.04897 -0.09234,-0.0625 -0.15625,-0.0625 z M 7.75,12 C 7.6115,12 7.5,12.1115 7.5,12.25 l 0,1.5 C 7.5,13.8885 7.6115,14 7.75,14 l 0.5,0 C 8.3885,14 8.5,13.8885 8.5,13.75 l 0,-1.5 C 8.5,12.1115 8.3885,12 8.25,12 l -0.5,0 z" />
-  </g>
-  <path
-     style="color:#000000;fill:url(#radialGradient3961);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-     id="rect2988-8"
-     d="M 15.5,4 C 15.223,4 15,4.223 15,4.5 l 0,3 C 15,7.777 15.223,8 15.5,8 l 1,0 C 16.777,8 17,7.777 17,7.5 l 0,-3 C 17,4.223 16.777,4 16.5,4 l -1,0 z M 8.25,7 C 8.12219,7 7.9729342,7.089566 7.875,7.1875 L 7.1875,7.875 c -0.195868,0.195868 -0.195868,0.4916314 0,0.6875 l 2.125,2.125 c 0.195868,0.195868 0.4916314,0.195868 0.6875,0 L 10.6875,10 c 0.195868,-0.195868 0.195868,-0.4916314 0,-0.6875 L 8.5625,7.1875 C 8.4645658,7.0895658 8.3778096,7 8.25,7 z m 15.5,0 c -0.12782,0 -0.214566,0.089566 -0.3125,0.1875 l -2.125,2.125 c -0.19586,0.195868 -0.19586,0.4916314 0,0.6875 L 22,10.6875 c 0.19586,0.195868 0.491632,0.195868 0.6875,0 l 2.125,-2.125 c 0.19586,-0.195868 0.19586,-0.4916314 0,-0.6875 L 24.125,7.1875 C 24.027066,7.0895658 23.87781,7 23.75,7 z M 16,10 c -3.313709,0 -6,2.686291 -6,6 0,3.313709 2.686291,6 6,6 3.313709,0 6,-2.686291 6,-6 0,-3.313709 -2.686291,-6 -6,-6 z m 0,2 c 2.209139,0 4,1.790861 4,4 0,2.209139 -1.790861,4 -4,4 -2.209139,0 -4,-1.790861 -4,-4 0,-2.209139 1.790861,-4 4,-4 z M 4.5,15 C 4.223,15 4,15.223 4,15.5 l 0,1 C 4,16.777 4.223,17 4.5,17 l 3,0 C 7.777,17 8,16.777 8,16.5 l 0,-1 C 8,15.223 7.777,15 7.5,15 l -3,0 z m 20,0 C 24.223,15 24,15.223 24,15.5 l 0,1 c 0,0.277 0.223,0.5 0.5,0.5 l 3,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 C 28,15.223 27.777,15 27.5,15 l -3,0 z M 9.625,21.1875 c -0.12781,0 -0.2145658,0.02706 -0.3125,0.125 l -2.125,2.125 c -0.195868,0.19586 -0.195868,0.491632 0,0.6875 l 0.6875,0.6875 c 0.195868,0.19586 0.4916314,0.19586 0.6875,0 l 2.125,-2.125 c 0.195868,-0.19586 0.195868,-0.491632 0,-0.6875 L 10,21.3125 C 9.902066,21.21456 9.7528096,21.1875 9.625,21.1875 z m 12.75,0 c -0.12782,0 -0.277066,0.02706 -0.375,0.125 L 21.3125,22 c -0.19586,0.19586 -0.19586,0.491632 0,0.6875 l 2.125,2.125 c 0.19586,0.19586 0.491632,0.19586 0.6875,0 l 0.6875,-0.6875 c 0.19586,-0.19586 0.19586,-0.491632 0,-0.6875 l -2.125,-2.125 c -0.09794,-0.09794 -0.18468,-0.125 -0.3125,-0.125 z M 15.5,24 C 15.223,24 15,24.223 15,24.5 l 0,3 c 0,0.277 0.223,0.5 0.5,0.5 l 1,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-3 C 17,24.223 16.777,24 16.5,24 l -1,0 z" />
-</svg>
diff --git a/elementary-xfce/status/48/xfpm-brightness-lcd.svg b/elementary-xfce/status/48/xfpm-brightness-lcd.svg
deleted file mode 100644
index 4ee2161ab..000000000
--- a/elementary-xfce/status/48/xfpm-brightness-lcd.svg
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.2"
-   width="48"
-   height="48"
-   id="svg2">
-  <defs
-     id="defs4">
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="ButtonShadow-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)">
-      <stop
-         id="stop3750-3"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-1"
-         style="stop-color:#000000;stop-opacity:0.58823532"
-         offset="1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter3174-4">
-      <feGaussianBlur
-         stdDeviation="1.71"
-         id="feGaussianBlur3176-5" />
-    </filter>
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="ButtonShadow"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)">
-      <stop
-         id="stop3750-9"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-7"
-         style="stop-color:#000000;stop-opacity:0.58823532"
-         offset="1" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter3174">
-      <feGaussianBlur
-         stdDeviation="1.71"
-         id="feGaussianBlur3176" />
-    </filter>
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="linearGradient6176"
-       xlink:href="#ButtonShadow-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)" />
-    <linearGradient
-       x1="45.447727"
-       y1="92.539597"
-       x2="45.447727"
-       y2="7.0165396"
-       id="linearGradient6178"
-       xlink:href="#ButtonShadow"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.0058652,0.994169)" />
-  </defs>
-  <metadata
-     id="metadata7">
-    <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="display:none"
-     id="layer2"
-     transform="matrix(1.5,0,0,1.5,1302.4092,-55.56813)">
-    <rect
-       style="opacity:0.9;fill:url(#linearGradient6178);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)"
-       id="rect3745"
-       y="7"
-       x="5"
-       ry="6"
-       rx="6"
-       height="85"
-       width="86" />
-  </g>
-  <g
-     style="display:none"
-     id="layer2-4"
-     transform="matrix(1.5,0,0,1.5,1297.5001,-56.11359)">
-    <rect
-       style="opacity:0.9;fill:url(#linearGradient6176);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174-4)"
-       id="rect3745-5"
-       y="7"
-       x="5"
-       ry="6"
-       rx="6"
-       height="85"
-       width="86" />
-  </g>
-  <g
-     style="fill:#efefef;fill-opacity:1"
-     id="layer1-6"
-     transform="scale(3,3)">
-    <path
-       style="color:#000000;fill:#efefef;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new"
-       id="rect2988-8"
-       d="M 7.75,2 C 7.6115,2 7.5,2.1115 7.5,2.25 l 0,1.5 C 7.5,3.8885 7.6115,4 7.75,4 l 0.5,0 C 8.3885,4 8.5,3.8885 8.5,3.75 l 0,-1.5 C 8.5,2.1115 8.3885,2 8.25,2 L 7.75,2 z M 4.125,3.5 C 4.061095,3.5 3.9864671,3.544783 3.9375,3.59375 L 3.59375,3.9375 c -0.097934,0.097934 -0.097934,0.2458157 0,0.34375 l 1.0625,1.0625 C 4.754184,5.441684 4.9020657,5.441684 5,5.34375 L 5.34375,5 c 0.097934,-0.097934 0.097934,-0.2458157 0,-0.34375 L 4.28125,3.59375 C 4.2322829,3.5447829 4.1889048,3.5 4.125,3.5 z m 7.75,0 c -0.06391,0 -0.107283,0.044783 -0.15625,0.09375 l -1.0625,1.0625 c -0.09793,0.097934 -0.09793,0.2458157 0,0.34375 L 11,5.34375 c 0.09793,0.097934 0.245816,0.097934 0.34375,0 l 1.0625,-1.0625 c 0.09793,-0.097934 0.09793,-0.2458157 0,-0.34375 L 12.0625,3.59375 C 12.013533,3.5447829 11.938905,3.5 11.875,3.5 z M 8,5 C 6.3431457,5 5,6.3431457 5,8 5,9.6568543 6.3431457,11 8,11 9.6568543,11 11,9.6568543 11,8 11,6.3431457 9.6568543,5 8,5 z m 0,1 c 1.1045695,0 2,0.8954305 2,2 0,1.1045695 -0.8954305,2 -2,2 C 6.8954305,10 6,9.1045695 6,8 6,6.8954305 6.8954305,6 8,6 z M 2.25,7.5 C 2.1115,7.5 2,7.6115 2,7.75 l 0,0.5 C 2,8.3885 2.1115,8.5 2.25,8.5 l 1.5,0 C 3.8885,8.5 4,8.3885 4,8.25 L 4,7.75 C 4,7.6115 3.8885,7.5 3.75,7.5 l -1.5,0 z m 10,0 C 12.1115,7.5 12,7.6115 12,7.75 l 0,0.5 c 0,0.1385 0.1115,0.25 0.25,0.25 l 1.5,0 C 13.8885,8.5 14,8.3885 14,8.25 l 0,-0.5 C 14,7.6115 13.8885,7.5 13.75,7.5 l -1.5,0 z m -7.4375,3.09375 c -0.063905,0 -0.1072829,0.01353 -0.15625,0.0625 l -1.0625,1.0625 c -0.097934,0.09793 -0.097934,0.245816 0,0.34375 l 0.34375,0.34375 c 0.097934,0.09793 0.2458157,0.09793 0.34375,0 l 1.0625,-1.0625 C 5.441684,11.24582 5.441684,11.097934 5.34375,11 L 5,10.65625 C 4.951033,10.60728 4.8764048,10.59375 4.8125,10.59375 z m 6.375,0 c -0.06391,0 -0.138533,0.01353 -0.1875,0.0625 L 10.65625,11 c -0.09793,0.09793 -0.09793,0.245816 0,0.34375 l 1.0625,1.0625 c 0.09793,0.09793 0.245816,0.09793 0.34375,0 l 0.34375,-0.34375 c 0.09793,-0.09793 0.09793,-0.245816 0,-0.34375 l -1.0625,-1.0625 c -0.04897,-0.04897 -0.09234,-0.0625 -0.15625,-0.0625 z M 7.75,12 C 7.6115,12 7.5,12.1115 7.5,12.25 l 0,1.5 C 7.5,13.8885 7.6115,14 7.75,14 l 0.5,0 C 8.3885,14 8.5,13.8885 8.5,13.75 l 0,-1.5 C 8.5,12.1115 8.3885,12 8.25,12 l -0.5,0 z" />
-  </g>
-</svg>