diff --git a/elementary-xfce-dark/panel/48/ac-adapter.svg b/elementary-xfce-dark/panel/48/ac-adapter.svg
deleted file mode 120000
index dbb11e00a..000000000
--- a/elementary-xfce-dark/panel/48/ac-adapter.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-ac-adapter.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-caution-charging.svg b/elementary-xfce-dark/panel/48/battery-caution-charging.svg
deleted file mode 120000
index bd82d8c99..000000000
--- a/elementary-xfce-dark/panel/48/battery-caution-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-caution.svg b/elementary-xfce-dark/panel/48/battery-caution.svg
deleted file mode 120000
index d4972a7f4..000000000
--- a/elementary-xfce-dark/panel/48/battery-caution.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-empty.svg b/elementary-xfce-dark/panel/48/battery-empty.svg
deleted file mode 120000
index 23afa7f89..000000000
--- a/elementary-xfce-dark/panel/48/battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-full-charged.svg b/elementary-xfce-dark/panel/48/battery-full-charged.svg
deleted file mode 120000
index 97e4c4ea0..000000000
--- a/elementary-xfce-dark/panel/48/battery-full-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-full-charging.svg b/elementary-xfce-dark/panel/48/battery-full-charging.svg
deleted file mode 120000
index 97e4c4ea0..000000000
--- a/elementary-xfce-dark/panel/48/battery-full-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-full.svg b/elementary-xfce-dark/panel/48/battery-full.svg
deleted file mode 120000
index 603b46e8e..000000000
--- a/elementary-xfce-dark/panel/48/battery-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-good-charging.svg b/elementary-xfce-dark/panel/48/battery-good-charging.svg
deleted file mode 120000
index a39097d9f..000000000
--- a/elementary-xfce-dark/panel/48/battery-good-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-good.svg b/elementary-xfce-dark/panel/48/battery-good.svg
deleted file mode 120000
index 07f71995c..000000000
--- a/elementary-xfce-dark/panel/48/battery-good.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-low-charging.svg b/elementary-xfce-dark/panel/48/battery-low-charging.svg
deleted file mode 120000
index 398681015..000000000
--- a/elementary-xfce-dark/panel/48/battery-low-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-low.svg b/elementary-xfce-dark/panel/48/battery-low.svg
deleted file mode 120000
index faa01c482..000000000
--- a/elementary-xfce-dark/panel/48/battery-low.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/battery-missing.svg b/elementary-xfce-dark/panel/48/battery-missing.svg
deleted file mode 120000
index 211451fff..000000000
--- a/elementary-xfce-dark/panel/48/battery-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/status/48/battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ac-adapter.svg b/elementary-xfce-dark/panel/48/xfpm-ac-adapter.svg
deleted file mode 120000
index 361d43fe1..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ac-adapter.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/apps/48/preferences-system-power.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-000-charging.svg b/elementary-xfce-dark/panel/48/xfpm-primary-000-charging.svg
deleted file mode 120000
index 1f7b47cb5..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-000.svg b/elementary-xfce-dark/panel/48/xfpm-primary-000.svg
deleted file mode 120000
index 0a36bb01a..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-020-charging.svg b/elementary-xfce-dark/panel/48/xfpm-primary-020-charging.svg
deleted file mode 120000
index 29f61d1d9..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-020.svg b/elementary-xfce-dark/panel/48/xfpm-primary-020.svg
deleted file mode 120000
index 7c4393273..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-040-charging.svg b/elementary-xfce-dark/panel/48/xfpm-primary-040-charging.svg
deleted file mode 120000
index 585d26e73..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-040.svg b/elementary-xfce-dark/panel/48/xfpm-primary-040.svg
deleted file mode 120000
index 957e8f587..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-040.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-060-charging.svg b/elementary-xfce-dark/panel/48/xfpm-primary-060-charging.svg
deleted file mode 120000
index 96239518b..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-060.svg b/elementary-xfce-dark/panel/48/xfpm-primary-060.svg
deleted file mode 120000
index e3967ee5a..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-080-charging.svg b/elementary-xfce-dark/panel/48/xfpm-primary-080-charging.svg
deleted file mode 120000
index 9b379c36d..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-080.svg b/elementary-xfce-dark/panel/48/xfpm-primary-080.svg
deleted file mode 120000
index f3d818e39..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-080.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-100-charging.svg b/elementary-xfce-dark/panel/48/xfpm-primary-100-charging.svg
deleted file mode 120000
index 0114c1681..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-100.svg b/elementary-xfce-dark/panel/48/xfpm-primary-100.svg
deleted file mode 120000
index 14e9befb4..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-charged.svg b/elementary-xfce-dark/panel/48/xfpm-primary-charged.svg
deleted file mode 120000
index 2e047e5bf..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-primary-missing.svg b/elementary-xfce-dark/panel/48/xfpm-primary-missing.svg
deleted file mode 120000
index 0a36bb01a..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-primary-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-primary-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-000-charging.svg b/elementary-xfce-dark/panel/48/xfpm-ups-000-charging.svg
deleted file mode 120000
index 0b3d587dd..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-000.svg b/elementary-xfce-dark/panel/48/xfpm-ups-000.svg
deleted file mode 120000
index 371b9f117..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-000.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-020-charging.svg b/elementary-xfce-dark/panel/48/xfpm-ups-020-charging.svg
deleted file mode 120000
index a77e98b1e..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-020.svg b/elementary-xfce-dark/panel/48/xfpm-ups-020.svg
deleted file mode 120000
index fd3a1223a..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-020.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-040-charging.svg b/elementary-xfce-dark/panel/48/xfpm-ups-040-charging.svg
deleted file mode 120000
index a14e1ee90..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-040.svg b/elementary-xfce-dark/panel/48/xfpm-ups-040.svg
deleted file mode 120000
index cf48e6767..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-040.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-060-charging.svg b/elementary-xfce-dark/panel/48/xfpm-ups-060-charging.svg
deleted file mode 120000
index cfe2b204e..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-060.svg b/elementary-xfce-dark/panel/48/xfpm-ups-060.svg
deleted file mode 120000
index a2fa22847..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-060.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-080-charging.svg b/elementary-xfce-dark/panel/48/xfpm-ups-080-charging.svg
deleted file mode 120000
index 530ce4cf2..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-080.svg b/elementary-xfce-dark/panel/48/xfpm-ups-080.svg
deleted file mode 120000
index acd80883b..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-080.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-100-charging.svg b/elementary-xfce-dark/panel/48/xfpm-ups-100-charging.svg
deleted file mode 120000
index 4fe9f36fe..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-100.svg b/elementary-xfce-dark/panel/48/xfpm-ups-100.svg
deleted file mode 120000
index 6d286718f..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-100.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/48/xfpm-ups-missing.svg b/elementary-xfce-dark/panel/48/xfpm-ups-missing.svg
deleted file mode 120000
index bb8d78d51..000000000
--- a/elementary-xfce-dark/panel/48/xfpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../elementary-xfce/panel/48/gpm-ups-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/64/xfpm-ac-adapter.svg b/elementary-xfce/apps/64/xfpm-ac-adapter.svg
deleted file mode 120000
index e7a4d9f1f..000000000
--- a/elementary-xfce/apps/64/xfpm-ac-adapter.svg
+++ /dev/null
@@ -1 +0,0 @@
-preferences-system-power.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-000-plugged.svg b/elementary-xfce/notifications/48/notification-battery-000-plugged.svg
deleted file mode 120000
index 19c5627b1..000000000
--- a/elementary-xfce/notifications/48/notification-battery-000-plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-000.svg b/elementary-xfce/notifications/48/notification-battery-000.svg
deleted file mode 120000
index e3a04984a..000000000
--- a/elementary-xfce/notifications/48/notification-battery-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery_empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-020-plugged.svg b/elementary-xfce/notifications/48/notification-battery-020-plugged.svg
deleted file mode 120000
index 538a392f8..000000000
--- a/elementary-xfce/notifications/48/notification-battery-020-plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-020.svg b/elementary-xfce/notifications/48/notification-battery-020.svg
deleted file mode 120000
index 5eced58bb..000000000
--- a/elementary-xfce/notifications/48/notification-battery-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-040-plugged.svg b/elementary-xfce/notifications/48/notification-battery-040-plugged.svg
deleted file mode 120000
index 776cf63ed..000000000
--- a/elementary-xfce/notifications/48/notification-battery-040-plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-040.svg b/elementary-xfce/notifications/48/notification-battery-040.svg
deleted file mode 120000
index 9ebd29d6f..000000000
--- a/elementary-xfce/notifications/48/notification-battery-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-060-plugged.svg b/elementary-xfce/notifications/48/notification-battery-060-plugged.svg
deleted file mode 120000
index 756b44044..000000000
--- a/elementary-xfce/notifications/48/notification-battery-060-plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-060.svg b/elementary-xfce/notifications/48/notification-battery-060.svg
deleted file mode 120000
index 40726a91f..000000000
--- a/elementary-xfce/notifications/48/notification-battery-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-080-plugged.svg b/elementary-xfce/notifications/48/notification-battery-080-plugged.svg
deleted file mode 120000
index b395584c6..000000000
--- a/elementary-xfce/notifications/48/notification-battery-080-plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-080.svg b/elementary-xfce/notifications/48/notification-battery-080.svg
deleted file mode 120000
index e58eb961d..000000000
--- a/elementary-xfce/notifications/48/notification-battery-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-100-plugged.svg b/elementary-xfce/notifications/48/notification-battery-100-plugged.svg
deleted file mode 120000
index 895f71b0e..000000000
--- a/elementary-xfce/notifications/48/notification-battery-100-plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-100.svg b/elementary-xfce/notifications/48/notification-battery-100.svg
deleted file mode 120000
index b87667acf..000000000
--- a/elementary-xfce/notifications/48/notification-battery-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-empty.svg b/elementary-xfce/notifications/48/notification-battery-empty.svg
deleted file mode 120000
index d6eef3073..000000000
--- a/elementary-xfce/notifications/48/notification-battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-notification-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/notifications/48/notification-battery-low.svg b/elementary-xfce/notifications/48/notification-battery-low.svg
deleted file mode 120000
index 5eced58bb..000000000
--- a/elementary-xfce/notifications/48/notification-battery-low.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-000-charging.svg b/elementary-xfce/panel/16/battery-000-charging.svg
deleted file mode 120000
index 26a81ae46..000000000
--- a/elementary-xfce/panel/16/battery-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-000.svg b/elementary-xfce/panel/16/battery-000.svg
deleted file mode 120000
index e222aedae..000000000
--- a/elementary-xfce/panel/16/battery-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-020-charging.svg b/elementary-xfce/panel/16/battery-020-charging.svg
deleted file mode 120000
index cec45284a..000000000
--- a/elementary-xfce/panel/16/battery-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-020.svg b/elementary-xfce/panel/16/battery-020.svg
deleted file mode 120000
index 43b99e111..000000000
--- a/elementary-xfce/panel/16/battery-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-040-charging.svg b/elementary-xfce/panel/16/battery-040-charging.svg
deleted file mode 120000
index cec45284a..000000000
--- a/elementary-xfce/panel/16/battery-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-040.svg b/elementary-xfce/panel/16/battery-040.svg
deleted file mode 120000
index 43b99e111..000000000
--- a/elementary-xfce/panel/16/battery-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-060-charging.svg b/elementary-xfce/panel/16/battery-060-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce/panel/16/battery-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-060.svg b/elementary-xfce/panel/16/battery-060.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce/panel/16/battery-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-080-charging.svg b/elementary-xfce/panel/16/battery-080-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce/panel/16/battery-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-080.svg b/elementary-xfce/panel/16/battery-080.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce/panel/16/battery-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-100-charging.svg b/elementary-xfce/panel/16/battery-100-charging.svg
deleted file mode 120000
index fa569ef59..000000000
--- a/elementary-xfce/panel/16/battery-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-100.svg b/elementary-xfce/panel/16/battery-100.svg
deleted file mode 120000
index a3be8f7c4..000000000
--- a/elementary-xfce/panel/16/battery-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery-charged.svg b/elementary-xfce/panel/16/battery-charged.svg
deleted file mode 120000
index fa569ef59..000000000
--- a/elementary-xfce/panel/16/battery-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery_charged.svg b/elementary-xfce/panel/16/battery_charged.svg
deleted file mode 120000
index fa569ef59..000000000
--- a/elementary-xfce/panel/16/battery_charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery_full.svg b/elementary-xfce/panel/16/battery_full.svg
deleted file mode 120000
index a3be8f7c4..000000000
--- a/elementary-xfce/panel/16/battery_full.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/battery_plugged.svg b/elementary-xfce/panel/16/battery_plugged.svg
deleted file mode 120000
index 26a81ae46..000000000
--- a/elementary-xfce/panel/16/battery_plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ac-adapter.svg b/elementary-xfce/panel/16/gpm-ac-adapter.svg
deleted file mode 120000
index 462da4e23..000000000
--- a/elementary-xfce/panel/16/gpm-ac-adapter.svg
+++ /dev/null
@@ -1 +0,0 @@
-ac-adapter.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-000-charging.svg b/elementary-xfce/panel/16/gpm-battery-000-charging.svg
deleted file mode 120000
index 26a81ae46..000000000
--- a/elementary-xfce/panel/16/gpm-battery-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-000.svg b/elementary-xfce/panel/16/gpm-battery-000.svg
deleted file mode 120000
index e222aedae..000000000
--- a/elementary-xfce/panel/16/gpm-battery-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-020-charging.svg b/elementary-xfce/panel/16/gpm-battery-020-charging.svg
deleted file mode 120000
index 7566c7e1f..000000000
--- a/elementary-xfce/panel/16/gpm-battery-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-caution-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-020.svg b/elementary-xfce/panel/16/gpm-battery-020.svg
deleted file mode 120000
index 819f26d4d..000000000
--- a/elementary-xfce/panel/16/gpm-battery-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-caution.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-040-charging.svg b/elementary-xfce/panel/16/gpm-battery-040-charging.svg
deleted file mode 120000
index cec45284a..000000000
--- a/elementary-xfce/panel/16/gpm-battery-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-040.svg b/elementary-xfce/panel/16/gpm-battery-040.svg
deleted file mode 120000
index 43b99e111..000000000
--- a/elementary-xfce/panel/16/gpm-battery-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-low.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-060-charging.svg b/elementary-xfce/panel/16/gpm-battery-060-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce/panel/16/gpm-battery-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-060.svg b/elementary-xfce/panel/16/gpm-battery-060.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce/panel/16/gpm-battery-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-080-charging.svg b/elementary-xfce/panel/16/gpm-battery-080-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce/panel/16/gpm-battery-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-080.svg b/elementary-xfce/panel/16/gpm-battery-080.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce/panel/16/gpm-battery-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-good.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-100-charging.svg b/elementary-xfce/panel/16/gpm-battery-100-charging.svg
deleted file mode 120000
index fa569ef59..000000000
--- a/elementary-xfce/panel/16/gpm-battery-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-100.svg b/elementary-xfce/panel/16/gpm-battery-100.svg
deleted file mode 120000
index a3be8f7c4..000000000
--- a/elementary-xfce/panel/16/gpm-battery-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-charged.svg b/elementary-xfce/panel/16/gpm-battery-charged.svg
deleted file mode 120000
index eddb86a90..000000000
--- a/elementary-xfce/panel/16/gpm-battery-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-full-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-empty.svg b/elementary-xfce/panel/16/gpm-battery-empty.svg
deleted file mode 120000
index e222aedae..000000000
--- a/elementary-xfce/panel/16/gpm-battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-battery-missing.svg b/elementary-xfce/panel/16/gpm-battery-missing.svg
deleted file mode 120000
index 245b4cabc..000000000
--- a/elementary-xfce/panel/16/gpm-battery-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-000-charging.svg b/elementary-xfce/panel/16/gpm-primary-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/16/gpm-primary-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-000.svg b/elementary-xfce/panel/16/gpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/16/gpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-020-charging.svg b/elementary-xfce/panel/16/gpm-primary-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/16/gpm-primary-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-020.svg b/elementary-xfce/panel/16/gpm-primary-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/16/gpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-040-charging.svg b/elementary-xfce/panel/16/gpm-primary-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/16/gpm-primary-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-040.svg b/elementary-xfce/panel/16/gpm-primary-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/16/gpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-060-charging.svg b/elementary-xfce/panel/16/gpm-primary-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/16/gpm-primary-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-060.svg b/elementary-xfce/panel/16/gpm-primary-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/16/gpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-080-charging.svg b/elementary-xfce/panel/16/gpm-primary-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/16/gpm-primary-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-080.svg b/elementary-xfce/panel/16/gpm-primary-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/16/gpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-100-charging.svg b/elementary-xfce/panel/16/gpm-primary-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/16/gpm-primary-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-100.svg b/elementary-xfce/panel/16/gpm-primary-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/16/gpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-primary-charged.svg b/elementary-xfce/panel/16/gpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/16/gpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ups-000-charging.svg b/elementary-xfce/panel/16/gpm-ups-000-charging.svg
deleted file mode 120000
index 26a81ae46..000000000
--- a/elementary-xfce/panel/16/gpm-ups-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ups-000.svg b/elementary-xfce/panel/16/gpm-ups-000.svg
deleted file mode 120000
index e222aedae..000000000
--- a/elementary-xfce/panel/16/gpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ups-020-charging.svg b/elementary-xfce/panel/16/gpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/16/gpm-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/panel/16/gpm-ups-020.svg b/elementary-xfce/panel/16/gpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/16/gpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ups-040-charging.svg b/elementary-xfce/panel/16/gpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/16/gpm-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/panel/16/gpm-ups-040.svg b/elementary-xfce/panel/16/gpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/16/gpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ups-060-charging.svg b/elementary-xfce/panel/16/gpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/16/gpm-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/panel/16/gpm-ups-060.svg b/elementary-xfce/panel/16/gpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/16/gpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ups-080-charging.svg b/elementary-xfce/panel/16/gpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/16/gpm-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/panel/16/gpm-ups-080.svg b/elementary-xfce/panel/16/gpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/16/gpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ups-100-charging.svg b/elementary-xfce/panel/16/gpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/16/gpm-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/panel/16/gpm-ups-100.svg b/elementary-xfce/panel/16/gpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/16/gpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/gpm-ups-missing.svg b/elementary-xfce/panel/16/gpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce/panel/16/gpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/xfpm-ac-adapter.svg b/elementary-xfce/panel/16/xfpm-ac-adapter.svg
deleted file mode 120000
index 462da4e23..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-000-charging.svg b/elementary-xfce/panel/16/xfpm-primary-000-charging.svg
deleted file mode 120000
index 26a81ae46..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-000.svg b/elementary-xfce/panel/16/xfpm-primary-000.svg
deleted file mode 120000
index e222aedae..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-020-charging.svg b/elementary-xfce/panel/16/xfpm-primary-020-charging.svg
deleted file mode 120000
index 7566c7e1f..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-020.svg b/elementary-xfce/panel/16/xfpm-primary-020.svg
deleted file mode 120000
index 819f26d4d..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-040-charging.svg b/elementary-xfce/panel/16/xfpm-primary-040-charging.svg
deleted file mode 120000
index cec45284a..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-040.svg b/elementary-xfce/panel/16/xfpm-primary-040.svg
deleted file mode 120000
index 43b99e111..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-060-charging.svg b/elementary-xfce/panel/16/xfpm-primary-060-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-060.svg b/elementary-xfce/panel/16/xfpm-primary-060.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-080-charging.svg b/elementary-xfce/panel/16/xfpm-primary-080-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-080.svg b/elementary-xfce/panel/16/xfpm-primary-080.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-100-charging.svg b/elementary-xfce/panel/16/xfpm-primary-100-charging.svg
deleted file mode 120000
index fa569ef59..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-100.svg b/elementary-xfce/panel/16/xfpm-primary-100.svg
deleted file mode 120000
index a3be8f7c4..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-charged.svg b/elementary-xfce/panel/16/xfpm-primary-charged.svg
deleted file mode 120000
index eddb86a90..000000000
--- a/elementary-xfce/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/panel/16/xfpm-primary-missing.svg b/elementary-xfce/panel/16/xfpm-primary-missing.svg
deleted file mode 120000
index 245b4cabc..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-000-charging.svg b/elementary-xfce/panel/16/xfpm-ups-000-charging.svg
deleted file mode 120000
index 26a81ae46..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-000.svg b/elementary-xfce/panel/16/xfpm-ups-000.svg
deleted file mode 120000
index e222aedae..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-020-charging.svg b/elementary-xfce/panel/16/xfpm-ups-020-charging.svg
deleted file mode 120000
index 7566c7e1f..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-020.svg b/elementary-xfce/panel/16/xfpm-ups-020.svg
deleted file mode 120000
index 819f26d4d..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-040-charging.svg b/elementary-xfce/panel/16/xfpm-ups-040-charging.svg
deleted file mode 120000
index cec45284a..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-040.svg b/elementary-xfce/panel/16/xfpm-ups-040.svg
deleted file mode 120000
index 43b99e111..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-060-charging.svg b/elementary-xfce/panel/16/xfpm-ups-060-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-060.svg b/elementary-xfce/panel/16/xfpm-ups-060.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-080-charging.svg b/elementary-xfce/panel/16/xfpm-ups-080-charging.svg
deleted file mode 120000
index 03a8c493b..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-080.svg b/elementary-xfce/panel/16/xfpm-ups-080.svg
deleted file mode 120000
index 2eb6cf41d..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-100-charging.svg b/elementary-xfce/panel/16/xfpm-ups-100-charging.svg
deleted file mode 120000
index fa569ef59..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-100.svg b/elementary-xfce/panel/16/xfpm-ups-100.svg
deleted file mode 120000
index a3be8f7c4..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-charged.svg b/elementary-xfce/panel/16/xfpm-ups-charged.svg
deleted file mode 120000
index e3c4e4262..000000000
--- a/elementary-xfce/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/panel/16/xfpm-ups-missing.svg b/elementary-xfce/panel/16/xfpm-ups-missing.svg
deleted file mode 120000
index 245b4cabc..000000000
--- a/elementary-xfce/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/panel/22/gpm-ac-adapter.svg b/elementary-xfce/panel/22/ac-adapter.svg
similarity index 100%
rename from elementary-xfce/panel/22/gpm-ac-adapter.svg
rename to elementary-xfce/panel/22/ac-adapter.svg
diff --git a/elementary-xfce/panel/22/battery-000-charging.svg b/elementary-xfce/panel/22/battery-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/22/battery-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-000.svg b/elementary-xfce/panel/22/battery-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/22/battery-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-020-charging.svg b/elementary-xfce/panel/22/battery-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/22/battery-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-020.svg b/elementary-xfce/panel/22/battery-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/22/battery-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-040-charging.svg b/elementary-xfce/panel/22/battery-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/22/battery-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-040.svg b/elementary-xfce/panel/22/battery-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/22/battery-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-060-charging.svg b/elementary-xfce/panel/22/battery-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/22/battery-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-060.svg b/elementary-xfce/panel/22/battery-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/22/battery-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-080-charging.svg b/elementary-xfce/panel/22/battery-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/22/battery-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-080.svg b/elementary-xfce/panel/22/battery-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/22/battery-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-100-charging.svg b/elementary-xfce/panel/22/battery-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/22/battery-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-100.svg b/elementary-xfce/panel/22/battery-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/22/battery-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-caution-charging.svg b/elementary-xfce/panel/22/battery-caution-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/22/battery-caution-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-caution-charging.svg b/elementary-xfce/panel/22/battery-caution-charging.svg
new file mode 100644
index 000000000..c7e23f044
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-caution-charging.svg
@@ -0,0 +1,131 @@
+<?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="22"
+   height="22"
+   id="svg3887">
+  <metadata
+     id="metadata25">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7-2">
+      <stop
+         id="stop3589-9-2-2-2-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1.0000003)" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3587-6-5-3-2-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.12581702,-9.798735,14.086873)" />
+  </defs>
+  <path
+     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208-6"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-18.75"
+     y="7.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236-1"
+     style="opacity:0.2;fill:none;stroke:#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" />
+  <path
+     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442-9"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="6"
+     height="3"
+     rx="0.25"
+     ry="0"
+     x="8"
+     y="16"
+     id="rect3965-9"
+     style="opacity:0.3;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:accumulate" />
+  <rect
+     width="6"
+     height="3"
+     rx="0.25"
+     ry="0"
+     x="8"
+     y="15"
+     id="rect3965"
+     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172-0"
+     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172"
+     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/22/battery-caution.svg b/elementary-xfce/panel/22/battery-caution.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/22/battery-caution.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-caution.svg b/elementary-xfce/panel/22/battery-caution.svg
new file mode 100644
index 000000000..c86437ddd
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-caution.svg
@@ -0,0 +1,101 @@
+<?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="svg2518">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2520">
+    <linearGradient
+       id="linearGradient3187">
+      <stop
+         id="stop3189"
+         style="stop-color:#a60000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3191"
+         style="stop-color:#ff1313;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="89.454575"
+       y1="30.517715"
+       x2="89.454575"
+       y2="37.832817"
+       id="linearGradient2516"
+       xlink:href="#linearGradient3187"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.4101105,-25.63626,2.4843648)" />
+    <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="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2392"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)" />
+  </defs>
+  <g
+     id="layer1">
+    <rect
+       width="6"
+       height="5"
+       rx="0.5"
+       ry="0.49999994"
+       x="8.0500002"
+       y="14"
+       id="rect3206"
+       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" />
+    <rect
+       width="14.5"
+       height="7.5"
+       rx="0.25"
+       ry="0.25"
+       x="-18.75"
+       y="7.25"
+       transform="matrix(0,-1,1,0,0,0)"
+       id="rect3236"
+       style="opacity:0.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" />
+    <path
+       d="m 6.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="path3208"
+       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="M 8.0500002,15 C 10.05,15 12.05,15 14.05,15 c 0,1 0,2 0,3 -2,0 -4,0 -5.9999998,0 0,-1 0,-2 0,-3 z"
+       id="rect3728"
+       style="opacity:0.8;fill:url(#linearGradient2516);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 6.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="rect2442"
+       style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/22/battery-charged.svg b/elementary-xfce/panel/22/battery-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/22/battery-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-empty-charging.svg b/elementary-xfce/panel/22/battery-empty-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/22/battery-empty-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-empty-charging.svg b/elementary-xfce/panel/22/battery-empty-charging.svg
new file mode 100644
index 000000000..34a82e998
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-empty-charging.svg
@@ -0,0 +1,93 @@
+<?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="22"
+   height="22"
+   id="svg3887">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1.0000003)" />
+  </defs>
+  <path
+     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208-6"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-18.75"
+     y="7.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236-1"
+     style="opacity:0.2;fill:none;stroke:#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" />
+  <path
+     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442-9"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172-0"
+     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172"
+     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/22/battery-empty.svg b/elementary-xfce/panel/22/battery-empty.svg
deleted file mode 120000
index 69aef787c..000000000
--- a/elementary-xfce/panel/22/battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-empty.svg b/elementary-xfce/panel/22/battery-empty.svg
new file mode 100644
index 000000000..a6c46fe4e
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-empty.svg
@@ -0,0 +1,95 @@
+<?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="22"
+   height="22"
+   id="svg3718">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3720">
+    <linearGradient
+       id="linearGradient3187">
+      <stop
+         id="stop3189"
+         style="stop-color:#a60000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3191"
+         style="stop-color:#ff1313;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3187"
+       id="linearGradient2997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1.0000003)"
+       x1="11.376964"
+       y1="14.98917"
+       x2="11.376964"
+       y2="17.01939" />
+    <linearGradient
+       xlink:href="#linearGradient3187"
+       id="linearGradient3000"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1.0000003)"
+       x1="11.376964"
+       y1="7"
+       x2="11.376964"
+       y2="17.01939" />
+    <linearGradient
+       xlink:href="#linearGradient3187"
+       id="linearGradient3003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1.0000003)"
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21" />
+  </defs>
+  <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="path3471"
+     d="m 11,6.9999997 c -0.554,0 -1,0.446 -1,1 L 10,13 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-5.0000003 c 0,-0.554 -0.446,-1 -1,-1 z M 10.75,15 C 10.3345,15 10,15.3345 10,15.75 l 0,0.5 c 0,0.4155 0.3345,0.75 0.75,0.75 l 0.5,0 C 11.6655,17 12,16.6655 12,16.25 l 0,-0.5 C 12,15.3345 11.6655,15 11.25,15 l -0.5,0 z" />
+  <rect
+     style="opacity:0.3;fill:none;stroke:#f00000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3236"
+     transform="matrix(0,-1,1,0,0,0)"
+     y="7.25"
+     x="-18.75"
+     ry="0.25"
+     rx="0.25"
+     height="7.5"
+     width="14.5" />
+  <path
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3208"
+     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
+  <path
+     style="opacity:0.8;fill:none;stroke:url(#linearGradient3003);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect2442"
+     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
+  <path
+     style="opacity:0.8;fill:url(#linearGradient3000);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3467"
+     d="m 11,5.9999997 c 0.554,0 1,0.446 1,1 L 12,12 c 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 l 0,-5.0000003 c 0,-0.554 0.446,-1 1,-1 z" />
+  <path
+     style="opacity:0.8;fill:url(#linearGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3448"
+     d="m 10.75,14 0.5,0 c 0.4155,0 0.75,0.3345 0.75,0.75 l 0,0.5 C 12,15.6655 11.6655,16 11.25,16 l -0.5,0 C 10.3345,16 10,15.6655 10,15.25 l 0,-0.5 C 10,14.3345 10.3345,14 10.75,14 z" />
+</svg>
diff --git a/elementary-xfce/panel/22/battery-full-charged.svg b/elementary-xfce/panel/22/battery-full-charged.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/22/battery-full-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-full-charged.svg b/elementary-xfce/panel/22/battery-full-charged.svg
new file mode 100644
index 000000000..c403e6382
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-full-charged.svg
@@ -0,0 +1,87 @@
+<?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"
+   width="22"
+   height="22"
+   id="svg3701"
+   version="1.1">
+  <defs
+     id="defs3703">
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2485"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-7.0000003)" />
+    <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="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2488"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)" />
+  </defs>
+  <metadata
+     id="metadata3706">
+    <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
+     id="layer1"
+     transform="translate(0,6)">
+    <path
+       d="M 8.0625,-3.0146495e-7 C 8.0625,1.9999995 8.0625,3.9999996 8.0625,6 l 6,-6.00000030146495 c -2,0 -4,0 -6,0 z m 6,0 L 12.0625,5 l 2,0 c 0,-1.666667 0,-3.3333338 0,-5.00000030146495 z M 14.0625,6.15625 8.0625,13 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
+       id="rect3728-9"
+       style="opacity:0.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 6.5,13.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,13.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-1.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="path3208"
+       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="14.5"
+       height="7.5"
+       rx="0.25"
+       ry="0.25"
+       x="-12.75"
+       y="7.25"
+       transform="matrix(0,-1,1,0,0,0)"
+       id="rect3236"
+       style="opacity:0.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" />
+    <path
+       d="m 8.0625,-1.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5 2,0 c 0,-1.6666667 0,-3.3333335 0,-5 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
+       id="rect3728"
+       style="opacity:0.7;fill:url(#linearGradient2488);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 6.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-2.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="rect2442"
+       style="opacity:0.7;fill:none;stroke:url(#linearGradient2485);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/22/battery-full-charging.svg b/elementary-xfce/panel/22/battery-full-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/22/battery-full-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-full-charging.svg b/elementary-xfce/panel/22/battery-full-charging.svg
new file mode 100644
index 000000000..8221113bd
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-full-charging.svg
@@ -0,0 +1,139 @@
+<?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="22"
+   height="22"
+   id="svg3887">
+  <metadata
+     id="metadata27">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient3848"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,-4.9568823)" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2893-1"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-7.0000003)" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient4478-1"
+       xlink:href="#linearGradient3587-6-5-3-2-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7-2">
+      <stop
+         id="stop3589-9-2-2-2-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="translate(0,6)"
+     id="layer1">
+    <path
+       d="m 6.5,13.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,13.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-1.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="path3208-6"
+       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="14.5"
+       height="7.5"
+       rx="0.25"
+       ry="0.25"
+       x="-12.75"
+       y="7.25"
+       transform="matrix(0,-1,1,0,0,0)"
+       id="rect3236-1"
+       style="opacity:0.2;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" />
+    <path
+       d="m 6.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-2.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="rect2442-9"
+       style="opacity:0.7;fill:none;stroke:url(#linearGradient2893-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g3611"
+       style="opacity:0.5">
+      <rect
+         width="6"
+         height="13"
+         rx="0.25"
+         ry="0"
+         x="8"
+         y="0"
+         id="rect3965-9"
+         style="opacity:0.6;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:accumulate" />
+      <rect
+         width="6"
+         height="13"
+         rx="0.25"
+         ry="0"
+         x="8"
+         y="-1"
+         id="rect3965"
+         style="opacity:0.7;color:#000000;fill:url(#linearGradient4478-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       d="m 14.055385,-0.028 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+       id="path3172-0"
+       style="opacity:0.4;fill:#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 14.055385,-1.027656 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+       id="path3172"
+       style="opacity:0.7;fill:url(#linearGradient3848);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-100.svg b/elementary-xfce/panel/22/battery-full.svg
similarity index 100%
rename from elementary-xfce/panel/22/gpm-battery-100.svg
rename to elementary-xfce/panel/22/battery-full.svg
diff --git a/elementary-xfce/panel/22/battery-good-charging.svg b/elementary-xfce/panel/22/battery-good-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/22/battery-good-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-good-charging.svg b/elementary-xfce/panel/22/battery-good-charging.svg
new file mode 100644
index 000000000..2e925b066
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-good-charging.svg
@@ -0,0 +1,131 @@
+<?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="22"
+   height="22"
+   id="svg3887">
+  <metadata
+     id="metadata25">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7-2">
+      <stop
+         id="stop3589-9-2-2-2-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1.0000003)" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3587-6-5-3-2-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
+  </defs>
+  <path
+     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208-6"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-18.75"
+     y="7.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236-1"
+     style="opacity:0.2;fill:none;stroke:#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" />
+  <path
+     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442-9"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="6"
+     height="8"
+     rx="0.25"
+     ry="0"
+     x="8"
+     y="11"
+     id="rect3965-9"
+     style="opacity:0.3;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:accumulate" />
+  <rect
+     width="6"
+     height="8"
+     rx="0.25"
+     ry="0"
+     x="8"
+     y="10"
+     id="rect3965"
+     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172-0"
+     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172"
+     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/22/battery-good.svg b/elementary-xfce/panel/22/battery-good.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/22/battery-good.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-good.svg b/elementary-xfce/panel/22/battery-good.svg
new file mode 100644
index 000000000..d4cfd11de
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-good.svg
@@ -0,0 +1,87 @@
+<?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="svg3239">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3241">
+    <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="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2392"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2395"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.3355121,-9.798735,7.5649955)" />
+  </defs>
+  <rect
+     width="6"
+     height="8"
+     rx="0.5"
+     ry="0.49999994"
+     x="8.0500002"
+     y="11"
+     id="rect3206"
+     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" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-18.75"
+     y="7.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236"
+     style="opacity:0.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" />
+  <path
+     d="m 6.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 8.0500002,10 C 10.05,10 12.05,10 14.05,10 c 0,2.666666 0,5.333334 0,8 -2,0 -4,0 -5.9999998,0 0,-2.666666 0,-5.333334 0,-8 z"
+     id="rect3728"
+     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 6.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/22/battery-low-charging.svg b/elementary-xfce/panel/22/battery-low-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/22/battery-low-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-low-charging.svg b/elementary-xfce/panel/22/battery-low-charging.svg
new file mode 100644
index 000000000..2199c4063
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-low-charging.svg
@@ -0,0 +1,131 @@
+<?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="22"
+   height="22"
+   id="svg3887">
+  <metadata
+     id="metadata25">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7-2">
+      <stop
+         id="stop3589-9-2-2-2-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1.0000003)" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3587-6-5-3-2-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.20969504,-9.798735,11.478122)" />
+  </defs>
+  <path
+     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208-6"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-18.75"
+     y="7.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236-1"
+     style="opacity:0.2;fill:none;stroke:#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" />
+  <path
+     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442-9"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="6"
+     height="5"
+     rx="0.25"
+     ry="0"
+     x="8"
+     y="14"
+     id="rect3965-9"
+     style="opacity:0.3;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:accumulate" />
+  <rect
+     width="6"
+     height="5"
+     rx="0.25"
+     ry="0"
+     x="8"
+     y="13"
+     id="rect3965"
+     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172-0"
+     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172"
+     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/22/battery-low.svg b/elementary-xfce/panel/22/battery-low.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/22/battery-low.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery-low.svg b/elementary-xfce/panel/22/battery-low.svg
new file mode 100644
index 000000000..dd1d35877
--- /dev/null
+++ b/elementary-xfce/panel/22/battery-low.svg
@@ -0,0 +1,87 @@
+<?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="svg3239">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3241">
+    <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="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2392"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2395"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.2096951,-9.798735,11.478122)" />
+  </defs>
+  <rect
+     width="6"
+     height="5"
+     rx="0.5"
+     ry="0.49999994"
+     x="8.0500002"
+     y="14"
+     id="rect3206"
+     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" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-18.75"
+     y="7.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236"
+     style="opacity:0.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" />
+  <path
+     d="m 6.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 8.0500002,13 C 10.05,13 12.05,13 14.05,13 c 0,1.666666 0,3.333334 0,5 -2,0 -4,0 -5.9999998,0 0,-1.666666 0,-3.333334 0,-5 z"
+     id="rect3728"
+     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 6.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/22/battery-missing.svg b/elementary-xfce/panel/22/battery-missing.svg
index ba417d0f9..e222aedae 120000
--- a/elementary-xfce/panel/22/battery-missing.svg
+++ b/elementary-xfce/panel/22/battery-missing.svg
@@ -1 +1 @@
-gpm-battery-missing.svg
\ No newline at end of file
+battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery_charged.svg b/elementary-xfce/panel/22/battery_charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/22/battery_charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery_full.svg b/elementary-xfce/panel/22/battery_full.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/22/battery_full.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/battery_plugged.svg b/elementary-xfce/panel/22/battery_plugged.svg
deleted file mode 120000
index e1ebcd6c2..000000000
--- a/elementary-xfce/panel/22/battery_plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-ac-adapter.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-battery-000-charging.svg b/elementary-xfce/panel/22/gpm-battery-000-charging.svg
deleted file mode 100644
index 34a82e998..000000000
--- a/elementary-xfce/panel/22/gpm-battery-000-charging.svg
+++ /dev/null
@@ -1,93 +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="22"
-   height="22"
-   id="svg3887">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
-  </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#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" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-000.svg b/elementary-xfce/panel/22/gpm-battery-000.svg
deleted file mode 100644
index a6c46fe4e..000000000
--- a/elementary-xfce/panel/22/gpm-battery-000.svg
+++ /dev/null
@@ -1,95 +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="22"
-   height="22"
-   id="svg3718">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3720">
-    <linearGradient
-       id="linearGradient3187">
-      <stop
-         id="stop3189"
-         style="stop-color:#a60000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3191"
-         style="stop-color:#ff1313;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3187"
-       id="linearGradient2997"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)"
-       x1="11.376964"
-       y1="14.98917"
-       x2="11.376964"
-       y2="17.01939" />
-    <linearGradient
-       xlink:href="#linearGradient3187"
-       id="linearGradient3000"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)"
-       x1="11.376964"
-       y1="7"
-       x2="11.376964"
-       y2="17.01939" />
-    <linearGradient
-       xlink:href="#linearGradient3187"
-       id="linearGradient3003"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)"
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21" />
-  </defs>
-  <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="path3471"
-     d="m 11,6.9999997 c -0.554,0 -1,0.446 -1,1 L 10,13 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 l 0,-5.0000003 c 0,-0.554 -0.446,-1 -1,-1 z M 10.75,15 C 10.3345,15 10,15.3345 10,15.75 l 0,0.5 c 0,0.4155 0.3345,0.75 0.75,0.75 l 0.5,0 C 11.6655,17 12,16.6655 12,16.25 l 0,-0.5 C 12,15.3345 11.6655,15 11.25,15 l -0.5,0 z" />
-  <rect
-     style="opacity:0.3;fill:none;stroke:#f00000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3236"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="7.25"
-     x="-18.75"
-     ry="0.25"
-     rx="0.25"
-     height="7.5"
-     width="14.5" />
-  <path
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3208"
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
-  <path
-     style="opacity:0.8;fill:none;stroke:url(#linearGradient3003);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect2442"
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
-  <path
-     style="opacity:0.8;fill:url(#linearGradient3000);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3467"
-     d="m 11,5.9999997 c 0.554,0 1,0.446 1,1 L 12,12 c 0,0.554 -0.446,1 -1,1 -0.554,0 -1,-0.446 -1,-1 l 0,-5.0000003 c 0,-0.554 0.446,-1 1,-1 z" />
-  <path
-     style="opacity:0.8;fill:url(#linearGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3448"
-     d="m 10.75,14 0.5,0 c 0.4155,0 0.75,0.3345 0.75,0.75 l 0,0.5 C 12,15.6655 11.6655,16 11.25,16 l -0.5,0 C 10.3345,16 10,15.6655 10,15.25 l 0,-0.5 C 10,14.3345 10.3345,14 10.75,14 z" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-020-charging.svg b/elementary-xfce/panel/22/gpm-battery-020-charging.svg
deleted file mode 100644
index c7e23f044..000000000
--- a/elementary-xfce/panel/22/gpm-battery-020-charging.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.1"
-   width="22"
-   height="22"
-   id="svg3887">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2852"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.12581702,-9.798735,14.086873)" />
-  </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#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" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="6"
-     height="3"
-     rx="0.25"
-     ry="0"
-     x="8"
-     y="16"
-     id="rect3965-9"
-     style="opacity:0.3;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:accumulate" />
-  <rect
-     width="6"
-     height="3"
-     rx="0.25"
-     ry="0"
-     x="8"
-     y="15"
-     id="rect3965"
-     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-020.svg b/elementary-xfce/panel/22/gpm-battery-020.svg
deleted file mode 100644
index c86437ddd..000000000
--- a/elementary-xfce/panel/22/gpm-battery-020.svg
+++ /dev/null
@@ -1,101 +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="svg2518">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2520">
-    <linearGradient
-       id="linearGradient3187">
-      <stop
-         id="stop3189"
-         style="stop-color:#a60000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3191"
-         style="stop-color:#ff1313;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="89.454575"
-       y1="30.517715"
-       x2="89.454575"
-       y2="37.832817"
-       id="linearGradient2516"
-       xlink:href="#linearGradient3187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.4101105,-25.63626,2.4843648)" />
-    <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="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
-  </defs>
-  <g
-     id="layer1">
-    <rect
-       width="6"
-       height="5"
-       rx="0.5"
-       ry="0.49999994"
-       x="8.0500002"
-       y="14"
-       id="rect3206"
-       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" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-18.75"
-       y="7.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       style="opacity:0.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" />
-    <path
-       d="m 6.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208"
-       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 8.0500002,15 C 10.05,15 12.05,15 14.05,15 c 0,1 0,2 0,3 -2,0 -4,0 -5.9999998,0 0,-1 0,-2 0,-3 z"
-       id="rect3728"
-       style="opacity:0.8;fill:url(#linearGradient2516);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 6.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442"
-       style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-040-charging.svg b/elementary-xfce/panel/22/gpm-battery-040-charging.svg
deleted file mode 100644
index 2199c4063..000000000
--- a/elementary-xfce/panel/22/gpm-battery-040-charging.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.1"
-   width="22"
-   height="22"
-   id="svg3887">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2852"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.20969504,-9.798735,11.478122)" />
-  </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#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" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="6"
-     height="5"
-     rx="0.25"
-     ry="0"
-     x="8"
-     y="14"
-     id="rect3965-9"
-     style="opacity:0.3;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:accumulate" />
-  <rect
-     width="6"
-     height="5"
-     rx="0.25"
-     ry="0"
-     x="8"
-     y="13"
-     id="rect3965"
-     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-040.svg b/elementary-xfce/panel/22/gpm-battery-040.svg
deleted file mode 100644
index dd1d35877..000000000
--- a/elementary-xfce/panel/22/gpm-battery-040.svg
+++ /dev/null
@@ -1,87 +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="svg3239">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3241">
-    <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="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.2096951,-9.798735,11.478122)" />
-  </defs>
-  <rect
-     width="6"
-     height="5"
-     rx="0.5"
-     ry="0.49999994"
-     x="8.0500002"
-     y="14"
-     id="rect3206"
-     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" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.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" />
-  <path
-     d="m 6.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 8.0500002,13 C 10.05,13 12.05,13 14.05,13 c 0,1.666666 0,3.333334 0,5 -2,0 -4,0 -5.9999998,0 0,-1.666666 0,-3.333334 0,-5 z"
-     id="rect3728"
-     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-060-charging.svg b/elementary-xfce/panel/22/gpm-battery-060-charging.svg
deleted file mode 100644
index 2e925b066..000000000
--- a/elementary-xfce/panel/22/gpm-battery-060-charging.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.1"
-   width="22"
-   height="22"
-   id="svg3887">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2852"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.33551206,-9.798735,7.5649954)" />
-  </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#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" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="6"
-     height="8"
-     rx="0.25"
-     ry="0"
-     x="8"
-     y="11"
-     id="rect3965-9"
-     style="opacity:0.3;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:accumulate" />
-  <rect
-     width="6"
-     height="8"
-     rx="0.25"
-     ry="0"
-     x="8"
-     y="10"
-     id="rect3965"
-     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-060.svg b/elementary-xfce/panel/22/gpm-battery-060.svg
deleted file mode 100644
index d4cfd11de..000000000
--- a/elementary-xfce/panel/22/gpm-battery-060.svg
+++ /dev/null
@@ -1,87 +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="svg3239">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3241">
-    <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="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.3355121,-9.798735,7.5649955)" />
-  </defs>
-  <rect
-     width="6"
-     height="8"
-     rx="0.5"
-     ry="0.49999994"
-     x="8.0500002"
-     y="11"
-     id="rect3206"
-     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" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.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" />
-  <path
-     d="m 6.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 8.0500002,10 C 10.05,10 12.05,10 14.05,10 c 0,2.666666 0,5.333334 0,8 -2,0 -4,0 -5.9999998,0 0,-2.666666 0,-5.333334 0,-8 z"
-     id="rect3728"
-     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-080-charging.svg b/elementary-xfce/panel/22/gpm-battery-080-charging.svg
deleted file mode 100644
index 72aee4fa3..000000000
--- a/elementary-xfce/panel/22/gpm-battery-080-charging.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.1"
-   width="22"
-   height="22"
-   id="svg3887">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,1.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1.0000003)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2852"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.41939008,-9.798735,4.9562442)" />
-  </defs>
-  <path
-     d="m 6.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;fill:none;stroke:#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" />
-  <path
-     d="m 6.5,18.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,18.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="6"
-     height="10"
-     rx="0.25"
-     ry="0"
-     x="8"
-     y="9"
-     id="rect3965-9"
-     style="opacity:0.3;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:accumulate" />
-  <rect
-     width="6"
-     height="10"
-     rx="0.25"
-     ry="0"
-     x="8"
-     y="8"
-     id="rect3965"
-     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 14.055385,5.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;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 14.055385,4.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-080.svg b/elementary-xfce/panel/22/gpm-battery-080.svg
deleted file mode 100644
index f3549db44..000000000
--- a/elementary-xfce/panel/22/gpm-battery-080.svg
+++ /dev/null
@@ -1,87 +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="svg3239">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3241">
-    <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="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-1)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.4193901,-9.798735,4.9562444)" />
-  </defs>
-  <rect
-     width="6"
-     height="10"
-     rx="0.5"
-     ry="0.49999997"
-     x="8.0500002"
-     y="9"
-     id="rect3206"
-     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" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-18.75"
-     y="7.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.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" />
-  <path
-     d="m 6.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,4.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 8.0500002,8 C 10.05,8 12.05,8 14.05,8 c 0,3.333333 0,6.666667 0,10 -2,0 -4,0 -5.9999998,0 0,-3.333333 0,-6.666667 0,-10 z"
-     id="rect3728"
-     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 6.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,3.381549 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-100-charging.svg b/elementary-xfce/panel/22/gpm-battery-100-charging.svg
deleted file mode 100644
index 8221113bd..000000000
--- a/elementary-xfce/panel/22/gpm-battery-100-charging.svg
+++ /dev/null
@@ -1,139 +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="22"
-   height="22"
-   id="svg3887">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient3848"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,-4.9568823)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2893-1"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-7.0000003)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient4478-1"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="translate(0,6)"
-     id="layer1">
-    <path
-       d="m 6.5,13.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,13.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-1.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208-6"
-       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-12.75"
-       y="7.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236-1"
-       style="opacity:0.2;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" />
-    <path
-       d="m 6.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-2.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442-9"
-       style="opacity:0.7;fill:none;stroke:url(#linearGradient2893-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="g3611"
-       style="opacity:0.5">
-      <rect
-         width="6"
-         height="13"
-         rx="0.25"
-         ry="0"
-         x="8"
-         y="0"
-         id="rect3965-9"
-         style="opacity:0.6;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:accumulate" />
-      <rect
-         width="6"
-         height="13"
-         rx="0.25"
-         ry="0"
-         x="8"
-         y="-1"
-         id="rect3965"
-         style="opacity:0.7;color:#000000;fill:url(#linearGradient4478-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <path
-       d="m 14.055385,-0.028 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-       id="path3172-0"
-       style="opacity:0.4;fill:#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 14.055385,-1.027656 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-       id="path3172"
-       style="opacity:0.7;fill:url(#linearGradient3848);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-charged.svg b/elementary-xfce/panel/22/gpm-battery-charged.svg
deleted file mode 100644
index c403e6382..000000000
--- a/elementary-xfce/panel/22/gpm-battery-charged.svg
+++ /dev/null
@@ -1,87 +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"
-   width="22"
-   height="22"
-   id="svg3701"
-   version="1.1">
-  <defs
-     id="defs3703">
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2485"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-7.0000003)" />
-    <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="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2488"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)" />
-  </defs>
-  <metadata
-     id="metadata3706">
-    <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
-     id="layer1"
-     transform="translate(0,6)">
-    <path
-       d="M 8.0625,-3.0146495e-7 C 8.0625,1.9999995 8.0625,3.9999996 8.0625,6 l 6,-6.00000030146495 c -2,0 -4,0 -6,0 z m 6,0 L 12.0625,5 l 2,0 c 0,-1.666667 0,-3.3333338 0,-5.00000030146495 z M 14.0625,6.15625 8.0625,13 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
-       id="rect3728-9"
-       style="opacity:0.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 6.5,13.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,13.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-1.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208"
-       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-12.75"
-       y="7.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       style="opacity:0.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" />
-    <path
-       d="m 8.0625,-1.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5 2,0 c 0,-1.6666667 0,-3.3333335 0,-5 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
-       id="rect3728"
-       style="opacity:0.7;fill:url(#linearGradient2488);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 6.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-2.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442"
-       style="opacity:0.7;fill:none;stroke:url(#linearGradient2485);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/22/gpm-battery-empty.svg b/elementary-xfce/panel/22/gpm-battery-empty.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/22/gpm-battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-battery-missing.svg b/elementary-xfce/panel/22/gpm-battery-missing.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/22/gpm-battery-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-000-charging.svg b/elementary-xfce/panel/22/gpm-primary-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/22/gpm-primary-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-000.svg b/elementary-xfce/panel/22/gpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/22/gpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-020-charging.svg b/elementary-xfce/panel/22/gpm-primary-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/22/gpm-primary-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-020.svg b/elementary-xfce/panel/22/gpm-primary-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/22/gpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-040-charging.svg b/elementary-xfce/panel/22/gpm-primary-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/22/gpm-primary-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-040.svg b/elementary-xfce/panel/22/gpm-primary-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/22/gpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-060-charging.svg b/elementary-xfce/panel/22/gpm-primary-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/22/gpm-primary-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-060.svg b/elementary-xfce/panel/22/gpm-primary-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/22/gpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-080-charging.svg b/elementary-xfce/panel/22/gpm-primary-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/22/gpm-primary-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-080.svg b/elementary-xfce/panel/22/gpm-primary-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/22/gpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-100-charging.svg b/elementary-xfce/panel/22/gpm-primary-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/22/gpm-primary-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-100.svg b/elementary-xfce/panel/22/gpm-primary-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/22/gpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-primary-charged.svg b/elementary-xfce/panel/22/gpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/22/gpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-ups-000-charging.svg b/elementary-xfce/panel/22/gpm-ups-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/22/gpm-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/panel/22/gpm-ups-000.svg b/elementary-xfce/panel/22/gpm-ups-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/22/gpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-ups-020-charging.svg b/elementary-xfce/panel/22/gpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/22/gpm-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/panel/22/gpm-ups-020.svg b/elementary-xfce/panel/22/gpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/22/gpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-ups-040-charging.svg b/elementary-xfce/panel/22/gpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/22/gpm-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/panel/22/gpm-ups-040.svg b/elementary-xfce/panel/22/gpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/22/gpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-ups-060-charging.svg b/elementary-xfce/panel/22/gpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/22/gpm-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/panel/22/gpm-ups-060.svg b/elementary-xfce/panel/22/gpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/22/gpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-ups-080-charging.svg b/elementary-xfce/panel/22/gpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/22/gpm-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/panel/22/gpm-ups-080.svg b/elementary-xfce/panel/22/gpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/22/gpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-ups-100-charging.svg b/elementary-xfce/panel/22/gpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/22/gpm-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/panel/22/gpm-ups-100.svg b/elementary-xfce/panel/22/gpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/22/gpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/gpm-ups-missing.svg b/elementary-xfce/panel/22/gpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce/panel/22/gpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/xfpm-ac-adapter.svg b/elementary-xfce/panel/22/xfpm-ac-adapter.svg
deleted file mode 120000
index e1ebcd6c2..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-000-charging.svg b/elementary-xfce/panel/22/xfpm-primary-000-charging.svg
deleted file mode 120000
index aa6dd36b9..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-000.svg b/elementary-xfce/panel/22/xfpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-020-charging.svg b/elementary-xfce/panel/22/xfpm-primary-020-charging.svg
deleted file mode 120000
index 17e5c8a06..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-020.svg b/elementary-xfce/panel/22/xfpm-primary-020.svg
deleted file mode 120000
index 85dbbfcb0..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-040-charging.svg b/elementary-xfce/panel/22/xfpm-primary-040-charging.svg
deleted file mode 120000
index 70af98bb3..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-040.svg b/elementary-xfce/panel/22/xfpm-primary-040.svg
deleted file mode 120000
index 3eafb6fad..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-060-charging.svg b/elementary-xfce/panel/22/xfpm-primary-060-charging.svg
deleted file mode 120000
index 9eace6f21..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-060.svg b/elementary-xfce/panel/22/xfpm-primary-060.svg
deleted file mode 120000
index 3b2d3aa1c..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-080-charging.svg b/elementary-xfce/panel/22/xfpm-primary-080-charging.svg
deleted file mode 120000
index a7087d713..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-080.svg b/elementary-xfce/panel/22/xfpm-primary-080.svg
deleted file mode 120000
index 1b9ff2e7d..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-100-charging.svg b/elementary-xfce/panel/22/xfpm-primary-100-charging.svg
deleted file mode 120000
index 89884c066..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-100.svg b/elementary-xfce/panel/22/xfpm-primary-100.svg
deleted file mode 120000
index 19652d770..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-charged.svg b/elementary-xfce/panel/22/xfpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/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/panel/22/xfpm-primary-missing.svg b/elementary-xfce/panel/22/xfpm-primary-missing.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-000-charging.svg b/elementary-xfce/panel/22/xfpm-ups-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-000.svg b/elementary-xfce/panel/22/xfpm-ups-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-020-charging.svg b/elementary-xfce/panel/22/xfpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-020.svg b/elementary-xfce/panel/22/xfpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-040-charging.svg b/elementary-xfce/panel/22/xfpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-040.svg b/elementary-xfce/panel/22/xfpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-060-charging.svg b/elementary-xfce/panel/22/xfpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-060.svg b/elementary-xfce/panel/22/xfpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-080-charging.svg b/elementary-xfce/panel/22/xfpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-080.svg b/elementary-xfce/panel/22/xfpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-100-charging.svg b/elementary-xfce/panel/22/xfpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-100.svg b/elementary-xfce/panel/22/xfpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-charged.svg b/elementary-xfce/panel/22/xfpm-ups-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/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/panel/22/xfpm-ups-missing.svg b/elementary-xfce/panel/22/xfpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce/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/panel/24/gpm-ac-adapter.svg b/elementary-xfce/panel/24/ac-adapter.svg
similarity index 100%
rename from elementary-xfce/panel/24/gpm-ac-adapter.svg
rename to elementary-xfce/panel/24/ac-adapter.svg
diff --git a/elementary-xfce/panel/24/battery-000-charging.svg b/elementary-xfce/panel/24/battery-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/24/battery-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-000.svg b/elementary-xfce/panel/24/battery-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/24/battery-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-020-charging.svg b/elementary-xfce/panel/24/battery-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/24/battery-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-020.svg b/elementary-xfce/panel/24/battery-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/24/battery-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-040-charging.svg b/elementary-xfce/panel/24/battery-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/24/battery-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-040.svg b/elementary-xfce/panel/24/battery-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/24/battery-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-060-charging.svg b/elementary-xfce/panel/24/battery-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/24/battery-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-060.svg b/elementary-xfce/panel/24/battery-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/24/battery-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-080-charging.svg b/elementary-xfce/panel/24/battery-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/24/battery-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-080.svg b/elementary-xfce/panel/24/battery-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/24/battery-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-100-charging.svg b/elementary-xfce/panel/24/battery-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/24/battery-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-100.svg b/elementary-xfce/panel/24/battery-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/24/battery-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-caution-charging.svg b/elementary-xfce/panel/24/battery-caution-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/24/battery-caution-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-caution-charging.svg b/elementary-xfce/panel/24/battery-caution-charging.svg
new file mode 100644
index 000000000..65990b1bb
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-caution-charging.svg
@@ -0,0 +1,131 @@
+<?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="14"
+   height="24"
+   id="svg3887">
+  <metadata
+     id="metadata25">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7-2">
+      <stop
+         id="stop3589-9-2-2-2-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-13.798734,2.0431177)" />
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,-3e-7)" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3587-6-5-3-2-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.12581702,-13.798735,15.086873)" />
+  </defs>
+  <path
+     d="m 2.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,5.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208-6"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-19.75"
+     y="3.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236-1"
+     style="opacity:0.2;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" />
+  <path
+     d="m 2.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442-9"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="6"
+     height="3"
+     rx="0.25"
+     ry="0"
+     x="4"
+     y="17"
+     id="rect3965-9"
+     style="opacity:0.3;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:accumulate" />
+  <rect
+     width="6"
+     height="3"
+     rx="0.25"
+     ry="0"
+     x="4"
+     y="16"
+     id="rect3965"
+     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 10.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172-0"
+     style="opacity:0.4;fill:#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 10.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172"
+     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/24/battery-caution.svg b/elementary-xfce/panel/24/battery-caution.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/24/battery-caution.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-caution.svg b/elementary-xfce/panel/24/battery-caution.svg
new file mode 100644
index 000000000..82e7f3783
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-caution.svg
@@ -0,0 +1,102 @@
+<?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="14"
+   height="24"
+   id="svg2518">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2520">
+    <linearGradient
+       id="linearGradient3187">
+      <stop
+         id="stop3189"
+         style="stop-color:#a60000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3191"
+         style="stop-color:#ff1313;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="89.454575"
+       y1="30.517715"
+       x2="89.454575"
+       y2="37.832817"
+       id="linearGradient2516"
+       xlink:href="#linearGradient3187"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.4101105,-29.63626,1.4843648)" />
+    <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="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2392"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,-2)" />
+  </defs>
+  <g
+     id="layer1"
+     transform="translate(0,2)">
+    <rect
+       width="6"
+       height="5"
+       rx="0.5"
+       ry="0.49999994"
+       x="4.0500002"
+       y="13"
+       id="rect3206"
+       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" />
+    <rect
+       width="14.5"
+       height="7.5"
+       rx="0.25"
+       ry="0.25"
+       x="-17.75"
+       y="3.25"
+       transform="matrix(0,-1,1,0,0,0)"
+       id="rect3236"
+       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" />
+    <path
+       d="m 2.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,3.381549 C 5.50334,3.053509 5.50417,2.725473 5.50514,2.397441 5.545901,1.799616 6.15474,1.420708 6.717338,1.499967 7.25026,1.5234 7.894234,1.375846 8.272203,1.863162 8.622964,2.30164 8.463608,2.884362 8.5,3.400369"
+       id="path3208"
+       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="M 4.0500002,14 C 6.05,14 8.05,14 10.05,14 c 0,1 0,2 0,3 -2,0 -4,0 -5.9999998,0 0,-1 0,-2 0,-3 z"
+       id="rect3728"
+       style="opacity:0.8;fill:url(#linearGradient2516);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 2.5,17.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,2.381549 C 5.50334,2.053509 5.50417,1.725473 5.50514,1.397441 5.545901,0.799616 6.15474,0.420708 6.717338,0.499967 7.25026,0.5234 7.894234,0.375846 8.272203,0.863162 8.622964,1.30164 8.463608,1.884362 8.5,2.400369"
+       id="rect2442"
+       style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/24/battery-charged.svg b/elementary-xfce/panel/24/battery-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/24/battery-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-empty-charging.svg b/elementary-xfce/panel/24/battery-empty-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/24/battery-empty-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-empty-charging.svg b/elementary-xfce/panel/24/battery-empty-charging.svg
new file mode 100644
index 000000000..888221908
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-empty-charging.svg
@@ -0,0 +1,93 @@
+<?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="14"
+   height="24"
+   id="svg3887">
+  <metadata
+     id="metadata23">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-13.798734,2.0431177)" />
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,-3e-7)" />
+  </defs>
+  <path
+     d="m 2.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,5.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208-6"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-19.75"
+     y="3.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236-1"
+     style="opacity:0.2;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" />
+  <path
+     d="m 2.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442-9"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 10.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172-0"
+     style="opacity:0.4;fill:#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 10.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172"
+     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/24/battery-empty.svg b/elementary-xfce/panel/24/battery-empty.svg
deleted file mode 120000
index 69aef787c..000000000
--- a/elementary-xfce/panel/24/battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-empty.svg b/elementary-xfce/panel/24/battery-empty.svg
new file mode 100644
index 000000000..79d6be5db
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-empty.svg
@@ -0,0 +1,95 @@
+<?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="14"
+   height="24"
+   id="svg3718">
+  <metadata
+     id="metadata19">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3720">
+    <linearGradient
+       id="linearGradient3187">
+      <stop
+         id="stop3189"
+         style="stop-color:#a60000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3191"
+         style="stop-color:#ff1313;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3187"
+       id="linearGradient2997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,-3e-7)"
+       x1="11.376964"
+       y1="14.98917"
+       x2="11.376964"
+       y2="17.01939" />
+    <linearGradient
+       xlink:href="#linearGradient3187"
+       id="linearGradient3000"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,-3e-7)"
+       x1="11.376964"
+       y1="7"
+       x2="11.376964"
+       y2="17.01939" />
+    <linearGradient
+       xlink:href="#linearGradient3187"
+       id="linearGradient3003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,-3e-7)"
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21" />
+  </defs>
+  <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="path3471"
+     d="m 7,7.9999997 c -0.554,0 -1,0.446 -1,1 L 6,14 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 L 8,8.9999997 c 0,-0.554 -0.446,-1 -1,-1 z M 6.75,16 C 6.3345,16 6,16.3345 6,16.75 l 0,0.5 C 6,17.6655 6.3345,18 6.75,18 l 0.5,0 C 7.6655,18 8,17.6655 8,17.25 l 0,-0.5 C 8,16.3345 7.6655,16 7.25,16 l -0.5,0 z" />
+  <rect
+     style="opacity:0.3;fill:none;stroke:#f00000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3236"
+     transform="matrix(0,-1,1,0,0,0)"
+     y="3.25"
+     x="-19.75"
+     ry="0.25"
+     rx="0.25"
+     height="7.5"
+     width="14.5" />
+  <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-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3208"
+     d="m 2.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,5.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
+  <path
+     style="opacity:0.8;fill:none;stroke:url(#linearGradient3003);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect2442"
+     d="m 2.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
+  <path
+     style="opacity:0.8;fill:url(#linearGradient3000);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3467"
+     d="m 7,6.9999997 c 0.554,0 1,0.446 1,1 L 8,13 C 8,13.554 7.554,14 7,14 6.446,14 6,13.554 6,13 L 6,7.9999997 c 0,-0.554 0.446,-1 1,-1 z" />
+  <path
+     style="opacity:0.8;fill:url(#linearGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3448"
+     d="m 6.75,15 0.5,0 C 7.6655,15 8,15.3345 8,15.75 l 0,0.5 C 8,16.6655 7.6655,17 7.25,17 l -0.5,0 C 6.3345,17 6,16.6655 6,16.25 l 0,-0.5 C 6,15.3345 6.3345,15 6.75,15 z" />
+</svg>
diff --git a/elementary-xfce/panel/24/battery-full-charged.svg b/elementary-xfce/panel/24/battery-full-charged.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/24/battery-full-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-full-charged.svg b/elementary-xfce/panel/24/battery-full-charged.svg
new file mode 100644
index 000000000..6fb4b6dae
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-full-charged.svg
@@ -0,0 +1,87 @@
+<?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"
+   width="24"
+   height="24"
+   id="svg3701"
+   version="1.1">
+  <defs
+     id="defs3703">
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2485"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-8.0000003)" />
+    <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="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2488"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798735,-5.9568826)" />
+  </defs>
+  <metadata
+     id="metadata3706">
+    <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
+     id="layer1"
+     transform="translate(0,8)">
+    <path
+       d="m 9.0625,-1.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5.0000003 2,0 c 0,-1.666667 0,-3.3333338 0,-5.0000003 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
+       id="rect3728-9"
+       style="opacity:0.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 7.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z m 3.00264,-15.1184513 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="path3208"
+       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="14.5"
+       height="7.5"
+       rx="0.25"
+       ry="0.25"
+       x="-11.75"
+       y="8.25"
+       transform="matrix(0,-1,1,0,0,0)"
+       id="rect3236"
+       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" />
+    <path
+       d="m 9.0625,-2.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5 2,0 c 0,-1.6666667 0,-3.3333335 0,-5 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
+       id="rect3728"
+       style="opacity:0.7;fill:url(#linearGradient2488);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 7.5,11.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,11.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z m 3.00264,-15.1184513 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="rect2442"
+       style="opacity:0.7;fill:none;stroke:url(#linearGradient2485);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/24/battery-full-charging.svg b/elementary-xfce/panel/24/battery-full-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/24/battery-full-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-full-charging.svg b/elementary-xfce/panel/24/battery-full-charging.svg
new file mode 100644
index 000000000..4b9b4e441
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-full-charging.svg
@@ -0,0 +1,140 @@
+<?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="24"
+   height="24"
+   id="svg3887">
+  <metadata
+     id="metadata27">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient3848"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,-4.9568823)" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2893-1"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-7.0000003)" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient4478-1"
+       xlink:href="#linearGradient3587-6-5-3-2-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)" />
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7-2">
+      <stop
+         id="stop3589-9-2-2-2-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     transform="translate(1,7)"
+     id="layer1">
+    <path
+       d="m 6.5,13.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,13.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-1.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="path3208-6"
+       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="14.5"
+       height="7.5"
+       rx="0.25"
+       ry="0.25"
+       x="-12.75"
+       y="7.25"
+       transform="matrix(0,-1,1,0,0,0)"
+       id="rect3236-1"
+       style="opacity:0.2;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" />
+    <path
+       d="m 6.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-2.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+       id="rect2442-9"
+       style="opacity:0.7;fill:none;stroke:url(#linearGradient2893-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g3611"
+       style="opacity:0.5">
+      <rect
+         width="6"
+         height="13"
+         rx="0.25"
+         ry="0"
+         x="8"
+         y="0"
+         id="rect3965-9"
+         style="opacity:0.6;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:accumulate" />
+      <rect
+         width="6"
+         height="13"
+         rx="0.25"
+         ry="0"
+         x="8"
+         y="-1"
+         id="rect3965"
+         style="opacity:0.7;color:#000000;fill:url(#linearGradient4478-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       d="m 14.055385,-0.028 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+       id="path3172-0"
+       style="opacity:0.4;fill:#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 14.055385,-1.027656 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+       id="path3172"
+       style="opacity:0.7;fill:url(#linearGradient3848);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-100.svg b/elementary-xfce/panel/24/battery-full.svg
similarity index 100%
rename from elementary-xfce/panel/24/gpm-battery-100.svg
rename to elementary-xfce/panel/24/battery-full.svg
diff --git a/elementary-xfce/panel/24/battery-good-charging.svg b/elementary-xfce/panel/24/battery-good-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/24/battery-good-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-good-charging.svg b/elementary-xfce/panel/24/battery-good-charging.svg
new file mode 100644
index 000000000..6f22a08da
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-good-charging.svg
@@ -0,0 +1,131 @@
+<?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="24"
+   height="24"
+   id="svg3887">
+  <metadata
+     id="metadata25">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7-2">
+      <stop
+         id="stop3589-9-2-2-2-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3587-6-5-3-2-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.33551206,-8.798735,8.5649954)" />
+  </defs>
+  <path
+     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208-6"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-19.75"
+     y="8.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236-1"
+     style="opacity:0.2;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" />
+  <path
+     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442-9"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="6"
+     height="8"
+     rx="0.25"
+     ry="0"
+     x="9"
+     y="12"
+     id="rect3965-9"
+     style="opacity:0.3;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:accumulate" />
+  <rect
+     width="6"
+     height="8"
+     rx="0.25"
+     ry="0"
+     x="9"
+     y="11"
+     id="rect3965"
+     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172-0"
+     style="opacity:0.4;fill:#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 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172"
+     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/24/battery-good.svg b/elementary-xfce/panel/24/battery-good.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/24/battery-good.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-good.svg b/elementary-xfce/panel/24/battery-good.svg
new file mode 100644
index 000000000..928c56a4c
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-good.svg
@@ -0,0 +1,87 @@
+<?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="24"
+   height="24"
+   id="svg3239">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3241">
+    <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="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2392"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2395"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.3355121,-8.798735,8.5649955)" />
+  </defs>
+  <rect
+     width="6"
+     height="8"
+     rx="0.5"
+     ry="0.49999994"
+     x="9.0500002"
+     y="12"
+     id="rect3206"
+     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" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-19.75"
+     y="8.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236"
+     style="opacity:0.3;fill:none;stroke:#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" />
+  <path
+     d="m 7.5,20.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 9.0500002,11 C 11.05,11 13.05,11 15.05,11 c 0,2.666666 0,5.333334 0,8 -2,0 -4,0 -5.9999998,0 0,-2.666666 0,-5.333334 0,-8 z"
+     id="rect3728"
+     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 7.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/24/battery-low-charging.svg b/elementary-xfce/panel/24/battery-low-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/24/battery-low-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-low-charging.svg b/elementary-xfce/panel/24/battery-low-charging.svg
new file mode 100644
index 000000000..8e8318f9f
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-low-charging.svg
@@ -0,0 +1,131 @@
+<?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="24"
+   height="24"
+   id="svg3887">
+  <metadata
+     id="metadata25">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3889">
+    <linearGradient
+       id="linearGradient3587-6-5-3-4-7">
+      <stop
+         id="stop3589-9-2-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-1-8"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7">
+      <stop
+         id="stop3589-9-2-2-2-7"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-3-2-7-2">
+      <stop
+         id="stop3589-9-2-2-2-7-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-73-6-9-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3587-6-5-3-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
+    <linearGradient
+       x1="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2843"
+       xlink:href="#linearGradient3587-6-5-3-2-7"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2852"
+       xlink:href="#linearGradient3587-6-5-3-2-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.20969504,-8.798735,12.478122)" />
+  </defs>
+  <path
+     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="path3208-6"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-19.75"
+     y="8.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236-1"
+     style="opacity:0.2;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" />
+  <path
+     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
+     id="rect2442-9"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="6"
+     height="5"
+     rx="0.25"
+     ry="0"
+     x="9"
+     y="15"
+     id="rect3965-9"
+     style="opacity:0.3;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:accumulate" />
+  <rect
+     width="6"
+     height="5"
+     rx="0.25"
+     ry="0"
+     x="9"
+     y="14"
+     id="rect3965"
+     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172-0"
+     style="opacity:0.4;fill:#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 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
+     id="path3172"
+     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/24/battery-low.svg b/elementary-xfce/panel/24/battery-low.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/24/battery-low.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery-low.svg b/elementary-xfce/panel/24/battery-low.svg
new file mode 100644
index 000000000..3b3c9a860
--- /dev/null
+++ b/elementary-xfce/panel/24/battery-low.svg
@@ -0,0 +1,87 @@
+<?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="14"
+   height="24"
+   id="svg3239">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3241">
+    <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="12"
+       y1="1.9895233"
+       x2="12"
+       y2="21"
+       id="linearGradient2392"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,0)" />
+    <linearGradient
+       x1="51.780437"
+       y1="7.2575765"
+       x2="51.780437"
+       y2="31.112288"
+       id="linearGradient2395"
+       xlink:href="#linearGradient3587-6-5-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4101105,0,0,0.2096951,-13.798735,12.478122)" />
+  </defs>
+  <rect
+     width="6"
+     height="5"
+     rx="0.5"
+     ry="0.49999994"
+     x="4.0500002"
+     y="15"
+     id="rect3206"
+     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" />
+  <rect
+     width="14.5"
+     height="7.5"
+     rx="0.25"
+     ry="0.25"
+     x="-19.75"
+     y="3.25"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3236"
+     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" />
+  <path
+     d="m 2.5,20.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,5.381549 C 5.50334,5.053509 5.50417,4.725473 5.50514,4.397441 5.545901,3.799616 6.15474,3.420708 6.717338,3.499967 7.25026,3.5234 7.894234,3.375846 8.272203,3.863162 8.622964,4.30164 8.463608,4.884362 8.5,5.400369"
+     id="path3208"
+     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 4.0500002,14 C 6.05,14 8.05,14 10.05,14 c 0,1.666666 0,3.333334 0,5 -2,0 -4,0 -5.9999998,0 0,-1.666666 0,-3.333334 0,-5 z"
+     id="rect3728"
+     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 2.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,4.381549 C 5.50334,4.053509 5.50417,3.725473 5.50514,3.397441 5.545901,2.799616 6.15474,2.420708 6.717338,2.499967 7.25026,2.5234 7.894234,2.375846 8.272203,2.863162 8.622964,3.30164 8.463608,3.884362 8.5,4.400369"
+     id="rect2442"
+     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/panel/24/battery-missing.svg b/elementary-xfce/panel/24/battery-missing.svg
index ba417d0f9..e222aedae 120000
--- a/elementary-xfce/panel/24/battery-missing.svg
+++ b/elementary-xfce/panel/24/battery-missing.svg
@@ -1 +1 @@
-gpm-battery-missing.svg
\ No newline at end of file
+battery-empty.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery_charged.svg b/elementary-xfce/panel/24/battery_charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/24/battery_charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery_full.svg b/elementary-xfce/panel/24/battery_full.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/24/battery_full.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/battery_plugged.svg b/elementary-xfce/panel/24/battery_plugged.svg
deleted file mode 120000
index e1ebcd6c2..000000000
--- a/elementary-xfce/panel/24/battery_plugged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-ac-adapter.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-battery-000-charging.svg b/elementary-xfce/panel/24/gpm-battery-000-charging.svg
deleted file mode 100644
index 888221908..000000000
--- a/elementary-xfce/panel/24/gpm-battery-000-charging.svg
+++ /dev/null
@@ -1,93 +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="14"
-   height="24"
-   id="svg3887">
-  <metadata
-     id="metadata23">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-13.798734,2.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5,-3e-7)" />
-  </defs>
-  <path
-     d="m 2.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,5.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="3.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;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" />
-  <path
-     d="m 2.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 10.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;fill:#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 10.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-000.svg b/elementary-xfce/panel/24/gpm-battery-000.svg
deleted file mode 100644
index 79d6be5db..000000000
--- a/elementary-xfce/panel/24/gpm-battery-000.svg
+++ /dev/null
@@ -1,95 +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="14"
-   height="24"
-   id="svg3718">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3720">
-    <linearGradient
-       id="linearGradient3187">
-      <stop
-         id="stop3189"
-         style="stop-color:#a60000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3191"
-         style="stop-color:#ff1313;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3187"
-       id="linearGradient2997"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5,-3e-7)"
-       x1="11.376964"
-       y1="14.98917"
-       x2="11.376964"
-       y2="17.01939" />
-    <linearGradient
-       xlink:href="#linearGradient3187"
-       id="linearGradient3000"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5,-3e-7)"
-       x1="11.376964"
-       y1="7"
-       x2="11.376964"
-       y2="17.01939" />
-    <linearGradient
-       xlink:href="#linearGradient3187"
-       id="linearGradient3003"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5,-3e-7)"
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21" />
-  </defs>
-  <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="path3471"
-     d="m 7,7.9999997 c -0.554,0 -1,0.446 -1,1 L 6,14 c 0,0.554 0.446,1 1,1 0.554,0 1,-0.446 1,-1 L 8,8.9999997 c 0,-0.554 -0.446,-1 -1,-1 z M 6.75,16 C 6.3345,16 6,16.3345 6,16.75 l 0,0.5 C 6,17.6655 6.3345,18 6.75,18 l 0.5,0 C 7.6655,18 8,17.6655 8,17.25 l 0,-0.5 C 8,16.3345 7.6655,16 7.25,16 l -0.5,0 z" />
-  <rect
-     style="opacity:0.3;fill:none;stroke:#f00000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3236"
-     transform="matrix(0,-1,1,0,0,0)"
-     y="3.25"
-     x="-19.75"
-     ry="0.25"
-     rx="0.25"
-     height="7.5"
-     width="14.5" />
-  <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-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3208"
-     d="m 2.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,5.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
-  <path
-     style="opacity:0.8;fill:none;stroke:url(#linearGradient3003);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect2442"
-     d="m 2.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207" />
-  <path
-     style="opacity:0.8;fill:url(#linearGradient3000);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="path3467"
-     d="m 7,6.9999997 c 0.554,0 1,0.446 1,1 L 8,13 C 8,13.554 7.554,14 7,14 6.446,14 6,13.554 6,13 L 6,7.9999997 c 0,-0.554 0.446,-1 1,-1 z" />
-  <path
-     style="opacity:0.8;fill:url(#linearGradient2997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     id="rect3448"
-     d="m 6.75,15 0.5,0 C 7.6655,15 8,15.3345 8,15.75 l 0,0.5 C 8,16.6655 7.6655,17 7.25,17 l -0.5,0 C 6.3345,17 6,16.6655 6,16.25 l 0,-0.5 C 6,15.3345 6.3345,15 6.75,15 z" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-020-charging.svg b/elementary-xfce/panel/24/gpm-battery-020-charging.svg
deleted file mode 100644
index 65990b1bb..000000000
--- a/elementary-xfce/panel/24/gpm-battery-020-charging.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.1"
-   width="14"
-   height="24"
-   id="svg3887">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-13.798734,2.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5,-3e-7)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2852"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.12581702,-13.798735,15.086873)" />
-  </defs>
-  <path
-     d="m 2.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,5.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="3.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;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" />
-  <path
-     d="m 2.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 11.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,4.3815487 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="6"
-     height="3"
-     rx="0.25"
-     ry="0"
-     x="4"
-     y="17"
-     id="rect3965-9"
-     style="opacity:0.3;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:accumulate" />
-  <rect
-     width="6"
-     height="3"
-     rx="0.25"
-     ry="0"
-     x="4"
-     y="16"
-     id="rect3965"
-     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 10.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;fill:#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 10.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-020.svg b/elementary-xfce/panel/24/gpm-battery-020.svg
deleted file mode 100644
index 82e7f3783..000000000
--- a/elementary-xfce/panel/24/gpm-battery-020.svg
+++ /dev/null
@@ -1,102 +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="14"
-   height="24"
-   id="svg2518">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2520">
-    <linearGradient
-       id="linearGradient3187">
-      <stop
-         id="stop3189"
-         style="stop-color:#a60000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3191"
-         style="stop-color:#ff1313;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="89.454575"
-       y1="30.517715"
-       x2="89.454575"
-       y2="37.832817"
-       id="linearGradient2516"
-       xlink:href="#linearGradient3187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.4101105,-29.63626,1.4843648)" />
-    <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="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5,-2)" />
-  </defs>
-  <g
-     id="layer1"
-     transform="translate(0,2)">
-    <rect
-       width="6"
-       height="5"
-       rx="0.5"
-       ry="0.49999994"
-       x="4.0500002"
-       y="13"
-       id="rect3206"
-       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" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-17.75"
-       y="3.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       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" />
-    <path
-       d="m 2.5,18.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,3.381549 C 5.50334,3.053509 5.50417,2.725473 5.50514,2.397441 5.545901,1.799616 6.15474,1.420708 6.717338,1.499967 7.25026,1.5234 7.894234,1.375846 8.272203,1.863162 8.622964,2.30164 8.463608,2.884362 8.5,3.400369"
-       id="path3208"
-       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 4.0500002,14 C 6.05,14 8.05,14 10.05,14 c 0,1 0,2 0,3 -2,0 -4,0 -5.9999998,0 0,-1 0,-2 0,-3 z"
-       id="rect3728"
-       style="opacity:0.8;fill:url(#linearGradient2516);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 2.5,17.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,2.381549 C 5.50334,2.053509 5.50417,1.725473 5.50514,1.397441 5.545901,0.799616 6.15474,0.420708 6.717338,0.499967 7.25026,0.5234 7.894234,0.375846 8.272203,0.863162 8.622964,1.30164 8.463608,1.884362 8.5,2.400369"
-       id="rect2442"
-       style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-040-charging.svg b/elementary-xfce/panel/24/gpm-battery-040-charging.svg
deleted file mode 100644
index 8e8318f9f..000000000
--- a/elementary-xfce/panel/24/gpm-battery-040-charging.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.1"
-   width="24"
-   height="24"
-   id="svg3887">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2852"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.20969504,-8.798735,12.478122)" />
-  </defs>
-  <path
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;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" />
-  <path
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="6"
-     height="5"
-     rx="0.25"
-     ry="0"
-     x="9"
-     y="15"
-     id="rect3965-9"
-     style="opacity:0.3;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:accumulate" />
-  <rect
-     width="6"
-     height="5"
-     rx="0.25"
-     ry="0"
-     x="9"
-     y="14"
-     id="rect3965"
-     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;fill:#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 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-040.svg b/elementary-xfce/panel/24/gpm-battery-040.svg
deleted file mode 100644
index 3b3c9a860..000000000
--- a/elementary-xfce/panel/24/gpm-battery-040.svg
+++ /dev/null
@@ -1,87 +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="14"
-   height="24"
-   id="svg3239">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3241">
-    <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="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-5,0)" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.2096951,-13.798735,12.478122)" />
-  </defs>
-  <rect
-     width="6"
-     height="5"
-     rx="0.5"
-     ry="0.49999994"
-     x="4.0500002"
-     y="15"
-     id="rect3206"
-     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" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="3.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     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" />
-  <path
-     d="m 2.5,20.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,5.381549 C 5.50334,5.053509 5.50417,4.725473 5.50514,4.397441 5.545901,3.799616 6.15474,3.420708 6.717338,3.499967 7.25026,3.5234 7.894234,3.375846 8.272203,3.863162 8.622964,4.30164 8.463608,4.884362 8.5,5.400369"
-     id="path3208"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 4.0500002,14 C 6.05,14 8.05,14 10.05,14 c 0,1.666666 0,3.333334 0,5 -2,0 -4,0 -5.9999998,0 0,-1.666666 0,-3.333334 0,-5 z"
-     id="rect3728"
-     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 2.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 5.50264,4.381549 C 5.50334,4.053509 5.50417,3.725473 5.50514,3.397441 5.545901,2.799616 6.15474,2.420708 6.717338,2.499967 7.25026,2.5234 7.894234,2.375846 8.272203,2.863162 8.622964,3.30164 8.463608,3.884362 8.5,4.400369"
-     id="rect2442"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-060-charging.svg b/elementary-xfce/panel/24/gpm-battery-060-charging.svg
deleted file mode 100644
index 6f22a08da..000000000
--- a/elementary-xfce/panel/24/gpm-battery-060-charging.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.1"
-   width="24"
-   height="24"
-   id="svg3887">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2852"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.33551206,-8.798735,8.5649954)" />
-  </defs>
-  <path
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;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" />
-  <path
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="6"
-     height="8"
-     rx="0.25"
-     ry="0"
-     x="9"
-     y="12"
-     id="rect3965-9"
-     style="opacity:0.3;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:accumulate" />
-  <rect
-     width="6"
-     height="8"
-     rx="0.25"
-     ry="0"
-     x="9"
-     y="11"
-     id="rect3965"
-     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;fill:#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 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-060.svg b/elementary-xfce/panel/24/gpm-battery-060.svg
deleted file mode 100644
index 928c56a4c..000000000
--- a/elementary-xfce/panel/24/gpm-battery-060.svg
+++ /dev/null
@@ -1,87 +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="24"
-   height="24"
-   id="svg3239">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3241">
-    <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="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.3355121,-8.798735,8.5649955)" />
-  </defs>
-  <rect
-     width="6"
-     height="8"
-     rx="0.5"
-     ry="0.49999994"
-     x="9.0500002"
-     y="12"
-     id="rect3206"
-     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" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.3;fill:none;stroke:#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" />
-  <path
-     d="m 7.5,20.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 9.0500002,11 C 11.05,11 13.05,11 15.05,11 c 0,2.666666 0,5.333334 0,8 -2,0 -4,0 -5.9999998,0 0,-2.666666 0,-5.333334 0,-8 z"
-     id="rect3728"
-     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-080-charging.svg b/elementary-xfce/panel/24/gpm-battery-080-charging.svg
deleted file mode 100644
index 1bba63a9e..000000000
--- a/elementary-xfce/panel/24/gpm-battery-080-charging.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.1"
-   width="24"
-   height="24"
-   id="svg3887">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2836"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798734,2.0431177)" />
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2843"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2852"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.41939008,-8.798735,5.9562442)" />
-  </defs>
-  <path
-     d="m 7.5,20.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,20.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208-6"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236-1"
-     style="opacity:0.2;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" />
-  <path
-     d="m 7.5,19.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,19.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.3815487 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442-9"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2843);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="6"
-     height="10"
-     rx="0.25"
-     ry="0"
-     x="9"
-     y="10"
-     id="rect3965-9"
-     style="opacity:0.3;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:accumulate" />
-  <rect
-     width="6"
-     height="10"
-     rx="0.25"
-     ry="0"
-     x="9"
-     y="9"
-     id="rect3965"
-     style="opacity:0.35;color:#000000;fill:url(#linearGradient2852);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 15.055385,6.972 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172-0"
-     style="opacity:0.4;fill:#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 15.055385,5.972344 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-     id="path3172"
-     style="opacity:0.7;fill:url(#linearGradient2836);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-080.svg b/elementary-xfce/panel/24/gpm-battery-080.svg
deleted file mode 100644
index 2d86dda48..000000000
--- a/elementary-xfce/panel/24/gpm-battery-080.svg
+++ /dev/null
@@ -1,87 +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="24"
-   height="24"
-   id="svg3239">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3241">
-    <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="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2392"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2395"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.4193901,-8.798735,5.9562444)" />
-  </defs>
-  <rect
-     width="6"
-     height="10"
-     rx="0.5"
-     ry="0.49999997"
-     x="9.0500002"
-     y="10"
-     id="rect3206"
-     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" />
-  <rect
-     width="14.5"
-     height="7.5"
-     rx="0.25"
-     ry="0.25"
-     x="-19.75"
-     y="8.25"
-     transform="matrix(0,-1,1,0,0,0)"
-     id="rect3236"
-     style="opacity:0.3;fill:none;stroke:#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" />
-  <path
-     d="m 7.5,20.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,5.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="path3208"
-     style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 9.0500002,9 C 11.05,9 13.05,9 15.05,9 c 0,3.333333 0,6.666667 0,10 -2,0 -4,0 -5.9999998,0 0,-3.333333 0,-6.666667 0,-10 z"
-     id="rect3728"
-     style="opacity:0.7;fill:url(#linearGradient2395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 7.5,19.5 0,-14 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 l 0,14 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 10.50264,4.381549 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-     id="rect2442"
-     style="opacity:0.7;fill:none;stroke:url(#linearGradient2392);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-100-charging.svg b/elementary-xfce/panel/24/gpm-battery-100-charging.svg
deleted file mode 100644
index 4b9b4e441..000000000
--- a/elementary-xfce/panel/24/gpm-battery-100-charging.svg
+++ /dev/null
@@ -1,140 +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="24"
-   height="24"
-   id="svg3887">
-  <metadata
-     id="metadata27">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3889">
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient3848"
-       xlink:href="#linearGradient3587-6-5-3-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798734,-4.9568823)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-4-7">
-      <stop
-         id="stop3589-9-2-2-8-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-1-8"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2893-1"
-       xlink:href="#linearGradient3587-6-5-3-2-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-1,-7.0000003)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7">
-      <stop
-         id="stop3589-9-2-2-2-7"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient4478-1"
-       xlink:href="#linearGradient3587-6-5-3-2-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-9.798735,-4.9568826)" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-2-7-2">
-      <stop
-         id="stop3589-9-2-2-2-7-2"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-6-9-9"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="translate(1,7)"
-     id="layer1">
-    <path
-       d="m 6.5,13.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,13.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-1.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208-6"
-       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-12.75"
-       y="7.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236-1"
-       style="opacity:0.2;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" />
-    <path
-       d="m 6.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 15.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z M 9.50264,-2.6184513 c 7e-4,-0.32804 0.00153,-0.656076 0.0025,-0.984108 0.040761,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442-9"
-       style="opacity:0.7;fill:none;stroke:url(#linearGradient2893-1);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="g3611"
-       style="opacity:0.5">
-      <rect
-         width="6"
-         height="13"
-         rx="0.25"
-         ry="0"
-         x="8"
-         y="0"
-         id="rect3965-9"
-         style="opacity:0.6;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:accumulate" />
-      <rect
-         width="6"
-         height="13"
-         rx="0.25"
-         ry="0"
-         x="8"
-         y="-1"
-         id="rect3965"
-         style="opacity:0.7;color:#000000;fill:url(#linearGradient4478-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <path
-       d="m 14.055385,-0.028 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-       id="path3172-0"
-       style="opacity:0.4;fill:#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 14.055385,-1.027656 -7.0000002,6.999999 4.0000002,0 -3.0000002,6.000001 7.0000002,-8.000001 -3,0 2,-4.999999 z"
-       id="path3172"
-       style="opacity:0.7;fill:url(#linearGradient3848);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-charged.svg b/elementary-xfce/panel/24/gpm-battery-charged.svg
deleted file mode 100644
index 6fb4b6dae..000000000
--- a/elementary-xfce/panel/24/gpm-battery-charged.svg
+++ /dev/null
@@ -1,87 +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"
-   width="24"
-   height="24"
-   id="svg3701"
-   version="1.1">
-  <defs
-     id="defs3703">
-    <linearGradient
-       x1="12"
-       y1="1.9895233"
-       x2="12"
-       y2="21"
-       id="linearGradient2485"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-8.0000003)" />
-    <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="51.780437"
-       y1="7.2575765"
-       x2="51.780437"
-       y2="31.112288"
-       id="linearGradient2488"
-       xlink:href="#linearGradient3587-6-5-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4101105,0,0,0.5452071,-8.798735,-5.9568826)" />
-  </defs>
-  <metadata
-     id="metadata3706">
-    <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
-     id="layer1"
-     transform="translate(0,8)">
-    <path
-       d="m 9.0625,-1.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5.0000003 2,0 c 0,-1.666667 0,-3.3333338 0,-5.0000003 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
-       id="rect3728-9"
-       style="opacity:0.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 7.5,12.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,12.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z m 3.00264,-15.1184513 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="path3208"
-       style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="14.5"
-       height="7.5"
-       rx="0.25"
-       ry="0.25"
-       x="-11.75"
-       y="8.25"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="rect3236"
-       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" />
-    <path
-       d="m 9.0625,-2.0000003 c 0,1.9999998 0,3.9999999 0,6.0000003 l 6,-6.0000003 c -2,0 -4,0 -6,0 z m 6,0 -2,5 2,0 c 0,-1.6666667 0,-3.3333335 0,-5 z m 0,6.1562503 -6,6.84375 c 2,0 4,0 6,0 0,-2.28125 0,-4.5625 0,-6.84375 z m -6,6.84375 3,-6 -3,0 c 0,2 0,4 0,6 z"
-       id="rect3728"
-       style="opacity:0.7;fill:url(#linearGradient2488);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 7.5,11.5 0,-14.0000003 c 0,-0.554 0.446,-1 1,-1 l 7,0 c 0.554,0 1,0.446 1,1 L 16.5,11.5 c 0,0.554 -0.446,1 -1,1 l -7,0 c -0.554,0 -1,-0.446 -1,-1 z m 3.00264,-15.1184513 c 7e-4,-0.32804 0.0015,-0.656076 0.0025,-0.984108 0.04076,-0.597825 0.6496,-0.976733 1.212198,-0.897474 0.532922,0.023433 1.176896,-0.124121 1.554865,0.363195 0.350761,0.438478 0.191405,1.0212 0.227797,1.537207"
-       id="rect2442"
-       style="opacity:0.7;fill:none;stroke:url(#linearGradient2485);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/24/gpm-battery-empty.svg b/elementary-xfce/panel/24/gpm-battery-empty.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/24/gpm-battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-battery-missing.svg b/elementary-xfce/panel/24/gpm-battery-missing.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/24/gpm-battery-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-000-charging.svg b/elementary-xfce/panel/24/gpm-primary-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/24/gpm-primary-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-000.svg b/elementary-xfce/panel/24/gpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/24/gpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-020-charging.svg b/elementary-xfce/panel/24/gpm-primary-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/24/gpm-primary-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-020.svg b/elementary-xfce/panel/24/gpm-primary-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/24/gpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-040-charging.svg b/elementary-xfce/panel/24/gpm-primary-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/24/gpm-primary-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-040.svg b/elementary-xfce/panel/24/gpm-primary-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/24/gpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-060-charging.svg b/elementary-xfce/panel/24/gpm-primary-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/24/gpm-primary-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-060.svg b/elementary-xfce/panel/24/gpm-primary-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/24/gpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-080-charging.svg b/elementary-xfce/panel/24/gpm-primary-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/24/gpm-primary-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-080.svg b/elementary-xfce/panel/24/gpm-primary-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/24/gpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-100-charging.svg b/elementary-xfce/panel/24/gpm-primary-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/24/gpm-primary-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-100.svg b/elementary-xfce/panel/24/gpm-primary-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/24/gpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-primary-charged.svg b/elementary-xfce/panel/24/gpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/24/gpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-ups-000-charging.svg b/elementary-xfce/panel/24/gpm-ups-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/24/gpm-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/panel/24/gpm-ups-000.svg b/elementary-xfce/panel/24/gpm-ups-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/24/gpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-ups-020-charging.svg b/elementary-xfce/panel/24/gpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/24/gpm-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/panel/24/gpm-ups-020.svg b/elementary-xfce/panel/24/gpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/24/gpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-ups-040-charging.svg b/elementary-xfce/panel/24/gpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/24/gpm-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/panel/24/gpm-ups-040.svg b/elementary-xfce/panel/24/gpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/24/gpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-ups-060-charging.svg b/elementary-xfce/panel/24/gpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/24/gpm-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/panel/24/gpm-ups-060.svg b/elementary-xfce/panel/24/gpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/24/gpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-ups-080-charging.svg b/elementary-xfce/panel/24/gpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/24/gpm-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/panel/24/gpm-ups-080.svg b/elementary-xfce/panel/24/gpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/24/gpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-ups-100-charging.svg b/elementary-xfce/panel/24/gpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/24/gpm-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/panel/24/gpm-ups-100.svg b/elementary-xfce/panel/24/gpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/24/gpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/gpm-ups-missing.svg b/elementary-xfce/panel/24/gpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce/panel/24/gpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/xfpm-primary-000-charging.svg b/elementary-xfce/panel/24/xfpm-primary-000-charging.svg
deleted file mode 120000
index aa6dd36b9..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-000.svg b/elementary-xfce/panel/24/xfpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-020-charging.svg b/elementary-xfce/panel/24/xfpm-primary-020-charging.svg
deleted file mode 120000
index 17e5c8a06..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-020.svg b/elementary-xfce/panel/24/xfpm-primary-020.svg
deleted file mode 120000
index 85dbbfcb0..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-040-charging.svg b/elementary-xfce/panel/24/xfpm-primary-040-charging.svg
deleted file mode 120000
index 70af98bb3..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-040.svg b/elementary-xfce/panel/24/xfpm-primary-040.svg
deleted file mode 120000
index 3eafb6fad..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-060-charging.svg b/elementary-xfce/panel/24/xfpm-primary-060-charging.svg
deleted file mode 120000
index 9eace6f21..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-060.svg b/elementary-xfce/panel/24/xfpm-primary-060.svg
deleted file mode 120000
index 3b2d3aa1c..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-080-charging.svg b/elementary-xfce/panel/24/xfpm-primary-080-charging.svg
deleted file mode 120000
index a7087d713..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-080.svg b/elementary-xfce/panel/24/xfpm-primary-080.svg
deleted file mode 120000
index 1b9ff2e7d..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-100-charging.svg b/elementary-xfce/panel/24/xfpm-primary-100-charging.svg
deleted file mode 120000
index 89884c066..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-100.svg b/elementary-xfce/panel/24/xfpm-primary-100.svg
deleted file mode 120000
index 19652d770..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-charged.svg b/elementary-xfce/panel/24/xfpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/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/panel/24/xfpm-primary-missing.svg b/elementary-xfce/panel/24/xfpm-primary-missing.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-000-charging.svg b/elementary-xfce/panel/24/xfpm-ups-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-000.svg b/elementary-xfce/panel/24/xfpm-ups-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-020-charging.svg b/elementary-xfce/panel/24/xfpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-020.svg b/elementary-xfce/panel/24/xfpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-040-charging.svg b/elementary-xfce/panel/24/xfpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-040.svg b/elementary-xfce/panel/24/xfpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-060-charging.svg b/elementary-xfce/panel/24/xfpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-060.svg b/elementary-xfce/panel/24/xfpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-080-charging.svg b/elementary-xfce/panel/24/xfpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-080.svg b/elementary-xfce/panel/24/xfpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-100-charging.svg b/elementary-xfce/panel/24/xfpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-100.svg b/elementary-xfce/panel/24/xfpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-charged.svg b/elementary-xfce/panel/24/xfpm-ups-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/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/panel/24/xfpm-ups-missing.svg b/elementary-xfce/panel/24/xfpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce/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/panel/48/gpm-ac-adapter.svg b/elementary-xfce/panel/48/gpm-ac-adapter.svg
deleted file mode 100644
index 0505f25af..000000000
--- a/elementary-xfce/panel/48/gpm-ac-adapter.svg
+++ /dev/null
@@ -1,561 +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"
-   width="48px"
-   height="48px"
-   id="svg5452"
-   version="1.1">
-  <defs
-     id="defs5454">
-    <linearGradient
-       xlink:href="#linearGradient8265-821-176-38-919-66-249"
-       id="linearGradient4773"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.064929,-9.460843)"
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         id="stop2687" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop2689" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient4702"
-       id="linearGradient4708"
-       x1="24"
-       y1="33.401722"
-       x2="33"
-       y2="33.401722"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       gradientTransform="translate(0,-1.9999996)" />
-    <linearGradient
-       id="linearGradient4702">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4704" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4706" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3844-4-1-98"
-       id="linearGradient4777"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.03983699,0,0,0.25602145,25.359729,41.816203)"
-       spreadMethod="reflect"
-       x1="102.30806"
-       y1="-2.3925467"
-       x2="102.30806"
-       y2="-24.582239" />
-    <linearGradient
-       id="linearGradient3844-4-1-98">
-      <stop
-         offset="0"
-         style="stop-color:#a5a6a8;stop-opacity:1"
-         id="stop3846-6-6-1" />
-      <stop
-         offset="1"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         id="stop3848-9-0-6" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient2509-9-1-4"
-       id="linearGradient4779"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.03983699,0,0,0.25602145,25.359729,41.816203)"
-       x1="109.95628"
-       y1="-24.91135"
-       x2="109.95628"
-       y2="-2.3757858" />
-    <linearGradient
-       id="linearGradient2509-9-1-4">
-      <stop
-         offset="0"
-         style="stop-color:#b3b3b3;stop-opacity:1"
-         id="stop2511-0-9-7" />
-      <stop
-         offset="1"
-         style="stop-color:#dadada;stop-opacity:1"
-         id="stop2513-3-1-74" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3858-4-6-8-7"
-       id="linearGradient4781"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.08657366,0,0,0.54407192,21.34809,29.607896)"
-       x1="89.01844"
-       y1="22.536863"
-       x2="89.01844"
-       y2="27.54611" />
-    <linearGradient
-       id="linearGradient3858-4-6-8-7">
-      <stop
-         offset="0"
-         style="stop-color:#a0a0a0;stop-opacity:1"
-         id="stop3860-9-8-5-3" />
-      <stop
-         offset="1"
-         style="stop-color:#4a4a4a;stop-opacity:1"
-         id="stop3862-9-2-3-8" />
-    </linearGradient>
-    <linearGradient
-       y2="30.155411"
-       x2="77.444443"
-       y1="41.184654"
-       x1="77.444443"
-       gradientTransform="matrix(0.85681647,0,0,0.69944042,-41.49886,12.561165)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4681"
-       xlink:href="#linearGradient3188-6-5" />
-    <linearGradient
-       id="linearGradient3188-6-5">
-      <stop
-         offset="0"
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         id="stop3190-6-58" />
-      <stop
-         offset="1"
-         style="stop-color:#282828;stop-opacity:1"
-         id="stop3192-6-88" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3642">
-      <stop
-         id="stop3644"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3646"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient3690"
-       id="radialGradient4025"
-       cx="25"
-       cy="12"
-       fx="25"
-       fy="12"
-       r="7.5"
-       gradientTransform="matrix(0,2.9755329,-1.5333334,0,43.400001,-67.388322)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3690">
-      <stop
-         offset="0"
-         style="stop-color:#ffeb9f;stop-opacity:1"
-         id="stop3692" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#ffd57e;stop-opacity:1"
-         id="stop3694" />
-      <stop
-         offset="0.66093999"
-         style="stop-color:#ffbc43;stop-opacity:1"
-         id="stop3696" />
-      <stop
-         offset="1"
-         style="stop-color:#ff921a;stop-opacity:1"
-         id="stop3698" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3603"
-       id="linearGradient4033"
-       x1="20"
-       y1="31.173784"
-       x2="20"
-       y2="8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-0.99999964)" />
-    <linearGradient
-       id="linearGradient3603">
-      <stop
-         offset="0"
-         style="stop-color:#a7651c;stop-opacity:1"
-         id="stop3605" />
-      <stop
-         offset="1"
-         style="stop-color:#c8a700;stop-opacity:1"
-         id="stop3607" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient4649"
-       id="linearGradient4647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54285711,0,0,0.36842106,10.97143,25.473684)"
-       x1="21.381216"
-       y1="5.0524864"
-       x2="21.381216"
-       y2="44.137077" />
-    <linearGradient
-       id="linearGradient4649">
-      <stop
-         id="stop4652"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0" />
-      <stop
-         offset="0.18506598"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         id="stop4654" />
-      <stop
-         id="stop4656"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         offset="0.87953037" />
-      <stop
-         id="stop4658"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3188-6"
-       id="linearGradient4190-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-52.444445,-73.155409)"
-       x1="77.444443"
-       y1="41.184654"
-       x2="77.444443"
-       y2="30.155411" />
-    <linearGradient
-       id="linearGradient3188-6">
-      <stop
-         offset="0"
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         id="stop3190-6" />
-      <stop
-         offset="1"
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         id="stop3192-6" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient4660"
-       id="radialGradient4267"
-       cx="28.924889"
-       cy="22.568502"
-       fx="28.924889"
-       fy="22.568502"
-       r="11.491406"
-       gradientTransform="matrix(3.7483979e-8,0.31456034,-1.177631,1.0889713e-7,50.577366,21.211339)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4660">
-      <stop
-         id="stop4662"
-         style="stop-color:#666666;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4664"
-         style="stop-color:#282828;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.6655121,0,0,0.4518781,-54.615029,45.875214)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient47870"
-       id="linearGradient3421"
-       y2="-5.5633383"
-       x2="32.084972"
-       y1="-14.402173"
-       x1="32.084972" />
-    <linearGradient
-       id="linearGradient47870">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop47872" />
-      <stop
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop47878" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop47874" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.8417267,-5.1455073e-7,6.2669991e-7,0.9200109,-115.2312,52.586443)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient51765"
-       id="radialGradient3418"
-       fy="-12.203125"
-       fx="51.4375"
-       r="2.171875"
-       cy="-12.203125"
-       cx="51.4375" />
-    <linearGradient
-       id="linearGradient51765">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop51767" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop51769" />
-    </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient51765"
-       id="radialGradient4142"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.8417267,-5.8450938e-8,-1.2125708e-7,0.9200109,52.236437,52.586419)"
-       cx="51.4375"
-       cy="-12.203125"
-       fx="51.4375"
-       fy="-12.203125"
-       r="2.171875" />
-    <radialGradient
-       xlink:href="#linearGradient3690-9"
-       id="radialGradient5244"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,2.9755329,-1.5333334,0,43.400001,-67.388322)"
-       cx="25"
-       cy="12"
-       fx="25"
-       fy="12"
-       r="7.5" />
-    <linearGradient
-       id="linearGradient3690-9">
-      <stop
-         offset="0"
-         style="stop-color:#ffeb9f;stop-opacity:1"
-         id="stop3692-0" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#ffd57e;stop-opacity:1"
-         id="stop3694-0" />
-      <stop
-         offset="0.66093999"
-         style="stop-color:#ffbc43;stop-opacity:1"
-         id="stop3696-74" />
-      <stop
-         offset="1"
-         style="stop-color:#ff921a;stop-opacity:1"
-         id="stop3698-1" />
-    </linearGradient>
-    <radialGradient
-       r="7.5"
-       fy="12"
-       fx="25"
-       cy="12"
-       cx="25"
-       gradientTransform="matrix(0,2.9755329,-1.5333334,0,43.400001,-67.388322)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5263"
-       xlink:href="#linearGradient3690-9-0" />
-    <linearGradient
-       id="linearGradient3690-9-0">
-      <stop
-         offset="0"
-         style="stop-color:#ffeb9f;stop-opacity:1"
-         id="stop3692-0-0" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#ffd57e;stop-opacity:1"
-         id="stop3694-0-9" />
-      <stop
-         offset="0.66093999"
-         style="stop-color:#ffbc43;stop-opacity:1"
-         id="stop3696-74-4" />
-      <stop
-         offset="1"
-         style="stop-color:#ff921a;stop-opacity:1"
-         id="stop3698-1-2" />
-    </linearGradient>
-    <radialGradient
-       r="7.5"
-       fy="12"
-       fx="25"
-       cy="12"
-       cx="25"
-       gradientTransform="matrix(0,2.9755329,-1.5333334,0,43.400001,-67.388322)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5303"
-       xlink:href="#linearGradient3690-9-0-4" />
-    <linearGradient
-       id="linearGradient3690-9-0-4">
-      <stop
-         offset="0"
-         style="stop-color:#ffeb9f;stop-opacity:1"
-         id="stop3692-0-0-8" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#ffd57e;stop-opacity:1"
-         id="stop3694-0-9-4" />
-      <stop
-         offset="0.66093999"
-         style="stop-color:#ffbc43;stop-opacity:1"
-         id="stop3696-74-4-3" />
-      <stop
-         offset="1"
-         style="stop-color:#ff921a;stop-opacity:1"
-         id="stop3698-1-2-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7652-827">
-      <stop
-         offset="0"
-         style="stop-color:#666666;stop-opacity:1;"
-         id="stop3225" />
-      <stop
-         offset="1"
-         style="stop-color:#5a5a5a;stop-opacity:0;"
-         id="stop3227" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7576-259">
-      <stop
-         offset="0"
-         style="stop-color:#3f3f3f;stop-opacity:1;"
-         id="stop3231" />
-      <stop
-         offset="1"
-         style="stop-color:#6c6c6c;stop-opacity:0"
-         id="stop3233" />
-    </linearGradient>
-    <linearGradient
-       y2="45.0625"
-       x2="38.875"
-       y1="40.3125"
-       x1="37.625"
-       gradientTransform="matrix(-0.72060161,-0.06027989,0.06027989,-0.72060161,36.517347,49.104769)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5448"
-       xlink:href="#linearGradient7652-827" />
-    <linearGradient
-       y2="46.5625"
-       x2="40.125"
-       y1="40.625"
-       x1="38.75"
-       gradientTransform="matrix(-0.72060161,-0.06027989,0.06027989,-0.72060161,36.517347,49.104769)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5450"
-       xlink:href="#linearGradient7576-259" />
-    <linearGradient
-       xlink:href="#linearGradient3642"
-       id="linearGradient3089"
-       gradientUnits="userSpaceOnUse"
-       x1="27"
-       y1="9"
-       x2="27"
-       y2="27"
-       gradientTransform="translate(0,-0.99999964)" />
-  </defs>
-  <metadata
-     id="metadata5457">
-    <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
-     id="layer1">
-    <path
-       d="m 26.973113,26.974134 c 0,0 4.018543,-2.880281 7.026887,-4.974134 1.504173,-1.046927 2.858989,-2.098176 3.688556,-3.160931 0.414777,-0.531376 0.80916,-1.110192 0.640544,-1.964613 -0.08428,-0.427211 -0.372981,-0.844806 -0.703395,-1.079278 -0.330401,-0.234473 -0.665953,-0.350487 -1.052648,-0.428203 -1.515693,-0.30462 -3.432871,-0.0016 -5.729445,0.450451 -2.296576,0.452008 -4.931397,1.098533 -7.582079,1.724087 -2.650682,0.625552 -5.324735,1.227954 -7.634562,1.538283 -2.309825,0.310332 -4.258131,0.285974 -5.344576,-0.08426 -0.514284,-0.175261 -0.519113,-0.261717 -0.521613,-0.270398 -0.0024,-0.0086 -0.02631,-0.245604 0.214143,-0.662377 0.480917,-0.833549 1.805713,-2.110444 3.315151,-3.30555 C 16.308954,12.367 20.09239,10.156026 20.09239,10.156026 L 18.97827,8.2940692 c 0,0 -3.84454,2.2304378 -7.042573,4.7624988 -1.599017,1.266031 -3.0299115,2.570488 -3.8220386,3.943436 -0.3960643,0.686476 -0.6871504,1.47598 -0.4436166,2.321235 0.2435314,0.845259 0.9980508,1.440252 1.8948302,1.745853 1.73568,0.591485 3.9108,0.475542 6.359806,0.146514 2.449006,-0.329028 5.169199,-0.913755 7.839121,-1.543849 2.66992,-0.630096 5.281128,-1.29648 7.49199,-1.731621 2.148668,-0.422901 3.891253,-0.559846 4.72921,-0.420743 -0.503839,0.645481 -1.808387,1.701769 -3.241765,2.699426 -2.866768,1.995309 -8.759679,6.507235 -8.759679,6.507235 1.938907,1.473579 1.306858,1.761792 2.989558,0.250083 z"
-       id="path7506"
-       style="fill:url(#linearGradient5448);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5450);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       style="opacity:0.05;fill:url(#radialGradient5303);fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5242-3-5"
-       d="m 20.375,3.9375 a 3.5738277,3.5738277 0 0 0 -3.03125,2.40625 l -3.71875,11 A 3.5738277,3.5738277 0 0 0 17,22.0625 l 2.375,0 -1.625,6.59375 a 3.5738277,3.5738277 0 0 0 6.40625,2.875 l 9.78125,-14 A 3.5738277,3.5738277 0 0 0 31,11.9375 l -0.65625,0 L 31.875,9.25 A 3.5738277,3.5738277 0 0 0 28.78125,3.9375 l -8.0625,0 a 3.5738277,3.5738277 0 0 0 -0.34375,0 z" />
-    <path
-       style="opacity:0.1;fill:url(#radialGradient5263);fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5242-3"
-       d="m 20.46875,5 a 2.5125605,2.5125605 0 0 0 -2.125,1.6875 l -3.71875,11 A 2.5125605,2.5125605 0 0 0 17,21 l 3.75,0 -1.96875,7.90625 a 2.5125605,2.5125605 0 0 0 4.5,2.03125 l 9.78125,-14 A 2.5125605,2.5125605 0 0 0 31,13 l -2.4375,0 2.40625,-4.25 A 2.5125605,2.5125605 0 0 0 28.78125,5 l -8.0625,0 a 2.5125605,2.5125605 0 0 0 -0.25,0 z" />
-    <path
-       style="opacity:0.25;fill:url(#radialGradient5244);fill-opacity:1;stroke:none;display:inline;enable-background:new"
-       id="path5242"
-       d="M 20.71875,6.0625 A 1.4255141,1.4255141 0 0 0 19.375,7.03125 l -3.71875,11 A 1.4255141,1.4255141 0 0 0 17,19.9375 l 5.125,0 -2.28125,9.21875 A 1.4255141,1.4255141 0 0 0 22.375,30.3125 l 9.78125,-14 A 1.4255141,1.4255141 0 0 0 31,14.0625 l -4.28125,0 3.3125,-5.875 a 1.4255141,1.4255141 0 0 0 -1.25,-2.125 l -8.0625,0 z" />
-    <g
-       id="g3423"
-       transform="matrix(0.86666667,0,0,1.2500002,51.297732,-9.201583)">
-      <rect
-         style="opacity:0.3;fill:url(#linearGradient3421);fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="rect46899"
-         y="39.367184"
-         x="-42.497383"
-         height="3.9940758"
-         width="22" />
-      <path
-         style="opacity:0.3;fill:url(#radialGradient3418);fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="path48849"
-         d="m -20.497383,39.36126 0,3.996297 c 2.205021,-0.01509 4,-0.897792 4,-1.991088 0,-1.093295 -1.794978,-1.990122 -4,-2.005209 z" />
-      <path
-         style="opacity:0.3;fill:url(#radialGradient4142);fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="path52742"
-         d="m -42.497383,39.36126 0,3.996297 c -2.205021,-0.01509 -4,-0.897792 -4,-1.991088 0,-1.093295 1.794978,-1.990122 4,-2.005209 z" />
-    </g>
-    <path
-       style="color:#000000;fill:url(#radialGradient4267);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.98281193;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4170"
-       d="m 35,34 a 11,6 0 1 1 -22,0 11,6 0 1 1 22,0 z"
-       transform="matrix(0.95490909,0,0,1.084,1.0821818,-3.8559995)" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient4190-0);fill-opacity:1;fill-rule:nonzero;stroke:#2a2a2a;stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4168"
-       width="21.007999"
-       height="10.008"
-       x="13.496"
-       y="-42.503998"
-       rx="1"
-       ry="1"
-       transform="scale(1,-1)" />
-    <path
-       style="opacity:0.4;color:#000000;fill:none;stroke:url(#linearGradient4647);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 24.000001,27.5 c 2.824888,0.02298 5.812106,0.649218 8.007403,2.531382 0.987447,0.838763 1.61067,2.111322 1.492597,3.418618 l -10e-7,7.9813 -19,0.1374 10e-7,-7.8687 c -0.05383,-0.998546 0.096,-2.042045 0.744266,-2.844828 1.516448,-1.955456 4.011614,-2.809145 6.376098,-3.1826 0.787453,-0.116677 1.583677,-0.172508 2.379636,-0.172572 z"
-       id="rect3145" />
-    <path
-       style="fill:url(#radialGradient4025);fill-opacity:1;stroke:url(#linearGradient4033);stroke-linejoin:miter;stroke-opacity:1;display:inline;enable-background:new"
-       id="path2911"
-       d="M 28.769428,7.4999994 24.242696,15.499999 31,15.499999 21.212031,29.5 23.925983,18.5 17,18.5 20.706427,7.4999994 l 8.063001,0 0,0 z" />
-    <path
-       style="opacity:0.5;fill:none;stroke:url(#linearGradient3089);stroke-linejoin:miter;stroke-opacity:1;display:inline;enable-background:new"
-       d="m 24.032826,17.53485 c 0.668551,0.03506 1.047348,0.802553 0.791653,1.387082 -0.48316,1.942703 -0.966319,3.885407 -1.449479,5.828111 1.927083,-2.760417 3.854167,-5.520833 5.78125,-8.28125 -1.698473,-0.0098 -3.399105,0.01961 -5.096216,-0.01486 -0.716057,-0.100132 -1.016468,-1.028308 -0.571223,-1.568332 1.212063,-2.138935 2.424126,-4.27787 3.636189,-6.4168046 -1.90625,0 -3.8125,0 -5.71875,0 l 0,-4.6e-5 c -1.020833,3.0208326 -2.041667,6.0416666 -3.0625,9.0624996"
-       id="path4162" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient4681);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992186;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4168-5"
-       width="18"
-       height="7"
-       x="15"
-       y="34"
-       rx="0.85681647"
-       ry="0.69944042" />
-    <path
-       id="path3880-3-6"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4781);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 30.500572,43.166666 c 2.03e-4,0.944128 -0.447714,1.333334 -1,1.333334 -0.552284,0 -0.999567,-0.324606 -1,-1.333334 L 28.5,40.5 l 2,0 z m -11,0 c 2.03e-4,0.944128 -0.447714,1.333334 -1,1.333334 -0.552284,0 -0.999567,-0.324606 -1,-1.333334 L 17.5,40.5 l 2,0 z" />
-    <path
-       id="path3880-6"
-       style="fill:url(#linearGradient4777);fill-opacity:1;stroke:url(#linearGradient4779);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 30.500572,38.999999 c 2.43e-4,1.062144 -0.447714,1.5 -1,1.5 -0.552284,0 -0.999567,-0.365181 -1,-1.5 L 28.5,36.5 l 2,0 z m -11,0 c 2.43e-4,1.062144 -0.447714,1.5 -1,1.5 -0.552284,0 -0.999567,-0.365181 -1,-1.5 L 17.5,36.5 l 2,0 z" />
-    <path
-       style="opacity:0.2;fill:none;stroke:url(#linearGradient4708);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 15.5,31.401723 17,0"
-       id="path4700" />
-    <path
-       style="opacity:0.8;fill:url(#linearGradient4773);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4771"
-       d="m 21.03125,8.9375 -3.3125,9.75 9.71875,-1.75 -3.1875,0 A 0.42239747,0.42239747 0 0 1 23.875,16.28125 L 27.8125,9.375 A 0.42239747,0.42239747 0 0 1 27.625,9.15625 C 27.595111,9.0868592 27.56315,9.0104622 27.53125,8.9375 l -6.5,0 z"
-       transform="translate(0,-0.99999964)" />
-  </g>
-</svg>
diff --git a/elementary-xfce/panel/48/gpm-battery-000-charging.svg b/elementary-xfce/panel/48/gpm-battery-000-charging.svg
deleted file mode 120000
index 19c5627b1..000000000
--- a/elementary-xfce/panel/48/gpm-battery-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-000.svg b/elementary-xfce/panel/48/gpm-battery-000.svg
deleted file mode 120000
index 82bbb9c8d..000000000
--- a/elementary-xfce/panel/48/gpm-battery-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-020-charging.svg b/elementary-xfce/panel/48/gpm-battery-020-charging.svg
deleted file mode 120000
index 538a392f8..000000000
--- a/elementary-xfce/panel/48/gpm-battery-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-020.svg b/elementary-xfce/panel/48/gpm-battery-020.svg
deleted file mode 120000
index 5eced58bb..000000000
--- a/elementary-xfce/panel/48/gpm-battery-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-040-charging.svg b/elementary-xfce/panel/48/gpm-battery-040-charging.svg
deleted file mode 120000
index 776cf63ed..000000000
--- a/elementary-xfce/panel/48/gpm-battery-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-040.svg b/elementary-xfce/panel/48/gpm-battery-040.svg
deleted file mode 120000
index 9ebd29d6f..000000000
--- a/elementary-xfce/panel/48/gpm-battery-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-060-charging.svg b/elementary-xfce/panel/48/gpm-battery-060-charging.svg
deleted file mode 120000
index 756b44044..000000000
--- a/elementary-xfce/panel/48/gpm-battery-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-060.svg b/elementary-xfce/panel/48/gpm-battery-060.svg
deleted file mode 120000
index 40726a91f..000000000
--- a/elementary-xfce/panel/48/gpm-battery-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-080-charging.svg b/elementary-xfce/panel/48/gpm-battery-080-charging.svg
deleted file mode 120000
index b395584c6..000000000
--- a/elementary-xfce/panel/48/gpm-battery-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-080.svg b/elementary-xfce/panel/48/gpm-battery-080.svg
deleted file mode 120000
index e58eb961d..000000000
--- a/elementary-xfce/panel/48/gpm-battery-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-100-charging.svg b/elementary-xfce/panel/48/gpm-battery-100-charging.svg
deleted file mode 120000
index 895f71b0e..000000000
--- a/elementary-xfce/panel/48/gpm-battery-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-100.svg b/elementary-xfce/panel/48/gpm-battery-100.svg
deleted file mode 120000
index b87667acf..000000000
--- a/elementary-xfce/panel/48/gpm-battery-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../status/48/battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-charged.svg b/elementary-xfce/panel/48/gpm-battery-charged.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/48/gpm-battery-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-empty.svg b/elementary-xfce/panel/48/gpm-battery-empty.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/48/gpm-battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-battery-missing.svg b/elementary-xfce/panel/48/gpm-battery-missing.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/48/gpm-battery-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-000-charging.svg b/elementary-xfce/panel/48/gpm-primary-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/48/gpm-primary-000-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-000.svg b/elementary-xfce/panel/48/gpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/48/gpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-020-charging.svg b/elementary-xfce/panel/48/gpm-primary-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/48/gpm-primary-020-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-020.svg b/elementary-xfce/panel/48/gpm-primary-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/48/gpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-040-charging.svg b/elementary-xfce/panel/48/gpm-primary-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/48/gpm-primary-040-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-040.svg b/elementary-xfce/panel/48/gpm-primary-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/48/gpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-060-charging.svg b/elementary-xfce/panel/48/gpm-primary-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/48/gpm-primary-060-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-060.svg b/elementary-xfce/panel/48/gpm-primary-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/48/gpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-080-charging.svg b/elementary-xfce/panel/48/gpm-primary-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/48/gpm-primary-080-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-080.svg b/elementary-xfce/panel/48/gpm-primary-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/48/gpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-100-charging.svg b/elementary-xfce/panel/48/gpm-primary-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/48/gpm-primary-100-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-100.svg b/elementary-xfce/panel/48/gpm-primary-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/48/gpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-primary-charged.svg b/elementary-xfce/panel/48/gpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/48/gpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-ups-000-charging.svg b/elementary-xfce/panel/48/gpm-ups-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/48/gpm-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/panel/48/gpm-ups-000.svg b/elementary-xfce/panel/48/gpm-ups-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/48/gpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-ups-020-charging.svg b/elementary-xfce/panel/48/gpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/48/gpm-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/panel/48/gpm-ups-020.svg b/elementary-xfce/panel/48/gpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/48/gpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-ups-040-charging.svg b/elementary-xfce/panel/48/gpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/48/gpm-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/panel/48/gpm-ups-040.svg b/elementary-xfce/panel/48/gpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/48/gpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-ups-060-charging.svg b/elementary-xfce/panel/48/gpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/48/gpm-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/panel/48/gpm-ups-060.svg b/elementary-xfce/panel/48/gpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/48/gpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-ups-080-charging.svg b/elementary-xfce/panel/48/gpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/48/gpm-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/panel/48/gpm-ups-080.svg b/elementary-xfce/panel/48/gpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/48/gpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-ups-100-charging.svg b/elementary-xfce/panel/48/gpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/48/gpm-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/panel/48/gpm-ups-100.svg b/elementary-xfce/panel/48/gpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/48/gpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/gpm-ups-missing.svg b/elementary-xfce/panel/48/gpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce/panel/48/gpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ac-adapter.svg b/elementary-xfce/panel/48/xfpm-ac-adapter.svg
deleted file mode 120000
index fb3788583..000000000
--- a/elementary-xfce/panel/48/xfpm-ac-adapter.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../apps/48/preferences-system-power.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-primary-000-charging.svg b/elementary-xfce/panel/48/xfpm-primary-000-charging.svg
deleted file mode 120000
index aa6dd36b9..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-primary-000.svg b/elementary-xfce/panel/48/xfpm-primary-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/48/xfpm-primary-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-primary-020-charging.svg b/elementary-xfce/panel/48/xfpm-primary-020-charging.svg
deleted file mode 120000
index 17e5c8a06..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-primary-020.svg b/elementary-xfce/panel/48/xfpm-primary-020.svg
deleted file mode 120000
index 85dbbfcb0..000000000
--- a/elementary-xfce/panel/48/xfpm-primary-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-primary-040-charging.svg b/elementary-xfce/panel/48/xfpm-primary-040-charging.svg
deleted file mode 120000
index 70af98bb3..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-primary-040.svg b/elementary-xfce/panel/48/xfpm-primary-040.svg
deleted file mode 120000
index 3eafb6fad..000000000
--- a/elementary-xfce/panel/48/xfpm-primary-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-primary-060-charging.svg b/elementary-xfce/panel/48/xfpm-primary-060-charging.svg
deleted file mode 120000
index 9eace6f21..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-primary-060.svg b/elementary-xfce/panel/48/xfpm-primary-060.svg
deleted file mode 120000
index 3b2d3aa1c..000000000
--- a/elementary-xfce/panel/48/xfpm-primary-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-primary-080-charging.svg b/elementary-xfce/panel/48/xfpm-primary-080-charging.svg
deleted file mode 120000
index a7087d713..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-primary-080.svg b/elementary-xfce/panel/48/xfpm-primary-080.svg
deleted file mode 120000
index 1b9ff2e7d..000000000
--- a/elementary-xfce/panel/48/xfpm-primary-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-primary-100-charging.svg b/elementary-xfce/panel/48/xfpm-primary-100-charging.svg
deleted file mode 120000
index 89884c066..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-primary-100.svg b/elementary-xfce/panel/48/xfpm-primary-100.svg
deleted file mode 120000
index 19652d770..000000000
--- a/elementary-xfce/panel/48/xfpm-primary-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-primary-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-primary-charged.svg b/elementary-xfce/panel/48/xfpm-primary-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/48/xfpm-primary-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-primary-missing.svg b/elementary-xfce/panel/48/xfpm-primary-missing.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/48/xfpm-primary-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ups-000-charging.svg b/elementary-xfce/panel/48/xfpm-ups-000-charging.svg
deleted file mode 120000
index bf644a91b..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-ups-000.svg b/elementary-xfce/panel/48/xfpm-ups-000.svg
deleted file mode 120000
index 8390bda45..000000000
--- a/elementary-xfce/panel/48/xfpm-ups-000.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ups-020-charging.svg b/elementary-xfce/panel/48/xfpm-ups-020-charging.svg
deleted file mode 120000
index 15a876563..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-ups-020.svg b/elementary-xfce/panel/48/xfpm-ups-020.svg
deleted file mode 120000
index 6faf6a9f6..000000000
--- a/elementary-xfce/panel/48/xfpm-ups-020.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ups-040-charging.svg b/elementary-xfce/panel/48/xfpm-ups-040-charging.svg
deleted file mode 120000
index 0e0f794ea..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-ups-040.svg b/elementary-xfce/panel/48/xfpm-ups-040.svg
deleted file mode 120000
index 6568e0bbd..000000000
--- a/elementary-xfce/panel/48/xfpm-ups-040.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ups-060-charging.svg b/elementary-xfce/panel/48/xfpm-ups-060-charging.svg
deleted file mode 120000
index 6d94ad616..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-ups-060.svg b/elementary-xfce/panel/48/xfpm-ups-060.svg
deleted file mode 120000
index 8bc3219c1..000000000
--- a/elementary-xfce/panel/48/xfpm-ups-060.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-060.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ups-080-charging.svg b/elementary-xfce/panel/48/xfpm-ups-080-charging.svg
deleted file mode 120000
index 1b520977b..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-ups-080.svg b/elementary-xfce/panel/48/xfpm-ups-080.svg
deleted file mode 120000
index e06930466..000000000
--- a/elementary-xfce/panel/48/xfpm-ups-080.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ups-100-charging.svg b/elementary-xfce/panel/48/xfpm-ups-100-charging.svg
deleted file mode 120000
index 4cfbb20a5..000000000
--- a/elementary-xfce/panel/48/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/panel/48/xfpm-ups-100.svg b/elementary-xfce/panel/48/xfpm-ups-100.svg
deleted file mode 120000
index 26a659b8a..000000000
--- a/elementary-xfce/panel/48/xfpm-ups-100.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ups-charged.svg b/elementary-xfce/panel/48/xfpm-ups-charged.svg
deleted file mode 120000
index f6ae71adc..000000000
--- a/elementary-xfce/panel/48/xfpm-ups-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-charged.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/48/xfpm-ups-missing.svg b/elementary-xfce/panel/48/xfpm-ups-missing.svg
deleted file mode 120000
index ba417d0f9..000000000
--- a/elementary-xfce/panel/48/xfpm-ups-missing.svg
+++ /dev/null
@@ -1 +0,0 @@
-gpm-battery-missing.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-000-charging.svg b/elementary-xfce/status/32/battery-000-charging.svg
deleted file mode 100644
index 5eba5dbf1..000000000
--- a/elementary-xfce/status/32/battery-000-charging.svg
+++ /dev/null
@@ -1,311 +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"
-   viewBox="0 0 32 32"
-   id="svg2485"
-   height="32"
-   width="32"
-   version="1.0">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5128" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5130" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         offset="0"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         id="stop5120" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5122" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4764" />
-      <stop
-         offset="0.05034721"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4766" />
-      <stop
-         offset="0.94965279"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4768" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.55555556,0,0,0.18421053,2.666667,21.302631)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3242-4-2"
-       id="linearGradient4393"
-       y2="65.258163"
-       x2="16.498198"
-       y1="8.7942686"
-       x1="16.498198" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4663-8-7" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop4665-7-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4762"
-       id="linearGradient4760"
-       y2="43"
-       x2="30"
-       y1="7"
-       x1="30" />
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       id="linearGradient3457-7-6"
-       y2="-93.091553"
-       x2="-48.479328"
-       y1="-93.091553"
-       x1="-20.446733" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         offset="0"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         id="stop4681-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4683-67-4" />
-    </linearGradient>
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5118"
-       id="linearGradient5066-8"
-       y2="-93.091553"
-       x2="-45.761551"
-       y1="-93.091553"
-       x1="-17.12093" />
-    <radialGradient
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5126"
-       id="radialGradient5132"
-       fy="7.5"
-       fx="16.5"
-       r="3.5"
-       cy="7.5"
-       cx="16.5" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         offset="0"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         id="stop3822-2-6-3-3-7" />
-      <stop
-         offset="0.5"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         id="stop3864-8-7-7-9-1" />
-      <stop
-         offset="1"
-         style="stop-color:#686868;stop-opacity:0"
-         id="stop3824-1-2-5-0-3" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       id="radialGradient5362"
-       fy="186.17059"
-       fx="99.157013"
-       r="62.769119"
-       cy="186.17059"
-       cx="99.157013" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5508"
-       y2="35.717499"
-       x2="17.77273"
-       y1="17.458462"
-       x1="13.681819" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5510"
-       y2="35.717499"
-       x2="27.31819"
-       y1="17.458462"
-       x1="25.272734" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3825"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3821"
-       id="linearGradient3941"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25" />
-    <linearGradient
-       id="linearGradient3242-4-2">
-      <stop
-         id="stop3244-8-8"
-         style="stop-color:#f89b7e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3246-2-8"
-         style="stop-color:#e35d4f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3248-8-0"
-         style="stop-color:#c6262e;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3250-3-0"
-         style="stop-color:#690b2c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 9,26.298746 c 0,0 1.840371,-0.798 6.999998,-0.798 5.159627,0 7,0.798 7,0.798 l 0,-20.3532833 c 0,0 -0.56,-0.9684289 -7,-0.9684289 C 9.56,4.9770338 9,5.9365027 9,5.9365027 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     transform="scale(-1,1)"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-4"
-     y="3.5"
-     x="-23.5"
-     ry="1"
-     rx="9"
-     height="26"
-     width="15" />
-  <path
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
-     id="path3818-0-5"
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-     id="rect3268-0-1"
-     y="26"
-     x="8.5"
-     ry="1.0096155"
-     rx="9.1800003"
-     height="3.5"
-     width="15" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#6f0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0"
-     d="m 23,27.028685 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-6-4"
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-6"
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-3-9"
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-3"
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4752"
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
-  <rect
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268"
-     y="3.5"
-     x="8.5"
-     ry="1"
-     rx="9.1800003"
-     height="26"
-     width="15" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
-     id="path5194"
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
-     id="rect3244"
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
-     id="path5124"
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7"
-     d="M 22.981918,27.795166 C 22.078868,27.334046 19.302622,27 16,27 12.708443,27 9.9397386,27.331812 9.0272201,27.790536" />
-  <g
-     transform="scale(0.66666667)"
-     style="opacity:0.4;stroke-width:1.5"
-     id="g5672">
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path2911-3"
-       d="M 28.769428,16.499999 24,24.000001 h 7.5 L 21,39 24,27 h -7.5 l 4.206427,-10.500001 z" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       id="path2911"
-       d="M 28.769428,14.999999 24,22.5 h 7.5 L 21,37.5 24,25.500001 h -7.5 l 4.206427,-10.500002 z" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/32/battery-000.svg b/elementary-xfce/status/32/battery-000.svg
deleted file mode 100644
index ff6515e68..000000000
--- a/elementary-xfce/status/32/battery-000.svg
+++ /dev/null
@@ -1,398 +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"
-   viewBox="0 0 32 32"
-   id="svg2485"
-   height="32"
-   width="32"
-   version="1.0">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5128" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5130" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         offset="0"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         id="stop5120" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5122" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4764" />
-      <stop
-         offset="0.05034721"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4766" />
-      <stop
-         offset="0.94965279"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4768" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.55555556,0,0,0.18421053,2.666667,21.302631)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3242-4-2"
-       id="linearGradient4393"
-       y2="65.258163"
-       x2="16.498198"
-       y1="8.7942686"
-       x1="16.498198" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4663-8-7" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop4665-7-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4762"
-       id="linearGradient4760"
-       y2="43"
-       x2="30"
-       y1="7"
-       x1="30" />
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       id="linearGradient3457-7-6"
-       y2="-93.091553"
-       x2="-48.479328"
-       y1="-93.091553"
-       x1="-20.446733" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         offset="0"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         id="stop4681-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4683-67-4" />
-    </linearGradient>
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5118"
-       id="linearGradient5066-8"
-       y2="-93.091553"
-       x2="-45.761551"
-       y1="-93.091553"
-       x1="-17.12093" />
-    <radialGradient
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5126"
-       id="radialGradient5132"
-       fy="7.5"
-       fx="16.5"
-       r="3.5"
-       cy="7.5"
-       cx="16.5" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         offset="0"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         id="stop3822-2-6-3-3-7" />
-      <stop
-         offset="0.5"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         id="stop3864-8-7-7-9-1" />
-      <stop
-         offset="1"
-         style="stop-color:#686868;stop-opacity:0"
-         id="stop3824-1-2-5-0-3" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       id="radialGradient5362"
-       fy="186.17059"
-       fx="99.157013"
-       r="62.769119"
-       cy="186.17059"
-       cx="99.157013" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5508"
-       y2="35.717499"
-       x2="17.77273"
-       y1="17.458462"
-       x1="13.681819" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5510"
-       y2="35.717499"
-       x2="27.31819"
-       y1="17.458462"
-       x1="25.272734" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3825"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3821"
-       id="linearGradient3941"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25" />
-    <linearGradient
-       id="linearGradient3242-4-2">
-      <stop
-         id="stop3244-8-8"
-         style="stop-color:#f89b7e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3246-2-8"
-         style="stop-color:#e35d4f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3248-8-0"
-         style="stop-color:#c6262e;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3250-3-0"
-         style="stop-color:#690b2c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3856-1-6-5">
-      <stop
-         id="stop3858-0-6-4"
-         style="stop-color:#634215;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3860-2-8-2"
-         style="stop-color:#93700d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3117">
-      <stop
-         id="stop3119"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3121"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.56911701" />
-      <stop
-         id="stop3123"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.93297637" />
-      <stop
-         id="stop3125"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846">
-      <stop
-         id="stop3848"
-         style="stop-color:#fff3cb;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3850"
-         style="stop-color:#fdde76;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3852"
-         style="stop-color:#f9c440;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3854"
-         style="stop-color:#e48b20;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="44.424442"
-       y1="60.535198"
-       x2="44.424442"
-       y2="-5.496769"
-       id="linearGradient3035"
-       xlink:href="#linearGradient3856-1-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.25087115,0,0,0.25087115,-3.3612781,0.56323051)" />
-    <linearGradient
-       x1="29.126724"
-       y1="19.787613"
-       x2="29.291178"
-       y2="57.567127"
-       id="linearGradient3039"
-       xlink:href="#linearGradient3117"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3209283,0,-0.00139699,0.29826454,-1.3199469,-3.5360874)" />
-    <linearGradient
-       x1="24"
-       y1="-14.603537"
-       x2="24"
-       y2="54.669891"
-       id="linearGradient3042"
-       xlink:href="#linearGradient3846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3333471,0,0,0.32559732,-3.3227132e-4,-0.00505258)" />
-  </defs>
-  <path
-     d="m 9,26.299 c 0,0 1.840371,-0.798 6.999998,-0.798 5.159627,0 7,0.798 7,0.798 l 0,-20.353283 c 0,0 -0.56,-0.9684289 -7,-0.9684289 C 9.56,4.9772881 9,5.936757 9,5.936757 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     transform="scale(-1,1)"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-4"
-     y="3.5"
-     x="-23.5"
-     ry="1"
-     rx="9"
-     height="26"
-     width="15" />
-  <path
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
-     id="path3818-0-5"
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-     id="rect3268-0-1"
-     y="26"
-     x="8.5"
-     ry="1.0096155"
-     rx="9.1800003"
-     height="3.5"
-     width="15" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#6f0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0"
-     d="m 23,27.028685 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-6-4"
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-6"
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-3-9"
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-3"
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4752"
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
-  <rect
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268"
-     y="3.5"
-     x="8.5"
-     ry="1"
-     rx="9.1800003"
-     height="26"
-     width="15" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
-     id="path5194"
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
-     id="rect3244"
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
-     id="path5124"
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7"
-     d="M 22.981918,27.795166 C 22.078868,27.334046 19.302622,27 16,27 12.708443,27 9.9397386,27.331812 9.0272201,27.790536" />
-  <g
-     transform="translate(15.76664,17)"
-     id="g4565">
-    <path
-       d="M 15.393251,13.018518 8.882912,1.0185175 C 8.695786,0.68518522 8.3571874,0.5 7.9800874,0.5 7.60299,0.5 7.2626529,0.72221995 7.0726841,1.0555552 L 0.61082617,13.055555 c -0.1521025,0.296297 -0.1538414,0.703705 0.033445,1 C 0.83155507,14.351852 1.1326025,14.5 1.5097026,14.5 H 14.481894 c 0.3771,0 0.717277,-0.185186 0.869382,-0.481483 0.189811,-0.296295 0.191393,-0.666665 0.04198,-0.999999 z"
-       id="path11155"
-       style="fill:url(#linearGradient3042);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="M 14,12.518301 C 12.045538,9.0468886 10,5 7.975142,1.5 6,5 4.1044533,8.9457609 2,12.513164 c -0.3189516,0.522763 -0.6329068,0.692927 -0.4793859,0.923014 0.1535186,0.230089 0.4184294,0.04807 1.1467418,0.06307 H 13.462952 c 0.678046,0.0075 0.864678,0.10371 0.989435,-0.126372 C 14.608061,13.142791 14.297545,12.987276 14,12.518301 Z"
-       id="path11159"
-       style="opacity:0.6;fill:none;stroke:url(#linearGradient3039);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="m 7.2080864,5.2077401 c 0.187663,1.833113 0.402621,3.653611 0.562369,5.4939039 0.160675,0 0.349131,0 0.509809,0 0.132505,-1.7672654 0.346231,-3.5238504 0.500406,-5.2889254 0.078593,-0.4179466 -0.135995,-0.9141779 -0.577334,-1.0157182 -0.436111,-0.1275054 -0.923353,0.188238 -0.981343,0.6392517 -0.0096,0.056618 -0.0139,0.1140805 -0.0139,0.171488 v 0 z m -0.05562,7.4529249 c -0.01985,0.545647 0.580544,0.973381 1.09316,0.80039 0.496507,-0.126715 0.758025,-0.750764 0.503564,-1.194356 -0.227785,-0.458549 -0.895755,-0.609631 -1.280006,-0.258685 -0.19423,0.159572 -0.322971,0.397796 -0.316718,0.652651 z"
-       id="path3295"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.4582634px;line-height:125%;font-family:Georgia;text-align:start;writing-mode:lr-tb;text-anchor:start;opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:none" />
-    <path
-       d="m 7.2080887,4.707765 c 0.187663,1.8331075 0.40262,3.6536 0.562368,5.493888 0.160675,0 0.34913,0 0.509807,0 0.132505,-1.7672605 0.34623,-3.5238405 0.500405,-5.2889105 0.07859,-0.417945 -0.135995,-0.914175 -0.577332,-1.015715 -0.43611,-0.127505 -0.92335,0.1882375 -0.98134,0.63925 -0.0096,0.056617 -0.0139,0.11408 -0.0139,0.1714875 v 0 z m -0.05562,7.452902 c -0.01985,0.545645 0.580542,0.973378 1.093157,0.800388 0.496505,-0.126715 0.758023,-0.750763 0.503563,-1.194353 -0.227785,-0.458547 -0.895753,-0.60963 -1.280003,-0.258685 -0.19423,0.159573 -0.32297,0.397795 -0.316717,0.65265 z"
-       id="text2315"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.4582634px;line-height:125%;font-family:Georgia;text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3035);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <path
-       d="M 15.393251,13.018518 8.8829124,1.0185176 C 8.6957865,0.68518482 8.3571884,0.50000002 7.9800883,0.50000002 c -0.3770979,0 -0.717435,0.2222199 -0.9074038,0.55555478 L 0.61082644,13.055556 c -0.1521025,0.296297 -0.1538415,0.703704 0.033445,0.999999 C 0.83155534,14.351852 1.1326027,14.5 1.5097027,14.5 H 14.481894 c 0.3771,0 0.717278,-0.185185 0.869383,-0.481481 0.189811,-0.296296 0.191392,-0.666666 0.04198,-1.000001 z"
-       id="path11155-59"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:none;stroke:#311d00;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/32/battery-020-charging.svg b/elementary-xfce/status/32/battery-020-charging.svg
deleted file mode 100644
index a6101a23c..000000000
--- a/elementary-xfce/status/32/battery-020-charging.svg
+++ /dev/null
@@ -1,351 +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="32"
-   height="32"
-   id="svg2485"
-   viewBox="0 0 32 32">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.05034721" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.94965279" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821" />
-    <linearGradient
-       id="linearGradient4271">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4273" />
-      <stop
-         offset="0.2559385"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4275" />
-      <stop
-         offset="0.90909094"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4277" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4279" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.55555556,0,0,0.42105263,2.6666661,10.763159)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3846-7"
-       id="linearGradient4393-7"
-       y2="35"
-       x2="46.68"
-       y1="35"
-       x1="-5.0010252" />
-    <linearGradient
-       id="linearGradient3846-7">
-      <stop
-         offset="0"
-         style="stop-color:#fff3cb;stop-opacity:1"
-         id="stop3848-7" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#fdde76;stop-opacity:1"
-         id="stop3850-5" />
-      <stop
-         offset="0.66093999"
-         style="stop-color:#f9c440;stop-opacity:1"
-         id="stop3852-9" />
-      <stop
-         offset="1"
-         style="stop-color:#e48b20;stop-opacity:1"
-         id="stop3854-2" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.56521739,0,0,0.49999961,2.4347826,6.7500113)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4271"
-       id="linearGradient4760-7"
-       y2="43"
-       x2="30"
-       y1="32.586082"
-       x1="30" />
-  </defs>
-  <path
-     d="m 9,21.629 c 0,0 1.840371,-0.628508 6.999998,-0.628508 5.159627,0 7,0.628508 7,0.628508 l 0,-15.6835374 c 0,0 -0.56,-0.9684289 -7,-0.9684289 C 9.56,4.9770337 9,5.9365026 9,5.9365026 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9"
-     ry="1"
-     x="-23.5"
-     y="3.5"
-     id="rect3268-4"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
-  <rect
-     width="15"
-     height="8"
-     rx="13.5"
-     ry="1.5000004"
-     x="8.5"
-     y="21.5"
-     id="rect3268-0-1-7"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" />
-  <path
-     d="m 23.5,22.500002 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5000002,0.446 -7.5000002,1"
-     id="rect3268-0-8"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#7d3400;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 16,22.499999 c -1.938645,0 -3.685271,0.08683 -4.927989,0.218749 -0.621359,0.06596 -1.1270747,0.142293 -1.4307066,0.218751 -0.08027,0.02022 -0.092941,0.02993 -0.1413044,0.04688 v 5.031246 c 0.048364,0.01696 0.061034,0.02665 0.1413044,0.04688 0.3036319,0.07645 0.8093476,0.15279 1.4307066,0.21875 1.242718,0.131907 2.989344,0.218736 4.927989,0.218736 1.938646,0 3.685271,-0.08683 4.927989,-0.218749 0.62136,-0.06596 1.127075,-0.142292 1.430707,-0.21875 0.08027,-0.02022 0.09294,-0.02993 0.141304,-0.04688 V 22.98437 C 22.45164,22.96741 22.43897,22.95771 22.358696,22.93749 22.055064,22.86104 21.549349,22.784698 20.927989,22.718739 19.685271,22.586829 17.938646,22.499999 16,22.499999 Z"
-     id="path4230"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient4760-7);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 23.175384,23.790373 c -0.928851,0.411517 -3.784419,0.709629 -7.181402,0.709629 -3.385603,0 -6.2334128,-0.296118 -7.1720028,-0.705497"
-     id="rect3268-0-7-1"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.4;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 23.5,22.500002 c 0,0.554 -3.345,1 -7.5,1 -4.155,0 -7.5000002,-0.446 -7.5000002,-1"
-     id="rect3268-0-3"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;stroke:#7d3400;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 23.175384,22.45704 c -0.928851,0.411517 -3.784419,0.709629 -7.181402,0.709629 -3.385603,0 -6.2334128,-0.296118 -7.1720028,-0.705497"
-     id="rect3268-0-7-8"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
-     id="rect3268-6-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
-     id="rect3268-6"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
-     id="rect3268-3-9"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
-     id="rect3268-3"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
-     id="path4752"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9.1800003"
-     ry="1"
-     x="8.5"
-     y="3.5"
-     id="rect3268"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
-     id="path5194"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
-  <path
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
-     id="rect3244"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
-  <path
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
-     id="path5124"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
-  <g
-     id="g5672"
-     style="opacity:0.4;stroke-width:1.5"
-     transform="scale(0.66666667)">
-    <path
-       d="M 28.769428,16.499999 24,24.000001 h 7.5 L 21,39 24,27 h -7.5 l 4.206427,-10.500001 z"
-       id="path2911-3"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49999999;marker:none;enable-background:accumulate;font-variant-east_asian:normal;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <path
-       d="M 28.769428,14.999999 24,22.5 h 7.5 L 21,37.5 24,25.500001 h -7.5 l 4.206427,-10.500002 z"
-       id="path2911"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/32/battery-020.svg b/elementary-xfce/status/32/battery-020.svg
deleted file mode 100644
index 0da2cd7d1..000000000
--- a/elementary-xfce/status/32/battery-020.svg
+++ /dev/null
@@ -1,338 +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"
-   viewBox="0 0 32 32"
-   id="svg2485"
-   height="32"
-   width="32"
-   version="1.0">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5128" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5130" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         offset="0"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         id="stop5120" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5122" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4764" />
-      <stop
-         offset="0.05034721"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4766" />
-      <stop
-         offset="0.94965279"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4768" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4663-8-7" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop4665-7-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4762"
-       id="linearGradient4760"
-       y2="43"
-       x2="30"
-       y1="7"
-       x1="30" />
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       id="linearGradient3457-7-6"
-       y2="-93.091553"
-       x2="-48.479328"
-       y1="-93.091553"
-       x1="-20.446733" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         offset="0"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         id="stop4681-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4683-67-4" />
-    </linearGradient>
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5118"
-       id="linearGradient5066-8"
-       y2="-93.091553"
-       x2="-45.761551"
-       y1="-93.091553"
-       x1="-17.12093" />
-    <radialGradient
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5126"
-       id="radialGradient5132"
-       fy="7.5"
-       fx="16.5"
-       r="3.5"
-       cy="7.5"
-       cx="16.5" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         offset="0"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         id="stop3822-2-6-3-3-7" />
-      <stop
-         offset="0.5"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         id="stop3864-8-7-7-9-1" />
-      <stop
-         offset="1"
-         style="stop-color:#686868;stop-opacity:0"
-         id="stop3824-1-2-5-0-3" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       id="radialGradient5362"
-       fy="186.17059"
-       fx="99.157013"
-       r="62.769119"
-       cy="186.17059"
-       cx="99.157013" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5508"
-       y2="35.717499"
-       x2="17.77273"
-       y1="17.458462"
-       x1="13.681819" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5510"
-       y2="35.717499"
-       x2="27.31819"
-       y1="17.458462"
-       x1="25.272734" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3825"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3821"
-       id="linearGradient3941"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25" />
-    <linearGradient
-       id="linearGradient4271">
-      <stop
-         id="stop4273"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4275"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.2559385" />
-      <stop
-         id="stop4277"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.90909094" />
-      <stop
-         id="stop4279"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393-7"
-       xlink:href="#linearGradient3846-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55555556,0,0,0.42105263,2.6666661,10.763159)" />
-    <linearGradient
-       id="linearGradient3846-7">
-      <stop
-         id="stop3848-7"
-         style="stop-color:#fff3cb;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3850-5"
-         style="stop-color:#fdde76;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3852-9"
-         style="stop-color:#f9c440;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3854-2"
-         style="stop-color:#e48b20;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="32.586082"
-       x2="30"
-       y2="43"
-       id="linearGradient4760-7"
-       xlink:href="#linearGradient4271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56521739,0,0,0.49999961,2.4347826,6.7500113)" />
-  </defs>
-  <path
-     d="m 9,21.629 c 0,0 1.840371,-0.628508 6.999998,-0.628508 5.159627,0 7,0.628508 7,0.628508 l 0,-15.683537 c 0,0 -0.56,-0.968429 -7,-0.968429 C 9.56,4.977034 9,5.936503 9,5.936503 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     transform="scale(-1,1)"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-4"
-     y="3.5"
-     x="-23.5"
-     ry="1"
-     rx="9"
-     height="26"
-     width="15" />
-  <path
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
-     id="path3818-0-5"
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-     id="rect3268-0-1-7"
-     y="21.5"
-     x="8.5"
-     ry="1.5000004"
-     rx="13.5"
-     height="8"
-     width="15" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#7d3400;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-8"
-     d="m 23.5,22.500002 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5000002,0.446 -7.5000002,1" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient4760-7);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4230"
-     d="m 16,22.499999 c -1.938645,0 -3.685271,0.08683 -4.927989,0.218749 -0.621359,0.06596 -1.1270747,0.142293 -1.4307066,0.218751 -0.08027,0.02022 -0.092941,0.02993 -0.1413044,0.04688 v 5.031246 c 0.048364,0.01696 0.061034,0.02665 0.1413044,0.04688 0.3036319,0.07645 0.8093476,0.15279 1.4307066,0.21875 1.242718,0.131907 2.989344,0.218736 4.927989,0.218736 1.938646,0 3.685271,-0.08683 4.927989,-0.218749 0.62136,-0.06596 1.127075,-0.142292 1.430707,-0.21875 0.08027,-0.02022 0.09294,-0.02993 0.141304,-0.04688 V 22.98437 C 22.45164,22.96741 22.43897,22.95771 22.358696,22.93749 22.055064,22.86104 21.549349,22.784698 20.927989,22.718739 19.685271,22.586829 17.938646,22.499999 16,22.499999 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.4;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7-1"
-     d="m 23.175384,23.790373 c -0.928851,0.411517 -3.784419,0.709629 -7.181402,0.709629 -3.385603,0 -6.2334128,-0.296118 -7.1720028,-0.705497" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;stroke:#7d3400;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-3"
-     d="m 23.5,22.500002 c 0,0.554 -3.345,1 -7.5,1 -4.155,0 -7.5000002,-0.446 -7.5000002,-1" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7-8"
-     d="m 23.175384,22.45704 c -0.928851,0.411517 -3.784419,0.709629 -7.181402,0.709629 -3.385603,0 -6.2334128,-0.296118 -7.1720028,-0.705497" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-6-4"
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-6"
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-3-9"
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-3"
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4752"
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
-  <rect
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268"
-     y="3.5"
-     x="8.5"
-     ry="1"
-     rx="9.1800003"
-     height="26"
-     width="15" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
-     id="path5194"
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
-     id="rect3244"
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
-     id="path5124"
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
-</svg>
diff --git a/elementary-xfce/status/32/battery-040-charging.svg b/elementary-xfce/status/32/battery-040-charging.svg
deleted file mode 100644
index 6c660f56a..000000000
--- a/elementary-xfce/status/32/battery-040-charging.svg
+++ /dev/null
@@ -1,351 +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"
-   viewBox="0 0 32 32"
-   id="svg2485"
-   height="32"
-   width="32"
-   version="1.0">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5128" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5130" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         offset="0"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         id="stop5120" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5122" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4764" />
-      <stop
-         offset="0.05034721"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4766" />
-      <stop
-         offset="0.94965279"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4768" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4663-8-7" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop4665-7-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4762"
-       id="linearGradient4760"
-       y2="43"
-       x2="30"
-       y1="7"
-       x1="30" />
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       id="linearGradient3457-7-6"
-       y2="-93.091553"
-       x2="-48.479328"
-       y1="-93.091553"
-       x1="-20.446733" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         offset="0"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         id="stop4681-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4683-67-4" />
-    </linearGradient>
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5118"
-       id="linearGradient5066-8"
-       y2="-93.091553"
-       x2="-45.761551"
-       y1="-93.091553"
-       x1="-17.12093" />
-    <radialGradient
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5126"
-       id="radialGradient5132"
-       fy="7.5"
-       fx="16.5"
-       r="3.5"
-       cy="7.5"
-       cx="16.5" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         offset="0"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         id="stop3822-2-6-3-3-7" />
-      <stop
-         offset="0.5"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         id="stop3864-8-7-7-9-1" />
-      <stop
-         offset="1"
-         style="stop-color:#686868;stop-opacity:0"
-         id="stop3824-1-2-5-0-3" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       id="radialGradient5362"
-       fy="186.17059"
-       fx="99.157013"
-       r="62.769119"
-       cy="186.17059"
-       cx="99.157013" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5508"
-       y2="35.717499"
-       x2="17.77273"
-       y1="17.458462"
-       x1="13.681819" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5510"
-       y2="35.717499"
-       x2="27.31819"
-       y1="17.458462"
-       x1="25.272734" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3825"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3821"
-       id="linearGradient3941"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25" />
-    <linearGradient
-       id="linearGradient4271">
-      <stop
-         id="stop4273"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4275"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.2559385" />
-      <stop
-         id="stop4277"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.90909094" />
-      <stop
-         id="stop4279"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393-7"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55555556,0,0,0.52631579,2.6666661,6.0789488)" />
-    <linearGradient
-       x1="30"
-       y1="32.586082"
-       x2="30"
-       y2="43"
-       id="linearGradient4760-7"
-       xlink:href="#linearGradient4271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56521739,0,0,0.66666703,2.4347826,-0.50002121)" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         offset="0"
-         style="stop-color:#90dbec;stop-opacity:1"
-         id="stop3750-8-9-7" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#42baea;stop-opacity:1"
-         id="stop3752-3-2-4" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#3689e6;stop-opacity:1"
-         id="stop3754-7-2-4" />
-      <stop
-         offset="1"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         id="stop3756-9-3-7" />
-    </linearGradient>
-  </defs>
-  <path
-     d="M 9,19.628508 C 9,19.628508 10.840371,19 15.999998,19 c 5.159627,0 7,0.628508 7,0.628508 l 0,-13.683537 c 0,0 -0.56,-0.9684289 -7,-0.9684289 C 9.56,4.9765421 9,5.936011 9,5.936011 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     transform="scale(-1,1)"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-4"
-     y="3.5"
-     x="-23.5"
-     ry="1"
-     rx="9"
-     height="26"
-     width="15" />
-  <path
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
-     id="path3818-0-5"
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-     id="rect3268-0-1-7"
-     y="19.5"
-     x="8.5"
-     ry="1.8750005"
-     rx="13.5"
-     height="10"
-     width="15" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#00537d;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-8"
-     d="m 23.5,20.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5000002,0.446 -7.5000002,1" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient4760-7);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4230"
-     d="m 16,20.49999 c -1.938645,0 -3.685271,0.115774 -4.927989,0.291666 -0.621359,0.08795 -1.1270747,0.189724 -1.4307066,0.291668 -0.08027,0.02696 -0.092941,0.03991 -0.1413044,0.06251 l 0,6.708337 c 0.048364,0.02261 0.061034,0.03553 0.1413044,0.06251 0.3036319,0.101933 0.8093476,0.20372 1.4307066,0.291667 1.242718,0.175876 2.989344,0.291648 4.927989,0.291648 1.938646,0 3.685271,-0.115773 4.927989,-0.291666 0.62136,-0.08795 1.127075,-0.189722 1.430707,-0.291667 0.08027,-0.02696 0.09294,-0.03991 0.141304,-0.06251 l 0,-6.708332 c -0.04836,-0.02261 -0.06103,-0.03555 -0.141304,-0.06251 C 22.055064,20.981379 21.549349,20.879589 20.927989,20.791644 19.685271,20.615764 17.938646,20.49999 16,20.49999 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7-1"
-     d="M 23.175384,21.490371 C 22.246533,21.901888 19.390965,22.2 15.993982,22.2 12.608379,22.2 9.7605692,21.903882 8.8219792,21.494503" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;stroke:#7d3400;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-3"
-     d="m 23.5,20.2 c 0,0.554 -3.345,1 -7.5,1 -4.155,0 -7.5000002,-0.446 -7.5000002,-1" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7-8"
-     d="M 23.175384,20.157371 C 22.246533,20.568888 19.390965,20.867 15.993982,20.867 c -3.385603,0 -6.233413,-0.296118 -7.172003,-0.705497" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-6-4"
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-6"
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-3-9"
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-3"
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4752"
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
-  <rect
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268"
-     y="3.5"
-     x="8.5"
-     ry="1"
-     rx="9.1800003"
-     height="26"
-     width="15" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
-     id="path5194"
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
-     id="rect3244"
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
-     id="path5124"
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
-  <g
-     transform="scale(0.66666667,0.66666667)"
-     style="opacity:0.4;stroke-width:1.5"
-     id="g5672">
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path2911-3"
-       d="M 28.769428,16.499999 24,24.000001 l 7.5,0 L 21,39 24,27 16.5,27 20.706427,16.499999 Z" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       id="path2911"
-       d="M 28.769428,14.999999 24,22.5 l 7.5,0 -10.5,15 3,-11.999999 -7.5,0 4.206427,-10.500002 z" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/32/battery-040.svg b/elementary-xfce/status/32/battery-040.svg
deleted file mode 100644
index c222d9139..000000000
--- a/elementary-xfce/status/32/battery-040.svg
+++ /dev/null
@@ -1,338 +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"
-   viewBox="0 0 32 32"
-   id="svg2485"
-   height="32"
-   width="32"
-   version="1.0">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5128" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5130" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         offset="0"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         id="stop5120" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5122" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4764" />
-      <stop
-         offset="0.05034721"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4766" />
-      <stop
-         offset="0.94965279"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4768" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4663-8-7" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop4665-7-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4762"
-       id="linearGradient4760"
-       y2="43"
-       x2="30"
-       y1="7"
-       x1="30" />
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       id="linearGradient3457-7-6"
-       y2="-93.091553"
-       x2="-48.479328"
-       y1="-93.091553"
-       x1="-20.446733" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         offset="0"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         id="stop4681-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4683-67-4" />
-    </linearGradient>
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5118"
-       id="linearGradient5066-8"
-       y2="-93.091553"
-       x2="-45.761551"
-       y1="-93.091553"
-       x1="-17.12093" />
-    <radialGradient
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5126"
-       id="radialGradient5132"
-       fy="7.5"
-       fx="16.5"
-       r="3.5"
-       cy="7.5"
-       cx="16.5" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         offset="0"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         id="stop3822-2-6-3-3-7" />
-      <stop
-         offset="0.5"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         id="stop3864-8-7-7-9-1" />
-      <stop
-         offset="1"
-         style="stop-color:#686868;stop-opacity:0"
-         id="stop3824-1-2-5-0-3" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       id="radialGradient5362"
-       fy="186.17059"
-       fx="99.157013"
-       r="62.769119"
-       cy="186.17059"
-       cx="99.157013" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5508"
-       y2="35.717499"
-       x2="17.77273"
-       y1="17.458462"
-       x1="13.681819" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5510"
-       y2="35.717499"
-       x2="27.31819"
-       y1="17.458462"
-       x1="25.272734" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3825"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3821"
-       id="linearGradient3941"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25" />
-    <linearGradient
-       id="linearGradient4271">
-      <stop
-         id="stop4273"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4275"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.2559385" />
-      <stop
-         id="stop4277"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.90909094" />
-      <stop
-         id="stop4279"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393-7"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55555556,0,0,0.52631579,2.6666661,6.0789488)" />
-    <linearGradient
-       x1="30"
-       y1="32.586082"
-       x2="30"
-       y2="43"
-       id="linearGradient4760-7"
-       xlink:href="#linearGradient4271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56521739,0,0,0.66666703,2.4347826,-0.50002121)" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         offset="0"
-         style="stop-color:#90dbec;stop-opacity:1"
-         id="stop3750-8-9-7" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#42baea;stop-opacity:1"
-         id="stop3752-3-2-4" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#3689e6;stop-opacity:1"
-         id="stop3754-7-2-4" />
-      <stop
-         offset="1"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         id="stop3756-9-3-7" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 9,19.629 c 0,0 1.840371,-0.628508 6.999998,-0.628508 5.159627,0 7,0.628508 7,0.628508 l 0,-13.683537 c 0,0 -0.56,-0.968429 -7,-0.968429 C 9.56,4.977034 9,5.936503 9,5.936503 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     transform="scale(-1,1)"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-4"
-     y="3.5"
-     x="-23.5"
-     ry="1"
-     rx="9"
-     height="26"
-     width="15" />
-  <path
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
-     id="path3818-0-5"
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-     id="rect3268-0-1-7"
-     y="19.5"
-     x="8.5"
-     ry="1.8750005"
-     rx="13.5"
-     height="10"
-     width="15" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#00537d;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-8"
-     d="m 23.5,20.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5000002,0.446 -7.5000002,1" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient4760-7);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4230"
-     d="m 16,20.49999 c -1.938645,0 -3.685271,0.115774 -4.927989,0.291666 -0.621359,0.08795 -1.1270747,0.189724 -1.4307066,0.291668 -0.08027,0.02696 -0.092941,0.03991 -0.1413044,0.06251 l 0,6.708337 c 0.048364,0.02261 0.061034,0.03553 0.1413044,0.06251 0.3036319,0.101933 0.8093476,0.20372 1.4307066,0.291667 1.242718,0.175876 2.989344,0.291648 4.927989,0.291648 1.938646,0 3.685271,-0.115773 4.927989,-0.291666 0.62136,-0.08795 1.127075,-0.189722 1.430707,-0.291667 0.08027,-0.02696 0.09294,-0.03991 0.141304,-0.06251 l 0,-6.708332 c -0.04836,-0.02261 -0.06103,-0.03555 -0.141304,-0.06251 C 22.055064,20.981379 21.549349,20.879589 20.927989,20.791644 19.685271,20.615764 17.938646,20.49999 16,20.49999 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7-1"
-     d="M 23.175384,21.490371 C 22.246533,21.901888 19.390965,22.2 15.993982,22.2 12.608379,22.2 9.7605692,21.903882 8.8219792,21.494503" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;stroke:#7d3400;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-3"
-     d="m 23.5,20.2 c 0,0.554 -3.345,1 -7.5,1 -4.155,0 -7.5000002,-0.446 -7.5000002,-1" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7-8"
-     d="M 23.175384,20.157371 C 22.246533,20.568888 19.390965,20.867 15.993982,20.867 c -3.385603,0 -6.233413,-0.296118 -7.172003,-0.705497" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-6-4"
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-6"
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-3-9"
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-3"
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4752"
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
-  <rect
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268"
-     y="3.5"
-     x="8.5"
-     ry="1"
-     rx="9.1800003"
-     height="26"
-     width="15" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
-     id="path5194"
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
-     id="rect3244"
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
-     id="path5124"
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
-</svg>
diff --git a/elementary-xfce/status/32/battery-060.svg b/elementary-xfce/status/32/battery-060.svg
deleted file mode 100644
index d510cf2fa..000000000
--- a/elementary-xfce/status/32/battery-060.svg
+++ /dev/null
@@ -1,293 +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="32"
-   height="32"
-   id="svg2485"
-   viewBox="0 0 32 32">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.05034721" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.94965279" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821" />
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393-1"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55555554,0,0,0.63157897,2.666667,1.3947371)" />
-  </defs>
-  <path
-     d="m 9,16 c 0,0 1.840371,0 6.999998,0 5.159627,0 7,0 7,0 l 0,-10.0550294 c 0,0 -0.56,-0.9684288 -7,-0.9684288 C 9.56,4.9765418 9,5.9360104 9,5.9360104 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9"
-     ry="1"
-     x="-23.5"
-     y="3.5"
-     id="rect3268-4"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-1-2"
-     d="m 8.5,16.5 v 12 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 v -12 z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path3077"
-     d="m 8.5,16.5 h 15" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path3077-3"
-     d="m 9.5,17.5 h 13" />
-  <path
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
-     id="rect3268-6-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
-     id="rect3268-6"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
-     id="rect3268-3-9"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
-     id="rect3268-3"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
-     id="path4752"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9.1800003"
-     ry="1"
-     x="8.5"
-     y="3.5"
-     id="rect3268"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
-     id="path5194"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
-  <path
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
-     id="rect3244"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
-  <path
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
-     id="path5124"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/status/32/battery-080-charging.svg b/elementary-xfce/status/32/battery-080-charging.svg
deleted file mode 100644
index d64bab2f9..000000000
--- a/elementary-xfce/status/32/battery-080-charging.svg
+++ /dev/null
@@ -1,311 +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="32"
-   height="32"
-   id="svg2485"
-   viewBox="0 0 32 32">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.05034721" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.94965279" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55555556,0,0,0.92105266,2.666667,-11.486842)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821" />
-  </defs>
-  <path
-     d="m 9.0000008,12.298 c 0,0 1.8403712,-0.798 6.9999982,-0.798 5.159627,0 7,0.798 7,0.798 l 0,-6.3530294 c 0,0 -0.56,-0.9684288 -7,-0.9684288 -6.4399982,0 -6.9999982,0.9594686 -6.9999982,0.9594686 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9"
-     ry="1"
-     x="-23.5"
-     y="3.5"
-     id="rect3268-4"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
-  <rect
-     width="15"
-     height="17.5"
-     rx="9.1800003"
-     ry="1.0096155"
-     x="8.5"
-     y="12"
-     id="rect3268-0-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 23,13.028685 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379"
-     id="rect3268-0"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
-     id="rect3268-6-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
-     id="rect3268-6"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
-     id="rect3268-3-9"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
-     id="rect3268-3"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
-     id="path4752"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9.1800003"
-     ry="1"
-     x="8.5"
-     y="3.5"
-     id="rect3268"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
-     id="path5194"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
-  <path
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
-     id="rect3244"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
-  <path
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
-     id="path5124"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
-  <path
-     d="M 22.981918,13.795166 C 22.078868,13.334046 19.302622,13 16,13 12.708443,13 9.9397386,13.331812 9.0272201,13.790536"
-     id="rect3268-0-7"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <g
-     id="g5672"
-     style="opacity:0.4;stroke-width:1.5"
-     transform="scale(0.66666667)">
-    <path
-       d="M 28.769428,16.499999 24,24.000001 h 7.5 L 21,39 24,27 h -7.5 l 4.206427,-10.500001 z"
-       id="path2911-3"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49999999;marker:none;enable-background:accumulate;font-variant-east_asian:normal;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <path
-       d="M 28.769428,14.999999 24,22.5 h 7.5 L 21,37.5 24,25.500001 h -7.5 l 4.206427,-10.500002 z"
-       id="path2911"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/32/battery-080.svg b/elementary-xfce/status/32/battery-080.svg
deleted file mode 100644
index 1567f36d8..000000000
--- a/elementary-xfce/status/32/battery-080.svg
+++ /dev/null
@@ -1,298 +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="32"
-   height="32"
-   id="svg2485"
-   viewBox="0 0 32 32">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.05034721" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.94965279" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55555556,0,0,0.92105266,2.666667,-11.486842)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821" />
-  </defs>
-  <path
-     d="m 9,12.298 c 0,0 1.840371,-0.798 6.999998,-0.798 5.159627,0 7,0.798 7,0.798 l 0,-6.3530294 c 0,0 -0.56,-0.9684288 -7,-0.9684288 C 9.56,4.9765418 9,5.9360104 9,5.9360104 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9"
-     ry="1"
-     x="-23.5"
-     y="3.5"
-     id="rect3268-4"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
-  <rect
-     width="15"
-     height="17.5"
-     rx="9.1800003"
-     ry="1.0096155"
-     x="8.5"
-     y="12"
-     id="rect3268-0-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 23,13.028685 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379"
-     id="rect3268-0"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
-     id="rect3268-6-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
-     id="rect3268-6"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
-     id="rect3268-3-9"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
-     id="rect3268-3"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
-     id="path4752"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9.1800003"
-     ry="1"
-     x="8.5"
-     y="3.5"
-     id="rect3268"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
-     id="path5194"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
-  <path
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
-     id="rect3244"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
-  <path
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
-     id="path5124"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
-  <path
-     d="M 22.981918,13.795166 C 22.078868,13.334046 19.302622,13 16,13 12.708443,13 9.9397386,13.331812 9.0272201,13.790536"
-     id="rect3268-0-7"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/status/32/battery-100-charging.svg b/elementary-xfce/status/32/battery-100-charging.svg
deleted file mode 100644
index 0157f77b3..000000000
--- a/elementary-xfce/status/32/battery-100-charging.svg
+++ /dev/null
@@ -1,307 +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="32"
-   height="32"
-   id="svg2485"
-   viewBox="0 0 32 32">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.05034721" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.94965279" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient4223"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55555556,0,0,1.2894737,2.666667,-27.88158)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821" />
-    <linearGradient
-       id="linearGradient4223">
-      <stop
-         offset="0"
-         style="stop-color:#cdf87e;stop-opacity:1"
-         id="stop4225" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#a2e34f;stop-opacity:1"
-         id="stop4227" />
-      <stop
-         offset="0.66093999"
-         style="stop-color:#68b723;stop-opacity:1"
-         id="stop4229" />
-      <stop
-         offset="1"
-         style="stop-color:#1d7e0d;stop-opacity:1"
-         id="stop4231" />
-    </linearGradient>
-  </defs>
-  <rect
-     width="15"
-     height="26"
-     rx="9"
-     ry="1"
-     x="-23.5"
-     y="3.5"
-     id="rect3268-4"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
-  <rect
-     width="15"
-     height="24.5"
-     rx="9.1800003"
-     ry="1.0096157"
-     x="8.5"
-     y="5.0000005"
-     id="rect3268-0-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 23,6.028214 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379"
-     id="rect3268-0"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0f7d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
-     id="rect3268-6-4"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
-     id="rect3268-6"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
-     id="rect3268-3-9"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
-     id="rect3268-3"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
-     id="path4752"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9.1800003"
-     ry="1"
-     x="8.5"
-     y="3.5"
-     id="rect3268"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
-     id="path5194"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
-  <path
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
-     id="rect3244"
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
-  <path
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
-     id="path5124"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
-  <path
-     d="M 22.981918,6.794695 C 22.078868,6.333575 19.302622,5.999529 16,5.999529 c -3.291557,0 -6.0602614,0.331812 -6.9727799,0.790536"
-     id="rect3268-0-7"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <g
-     id="g5672"
-     style="opacity:0.4;stroke-width:1.5"
-     transform="scale(0.66666667)">
-    <path
-       d="M 28.769428,16.499999 24,24.000001 h 7.5 L 21,39 24,27 h -7.5 l 4.206427,-10.500001 z"
-       id="path2911-3"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    <path
-       d="M 28.769428,14.999999 24,22.5 h 7.5 L 21,37.5 24,25.500001 h -7.5 l 4.206427,-10.500002 z"
-       id="path2911"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/32/battery-100.svg b/elementary-xfce/status/32/battery-100.svg
deleted file mode 100644
index f0d35a4aa..000000000
--- a/elementary-xfce/status/32/battery-100.svg
+++ /dev/null
@@ -1,294 +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"
-   viewBox="0 0 32 32"
-   id="svg2485"
-   height="32"
-   width="32"
-   version="1.0">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5128" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5130" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         offset="0"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         id="stop5120" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5122" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4764" />
-      <stop
-         offset="0.05034721"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4766" />
-      <stop
-         offset="0.94965279"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4768" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4770" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.55555556,0,0,1.2894737,2.666667,-27.88158)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4223"
-       id="linearGradient4393"
-       y2="35"
-       x2="46.68"
-       y1="35"
-       x1="-5.0010252" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4663-8-7" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop4665-7-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4762"
-       id="linearGradient4760"
-       y2="43"
-       x2="30"
-       y1="7"
-       x1="30" />
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       id="linearGradient3457-7-6"
-       y2="-93.091553"
-       x2="-48.479328"
-       y1="-93.091553"
-       x1="-20.446733" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         offset="0"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         id="stop4681-3-1" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4683-67-4" />
-    </linearGradient>
-    <linearGradient
-       spreadMethod="reflect"
-       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5118"
-       id="linearGradient5066-8"
-       y2="-93.091553"
-       x2="-45.761551"
-       y1="-93.091553"
-       x1="-17.12093" />
-    <radialGradient
-       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5126"
-       id="radialGradient5132"
-       fy="7.5"
-       fx="16.5"
-       r="3.5"
-       cy="7.5"
-       cx="16.5" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         offset="0"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         id="stop3822-2-6-3-3-7" />
-      <stop
-         offset="0.5"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         id="stop3864-8-7-7-9-1" />
-      <stop
-         offset="1"
-         style="stop-color:#686868;stop-opacity:0"
-         id="stop3824-1-2-5-0-3" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       id="radialGradient5362"
-       fy="186.17059"
-       fx="99.157013"
-       r="62.769119"
-       cy="186.17059"
-       cx="99.157013" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5508"
-       y2="35.717499"
-       x2="17.77273"
-       y1="17.458462"
-       x1="13.681819" />
-    <linearGradient
-       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       id="linearGradient5510"
-       y2="35.717499"
-       x2="27.31819"
-       y1="17.458462"
-       x1="25.272734" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop3825"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3821"
-       id="linearGradient3941"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25" />
-    <linearGradient
-       id="linearGradient4223">
-      <stop
-         id="stop4225"
-         style="stop-color:#cdf87e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4227"
-         style="stop-color:#a2e34f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop4229"
-         style="stop-color:#68b723;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop4231"
-         style="stop-color:#1d7e0d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <rect
-     transform="scale(-1,1)"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-4"
-     y="3.5"
-     x="-23.5"
-     ry="1"
-     rx="9"
-     height="26"
-     width="15" />
-  <path
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
-     id="path3818-0-5"
-     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
-  <rect
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-1"
-     y="5.0000005"
-     x="8.5"
-     ry="1.0096157"
-     rx="9.1800003"
-     height="24.5"
-     width="15" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0f7d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0"
-     d="m 23,6.028214 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-6-4"
-     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-6"
-     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-     id="rect3268-3-9"
-     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-3"
-     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4752"
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
-  <rect
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268"
-     y="3.5"
-     x="8.5"
-     ry="1"
-     rx="9.1800003"
-     height="26"
-     width="15" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
-     id="path5194"
-     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
-  <path
-     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
-     id="rect3244"
-     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
-     id="path5124"
-     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="rect3268-0-7"
-     d="M 22.981918,6.794695 C 22.078868,6.333575 19.302622,5.999529 16,5.999529 c -3.291557,0 -6.0602614,0.331812 -6.9727799,0.790536" />
-</svg>
diff --git a/elementary-xfce/status/32/battery-caution-charging.svg b/elementary-xfce/status/32/battery-caution-charging.svg
deleted file mode 120000
index 5c4b1caf0..000000000
--- a/elementary-xfce/status/32/battery-caution-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-caution-charging.svg b/elementary-xfce/status/32/battery-caution-charging.svg
new file mode 100644
index 000000000..90b2e3715
--- /dev/null
+++ b/elementary-xfce/status/32/battery-caution-charging.svg
@@ -0,0 +1,349 @@
+<?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="32"
+   height="32"
+   id="svg2485"
+   viewBox="0 0 32 32">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.05034721" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.94965279" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0"
+         id="stop3823" />
+      <stop
+         id="stop947"
+         offset="0.06865654"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop943"
+         offset="0.5"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.82605612"
+         id="stop945" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.333331"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient3821" />
+    <linearGradient
+       id="linearGradient4271">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4273" />
+      <stop
+         offset="0.2559385"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4275" />
+      <stop
+         offset="0.90909094"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4277" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4279" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.56521739,0,0,0.49999961,2.4347826,6.7500113)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4271"
+       id="linearGradient4760-7"
+       y2="43"
+       x2="30"
+       y1="32.586082"
+       x1="30" />
+    <linearGradient
+       gradientTransform="matrix(1,0,0,0.32432432,-11.499999,-2.432433)"
+       xlink:href="#linearGradient899"
+       id="linearGradient901"
+       x1="19.499998"
+       y1="87.666672"
+       x2="43.5"
+       y2="87.666672"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         style="stop-color:#ffe16b;stop-opacity:1"
+         offset="0"
+         id="stop895" />
+      <stop
+         style="stop-color:#d48e15;stop-opacity:1"
+         offset="1"
+         id="stop897" />
+    </linearGradient>
+  </defs>
+  <rect
+     width="15"
+     height="26"
+     rx="9"
+     ry="1"
+     x="-23.5"
+     y="3.5"
+     id="rect3268-4"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     transform="scale(-1,1)" />
+  <path
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
+  <rect
+     width="15"
+     height="8"
+     rx="13.5"
+     ry="1.5000004"
+     x="8.5"
+     y="21.5"
+     id="rect3268-0-1-7"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+  <path
+     d="m 23.5,22.500002 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5000002,0.446 -7.5000002,1"
+     id="rect3268-0-8"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#ad5f00;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,22.499999 c -1.938645,0 -3.685271,0.08683 -4.927989,0.218749 -0.621359,0.06596 -1.1270747,0.142293 -1.4307066,0.218751 -0.08027,0.02022 -0.092941,0.02993 -0.1413044,0.04688 v 5.031246 c 0.048364,0.01696 0.061034,0.02665 0.1413044,0.04688 0.3036319,0.07645 0.8093476,0.15279 1.4307066,0.21875 1.242718,0.131907 2.989344,0.218736 4.927989,0.218736 1.938646,0 3.685271,-0.08683 4.927989,-0.218749 0.62136,-0.06596 1.127075,-0.142292 1.430707,-0.21875 0.08027,-0.02022 0.09294,-0.02993 0.141304,-0.04688 V 22.98437 C 22.45164,22.96741 22.43897,22.95771 22.358696,22.93749 22.055064,22.86104 21.549349,22.784698 20.927989,22.718739 19.685271,22.586829 17.938646,22.499999 16,22.499999 Z"
+     id="path4230"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient4760-7);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 23.175384,23.790373 c -0.928851,0.411517 -3.784419,0.709629 -7.181402,0.709629 -3.385603,0 -6.2334128,-0.296118 -7.1720028,-0.705497"
+     id="rect3268-0-7-1"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.4;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 23.5,22.500002 c 0,0.554 -3.345,1 -7.5,1 -4.155,0 -7.5000002,-0.446 -7.5000002,-1"
+     id="rect3268-0-3"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;stroke:#ad5f00;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 23.175384,22.45704 c -0.928851,0.411517 -3.784419,0.709629 -7.181402,0.709629 -3.385603,0 -6.2334128,-0.296118 -7.1720028,-0.705497"
+     id="rect3268-0-7-8"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
+     id="rect3268-6-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
+     id="rect3268-6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
+     id="rect3268-3-9"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
+     id="rect3268-3"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
+     id="path4752"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="rect3268"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6" />
+  <path
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
+     id="path5194"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+  <path
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
+     id="rect3244"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
+  <path
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
+     id="path5124"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
+  <g
+     id="g5672"
+     style="opacity:0.4;stroke-width:1.5"
+     transform="scale(0.66666667)" />
+  <path
+     id="rect910"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#ad5f00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6" />
+  <path
+     id="path54-3"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 16.333341,10.667001 c -0.198957,0 -0.377848,0.08705 -0.499998,0.225261 L 10.09375,18.993963 C 10.03454,19.093552 10,19.209524 10,19.333807 c 0,0.368191 0.298476,0.666666 0.666667,0.666666 h 5.333338 l -0.944012,4.399876 c -0.0357,0.08167 -0.056,0.172088 -0.056,0.266927 0,0.368192 0.298477,0.666667 0.666667,0.666667 0.19896,0 0.377852,-0.08704 0.5,-0.225259 l 5.73959,-8.101702 C 21.96546,16.907392 22,16.791418 22,16.667138 22,16.298947 21.701524,16.000469 21.333332,16.000469 h -5.333334 l 0.944012,-4.399874 c 0.0357,-0.08167 0.056,-0.172087 0.056,-0.266927 0,-0.36819 -0.298478,-0.666667 -0.666669,-0.666667 z" />
+  <path
+     id="path54"
+     style="font-variation-settings:normal;opacity:0.85;vector-effect:none;fill:#d48e15;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 16.333341,9.666531 c -0.198957,0 -0.377848,0.087049 -0.499998,0.2252607 L 10.09375,17.993493 C 10.03454,18.093083 10,18.209056 10,18.333339 c 0,0.36819 0.298476,0.666666 0.666667,0.666666 h 5.333338 l -0.944012,4.399875 c -0.0357,0.08167 -0.056,0.172088 -0.056,0.266927 0,0.368192 0.298477,0.666667 0.666667,0.666667 0.19896,0 0.377852,-0.08704 0.5,-0.225259 l 5.73959,-8.101703 C 21.96546,15.906923 22,15.79095 22,15.666669 c 0,-0.36819 -0.298476,-0.666668 -0.666668,-0.666668 h -5.333334 l 0.944012,-4.399875 c 0.0357,-0.08167 0.056,-0.172087 0.056,-0.266927 0,-0.3681905 -0.298478,-0.666668 -0.666669,-0.666668 z" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-caution.svg b/elementary-xfce/status/32/battery-caution.svg
deleted file mode 120000
index f76eaff39..000000000
--- a/elementary-xfce/status/32/battery-caution.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-caution.svg b/elementary-xfce/status/32/battery-caution.svg
new file mode 100644
index 000000000..fc9985380
--- /dev/null
+++ b/elementary-xfce/status/32/battery-caution.svg
@@ -0,0 +1,451 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 32 32"
+   id="svg2485"
+   height="32"
+   width="32"
+   version="1.0"
+   sodipodi:docname="battery-caution.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1373"
+     id="namedview66"
+     showgrid="true"
+     inkscape:zoom="11.313709"
+     inkscape:cx="51.01814"
+     inkscape:cy="14.352569"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2485">
+    <inkscape:grid
+       type="xygrid"
+       id="grid895" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata71">
+    <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="defs2487">
+    <linearGradient
+       id="linearGradient929">
+      <stop
+         id="stop918"
+         offset="0"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.08017239"
+         id="stop921" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0.48701805"
+         id="stop923" />
+      <stop
+         id="stop925"
+         offset="0.82605612"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop927"
+         offset="1"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5128" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop5130" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         offset="0"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         id="stop5120" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5122" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4764" />
+      <stop
+         offset="0.05034721"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4766" />
+      <stop
+         offset="0.94965279"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4768" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4663-8-7" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4665-7-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4762"
+       id="linearGradient4760"
+       y2="43"
+       x2="30"
+       y1="7"
+       x1="30" />
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       id="linearGradient3457-7-6"
+       y2="-93.091553"
+       x2="-48.479328"
+       y1="-93.091553"
+       x1="-20.446733" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         id="stop4681-3-1" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4683-67-4" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5118"
+       id="linearGradient5066-8"
+       y2="-93.091553"
+       x2="-45.761551"
+       y1="-93.091553"
+       x1="-17.12093" />
+    <radialGradient
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5126"
+       id="radialGradient5132"
+       fy="7.5"
+       fx="16.5"
+       r="3.5"
+       cy="7.5"
+       cx="16.5" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         offset="0"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         id="stop3822-2-6-3-3-7" />
+      <stop
+         offset="0.5"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         id="stop3864-8-7-7-9-1" />
+      <stop
+         offset="1"
+         style="stop-color:#686868;stop-opacity:0"
+         id="stop3824-1-2-5-0-3" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       id="radialGradient5362"
+       fy="186.17059"
+       fx="99.157013"
+       r="62.769119"
+       cy="186.17059"
+       cx="99.157013" />
+    <linearGradient
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5508"
+       y2="35.717499"
+       x2="17.77273"
+       y1="17.458462"
+       x1="13.681819" />
+    <linearGradient
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5510"
+       y2="35.717499"
+       x2="27.31819"
+       y1="17.458462"
+       x1="25.272734" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         id="stop3823"
+         offset="0"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.08017239"
+         id="stop898" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0.46257836"
+         id="stop910" />
+      <stop
+         id="stop912"
+         offset="0.82605612"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop3825"
+         offset="1"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient929"
+       id="linearGradient3941"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       x1="12.029413"
+       y1="25"
+       x2="36.608757"
+       y2="25" />
+    <linearGradient
+       id="linearGradient4271">
+      <stop
+         id="stop4273"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4275"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.2559385" />
+      <stop
+         id="stop4277"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.90909094" />
+      <stop
+         id="stop4279"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-5.0010252"
+       y1="35"
+       x2="46.68"
+       y2="35"
+       id="linearGradient4393-7"
+       xlink:href="#linearGradient3846-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55555556,0,0,0.42105263,2.6666661,10.763159)" />
+    <linearGradient
+       id="linearGradient3846-7">
+      <stop
+         id="stop3848-7"
+         style="stop-color:#fff394;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3850-5"
+         style="stop-color:#ffe16b;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3852-9"
+         style="stop-color:#f9c440;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop3854-2"
+         style="stop-color:#d48e15;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="32.586082"
+       x2="30"
+       y2="43"
+       id="linearGradient4760-7"
+       xlink:href="#linearGradient4271"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.56521739,0,0,0.49999961,2.4347826,6.7500113)" />
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.333331"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-21.899999,-3.666666)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941-3"
+       xlink:href="#linearGradient3821-6" />
+    <linearGradient
+       id="linearGradient3821-6">
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0"
+         id="stop3823-7" />
+      <stop
+         id="stop947"
+         offset="0.06865654"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop943"
+         offset="0.5"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.82605612"
+         id="stop945" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="1"
+         id="stop3825-5" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1,0,0,0.32432432,-11.499999,-2.432433)"
+       xlink:href="#linearGradient899"
+       id="linearGradient901"
+       x1="20.038094"
+       y1="84.583336"
+       x2="43.5"
+       y2="84.583336"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         style="stop-color:#ffe16b;stop-opacity:1"
+         offset="0"
+         id="stop895" />
+      <stop
+         style="stop-color:#d48e15;stop-opacity:1"
+         offset="1"
+         id="stop897" />
+    </linearGradient>
+  </defs>
+  <rect
+     transform="scale(-1,1)"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     id="rect3268-4"
+     y="3.5"
+     x="-23.5"
+     ry="1"
+     rx="9"
+     height="26"
+     width="15" />
+  <path
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
+     id="path3818-0-5"
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     id="rect3268-0-1-7"
+     y="21.5"
+     x="8.5"
+     ry="1.5000004"
+     rx="13.5"
+     height="8"
+     width="15" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#ad5f00;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-8"
+     d="m 23.5,22.500002 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5000002,0.446 -7.5000002,1" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:url(#linearGradient4760-7);stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path4230"
+     d="m 16,22.499999 c -1.938645,0 -3.685271,0.08683 -4.927989,0.218749 -0.621359,0.06596 -1.1270747,0.142293 -1.4307066,0.218751 -0.08027,0.02022 -0.092941,0.02993 -0.1413044,0.04688 v 5.031246 c 0.048364,0.01696 0.061034,0.02665 0.1413044,0.04688 0.3036319,0.07645 0.8093476,0.15279 1.4307066,0.21875 1.242718,0.131907 2.989344,0.218736 4.927989,0.218736 1.938646,0 3.685271,-0.08683 4.927989,-0.218749 0.62136,-0.06596 1.127075,-0.142292 1.430707,-0.21875 0.08027,-0.02022 0.09294,-0.02993 0.141304,-0.04688 V 22.98437 C 22.45164,22.96741 22.43897,22.95771 22.358696,22.93749 22.055064,22.86104 21.549349,22.784698 20.927989,22.718739 19.685271,22.586829 17.938646,22.499999 16,22.499999 Z" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.4;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-7-1"
+     d="m 23.175384,23.790373 c -0.928851,0.411517 -3.784419,0.709629 -7.181402,0.709629 -3.385603,0 -6.2334128,-0.296118 -7.1720028,-0.705497" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15;fill:none;stroke:#ad5f00;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-3"
+     d="m 23.5,22.500002 c 0,0.554 -3.345,1 -7.5,1 -4.155,0 -7.5000002,-0.446 -7.5000002,-1" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-7-8"
+     d="m 23.175384,22.45704 c -0.928851,0.411517 -3.784419,0.709629 -7.181402,0.709629 -3.385603,0 -6.2334128,-0.296118 -7.1720028,-0.705497" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="rect3268-6-4"
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-6"
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="rect3268-3-9"
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-3"
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path4752"
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
+  <path
+     id="rect3268"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     sodipodi:nodetypes="csssc" />
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+     id="path5194"
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
+     id="rect3244"
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
+     id="path5124"
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
+  <path
+     id="rect891"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#ad5f00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6"
+     sodipodi:nodetypes="csssc" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-empty-charging.svg b/elementary-xfce/status/32/battery-empty-charging.svg
deleted file mode 120000
index 47cf3ff48..000000000
--- a/elementary-xfce/status/32/battery-empty-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-empty-charging.svg b/elementary-xfce/status/32/battery-empty-charging.svg
new file mode 100644
index 000000000..372bd3134
--- /dev/null
+++ b/elementary-xfce/status/32/battery-empty-charging.svg
@@ -0,0 +1,309 @@
+<?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="32"
+   height="32"
+   id="svg2485"
+   viewBox="0 0 32 32">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient922">
+      <stop
+         id="stop912"
+         offset="0"
+         style="stop-color:#7a0000;stop-opacity:0" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:1"
+         offset="0.10048653"
+         id="stop914" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="0.5"
+         id="stop916" />
+      <stop
+         id="stop918"
+         offset="0.82605612"
+         style="stop-color:#7a0000;stop-opacity:1" />
+      <stop
+         id="stop920"
+         offset="1"
+         style="stop-color:#7a0000;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.05034721" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.94965279" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="18.599998"
+       y1="9.2142887"
+       x2="18.599998"
+       y2="58.07143"
+       id="linearGradient4393"
+       xlink:href="#linearGradient3242-4-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55555556,0,0,0.18421053,2.666667,21.302631)" />
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="11.474326"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient922" />
+    <linearGradient
+       id="linearGradient3242-4-2">
+      <stop
+         offset="0"
+         style="stop-color:#ff8c82;stop-opacity:1"
+         id="stop3244-8-8" />
+      <stop
+         offset="1"
+         style="stop-color:#a10705;stop-opacity:1"
+         id="stop3250-3-0" />
+    </linearGradient>
+  </defs>
+  <rect
+     width="15"
+     height="26"
+     rx="9"
+     ry="1"
+     x="-23.5"
+     y="3.5"
+     id="rect3268-4"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <path
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
+  <rect
+     width="15"
+     height="3.5"
+     rx="9.1800003"
+     ry="1.0096155"
+     x="8.5"
+     y="26"
+     id="rect3268-0-1"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" />
+  <path
+     d="m 23,27.028685 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379"
+     id="rect3268-0"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#7a0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
+     id="rect3268-6-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
+     id="rect3268-6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
+     id="rect3268-3-9"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
+     id="rect3268-3"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
+     id="path4752"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268" />
+  <path
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
+     id="path5194"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+  <path
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
+     id="rect3244"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
+  <path
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
+     id="path5124"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
+  <path
+     d="M 22.981918,27.795166 C 22.078868,27.334046 19.302622,27 16,27 12.708443,27 9.9397386,27.331812 9.0272201,27.790536"
+     id="rect3268-0-7"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <g
+     id="g5672"
+     style="opacity:0.4;stroke-width:1.5"
+     transform="scale(0.66666667)" />
+  <path
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#7a0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect889" />
+  <path
+     id="path54-3"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 16.333341,10.667001 c -0.198957,0 -0.377848,0.08705 -0.499998,0.225261 L 10.09375,18.993963 C 10.03454,19.093552 10,19.209524 10,19.333807 c 0,0.368191 0.298476,0.666666 0.666667,0.666666 h 5.333338 l -0.944012,4.399876 c -0.0357,0.08167 -0.056,0.172088 -0.056,0.266927 0,0.368192 0.298477,0.666667 0.666667,0.666667 0.19896,0 0.377852,-0.08704 0.5,-0.225259 l 5.73959,-8.101702 C 21.96546,16.907392 22,16.791418 22,16.667138 22,16.298947 21.701524,16.000469 21.333332,16.000469 h -5.333334 l 0.944012,-4.399874 c 0.0357,-0.08167 0.056,-0.172087 0.056,-0.266927 0,-0.36819 -0.298478,-0.666667 -0.666669,-0.666667 z" />
+  <path
+     id="path54"
+     style="font-variation-settings:normal;opacity:0.55;vector-effect:none;fill:#a10705;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 16.333341,9.666531 c -0.198957,0 -0.377848,0.087049 -0.499998,0.2252607 L 10.09375,17.993493 C 10.03454,18.093083 10,18.209056 10,18.333339 c 0,0.36819 0.298476,0.666666 0.666667,0.666666 h 5.333338 l -0.944012,4.399875 c -0.0357,0.08167 -0.056,0.172088 -0.056,0.266927 0,0.368192 0.298477,0.666667 0.666667,0.666667 0.19896,0 0.377852,-0.08704 0.5,-0.225259 l 5.73959,-8.101703 C 21.96546,15.906923 22,15.79095 22,15.666669 c 0,-0.36819 -0.298476,-0.666668 -0.666668,-0.666668 h -5.333334 l 0.944012,-4.399875 c 0.0357,-0.08167 0.056,-0.172087 0.056,-0.266927 0,-0.3681905 -0.298478,-0.666668 -0.666669,-0.666668 z" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-empty.svg b/elementary-xfce/status/32/battery-empty.svg
deleted file mode 120000
index 1bf261b38..000000000
--- a/elementary-xfce/status/32/battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-empty.svg b/elementary-xfce/status/32/battery-empty.svg
new file mode 100644
index 000000000..0027b859a
--- /dev/null
+++ b/elementary-xfce/status/32/battery-empty.svg
@@ -0,0 +1,447 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="32"
+   height="32"
+   id="svg2485"
+   viewBox="0 0 32 32"
+   sodipodi:docname="battery-empty.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1373"
+     id="namedview72"
+     showgrid="true"
+     inkscape:zoom="2.784233"
+     inkscape:cx="169.19953"
+     inkscape:cy="80.214448"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2485">
+    <inkscape:grid
+       type="xygrid"
+       id="grid899"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata71">
+    <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="defs2487">
+    <linearGradient
+       id="linearGradient971">
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="0"
+         id="stop961" />
+      <stop
+         id="stop963"
+         offset="0.06865654"
+         style="stop-color:#7a0000;stop-opacity:1" />
+      <stop
+         id="stop965"
+         offset="0.5"
+         style="stop-color:#7a0000;stop-opacity:0" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:1"
+         offset="0.82605612"
+         id="stop967" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="1"
+         id="stop969" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.05034721" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.94965279" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20.4"
+       y1="14.64286"
+       x2="20.4"
+       y2="58.07143"
+       id="linearGradient4393"
+       xlink:href="#linearGradient3242-4-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55555556,0,0,0.18421053,2.666667,21.302631)" />
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="0"
+         id="stop3823" />
+      <stop
+         id="stop925"
+         offset="0.08017239"
+         style="stop-color:#7a0000;stop-opacity:1" />
+      <stop
+         id="stop919"
+         offset="0.48701805"
+         style="stop-color:#7a0000;stop-opacity:0" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:1"
+         offset="0.76603448"
+         id="stop921" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient971" />
+    <linearGradient
+       id="linearGradient3242-4-2">
+      <stop
+         offset="0"
+         style="stop-color:#ff8c82;stop-opacity:1"
+         id="stop3244-8-8" />
+      <stop
+         offset="1"
+         style="stop-color:#a10705;stop-opacity:1"
+         id="stop3250-3-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3117">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3119" />
+      <stop
+         offset="0.56911701"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop3121" />
+      <stop
+         offset="0.93297637"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop3123" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop3125" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.3209283,0,-0.00139699,0.29826454,14.687308,13.463913)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3117"
+       id="linearGradient3039"
+       y2="57.567127"
+       x2="29.291178"
+       y1="19.787613"
+       x1="29.126724" />
+    <linearGradient
+       gradientTransform="matrix(0.3333471,0,0,0.32559732,16.006923,16.994947)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4171"
+       id="linearGradient3042"
+       y2="43.828014"
+       x2="24"
+       y1="1.7296801"
+       x1="24" />
+    <linearGradient
+       id="linearGradient4171">
+      <stop
+         style="stop-color:#ffe16b;stop-opacity:1"
+         offset="0"
+         id="stop4173" />
+      <stop
+         style="stop-color:#f9c440;stop-opacity:1"
+         offset="1"
+         id="stop4175" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3821-6"
+       id="linearGradient3941-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-21.899999,-3.666666)"
+       x1="12.333331"
+       y1="25"
+       x2="36.608757"
+       y2="25" />
+    <linearGradient
+       id="linearGradient3821-6">
+      <stop
+         id="stop3823-7"
+         offset="0"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.06865654"
+         id="stop947" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0.5"
+         id="stop943" />
+      <stop
+         id="stop945"
+         offset="0.82605612"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop3825-5"
+         offset="1"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+    </linearGradient>
+  </defs>
+  <path
+     d="m -16,3.5 c 4.155,0 7.5,0.446 7.5,1 v 24 c 0,0.554 -3.345,1 -7.5,1 -4.155,0 -7.5,-0.446 -7.5,-1 v -24 c 0,-0.554 3.345,-1 7.5,-1 z"
+     transform="scale(-1,1)"
+     style="color:#000000;font-variation-settings:normal;display:block;overflow:visible;visibility:visible;opacity:0.1;vector-effect:none;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     id="rect3268-4" />
+  <path
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
+  <rect
+     width="15"
+     height="3.5"
+     rx="9.1800003"
+     ry="1.0096155"
+     x="8.5"
+     y="26"
+     id="rect3268-0-1"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" />
+  <path
+     d="m 23,27.028685 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379"
+     id="rect3268-0"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#7a0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
+     id="rect3268-6-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
+     id="rect3268-6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
+     id="rect3268-3-9"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
+     id="rect3268-3"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
+     id="path4752"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="rect3268"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     sodipodi:nodetypes="csssc" />
+  <path
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
+     id="path5194"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+  <path
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
+     id="rect3244"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
+  <path
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
+     id="path5124"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
+  <path
+     d="M 22.981918,27.795166 C 22.078868,27.334046 19.302622,27 16,27 12.708443,27 9.9397386,27.331812 9.0272201,27.790536"
+     id="rect3268-0-7"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="rect897"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#7a0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6"
+     sodipodi:nodetypes="csssc" />
+  <path
+     d="m 31.400506,30.018518 -6.510339,-12 C 24.703041,17.685185 24.364442,17.5 23.987342,17.5 c -0.377097,0 -0.717434,0.22222 -0.907403,0.555555 l -6.461858,12 c -0.152102,0.296297 -0.153841,0.703705 0.03345,1 C 16.83881,31.351852 17.139858,31.5 17.516958,31.5 l 12.972191,0 c 0.3771,0 0.717277,-0.185186 0.869382,-0.481483 0.189811,-0.296295 0.191393,-0.666665 0.04198,-0.999999 z"
+     id="path11155"
+     style="fill:url(#linearGradient3042);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="M 30.007255,29.518301 C 28.052793,26.046889 26.007255,22 23.982397,18.5 c -1.975142,3.5 -3.870689,7.445761 -5.975142,11.013164 -0.318952,0.522763 -0.632907,0.692927 -0.479386,0.923014 0.153519,0.230089 0.418429,0.04807 1.146742,0.06307 l 10.795596,0 c 0.678046,0.0075 0.864678,0.10371 0.989435,-0.126372 0.155674,-0.230085 -0.154842,-0.3856 -0.452387,-0.854575 z"
+     id="path11159"
+     style="opacity:0.6;fill:none;stroke:url(#linearGradient3039);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="m 31.400506,30.018518 -6.510339,-12 C 24.703041,17.685185 24.364443,17.5 23.987343,17.5 c -0.377098,0 -0.717435,0.22222 -0.907403,0.555555 l -6.461859,12.000001 c -0.152102,0.296297 -0.153841,0.703704 0.03345,0.999999 C 16.83881,31.351852 17.139858,31.5 17.516958,31.5 l 12.972191,0 c 0.3771,0 0.717278,-0.185185 0.869383,-0.481481 0.189811,-0.296296 0.191392,-0.666666 0.04198,-1.000001 z"
+     id="path11155-59"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#ad5f00;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-opacity:1;fill-rule:nonzero;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" />
+  <path
+     id="path4231"
+     d="m 23.007255,22 0,4 0.5,2 1,0 0.5,-2 0,-4 z m 1,7 c -0.552285,0 -1,0.447715 -1,1 0,0.552285 0.447715,1 1,1 0.552285,0 1,-0.447715 1,-1 0,-0.552285 -0.447715,-1 -1,-1 z"
+     style="opacity:0.15;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:#7a0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-rule:nonzero;stroke-dashoffset:0;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 23.007255,21 0,4 0.5,2 1,0 0.5,-2 0,-4 z m 1,7 c -0.552285,0 -1,0.447715 -1,1 0,0.552285 0.447715,1 1,1 0.552285,0 1,-0.447715 1,-1 0,-0.552285 -0.447715,-1 -1,-1 z"
+     id="path4156" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-full-charged.svg b/elementary-xfce/status/32/battery-full-charged.svg
deleted file mode 120000
index d53d66a51..000000000
--- a/elementary-xfce/status/32/battery-full-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-full-charged.svg b/elementary-xfce/status/32/battery-full-charged.svg
new file mode 100644
index 000000000..22f9fb585
--- /dev/null
+++ b/elementary-xfce/status/32/battery-full-charged.svg
@@ -0,0 +1,281 @@
+<?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"
+   viewBox="0 0 32 32"
+   id="svg2485"
+   height="32"
+   width="32"
+   version="1.0">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient949">
+      <stop
+         id="stop945"
+         offset="0"
+         style="stop-color:#9bdb4d;stop-opacity:1" />
+      <stop
+         id="stop947"
+         offset="1"
+         style="stop-color:#3a9104;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5128" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop5130" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         offset="0"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         id="stop5120" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5122" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4764" />
+      <stop
+         offset="0.05034721"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4766" />
+      <stop
+         offset="0.94965279"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4768" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4663-8-7" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4665-7-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.2837841)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4762"
+       id="linearGradient4760"
+       y2="43"
+       x2="30"
+       y1="7"
+       x1="30" />
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       id="linearGradient3457-7-6"
+       y2="-93.091553"
+       x2="-48.479328"
+       y1="-93.091553"
+       x1="-20.446733" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         id="stop4681-3-1" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4683-67-4" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5118"
+       id="linearGradient5066-8"
+       y2="-93.091553"
+       x2="-45.761551"
+       y1="-93.091553"
+       x1="-17.12093" />
+    <radialGradient
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5126"
+       id="radialGradient5132"
+       fy="7.5"
+       fx="16.5"
+       r="3.5"
+       cy="7.5"
+       cx="16.5" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         offset="0"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         id="stop3822-2-6-3-3-7" />
+      <stop
+         offset="0.5"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         id="stop3864-8-7-7-9-1" />
+      <stop
+         offset="1"
+         style="stop-color:#686868;stop-opacity:0"
+         id="stop3824-1-2-5-0-3" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       id="radialGradient5362"
+       fy="186.17059"
+       fx="99.157013"
+       r="62.769119"
+       cy="186.17059"
+       cx="99.157013" />
+    <linearGradient
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5508"
+       y2="35.717499"
+       x2="17.77273"
+       y1="17.458462"
+       x1="13.681819" />
+    <linearGradient
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5510"
+       y2="35.717499"
+       x2="27.31819"
+       y1="17.458462"
+       x1="25.272734" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         id="stop3823"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3825"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3821"
+       id="linearGradient3941"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       x1="12.029413"
+       y1="25"
+       x2="36.608757"
+       y2="25" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.5"
+       x2="23.5"
+       y1="17.5"
+       x1="8.5"
+       id="linearGradient951"
+       xlink:href="#linearGradient949" />
+  </defs>
+  <path
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
+     id="path3818-0-5"
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
+  <rect
+     transform="scale(-1,1)"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="rect3268-4"
+     y="3.5"
+     x="-23.5"
+     ry="1"
+     rx="9"
+     height="26"
+     width="15" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="rect3268-6-4"
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="rect3268-3-9"
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-3"
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
+  <rect
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient951);stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;vector-effect:none;fill-opacity:1"
+     id="rect3268-36-5"
+     y="5.5"
+     x="8.5"
+     ry="0.92307693"
+     rx="9.1800003"
+     height="24"
+     width="15" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path4752"
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
+  <path
+     id="rect3268"
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+     id="path5194"
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
+     id="rect3244"
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
+     id="path5124"
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-7"
+     d="M 22.981918,7.2061236 C 22.078868,6.7450036 19.302622,6.4109576 16,6.4109576 c -3.291557,0 -6.0602614,0.331812 -6.9727799,0.790536" />
+  <rect
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#206b00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-36"
+     y="5.5"
+     x="8.5"
+     ry="0.92307693"
+     rx="9.1800003"
+     height="24"
+     width="15" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-full-charging.svg b/elementary-xfce/status/32/battery-full-charging.svg
deleted file mode 120000
index d53d66a51..000000000
--- a/elementary-xfce/status/32/battery-full-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-full-charging.svg b/elementary-xfce/status/32/battery-full-charging.svg
new file mode 100644
index 000000000..e003a805d
--- /dev/null
+++ b/elementary-xfce/status/32/battery-full-charging.svg
@@ -0,0 +1,293 @@
+<?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="32"
+   height="32"
+   id="svg2485"
+   viewBox="0 0 32 32">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.05034721" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.94965279" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient3821" />
+    <linearGradient
+       gradientTransform="translate(-20,-12.5)"
+       xlink:href="#linearGradient899"
+       id="linearGradient901"
+       x1="28.487635"
+       y1="25.5"
+       x2="43.512783"
+       y2="25.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         style="stop-color:#64baff;stop-opacity:1"
+         offset="0"
+         id="stop895" />
+      <stop
+         style="stop-color:#3689e6;stop-opacity:1"
+         offset="1"
+         id="stop897" />
+    </linearGradient>
+  </defs>
+  <rect
+     width="15"
+     height="26"
+     rx="9"
+     ry="1"
+     x="-23.5"
+     y="3.5"
+     id="rect3268-4"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     transform="scale(-1,1)" />
+  <path
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
+  <rect
+     width="15"
+     height="24.5"
+     rx="9.1800003"
+     ry="1.0096157"
+     x="8.5"
+     y="5.0000005"
+     id="rect3268-0-1"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+  <path
+     d="m 23,6.028214 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379"
+     id="rect3268-0"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
+     id="rect3268-6-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
+     id="rect3268-6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
+     id="rect3268-3-9"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
+     id="rect3268-3"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
+     id="path4752"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268" />
+  <path
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
+     id="path5124"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
+  <path
+     d="M 22.981918,6.794695 C 22.078868,6.333575 19.302622,5.999529 16,5.999529 c -3.291557,0 -6.0602614,0.331812 -6.9727799,0.790536"
+     id="rect3268-0-7"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
+     id="path5194"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+  <path
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
+     id="rect3244"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
+  <path
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect902" />
+  <path
+     id="path54-3"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 16.333341,10.667001 c -0.198957,0 -0.377848,0.08705 -0.499998,0.225261 L 10.09375,18.993963 C 10.03454,19.093552 10,19.209524 10,19.333807 c 0,0.368191 0.298476,0.666666 0.666667,0.666666 h 5.333338 l -0.944012,4.399876 c -0.0357,0.08167 -0.056,0.172088 -0.056,0.266927 0,0.368192 0.298477,0.666667 0.666667,0.666667 0.19896,0 0.377852,-0.08704 0.5,-0.225259 l 5.73959,-8.101702 C 21.96546,16.907392 22,16.791418 22,16.667138 22,16.298947 21.701524,16.000469 21.333332,16.000469 h -5.333334 l 0.944012,-4.399874 c 0.0357,-0.08167 0.056,-0.172087 0.056,-0.266927 0,-0.36819 -0.298478,-0.666667 -0.666669,-0.666667 z" />
+  <path
+     id="path54"
+     style="font-variation-settings:normal;opacity:0.95;vector-effect:none;fill:#0d52bf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000"
+     d="m 16.333341,9.666531 c -0.198957,0 -0.377848,0.087049 -0.499998,0.2252607 L 10.09375,17.993493 C 10.03454,18.093083 10,18.209056 10,18.333339 c 0,0.36819 0.298476,0.666666 0.666667,0.666666 h 5.333338 l -0.944012,4.399875 c -0.0357,0.08167 -0.056,0.172088 -0.056,0.266927 0,0.368192 0.298477,0.666667 0.666667,0.666667 0.19896,0 0.377852,-0.08704 0.5,-0.225259 l 5.73959,-8.101703 C 21.96546,15.906923 22,15.79095 22,15.666669 c 0,-0.36819 -0.298476,-0.666668 -0.666668,-0.666668 h -5.333334 l 0.944012,-4.399875 c 0.0357,-0.08167 0.056,-0.172087 0.056,-0.266927 0,-0.3681905 -0.298478,-0.666668 -0.666669,-0.666668 z" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-full.svg b/elementary-xfce/status/32/battery-full.svg
deleted file mode 120000
index 51e311fbd..000000000
--- a/elementary-xfce/status/32/battery-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-full.svg b/elementary-xfce/status/32/battery-full.svg
new file mode 100644
index 000000000..4dce879e7
--- /dev/null
+++ b/elementary-xfce/status/32/battery-full.svg
@@ -0,0 +1,345 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="32"
+   height="32"
+   id="svg2485"
+   viewBox="0 0 32 32"
+   sodipodi:docname="battery-full.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1373"
+     id="namedview57"
+     showgrid="true"
+     inkscape:zoom="22.273863"
+     inkscape:cx="24.712433"
+     inkscape:cy="26.609598"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2485">
+    <inkscape:grid
+       type="xygrid"
+       id="grid882"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata71">
+    <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="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.05034721" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.94965279" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-5.0010252"
+       y1="35"
+       x2="46.68"
+       y2="35"
+       id="linearGradient4393"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55555556,0,0,1.2894737,2.666667,-27.88158)" />
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient3821" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
+      <stop
+         offset="0"
+         style="stop-color:#8cd5ff;stop-opacity:1"
+         id="stop3750-8-9-7" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#64baff;stop-opacity:1"
+         id="stop3752-3-2-4" />
+      <stop
+         offset="0.704952"
+         style="stop-color:#3689e6;stop-opacity:1"
+         id="stop3754-7-2-4" />
+      <stop
+         offset="1"
+         style="stop-color:#0d52bf;stop-opacity:1"
+         id="stop3756-9-3-7" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="25.5"
+       x2="35.023972"
+       y1="25.5"
+       x1="20.034613"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="translate(-11.5,-7.5)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#64baff;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <rect
+     width="15"
+     height="26"
+     rx="9"
+     ry="1"
+     x="-23.5"
+     y="3.5"
+     id="rect3268-4"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     transform="scale(-1,1)" />
+  <path
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
+  <rect
+     width="15"
+     height="24.5"
+     rx="9.1800003"
+     ry="1.0096157"
+     x="8.5"
+     y="5.0000005"
+     id="rect3268-0-1"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+  <path
+     d="m 23,6.028214 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379"
+     id="rect3268-0"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
+     id="rect3268-6-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
+     id="rect3268-6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
+     id="rect3268-3-9"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
+     id="rect3268-3"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
+     id="path4752"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
+     id="path5194"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+  <path
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
+     id="rect3244"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
+  <path
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
+     id="path5124"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
+  <path
+     d="M 22.981918,6.794695 C 22.078868,6.333575 19.302622,5.999529 16,5.999529 c -3.291557,0 -6.0602614,0.331812 -6.9727799,0.790536"
+     id="rect3268-0-7"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="rect888"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6"
+     sodipodi:nodetypes="csssc" />
+  <path
+     id="rect3268"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     sodipodi:nodetypes="csssc" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-good-charging.svg b/elementary-xfce/status/32/battery-good-charging.svg
deleted file mode 120000
index 83926f7cf..000000000
--- a/elementary-xfce/status/32/battery-good-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-good-charging.svg b/elementary-xfce/status/32/battery-good-charging.svg
new file mode 100644
index 000000000..9448bdd76
--- /dev/null
+++ b/elementary-xfce/status/32/battery-good-charging.svg
@@ -0,0 +1,313 @@
+<?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"
+   viewBox="0 0 32 32"
+   id="svg2485"
+   height="32"
+   width="32"
+   version="1.0">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient914">
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="0"
+         id="stop904" />
+      <stop
+         id="stop906"
+         offset="0.06865654"
+         style="stop-color:#002e99;stop-opacity:1" />
+      <stop
+         id="stop908"
+         offset="0.5"
+         style="stop-color:#002e99;stop-opacity:0" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:1"
+         offset="0.82605612"
+         id="stop910" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="1"
+         id="stop912" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5128" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop5130" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         offset="0"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         id="stop5120" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5122" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4764" />
+      <stop
+         offset="0.05034721"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4766" />
+      <stop
+         offset="0.94965279"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4768" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4663-8-7" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4665-7-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4762"
+       id="linearGradient4760"
+       y2="43"
+       x2="30"
+       y1="7"
+       x1="30" />
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       id="linearGradient3457-7-6"
+       y2="-93.091553"
+       x2="-48.479328"
+       y1="-93.091553"
+       x1="-20.446733" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         id="stop4681-3-1" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4683-67-4" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5118"
+       id="linearGradient5066-8"
+       y2="-93.091553"
+       x2="-45.761551"
+       y1="-93.091553"
+       x1="-17.12093" />
+    <radialGradient
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5126"
+       id="radialGradient5132"
+       fy="7.5"
+       fx="16.5"
+       r="3.5"
+       cy="7.5"
+       cx="16.5" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         offset="0"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         id="stop3822-2-6-3-3-7" />
+      <stop
+         offset="0.5"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         id="stop3864-8-7-7-9-1" />
+      <stop
+         offset="1"
+         style="stop-color:#686868;stop-opacity:0"
+         id="stop3824-1-2-5-0-3" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       id="radialGradient5362"
+       fy="186.17059"
+       fx="99.157013"
+       r="62.769119"
+       cy="186.17059"
+       cx="99.157013" />
+    <linearGradient
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5508"
+       y2="35.717499"
+       x2="17.77273"
+       y1="17.458462"
+       x1="13.681819" />
+    <linearGradient
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5510"
+       y2="35.717499"
+       x2="27.31819"
+       y1="17.458462"
+       x1="25.272734" />
+    <linearGradient
+       xlink:href="#linearGradient914"
+       id="linearGradient3941"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       x1="12.029413"
+       y1="25"
+       x2="36.608757"
+       y2="25" />
+    <linearGradient
+       gradientTransform="translate(-20,-12.5)"
+       xlink:href="#linearGradient899"
+       id="linearGradient901"
+       x1="28.472324"
+       y1="29.5"
+       x2="43.440338"
+       y2="29.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         style="stop-color:#64baff;stop-opacity:1"
+         offset="0"
+         id="stop895" />
+      <stop
+         style="stop-color:#3689e6;stop-opacity:1"
+         offset="1"
+         id="stop897" />
+    </linearGradient>
+  </defs>
+  <rect
+     transform="scale(-1,1)"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     id="rect3268-4"
+     y="3.5"
+     x="-23.5"
+     ry="1"
+     rx="9"
+     height="26"
+     width="15" />
+  <path
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1"
+     id="path3818-0-5"
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     id="rect3268-0-1"
+     y="12"
+     x="8.5"
+     ry="1.0096155"
+     rx="9.1800003"
+     height="17.5"
+     width="15" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="rect3268-6-4"
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-6"
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     id="rect3268-3-9"
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-3"
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636" />
+  <path
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate"
+     id="path5124"
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-7"
+     d="M 22.981918,13.795166 C 22.078868,13.334046 19.302622,13 16,13 12.708443,13 9.9397386,13.331812 9.0272201,13.790536" />
+  <g
+     transform="scale(0.66666667)"
+     style="opacity:0.4;stroke-width:1.5"
+     id="g5672" />
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+     id="path5194"
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z" />
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none"
+     id="rect3244"
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z" />
+  <path
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect928" />
+  <path
+     id="path54-3"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 16.333341,10.667 c -0.198957,0 -0.377848,0.08705 -0.499998,0.225261 L 10.09375,18.993962 C 10.03454,19.093552 10,19.209524 10,19.333807 c 0,0.368191 0.298476,0.666666 0.666667,0.666666 h 5.333338 l -0.944012,4.399876 c -0.0357,0.08167 -0.056,0.172088 -0.056,0.266927 0,0.368192 0.298477,0.666667 0.666667,0.666667 0.19896,0 0.377852,-0.08704 0.5,-0.225259 l 5.73959,-8.101703 C 21.96546,16.907391 22,16.791418 22,16.667137 c 0,-0.36819 -0.298476,-0.666668 -0.666668,-0.666668 h -5.333334 l 0.944012,-4.399875 c 0.0357,-0.08167 0.056,-0.172087 0.056,-0.266927 0,-0.36819 -0.298478,-0.666667 -0.666669,-0.666667 z" />
+  <path
+     id="path54"
+     style="font-variation-settings:normal;opacity:0.95;vector-effect:none;fill:#0d52bf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000"
+     d="M 16 12 C 15.399096 12 14.867947 12.027118 14.308594 12.044922 L 10.09375 17.994141 C 10.03454 18.093731 10 18.209701 10 18.333984 C 10 18.702175 10.297825 19 10.666016 19 L 16 19 L 15.056641 23.400391 C 15.020941 23.482061 15 23.571176 15 23.666016 C 15 24.034208 15.297826 24.333984 15.666016 24.333984 C 15.864976 24.333984 16.043868 24.245642 16.166016 24.107422 L 21.90625 16.005859 C 21.96546 15.906269 22 15.790297 22 15.666016 C 22 15.297826 21.702176 15 21.333984 15 L 16 15 L 16.638672 12.017578 C 16.41701 12.014948 16.226906 12 16 12 z " />
+  <path
+     id="path54-36"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 16.333984 9.6660156 C 16.135027 9.6660156 15.956134 9.7543664 15.833984 9.8925781 L 14.308594 12.044922 C 14.867947 12.027118 15.399096 12 16 12 C 16.226906 12 16.41701 12.014948 16.638672 12.017578 L 16.943359 10.599609 C 16.979059 10.517939 17 10.428824 17 10.333984 C 17 9.9657949 16.702175 9.6660156 16.333984 9.6660156 z " />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0"
+     d="m 23,13.028685 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path4752"
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-good.svg b/elementary-xfce/status/32/battery-good.svg
deleted file mode 120000
index 353e367fb..000000000
--- a/elementary-xfce/status/32/battery-good.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-good.svg b/elementary-xfce/status/32/battery-good.svg
new file mode 100644
index 000000000..977c1e570
--- /dev/null
+++ b/elementary-xfce/status/32/battery-good.svg
@@ -0,0 +1,400 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="32"
+   height="32"
+   id="svg2485"
+   viewBox="0 0 32 32"
+   sodipodi:docname="battery-good.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1373"
+     id="namedview57"
+     showgrid="true"
+     inkscape:zoom="31.500001"
+     inkscape:cx="27.881537"
+     inkscape:cy="19.404761"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2485">
+    <inkscape:grid
+       type="xygrid"
+       id="grid882"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata71">
+    <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="defs2487">
+    <linearGradient
+       id="linearGradient933">
+      <stop
+         id="stop923"
+         offset="0"
+         style="stop-color:#002e99;stop-opacity:0" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:1"
+         offset="0.06865654"
+         id="stop925" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="0.5"
+         id="stop927" />
+      <stop
+         id="stop929"
+         offset="0.82605612"
+         style="stop-color:#002e99;stop-opacity:1" />
+      <stop
+         id="stop931"
+         offset="1"
+         style="stop-color:#002e99;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.05034721" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.94965279" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
+      <stop
+         id="stop3750-8-9-7"
+         style="stop-color:#8cd5ff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-3-2-4"
+         style="stop-color:#64baff;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3754-7-2-4"
+         style="stop-color:#3689e6;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop3756-9-3-7"
+         style="stop-color:#0d52bf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-5.0010252"
+       y1="35"
+       x2="46.68"
+       y2="35"
+       id="linearGradient4393"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55555556,0,0,0.92105266,2.666667,-11.486842)" />
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient933" />
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.333331"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-21.899999,-3.666666)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941-3"
+       xlink:href="#linearGradient3821-6" />
+    <linearGradient
+       id="linearGradient3821-6">
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0"
+         id="stop3823-7" />
+      <stop
+         id="stop947"
+         offset="0.06865654"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop943"
+         offset="0.5"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.82605612"
+         id="stop945" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="1"
+         id="stop3825-5" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="28.5"
+       x2="43.477116"
+       y1="28.5"
+       x1="28.515991"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="translate(-20,-12.5)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#64baff;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <rect
+     width="15"
+     height="26"
+     rx="9"
+     ry="1"
+     x="-23.5"
+     y="3.5"
+     id="rect3268-4"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <path
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
+  <rect
+     width="15"
+     height="17.5"
+     rx="9.1800003"
+     ry="1.0096155"
+     x="8.5"
+     y="12"
+     id="rect3268-0-1"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+  <path
+     d="m 23,13.028685 c 0,-0.569723 -3.122,-1.028379 -7,-1.028379 -3.878001,0 -7,0.458656 -7,1.028379"
+     id="rect3268-0"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
+     id="rect3268-6-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
+     id="rect3268-6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
+     id="rect3268-3-9"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
+     id="rect3268-3"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
+     id="path4752"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="rect3268"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     sodipodi:nodetypes="csssc" />
+  <path
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
+     id="path5194"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+  <path
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
+     id="rect3244"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
+  <path
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
+     id="path5124"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
+  <path
+     d="M 22.981918,13.795166 C 22.078868,13.334046 19.302622,13 16,13 12.708443,13 9.9397386,13.331812 9.0272201,13.790536"
+     id="rect3268-0-7"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="rect884"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6"
+     sodipodi:nodetypes="csssc" />
+</svg>
diff --git a/elementary-xfce/status/32/battery-060-charging.svg b/elementary-xfce/status/32/battery-low-charging.svg
similarity index 70%
rename from elementary-xfce/status/32/battery-060-charging.svg
rename to elementary-xfce/status/32/battery-low-charging.svg
index 0c224033d..82f180863 100644
--- a/elementary-xfce/status/32/battery-060-charging.svg
+++ b/elementary-xfce/status/32/battery-low-charging.svg
@@ -19,12 +19,35 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs2487">
+    <linearGradient
+       id="linearGradient914">
+      <stop
+         id="stop904"
+         offset="0"
+         style="stop-color:#002e99;stop-opacity:0" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:1"
+         offset="0.06865654"
+         id="stop906" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="0.5"
+         id="stop908" />
+      <stop
+         id="stop910"
+         offset="0.82605612"
+         style="stop-color:#002e99;stop-opacity:1" />
+      <stop
+         id="stop912"
+         offset="1"
+         style="stop-color:#002e99;stop-opacity:0" />
+    </linearGradient>
     <linearGradient
        id="linearGradient5126">
       <stop
@@ -66,25 +89,6 @@
          style="stop-color:#ffffff;stop-opacity:0.39215687"
          offset="1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3254-3-182-8-5">
       <stop
@@ -189,17 +193,6 @@
        xlink:href="#linearGradient3254-3-182-8-5"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
     <linearGradient
        y2="25"
        x2="36.608757"
@@ -208,21 +201,28 @@
        gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3941"
-       xlink:href="#linearGradient3821" />
+       xlink:href="#linearGradient914" />
     <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393-1"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55555554,0,0,0.63157897,2.666667,1.3947371)" />
+       y2="33.5"
+       x2="43.473835"
+       y1="33.5"
+       x1="28.593813"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="translate(-20,-12.5)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#64baff;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1" />
+    </linearGradient>
   </defs>
-  <path
-     d="m 9,16 c 0,0 1.840371,0 6.999998,0 5.159627,0 7,0 7,0 l 0,-10.0550294 c 0,0 -0.56,-0.9684288 -7,-0.9684288 C 9.56,4.9765418 9,5.9360104 9,5.9360104 Z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
   <rect
      width="15"
      height="26"
@@ -231,20 +231,16 @@
      x="-23.5"
      y="3.5"
      id="rect3268-4"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
      transform="scale(-1,1)" />
   <path
      d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
      id="path3818-0-5"
      style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
   <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
      id="rect3268-0-1-2"
      d="m 8.5,16.5 v 12 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 v -12 z" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path3077"
-     d="m 8.5,16.5 h 15" />
   <path
      style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
      id="path3077-3"
@@ -266,18 +262,9 @@
      id="rect3268-3"
      style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
   <path
-     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
-     id="path4752"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="15"
-     height="26"
-     rx="9.1800003"
-     ry="1"
-     x="8.5"
-     y="3.5"
      id="rect3268"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6" />
   <path
      d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
      id="path5194"
@@ -293,14 +280,29 @@
   <g
      transform="scale(0.66666667)"
      style="opacity:0.4;stroke-width:1.5"
-     id="g5672">
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path2911-3"
-       d="M 28.769428,16.499999 24,24.000001 h 7.5 L 21,39 24,27 h -7.5 l 4.206427,-10.500001 z" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       id="path2911"
-       d="M 28.769428,14.999999 24,22.5 h 7.5 L 21,37.5 24,25.500001 h -7.5 l 4.206427,-10.500002 z" />
-  </g>
+     id="g5672" />
+  <path
+     id="rect928"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6" />
+  <path
+     id="path54-3"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 16.333341,10.667001 c -0.198957,0 -0.377848,0.08705 -0.499998,0.225261 L 10.09375,18.993963 C 10.03454,19.093552 10,19.209524 10,19.333807 c 0,0.368191 0.298476,0.666666 0.666667,0.666666 h 5.333338 l -0.944012,4.399876 c -0.0357,0.08167 -0.056,0.172088 -0.056,0.266927 0,0.368192 0.298477,0.666667 0.666667,0.666667 0.19896,0 0.377852,-0.08704 0.5,-0.225259 l 5.73959,-8.101702 C 21.96546,16.907392 22,16.791418 22,16.667138 22,16.298947 21.701524,16.000469 21.333332,16.000469 h -5.333334 l 0.944012,-4.399874 c 0.0357,-0.08167 0.056,-0.172087 0.056,-0.266927 0,-0.36819 -0.298478,-0.666667 -0.666669,-0.666667 z" />
+  <path
+     id="path54"
+     style="font-variation-settings:normal;opacity:0.95;vector-effect:none;fill:#0d52bf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000"
+     d="M 11.152344 16.5 L 10.09375 17.994141 C 10.03454 18.093731 10 18.209701 10 18.333984 C 10 18.702174 10.297825 19 10.666016 19 L 16 19 L 15.056641 23.400391 C 15.020941 23.482061 15 23.571177 15 23.666016 C 15 24.034208 15.297826 24.333984 15.666016 24.333984 C 15.864976 24.333984 16.043868 24.245641 16.166016 24.107422 L 21.556641 16.5 L 11.152344 16.5 z " />
+  <path
+     id="path54-36"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 16.333984 9.6660156 C 16.135027 9.6660156 15.956134 9.7543664 15.833984 9.8925781 L 11.152344 16.5 L 21.556641 16.5 L 21.90625 16.005859 C 21.96546 15.90627 22 15.790297 22 15.666016 C 22 15.297826 21.702176 15 21.333984 15 L 16 15 L 16.943359 10.599609 C 16.979059 10.517939 17 10.428824 17 10.333984 C 17 9.9657939 16.702175 9.6660156 16.333984 9.6660156 z " />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path3077"
+     d="m 8.5,16.5 h 15" />
+  <path
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
+     id="path4752"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
 </svg>
diff --git a/elementary-xfce/status/32/battery-low.svg b/elementary-xfce/status/32/battery-low.svg
deleted file mode 120000
index 66c1d449d..000000000
--- a/elementary-xfce/status/32/battery-low.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery-low.svg b/elementary-xfce/status/32/battery-low.svg
new file mode 100644
index 000000000..aa514adeb
--- /dev/null
+++ b/elementary-xfce/status/32/battery-low.svg
@@ -0,0 +1,395 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="32"
+   height="32"
+   id="svg2485"
+   viewBox="0 0 32 32"
+   sodipodi:docname="battery-low.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1373"
+     id="namedview57"
+     showgrid="true"
+     inkscape:zoom="31.500001"
+     inkscape:cx="29.082621"
+     inkscape:cy="19.838343"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2485">
+    <inkscape:grid
+       type="xygrid"
+       id="grid913"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata71">
+    <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="defs2487">
+    <linearGradient
+       id="linearGradient911">
+      <stop
+         id="stop901"
+         offset="0"
+         style="stop-color:#002e99;stop-opacity:0" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:1"
+         offset="0.06865654"
+         id="stop903" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="0.5"
+         id="stop905" />
+      <stop
+         id="stop907"
+         offset="0.82605612"
+         style="stop-color:#002e99;stop-opacity:1" />
+      <stop
+         id="stop909"
+         offset="1"
+         style="stop-color:#002e99;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.05034721" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.94965279" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
+      <stop
+         id="stop3750-8-9-7"
+         style="stop-color:#8cd5ff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3752-3-2-4"
+         style="stop-color:#64baff;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3754-7-2-4"
+         style="stop-color:#3689e6;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop3756-9-3-7"
+         style="stop-color:#0d52bf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51999998,0,0,0.64864864,3.5200001,0.28378406)" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12740271,0,0,0.15113872,19.319255,17.024284)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.36855189,0,0,0.13359585,25.643284,15.699275)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53450479,0,0,0.5901873,2.7689069,0.07629)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.15931399,0,0,0.03982852,0.20289978,21.085354)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.3941434,-2.3777703,-20.567459)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9777772,0,0,1.4146455,-5.7111039,-21.112568)" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-30.399999,-0.16666603)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient911" />
+    <linearGradient
+       x1="-5.0010252"
+       y1="35"
+       x2="46.68"
+       y2="35"
+       id="linearGradient4393-1"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55555554,0,0,0.63157897,2.666667,1.3947371)" />
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.333331"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-21.899999,-3.666666)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941-3"
+       xlink:href="#linearGradient3821-6" />
+    <linearGradient
+       id="linearGradient3821-6">
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0"
+         id="stop3823-7" />
+      <stop
+         id="stop947"
+         offset="0.06865654"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop943"
+         offset="0.5"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.82605612"
+         id="stop945" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="1"
+         id="stop3825-5" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="33.5"
+       x2="43.473194"
+       y1="33.5"
+       x1="28.412779"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="translate(-20,-12.5)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#64baff;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <rect
+     width="15"
+     height="26"
+     rx="9"
+     ry="1"
+     x="-23.5"
+     y="3.5"
+     id="rect3268-4"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <path
+     d="m 26,28.50025 a 10,2.5 0 0 1 -19.9999999,0 10,2.5 0 1 1 19.9999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none;stroke-width:1" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     id="rect3268-0-1-2"
+     d="m 8.5,16.5 v 12 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 v -12 z" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;fill-opacity:0;fill-rule:nonzero;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path3077"
+     d="m 8.5,16.5 h 15" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path3077-3"
+     d="m 9.5,17.5 h 13" />
+  <path
+     d="M 15.999999,3.5 C 11.844999,3.5 8.5,4.0734287 8.5,4.7857145 V 6.5 c 0,-0.7122858 3.344999,-1.2857145 7.499999,-1.2857145 4.155001,0 7.5,0.5734287 7.5,1.2857145 V 4.7857145 C 23.499999,4.0734287 20.155,3.5 15.999999,3.5 Z"
+     id="rect3268-6-4"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 8.9411767,6.0260193 c 0,-0.5649851 3.1482353,-1.0198286 7.0588233,-1.0198286 3.910589,0 7.058823,0.4548435 7.058823,1.0198286"
+     id="rect3268-6"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.5,3.5 V 2.3181818 c 0,-0.4546401 -1.115,-0.8181819 -2.5,-0.8181819 -1.385,0 -2.5,0.3635418 -2.5,0.8181819 V 3.5"
+     id="rect3268-3-9"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 18.499999,2.9999999 V 2.1136363 c 0,-0.34098 -1.114999,-0.6136364 -2.5,-0.6136364 -1.385,0 -2.499999,0.2726564 -2.499999,0.6136364 v 0.8863636"
+     id="rect3268-3"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 16,4.4999999 c -1.929142,0 -3.667413,0.1119074 -4.907499,0.2837841 -0.620045,0.085943 -1.1206868,0.182088 -1.4300011,0.2837841 -0.085062,0.027963 -0.1108557,0.036885 -0.1625,0.060811 V 27.871622 c 0.051646,0.02393 0.077438,0.03284 0.1625,0.06081 0.3093143,0.101695 0.8099561,0.197845 1.4300011,0.283783 C 12.332587,28.388092 14.070858,28.5 16,28.5 c 1.929142,0 3.667413,-0.111908 4.907499,-0.283784 0.620045,-0.08594 1.120687,-0.182088 1.430001,-0.283783 0.08506,-0.02797 0.110855,-0.03689 0.1625,-0.06081 V 5.1283789 C 22.448355,5.1044535 22.422562,5.0955342 22.3375,5.0675681 22.028186,4.965872 21.527544,4.8697218 20.907499,4.783784 19.667413,4.6119073 17.929142,4.4999999 16,4.4999999 Z"
+     id="path4752"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.8;fill:none;stroke:url(#linearGradient4760);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="rect3268"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 23.5,6 V 4.5 c 0,-0.554 -3.345,-1 -7.5,-1 -4.155,0 -7.5,0.446 -7.5,1 V 6"
+     sodipodi:nodetypes="csssc" />
+  <path
+     d="m 15,3.4999999 c -2.141789,0.08116 -3.004844,0.2414338 -4,0.4814808 V 29.018518 c 0.995156,0.240047 1.858211,0.40032 4,0.481481 z"
+     id="path5194"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none" />
+  <path
+     d="M 19,3.4999998 V 29.499999 c 0.757782,-0.08406 1.536192,-0.183863 2,-0.297386 V 3.7973848 C 20.536192,3.6838626 19.757782,3.5840522 19,3.4999998 Z"
+     id="rect3244"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none" />
+  <path
+     d="m 13.459003,4.502695 a 1.8707668,2.0656556 0 1 1 -3.7415337,0 1.8707669,2.0656556 0 1 1 3.7415337,0 z"
+     id="path5124"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3700273;marker:none;enable-background:accumulate" />
+  <path
+     id="rect917"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 8.5,6 v 22.5 c 0,0.554 3.345,1 7.5,1 4.155,0 7.5,-0.446 7.5,-1 V 6"
+     sodipodi:nodetypes="csssc" />
+</svg>
diff --git a/elementary-xfce/status/32/battery_empty.svg b/elementary-xfce/status/32/battery_empty.svg
deleted file mode 120000
index 1bf261b38..000000000
--- a/elementary-xfce/status/32/battery_empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/32/battery_full.svg b/elementary-xfce/status/32/battery_full.svg
deleted file mode 120000
index 51e311fbd..000000000
--- a/elementary-xfce/status/32/battery_full.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/ac-adapter.svg b/elementary-xfce/status/48/ac-adapter.svg
new file mode 100644
index 000000000..f702a54c9
--- /dev/null
+++ b/elementary-xfce/status/48/ac-adapter.svg
@@ -0,0 +1,472 @@
+<?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="svg5452"
+   height="48"
+   width="48"
+   version="1.1">
+  <defs
+     id="defs5454">
+    <linearGradient
+       id="linearGradient1148">
+      <stop
+         id="stop1140"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1144"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="1" />
+      <stop
+         id="stop1146"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1138">
+      <stop
+         id="stop1130"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1132"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.00000008" />
+      <stop
+         id="stop1134"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.82089913" />
+      <stop
+         id="stop1136"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="translate(0,-1.9999996)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4702"
+       id="linearGradient4708"
+       y2="33.401722"
+       x2="33"
+       y1="33.401722"
+       x1="24" />
+    <linearGradient
+       id="linearGradient4702">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4704" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4706" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.03983699,0,0,0.25602145,25.359729,41.816203)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3844-4-1-98"
+       id="linearGradient4777"
+       y2="-24.582239"
+       x2="102.30806"
+       y1="-2.3925467"
+       x1="102.30806" />
+    <linearGradient
+       id="linearGradient3844-4-1-98">
+      <stop
+         offset="0"
+         style="stop-color:#a5a6a8;stop-opacity:1"
+         id="stop3846-6-6-1" />
+      <stop
+         offset="1"
+         style="stop-color:#e8e8e8;stop-opacity:1"
+         id="stop3848-9-0-6" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.03983699,0,0,0.25602145,25.359729,41.816203)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2509-9-1-4"
+       id="linearGradient4779"
+       y2="-2.3757858"
+       x2="109.95628"
+       y1="-24.91135"
+       x1="109.95628" />
+    <linearGradient
+       id="linearGradient2509-9-1-4">
+      <stop
+         offset="0"
+         style="stop-color:#b3b3b3;stop-opacity:1"
+         id="stop2511-0-9-7" />
+      <stop
+         offset="1"
+         style="stop-color:#dadada;stop-opacity:1"
+         id="stop2513-3-1-74" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.08657366,0,0,0.54407192,21.34809,29.607896)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3858-4-6-8-7"
+       id="linearGradient4781"
+       y2="27.54611"
+       x2="89.01844"
+       y1="22.536863"
+       x1="89.01844" />
+    <linearGradient
+       id="linearGradient3858-4-6-8-7">
+      <stop
+         offset="0"
+         style="stop-color:#a0a0a0;stop-opacity:1"
+         id="stop3860-9-8-5-3" />
+      <stop
+         offset="1"
+         style="stop-color:#4a4a4a;stop-opacity:1"
+         id="stop3862-9-2-3-8" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.85681647,0,0,0.69944042,-41.49886,12.561165)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3188-6-5"
+       id="linearGradient4681"
+       y2="30.155411"
+       x2="77.444443"
+       y1="41.184654"
+       x1="77.444443" />
+    <linearGradient
+       id="linearGradient3188-6-5">
+      <stop
+         offset="0"
+         style="stop-color:#4d4d4d;stop-opacity:1"
+         id="stop3190-6-58" />
+      <stop
+         offset="1"
+         style="stop-color:#282828;stop-opacity:1"
+         id="stop3192-6-88" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.54285711,0,0,0.36842106,10.97143,25.473684)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4649"
+       id="linearGradient4647"
+       y2="44.137077"
+       x2="21.381216"
+       y1="5.0524864"
+       x1="21.381216" />
+    <linearGradient
+       id="linearGradient4649">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4652" />
+      <stop
+         offset="0.18506598"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4654" />
+      <stop
+         offset="0.87953037"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4656" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4658" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-52.444445,-73.155409)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3188-6"
+       id="linearGradient4190-0"
+       y2="30.155411"
+       x2="77.444443"
+       y1="41.184654"
+       x1="77.444443" />
+    <linearGradient
+       id="linearGradient3188-6">
+      <stop
+         offset="0"
+         style="stop-color:#4d4d4d;stop-opacity:1"
+         id="stop3190-6" />
+      <stop
+         offset="1"
+         style="stop-color:#4d4d4d;stop-opacity:1"
+         id="stop3192-6" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(3.5793792e-8,0.34098341,-1.1245305,1.1804449e-7,49.378968,19.137092)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4660"
+       id="radialGradient4267"
+       fy="22.568502"
+       fx="28.924889"
+       r="11.491406"
+       cy="22.568502"
+       cx="28.924889" />
+    <linearGradient
+       id="linearGradient4660">
+      <stop
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1"
+         id="stop4662" />
+      <stop
+         offset="1"
+         style="stop-color:#282828;stop-opacity:1"
+         id="stop4664" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.6655121,0,0,0.4518781,-54.615029,45.875214)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient47870"
+       id="linearGradient3421"
+       y2="-5.5633383"
+       x2="32.084972"
+       y1="-14.402173"
+       x1="32.084972" />
+    <linearGradient
+       id="linearGradient47870">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop47872" />
+      <stop
+         offset="0.5"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop47878" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop47874" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(1.8417267,-5.1455073e-7,6.2669991e-7,0.9200109,-115.2312,52.586443)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient51765"
+       id="radialGradient3418"
+       fy="-12.203125"
+       fx="51.4375"
+       r="2.171875"
+       cy="-12.203125"
+       cx="51.4375" />
+    <linearGradient
+       id="linearGradient51765">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop51767" />
+      <stop
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0"
+         id="stop51769" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(-1.8417267,-5.8450938e-8,-1.2125708e-7,0.9200109,52.236437,52.586419)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient51765"
+       id="radialGradient4142"
+       fy="-12.203125"
+       fx="51.4375"
+       r="2.171875"
+       cy="-12.203125"
+       cx="51.4375" />
+    <linearGradient
+       id="linearGradient7652-827">
+      <stop
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1"
+         id="stop3225" />
+      <stop
+         offset="1"
+         style="stop-color:#5a5a5a;stop-opacity:0"
+         id="stop3227" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7576-259">
+      <stop
+         offset="0"
+         style="stop-color:#3f3f3f;stop-opacity:1"
+         id="stop3231" />
+      <stop
+         offset="1"
+         style="stop-color:#6c6c6c;stop-opacity:0"
+         id="stop3233" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-0.72060161,-0.06027989,0.06027989,-0.72060161,36.517347,49.104769)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient7652-827"
+       id="linearGradient5448"
+       y2="45.0625"
+       x2="38.875"
+       y1="40.3125"
+       x1="37.625" />
+    <linearGradient
+       gradientTransform="matrix(-0.72060161,-0.06027989,0.06027989,-0.72060161,36.517347,49.104769)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient7576-259"
+       id="linearGradient5450"
+       y2="46.5625"
+       x2="40.125"
+       y1="40.625"
+       x1="38.75" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="29.454552"
+       x2="26"
+       y1="5"
+       x1="26"
+       id="linearGradient982"
+       xlink:href="#linearGradient864" />
+    <linearGradient
+       id="linearGradient864">
+      <stop
+         id="stop860"
+         offset="0"
+         style="stop-color:#ffe16b;stop-opacity:1" />
+      <stop
+         id="stop862"
+         offset="1"
+         style="stop-color:#f9c440;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="24.156281"
+       x2="43.282909"
+       y1="18.871256"
+       x1="43.282909"
+       gradientTransform="matrix(1.6169806,0,0,1.6169806,-45.462076,-21.060237)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1090"
+       xlink:href="#linearGradient1148" />
+    <linearGradient
+       xlink:href="#linearGradient1138"
+       id="linearGradient1090-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6169806,0,0,1.6169806,-45.462076,-21.060237)"
+       x1="46.310596"
+       y1="22.919407"
+       x2="46.310596"
+       y2="28.529644" />
+    <linearGradient
+       xlink:href="#linearGradient864"
+       id="linearGradient982-8"
+       x1="26"
+       y1="5"
+       x2="26"
+       y2="29.454552"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="29.454552"
+       x2="26"
+       y1="5"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1198"
+       xlink:href="#linearGradient864" />
+  </defs>
+  <metadata
+     id="metadata5457">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="m 26.973113,26.974134 c 0,0 4.018543,-2.880281 7.026887,-4.974134 1.504173,-1.046927 2.858989,-2.098176 3.688556,-3.160931 0.414777,-0.531376 0.80916,-1.110192 0.640544,-1.964613 -0.08428,-0.427211 -0.372981,-0.844806 -0.703395,-1.079278 -0.330401,-0.234473 -0.665953,-0.350487 -1.052648,-0.428203 -1.515693,-0.30462 -3.432871,-0.0016 -5.729445,0.450451 -2.296576,0.452008 -4.931397,1.098533 -7.582079,1.724087 -2.650682,0.625552 -5.324735,1.227954 -7.634562,1.538283 -2.309825,0.310332 -4.258131,0.285974 -5.344576,-0.08426 -0.514284,-0.175261 -0.519113,-0.261717 -0.521613,-0.270398 -0.0024,-0.0086 -0.02631,-0.245604 0.214143,-0.662377 0.480917,-0.833549 1.805713,-2.110444 3.315151,-3.30555 C 16.308954,12.367 20.09239,10.156026 20.09239,10.156026 L 18.97827,8.2940692 c 0,0 -3.84454,2.2304378 -7.042573,4.7624988 -1.599017,1.266031 -3.0299115,2.570488 -3.8220386,3.943436 -0.3960643,0.686476 -0.6871504,1.47598 -0.4436166,2.321235 0.2435314,0.845259 0.9980508,1.440252 1.8948302,1.745853 1.73568,0.591485 3.9108,0.475542 6.359806,0.146514 2.449006,-0.329028 5.169199,-0.913755 7.839121,-1.543849 2.66992,-0.630096 5.281128,-1.29648 7.49199,-1.731621 2.148668,-0.422901 3.891253,-0.559846 4.72921,-0.420743 -0.503839,0.645481 -1.808387,1.701769 -3.241765,2.699426 -2.866768,1.995309 -8.759679,6.507235 -8.759679,6.507235 1.938907,1.473579 1.306858,1.761792 2.989558,0.250083 z"
+     id="path7506"
+     style="fill:url(#linearGradient5448);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5450);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     transform="matrix(0.86666667,0,0,1.2500002,51.297732,-9.201583)"
+     id="g3423">
+    <rect
+       width="22"
+       height="3.9940758"
+       x="-42.497383"
+       y="39.367184"
+       id="rect46899"
+       style="opacity:0.3;fill:url(#linearGradient3421);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m -20.497383,39.36126 v 3.996297 c 2.205021,-0.01509 4,-0.897792 4,-1.991088 0,-1.093295 -1.794978,-1.990122 -4,-2.005209 z"
+       id="path48849"
+       style="opacity:0.3;fill:url(#radialGradient3418);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m -42.497383,39.36126 v 3.996297 c -2.205021,-0.01509 -4,-0.897792 -4,-1.991088 0,-1.093295 1.794978,-1.990122 4,-2.005209 z"
+       id="path52742"
+       style="opacity:0.3;fill:url(#radialGradient4142);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  </g>
+  <path
+     d="m 34.504,33 a 10.504,6.504 0 1 1 -21.008,0 10.504,6.504 0 1 1 21.008,0 z"
+     id="path4170"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4267);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="path2-2-7"
+     style="font-variation-settings:normal;opacity:0.15;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:url(#linearGradient1198);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 25.951172,3.0019531 A 2.50025,2.50025 0 0 0 24,4 L 13.5,18 a 2.50025,2.50025 0 0 0 2,4 h 5.382812 l -1.324218,5.957031 A 2.50025,2.50025 0 0 0 24,30 L 34.5,16 a 2.50025,2.50025 0 0 0 -2,-4 H 27.117188 L 28.441406,6.0429688 A 2.50025,2.50025 0 0 0 25.951172,3.0019531 Z" />
+  <path
+     d="m 26.005859,4 a 1.50015,1.50015 0 0 0 -1.205078,0.5996094 l -10.5,13.9999996 A 1.50015,1.50015 0 0 0 15.5,21 h 6.628906 l -1.59375,7.173828 a 1.50015,1.50015 0 0 0 2.664063,1.226563 l 10.5,-14 A 1.50015,1.50015 0 0 0 32.5,13 h -6.628906 l 1.59375,-7.1738281 A 1.50015,1.50015 0 0 0 26.005859,4 Z"
+     style="font-variation-settings:normal;opacity:0.3;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:url(#linearGradient982-8);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path2-2" />
+  <rect
+     width="21.007999"
+     height="10.008"
+     rx="1"
+     ry="1"
+     x="13.496"
+     y="-42.503998"
+     transform="scale(1,-1)"
+     id="rect4168"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4190-0);fill-opacity:1;fill-rule:nonzero;stroke:#2a2a2a;stroke-width:0.999922;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 24.000001,27.5 c 2.824888,0.02298 5.812106,0.649218 8.007403,2.531382 0.987447,0.838763 1.61067,2.111322 1.492597,3.418618 l -10e-7,7.9813 -19,0.1374 10e-7,-7.8687 c -0.05383,-0.998546 0.096,-2.042045 0.744266,-2.844828 1.516448,-1.955456 4.011614,-2.809145 6.376098,-3.1826 0.787453,-0.116677 1.583677,-0.172508 2.379636,-0.172572 z"
+     id="rect3145"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.4;fill:none;stroke:url(#linearGradient4647);stroke-width:1;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <rect
+     width="18"
+     height="7"
+     rx="0.85681647"
+     ry="0.69944042"
+     x="15"
+     y="34"
+     id="rect4168-5"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4681);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.999922;marker:none;enable-background:accumulate" />
+  <path
+     d="m 30.500572,43.166666 c 2.03e-4,0.944128 -0.447714,1.333334 -1,1.333334 -0.552284,0 -0.999567,-0.324606 -1,-1.333334 L 28.5,40.5 h 2 z m -11,0 c 2.03e-4,0.944128 -0.447714,1.333334 -1,1.333334 -0.552284,0 -0.999567,-0.324606 -1,-1.333334 L 17.5,40.5 h 2 z"
+     id="path3880-3-6"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4781);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 30.500572,38.999999 c 2.43e-4,1.062144 -0.447714,1.5 -1,1.5 -0.552284,0 -0.999567,-0.365181 -1,-1.5 L 28.5,36.5 h 2 z m -11,0 c 2.43e-4,1.062144 -0.447714,1.5 -1,1.5 -0.552284,0 -0.999567,-0.365181 -1,-1.5 L 17.5,36.5 h 2 z"
+     id="path3880-6"
+     style="fill:url(#linearGradient4777);fill-opacity:1;stroke:url(#linearGradient4779);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="m 15.5,31.401723 h 17"
+     id="path4700"
+     style="opacity:0.2;fill:none;stroke:url(#linearGradient4708);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     color="#bebebe"
+     d="m 22,28.5 10.5,-14 H 24 l 2,-9 -10.5,14 H 24 Z"
+     fill="#666666"
+     overflow="visible"
+     style="font-variation-settings:normal;opacity:1;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:url(#linearGradient982);fill-opacity:1;stroke:#ad5f00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.5;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path2" />
+  <path
+     id="path2-9"
+     style="font-variation-settings:normal;opacity:1;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient1090);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     overflow="visible"
+     fill="#666666"
+     d="m 24.251887,18.5 h -6.76803 l 6.577747,-8.7621804 -1.128713,4.9494224"
+     color="#bebebe" />
+  <path
+     color="#bebebe"
+     d="m 24,15.5 h 6.460531 l -6.462336,8.636326 1.236833,-5.450951"
+     fill="#666666"
+     overflow="visible"
+     style="font-variation-settings:normal;opacity:0.8;isolation:auto;mix-blend-mode:normal;vector-effect:none;fill:none;fill-opacity:1;stroke:url(#linearGradient1090-6);stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path2-9-1" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-000-charging.svg b/elementary-xfce/status/48/battery-000-charging.svg
deleted file mode 100644
index 95aa6cb4a..000000000
--- a/elementary-xfce/status/48/battery-000-charging.svg
+++ /dev/null
@@ -1,310 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient3242-4-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,0.26315789,1.7777778,32.789473)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3242-4-2">
-      <stop
-         id="stop3244-8-8"
-         style="stop-color:#f89b7e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3246-2-8"
-         style="stop-color:#e35d4f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3248-8-0"
-         style="stop-color:#c6262e;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3250-3-0"
-         style="stop-color:#690b2c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="translate(-48,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3907"
-       xlink:href="#linearGradient3821" />
-  </defs>
-  <path
-     d="m 11.5,40.186697 c 0,0 3.28638,-1.186547 12.5,-1.186547 9.21362,0 12.5,1.186547 12.5,1.186547 l 0,-31.865043 c 0,0 -1,-1.301306 -12.5,-1.301306 -11.5,0 -12.5,1.285306 -12.5,1.285306 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3907);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <rect
-     width="25"
-     height="5"
-     rx="13.5"
-     ry="1.5000002"
-     x="11.5"
-     y="39.5"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 36.5,41 c 0,-0.831 -5.575,-1.5 -12.5,-1.5 -6.925,0 -12.5,0.669 -12.5,1.5"
-     id="rect3268-0"
-     style="opacity:0.5;color:#000000;fill:none;stroke:#6f0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,41.564 C 34.420917,40.946725 29.661637,40.499557 24,40.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
-     id="rect3268-0-7"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <g
-     id="g5672"
-     style="opacity:0.4">
-    <path
-       d="m 28.769428,15.999999 -4.526732,8 6.757304,0 L 21.212031,38 23.925983,27 17,27 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path3419"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline;enable-background:new" />
-    <path
-       d="m 28.769428,14.999999 -4.526732,8 6.757304,0 L 21.212031,37 23.925983,26 17,26 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path2911"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/48/battery-000.svg b/elementary-xfce/status/48/battery-000.svg
deleted file mode 100644
index 43531c29e..000000000
--- a/elementary-xfce/status/48/battery-000.svg
+++ /dev/null
@@ -1,434 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="19.367573"
-       y1="9.571414"
-       x2="19.367573"
-       y2="69.82972"
-       id="linearGradient4393"
-       xlink:href="#linearGradient3242-4-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,0.26315789,1.7777778,32.789473)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3242-4-2">
-      <stop
-         id="stop3244-8-8"
-         style="stop-color:#f89b7e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3246-2-8"
-         style="stop-color:#e35d4f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3248-8-0"
-         style="stop-color:#c6262e;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3250-3-0"
-         style="stop-color:#690b2c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.48890916,0,0,0.48839827,0.26618161,0.74232159)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3846-7"
-       id="linearGradient3094"
-       y2="54.669891"
-       x2="24"
-       y1="-14.603537"
-       x1="24" />
-    <linearGradient
-       gradientTransform="matrix(0.49373581,0,-0.00214922,0.51518426,-2.3383831,-7.425973)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3117-8"
-       id="linearGradient3091"
-       y2="57.567127"
-       x2="29.291178"
-       y1="19.787613"
-       x1="29.126724" />
-    <linearGradient
-       gradientTransform="matrix(0.3750017,0,0,0.3750017,-4.9788628,1.3752029)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3856-1-6"
-       id="linearGradient3087"
-       y2="-5.496769"
-       x2="44.424442"
-       y1="60.535198"
-       x1="44.424442" />
-    <linearGradient
-       id="linearGradient3856-1-6">
-      <stop
-         offset="0"
-         style="stop-color:#634215;stop-opacity:1"
-         id="stop3858-0-6" />
-      <stop
-         offset="1"
-         style="stop-color:#93700d;stop-opacity:1"
-         id="stop3860-2-8" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3117-8">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3119-9" />
-      <stop
-         offset="0.56911701"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop3121-9" />
-      <stop
-         offset="0.93297637"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop3123-6" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop3125-3" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3846-7">
-      <stop
-         offset="0"
-         style="stop-color:#fff3cb;stop-opacity:1"
-         id="stop3848-7" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#fdde76;stop-opacity:1"
-         id="stop3850-5" />
-      <stop
-         offset="0.66093999"
-         style="stop-color:#f9c440;stop-opacity:1"
-         id="stop3852-9" />
-      <stop
-         offset="1"
-         style="stop-color:#e48b20;stop-opacity:1"
-         id="stop3854-2" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.1294118,0,0,0.12941156,-58.729414,22.026471)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8838"
-       id="radialGradient2415"
-       fy="4.625"
-       fx="62.625"
-       r="10.625"
-       cy="4.625"
-       cx="62.625" />
-    <linearGradient
-       id="linearGradient8838">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop8840" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop8842" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="translate(-48,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3848"
-       xlink:href="#linearGradient3821" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5-0">
-      <stop
-         id="stop4663-8-7-1"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6-7"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="35.717499"
-       x2="17.77273"
-       y1="17.458462"
-       x1="13.681819"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.066655,-30.333874)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3890"
-       xlink:href="#linearGradient3254-3-182-8-5-0" />
-  </defs>
-  <path
-     d="m 11.5,40.187 c 0,0 3.28638,-1.186547 12.5,-1.186547 9.21362,0 12.5,1.186547 12.5,1.186547 l 0,-31.8650426 c 0,0 -1,-1.301306 -12.5,-1.301306 -11.5,0 -12.5,1.285306 -12.5,1.285306 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3848);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <rect
-     width="25"
-     height="5"
-     rx="13.5"
-     ry="1.5000002"
-     x="11.5"
-     y="39.5"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 36.5,41 c 0,-0.831 -5.575,-1.5 -12.5,-1.5 -6.925,0 -12.5,0.669 -12.5,1.5"
-     id="rect3268-0"
-     style="opacity:0.5;color:#000000;fill:none;stroke:#6f0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,41.564 C 34.420917,40.946725 29.661637,40.499557 24,40.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
-     id="rect3268-0-7"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <g
-     id="g3391"
-     transform="translate(24,24)">
-    <path
-       style="opacity:0.3;fill:url(#radialGradient2415);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible"
-       id="path8836"
-       d="M 24,22.625 C 24,23.384391 18.627417,24 12,24 5.3725828,24 -2.5e-7,23.384391 -2.5e-7,22.625 -2.5e-7,21.865609 5.3725828,21.25 12,21.25 c 6.627417,0 12,0.615609 12,1.375 l 0,0 z" />
-    <path
-       style="fill:url(#linearGradient3094);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path11155-5"
-       d="M 22.843441,20.277765 13.294944,2.2776819 C 13.020489,1.7776818 12.523879,1.4999018 11.970799,1.4999018 c -0.553075,0 -1.052235,0.33333 -1.330855,0.8333351 L 1.1625466,20.333325 c -0.22308499,0.444445 -0.22563499,1.05556 0.04905,1.500005 0.27468,0.44445 0.716215,0.66667 1.269296,0.66667 l 19.0258884,0 c 0.55308,0 1.052005,-0.27778 1.275095,-0.722225 0.278385,-0.444445 0.280705,-1.000005 0.06156,-1.50001 z" />
-    <path
-       style="opacity:0.6;fill:none;stroke:url(#linearGradient3091);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path11159-4"
-       d="M 21.554469,19.506436 13.009293,3.9158521 c -0.363933,-0.6933859 -0.494462,-1.415852 -1.047538,-1.415852 -0.475681,0 -0.724576,0.8239925 -1.068333,1.4784949 l -8.4503241,15.57762 c -0.490695,0.902951 -0.543267,1.138323 -0.307081,1.535746 0.236181,0.397428 0.539433,0.375782 1.659914,0.401703 l 16.6086101,0 c 1.043148,0.01297 1.278124,-0.06692 1.470057,-0.464346 0.2395,-0.397427 0.137629,-0.712731 -0.320129,-1.522782 z" />
-    <path
-       style="font-size:62.4582634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Georgia"
-       id="text2315-7-2"
-       d="m 10.812132,8.5616499 c 0.28149,2.7496611 0.603925,5.4804011 0.84355,8.2408311 0.241015,0 0.523695,0 0.76471,0 0.19876,-2.65089 0.519345,-5.285765 0.75061,-7.9333661 0.117885,-0.62692 -0.203995,-1.37126 -0.866,-1.523575 -0.654165,-0.1912546 -1.38503,0.282355 -1.472015,0.95888 -0.0144,0.08493 -0.02085,0.171115 -0.02085,0.25723 l -5e-6,0 z m -0.08343,11.1793511 c -0.02975,0.81847 0.870815,1.46007 1.63974,1.20058 0.744755,-0.19007 1.13703,-1.12614 0.75534,-1.791525 -0.341675,-0.687825 -1.343625,-0.914445 -1.920005,-0.38803 -0.291345,0.23936 -0.484455,0.596695 -0.475075,0.978975 l 0,0 z" />
-    <path
-       style="font-size:62.4582634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient3087);fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Georgia"
-       id="path3295-1-9"
-       d="m 10.812132,7.5616475 c 0.28149,2.7496605 0.603925,5.4804005 0.84355,8.2408305 0.241015,0 0.523695,0 0.76471,0 0.19876,-2.65089 0.519345,-5.28576 0.75061,-7.9333655 0.117885,-0.6269146 -0.203995,-1.3712596 -0.866,-1.5235746 -0.654165,-0.191255 -1.38503,0.28236 -1.472015,0.9588796 -0.0144,0.08493 -0.02085,0.171115 -0.02085,0.25723 l -5e-6,0 z m -0.08343,11.1793505 c -0.02975,0.81847 0.870815,1.46007 1.63974,1.200585 0.744755,-0.190075 1.13703,-1.126145 0.75534,-1.79153 -0.341675,-0.68782 -1.343625,-0.914445 -1.920005,-0.38803 -0.291345,0.239365 -0.484455,0.596695 -0.475075,0.978975 l 0,0 z" />
-    <path
-       style="opacity:0.4;fill:none;stroke:#311d00;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path11155-8"
-       d="M 22.843441,20.277775 13.294944,2.2777769 C 13.020489,1.7777792 12.523879,1.5000004 11.970799,1.5000004 c -0.553075,0 -1.052235,0.3333285 -1.330855,0.8333312 L 1.1625466,20.333335 C 0.93946161,20.777778 0.93691161,21.38889 1.2115966,21.833333 1.4862766,22.277781 1.9278116,22.5 2.4808916,22.5 l 19.0258894,0 c 0.55308,0 1.052005,-0.277779 1.275095,-0.722222 0.278385,-0.444443 0.280705,-1 0.06156,-1.500003 z" />
-  </g>
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient3890);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-</svg>
diff --git a/elementary-xfce/status/48/battery-020-charging.svg b/elementary-xfce/status/48/battery-020-charging.svg
deleted file mode 100644
index 702663bad..000000000
--- a/elementary-xfce/status/48/battery-020-charging.svg
+++ /dev/null
@@ -1,350 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3825"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4271">
-      <stop
-         id="stop4273"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4275"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.2559385" />
-      <stop
-         id="stop4277"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.90909094" />
-      <stop
-         id="stop4279"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient3846-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,0.63157894,1.7777778,16.394735)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3846-7">
-      <stop
-         id="stop3848-7"
-         style="stop-color:#fff3cb;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3850-5"
-         style="stop-color:#fdde76;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3852-9"
-         style="stop-color:#f9c440;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3854-2"
-         style="stop-color:#e48b20;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="32.586082"
-       x2="30"
-       y2="43"
-       id="linearGradient4760-7"
-       xlink:href="#linearGradient4271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.83333334,0,7.2499998)" />
-    <linearGradient
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25"
-       id="linearGradient3827"
-       xlink:href="#linearGradient3821"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48,0)" />
-  </defs>
-  <path
-     d="m 11.5,33.136203 c 0,0 3.28638,-1.1357 12.5,-1.1357 9.21362,0 12.5,1.1357 12.5,1.1357 l 0,-24.8143448 c 0,0 -1,-1.301306 -12.5,-1.301306 -11.5,0 -12.5,1.285306 -12.5,1.285306 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     transform="scale(-1,1)"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3827);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <rect
-     width="25"
-     height="12"
-     rx="13.5"
-     ry="1.5000004"
-     x="11.5"
-     y="32.5"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 36.5,34 c 0,-0.831 -5.575,-1.5 -12.5,-1.5 -6.925,0 -12.5,0.669 -12.5,1.5"
-     id="rect3268-0"
-     style="opacity:0.5;color:#000000;fill:none;stroke:#7d3400;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 24,33.5 c -3.429911,0 -6.520095,0.144718 -8.71875,0.364583 -1.099328,0.109933 -1.994055,0.237154 -2.53125,0.364584 -0.142017,0.03369 -0.164439,0.04987 -0.25,0.07813 l 0,8.385416 c 0.08556,0.02826 0.107983,0.04443 0.25,0.07813 0.537195,0.12743 1.431922,0.254651 2.53125,0.364584 C 17.479905,43.355283 20.570089,43.5 24,43.5 c 3.429911,0 6.520095,-0.144717 8.71875,-0.364583 1.099328,-0.109933 1.994055,-0.237154 2.53125,-0.364584 0.142017,-0.03369 0.164439,-0.04987 0.25,-0.07813 l 0,-8.385416 c -0.08556,-0.02826 -0.107983,-0.04444 -0.25,-0.07813 -0.537195,-0.12743 -1.431922,-0.254651 -2.53125,-0.364584 C 30.520095,33.644718 27.429911,33.5 24,33.5 z"
-     id="path4230"
-     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4760-7);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 35.969003,35.935557 C 34.420917,36.552832 29.661637,37 24,37 18.35733,37 13.61098,36.555823 12.046663,35.941755"
-     id="rect3268-0-7"
-     style="opacity:0.4;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 36.5,34.5 C 36.5,35.331 30.925,36 24,36 17.075,36 11.5,35.331 11.5,34.5"
-     id="rect3268-0-3"
-     style="opacity:0.15;color:#000000;fill:none;stroke:#7d3400;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 35.969003,33.935557 C 34.420917,34.552832 29.661637,35 24,35 18.35733,35 13.61098,34.555823 12.046663,33.941755"
-     id="rect3268-0-7-8"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <g
-     id="g5672"
-     style="opacity:0.4">
-    <path
-       d="m 28.769428,15.999999 -4.526732,8 6.757304,0 L 21.212031,38 23.925983,27 17,27 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path3419"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline;enable-background:new" />
-    <path
-       d="m 28.769428,14.999999 -4.526732,8 6.757304,0 L 21.212031,37 23.925983,26 17,26 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path2911"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/48/battery-020.svg b/elementary-xfce/status/48/battery-020.svg
deleted file mode 100644
index 39610f575..000000000
--- a/elementary-xfce/status/48/battery-020.svg
+++ /dev/null
@@ -1,338 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3825"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4271">
-      <stop
-         id="stop4273"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4275"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.2559385" />
-      <stop
-         id="stop4277"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.90909094" />
-      <stop
-         id="stop4279"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient3846-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,0.63157894,1.7777778,16.394735)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3846-7">
-      <stop
-         id="stop3848-7"
-         style="stop-color:#fff3cb;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3850-5"
-         style="stop-color:#fdde76;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3852-9"
-         style="stop-color:#f9c440;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3854-2"
-         style="stop-color:#e48b20;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="32.586082"
-       x2="30"
-       y2="43"
-       id="linearGradient4760-7"
-       xlink:href="#linearGradient4271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.83333334,0,7.2499998)" />
-    <linearGradient
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25"
-       id="linearGradient3827"
-       xlink:href="#linearGradient3821"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48,0)" />
-  </defs>
-  <path
-     d="m 11.5,33.136 c 0,0 3.28638,-1.1357 12.5,-1.1357 9.21362,0 12.5,1.1357 12.5,1.1357 l 0,-24.814345 c 0,0 -1,-1.301306 -12.5,-1.301306 -11.5,0 -12.5,1.285306 -12.5,1.285306 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     transform="scale(-1,1)"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3827);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <rect
-     width="25"
-     height="12"
-     rx="13.5"
-     ry="1.5000004"
-     x="11.5"
-     y="32.5"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 36.5,34 c 0,-0.831 -5.575,-1.5 -12.5,-1.5 -6.925,0 -12.5,0.669 -12.5,1.5"
-     id="rect3268-0"
-     style="opacity:0.5;color:#000000;fill:none;stroke:#7d3400;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 24,33.5 c -3.429911,0 -6.520095,0.144718 -8.71875,0.364583 -1.099328,0.109933 -1.994055,0.237154 -2.53125,0.364584 -0.142017,0.03369 -0.164439,0.04987 -0.25,0.07813 l 0,8.385416 c 0.08556,0.02826 0.107983,0.04443 0.25,0.07813 0.537195,0.12743 1.431922,0.254651 2.53125,0.364584 C 17.479905,43.355283 20.570089,43.5 24,43.5 c 3.429911,0 6.520095,-0.144717 8.71875,-0.364583 1.099328,-0.109933 1.994055,-0.237154 2.53125,-0.364584 0.142017,-0.03369 0.164439,-0.04987 0.25,-0.07813 l 0,-8.385416 c -0.08556,-0.02826 -0.107983,-0.04444 -0.25,-0.07813 -0.537195,-0.12743 -1.431922,-0.254651 -2.53125,-0.364584 C 30.520095,33.644718 27.429911,33.5 24,33.5 z"
-     id="path4230"
-     style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4760-7);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 35.969003,35.935557 C 34.420917,36.552832 29.661637,37 24,37 18.35733,37 13.61098,36.555823 12.046663,35.941755"
-     id="rect3268-0-7"
-     style="opacity:0.4;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 36.5,34.5 C 36.5,35.331 30.925,36 24,36 17.075,36 11.5,35.331 11.5,34.5"
-     id="rect3268-0-3"
-     style="opacity:0.15;color:#000000;fill:none;stroke:#7d3400;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 35.969003,33.935557 C 34.420917,34.552832 29.661637,35 24,35 18.35733,35 13.61098,34.555823 12.046663,33.941755"
-     id="rect3268-0-7-8"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/status/48/battery-040-charging.svg b/elementary-xfce/status/48/battery-040-charging.svg
deleted file mode 100644
index d8b4b123d..000000000
--- a/elementary-xfce/status/48/battery-040-charging.svg
+++ /dev/null
@@ -1,313 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,0.70392702,1.7777778,13.175249)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3825"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48,0)" />
-  </defs>
-  <path
-     d="m 11.5,29.984802 c 0,0 3.28638,-0.984994 12.5,-0.984994 9.21362,0 12.5,0.984994 12.5,0.984994 l 0,-21.663142 c 0,0 -1,-1.301306 -12.5,-1.301306 -11.5,0 -12.5,1.285306 -12.5,1.285306 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     transform="scale(-1,1)"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <path
-     d="m 11.5,30.382352 0,13.003096 C 11.5,44.00291 17.075,44.5 24,44.5 c 6.925,0 12.5,-0.49709 12.5,-1.114552 l 0,-13.003096 c 0,0 -2.926834,-0.882352 -12.5,-0.882352 -9.573166,0 -12.5,0.882352 -12.5,0.882352 z"
-     id="rect3268-0-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 11.5,30.5 c 0,0 3.28638,-1 12.5,-1 9.21362,0 12.5,1 12.5,1"
-     id="path3077"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 13,31.5 c 0,0 2.871179,1 11,1 8.128821,0 11,-1 11,-1"
-     id="path3077-3"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4299"
-     d="m 13,31.527819 c 0,0 2.871179,-1 11,-1 8.128821,0 11,1 11,1" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4206"
-     d="m 11.5,30.5 c 0,0 3.28638,1 12.5,1 9.21362,0 12.5,-1 12.5,-1" />
-  <g
-     id="g5672"
-     style="opacity:0.4">
-    <path
-       d="m 28.769428,15.999999 -4.526732,8 6.757304,0 L 21.212031,38 23.925983,27 17,27 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path3419"
-       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;enable-background:new" />
-    <path
-       d="m 28.769428,14.999999 -4.526732,8 6.757304,0 L 21.212031,37 23.925983,26 17,26 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path2911"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/48/battery-040.svg b/elementary-xfce/status/48/battery-040.svg
deleted file mode 100644
index 9e19f6bb1..000000000
--- a/elementary-xfce/status/48/battery-040.svg
+++ /dev/null
@@ -1,301 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,0.70392702,1.7777778,13.175249)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3825"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48,0)" />
-  </defs>
-  <path
-     d="m 11.5,29.985 c 0,0 3.28638,-0.984994 12.5,-0.984994 9.21362,0 12.5,0.984994 12.5,0.984994 l 0,-21.6631419 c 0,0 -1,-1.301306 -12.5,-1.301306 -11.5,0 -12.5,1.285306 -12.5,1.285306 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     transform="scale(-1,1)"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <path
-     d="m 11.5,30.382352 0,13.003096 C 11.5,44.00291 17.075,44.5 24,44.5 c 6.925,0 12.5,-0.49709 12.5,-1.114552 l 0,-13.003096 c 0,0 -2.926834,-0.882352 -12.5,-0.882352 -9.573166,0 -12.5,0.882352 -12.5,0.882352 z"
-     id="rect3268-0-1"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 11.5,30.5 c 0,0 3.28638,-1 12.5,-1 9.21362,0 12.5,1 12.5,1"
-     id="path3077"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="m 13,31.5 c 0,0 2.871179,1 11,1 8.128821,0 11,-1 11,-1"
-     id="path3077-3"
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4299"
-     d="m 13,31.527819 c 0,0 2.871179,-1 11,-1 8.128821,0 11,1 11,1" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4206"
-     d="m 11.5,30.5 c 0,0 3.28638,1 12.5,1 9.21362,0 12.5,-1 12.5,-1" />
-</svg>
diff --git a/elementary-xfce/status/48/battery-060-charging.svg b/elementary-xfce/status/48/battery-060-charging.svg
deleted file mode 100644
index 025397e17..000000000
--- a/elementary-xfce/status/48/battery-060-charging.svg
+++ /dev/null
@@ -1,305 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,0.94736845,1.7777778,2.3421058)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="translate(-48,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821" />
-  </defs>
-  <path
-     d="m 11.5,25 c 0,0 3.28638,0 12.5,0 9.21362,0 12.5,0 12.5,0 l 0,-16.678341 c 0,0 -1,-1.301306 -12.5,-1.301306 -11.5,0 -12.5,1.285306 -12.5,1.285306 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <path
-     style="color:#000000;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="m 11.5,25.5 0,17.5 c 0,0.831 5.575,1.5 12.5,1.5 6.925,0 12.5,-0.669 12.5,-1.5 l 0,-17.5 z"
-     id="rect3268-0-1" />
-  <path
-     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="m 11.5,25.5 25,0"
-     id="path3077" />
-  <path
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-     d="m 13,26.5 22,0"
-     id="path3077-3" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <g
-     id="g5672"
-     style="opacity:0.4">
-    <path
-       d="m 28.769428,15.999999 -4.526732,8 6.757304,0 L 21.212031,38 23.925983,27 17,27 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path3419"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline;enable-background:new" />
-    <path
-       d="m 28.769428,14.999999 -4.526732,8 6.757304,0 L 21.212031,37 23.925983,26 17,26 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path2911"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/48/battery-060.svg b/elementary-xfce/status/48/battery-060.svg
deleted file mode 100644
index e9338eb41..000000000
--- a/elementary-xfce/status/48/battery-060.svg
+++ /dev/null
@@ -1,293 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,0.94736845,1.7777778,2.3421058)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         id="stop3823"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3825"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="12.029413"
-       y1="25"
-       x2="36.608757"
-       y2="25"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48,0)" />
-  </defs>
-  <path
-     d="m 11.5,25 c 0,0 3.28638,0 12.5,0 9.21362,0 12.5,0 12.5,0 l 0,-16.678341 c 0,0 -1,-1.301306 -12.5,-1.301306 -11.5,0 -12.5,1.285306 -12.5,1.285306 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     transform="scale(-1,1)"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <path
-     d="m 11.5,25.5 0,17.5 c 0,0.831 5.575,1.5 12.5,1.5 6.925,0 12.5,-0.669 12.5,-1.5 l 0,-17.5 z"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 11.5,25.5 25,0"
-     id="path3077"
-     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 13,26.5 22,0"
-     id="path3077-3"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-</svg>
diff --git a/elementary-xfce/status/48/battery-080-charging.svg b/elementary-xfce/status/48/battery-080-charging.svg
deleted file mode 100644
index e37c92c6f..000000000
--- a/elementary-xfce/status/48/battery-080-charging.svg
+++ /dev/null
@@ -1,310 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,1.3684211,1.7777778,-16.394736)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="translate(-48,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3941"
-       xlink:href="#linearGradient3821" />
-  </defs>
-  <path
-     d="m 11.500001,19.188383 c 0,0 3.28638,-1.188383 12.5,-1.188383 9.21362,0 12.5,1.188383 12.5,1.188383 l 0,-10.8663406 c 0,0 -1,-1.3013064 -12.5,-1.3013064 -11.5,0 -12.5,1.2853061 -12.5,1.2853061 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <rect
-     width="25"
-     height="26"
-     rx="13.5"
-     ry="1.5000002"
-     x="11.5"
-     y="18.5"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 36.5,20 c 0,-0.831 -5.575,-1.5 -12.5,-1.5 -6.925,0 -12.5,0.669 -12.5,1.5"
-     id="rect3268-0"
-     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,20.564 C 34.420917,19.946725 29.661637,19.499557 24,19.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
-     id="rect3268-0-7"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <g
-     id="g5672"
-     style="opacity:0.4">
-    <path
-       d="m 28.769428,15.999999 -4.526732,8 6.757304,0 L 21.212031,38 23.925983,27 17,27 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path3419"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline;enable-background:new" />
-    <path
-       d="m 28.769428,14.999999 -4.526732,8 6.757304,0 L 21.212031,37 23.925983,26 17,26 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path2911"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/48/battery-080.svg b/elementary-xfce/status/48/battery-080.svg
deleted file mode 100644
index afdf9fe41..000000000
--- a/elementary-xfce/status/48/battery-080.svg
+++ /dev/null
@@ -1,298 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1">
-      <stop
-         id="stop3750-8-9-7"
-         style="stop-color:#90dbec;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-2-4"
-         style="stop-color:#42baea;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-7-2-4"
-         style="stop-color:#3689e6;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-9-3-7"
-         style="stop-color:#2b63a0;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,1.3684211,1.7777778,-16.394736)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient3821">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3823" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3825" />
-    </linearGradient>
-    <linearGradient
-       y2="25"
-       x2="36.608757"
-       y1="25"
-       x1="12.029413"
-       gradientTransform="translate(-48,0)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3924"
-       xlink:href="#linearGradient3821" />
-  </defs>
-  <path
-     d="m 11.5,19.188 c 0,0 3.28638,-1.188383 12.5,-1.188383 9.21362,0 12.5,1.188383 12.5,1.188383 l 0,-10.8663402 c 0,0 -1,-1.3013064 -12.5,-1.3013064 -11.5,0 -12.5,1.2853061 -12.5,1.2853061 z"
-     id="path4350"
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="-36.5"
-     y="5.5"
-     id="rect3268-4"
-     style="opacity:0.1;color:#000000;fill:url(#linearGradient3924);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-     transform="scale(-1,1)" />
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <rect
-     width="25"
-     height="26"
-     rx="13.5"
-     ry="1.5000002"
-     x="11.5"
-     y="18.5"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 36.5,20 c 0,-0.831 -5.575,-1.5 -12.5,-1.5 -6.925,0 -12.5,0.669 -12.5,1.5"
-     id="rect3268-0"
-     style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#00537d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,20.564 C 34.420917,19.946725 29.661637,19.499557 24,19.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
-     id="rect3268-0-7"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/status/48/battery-100-charging.svg b/elementary-xfce/status/48/battery-100-charging.svg
deleted file mode 100644
index 98f0e2d8d..000000000
--- a/elementary-xfce/status/48/battery-100-charging.svg
+++ /dev/null
@@ -1,276 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient4223"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,1.9473684,1.7777778,-42.157895)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient4223">
-      <stop
-         id="stop4225"
-         style="stop-color:#cdf87e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4227"
-         style="stop-color:#a2e34f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop4229"
-         style="stop-color:#68b723;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop4231"
-         style="stop-color:#1d7e0d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <rect
-     width="25"
-     height="37"
-     rx="13.5"
-     ry="1.5000002"
-     x="11.5"
-     y="7.5"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 36.5,9 C 36.5,8.169 30.925,7.5 24,7.5 17.075,7.5 11.5,8.169 11.5,9"
-     id="rect3268-0"
-     style="opacity:0.5;color:#000000;fill:none;stroke:#0f7d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,9.564443 C 34.420917,8.947168 29.661637,8.5 24,8.5 18.35733,8.5 13.61098,8.944177 12.046663,9.558245"
-     id="rect3268-0-7"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <g
-     id="g5672"
-     style="opacity:0.4">
-    <path
-       d="m 28.769428,15.999999 -4.526732,8 6.757304,0 L 21.212031,38 23.925983,27 17,27 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path3419"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline;enable-background:new" />
-    <path
-       d="m 28.769428,14.999999 -4.526732,8 6.757304,0 L 21.212031,37 23.925983,26 17,26 l 3.706427,-11.000001 8.063001,0 0,0 z"
-       id="path2911"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/48/battery-100.svg b/elementary-xfce/status/48/battery-100.svg
deleted file mode 100644
index 840ef10fe..000000000
--- a/elementary-xfce/status/48/battery-100.svg
+++ /dev/null
@@ -1,264 +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="48"
-   height="48"
-   id="svg2485">
-  <metadata
-     id="metadata71">
-    <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="defs2487">
-    <linearGradient
-       id="linearGradient5126">
-      <stop
-         id="stop5128"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5130"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5118">
-      <stop
-         id="stop5120"
-         style="stop-color:#9d9d9d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5122"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         id="stop4764"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4766"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02777778" />
-      <stop
-         id="stop4768"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.97222221" />
-      <stop
-         id="stop4770"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-5.0010252"
-       y1="35"
-       x2="46.68"
-       y2="35"
-       id="linearGradient4393"
-       xlink:href="#linearGradient4223"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92592593,0,0,1.9473684,1.7777778,-42.157895)" />
-    <linearGradient
-       id="linearGradient3254-3-182-8-5">
-      <stop
-         id="stop4663-8-7"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4665-7-6"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="30"
-       y1="7"
-       x2="30"
-       y2="43"
-       id="linearGradient4760"
-       xlink:href="#linearGradient4762"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-20.446733"
-       y1="-93.091553"
-       x2="-48.479328"
-       y2="-93.091553"
-       id="linearGradient3457-7-6"
-       xlink:href="#linearGradient2793-2-0-669-94-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient2793-2-0-669-94-2">
-      <stop
-         id="stop4681-3-1"
-         style="stop-color:#b4b4b4;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4683-67-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-17.12093"
-       y1="-93.091553"
-       x2="-45.761551"
-       y2="-93.091553"
-       id="linearGradient5066-8"
-       xlink:href="#linearGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="16.5"
-       cy="7.5"
-       r="3.5"
-       fx="16.5"
-       fy="7.5"
-       id="radialGradient5132"
-       xlink:href="#linearGradient5126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
-    <linearGradient
-       id="linearGradient3820-7-2-1-2-6">
-      <stop
-         id="stop3822-2-6-3-3-7"
-         style="stop-color:#3d3d3d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3864-8-7-7-9-1"
-         style="stop-color:#686868;stop-opacity:0.49803922"
-         offset="0.5" />
-      <stop
-         id="stop3824-1-2-5-0-3"
-         style="stop-color:#686868;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="99.157013"
-       cy="186.17059"
-       r="62.769119"
-       fx="99.157013"
-       fy="186.17059"
-       id="radialGradient5362"
-       xlink:href="#linearGradient3820-7-2-1-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
-    <linearGradient
-       x1="13.681819"
-       y1="17.458462"
-       x2="17.77273"
-       y2="35.717499"
-       id="linearGradient5508"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       x1="25.272734"
-       y1="17.458462"
-       x2="27.31819"
-       y2="35.717499"
-       id="linearGradient5510"
-       xlink:href="#linearGradient3254-3-182-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
-    <linearGradient
-       id="linearGradient4223">
-      <stop
-         id="stop4225"
-         style="stop-color:#cdf87e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4227"
-         style="stop-color:#a2e34f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop4229"
-         style="stop-color:#68b723;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop4231"
-         style="stop-color:#1d7e0d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <path
-     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
-     id="path3818-0-5"
-     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
-  <rect
-     width="25"
-     height="37"
-     rx="13.5"
-     ry="1.5000002"
-     x="11.5"
-     y="7.5"
-     id="rect3268-0-1"
-     style="color:#000000;fill:url(#linearGradient4393);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 36.5,9 C 36.5,8.169 30.925,7.5 24,7.5 17.075,7.5 11.5,8.169 11.5,9"
-     id="rect3268-0"
-     style="opacity:0.5;color:#000000;fill:none;stroke:#0f7d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
-     id="rect3268-6-4"
-     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
-     id="rect3268-6"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3-9"
-     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
-     id="rect3268-3"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
-     transform="matrix(0.92,0,0,1,1.92,0)"
-     id="path4752"
-     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <rect
-     width="25"
-     height="39"
-     rx="13.5"
-     ry="1.5"
-     x="11.5"
-     y="5.5"
-     id="rect3268"
-     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <path
-     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
-     id="path5194"
-     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
-     id="rect3244"
-     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
-     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
-     id="path5124"
-     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,9.564443 C 34.420917,8.947168 29.661637,8.5 24,8.5 18.35733,8.5 13.61098,8.944177 12.046663,9.558245"
-     id="rect3268-0-7"
-     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-</svg>
diff --git a/elementary-xfce/status/48/battery-ac-adapter.svg b/elementary-xfce/status/48/battery-ac-adapter.svg
deleted file mode 100644
index 628e9e62f..000000000
--- a/elementary-xfce/status/48/battery-ac-adapter.svg
+++ /dev/null
@@ -1,561 +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="48"
-   height="48"
-   id="svg5452">
-  <defs
-     id="defs5454">
-    <linearGradient
-       x1="11.566265"
-       y1="22.292103"
-       x2="15.214532"
-       y2="33.95525"
-       id="linearGradient4773"
-       xlink:href="#linearGradient8265-821-176-38-919-66-249"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.064929,-9.460843)" />
-    <linearGradient
-       id="linearGradient8265-821-176-38-919-66-249">
-      <stop
-         id="stop2687"
-         style="stop-color:#ffffff;stop-opacity:0.27450982"
-         offset="0" />
-      <stop
-         id="stop2689"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24"
-       y1="33.401722"
-       x2="33"
-       y2="33.401722"
-       id="linearGradient4708"
-       xlink:href="#linearGradient4702"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1.9999996)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient4702">
-      <stop
-         id="stop4704"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4706"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="102.30806"
-       y1="-2.3925467"
-       x2="102.30806"
-       y2="-24.582239"
-       id="linearGradient4777"
-       xlink:href="#linearGradient3844-4-1-98"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.03983699,0,0,0.25602145,25.359729,41.816203)"
-       spreadMethod="reflect" />
-    <linearGradient
-       id="linearGradient3844-4-1-98">
-      <stop
-         id="stop3846-6-6-1"
-         style="stop-color:#a5a6a8;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3848-9-0-6"
-         style="stop-color:#e8e8e8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="109.95628"
-       y1="-24.91135"
-       x2="109.95628"
-       y2="-2.3757858"
-       id="linearGradient4779"
-       xlink:href="#linearGradient2509-9-1-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.03983699,0,0,0.25602145,25.359729,41.816203)" />
-    <linearGradient
-       id="linearGradient2509-9-1-4">
-      <stop
-         id="stop2511-0-9-7"
-         style="stop-color:#b3b3b3;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2513-3-1-74"
-         style="stop-color:#dadada;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="89.01844"
-       y1="22.536863"
-       x2="89.01844"
-       y2="27.54611"
-       id="linearGradient4781"
-       xlink:href="#linearGradient3858-4-6-8-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.08657366,0,0,0.54407192,21.34809,29.607896)" />
-    <linearGradient
-       id="linearGradient3858-4-6-8-7">
-      <stop
-         id="stop3860-9-8-5-3"
-         style="stop-color:#a0a0a0;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3862-9-2-3-8"
-         style="stop-color:#4a4a4a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="77.444443"
-       y1="41.184654"
-       x2="77.444443"
-       y2="30.155411"
-       id="linearGradient4681"
-       xlink:href="#linearGradient3188-6-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85681647,0,0,0.69944042,-41.49886,12.561165)" />
-    <linearGradient
-       id="linearGradient3188-6-5">
-      <stop
-         id="stop3190-6-58"
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3192-6-88"
-         style="stop-color:#282828;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3642">
-      <stop
-         id="stop3644"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3646"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="25"
-       cy="12"
-       r="7.5"
-       fx="25"
-       fy="12"
-       id="radialGradient4025"
-       xlink:href="#linearGradient3690"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,2.9755329,-1.5333334,0,43.400001,-67.388322)" />
-    <linearGradient
-       id="linearGradient3690">
-      <stop
-         id="stop3692"
-         style="stop-color:#ffeb9f;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3694"
-         style="stop-color:#ffd57e;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3696"
-         style="stop-color:#ffbc43;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3698"
-         style="stop-color:#ff921a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="20"
-       y1="31.173784"
-       x2="20"
-       y2="8"
-       id="linearGradient4033"
-       xlink:href="#linearGradient3603"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-0.99999964)" />
-    <linearGradient
-       id="linearGradient3603">
-      <stop
-         id="stop3605"
-         style="stop-color:#a7651c;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3607"
-         style="stop-color:#c8a700;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21.381216"
-       y1="5.0524864"
-       x2="21.381216"
-       y2="44.137077"
-       id="linearGradient4647"
-       xlink:href="#linearGradient4649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.54285711,0,0,0.36842106,10.97143,25.473684)" />
-    <linearGradient
-       id="linearGradient4649">
-      <stop
-         id="stop4652"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4654"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.18506598" />
-      <stop
-         id="stop4656"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.87953037" />
-      <stop
-         id="stop4658"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="77.444443"
-       y1="41.184654"
-       x2="77.444443"
-       y2="30.155411"
-       id="linearGradient4190-0"
-       xlink:href="#linearGradient3188-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-52.444445,-73.155409)" />
-    <linearGradient
-       id="linearGradient3188-6">
-      <stop
-         id="stop3190-6"
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3192-6"
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="28.924889"
-       cy="22.568502"
-       r="11.491406"
-       fx="28.924889"
-       fy="22.568502"
-       id="radialGradient4267"
-       xlink:href="#linearGradient4660"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.7483979e-8,0.31456034,-1.177631,1.0889713e-7,50.577366,21.211339)" />
-    <linearGradient
-       id="linearGradient4660">
-      <stop
-         id="stop4662"
-         style="stop-color:#666666;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4664"
-         style="stop-color:#282828;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="32.084972"
-       y1="-14.402173"
-       x2="32.084972"
-       y2="-5.5633383"
-       id="linearGradient3421"
-       xlink:href="#linearGradient47870"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6655121,0,0,0.4518781,-54.615029,45.875214)" />
-    <linearGradient
-       id="linearGradient47870">
-      <stop
-         id="stop47872"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop47878"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop47874"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="51.4375"
-       cy="-12.203125"
-       r="2.171875"
-       fx="51.4375"
-       fy="-12.203125"
-       id="radialGradient3418"
-       xlink:href="#linearGradient51765"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.8417267,-5.1455073e-7,6.2669991e-7,0.9200109,-115.2312,52.586443)" />
-    <linearGradient
-       id="linearGradient51765">
-      <stop
-         id="stop51767"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop51769"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="51.4375"
-       cy="-12.203125"
-       r="2.171875"
-       fx="51.4375"
-       fy="-12.203125"
-       id="radialGradient4142"
-       xlink:href="#linearGradient51765"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.8417267,-5.8450938e-8,-1.2125708e-7,0.9200109,52.236437,52.586419)" />
-    <radialGradient
-       cx="25"
-       cy="12"
-       r="7.5"
-       fx="25"
-       fy="12"
-       id="radialGradient5244"
-       xlink:href="#linearGradient3690-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,2.9755329,-1.5333334,0,43.400001,-67.388322)" />
-    <linearGradient
-       id="linearGradient3690-9">
-      <stop
-         id="stop3692-0"
-         style="stop-color:#ffeb9f;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3694-0"
-         style="stop-color:#ffd57e;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3696-74"
-         style="stop-color:#ffbc43;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3698-1"
-         style="stop-color:#ff921a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="25"
-       cy="12"
-       r="7.5"
-       fx="25"
-       fy="12"
-       id="radialGradient5263"
-       xlink:href="#linearGradient3690-9-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,2.9755329,-1.5333334,0,43.400001,-67.388322)" />
-    <linearGradient
-       id="linearGradient3690-9-0">
-      <stop
-         id="stop3692-0-0"
-         style="stop-color:#ffeb9f;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3694-0-9"
-         style="stop-color:#ffd57e;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3696-74-4"
-         style="stop-color:#ffbc43;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3698-1-2"
-         style="stop-color:#ff921a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="25"
-       cy="12"
-       r="7.5"
-       fx="25"
-       fy="12"
-       id="radialGradient5303"
-       xlink:href="#linearGradient3690-9-0-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,2.9755329,-1.5333334,0,43.400001,-67.388322)" />
-    <linearGradient
-       id="linearGradient3690-9-0-4">
-      <stop
-         id="stop3692-0-0-8"
-         style="stop-color:#ffeb9f;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3694-0-9-4"
-         style="stop-color:#ffd57e;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3696-74-4-3"
-         style="stop-color:#ffbc43;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3698-1-2-4"
-         style="stop-color:#ff921a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7652-827">
-      <stop
-         id="stop3225"
-         style="stop-color:#666666;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3227"
-         style="stop-color:#5a5a5a;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7576-259">
-      <stop
-         id="stop3231"
-         style="stop-color:#3f3f3f;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3233"
-         style="stop-color:#6c6c6c;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="37.625"
-       y1="40.3125"
-       x2="38.875"
-       y2="45.0625"
-       id="linearGradient5448"
-       xlink:href="#linearGradient7652-827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.72060161,-0.06027989,0.06027989,-0.72060161,36.517347,49.104769)" />
-    <linearGradient
-       x1="38.75"
-       y1="40.625"
-       x2="40.125"
-       y2="46.5625"
-       id="linearGradient5450"
-       xlink:href="#linearGradient7576-259"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.72060161,-0.06027989,0.06027989,-0.72060161,36.517347,49.104769)" />
-    <linearGradient
-       x1="27"
-       y1="9"
-       x2="27"
-       y2="27"
-       id="linearGradient3089"
-       xlink:href="#linearGradient3642"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-0.99999964)" />
-  </defs>
-  <metadata
-     id="metadata5457">
-    <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
-     id="layer1">
-    <path
-       d="m 26.973113,26.974134 c 0,0 4.018543,-2.880281 7.026887,-4.974134 1.504173,-1.046927 2.858989,-2.098176 3.688556,-3.160931 0.414777,-0.531376 0.80916,-1.110192 0.640544,-1.964613 -0.08428,-0.427211 -0.372981,-0.844806 -0.703395,-1.079278 -0.330401,-0.234473 -0.665953,-0.350487 -1.052648,-0.428203 -1.515693,-0.30462 -3.432871,-0.0016 -5.729445,0.450451 -2.296576,0.452008 -4.931397,1.098533 -7.582079,1.724087 -2.650682,0.625552 -5.324735,1.227954 -7.634562,1.538283 -2.309825,0.310332 -4.258131,0.285974 -5.344576,-0.08426 -0.514284,-0.175261 -0.519113,-0.261717 -0.521613,-0.270398 -0.0024,-0.0086 -0.02631,-0.245604 0.214143,-0.662377 0.480917,-0.833549 1.805713,-2.110444 3.315151,-3.30555 C 16.308954,12.367 20.09239,10.156026 20.09239,10.156026 L 18.97827,8.2940692 c 0,0 -3.84454,2.2304378 -7.042573,4.7624988 -1.599017,1.266031 -3.0299115,2.570488 -3.8220386,3.943436 -0.3960643,0.686476 -0.6871504,1.47598 -0.4436166,2.321235 0.2435314,0.845259 0.9980508,1.440252 1.8948302,1.745853 1.73568,0.591485 3.9108,0.475542 6.359806,0.146514 2.449006,-0.329028 5.169199,-0.913755 7.839121,-1.543849 2.66992,-0.630096 5.281128,-1.29648 7.49199,-1.731621 2.148668,-0.422901 3.891253,-0.559846 4.72921,-0.420743 -0.503839,0.645481 -1.808387,1.701769 -3.241765,2.699426 -2.866768,1.995309 -8.759679,6.507235 -8.759679,6.507235 1.938907,1.473579 1.306858,1.761792 2.989558,0.250083 z"
-       id="path7506"
-       style="fill:url(#linearGradient5448);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5450);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 20.375,3.9375 a 3.5738277,3.5738277 0 0 0 -3.03125,2.40625 l -3.71875,11 A 3.5738277,3.5738277 0 0 0 17,22.0625 l 2.375,0 -1.625,6.59375 a 3.5738277,3.5738277 0 0 0 6.40625,2.875 l 9.78125,-14 A 3.5738277,3.5738277 0 0 0 31,11.9375 l -0.65625,0 L 31.875,9.25 A 3.5738277,3.5738277 0 0 0 28.78125,3.9375 l -8.0625,0 a 3.5738277,3.5738277 0 0 0 -0.34375,0 z"
-       id="path5242-3-5"
-       style="opacity:0.05;fill:url(#radialGradient5303);fill-opacity:1;stroke:none;display:inline;enable-background:new" />
-    <path
-       d="m 20.46875,5 a 2.5125605,2.5125605 0 0 0 -2.125,1.6875 l -3.71875,11 A 2.5125605,2.5125605 0 0 0 17,21 l 3.75,0 -1.96875,7.90625 a 2.5125605,2.5125605 0 0 0 4.5,2.03125 l 9.78125,-14 A 2.5125605,2.5125605 0 0 0 31,13 l -2.4375,0 2.40625,-4.25 A 2.5125605,2.5125605 0 0 0 28.78125,5 l -8.0625,0 a 2.5125605,2.5125605 0 0 0 -0.25,0 z"
-       id="path5242-3"
-       style="opacity:0.1;fill:url(#radialGradient5263);fill-opacity:1;stroke:none;display:inline;enable-background:new" />
-    <path
-       d="M 20.71875,6.0625 A 1.4255141,1.4255141 0 0 0 19.375,7.03125 l -3.71875,11 A 1.4255141,1.4255141 0 0 0 17,19.9375 l 5.125,0 -2.28125,9.21875 A 1.4255141,1.4255141 0 0 0 22.375,30.3125 l 9.78125,-14 A 1.4255141,1.4255141 0 0 0 31,14.0625 l -4.28125,0 3.3125,-5.875 a 1.4255141,1.4255141 0 0 0 -1.25,-2.125 l -8.0625,0 z"
-       id="path5242"
-       style="opacity:0.25;fill:url(#radialGradient5244);fill-opacity:1;stroke:none;display:inline;enable-background:new" />
-    <g
-       transform="matrix(0.86666667,0,0,1.2500002,51.297732,-9.201583)"
-       id="g3423">
-      <rect
-         width="22"
-         height="3.9940758"
-         x="-42.497383"
-         y="39.367184"
-         id="rect46899"
-         style="opacity:0.3;fill:url(#linearGradient3421);fill-opacity:1;fill-rule:evenodd;stroke:none" />
-      <path
-         d="m -20.497383,39.36126 0,3.996297 c 2.205021,-0.01509 4,-0.897792 4,-1.991088 0,-1.093295 -1.794978,-1.990122 -4,-2.005209 z"
-         id="path48849"
-         style="opacity:0.3;fill:url(#radialGradient3418);fill-opacity:1;fill-rule:evenodd;stroke:none" />
-      <path
-         d="m -42.497383,39.36126 0,3.996297 c -2.205021,-0.01509 -4,-0.897792 -4,-1.991088 0,-1.093295 1.794978,-1.990122 4,-2.005209 z"
-         id="path52742"
-         style="opacity:0.3;fill:url(#radialGradient4142);fill-opacity:1;fill-rule:evenodd;stroke:none" />
-    </g>
-    <path
-       d="m 35,34 a 11,6 0 1 1 -22,0 11,6 0 1 1 22,0 z"
-       transform="matrix(0.95490909,0,0,1.084,1.0821818,-3.8559995)"
-       id="path4170"
-       style="color:#000000;fill:url(#radialGradient4267);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:0.98281193;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="21.007999"
-       height="10.008"
-       rx="1"
-       ry="1"
-       x="13.496"
-       y="-42.503998"
-       transform="scale(1,-1)"
-       id="rect4168"
-       style="color:#000000;fill:url(#linearGradient4190-0);fill-opacity:1;fill-rule:nonzero;stroke:#2a2a2a;stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;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 24.000001,27.5 c 2.824888,0.02298 5.812106,0.649218 8.007403,2.531382 0.987447,0.838763 1.61067,2.111322 1.492597,3.418618 l -10e-7,7.9813 -19,0.1374 10e-7,-7.8687 c -0.05383,-0.998546 0.096,-2.042045 0.744266,-2.844828 1.516448,-1.955456 4.011614,-2.809145 6.376098,-3.1826 0.787453,-0.116677 1.583677,-0.172508 2.379636,-0.172572 z"
-       id="rect3145"
-       style="opacity:0.4;color:#000000;fill:none;stroke:url(#linearGradient4647);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="M 28.769428,7.4999994 24.242696,15.499999 31,15.499999 21.212031,29.5 23.925983,18.5 17,18.5 20.706427,7.4999994 l 8.063001,0 0,0 z"
-       id="path2911"
-       style="fill:url(#radialGradient4025);fill-opacity:1;stroke:url(#linearGradient4033);stroke-linejoin:miter;stroke-opacity:1;display:inline;enable-background:new" />
-    <path
-       d="m 24.032826,17.53485 c 0.668551,0.03506 1.047348,0.802553 0.791653,1.387082 -0.48316,1.942703 -0.966319,3.885407 -1.449479,5.828111 1.927083,-2.760417 3.854167,-5.520833 5.78125,-8.28125 -1.698473,-0.0098 -3.399105,0.01961 -5.096216,-0.01486 -0.716057,-0.100132 -1.016468,-1.028308 -0.571223,-1.568332 1.212063,-2.138935 2.424126,-4.27787 3.636189,-6.4168046 -1.90625,0 -3.8125,0 -5.71875,0 l 0,-4.6e-5 c -1.020833,3.0208326 -2.041667,6.0416666 -3.0625,9.0624996"
-       id="path4162"
-       style="opacity:0.5;fill:none;stroke:url(#linearGradient3089);stroke-linejoin:miter;stroke-opacity:1;display:inline;enable-background:new" />
-    <rect
-       width="18"
-       height="7"
-       rx="0.85681647"
-       ry="0.69944042"
-       x="15"
-       y="34"
-       id="rect4168-5"
-       style="color:#000000;fill:url(#linearGradient4681);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992186;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 30.500572,43.166666 c 2.03e-4,0.944128 -0.447714,1.333334 -1,1.333334 -0.552284,0 -0.999567,-0.324606 -1,-1.333334 L 28.5,40.5 l 2,0 z m -11,0 c 2.03e-4,0.944128 -0.447714,1.333334 -1,1.333334 -0.552284,0 -0.999567,-0.324606 -1,-1.333334 L 17.5,40.5 l 2,0 z"
-       id="path3880-3-6"
-       style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4781);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 30.500572,38.999999 c 2.43e-4,1.062144 -0.447714,1.5 -1,1.5 -0.552284,0 -0.999567,-0.365181 -1,-1.5 L 28.5,36.5 l 2,0 z m -11,0 c 2.43e-4,1.062144 -0.447714,1.5 -1,1.5 -0.552284,0 -0.999567,-0.365181 -1,-1.5 L 17.5,36.5 l 2,0 z"
-       id="path3880-6"
-       style="fill:url(#linearGradient4777);fill-opacity:1;stroke:url(#linearGradient4779);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 15.5,31.401723 17,0"
-       id="path4700"
-       style="opacity:0.2;fill:none;stroke:url(#linearGradient4708);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="m 21.03125,8.9375 -3.3125,9.75 9.71875,-1.75 -3.1875,0 A 0.42239747,0.42239747 0 0 1 23.875,16.28125 L 27.8125,9.375 A 0.42239747,0.42239747 0 0 1 27.625,9.15625 C 27.595111,9.0868592 27.56315,9.0104622 27.53125,8.9375 l -6.5,0 z"
-       transform="translate(0,-0.99999964)"
-       id="path4771"
-       style="opacity:0.8;fill:url(#linearGradient4773);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/elementary-xfce/status/48/battery-caution-charging.svg b/elementary-xfce/status/48/battery-caution-charging.svg
deleted file mode 120000
index 5c4b1caf0..000000000
--- a/elementary-xfce/status/48/battery-caution-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-020-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-caution-charging.svg b/elementary-xfce/status/48/battery-caution-charging.svg
new file mode 100644
index 000000000..4fb1245d1
--- /dev/null
+++ b/elementary-xfce/status/48/battery-caution-charging.svg
@@ -0,0 +1,322 @@
+<?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="48"
+   height="48"
+   id="svg2485">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.02777778" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.97222221" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="translate(-48)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient929" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="26"
+       x2="47.991497"
+       y1="26"
+       x1="11.401914"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="matrix(1,0,0,0.32432432,1e-6,30.067567)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#ffe16b;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#d48e15;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient929">
+      <stop
+         id="stop918"
+         offset="0"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.08017239"
+         id="stop921" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0.48701805"
+         id="stop923" />
+      <stop
+         id="stop925"
+         offset="0.82605612"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop927"
+         offset="1"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+    </linearGradient>
+  </defs>
+  <path
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
+  <rect
+     width="25"
+     height="39"
+     rx="13.5"
+     ry="1.5"
+     x="-36.5"
+     y="5.5"
+     id="rect3268-4"
+     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
+     id="rect3268-0-1-3"
+     y="32.5"
+     x="11.5"
+     ry="1.5000002"
+     rx="13.5"
+     height="12"
+     width="25" />
+  <rect
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#ad5f00;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-36"
+     y="32.5"
+     x="11.5"
+     ry="1.5"
+     rx="13.5"
+     height="12"
+     width="25" />
+  <path
+     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
+     id="rect3268-6-4"
+     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
+     id="rect3268-6"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3-9"
+     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     id="path4752"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     id="path5124"
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.959926,34.564 C 34.41184,33.946725 29.65256,33.499557 23.990923,33.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
+     id="rect3268-0-7"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.4;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-7-5"
+     d="M 35.959926,35.935557 C 34.41184,36.552832 29.65256,37 23.990923,37 18.348253,37 13.601903,36.555823 12.037586,35.941755" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#d48e15;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;vector-effect:none;fill-opacity:1"
+     id="rect3268-0-3"
+     d="M 36.5,34.5 C 36.5,35.331 30.925,36 24,36 17.075,36 11.5,35.331 11.5,34.5" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-7-8"
+     d="M 35.959926,33.935557 C 34.41184,34.552832 29.65256,35 23.990923,35 18.348253,35 13.601903,34.555823 12.037586,33.941755" />
+  <path
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
+     id="path5194"
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
+     id="rect3244"
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     id="rect3268-5-7"
+     d="M 36.5,9 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 2"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     id="path885"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#ad5f00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 11.5,9 v 25 m 25,0 V 9" />
+  <path
+     d="m 24.5,14.999805 c -0.298436,0 -0.566775,0.130572 -0.75,0.337891 L 15.140625,27.490234 C 15.051797,27.639631 15,27.813576 15,28 c 0,0.552285 0.447715,1 1,1 h 8 l -1.416016,6.599804 C 22.530437,35.722323 22.5,35.857934 22.5,36.000195 c 0,0.552285 0.447715,1 1,1 0.298436,0 0.566775,-0.130572 0.75,-0.337891 L 32.859375,24.509766 C 32.948203,24.360369 33,24.186424 33,24 33,23.447715 32.552285,23 32,23 h -8 l 1.416016,-6.599805 c 0.05355,-0.122519 0.08398,-0.25813 0.08398,-0.40039 0,-0.552285 -0.447715,-1 -1,-1 z"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path54-4" />
+  <path
+     id="path54-3"
+     style="font-variation-settings:normal;opacity:0.85;vector-effect:none;fill:#d48e15;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 24.5,13.999805 c -0.298436,0 -0.566775,0.130572 -0.75,0.337891 L 15.140625,26.490234 C 15.051797,26.639631 15,26.813576 15,27 c 0,0.552285 0.447715,1 1,1 h 8 l -1.416016,6.599804 C 22.530437,34.722323 22.5,34.857934 22.5,35.000195 c 0,0.552285 0.447715,1 1,1 0.298436,0 0.566775,-0.130572 0.75,-0.337891 L 32.859375,23.509766 C 32.948203,23.360369 33,23.186424 33,23 33,22.447715 32.552285,22 32,22 h -8 l 1.416016,-6.599805 c 0.05355,-0.122518 0.08398,-0.25813 0.08398,-0.40039 0,-0.552285 -0.447715,-1 -1,-1 z" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-caution.svg b/elementary-xfce/status/48/battery-caution.svg
deleted file mode 120000
index f76eaff39..000000000
--- a/elementary-xfce/status/48/battery-caution.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-020.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-caution.svg b/elementary-xfce/status/48/battery-caution.svg
new file mode 100644
index 000000000..07cf41e9d
--- /dev/null
+++ b/elementary-xfce/status/48/battery-caution.svg
@@ -0,0 +1,365 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="battery-caution.svg"
+   id="svg2485"
+   height="48"
+   width="48"
+   version="1.0">
+  <sodipodi:namedview
+     inkscape:current-layer="svg2485"
+     inkscape:window-maximized="1"
+     inkscape:window-y="30"
+     inkscape:window-x="0"
+     inkscape:cy="36.673643"
+     inkscape:cx="81.626126"
+     inkscape:zoom="7.4246212"
+     showgrid="true"
+     id="namedview58"
+     inkscape:window-height="1373"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff">
+    <inkscape:grid
+       empspacing="4"
+       id="grid883"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5128" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop5130" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         offset="0"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         id="stop5120" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5122" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4764" />
+      <stop
+         offset="0.02777778"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4766" />
+      <stop
+         offset="0.97222221"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4768" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4663-8-7" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4665-7-6" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4762"
+       id="linearGradient4760"
+       y2="43"
+       x2="30"
+       y1="7"
+       x1="30" />
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       id="linearGradient3457-7-6"
+       y2="-93.091553"
+       x2="-48.479328"
+       y1="-93.091553"
+       x1="-20.446733" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         id="stop4681-3-1" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4683-67-4" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5118"
+       id="linearGradient5066-8"
+       y2="-93.091553"
+       x2="-45.761551"
+       y1="-93.091553"
+       x1="-17.12093" />
+    <radialGradient
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5126"
+       id="radialGradient5132"
+       fy="7.5"
+       fx="16.5"
+       r="3.5"
+       cy="7.5"
+       cx="16.5" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         offset="0"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         id="stop3822-2-6-3-3-7" />
+      <stop
+         offset="0.5"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         id="stop3864-8-7-7-9-1" />
+      <stop
+         offset="1"
+         style="stop-color:#686868;stop-opacity:0"
+         id="stop3824-1-2-5-0-3" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       id="radialGradient5362"
+       fy="186.17059"
+       fx="99.157013"
+       r="62.769119"
+       cy="186.17059"
+       cx="99.157013" />
+    <linearGradient
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5508"
+       y2="35.717499"
+       x2="17.77273"
+       y1="17.458462"
+       x1="13.681819" />
+    <linearGradient
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5510"
+       y2="35.717499"
+       x2="27.31819"
+       y1="17.458462"
+       x1="25.272734" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         id="stop3823"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3825"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient929"
+       id="linearGradient3941"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48)"
+       x1="12.029413"
+       y1="25"
+       x2="36.608757"
+       y2="25" />
+    <linearGradient
+       gradientTransform="matrix(1,0,0,0.32432432,1e-6,30.067567)"
+       xlink:href="#linearGradient899"
+       id="linearGradient901"
+       x1="11.401914"
+       y1="26"
+       x2="47.991497"
+       y2="26"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         style="stop-color:#ffe16b;stop-opacity:1"
+         offset="0"
+         id="stop895" />
+      <stop
+         style="stop-color:#d48e15;stop-opacity:1"
+         offset="1"
+         id="stop897" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="matrix(0.60000002,0,0,0.66666667,-21.899999,-3.666666)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941-3"
+       xlink:href="#linearGradient929" />
+    <linearGradient
+       id="linearGradient929">
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="0"
+         id="stop918" />
+      <stop
+         id="stop921"
+         offset="0.08017239"
+         style="stop-color:#ad5f00;stop-opacity:1" />
+      <stop
+         id="stop923"
+         offset="0.48701805"
+         style="stop-color:#ad5f00;stop-opacity:0" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:1"
+         offset="0.82605612"
+         id="stop925" />
+      <stop
+         style="stop-color:#ad5f00;stop-opacity:0"
+         offset="1"
+         id="stop927" />
+    </linearGradient>
+  </defs>
+  <path
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none"
+     id="path3818-0-5"
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z" />
+  <rect
+     transform="scale(-1,1)"
+     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     id="rect3268-4"
+     y="5.5"
+     x="-36.5"
+     ry="1.5"
+     rx="13.5"
+     height="39"
+     width="25" />
+  <rect
+     width="25"
+     height="12"
+     rx="13.5"
+     ry="1.5000002"
+     x="11.5"
+     y="32.5"
+     id="rect3268-0-1-3"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" />
+  <rect
+     width="25"
+     height="12"
+     rx="13.5"
+     ry="1.5"
+     x="11.5"
+     y="32.5"
+     id="rect3268-36"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#ad5f00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-6-4"
+     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z" />
+  <path
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="rect3268-6"
+     d="M 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9" />
+  <path
+     style="color:#000000;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-3-9"
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875" />
+  <path
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="rect3268-3"
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875" />
+  <path
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="path4752"
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z" />
+  <path
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5124"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-0-7"
+     d="M 35.959926,34.564 C 34.41184,33.946725 29.65256,33.499557 23.990923,33.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245" />
+  <path
+     sodipodi:nodetypes="csssc"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 36.5,9 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 2"
+     id="rect3268-5" />
+  <path
+     d="M 35.959926,35.935557 C 34.41184,36.552832 29.65256,37 23.990923,37 18.348253,37 13.601903,36.555823 12.037586,35.941755"
+     id="rect3268-0-7-5"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.4;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 36.5,34.5 C 36.5,35.331 30.925,36 24,36 17.075,36 11.5,35.331 11.5,34.5"
+     id="rect3268-0-3"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#d48e15;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;vector-effect:none;fill-opacity:1" />
+  <path
+     d="M 35.959926,33.935557 C 34.41184,34.552832 29.65256,35 23.990923,35 18.348253,35 13.601903,34.555823 12.037586,33.941755"
+     id="rect3268-0-7-8"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="path5194"
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z" />
+  <path
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="rect3244"
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z" />
+  <path
+     sodipodi:nodetypes="cccc"
+     d="m 11.5,9 v 25 m 25,0 V 9"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#ad5f00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path885" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-charged.svg b/elementary-xfce/status/48/battery-charged.svg
deleted file mode 120000
index d53d66a51..000000000
--- a/elementary-xfce/status/48/battery-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-empty-charging.svg b/elementary-xfce/status/48/battery-empty-charging.svg
deleted file mode 120000
index 47cf3ff48..000000000
--- a/elementary-xfce/status/48/battery-empty-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-000-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-empty-charging.svg b/elementary-xfce/status/48/battery-empty-charging.svg
new file mode 100644
index 000000000..45ccf8d98
--- /dev/null
+++ b/elementary-xfce/status/48/battery-empty-charging.svg
@@ -0,0 +1,308 @@
+<?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="48"
+   height="48"
+   id="svg2485">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.02777778" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.97222221" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="16.422039"
+       y1="13.204427"
+       x2="16.422039"
+       y2="69.583908"
+       id="linearGradient4393"
+       xlink:href="#linearGradient3242-4-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92592593,0,0,0.26315789,1.7777778,32.789473)" />
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       id="linearGradient3242-4-2">
+      <stop
+         id="stop3244-8-8"
+         style="stop-color:#ff8c82;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3250-3-0"
+         style="stop-color:#a10705;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="24.935535"
+       y1="25"
+       x1="-0.069760188"
+       gradientTransform="translate(-36.5,-5.5)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient929" />
+    <linearGradient
+       id="linearGradient929">
+      <stop
+         id="stop918"
+         offset="0"
+         style="stop-color:#7a0000;stop-opacity:0" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:1"
+         offset="0.08017239"
+         id="stop921" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="0.48701805"
+         id="stop923" />
+      <stop
+         id="stop925"
+         offset="0.82605612"
+         style="stop-color:#7a0000;stop-opacity:1" />
+      <stop
+         id="stop927"
+         offset="1"
+         style="stop-color:#7a0000;stop-opacity:0" />
+    </linearGradient>
+  </defs>
+  <path
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
+  <rect
+     width="25"
+     height="39"
+     rx="13.5"
+     ry="1.5"
+     x="-36.5"
+     y="5.5"
+     id="rect3268-4"
+     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <rect
+     width="25"
+     height="5"
+     rx="13.5"
+     ry="1.5000002"
+     x="11.5"
+     y="39.5"
+     id="rect3268-0-1"
+     style="color:#000000;fill:url(#linearGradient4393);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 36.5,41 c 0,-0.831 -5.575,-1.5 -12.5,-1.5 -6.925,0 -12.5,0.669 -12.5,1.5"
+     id="rect3268-0"
+     style="opacity:0.5;color:#000000;fill:none;stroke:#7a0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
+     id="rect3268-6-4"
+     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
+     id="rect3268-6"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3-9"
+     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     id="path4752"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     id="rect3268"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 36.5,9 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 2" />
+  <path
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
+     id="rect3244"
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     id="path5124"
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,41.564 C 34.420917,40.946725 29.661637,40.499557 24,40.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
+     id="rect3268-0-7"
+     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <g
+     id="g5672"
+     style="opacity:0.4" />
+  <path
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
+     id="path5194"
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     id="rect914"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#7a0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="m 11.5,9 v 34 c 0,0.831 5.575,1.5 12.5,1.5 6.925,0 12.5,-0.669 12.5,-1.5 V 9" />
+  <path
+     d="m 24.5,14.999805 c -0.298436,0 -0.566775,0.130572 -0.75,0.337891 L 15.140625,27.490234 C 15.051797,27.639631 15,27.813576 15,28 c 0,0.552285 0.447715,1 1,1 h 8 l -1.416016,6.599804 C 22.530437,35.722323 22.5,35.857934 22.5,36.000195 c 0,0.552285 0.447715,1 1,1 0.298436,0 0.566775,-0.130572 0.75,-0.337891 L 32.859375,24.509766 C 32.948203,24.360369 33,24.186424 33,24 33,23.447715 32.552285,23 32,23 h -8 l 1.416016,-6.599805 c 0.05355,-0.122519 0.08398,-0.25813 0.08398,-0.40039 0,-0.552285 -0.447715,-1 -1,-1 z"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path54-4" />
+  <path
+     id="path54-3"
+     style="font-variation-settings:normal;opacity:0.55;vector-effect:none;fill:#a10705;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 24.5,13.999805 c -0.298436,0 -0.566775,0.130572 -0.75,0.337891 L 15.140625,26.490234 C 15.051797,26.639631 15,26.813576 15,27 c 0,0.552285 0.447715,1 1,1 h 8 l -1.416016,6.599804 C 22.530437,34.722323 22.5,34.857934 22.5,35.000195 c 0,0.552285 0.447715,1 1,1 0.298436,0 0.566775,-0.130572 0.75,-0.337891 L 32.859375,23.509766 C 32.948203,23.360369 33,23.186424 33,23 33,22.447715 32.552285,22 32,22 h -8 l 1.416016,-6.599805 c 0.05355,-0.122518 0.08398,-0.25813 0.08398,-0.40039 0,-0.552285 -0.447715,-1 -1,-1 z" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-empty.svg b/elementary-xfce/status/48/battery-empty.svg
deleted file mode 120000
index 1bf261b38..000000000
--- a/elementary-xfce/status/48/battery-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-empty.svg b/elementary-xfce/status/48/battery-empty.svg
new file mode 100644
index 000000000..80bd5e17f
--- /dev/null
+++ b/elementary-xfce/status/48/battery-empty.svg
@@ -0,0 +1,451 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="battery-empty.svg"
+   id="svg2485"
+   height="48"
+   width="48"
+   version="1.0">
+  <sodipodi:namedview
+     inkscape:current-layer="svg2485"
+     inkscape:window-maximized="1"
+     inkscape:window-y="30"
+     inkscape:window-x="0"
+     inkscape:cy="175.42482"
+     inkscape:cx="259.57453"
+     inkscape:zoom="1.3125"
+     showgrid="true"
+     id="namedview80"
+     inkscape:window-height="1373"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff">
+    <inkscape:grid
+       id="grid905"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5128" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop5130" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         offset="0"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         id="stop5120" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5122" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4764" />
+      <stop
+         offset="0.02777778"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4766" />
+      <stop
+         offset="0.97222221"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4768" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4770" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.92592593,0,0,0.26315789,1.7777778,32.789473)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3242-4-2"
+       id="linearGradient4393"
+       y2="69.82972"
+       x2="19.367573"
+       y1="9.571414"
+       x1="19.367573" />
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4663-8-7" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4665-7-6" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4762"
+       id="linearGradient4760"
+       y2="43"
+       x2="30"
+       y1="7"
+       x1="30" />
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       id="linearGradient3457-7-6"
+       y2="-93.091553"
+       x2="-48.479328"
+       y1="-93.091553"
+       x1="-20.446733" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         id="stop4681-3-1" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4683-67-4" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5118"
+       id="linearGradient5066-8"
+       y2="-93.091553"
+       x2="-45.761551"
+       y1="-93.091553"
+       x1="-17.12093" />
+    <radialGradient
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5126"
+       id="radialGradient5132"
+       fy="7.5"
+       fx="16.5"
+       r="3.5"
+       cy="7.5"
+       cx="16.5" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         offset="0"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         id="stop3822-2-6-3-3-7" />
+      <stop
+         offset="0.5"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         id="stop3864-8-7-7-9-1" />
+      <stop
+         offset="1"
+         style="stop-color:#686868;stop-opacity:0"
+         id="stop3824-1-2-5-0-3" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       id="radialGradient5362"
+       fy="186.17059"
+       fx="99.157013"
+       r="62.769119"
+       cy="186.17059"
+       cx="99.157013" />
+    <linearGradient
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5510"
+       y2="35.717499"
+       x2="27.31819"
+       y1="17.458462"
+       x1="25.272734" />
+    <linearGradient
+       id="linearGradient3242-4-2">
+      <stop
+         offset="0"
+         style="stop-color:#ff8c82;stop-opacity:1"
+         id="stop3244-8-8" />
+      <stop
+         offset="1"
+         style="stop-color:#a10705;stop-opacity:1"
+         id="stop3250-3-0" />
+    </linearGradient>
+    <linearGradient
+       x1="24"
+       y1="2.0112092"
+       x2="24"
+       y2="44.532082"
+       id="linearGradient3094"
+       xlink:href="#linearGradient4171"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.48890916,0,0,0.48839827,24.266182,24.742322)" />
+    <linearGradient
+       x1="29.126724"
+       y1="19.787613"
+       x2="29.291178"
+       y2="57.567127"
+       id="linearGradient3091"
+       xlink:href="#linearGradient3117-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49373581,0,-0.00214922,0.51518426,21.661617,16.574027)" />
+    <linearGradient
+       id="linearGradient3117-8">
+      <stop
+         id="stop3119-9"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3121-9"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.56911701" />
+      <stop
+         id="stop3123-6"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.93297637" />
+      <stop
+         id="stop3125-3"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8838">
+      <stop
+         id="stop8840"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8842"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         id="stop3823"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop3825"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3821"
+       id="linearGradient3848"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48,0)"
+       x1="12.029413"
+       y1="25"
+       x2="36.608757"
+       y2="25" />
+    <linearGradient
+       id="linearGradient3254-3-182-8-5-0">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4663-8-7-1" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4665-7-6-7" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3254-3-182-8-5-0"
+       id="linearGradient3890"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.066655,-30.333874)"
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499" />
+    <radialGradient
+       gradientTransform="matrix(1.1294118,0,0,0.12941156,-34.729414,46.026471)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient8838"
+       id="radialGradient2415"
+       fy="4.625"
+       fx="62.625"
+       r="10.625"
+       cy="4.625"
+       cx="62.625" />
+    <linearGradient
+       id="linearGradient4171">
+      <stop
+         style="stop-color:#ffe16b;stop-opacity:1"
+         offset="0"
+         id="stop4173" />
+      <stop
+         style="stop-color:#f9c440;stop-opacity:1"
+         offset="1"
+         id="stop4175" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient929"
+       id="linearGradient3941"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-36.5,-5.5)"
+       x1="0.5"
+       y1="25.5"
+       x2="24.5"
+       y2="25.5" />
+    <linearGradient
+       id="linearGradient929">
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="0"
+         id="stop918" />
+      <stop
+         id="stop921"
+         offset="0.08017239"
+         style="stop-color:#7a0000;stop-opacity:1" />
+      <stop
+         id="stop923"
+         offset="0.48701805"
+         style="stop-color:#7a0000;stop-opacity:0" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:1"
+         offset="0.82605612"
+         id="stop925" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="1"
+         id="stop927" />
+    </linearGradient>
+  </defs>
+  <rect
+     transform="scale(-1,1)"
+     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     id="rect3268-4"
+     y="5.5"
+     x="-36.5"
+     ry="1.5"
+     rx="13.5"
+     height="39"
+     width="25" />
+  <path
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none"
+     id="path3818-0-5"
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z" />
+  <rect
+     style="color:#000000;fill:url(#linearGradient4393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-0-1"
+     y="39.5"
+     x="11.5"
+     ry="1.5000002"
+     rx="13.5"
+     height="5"
+     width="25" />
+  <path
+     style="opacity:0.5;color:#000000;fill:none;stroke:#7a0000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-0"
+     d="m 36.5,41 c 0,-0.831 -5.575,-1.5 -12.5,-1.5 -6.925,0 -12.5,0.669 -12.5,1.5" />
+  <path
+     style="color:#000000;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-6-4"
+     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z" />
+  <path
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="rect3268-6"
+     d="M 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9" />
+  <path
+     style="color:#000000;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-3-9"
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875" />
+  <path
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="rect3268-3"
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875" />
+  <path
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="path4752"
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 C 11.64892,7.418115 11.599316,7.431865 11.5,7.46875 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z" />
+  <path
+     sodipodi:nodetypes="csssc"
+     d="M 36.5,9 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 2"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268" />
+  <path
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="rect3244"
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z" />
+  <path
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5124"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z" />
+  <path
+     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="rect3268-0-7"
+     d="M 35.969003,41.564 C 34.420917,40.946725 29.661637,40.499557 24,40.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245" />
+  <path
+     style="opacity:0.3;fill:url(#linearGradient3890);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="path5194"
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z" />
+  <path
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#radialGradient2415);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none"
+     id="path8836"
+     d="M 48,46.625 C 48,47.384391 42.627417,48 36,48 29.372583,48 24,47.384391 24,46.625 c 0,-0.759391 5.372583,-1.375 12,-1.375 6.627417,0 12,0.615609 12,1.375 z" />
+  <path
+     sodipodi:nodetypes="csssc"
+     d="m 11.5,9 v 34 c 0,0.831 5.575,1.5 12.5,1.5 6.925,0 12.5,-0.669 12.5,-1.5 V 9"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#7a0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect907" />
+  <path
+     style="fill:url(#linearGradient3094);fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path11155-5"
+     d="M 46.843441,44.277765 37.294944,26.277682 c -0.274455,-0.5 -0.771065,-0.77778 -1.324145,-0.77778 -0.553075,0 -1.052235,0.33333 -1.330855,0.833335 l -9.477397,18.000088 c -0.223085,0.444445 -0.225635,1.05556 0.04905,1.500005 0.27468,0.44445 0.716215,0.66667 1.269296,0.66667 l 19.025888,0 c 0.55308,0 1.052005,-0.27778 1.275095,-0.722225 0.278385,-0.444445 0.280705,-1.000005 0.06156,-1.50001 z" />
+  <path
+     style="opacity:0.6;fill:none;stroke:url(#linearGradient3091);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path11159-4"
+     d="M 45.554469,43.506436 37.009293,27.915852 C 36.64536,27.222466 36.514831,26.5 35.961755,26.5 c -0.475681,0 -0.724576,0.823993 -1.068333,1.478495 l -8.450324,15.57762 c -0.490695,0.902951 -0.543267,1.138323 -0.307081,1.535746 0.236181,0.397428 0.539433,0.375782 1.659914,0.401703 l 16.60861,0 c 1.043148,0.01297 1.278124,-0.06692 1.470057,-0.464346 0.2395,-0.397427 0.137629,-0.712731 -0.320129,-1.522782 z" />
+  <path
+     style="opacity:0.5;fill:none;stroke:#ad5f00;stroke-width:0.99999982;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-opacity:1;fill-rule:nonzero;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0;marker:none;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     id="path11155-8"
+     d="M 46.843441,44.277775 37.294944,26.277777 C 37.020489,25.777779 36.523879,25.5 35.970799,25.5 c -0.553075,0 -1.052235,0.333329 -1.330855,0.833332 l -9.477397,18.000003 c -0.223085,0.444443 -0.225635,1.055555 0.04905,1.499998 C 25.486277,46.277781 25.927812,46.5 26.480892,46.5 l 19.025889,0 c 0.55308,0 1.052005,-0.277779 1.275095,-0.722222 0.278385,-0.444443 0.280705,-1 0.06156,-1.500003 z" />
+  <path
+     style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
+     d="m 36,33 c -0.717969,0 -1.3,0.596955 -1.3,1.333333 0,1.333334 0.433332,3.111111 0.866667,6.666667 l 0.866665,0 C 36.866667,37.444444 37.3,35.666667 37.3,34.333333 37.3,33.596955 36.717969,33 36,33 Z m 0,9.333333 c -0.717969,0 -1.3,0.596955 -1.3,1.333334 C 34.7,44.403045 35.282031,45 36,45 c 0.717969,0 1.3,-0.596955 1.3,-1.333333 0,-0.736379 -0.582031,-1.333334 -1.3,-1.333334 z"
+     id="path4159-3-3" />
+  <path
+     style="opacity:1;fill:#7a0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922"
+     d="m 36,32 c -0.717969,0 -1.3,0.596955 -1.3,1.333333 0,1.333334 0.433332,3.111111 0.866667,6.666667 l 0.866665,0 C 36.866667,36.444444 37.3,34.666667 37.3,33.333333 37.3,32.596955 36.717969,32 36,32 Z m 0,9.333333 c -0.717969,0 -1.3,0.596955 -1.3,1.333334 C 34.7,43.403045 35.282031,44 36,44 c 0.717969,0 1.3,-0.596955 1.3,-1.333333 0,-0.736379 -0.582031,-1.333334 -1.3,-1.333334 z"
+     id="path4159-3" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-full-charged.svg b/elementary-xfce/status/48/battery-full-charged.svg
deleted file mode 120000
index d53d66a51..000000000
--- a/elementary-xfce/status/48/battery-full-charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-full-charged.svg b/elementary-xfce/status/48/battery-full-charged.svg
new file mode 100644
index 000000000..bc28a46db
--- /dev/null
+++ b/elementary-xfce/status/48/battery-full-charged.svg
@@ -0,0 +1,255 @@
+<?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="svg2485"
+   height="48"
+   width="48"
+   version="1.0">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#9bdb4d;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3a9104;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5128" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop5130" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         offset="0"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         id="stop5120" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop5122" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4764" />
+      <stop
+         offset="0.02777778"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop4766" />
+      <stop
+         offset="0.97222221"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop4768" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop4770" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4663-8-7" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop4665-7-6" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4762"
+       id="linearGradient4760"
+       y2="43"
+       x2="30"
+       y1="7"
+       x1="30" />
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       id="linearGradient3457-7-6"
+       y2="-93.091553"
+       x2="-48.479328"
+       y1="-93.091553"
+       x1="-20.446733" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         offset="0"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         id="stop4681-3-1" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop4683-67-4" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="reflect"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5118"
+       id="linearGradient5066-8"
+       y2="-93.091553"
+       x2="-45.761551"
+       y1="-93.091553"
+       x1="-17.12093" />
+    <radialGradient
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5126"
+       id="radialGradient5132"
+       fy="7.5"
+       fx="16.5"
+       r="3.5"
+       cy="7.5"
+       cx="16.5" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         offset="0"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         id="stop3822-2-6-3-3-7" />
+      <stop
+         offset="0.5"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         id="stop3864-8-7-7-9-1" />
+      <stop
+         offset="1"
+         style="stop-color:#686868;stop-opacity:0"
+         id="stop3824-1-2-5-0-3" />
+    </linearGradient>
+    <radialGradient
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       id="radialGradient5362"
+       fy="186.17059"
+       fx="99.157013"
+       r="62.769119"
+       cy="186.17059"
+       cx="99.157013" />
+    <linearGradient
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5508"
+       y2="35.717499"
+       x2="17.77273"
+       y1="17.458462"
+       x1="13.681819" />
+    <linearGradient
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       id="linearGradient5510"
+       y2="35.717499"
+       x2="27.31819"
+       y1="17.458462"
+       x1="25.272734" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="26"
+       x2="36.5"
+       y1="26"
+       x1="11.401914"
+       id="linearGradient901"
+       xlink:href="#linearGradient899" />
+  </defs>
+  <path
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none"
+     id="path3818-0-5"
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z" />
+  <rect
+     style="color:#000000;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-0-1"
+     y="7.5"
+     x="11.5"
+     ry="1.5000002"
+     rx="13.5"
+     height="37"
+     width="25" />
+  <path
+     style="opacity:0.5;color:#000000;fill:none;stroke:#0f7d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-0"
+     d="M 36.5,9 C 36.5,8.169 30.925,7.5 24,7.5 17.075,7.5 11.5,8.169 11.5,9" />
+  <path
+     style="color:#000000;fill:url(#linearGradient5066-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-6-4"
+     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z" />
+  <path
+     style="color:#000000;fill:url(#linearGradient3457-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect3268-3-9"
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875" />
+  <path
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="rect3268-3"
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875" />
+  <path
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="path4752"
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z" />
+  <path
+     id="rect3268"
+     d="M 36.5,8.5 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 1.5"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="path5194"
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z" />
+  <path
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="rect3244"
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z" />
+  <path
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path5124"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z" />
+  <path
+     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     id="rect3268-0-7"
+     d="M 35.969003,9.564443 C 34.420917,8.947168 29.661637,8.5 24,8.5 18.35733,8.5 13.61098,8.944177 12.046663,9.558245" />
+  <rect
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#206b00;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-36"
+     y="7.5"
+     x="11.5"
+     ry="1.5"
+     rx="13.5"
+     height="37"
+     width="25" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-full-charging.svg b/elementary-xfce/status/48/battery-full-charging.svg
deleted file mode 120000
index d53d66a51..000000000
--- a/elementary-xfce/status/48/battery-full-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-full-charging.svg b/elementary-xfce/status/48/battery-full-charging.svg
new file mode 100644
index 000000000..f655e9c94
--- /dev/null
+++ b/elementary-xfce/status/48/battery-full-charging.svg
@@ -0,0 +1,263 @@
+<?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="48"
+   height="48"
+   id="svg2485">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         style="stop-color:#64baff;stop-opacity:1"
+         offset="0"
+         id="stop895" />
+      <stop
+         style="stop-color:#3689e6;stop-opacity:1"
+         offset="1"
+         id="stop897" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.02777778" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.97222221" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       xlink:href="#linearGradient899"
+       id="linearGradient901"
+       x1="11.401914"
+       y1="26"
+       x2="36.5"
+       y2="26"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
+  <rect
+     width="25"
+     height="37"
+     rx="13.5"
+     ry="1.5000002"
+     x="11.5"
+     y="7.5"
+     id="rect3268-0-1"
+     style="color:#000000;fill:url(#linearGradient901);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 36.5,9 C 36.5,8.169 30.925,7.5 24,7.5 17.075,7.5 11.5,8.169 11.5,9"
+     id="rect3268-0"
+     style="opacity:0.5;color:#000000;fill:none;stroke:#0f7d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
+     id="rect3268-6-4"
+     style="color:#000000;fill:url(#linearGradient5066-8);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3-9"
+     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
+     id="path4752"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     transform="matrix(0.92,0,0,1,1.92,0)" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 36.5,8.5 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 1.5"
+     id="rect3268" />
+  <path
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
+     id="path5194"
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
+     id="rect3244"
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     id="path5124"
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,9.564443 C 34.420917,8.947168 29.661637,8.5 24,8.5 18.35733,8.5 13.61098,8.944177 12.046663,9.558245"
+     id="rect3268-0-7"
+     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="25"
+     height="37"
+     rx="13.5"
+     ry="1.5"
+     x="11.5"
+     y="7.5"
+     id="rect3268-36"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="m 24.5,14.999805 c -0.298436,0 -0.566775,0.130572 -0.75,0.337891 L 15.140625,27.490234 C 15.051797,27.639631 15,27.813576 15,28 c 0,0.552285 0.447715,1 1,1 h 8 l -1.416016,6.599804 C 22.530437,35.722323 22.5,35.857934 22.5,36.000195 c 0,0.552285 0.447715,1 1,1 0.298436,0 0.566775,-0.130572 0.75,-0.337891 L 32.859375,24.509766 C 32.948203,24.360369 33,24.186424 33,24 33,23.447715 32.552285,23 32,23 h -8 l 1.416016,-6.599805 c 0.05355,-0.122519 0.08398,-0.25813 0.08398,-0.40039 0,-0.552285 -0.447715,-1 -1,-1 z"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path54-4" />
+  <path
+     id="path54"
+     style="font-variation-settings:normal;opacity:0.95;vector-effect:none;fill:#0d52bf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 24.5,13.999805 c -0.298436,0 -0.566775,0.130572 -0.75,0.337891 L 15.140625,26.490234 C 15.051797,26.639631 15,26.813576 15,27 c 0,0.552285 0.447715,1 1,1 h 8 l -1.416016,6.599804 C 22.530437,34.722323 22.5,34.857934 22.5,35.000195 c 0,0.552285 0.447715,1 1,1 0.298436,0 0.566775,-0.130572 0.75,-0.337891 L 32.859375,23.509766 C 32.948203,23.360369 33,23.186424 33,23 33,22.447715 32.552285,22 32,22 h -8 l 1.416016,-6.599805 c 0.05355,-0.122518 0.08398,-0.25813 0.08398,-0.40039 0,-0.552285 -0.447715,-1 -1,-1 z" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-full.svg b/elementary-xfce/status/48/battery-full.svg
deleted file mode 120000
index 51e311fbd..000000000
--- a/elementary-xfce/status/48/battery-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-full.svg b/elementary-xfce/status/48/battery-full.svg
new file mode 100644
index 000000000..2b093e116
--- /dev/null
+++ b/elementary-xfce/status/48/battery-full.svg
@@ -0,0 +1,255 @@
+<?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="48"
+   height="48"
+   id="svg2485">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         style="stop-color:#64baff;stop-opacity:1"
+         offset="0"
+         id="stop895" />
+      <stop
+         style="stop-color:#3689e6;stop-opacity:1"
+         offset="1"
+         id="stop897" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.02777778" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.97222221" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       xlink:href="#linearGradient899"
+       id="linearGradient901"
+       x1="11.401914"
+       y1="26"
+       x2="36.5"
+       y2="26"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
+  <rect
+     width="25"
+     height="37"
+     rx="13.5"
+     ry="1.5000002"
+     x="11.5"
+     y="7.5"
+     id="rect3268-0-1"
+     style="color:#000000;fill:url(#linearGradient901);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 36.5,9 C 36.5,8.169 30.925,7.5 24,7.5 17.075,7.5 11.5,8.169 11.5,9"
+     id="rect3268-0"
+     style="opacity:0.5;color:#000000;fill:none;stroke:#0f7d00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;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 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
+     id="rect3268-6-4"
+     style="color:#000000;fill:url(#linearGradient5066-8);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3-9"
+     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
+     id="path4752"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
+     transform="matrix(0.92,0,0,1,1.92,0)" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 36.5,8.5 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 1.5"
+     id="rect3268" />
+  <path
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
+     id="path5194"
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
+     id="rect3244"
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     id="path5124"
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,9.564443 C 34.420917,8.947168 29.661637,8.5 24,8.5 18.35733,8.5 13.61098,8.944177 12.046663,9.558245"
+     id="rect3268-0-7"
+     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="25"
+     height="37"
+     rx="13.5"
+     ry="1.5"
+     x="11.5"
+     y="7.5"
+     id="rect3268-36"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-good-charging.svg b/elementary-xfce/status/48/battery-good-charging.svg
deleted file mode 120000
index 83926f7cf..000000000
--- a/elementary-xfce/status/48/battery-good-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-080-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-good-charging.svg b/elementary-xfce/status/48/battery-good-charging.svg
new file mode 100644
index 000000000..56e0e1804
--- /dev/null
+++ b/elementary-xfce/status/48/battery-good-charging.svg
@@ -0,0 +1,314 @@
+<?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="48"
+   height="48"
+   id="svg2485">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.02777778" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.97222221" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="translate(-48)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient915" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="26"
+       x2="36.5"
+       y1="26"
+       x1="11.401914"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="matrix(1,0,0,0.7027027,10e-7,13.22973)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#64baff;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient915">
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="0"
+         id="stop905" />
+      <stop
+         id="stop907"
+         offset="0.08017239"
+         style="stop-color:#002e99;stop-opacity:1" />
+      <stop
+         id="stop909"
+         offset="0.48701805"
+         style="stop-color:#002e99;stop-opacity:0" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:1"
+         offset="0.82605612"
+         id="stop911" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="1"
+         id="stop913" />
+    </linearGradient>
+  </defs>
+  <path
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
+  <rect
+     width="25"
+     height="39"
+     rx="13.5"
+     ry="1.5"
+     x="-36.5"
+     y="5.5"
+     id="rect3268-4"
+     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
+     id="rect3268-0-1-3"
+     y="18.5"
+     x="11.5"
+     ry="1.5000002"
+     rx="13.5"
+     height="26"
+     width="25" />
+  <path
+     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
+     id="rect3268-6-4"
+     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
+     id="rect3268-6"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3-9"
+     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     id="path4752"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
+     id="path5194"
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
+     id="rect3244"
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     id="path5124"
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,20.564 C 34.420917,19.946725 29.661637,19.499557 24,19.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
+     id="rect3268-0-7"
+     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     id="rect3268-5"
+     d="M 36.5,9 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 2"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 11.5 9 L 11.5 20 L 11.5 9 z M 36.5 9 L 36.5 20 L 36.5 9 z "
+     style="fill:none;stroke:#002e99;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.3"
+     id="path891" />
+  <path
+     d="m 24.5,14.999805 c -0.298436,0 -0.566775,0.130572 -0.75,0.337891 L 15.140625,27.490234 C 15.051797,27.639631 15,27.813576 15,28 c 0,0.552285 0.447715,1 1,1 h 8 l -1.416016,6.599804 C 22.530437,35.722323 22.5,35.857934 22.5,36.000195 c 0,0.552285 0.447715,1 1,1 0.298436,0 0.566775,-0.130572 0.75,-0.337891 L 32.859375,24.509766 C 32.948203,24.360369 33,24.186424 33,24 33,23.447715 32.552285,23 32,23 h -8 l 1.416016,-6.599805 c 0.05355,-0.122519 0.08398,-0.25813 0.08398,-0.40039 0,-0.552285 -0.447715,-1 -1,-1 z"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     id="path54-4" />
+  <path
+     id="path54-3"
+     style="font-variation-settings:normal;opacity:0.95;vector-effect:none;fill:#0d52bf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 24 18.5 C 22.871028 18.5 21.798669 18.523276 20.759766 18.556641 L 15.140625 26.490234 C 15.051797 26.639631 15 26.813576 15 27 C 15 27.552285 15.447715 28 16 28 L 24 28 L 22.583984 34.599609 C 22.530437 34.722128 22.5 34.857739 22.5 35 C 22.5 35.552285 22.947715 36 23.5 36 C 23.798436 36 24.066775 35.869428 24.25 35.662109 L 32.859375 23.509766 C 32.948203 23.360369 33 23.186424 33 23 C 33 22.447715 32.552285 22 32 22 L 24 22 L 24.748047 18.509766 C 24.495554 18.507957 24.256409 18.5 24 18.5 z " />
+  <path
+     id="path54"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 24.5 14 C 24.201564 14 23.933225 14.130572 23.75 14.337891 L 20.761719 18.556641 C 21.800036 18.523313 22.871708 18.5 24 18.5 C 24.256409 18.5 24.495554 18.507957 24.748047 18.509766 L 25.416016 15.400391 C 25.469566 15.277873 25.5 15.14226 25.5 15 C 25.5 14.447715 25.052285 14 24.5 14 z " />
+  <rect
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-36"
+     y="18.5"
+     x="11.5"
+     ry="1.5"
+     rx="13.5"
+     height="26"
+     width="25" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-good.svg b/elementary-xfce/status/48/battery-good.svg
deleted file mode 120000
index 353e367fb..000000000
--- a/elementary-xfce/status/48/battery-good.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-good.svg b/elementary-xfce/status/48/battery-good.svg
new file mode 100644
index 000000000..bdf760022
--- /dev/null
+++ b/elementary-xfce/status/48/battery-good.svg
@@ -0,0 +1,371 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="battery-good.svg"
+   version="1.0"
+   width="48"
+   height="48"
+   id="svg2485">
+  <sodipodi:namedview
+     inkscape:current-layer="svg2485"
+     inkscape:window-maximized="1"
+     inkscape:window-y="30"
+     inkscape:window-x="0"
+     inkscape:cy="24.260951"
+     inkscape:cx="24.237121"
+     inkscape:zoom="21"
+     showgrid="false"
+     id="namedview55"
+     inkscape:window-height="1373"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <metadata
+     id="metadata71">
+    <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="defs2487">
+    <linearGradient
+       id="linearGradient915">
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="0"
+         id="stop905" />
+      <stop
+         id="stop907"
+         offset="0.08017239"
+         style="stop-color:#002e99;stop-opacity:1" />
+      <stop
+         id="stop909"
+         offset="0.48701805"
+         style="stop-color:#002e99;stop-opacity:0" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:1"
+         offset="0.82605612"
+         id="stop911" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="1"
+         id="stop913" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.02777778" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.97222221" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="translate(-48)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient915" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="26"
+       x2="36.5"
+       y1="26"
+       x1="11.401914"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="matrix(1,0,0,0.7027027,10e-7,13.22973)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#64baff;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="24.935535"
+       y1="25"
+       x1="-0.069760188"
+       gradientTransform="translate(-25,-11)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941-3"
+       xlink:href="#linearGradient929" />
+    <linearGradient
+       id="linearGradient929">
+      <stop
+         id="stop918"
+         offset="0"
+         style="stop-color:#7a0000;stop-opacity:0" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:1"
+         offset="0.08017239"
+         id="stop921" />
+      <stop
+         style="stop-color:#7a0000;stop-opacity:0"
+         offset="0.48701805"
+         id="stop923" />
+      <stop
+         id="stop925"
+         offset="0.82605612"
+         style="stop-color:#7a0000;stop-opacity:1" />
+      <stop
+         id="stop927"
+         offset="1"
+         style="stop-color:#7a0000;stop-opacity:0" />
+    </linearGradient>
+  </defs>
+  <path
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
+  <rect
+     width="25"
+     height="39"
+     rx="13.5"
+     ry="1.5"
+     x="-36.5"
+     y="5.5"
+     id="rect3268-4"
+     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <rect
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
+     id="rect3268-0-1-3"
+     y="18.5"
+     x="11.5"
+     ry="1.5000002"
+     rx="13.5"
+     height="26"
+     width="25" />
+  <rect
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect3268-36"
+     y="18.5"
+     x="11.5"
+     ry="1.5"
+     rx="13.5"
+     height="26"
+     width="25" />
+  <path
+     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
+     id="rect3268-6-4"
+     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
+     id="rect3268-6"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3-9"
+     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     id="path4752"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
+     id="path5194"
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
+     id="rect3244"
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     id="path5124"
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);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 35.969003,20.564 C 34.420917,19.946725 29.661637,19.499557 24,19.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
+     id="rect3268-0-7"
+     style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="csssc"
+     id="rect3268-5"
+     d="M 36.5,9 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 2"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="cccc"
+     d="M 36.5,20 V 9 m -25,0 v 11"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#0d52bf;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="path882" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-low-charging.svg b/elementary-xfce/status/48/battery-low-charging.svg
deleted file mode 120000
index 5c0e49378..000000000
--- a/elementary-xfce/status/48/battery-low-charging.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-040-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-low-charging.svg b/elementary-xfce/status/48/battery-low-charging.svg
new file mode 100644
index 000000000..526baf2ac
--- /dev/null
+++ b/elementary-xfce/status/48/battery-low-charging.svg
@@ -0,0 +1,304 @@
+<?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="48"
+   height="48"
+   id="svg2485">
+  <metadata
+     id="metadata71">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.02777778" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.97222221" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="translate(-48)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient915" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="26"
+       x2="36.5"
+       y1="26"
+       x1="11.401914"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="matrix(1,0,0,0.7027027,1e-6,13.22973)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#64baff;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient915">
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="0"
+         id="stop905" />
+      <stop
+         id="stop907"
+         offset="0.08017239"
+         style="stop-color:#002e99;stop-opacity:1" />
+      <stop
+         id="stop909"
+         offset="0.48701805"
+         style="stop-color:#002e99;stop-opacity:0" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:1"
+         offset="0.82605612"
+         id="stop911" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="1"
+         id="stop913" />
+    </linearGradient>
+  </defs>
+  <path
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
+  <rect
+     width="25"
+     height="39"
+     rx="13.5"
+     ry="1.5"
+     x="-36.5"
+     y="5.5"
+     id="rect3268-4"
+     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
+     d="M 11.5,25.5 V 43 c 0,0.831 5.575,1.5 12.5,1.5 6.925,0 12.5,-0.669 12.5,-1.5 V 25.5 Z"
+     id="rect3268-0-1-3" />
+  <path
+     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
+     id="rect3268-6-4"
+     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
+     id="rect3268-6"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3-9"
+     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     id="path4752"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
+     id="rect3244"
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     id="path5124"
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     id="rect3268-5"
+     d="M 36.5,9 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 2"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 35.999999,26.499999 H 12"
+     id="rect3268-0-7"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 11.5 9 L 11.5 25 L 11.5 9 z M 36.5 9 L 36.5 25 L 36.5 9 z "
+     style="fill:none;stroke:#0d52bf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.3"
+     id="path902" />
+  <path
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
+     id="path5194"
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     id="path54-4"
+     style="font-variation-settings:normal;opacity:0.4;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="m 24.5,14.999805 c -0.298436,0 -0.566775,0.130572 -0.75,0.337891 L 15.140625,27.490234 C 15.051797,27.639631 15,27.813576 15,28 c 0,0.552285 0.447715,1 1,1 h 8 l -1.416016,6.599804 C 22.530437,35.722323 22.5,35.857934 22.5,36.000195 c 0,0.552285 0.447715,1 1,1 0.298436,0 0.566775,-0.130572 0.75,-0.337891 L 32.859375,24.509766 C 32.948203,24.360369 33,24.186424 33,24 33,23.447715 32.552285,23 32,23 h -8 l 1.416016,-6.599805 c 0.05355,-0.122519 0.08398,-0.25813 0.08398,-0.40039 0,-0.552285 -0.447715,-1 -1,-1 z" />
+  <path
+     id="path54"
+     style="font-variation-settings:normal;opacity:0.95;vector-effect:none;fill:#0d52bf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 15.841797 25.5 L 15.140625 26.490234 C 15.051797 26.639631 15 26.813576 15 27 C 15 27.552285 15.447715 28 16 28 L 24 28 L 22.583984 34.599609 C 22.530437 34.722128 22.5 34.857739 22.5 35 C 22.5 35.552285 22.947715 36 23.5 36 C 23.798436 36 24.066775 35.869428 24.25 35.662109 L 31.449219 25.5 L 15.841797 25.5 z " />
+  <path
+     id="path54-49"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#7f7f7f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;stop-color:#000000;stop-opacity:1"
+     d="M 24.5 14 C 24.201564 14 23.933225 14.130572 23.75 14.337891 L 15.841797 25.5 L 31.449219 25.5 L 32.859375 23.509766 C 32.948203 23.360369 33 23.186424 33 23 C 33 22.447715 32.552285 22 32 22 L 24 22 L 25.416016 15.400391 C 25.469566 15.277873 25.5 15.14226 25.5 15 C 25.5 14.447715 25.052285 14 24.5 14 z " />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 11.5,25.5 V 43 c 0,0.831 5.575,1.5 12.5,1.5 6.925,0 12.5,-0.669 12.5,-1.5 V 25.5 Z"
+     id="rect3268-36" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-low.svg b/elementary-xfce/status/48/battery-low.svg
deleted file mode 120000
index 66c1d449d..000000000
--- a/elementary-xfce/status/48/battery-low.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-040.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery-low.svg b/elementary-xfce/status/48/battery-low.svg
new file mode 100644
index 000000000..03f2e712e
--- /dev/null
+++ b/elementary-xfce/status/48/battery-low.svg
@@ -0,0 +1,337 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="battery-low.svg"
+   version="1.0"
+   width="48"
+   height="48"
+   id="svg2485">
+  <sodipodi:namedview
+     inkscape:current-layer="svg2485"
+     inkscape:window-maximized="1"
+     inkscape:window-y="30"
+     inkscape:window-x="0"
+     inkscape:cy="24"
+     inkscape:cx="24"
+     inkscape:zoom="21"
+     showgrid="false"
+     id="namedview55"
+     inkscape:window-height="1373"
+     inkscape:window-width="2560"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <metadata
+     id="metadata71">
+    <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="defs2487">
+    <linearGradient
+       id="linearGradient5126">
+      <stop
+         id="stop5128"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5130"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5118">
+      <stop
+         id="stop5120"
+         style="stop-color:#9d9d9d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5122"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4762">
+      <stop
+         id="stop4764"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4766"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.02777778" />
+      <stop
+         id="stop4768"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.97222221" />
+      <stop
+         id="stop4770"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3254-3-182-8-5">
+      <stop
+         id="stop4663-8-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4665-7-6"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="30"
+       y1="7"
+       x2="30"
+       y2="43"
+       id="linearGradient4760"
+       xlink:href="#linearGradient4762"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-20.446733"
+       y1="-93.091553"
+       x2="-48.479328"
+       y2="-93.091553"
+       id="linearGradient3457-7-6"
+       xlink:href="#linearGradient2793-2-0-669-94-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1783638,0,0,0.1558618,28.646957,19.509417)"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient2793-2-0-669-94-2">
+      <stop
+         id="stop4681-3-1"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4683-67-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-17.12093"
+       y1="-93.091553"
+       x2="-45.761551"
+       y2="-93.091553"
+       id="linearGradient5066-8"
+       xlink:href="#linearGradient5118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61425314,0,0,0.1558618,40.07214,19.732487)"
+       spreadMethod="reflect" />
+    <radialGradient
+       cx="16.5"
+       cy="7.5"
+       r="3.5"
+       fx="16.5"
+       fy="7.5"
+       id="radialGradient5132"
+       xlink:href="#linearGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.42857143,0,4.2857143)" />
+    <linearGradient
+       id="linearGradient3820-7-2-1-2-6">
+      <stop
+         id="stop3822-2-6-3-3-7"
+         style="stop-color:#3d3d3d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3864-8-7-7-9-1"
+         style="stop-color:#686868;stop-opacity:0.49803922"
+         offset="0.5" />
+      <stop
+         id="stop3824-1-2-5-0-3"
+         style="stop-color:#686868;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient5362"
+       xlink:href="#linearGradient3820-7-2-1-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,0,0,0.07169133,-1.275361,29.153187)" />
+    <linearGradient
+       x1="13.681819"
+       y1="17.458462"
+       x2="17.77273"
+       y2="35.717499"
+       id="linearGradient5508"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       x1="25.272734"
+       y1="17.458462"
+       x2="27.31819"
+       y2="35.717499"
+       id="linearGradient5510"
+       xlink:href="#linearGradient3254-3-182-8-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4666658,0,0,2.0811612,-6.0666553,-30.333874)" />
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="translate(-48)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941"
+       xlink:href="#linearGradient915" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="26"
+       x2="36.5"
+       y1="26"
+       x1="11.401914"
+       id="linearGradient901"
+       xlink:href="#linearGradient899"
+       gradientTransform="matrix(1,0,0,0.7027027,1e-6,13.22973)" />
+    <linearGradient
+       id="linearGradient899">
+      <stop
+         id="stop895"
+         offset="0"
+         style="stop-color:#64baff;stop-opacity:1" />
+      <stop
+         id="stop897"
+         offset="1"
+         style="stop-color:#3689e6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="25"
+       x2="36.608757"
+       y1="25"
+       x1="12.029413"
+       gradientTransform="translate(-36.5,-5.5)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3941-3"
+       xlink:href="#linearGradient915" />
+    <linearGradient
+       id="linearGradient915">
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="0"
+         id="stop905" />
+      <stop
+         id="stop907"
+         offset="0.08017239"
+         style="stop-color:#002e99;stop-opacity:1" />
+      <stop
+         id="stop909"
+         offset="0.48701805"
+         style="stop-color:#002e99;stop-opacity:0" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:1"
+         offset="0.82605612"
+         id="stop911" />
+      <stop
+         style="stop-color:#002e99;stop-opacity:0"
+         offset="1"
+         id="stop913" />
+    </linearGradient>
+  </defs>
+  <path
+     d="M 40,42.5 A 16,4.5 0 0 1 7.9999998,42.5 16,4.5 0 1 1 40,42.5 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient5362);fill-opacity:1;stroke:none" />
+  <rect
+     width="25"
+     height="39"
+     rx="13.5"
+     ry="1.5"
+     x="-36.5"
+     y="5.5"
+     id="rect3268-4"
+     style="opacity:0.1;color:#000000;fill:url(#linearGradient3941);fill-opacity:1.0;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="scale(-1,1)" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient901);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
+     d="M 11.5,25.5 V 43 c 0,0.831 5.575,1.5 12.5,1.5 6.925,0 12.5,-0.669 12.5,-1.5 V 25.5 Z"
+     id="rect3268-0-1-3" />
+  <path
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0d52bf;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     d="M 11.5,25.5 V 43 c 0,0.831 5.575,1.5 12.5,1.5 6.925,0 12.5,-0.669 12.5,-1.5 V 25.5 Z"
+     id="rect3268-36" />
+  <path
+     d="M 24,5.5 C 17.075,5.5 11.5,6.169 11.5,7 l 0,2 c 0,-0.831 5.575,-1.5 12.5,-1.5 6.925,0 12.5,0.669 12.5,1.5 l 0,-2 C 36.5,6.169 30.925,5.5 24,5.5 z"
+     id="rect3268-6-4"
+     style="color:#000000;fill:url(#linearGradient5066-8);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 11.5,9 C 11.5,8.169 17.075,7.5 24,7.5 30.925,7.5 36.5,8.169 36.5,9"
+     id="rect3268-6"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3-9"
+     style="color:#000000;fill:url(#linearGradient3457-7-6);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 27.5,5.5625 0,-1.21875 C 27.5,3.8749017 25.939,3.5 24,3.5 c -1.939,0 -3.5,0.3749017 -3.5,0.84375 l 0,1.21875"
+     id="rect3268-3"
+     style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="m 24,6.5 c -3.709888,0 -7.052717,0.1725241 -9.4375,0.4375 -1.192392,0.132488 -2.155165,0.2807189 -2.75,0.4375 -0.16358,0.043115 -0.213184,0.056865 -0.3125,0.09375 l 0,35.0625 c 0.09932,0.03688 0.14892,0.05063 0.3125,0.09375 0.594835,0.156781 1.557608,0.305012 2.75,0.4375 C 16.947283,43.327476 20.290112,43.5 24,43.5 c 3.709888,0 7.052717,-0.172524 9.4375,-0.4375 1.192392,-0.132488 2.155165,-0.280719 2.75,-0.4375 0.16358,-0.04312 0.213184,-0.05687 0.3125,-0.09375 l 0,-35.0625 C 36.400684,7.4318648 36.35108,7.4181148 36.1875,7.375 35.592665,7.2182189 34.629892,7.069988 33.4375,6.9375 31.052717,6.6725241 27.709888,6.5 24,6.5 z"
+     transform="matrix(0.92,0,0,1,1.92,0)"
+     id="path4752"
+     style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient4760);stroke-width:1.04257202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 20,5.59375 C 16.787316,5.7149057 15.492733,5.9541603 14,6.3125 l 0,37.375 c 1.492733,0.35834 2.787316,0.597594 6,0.71875 z"
+     id="path5194"
+     style="opacity:0.3;fill:url(#linearGradient5508);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 31,5.875 0,38.25 c 1.136673,-0.123654 2.304289,-0.27049 3,-0.4375 L 34,6.3125 C 33.304289,6.1454904 32.136673,5.9986542 31,5.875 z"
+     id="rect3244"
+     style="opacity:0.1;fill:url(#linearGradient5510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+  <path
+     d="m 20,7.5 a 3.5,1.5 0 1 1 -7,0 3.5,1.5 0 1 1 7,0 z"
+     transform="matrix(0.90865815,0,0,2.0656555,1.5071413,-8.7383745)"
+     id="path5124"
+     style="opacity:0.2;color:#000000;fill:url(#radialGradient5132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     sodipodi:nodetypes="csssc"
+     id="rect3268-5"
+     d="M 36.5,9 V 7 C 36.5,6.169 30.925,5.5 24,5.5 17.075,5.5 11.5,6.169 11.5,7 v 2"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 35.999999,26.499999 H 12"
+     id="rect3268-0-7"
+     style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.2;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     d="M 11.5 9 L 11.5 25 L 11.5 9 z M 36.5 9 L 36.5 25 L 36.5 9 z "
+     style="fill:none;stroke:#0d52bf;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.3"
+     id="path880" />
+</svg>
diff --git a/elementary-xfce/status/48/battery-missing.svg b/elementary-xfce/status/48/battery-missing.svg
index 23ad8a82d..9b8c436e9 100644
--- a/elementary-xfce/status/48/battery-missing.svg
+++ b/elementary-xfce/status/48/battery-missing.svg
@@ -179,25 +179,6 @@
          style="stop-color:#000000;stop-opacity:0"
          offset="1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3846-7">
-      <stop
-         id="stop3848-7"
-         style="stop-color:#fff3cb;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3850-5"
-         style="stop-color:#fdde76;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3852-9"
-         style="stop-color:#f9c440;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3854-2"
-         style="stop-color:#e48b20;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
     <linearGradient
        id="linearGradient3117-8">
       <stop
@@ -217,54 +198,6 @@
          style="stop-color:#ffffff;stop-opacity:0.39215687"
          offset="1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3856-1-6">
-      <stop
-         id="stop3858-0-6"
-         style="stop-color:#634215;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3860-2-8"
-         style="stop-color:#93700d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="62.625"
-       cy="4.625"
-       r="10.625"
-       fx="62.625"
-       fy="4.625"
-       id="radialGradient3289"
-       xlink:href="#linearGradient8838"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1294118,0,0,0.12941156,-58.729414,22.026471)" />
-    <linearGradient
-       x1="24"
-       y1="-14.603537"
-       x2="24"
-       y2="54.669891"
-       id="linearGradient3291"
-       xlink:href="#linearGradient3846-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.48890916,0,0,0.48839827,0.26618161,0.74232159)" />
-    <linearGradient
-       x1="29.126724"
-       y1="19.787613"
-       x2="29.291178"
-       y2="57.567127"
-       id="linearGradient3293"
-       xlink:href="#linearGradient3117-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.49373581,0,-0.00214922,0.51518426,-2.3383831,-7.425973)" />
-    <linearGradient
-       x1="44.424442"
-       y1="60.535198"
-       x2="44.424442"
-       y2="-5.496769"
-       id="linearGradient3295"
-       xlink:href="#linearGradient3856-1-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3750017,0,0,0.3750017,-4.9788628,1.3752029)" />
     <linearGradient
        x1="-19.598513"
        y1="161.18126"
@@ -306,6 +239,45 @@
        gradientUnits="userSpaceOnUse"
        id="linearGradient3975"
        xlink:href="#linearGradient3821" />
+    <linearGradient
+       gradientTransform="matrix(0.49373581,0,-0.00214922,0.51518426,21.661617,16.574027)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3117-8"
+       id="linearGradient3091"
+       y2="57.567127"
+       x2="29.291178"
+       y1="19.787613"
+       x1="29.126724" />
+    <linearGradient
+       gradientTransform="matrix(0.48890916,0,0,0.48839827,24.266182,24.742322)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4171"
+       id="linearGradient3094"
+       y2="44.532082"
+       x2="24"
+       y1="2.0112092"
+       x1="24" />
+    <linearGradient
+       id="linearGradient4171">
+      <stop
+         id="stop4173"
+         offset="0"
+         style="stop-color:#ffe16b;stop-opacity:1" />
+      <stop
+         id="stop4175"
+         offset="1"
+         style="stop-color:#f9c440;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       cx="62.625"
+       cy="4.625"
+       r="10.625"
+       fx="62.625"
+       fy="4.625"
+       id="radialGradient2415"
+       xlink:href="#linearGradient8838"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1294118,0,0,0.12941156,-34.729414,46.026471)" />
   </defs>
   <rect
      width="25"
@@ -372,32 +344,28 @@
      d="M 35.969003,41.564 C 34.420917,40.946725 29.661637,40.499557 24,40.499557 c -5.64267,0 -10.38902,0.444177 -11.953337,1.058245"
      id="rect3268-0-7"
      style="opacity:0.2;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:7;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible;enable-background:accumulate" />
-  <g
-     transform="translate(24,24)"
-     id="g3156">
-    <path
-       d="M 24,22.625 C 24,23.384391 18.627417,24 12,24 5.3725828,24 -2.5e-7,23.384391 -2.5e-7,22.625 -2.5e-7,21.865609 5.3725828,21.25 12,21.25 c 6.627417,0 12,0.615609 12,1.375 l 0,0 z"
-       id="path8836"
-       style="opacity:0.3;fill:url(#radialGradient3289);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible" />
-    <path
-       d="M 22.843441,20.277765 13.294944,2.2776819 C 13.020489,1.7776818 12.523879,1.4999018 11.970799,1.4999018 c -0.553075,0 -1.052235,0.33333 -1.330855,0.8333351 L 1.1625466,20.333325 c -0.22308499,0.444445 -0.22563499,1.05556 0.04905,1.500005 0.27468,0.44445 0.716215,0.66667 1.269296,0.66667 l 19.0258884,0 c 0.55308,0 1.052005,-0.27778 1.275095,-0.722225 0.278385,-0.444445 0.280705,-1.000005 0.06156,-1.50001 z"
-       id="path11155-5"
-       style="fill:url(#linearGradient3291);fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="M 21.554469,19.506436 13.009293,3.9158521 c -0.363933,-0.6933859 -0.494462,-1.415852 -1.047538,-1.415852 -0.475681,0 -0.724576,0.8239925 -1.068333,1.4784949 l -8.4503241,15.57762 c -0.490695,0.902951 -0.543267,1.138323 -0.307081,1.535746 0.236181,0.397428 0.539433,0.375782 1.659914,0.401703 l 16.6086101,0 c 1.043148,0.01297 1.278124,-0.06692 1.470057,-0.464346 0.2395,-0.397427 0.137629,-0.712731 -0.320129,-1.522782 z"
-       id="path11159-4"
-       style="opacity:0.6;fill:none;stroke:url(#linearGradient3293);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 10.812132,8.5616499 c 0.28149,2.7496611 0.603925,5.4804011 0.84355,8.2408311 0.241015,0 0.523695,0 0.76471,0 0.19876,-2.65089 0.519345,-5.285765 0.75061,-7.9333661 0.117885,-0.62692 -0.203995,-1.37126 -0.866,-1.523575 -0.654165,-0.1912546 -1.38503,0.282355 -1.472015,0.95888 -0.0144,0.08493 -0.02085,0.171115 -0.02085,0.25723 l -5e-6,0 z m -0.08343,11.1793511 c -0.02975,0.81847 0.870815,1.46007 1.63974,1.20058 0.744755,-0.19007 1.13703,-1.12614 0.75534,-1.791525 -0.341675,-0.687825 -1.343625,-0.914445 -1.920005,-0.38803 -0.291345,0.23936 -0.484455,0.596695 -0.475075,0.978975 l 0,0 z"
-       id="text2315-7-2"
-       style="font-size:62.4582634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Georgia" />
-    <path
-       d="m 10.812132,7.5616475 c 0.28149,2.7496605 0.603925,5.4804005 0.84355,8.2408305 0.241015,0 0.523695,0 0.76471,0 0.19876,-2.65089 0.519345,-5.28576 0.75061,-7.9333655 0.117885,-0.6269146 -0.203995,-1.3712596 -0.866,-1.5235746 -0.654165,-0.191255 -1.38503,0.28236 -1.472015,0.9588796 -0.0144,0.08493 -0.02085,0.171115 -0.02085,0.25723 l -5e-6,0 z m -0.08343,11.1793505 c -0.02975,0.81847 0.870815,1.46007 1.63974,1.200585 0.744755,-0.190075 1.13703,-1.126145 0.75534,-1.79153 -0.341675,-0.68782 -1.343625,-0.914445 -1.920005,-0.38803 -0.291345,0.239365 -0.484455,0.596695 -0.475075,0.978975 l 0,0 z"
-       id="path3295-1-9"
-       style="font-size:62.4582634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient3295);fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Georgia" />
-    <path
-       d="M 22.843441,20.277775 13.294944,2.2777769 C 13.020489,1.7777792 12.523879,1.5000004 11.970799,1.5000004 c -0.553075,0 -1.052235,0.3333285 -1.330855,0.8333312 L 1.1625466,20.333335 C 0.93946161,20.777778 0.93691161,21.38889 1.2115966,21.833333 1.4862766,22.277781 1.9278116,22.5 2.4808916,22.5 l 19.0258894,0 c 0.55308,0 1.052005,-0.277779 1.275095,-0.722222 0.278385,-0.444443 0.280705,-1 0.06156,-1.500003 z"
-       id="path11155-8"
-       style="opacity:0.4;fill:none;stroke:#311d00;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
+  <path
+     d="M 48,46.625 C 48,47.384391 42.627417,48 36,48 29.372583,48 24,47.384391 24,46.625 c 0,-0.759391 5.372583,-1.375 12,-1.375 6.627417,0 12,0.615609 12,1.375 z"
+     id="path8836"
+     style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:url(#radialGradient2415);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none" />
+  <path
+     d="M 46.843441,44.277765 37.294944,26.277682 c -0.274455,-0.5 -0.771065,-0.77778 -1.324145,-0.77778 -0.553075,0 -1.052235,0.33333 -1.330855,0.833335 l -9.477397,18.000088 c -0.223085,0.444445 -0.225635,1.05556 0.04905,1.500005 0.27468,0.44445 0.716215,0.66667 1.269296,0.66667 l 19.025888,0 c 0.55308,0 1.052005,-0.27778 1.275095,-0.722225 0.278385,-0.444445 0.280705,-1.000005 0.06156,-1.50001 z"
+     id="path11155-5"
+     style="fill:url(#linearGradient3094);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="M 45.554469,43.506436 37.009293,27.915852 C 36.64536,27.222466 36.514831,26.5 35.961755,26.5 c -0.475681,0 -0.724576,0.823993 -1.068333,1.478495 l -8.450324,15.57762 c -0.490695,0.902951 -0.543267,1.138323 -0.307081,1.535746 0.236181,0.397428 0.539433,0.375782 1.659914,0.401703 l 16.60861,0 c 1.043148,0.01297 1.278124,-0.06692 1.470057,-0.464346 0.2395,-0.397427 0.137629,-0.712731 -0.320129,-1.522782 z"
+     id="path11159-4"
+     style="opacity:0.6;fill:none;stroke:url(#linearGradient3091);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="M 46.843441,44.277775 37.294944,26.277777 C 37.020489,25.777779 36.523879,25.5 35.970799,25.5 c -0.553075,0 -1.052235,0.333329 -1.330855,0.833332 l -9.477397,18.000003 c -0.223085,0.444443 -0.225635,1.055555 0.04905,1.499998 C 25.486277,46.277781 25.927812,46.5 26.480892,46.5 l 19.025889,0 c 0.55308,0 1.052005,-0.277779 1.275095,-0.722222 0.278385,-0.444443 0.280705,-1 0.06156,-1.500003 z"
+     id="path11155-8"
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ad5f00;stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="path4159-3-3"
+     d="m 36,33 c -0.717969,0 -1.3,0.596955 -1.3,1.333333 0,1.333334 0.433332,3.111111 0.866667,6.666667 l 0.866665,0 C 36.866667,37.444444 37.3,35.666667 37.3,34.333333 37.3,33.596955 36.717969,33 36,33 Z m 0,9.333333 c -0.717969,0 -1.3,0.596955 -1.3,1.333334 C 34.7,44.403045 35.282031,45 36,45 c 0.717969,0 1.3,-0.596955 1.3,-1.333333 0,-0.736379 -0.582031,-1.333334 -1.3,-1.333334 z"
+     style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922" />
+  <path
+     id="path4159-3"
+     d="m 36,32 c -0.717969,0 -1.3,0.596955 -1.3,1.333333 0,1.333334 0.433332,3.111111 0.866667,6.666667 l 0.866665,0 C 36.866667,36.444444 37.3,34.666667 37.3,33.333333 37.3,32.596955 36.717969,32 36,32 Z m 0,9.333333 c -0.717969,0 -1.3,0.596955 -1.3,1.333334 C 34.7,43.403045 35.282031,44 36,44 c 0.717969,0 1.3,-0.596955 1.3,-1.333333 0,-0.736379 -0.582031,-1.333334 -1.3,-1.333334 z"
+     style="opacity:1;fill:#7a0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.49803922" />
 </svg>
diff --git a/elementary-xfce/status/48/battery_charged.svg b/elementary-xfce/status/48/battery_charged.svg
deleted file mode 120000
index d53d66a51..000000000
--- a/elementary-xfce/status/48/battery_charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100-charging.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery_empty.svg b/elementary-xfce/status/48/battery_empty.svg
deleted file mode 120000
index 1bf261b38..000000000
--- a/elementary-xfce/status/48/battery_empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-000.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery_full.svg b/elementary-xfce/status/48/battery_full.svg
deleted file mode 120000
index 51e311fbd..000000000
--- a/elementary-xfce/status/48/battery_full.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-100.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery_third_fourth.svg b/elementary-xfce/status/48/battery_third_fourth.svg
deleted file mode 120000
index 353e367fb..000000000
--- a/elementary-xfce/status/48/battery_third_fourth.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-080.svg
\ No newline at end of file
diff --git a/elementary-xfce/status/48/battery_two_thirds.svg b/elementary-xfce/status/48/battery_two_thirds.svg
deleted file mode 120000
index 2d5a50bad..000000000
--- a/elementary-xfce/status/48/battery_two_thirds.svg
+++ /dev/null
@@ -1 +0,0 @@
-battery-060.svg
\ No newline at end of file