[Xfce4-commits] [xfce/xfce4-power-manager] 10/63: Use symbolic icons for the panel-plugin

noreply at xfce.org noreply at xfce.org
Sun Mar 22 13:02:05 CET 2015


This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 2174e5b77a946006565b7193a31b80c2e4cf86ad
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Mar 5 21:19:59 2015 +0100

    Use symbolic icons for the panel-plugin
---
 configure.ac.in                                    |    3 -
 data/icons/16x16/Makefile.am                       |   21 ---
 data/icons/16x16/xfpm-ac-adapter.png               |  Bin 606 -> 0 bytes
 data/icons/16x16/xfpm-primary-000-charging.png     |  Bin 857 -> 0 bytes
 data/icons/16x16/xfpm-primary-000.png              |  Bin 728 -> 0 bytes
 data/icons/16x16/xfpm-primary-020-charging.png     |  Bin 940 -> 0 bytes
 data/icons/16x16/xfpm-primary-020.png              |  Bin 496 -> 0 bytes
 data/icons/16x16/xfpm-primary-040-charging.png     |  Bin 905 -> 0 bytes
 data/icons/16x16/xfpm-primary-040.png              |  Bin 456 -> 0 bytes
 data/icons/16x16/xfpm-primary-060-charging.png     |  Bin 907 -> 0 bytes
 data/icons/16x16/xfpm-primary-060.png              |  Bin 459 -> 0 bytes
 data/icons/16x16/xfpm-primary-080-charging.png     |  Bin 839 -> 0 bytes
 data/icons/16x16/xfpm-primary-080.png              |  Bin 477 -> 0 bytes
 data/icons/16x16/xfpm-primary-100-charging.png     |  Bin 848 -> 0 bytes
 data/icons/16x16/xfpm-primary-100.png              |  Bin 472 -> 0 bytes
 data/icons/16x16/xfpm-primary-charged.png          |  Bin 729 -> 0 bytes
 data/icons/16x16/xfpm-primary-missing.png          |  Bin 635 -> 0 bytes
 data/icons/22x22/Makefile.am                       |   21 ---
 data/icons/22x22/xfpm-ac-adapter.png               |  Bin 1189 -> 0 bytes
 data/icons/22x22/xfpm-primary-000-charging.png     |  Bin 1324 -> 0 bytes
 data/icons/22x22/xfpm-primary-000.png              |  Bin 1113 -> 0 bytes
 data/icons/22x22/xfpm-primary-020-charging.png     |  Bin 1317 -> 0 bytes
 data/icons/22x22/xfpm-primary-020.png              |  Bin 775 -> 0 bytes
 data/icons/22x22/xfpm-primary-040-charging.png     |  Bin 1159 -> 0 bytes
 data/icons/22x22/xfpm-primary-040.png              |  Bin 711 -> 0 bytes
 data/icons/22x22/xfpm-primary-060-charging.png     |  Bin 1162 -> 0 bytes
 data/icons/22x22/xfpm-primary-060.png              |  Bin 703 -> 0 bytes
 data/icons/22x22/xfpm-primary-080-charging.png     |  Bin 1293 -> 0 bytes
 data/icons/22x22/xfpm-primary-080.png              |  Bin 768 -> 0 bytes
 data/icons/22x22/xfpm-primary-100-charging.png     |  Bin 1258 -> 0 bytes
 data/icons/22x22/xfpm-primary-100.png              |  Bin 705 -> 0 bytes
 data/icons/22x22/xfpm-primary-charged.png          |  Bin 1099 -> 0 bytes
 data/icons/22x22/xfpm-primary-missing.png          |  Bin 887 -> 0 bytes
 data/icons/24x24/Makefile.am                       |   21 ---
 data/icons/24x24/xfpm-ac-adapter.png               |  Bin 1004 -> 0 bytes
 data/icons/24x24/xfpm-primary-000-charging.png     |  Bin 1315 -> 0 bytes
 data/icons/24x24/xfpm-primary-000.png              |  Bin 1138 -> 0 bytes
 data/icons/24x24/xfpm-primary-020-charging.png     |  Bin 1308 -> 0 bytes
 data/icons/24x24/xfpm-primary-020.png              |  Bin 780 -> 0 bytes
 data/icons/24x24/xfpm-primary-040-charging.png     |  Bin 1252 -> 0 bytes
 data/icons/24x24/xfpm-primary-040.png              |  Bin 720 -> 0 bytes
 data/icons/24x24/xfpm-primary-060-charging.png     |  Bin 1252 -> 0 bytes
 data/icons/24x24/xfpm-primary-060.png              |  Bin 714 -> 0 bytes
 data/icons/24x24/xfpm-primary-080-charging.png     |  Bin 1283 -> 0 bytes
 data/icons/24x24/xfpm-primary-080.png              |  Bin 762 -> 0 bytes
 data/icons/24x24/xfpm-primary-100-charging.png     |  Bin 1250 -> 0 bytes
 data/icons/24x24/xfpm-primary-100.png              |  Bin 707 -> 0 bytes
 data/icons/24x24/xfpm-primary-charged.png          |  Bin 1077 -> 0 bytes
 data/icons/24x24/xfpm-primary-missing.png          |  Bin 882 -> 0 bytes
 data/icons/Makefile.am                             |    3 -
 data/icons/scalable/Makefile.am                    |   15 ++
 data/icons/scalable/xfpm-ac-adapter-symbolic.svg   |  148 +++++++++++++++
 .../xfpm-primary-000-charging-symbolic.svg         |   39 ++++
 data/icons/scalable/xfpm-primary-000-symbolic.svg  |   34 ++++
 .../xfpm-primary-020-charging-symbolic.svg         |   39 ++++
 data/icons/scalable/xfpm-primary-020-symbolic.svg  |   33 ++++
 .../xfpm-primary-040-charging-symbolic.svg         |  191 ++++++++++++++++++++
 data/icons/scalable/xfpm-primary-040-symbolic.svg  |  169 +++++++++++++++++
 .../xfpm-primary-060-charging-symbolic.svg         |   39 ++++
 data/icons/scalable/xfpm-primary-060-symbolic.svg  |   34 ++++
 .../xfpm-primary-080-charging-symbolic.svg         |  153 ++++++++++++++++
 data/icons/scalable/xfpm-primary-080-symbolic.svg  |  177 ++++++++++++++++++
 .../xfpm-primary-100-charging-symbolic.svg         |   33 ++++
 data/icons/scalable/xfpm-primary-100-symbolic.svg  |   35 ++++
 .../scalable/xfpm-primary-charged-symbolic.svg     |   32 ++++
 .../scalable/xfpm-primary-missing-symbolic.svg     |   33 ++++
 .../power-manager-plugin/power-manager-button.c    |   63 +++++--
 67 files changed, 1255 insertions(+), 81 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index dabb577..96d44cd 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -237,9 +237,6 @@ panel-plugins/power-manager-plugin/lxde/Makefile
 panel-plugins/power-manager-plugin/xfce/Makefile
 data/Makefile
 data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
 data/icons/32x32/Makefile
 data/icons/48x48/Makefile
 data/icons/scalable/Makefile
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index fe33c96..0000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST =				\
-	$(Data_DATA)
-
-Datadir = $(datadir)/icons/hicolor/16x16/status
-
-Data_DATA =				\
-	xfpm-ac-adapter.png		\
-	xfpm-primary-000.png		\
-	xfpm-primary-020.png		\
-	xfpm-primary-040.png		\
-	xfpm-primary-060.png		\
-	xfpm-primary-080.png		\
-	xfpm-primary-100.png		\
-	xfpm-primary-000-charging.png	\
-	xfpm-primary-020-charging.png	\
-	xfpm-primary-040-charging.png	\
-	xfpm-primary-060-charging.png	\
-	xfpm-primary-080-charging.png	\
-	xfpm-primary-100-charging.png	\
-	xfpm-primary-charged.png		\
-	xfpm-primary-missing.png
\ No newline at end of file
diff --git a/data/icons/16x16/xfpm-ac-adapter.png b/data/icons/16x16/xfpm-ac-adapter.png
deleted file mode 100644
index cbd8284..0000000
Binary files a/data/icons/16x16/xfpm-ac-adapter.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-000-charging.png b/data/icons/16x16/xfpm-primary-000-charging.png
deleted file mode 100644
index ae57414..0000000
Binary files a/data/icons/16x16/xfpm-primary-000-charging.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-000.png b/data/icons/16x16/xfpm-primary-000.png
deleted file mode 100644
index 4c9c132..0000000
Binary files a/data/icons/16x16/xfpm-primary-000.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-020-charging.png b/data/icons/16x16/xfpm-primary-020-charging.png
deleted file mode 100644
index 20f2d22..0000000
Binary files a/data/icons/16x16/xfpm-primary-020-charging.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-020.png b/data/icons/16x16/xfpm-primary-020.png
deleted file mode 100644
index 4d00dc2..0000000
Binary files a/data/icons/16x16/xfpm-primary-020.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-040-charging.png b/data/icons/16x16/xfpm-primary-040-charging.png
deleted file mode 100644
index 54e87ce..0000000
Binary files a/data/icons/16x16/xfpm-primary-040-charging.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-040.png b/data/icons/16x16/xfpm-primary-040.png
deleted file mode 100644
index 0bb08cf..0000000
Binary files a/data/icons/16x16/xfpm-primary-040.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-060-charging.png b/data/icons/16x16/xfpm-primary-060-charging.png
deleted file mode 100644
index 5a780df..0000000
Binary files a/data/icons/16x16/xfpm-primary-060-charging.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-060.png b/data/icons/16x16/xfpm-primary-060.png
deleted file mode 100644
index 8f0697b..0000000
Binary files a/data/icons/16x16/xfpm-primary-060.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-080-charging.png b/data/icons/16x16/xfpm-primary-080-charging.png
deleted file mode 100644
index 4291d53..0000000
Binary files a/data/icons/16x16/xfpm-primary-080-charging.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-080.png b/data/icons/16x16/xfpm-primary-080.png
deleted file mode 100644
index 4d21410..0000000
Binary files a/data/icons/16x16/xfpm-primary-080.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-100-charging.png b/data/icons/16x16/xfpm-primary-100-charging.png
deleted file mode 100644
index ee4e862..0000000
Binary files a/data/icons/16x16/xfpm-primary-100-charging.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-100.png b/data/icons/16x16/xfpm-primary-100.png
deleted file mode 100644
index 1f1314f..0000000
Binary files a/data/icons/16x16/xfpm-primary-100.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-charged.png b/data/icons/16x16/xfpm-primary-charged.png
deleted file mode 100644
index 6264182..0000000
Binary files a/data/icons/16x16/xfpm-primary-charged.png and /dev/null differ
diff --git a/data/icons/16x16/xfpm-primary-missing.png b/data/icons/16x16/xfpm-primary-missing.png
deleted file mode 100644
index 56121af..0000000
Binary files a/data/icons/16x16/xfpm-primary-missing.png and /dev/null differ
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index 5e0ca25..0000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST =				\
-	$(Data_DATA)
-
-Datadir = $(datadir)/icons/hicolor/22x22/status
-
-Data_DATA =				\
-	xfpm-ac-adapter.png		\
-	xfpm-primary-000.png		\
-	xfpm-primary-020.png		\
-	xfpm-primary-040.png		\
-	xfpm-primary-060.png		\
-	xfpm-primary-080.png		\
-	xfpm-primary-100.png		\
-	xfpm-primary-000-charging.png	\
-	xfpm-primary-020-charging.png	\
-	xfpm-primary-040-charging.png	\
-	xfpm-primary-060-charging.png	\
-	xfpm-primary-080-charging.png	\
-	xfpm-primary-100-charging.png	\
-	xfpm-primary-charged.png		\
-	xfpm-primary-missing.png
\ No newline at end of file
diff --git a/data/icons/22x22/xfpm-ac-adapter.png b/data/icons/22x22/xfpm-ac-adapter.png
deleted file mode 100644
index 07e2cf4..0000000
Binary files a/data/icons/22x22/xfpm-ac-adapter.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-000-charging.png b/data/icons/22x22/xfpm-primary-000-charging.png
deleted file mode 100644
index 856c91e..0000000
Binary files a/data/icons/22x22/xfpm-primary-000-charging.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-000.png b/data/icons/22x22/xfpm-primary-000.png
deleted file mode 100644
index 798af3f..0000000
Binary files a/data/icons/22x22/xfpm-primary-000.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-020-charging.png b/data/icons/22x22/xfpm-primary-020-charging.png
deleted file mode 100644
index 4c4810f..0000000
Binary files a/data/icons/22x22/xfpm-primary-020-charging.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-020.png b/data/icons/22x22/xfpm-primary-020.png
deleted file mode 100644
index 93ff293..0000000
Binary files a/data/icons/22x22/xfpm-primary-020.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-040-charging.png b/data/icons/22x22/xfpm-primary-040-charging.png
deleted file mode 100644
index 490afbe..0000000
Binary files a/data/icons/22x22/xfpm-primary-040-charging.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-040.png b/data/icons/22x22/xfpm-primary-040.png
deleted file mode 100644
index c6449a8..0000000
Binary files a/data/icons/22x22/xfpm-primary-040.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-060-charging.png b/data/icons/22x22/xfpm-primary-060-charging.png
deleted file mode 100644
index fadf904..0000000
Binary files a/data/icons/22x22/xfpm-primary-060-charging.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-060.png b/data/icons/22x22/xfpm-primary-060.png
deleted file mode 100644
index b333c07..0000000
Binary files a/data/icons/22x22/xfpm-primary-060.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-080-charging.png b/data/icons/22x22/xfpm-primary-080-charging.png
deleted file mode 100644
index 3adb593..0000000
Binary files a/data/icons/22x22/xfpm-primary-080-charging.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-080.png b/data/icons/22x22/xfpm-primary-080.png
deleted file mode 100644
index 2ca7bd4..0000000
Binary files a/data/icons/22x22/xfpm-primary-080.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-100-charging.png b/data/icons/22x22/xfpm-primary-100-charging.png
deleted file mode 100644
index 22840df..0000000
Binary files a/data/icons/22x22/xfpm-primary-100-charging.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-100.png b/data/icons/22x22/xfpm-primary-100.png
deleted file mode 100644
index 231e42d..0000000
Binary files a/data/icons/22x22/xfpm-primary-100.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-charged.png b/data/icons/22x22/xfpm-primary-charged.png
deleted file mode 100644
index db67ec6..0000000
Binary files a/data/icons/22x22/xfpm-primary-charged.png and /dev/null differ
diff --git a/data/icons/22x22/xfpm-primary-missing.png b/data/icons/22x22/xfpm-primary-missing.png
deleted file mode 100644
index 887d031..0000000
Binary files a/data/icons/22x22/xfpm-primary-missing.png and /dev/null differ
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index aabd541..0000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST =				\
-	$(Data_DATA)
-
-Datadir = $(datadir)/icons/hicolor/24x24/status
-
-Data_DATA =				\
-	xfpm-ac-adapter.png		\
-	xfpm-primary-000.png		\
-	xfpm-primary-020.png		\
-	xfpm-primary-040.png		\
-	xfpm-primary-060.png		\
-	xfpm-primary-080.png		\
-	xfpm-primary-100.png		\
-	xfpm-primary-000-charging.png	\
-	xfpm-primary-020-charging.png	\
-	xfpm-primary-040-charging.png	\
-	xfpm-primary-060-charging.png	\
-	xfpm-primary-080-charging.png	\
-	xfpm-primary-100-charging.png	\
-	xfpm-primary-charged.png		\
-	xfpm-primary-missing.png
diff --git a/data/icons/24x24/xfpm-ac-adapter.png b/data/icons/24x24/xfpm-ac-adapter.png
deleted file mode 100644
index ec59cd0..0000000
Binary files a/data/icons/24x24/xfpm-ac-adapter.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-000-charging.png b/data/icons/24x24/xfpm-primary-000-charging.png
deleted file mode 100644
index 800824f..0000000
Binary files a/data/icons/24x24/xfpm-primary-000-charging.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-000.png b/data/icons/24x24/xfpm-primary-000.png
deleted file mode 100644
index fe065b5..0000000
Binary files a/data/icons/24x24/xfpm-primary-000.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-020-charging.png b/data/icons/24x24/xfpm-primary-020-charging.png
deleted file mode 100644
index ef10f52..0000000
Binary files a/data/icons/24x24/xfpm-primary-020-charging.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-020.png b/data/icons/24x24/xfpm-primary-020.png
deleted file mode 100644
index d0f3752..0000000
Binary files a/data/icons/24x24/xfpm-primary-020.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-040-charging.png b/data/icons/24x24/xfpm-primary-040-charging.png
deleted file mode 100644
index 6d6b929..0000000
Binary files a/data/icons/24x24/xfpm-primary-040-charging.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-040.png b/data/icons/24x24/xfpm-primary-040.png
deleted file mode 100644
index e0e17a6..0000000
Binary files a/data/icons/24x24/xfpm-primary-040.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-060-charging.png b/data/icons/24x24/xfpm-primary-060-charging.png
deleted file mode 100644
index 9395cbe..0000000
Binary files a/data/icons/24x24/xfpm-primary-060-charging.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-060.png b/data/icons/24x24/xfpm-primary-060.png
deleted file mode 100644
index 9048548..0000000
Binary files a/data/icons/24x24/xfpm-primary-060.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-080-charging.png b/data/icons/24x24/xfpm-primary-080-charging.png
deleted file mode 100644
index e90469a..0000000
Binary files a/data/icons/24x24/xfpm-primary-080-charging.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-080.png b/data/icons/24x24/xfpm-primary-080.png
deleted file mode 100644
index 7eee50a..0000000
Binary files a/data/icons/24x24/xfpm-primary-080.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-100-charging.png b/data/icons/24x24/xfpm-primary-100-charging.png
deleted file mode 100644
index 06b226e..0000000
Binary files a/data/icons/24x24/xfpm-primary-100-charging.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-100.png b/data/icons/24x24/xfpm-primary-100.png
deleted file mode 100644
index 51cd816..0000000
Binary files a/data/icons/24x24/xfpm-primary-100.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-charged.png b/data/icons/24x24/xfpm-primary-charged.png
deleted file mode 100644
index 99f50b0..0000000
Binary files a/data/icons/24x24/xfpm-primary-charged.png and /dev/null differ
diff --git a/data/icons/24x24/xfpm-primary-missing.png b/data/icons/24x24/xfpm-primary-missing.png
deleted file mode 100644
index 41fca82..0000000
Binary files a/data/icons/24x24/xfpm-primary-missing.png and /dev/null differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index d67e8e1..ae19d5e 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,7 +1,4 @@
 SUBDIRS =         	\
-	16x16		\
-	22x22		\
-	24x24		\
 	32x32		\
 	48x48		\
 	scalable
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 853b25b..b9060ee 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -13,20 +13,35 @@ Data_DATA =				\
 	tablet.svg			\
 	video-display.svg		\
 	xfpm-ac-adapter.svg		\
+	xfpm-ac-adapter-symbolic.svg		\
 	xfpm-primary-000.svg		\
+	xfpm-primary-000-symbolic.svg		\
 	xfpm-primary-020.svg		\
+	xfpm-primary-020-symbolic.svg		\
 	xfpm-primary-040.svg		\
+	xfpm-primary-040-symbolic.svg		\
 	xfpm-primary-060.svg		\
+	xfpm-primary-060-symbolic.svg		\
 	xfpm-primary-080.svg		\
+	xfpm-primary-080-symbolic.svg		\
 	xfpm-primary-100.svg		\
+	xfpm-primary-100-symbolic.svg		\
 	xfpm-primary-000-charging.svg	\
+	xfpm-primary-000-charging-symbolic.svg	\
 	xfpm-primary-020-charging.svg	\
+	xfpm-primary-020-charging-symbolic.svg	\
 	xfpm-primary-040-charging.svg	\
+	xfpm-primary-040-charging-symbolic.svg	\
 	xfpm-primary-060-charging.svg	\
+	xfpm-primary-060-charging-symbolic.svg	\
 	xfpm-primary-080-charging.svg	\
+	xfpm-primary-080-charging-symbolic.svg	\
 	xfpm-primary-100-charging.svg	\
+	xfpm-primary-100-charging-symbolic.svg	\
 	xfpm-primary-charged.svg		\
+	xfpm-primary-charged-symbolic.svg		\
 	xfpm-primary-missing.svg		\
+	xfpm-primary-missing-symbolic.svg		\
 	xfpm-ups-000.svg		\
 	xfpm-ups-020.svg		\
 	xfpm-ups-040.svg		\
diff --git a/data/icons/scalable/xfpm-ac-adapter-symbolic.svg b/data/icons/scalable/xfpm-ac-adapter-symbolic.svg
new file mode 100644
index 0000000..6cfeb4a
--- /dev/null
+++ b/data/icons/scalable/xfpm-ac-adapter-symbolic.svg
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="xfpm-ac-adapter-symbolic.svg"
+   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   height="16.001423"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="-5.9624183"
+     inkscape:cy="6.8129416"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="749"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1280"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="11.313708">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="60px"
+       originy="0.0014224199px"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-181.0002,-217)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 189.7795,222.00771 c -0.17789,0.0489 -0.3419,0.14729 -0.46875,0.28125 l -3.03125,3 c -0.2353,0.23074 -0.34458,0.58284 -0.28125,0.90625 l 0,0.8125 0.8125,0 0.1875,0 1.4707,0 -1.1875,1.27359 c -0.21461,0.21931 -0.32135,0.53954 -0.28125,0.84375 -0.001,0.0312 -0.001,0.0625 0,0.0937 l 0,0.78125 0.84375,0 0.15625,0 c 0.26386,0.004 0.52791,-0.099 0.71875,-0.28125 l 3,-2.99234 c 0.18369,-0.18976 0.28735,-0.45466 0.28125,-0.7187 0.003,-0.0416 0.003,-0.0834 0,-0.125 l 0,-0.875 -0.84375 [...]
+       id="path10747"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccc"
+       style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:xx-small;line-height:normal;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overfl [...]
+    <path
+       inkscape:connector-curvature="0"
+       d="m 186.46875,217.00586 c -0.49202,0 -0.7981,0.21605 -1.0332,0.45703 -0.2351,0.24098 -0.43555,0.55689 -0.43555,1.0293 l 0,0.50781 -2,0 0,14 12.00195,0.002 0,-1.00195 0,-12.99805 -2,0 0,-0.39843 -0.002,-0.0274 c -0.0239,-0.43046 -0.18017,-0.734 -0.41602,-1.01367 -0.23584,-0.27967 -0.62045,-0.58711 -1.20117,-0.55469 l 0.0566,-0.002 -4.9707,0 z m 0.5332,2.00195 3.99805,0.002 0,1.99414 1.99805,0 0,9.99414 -7.9961,0 0,-9.9961 2,0 0,-1.99414 z"
+       id="path3434-5"
+       style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;i [...]
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-181.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-181.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-181.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-181.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-181.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-181.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-181.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-181.0002,-217)" />
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-000-charging-symbolic.svg b/data/icons/scalable/xfpm-primary-000-charging-symbolic.svg
new file mode 100644
index 0000000..7b3359d
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-000-charging-symbolic.svg
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-caution-charging-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DT [...]
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-20.433576' inkscape:cy='3.5909509' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscap [...]
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='0px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-241.0002,-217)'>
+    <path class='error' inkscape:connector-curvature='0' d='m 246.0002,227.99975 0,2 3.00025,0 0,-2 -3.00025,0 z' id='path6306' sodipodi:nodetypes='ccccc' style='fill:#ef2929;fill-opacity:1;stroke:none'/>
+    <path inkscape:connector-curvature='0' d='m 246.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 245.20232,217.70904 245,218.02725 245,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z' id='path6308' style='font-size:medium;font-style:n [...]
+    
+    <path inkscape:connector-curvature='0' d='M 253.84375,224.96875 A 1.0001,1.0001 0 0 0 253.25,225.25 l -3,3 a 1.0001,1.0001 0 0 0 0.71875,1.71875 l 2.5625,0 L 252.25,231.25 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 3,-3 a 1.0001,1.0001 0 0 0 -0.71875,-1.71875 l -2.5625,0 1.28125,-1.28125 a 1.0001,1.0001 0 0 0 -0.84375,-1.71875 z' id='path6312' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decora [...]
+    <rect height='1' id='rect6314' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='255.96919' y='227.96851'/>
+    <rect height='1' id='rect6316' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='249.96919' y='228.96851'/>
+    <rect height='1' id='rect6318' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='253.96919' y='224.96851'/>
+    <rect height='1' id='rect6320' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='251.96919' y='231.96851'/>
+    <path inkscape:connector-curvature='0' d='m 253.125,225.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z' id='path6322' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1 [...]
+    <path inkscape:connector-curvature='0' d='m 254.125,228.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z' id='path6324' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1 [...]
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-241.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-241.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-241.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-241.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-241.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-241.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-241.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-241.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-000-symbolic.svg b/data/icons/scalable/xfpm-primary-000-symbolic.svg
new file mode 100644
index 0000000..d292262
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-000-symbolic.svg
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-caution-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='171.28381' inkscape:cy='-421.9103' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape [...]
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='140px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+    <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' id='grid5968' opacity='0.1254902' originx='140px' originy='0px' snapvisiblegridlinesonly='true' spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-101.0002,-217)'>
+    
+    <path class='error' inkscape:connector-curvature='0' d='m 106.0002,227.99975 0,1.99999 2.00025,0 0,-2 -2.00025,1e-5 z' id='rect6060-0' sodipodi:nodetypes='ccccc' style='fill:#cc0000;fill-opacity:1;stroke:none;display:inline'/>
+    <path inkscape:connector-curvature='0' d='m 106.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 105.20232,217.70904 105,218.02725 105,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 4,0 0,-2 -3,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z' id='path6062-4' style='font-size:medium;font-style [...]
+    <path class='warning' inkscape:connector-curvature='0' d='m 109.8752,225 c -0.49245,0 -0.875,0.38256 -0.875,0.875 l 0,6.25 c 0,0.49244 0.38255,0.875 0.875,0.875 l 6.25,0 c 0.49245,0 0.875,-0.38256 0.875,-0.875 l 0,-6.25 c 0,-0.49244 -0.38255,-0.875 -0.875,-0.875 l -6.25,0 z m 2.125,1 2,0 0,4 -2,0 0,-4 z m 0,5 2,0 0,1 -2,0 0,-1 z' id='rect6718-3' sodipodi:nodetypes='ccccccccccccccccccc' style='color:#bebebe;fill:#f57900;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marke [...]
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-101.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-101.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-101.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-101.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-101.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-101.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-101.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-101.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-020-charging-symbolic.svg b/data/icons/scalable/xfpm-primary-020-charging-symbolic.svg
new file mode 100644
index 0000000..fef8dde
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-020-charging-symbolic.svg
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-low-charging-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/so [...]
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-0.433576' inkscape:cy='3.5909509' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape [...]
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='20px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-221.0002,-217)'>
+    <path inkscape:connector-curvature='0' d='m 226.0002,228.06225 0,1.9375 3.00025,0 0,-2 z' id='path6282' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
+    <path inkscape:connector-curvature='0' d='m 226.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 225.20232,217.70904 225,218.02725 225,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z' id='path6284' style='font-size:medium;font-style:n [...]
+    
+    <path inkscape:connector-curvature='0' d='M 233.84375,224.96875 A 1.0001,1.0001 0 0 0 233.25,225.25 l -3,3 a 1.0001,1.0001 0 0 0 0.71875,1.71875 l 2.5625,0 L 232.25,231.25 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 3,-3 a 1.0001,1.0001 0 0 0 -0.71875,-1.71875 l -2.5625,0 1.28125,-1.28125 a 1.0001,1.0001 0 0 0 -0.84375,-1.71875 z' id='path6288' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decora [...]
+    <rect height='1' id='rect6290' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='235.96919' y='227.96851'/>
+    <rect height='1' id='rect6292' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='229.96919' y='228.96851'/>
+    <rect height='1' id='rect6294' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='233.96919' y='224.96851'/>
+    <rect height='1' id='rect6296' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='231.96919' y='231.96851'/>
+    <path inkscape:connector-curvature='0' d='m 233.125,225.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z' id='path6298' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1 [...]
+    <path inkscape:connector-curvature='0' d='m 234.125,228.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z' id='path6300' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1 [...]
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-221.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-221.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-221.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-221.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-221.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-221.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-221.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-221.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-020-symbolic.svg b/data/icons/scalable/xfpm-primary-020-symbolic.svg
new file mode 100644
index 0000000..99f15c7
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-020-symbolic.svg
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-low-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='191.28381' inkscape:cy='-421.9103' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape [...]
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='160px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+    <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' id='grid5968' opacity='0.1254902' originx='160px' originy='0px' snapvisiblegridlinesonly='true' spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-81.0002,-217)'>
+    <rect height='6' id='rect3743' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='matrix(0,1,1,0,0,0)' width='2' x='228' y='86.000198'/>
+    <path inkscape:connector-curvature='0' d='m 86.46875,217 c -0.490327,0 -0.796069,0.22846 -1.03125,0.46875 -0.235181,0.24029 -0.4375,0.52725 -0.4375,1 L 85,219 l -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.02393,-0.4306 -0.170232,-0.72105 -0.40625,-1 -0.223737,-0.26444 -0.626697,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z M 87,219 l 4,0 0,1 0,1 1,0 1,0 0,10 -8,0 0,-10 1,0 1,0 0,-1 0,-1 z' id='path3745' style='font-s [...]
+    
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-81.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-81.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-81.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-81.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-81.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-81.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-81.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-81.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-040-charging-symbolic.svg b/data/icons/scalable/xfpm-primary-040-charging-symbolic.svg
new file mode 100644
index 0000000..fd2bce6
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-040-charging-symbolic.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="xfpm-primary-040-charging-symbolic.svg"
+   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   height="16"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="14.410174"
+     inkscape:cy="3.5284509"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="749"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1280"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="32">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="40px"
+       originy="0px"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-201.0002,-217)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 206.0002,226 0,1 4,0 1,-1 z m 0,2 0,2 3,0 0,-2 z"
+       id="path6257"
+       sodipodi:nodetypes="cccccccccc"
+       style="fill:#bebebe;fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 206.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 205.20232,217.70904 205,218.02725 205,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z"
+       id="path6259"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accum [...]
+    <path
+       inkscape:connector-curvature="0"
+       d="M 213.84375,224.96875 A 1.0001,1.0001 0 0 0 213.25,225.25 l -3,3 a 1.0001,1.0001 0 0 0 0.71875,1.71875 l 2.5625,0 L 212.25,231.25 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 3,-3 a 1.0001,1.0001 0 0 0 -0.71875,-1.71875 l -2.5625,0 1.28125,-1.28125 a 1.0001,1.0001 0 0 0 -0.84375,-1.71875 z"
+       id="path6264"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enabl [...]
+    <rect
+       height="1"
+       id="rect6266"
+       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
+       width="1"
+       x="215.96919"
+       y="227.96851" />
+    <rect
+       height="1"
+       id="rect6268"
+       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
+       width="1"
+       x="209.96919"
+       y="228.96851" />
+    <rect
+       height="1"
+       id="rect6270"
+       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
+       width="1"
+       x="213.96919"
+       y="224.96851" />
+    <rect
+       height="1"
+       id="rect6272"
+       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible"
+       width="1"
+       x="211.96919"
+       y="231.96851" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 213.125,225.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z"
+       id="path6274"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enabl [...]
+    <path
+       inkscape:connector-curvature="0"
+       d="m 214.125,228.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z"
+       id="path6276"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enabl [...]
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-201.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-201.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-201.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-201.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-201.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-201.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-201.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-201.0002,-217)" />
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-040-symbolic.svg b/data/icons/scalable/xfpm-primary-040-symbolic.svg
new file mode 100644
index 0000000..7884900
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-040-symbolic.svg
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="xfpm-primary-040-symbolic.svg"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="7.392937"
+     inkscape:cy="7.4248373"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="749"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1280"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="11.313708">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="180px"
+       originy="0px"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+    <inkscape:grid
+       color="#000000"
+       empcolor="#000000"
+       empopacity="0"
+       empspacing="4"
+       enabled="true"
+       id="grid5968"
+       opacity="0.1254902"
+       originx="180px"
+       originy="0px"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-61.0002,-217)">
+    <rect
+       height="6"
+       id="rect3735"
+       style="fill:#bebebe;fill-opacity:1;stroke:none"
+       transform="matrix(0,1,1,0,0,0)"
+       width="1"
+       x="226"
+       y="66.000198" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 66.46875,217 c -0.490327,0 -0.796068,0.22845 -1.03125,0.46875 C 65.202318,217.70905 65,218.02726 65,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 c -0.02393,-0.4306 -0.170236,-0.75229 -0.40625,-1.03125 -0.223734,-0.26444 -0.626687,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z M 67,219 l 4,0 0,1 0,1 1,0 1,0 0,10 -8,0 0,-10 1,0 1,0 0,-1 0,-1 z"
+       id="path3737"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accum [...]
+    <rect
+       height="6"
+       id="rect10870"
+       style="fill:#bebebe;fill-opacity:1;stroke:none"
+       transform="matrix(0,1,1,0,0,0)"
+       width="2"
+       x="228"
+       y="66.000198" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-61.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-61.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-61.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-61.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-61.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-61.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-61.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-61.0002,-217)" />
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-060-charging-symbolic.svg b/data/icons/scalable/xfpm-primary-060-charging-symbolic.svg
new file mode 100644
index 0000000..7867939
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-060-charging-symbolic.svg
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-good-charging-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/s [...]
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='19.566424' inkscape:cy='3.5909509' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape [...]
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='40px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-201.0002,-217)'>
+    <path inkscape:connector-curvature='0' d='m 206.0002,225 0,2 4,0 1,-1 1,-1 z m 0,3 0,2 3,0 0,-2 z' id='path6257' sodipodi:nodetypes='ccccccccccc' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
+    <path inkscape:connector-curvature='0' d='m 206.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 205.20232,217.70904 205,218.02725 205,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z' id='path6259' style='font-size:medium;font-style:n [...]
+    
+    <path inkscape:connector-curvature='0' d='M 213.84375,224.96875 A 1.0001,1.0001 0 0 0 213.25,225.25 l -3,3 a 1.0001,1.0001 0 0 0 0.71875,1.71875 l 2.5625,0 L 212.25,231.25 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 3,-3 a 1.0001,1.0001 0 0 0 -0.71875,-1.71875 l -2.5625,0 1.28125,-1.28125 a 1.0001,1.0001 0 0 0 -0.84375,-1.71875 z' id='path6264' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decora [...]
+    <rect height='1' id='rect6266' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='215.96919' y='227.96851'/>
+    <rect height='1' id='rect6268' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='209.96919' y='228.96851'/>
+    <rect height='1' id='rect6270' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='213.96919' y='224.96851'/>
+    <rect height='1' id='rect6272' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible' width='1' x='211.96919' y='231.96851'/>
+    <path inkscape:connector-curvature='0' d='m 213.125,225.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z' id='path6274' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1 [...]
+    <path inkscape:connector-curvature='0' d='m 214.125,228.40625 -2,3 1.6875,1.125 2,-3 -1.6875,-1.125 z' id='path6276' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1 [...]
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-201.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-201.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-201.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-201.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-201.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-201.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-201.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-201.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-060-symbolic.svg b/data/icons/scalable/xfpm-primary-060-symbolic.svg
new file mode 100644
index 0000000..f488c4c
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-060-symbolic.svg
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-good-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='211.28381' inkscape:cy='-421.9103' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape [...]
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='180px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+    <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' id='grid5968' opacity='0.1254902' originx='180px' originy='0px' snapvisiblegridlinesonly='true' spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-61.0002,-217)'>
+    <rect height='6' id='rect3735' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='matrix(0,1,1,0,0,0)' width='2' x='225' y='66.000198'/>
+    <path inkscape:connector-curvature='0' d='m 66.46875,217 c -0.490327,0 -0.796068,0.22845 -1.03125,0.46875 C 65.202318,217.70905 65,218.02726 65,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 c -0.02393,-0.4306 -0.170236,-0.75229 -0.40625,-1.03125 -0.223734,-0.26444 -0.626687,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z M 67,219 l 4,0 0,1 0,1 1,0 1,0 0,10 -8,0 0,-10 1,0 1,0 0,-1 0,-1 z' id='path3737' style='font-size:med [...]
+    
+    <rect height='6' id='rect10870' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='matrix(0,1,1,0,0,0)' width='2' x='228' y='66.000198'/>
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-61.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-61.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-61.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-61.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-61.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-61.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-61.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-61.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-080-charging-symbolic.svg b/data/icons/scalable/xfpm-primary-080-charging-symbolic.svg
new file mode 100644
index 0000000..6f5502b
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-080-charging-symbolic.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="xfpm-primary-080-charging-symbolic.svg"
+   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   height="16"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="0.269374"
+     inkscape:cy="7.1609489"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="749"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1280"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="32">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="80px"
+       originy="0px"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-161.0002,-217)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 166.0002,223 0,1 6,0 0,-1 z m 0,2 0,2 4,0 0.25,-0.125 1.75,-1.75 0,-0.125 z m 0,3.0625 0,1.9375 3,0 0,-0.8125 0,-1.125 z"
+       id="rect6060"
+       style="fill:#bebebe;fill-opacity:1;stroke:none"
+       sodipodi:nodetypes="cccccccccccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 166.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 165.20232,217.70904 165,218.02725 165,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z"
+       id="path6062"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accum [...]
+    <path
+       inkscape:connector-curvature="0"
+       d="m 173.71895,224.96875 c -0.17789,0.0489 -0.3419,0.14729 -0.46875,0.28125 l -3,2.96875 c -0.2353,0.23073 -0.34458,0.61409 -0.28125,0.9375 l 0,0.8125 1,0 2.125,0 -0.84375,1.25 c -0.15169,0.14917 -0.24515,0.35304 -0.28125,0.5625 l 0,0.375 0,0.8125 1,0 c 0.26386,0.004 0.52791,-0.13024 0.71875,-0.3125 l 3,-3 c 0.1837,-0.18978 0.28737,-0.42344 0.28125,-0.6875 0.003,-0.0416 0.003,-0.0834 0,-0.125 l 0,-0.875 -0.84375,0 -0.0937,0 c -0.0208,-6.5e-4 -0.0417,-6.5e-4 -0.0625,0 l -2.125,0 0. [...]
+       id="path6217"
+       style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulat [...]
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-161.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-161.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-161.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-161.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-161.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-161.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-161.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-161.0002,-217)" />
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-080-symbolic.svg b/data/icons/scalable/xfpm-primary-080-symbolic.svg
new file mode 100644
index 0000000..78c08ce
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-080-symbolic.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="xfpm-primary-080-symbolic.svg"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="46.667339"
+     inkscape:cy="21.566973"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="749"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1280"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="5.6568542">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="200px"
+       originy="0px"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+    <inkscape:grid
+       color="#000000"
+       empcolor="#000000"
+       empopacity="0"
+       empspacing="4"
+       enabled="true"
+       id="grid5968"
+       opacity="0.1254902"
+       originx="200px"
+       originy="0px"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-41.0002,-217)">
+    <rect
+       height="6"
+       id="rect2928"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate"
+       transform="matrix(0,1,1,0,0,0)"
+       width="1"
+       x="223"
+       y="46.000198" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 46.46875,217 c -0.490327,0 -0.796069,0.22846 -1.03125,0.46875 -0.235181,0.24029 -0.4375,0.52725 -0.4375,1 L 45,219 l -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.02393,-0.4306 -0.170232,-0.72105 -0.40625,-1 -0.223737,-0.26444 -0.626697,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z M 47,219 l 4,0 0,1 0,1 1,0 1,0 0,10 -8,0 0,-10 1,0 1,0 0,-1 0,-1 z"
+       id="path2930"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accum [...]
+    <rect
+       height="6"
+       id="rect4227"
+       style="color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0,1,1,0,0,0)"
+       width="2"
+       x="225"
+       y="46.000198" />
+    <rect
+       height="6"
+       id="rect4229"
+       style="color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0,1,1,0,0,0)"
+       width="2"
+       x="228"
+       y="46.000198" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-41.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-41.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-41.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-41.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-41.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-41.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-41.0002,-217)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-41.0002,-217)" />
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-100-charging-symbolic.svg b/data/icons/scalable/xfpm-primary-100-charging-symbolic.svg
new file mode 100644
index 0000000..89ed55c
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-100-charging-symbolic.svg
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-full-charging-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/s [...]
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='5.425624' inkscape:cy='7.2234489' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape: [...]
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='80px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-161.0002,-217)'>
+    <path inkscape:connector-curvature='0' d='m 166.0002,222 0,2 6,0 0,-2 -6,0 z m 0,3 0,2 4,0 0.25,-0.125 1.75,-1.75 0,-0.125 -6,0 z m 0,3.0625 0,1.9375 3,0 0,-0.8125 0,-1.125 -3,0 z' id='rect6060' style='fill:#bebebe;fill-opacity:1;stroke:none'/>
+    <path inkscape:connector-curvature='0' d='m 166.46875,217 c -0.49033,0 -0.79607,0.22846 -1.03125,0.46875 C 165.20232,217.70904 165,218.02725 165,218.5 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 7,0 0,-2 -6,0 0,-10 1,0 1,0 0,-1 0,-1 4,0 0,1 0,1 1,0 1,0 0,3 2,0 0,-4 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.4306 -0.17023,-0.72105 -0.40625,-1 -0.22374,-0.26444 -0.6267,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z' id='path6062' style='font-size:medium;font-style:n [...]
+    
+    <path inkscape:connector-curvature='0' d='m 173.71895,224.96875 c -0.17789,0.0489 -0.3419,0.14729 -0.46875,0.28125 l -3,2.96875 c -0.2353,0.23073 -0.34458,0.61409 -0.28125,0.9375 l 0,0.8125 1,0 2.125,0 -0.84375,1.25 c -0.15169,0.14917 -0.24515,0.35304 -0.28125,0.5625 l 0,0.375 0,0.8125 1,0 c 0.26386,0.004 0.52791,-0.13024 0.71875,-0.3125 l 3,-3 c 0.1837,-0.18978 0.28737,-0.42344 0.28125,-0.6875 0.003,-0.0416 0.003,-0.0834 0,-0.125 l 0,-0.875 -0.84375,0 -0.0937,0 c -0.0208,-6.5e-4 -0. [...]
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-161.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-161.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-161.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-161.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-161.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-161.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-161.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-161.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-100-symbolic.svg b/data/icons/scalable/xfpm-primary-100-symbolic.svg
new file mode 100644
index 0000000..afef836
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-100-symbolic.svg
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-full-symbolic.svg' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.4 r9939' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='231.28381' inkscape:cy='-421.9103' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape [...]
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='200px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+    <inkscape:grid color='#000000' empcolor='#000000' empopacity='0' empspacing='4' enabled='true' id='grid5968' opacity='0.1254902' originx='200px' originy='0px' snapvisiblegridlinesonly='true' spacingx='0.5px' spacingy='0.5px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-41.0002,-217)'>
+    <rect height='6' id='rect2928' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' transform='matrix(0,1,1,0,0,0)' width='2' x='222' y='46.000198'/>
+    <path inkscape:connector-curvature='0' d='m 46.46875,217 c -0.490327,0 -0.796069,0.22846 -1.03125,0.46875 -0.235181,0.24029 -0.4375,0.52725 -0.4375,1 L 45,219 l -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.02393,-0.4306 -0.170232,-0.72105 -0.40625,-1 -0.223737,-0.26444 -0.626697,-0.52931 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z M 47,219 l 4,0 0,1 0,1 1,0 1,0 0,10 -8,0 0,-10 1,0 1,0 0,-1 0,-1 z' id='path2930' style='font-s [...]
+    
+    <rect height='6' id='rect4227' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' transform='matrix(0,1,1,0,0,0)' width='2' x='225' y='46.000198'/>
+    <rect height='6' id='rect4229' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate' transform='matrix(0,1,1,0,0,0)' width='2' x='228' y='46.000198'/>
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-41.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-41.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-41.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-41.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-41.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-41.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-41.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-41.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-charged-symbolic.svg b/data/icons/scalable/xfpm-primary-charged-symbolic.svg
new file mode 100644
index 0000000..da9e964
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-charged-symbolic.svg
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-full-charged-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16.001423' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net [...]
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='4.99669' inkscape:cy='-8.864728' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:s [...]
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='60px' originy='0.0014224199px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-181.0002,-217)'>
+    
+    <path inkscape:connector-curvature='0' d='m 189.7795,222.00771 c -0.17789,0.0489 -0.3419,0.14729 -0.46875,0.28125 l -3.03125,3 c -0.2353,0.23074 -0.34458,0.58284 -0.28125,0.90625 l 0,0.8125 0.8125,0 0.1875,0 1.4707,0 -1.1875,1.27359 c -0.21461,0.21931 -0.32135,0.53954 -0.28125,0.84375 -0.001,0.0312 -0.001,0.0625 0,0.0937 l 0,0.78125 0.84375,0 0.15625,0 c 0.26386,0.004 0.52791,-0.099 0.71875,-0.28125 l 3,-2.99234 c 0.18369,-0.18976 0.28735,-0.45466 0.28125,-0.7187 0.003,-0.0416 0.003, [...]
+    <path inkscape:connector-curvature='0' d='m 186.46875,217.00586 c -0.49202,0 -0.7981,0.21605 -1.0332,0.45703 -0.2351,0.24098 -0.43555,0.55689 -0.43555,1.0293 l 0,0.50781 -2,0 0,14 12.00195,0.002 0,-1.00195 0,-12.99805 -2,0 0,-0.39843 -0.002,-0.0274 c -0.0239,-0.43046 -0.18017,-0.734 -0.41602,-1.01367 -0.23584,-0.27967 -0.62045,-0.58711 -1.20117,-0.55469 l 0.0566,-0.002 -4.9707,0 z m 0.5332,2.00195 3.99805,0.002 0,1.99414 1.99805,0 0,9.99414 -7.9961,0 0,-9.9961 2,0 0,-1.99414 z' id='p [...]
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-181.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-181.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-181.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-181.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-181.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-181.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-181.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-181.0002,-217)'/>
+</svg>
diff --git a/data/icons/scalable/xfpm-primary-missing-symbolic.svg b/data/icons/scalable/xfpm-primary-missing-symbolic.svg
new file mode 100644
index 0000000..84c05d0
--- /dev/null
+++ b/data/icons/scalable/xfpm-primary-missing-symbolic.svg
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='battery-missing-symbolic.svg' inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png' inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipod [...]
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='127.39978' inkscape:cy='28.08611' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape: [...]
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='120px' originy='0px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-121.0002,-217)'>
+    
+    <path inkscape:connector-curvature='0' d='m 126.46895,217 c -0.49202,0 -0.79615,0.22777 -1.03125,0.46875 -0.2351,0.24098 -0.4375,0.55884 -0.4375,1.03125 l 0,0.5 -1,0 -1,0 0,1 0,12 0,1 1,0 10,0 1,0 0,-1 0,-12 0,-1 -1,0 -1,0 0,-0.375 0,-0.0312 0,-0.0312 c -0.0239,-0.43046 -0.17041,-0.72033 -0.40625,-1 -0.22357,-0.26511 -0.62489,-0.52941 -1.15625,-0.53125 l 0,-0.0312 -0.0625,0 -4.90625,0 z m 0.53125,2 4,0 0,1 0,0.53125 c 0.22927,0.13183 0.42611,0.29608 0.625,0.46875 l 0.375,0 1,0 0,2.75 [...]
+    
+    <path inkscape:connector-curvature='0' d='m 128.81738,221.00473 c 1.64243,-0.092 3.0955,1.17008 3.1875,2.8125 -1e-4,1.40136 -0.37771,1.92177 -1.59375,2.84375 -0.19093,0.14364 -0.3256,0.2506 -0.375,0.3125 -0.0494,0.0621 -0.0312,0.0332 -0.0312,0.0312 0.007,0.52831 -0.47163,1 -1,1 -0.52837,0 -1.007,-0.47169 -1,-1 0,-0.50239 0.22424,-0.94342 0.46875,-1.25 0.24451,-0.30663 0.4913,-0.51638 0.71875,-0.6875 0.20405,-0.16056 0.46083,-0.38454 0.6875,-0.65625 0.0935,-0.1121 0.129,-0.30766 0.125 [...]
+  </g>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' transform='translate(-121.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' transform='translate(-121.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' transform='translate(-121.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' transform='translate(-121.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-121.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-121.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' transform='translate(-121.0002,-217)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-121.0002,-217)'/>
+</svg>
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 38121c7..2d5934f 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -825,6 +825,7 @@ static void
 power_manager_button_init (PowerManagerButton *button)
 {
     GError *error = NULL;
+    GtkCssProvider *css_provider;
 
     button->priv = POWER_MANAGER_BUTTON_GET_PRIVATE (button);
 
@@ -832,6 +833,7 @@ power_manager_button_init (PowerManagerButton *button)
     gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE);
     gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
     gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
+    gtk_widget_set_name (GTK_WIDGET (button), "xfce4-power-manager-plugin");
 
     button->priv->brightness = xfpm_brightness_new ();
     xfpm_brightness_setup (button->priv->brightness);
@@ -852,6 +854,21 @@ power_manager_button_init (PowerManagerButton *button)
     button->priv->panel_icon_name = g_strdup(XFPM_AC_ADAPTER_ICON);
     button->priv->panel_icon_width = 24;
 
+    /* Sane default Gtk style */
+    css_provider = gtk_css_provider_new ();
+    gtk_css_provider_load_from_data (css_provider,
+                                     "#xfce4-power-manager-plugin {"
+                                     "-GtkWidget-focus-padding: 0;"
+                                     "-GtkWidget-focus-line-width: 0;"
+                                     "-GtkButton-default-border: 0;"
+                                     "-GtkButton-inner-border: 0;"
+                                     "padding: 1px;"
+                                     "border-width: 1px;}",
+                                     -1, NULL);
+    gtk_style_context_add_provider (GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (button))),
+                                    GTK_STYLE_PROVIDER (css_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+    g_signal_connect (G_OBJECT (button), "style_updated", G_CALLBACK (power_manager_button_set_icon), button); 
     g_signal_connect (button->priv->upower, "device-added", G_CALLBACK (device_added_cb), button);
     g_signal_connect (button->priv->upower, "device-removed", G_CALLBACK (device_removed_cb), button);
 }
@@ -913,14 +930,20 @@ static gboolean
 power_manager_button_set_icon (PowerManagerButton *button)
 {
     GdkPixbuf *pixbuf;
+    GtkIconInfo *info;
+    GtkStyleContext *context;
+    gchar *icon_name;
 
     DBG("icon_width %d", button->priv->panel_icon_width);
 
-    pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-                                       button->priv->panel_icon_name,
-                                       button->priv->panel_icon_width,
-                                       GTK_ICON_LOOKUP_GENERIC_FALLBACK,
-                                       NULL);
+    icon_name = g_strdup_printf ("%s-symbolic", button->priv->panel_icon_name);
+    g_warning ("width: %d, icon name: %s",button->priv->panel_icon_width, icon_name);
+
+    context = GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (gtk_widget_get_parent (GTK_WIDGET (button)))));
+
+    info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), icon_name,
+                                       button->priv->panel_icon_width, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+    pixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);
 
     if ( pixbuf )
     {
@@ -931,6 +954,7 @@ power_manager_button_set_icon (PowerManagerButton *button)
         return TRUE;
     }
 
+    g_free (icon_name);
     return FALSE;
 }
 
@@ -970,7 +994,7 @@ power_manager_button_press_event (GtkWidget *widget, GdkEventButton *event)
 static gboolean
 power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerManagerButton *button)
 {
-    GtkStyleContext *ctx;
+    GtkStyleContext *context;
     GtkBorder padding, border;
     gint width;
     gint xthickness;
@@ -978,18 +1002,33 @@ power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerM
 
     g_return_val_if_fail (POWER_MANAGER_IS_BUTTON (button), FALSE);
     g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
+    g_return_if_fail (size > 0);
+
+    size /= xfce_panel_plugin_get_nrows (plugin);
 
-    ctx = gtk_widget_get_style_context (GTK_WIDGET (button));
-    gtk_style_context_get_padding (ctx, gtk_widget_get_state_flags (GTK_WIDGET (button)), &padding);
-    gtk_style_context_get_border (ctx, gtk_widget_get_state_flags (GTK_WIDGET (button)), &border);
+    /* Calculate the size of the widget because the theme can override it */
+    context = gtk_widget_get_style_context (GTK_WIDGET (button));
+    gtk_style_context_get_padding (context, gtk_widget_get_state_flags (GTK_WIDGET (button)), &padding);
+    gtk_style_context_get_border (context, gtk_widget_get_state_flags (GTK_WIDGET (button)), &border);
     xthickness = padding.left+padding.right+border.left+border.right;
     ythickness = padding.top+padding.bottom+border.top+border.bottom;
 
-    size /= xfce_panel_plugin_get_nrows (plugin);
+    /* Calculate the size of the space left for the icon */
     width = size - 2* MAX (xthickness, ythickness);
 
-    gtk_widget_set_size_request (GTK_WIDGET(plugin), size + xthickness, size + ythickness);
-    button->priv->panel_icon_width = width;
+    /* Since symbolic icons are usually only provided in 16px we
+     * try to be clever and use size steps */
+    g_warning ("size: %d, width: %d", size, width);
+    if (width <= 21)
+        button->priv->panel_icon_width = 16;
+    else if (width >=22 && width <= 29)
+        button->priv->panel_icon_width = 24;
+    else if (width >= 30 && width <= 40)
+        button->priv->panel_icon_width = 32;
+    else
+        button->priv->panel_icon_width = width;
+
+    gtk_widget_set_size_request (GTK_WIDGET(plugin), size, size);
 
     return power_manager_button_set_icon (button);
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list