197 files changed, 362 insertions, 184 deletions

diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index c2458c15..76fce215 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,2 +1,23 @@
-SUBDIRS = status
+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		\
+	xfpm-brightness-lcd-invalid.png	\
+	xfpm-brightness-lcd.png
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
deleted file mode 100644
index 76fce215..00000000
--- a/data/icons/16x16/status/Makefile.am
+++ /dev/null
@@ -1,23 +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		\
-	xfpm-brightness-lcd-invalid.png	\
-	xfpm-brightness-lcd.png
diff --git a/data/icons/16x16/status/xfpm-ac-adapter.png b/data/icons/16x16/xfpm-ac-adapter.png
index cbd8284c..cbd8284c 100644
--- a/data/icons/16x16/status/xfpm-ac-adapter.png
+++ b/data/icons/16x16/xfpm-ac-adapter.png
diff --git a/data/icons/16x16/status/xfpm-brightness-lcd-invalid.png b/data/icons/16x16/xfpm-brightness-lcd-invalid.png
index 341f2837..341f2837 100644
--- a/data/icons/16x16/status/xfpm-brightness-lcd-invalid.png
+++ b/data/icons/16x16/xfpm-brightness-lcd-invalid.png
diff --git a/data/icons/16x16/status/xfpm-brightness-lcd.png b/data/icons/16x16/xfpm-brightness-lcd.png
index 341f2837..341f2837 100644
--- a/data/icons/16x16/status/xfpm-brightness-lcd.png
+++ b/data/icons/16x16/xfpm-brightness-lcd.png
diff --git a/data/icons/16x16/status/xfpm-primary-000-charging.png b/data/icons/16x16/xfpm-primary-000-charging.png
index ae574149..ae574149 100644
--- a/data/icons/16x16/status/xfpm-primary-000-charging.png
+++ b/data/icons/16x16/xfpm-primary-000-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-000.png b/data/icons/16x16/xfpm-primary-000.png
index 4c9c1325..4c9c1325 100644
--- a/data/icons/16x16/status/xfpm-primary-000.png
+++ b/data/icons/16x16/xfpm-primary-000.png
diff --git a/data/icons/16x16/status/xfpm-primary-020-charging.png b/data/icons/16x16/xfpm-primary-020-charging.png
index 20f2d220..20f2d220 100644
--- a/data/icons/16x16/status/xfpm-primary-020-charging.png
+++ b/data/icons/16x16/xfpm-primary-020-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-020.png b/data/icons/16x16/xfpm-primary-020.png
index 4d00dc28..4d00dc28 100644
--- a/data/icons/16x16/status/xfpm-primary-020.png
+++ b/data/icons/16x16/xfpm-primary-020.png
diff --git a/data/icons/16x16/status/xfpm-primary-040-charging.png b/data/icons/16x16/xfpm-primary-040-charging.png
index 54e87ce1..54e87ce1 100644
--- a/data/icons/16x16/status/xfpm-primary-040-charging.png
+++ b/data/icons/16x16/xfpm-primary-040-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-040.png b/data/icons/16x16/xfpm-primary-040.png
index 0bb08cf6..0bb08cf6 100644
--- a/data/icons/16x16/status/xfpm-primary-040.png
+++ b/data/icons/16x16/xfpm-primary-040.png
diff --git a/data/icons/16x16/status/xfpm-primary-060-charging.png b/data/icons/16x16/xfpm-primary-060-charging.png
index 5a780df0..5a780df0 100644
--- a/data/icons/16x16/status/xfpm-primary-060-charging.png
+++ b/data/icons/16x16/xfpm-primary-060-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-060.png b/data/icons/16x16/xfpm-primary-060.png
index 8f0697b9..8f0697b9 100644
--- a/data/icons/16x16/status/xfpm-primary-060.png
+++ b/data/icons/16x16/xfpm-primary-060.png
diff --git a/data/icons/16x16/status/xfpm-primary-080-charging.png b/data/icons/16x16/xfpm-primary-080-charging.png
index 4291d53c..4291d53c 100644
--- a/data/icons/16x16/status/xfpm-primary-080-charging.png
+++ b/data/icons/16x16/xfpm-primary-080-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-080.png b/data/icons/16x16/xfpm-primary-080.png
index 4d21410f..4d21410f 100644
--- a/data/icons/16x16/status/xfpm-primary-080.png
+++ b/data/icons/16x16/xfpm-primary-080.png
diff --git a/data/icons/16x16/status/xfpm-primary-100-charging.png b/data/icons/16x16/xfpm-primary-100-charging.png
index ee4e862f..ee4e862f 100644
--- a/data/icons/16x16/status/xfpm-primary-100-charging.png
+++ b/data/icons/16x16/xfpm-primary-100-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-100.png b/data/icons/16x16/xfpm-primary-100.png
index 1f1314fc..1f1314fc 100644
--- a/data/icons/16x16/status/xfpm-primary-100.png
+++ b/data/icons/16x16/xfpm-primary-100.png
diff --git a/data/icons/16x16/status/xfpm-primary-charged.png b/data/icons/16x16/xfpm-primary-charged.png
index 62641829..62641829 100644
--- a/data/icons/16x16/status/xfpm-primary-charged.png
+++ b/data/icons/16x16/xfpm-primary-charged.png
diff --git a/data/icons/16x16/status/xfpm-primary-missing.png b/data/icons/16x16/xfpm-primary-missing.png
index 56121af9..56121af9 100644
--- a/data/icons/16x16/status/xfpm-primary-missing.png
+++ b/data/icons/16x16/xfpm-primary-missing.png
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index c2458c15..f20327cf 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1,2 +1,23 @@
-SUBDIRS = status
+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		\
+	xfpm-brightness-lcd-invalid.png	\
+	xfpm-brightness-lcd.png
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
deleted file mode 100644
index f20327cf..00000000
--- a/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,23 +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		\
-	xfpm-brightness-lcd-invalid.png	\
-	xfpm-brightness-lcd.png
diff --git a/data/icons/22x22/status/xfpm-ac-adapter.png b/data/icons/22x22/xfpm-ac-adapter.png
index 07e2cf42..07e2cf42 100644
--- a/data/icons/22x22/status/xfpm-ac-adapter.png
+++ b/data/icons/22x22/xfpm-ac-adapter.png
diff --git a/data/icons/22x22/status/xfpm-brightness-lcd-invalid.png b/data/icons/22x22/xfpm-brightness-lcd-invalid.png
index 5a13df2b..5a13df2b 100644
--- a/data/icons/22x22/status/xfpm-brightness-lcd-invalid.png
+++ b/data/icons/22x22/xfpm-brightness-lcd-invalid.png
diff --git a/data/icons/22x22/status/xfpm-brightness-lcd.png b/data/icons/22x22/xfpm-brightness-lcd.png
index a1ab0cec..a1ab0cec 100644
--- a/data/icons/22x22/status/xfpm-brightness-lcd.png
+++ b/data/icons/22x22/xfpm-brightness-lcd.png
diff --git a/data/icons/22x22/status/xfpm-primary-000-charging.png b/data/icons/22x22/xfpm-primary-000-charging.png
index 856c91ee..856c91ee 100644
--- a/data/icons/22x22/status/xfpm-primary-000-charging.png
+++ b/data/icons/22x22/xfpm-primary-000-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-000.png b/data/icons/22x22/xfpm-primary-000.png
index 798af3f5..798af3f5 100644
--- a/data/icons/22x22/status/xfpm-primary-000.png
+++ b/data/icons/22x22/xfpm-primary-000.png
diff --git a/data/icons/22x22/status/xfpm-primary-020-charging.png b/data/icons/22x22/xfpm-primary-020-charging.png
index 4c4810f8..4c4810f8 100644
--- a/data/icons/22x22/status/xfpm-primary-020-charging.png
+++ b/data/icons/22x22/xfpm-primary-020-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-020.png b/data/icons/22x22/xfpm-primary-020.png
index 93ff293c..93ff293c 100644
--- a/data/icons/22x22/status/xfpm-primary-020.png
+++ b/data/icons/22x22/xfpm-primary-020.png
diff --git a/data/icons/22x22/status/xfpm-primary-040-charging.png b/data/icons/22x22/xfpm-primary-040-charging.png
index 490afbe8..490afbe8 100644
--- a/data/icons/22x22/status/xfpm-primary-040-charging.png
+++ b/data/icons/22x22/xfpm-primary-040-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-040.png b/data/icons/22x22/xfpm-primary-040.png
index c6449a88..c6449a88 100644
--- a/data/icons/22x22/status/xfpm-primary-040.png
+++ b/data/icons/22x22/xfpm-primary-040.png
diff --git a/data/icons/22x22/status/xfpm-primary-060-charging.png b/data/icons/22x22/xfpm-primary-060-charging.png
index fadf904e..fadf904e 100644
--- a/data/icons/22x22/status/xfpm-primary-060-charging.png
+++ b/data/icons/22x22/xfpm-primary-060-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-060.png b/data/icons/22x22/xfpm-primary-060.png
index b333c07f..b333c07f 100644
--- a/data/icons/22x22/status/xfpm-primary-060.png
+++ b/data/icons/22x22/xfpm-primary-060.png
diff --git a/data/icons/22x22/status/xfpm-primary-080-charging.png b/data/icons/22x22/xfpm-primary-080-charging.png
index 3adb5937..3adb5937 100644
--- a/data/icons/22x22/status/xfpm-primary-080-charging.png
+++ b/data/icons/22x22/xfpm-primary-080-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-080.png b/data/icons/22x22/xfpm-primary-080.png
index 2ca7bd48..2ca7bd48 100644
--- a/data/icons/22x22/status/xfpm-primary-080.png
+++ b/data/icons/22x22/xfpm-primary-080.png
diff --git a/data/icons/22x22/status/xfpm-primary-100-charging.png b/data/icons/22x22/xfpm-primary-100-charging.png
index 22840dfe..22840dfe 100644
--- a/data/icons/22x22/status/xfpm-primary-100-charging.png
+++ b/data/icons/22x22/xfpm-primary-100-charging.png
diff --git a/data/icons/22x22/status/xfpm-primary-100.png b/data/icons/22x22/xfpm-primary-100.png
index 231e42d9..231e42d9 100644
--- a/data/icons/22x22/status/xfpm-primary-100.png
+++ b/data/icons/22x22/xfpm-primary-100.png
diff --git a/data/icons/22x22/status/xfpm-primary-charged.png b/data/icons/22x22/xfpm-primary-charged.png
index db67ec6e..db67ec6e 100644
--- a/data/icons/22x22/status/xfpm-primary-charged.png
+++ b/data/icons/22x22/xfpm-primary-charged.png
diff --git a/data/icons/22x22/status/xfpm-primary-missing.png b/data/icons/22x22/xfpm-primary-missing.png
index 887d0311..887d0311 100644
--- a/data/icons/22x22/status/xfpm-primary-missing.png
+++ b/data/icons/22x22/xfpm-primary-missing.png
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index c2458c15..08e23ccf 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1,2 +1,23 @@
-SUBDIRS = status
+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		\
+	xfpm-brightness-lcd-invalid.png	\
+	xfpm-brightness-lcd.png
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
deleted file mode 100644
index 08e23ccf..00000000
--- a/data/icons/24x24/status/Makefile.am
+++ /dev/null
@@ -1,23 +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		\
-	xfpm-brightness-lcd-invalid.png	\
-	xfpm-brightness-lcd.png
diff --git a/data/icons/24x24/status/xfpm-ac-adapter.png b/data/icons/24x24/xfpm-ac-adapter.png
index ec59cd08..ec59cd08 100644
--- a/data/icons/24x24/status/xfpm-ac-adapter.png
+++ b/data/icons/24x24/xfpm-ac-adapter.png
diff --git a/data/icons/24x24/status/xfpm-brightness-lcd-invalid.png b/data/icons/24x24/xfpm-brightness-lcd-invalid.png
index 900140d9..900140d9 100644
--- a/data/icons/24x24/status/xfpm-brightness-lcd-invalid.png
+++ b/data/icons/24x24/xfpm-brightness-lcd-invalid.png
diff --git a/data/icons/24x24/status/xfpm-brightness-lcd.png b/data/icons/24x24/xfpm-brightness-lcd.png
index 8a52068a..8a52068a 100644
--- a/data/icons/24x24/status/xfpm-brightness-lcd.png
+++ b/data/icons/24x24/xfpm-brightness-lcd.png
diff --git a/data/icons/24x24/status/xfpm-primary-000-charging.png b/data/icons/24x24/xfpm-primary-000-charging.png
index 800824f2..800824f2 100644
--- a/data/icons/24x24/status/xfpm-primary-000-charging.png
+++ b/data/icons/24x24/xfpm-primary-000-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-000.png b/data/icons/24x24/xfpm-primary-000.png
index fe065b50..fe065b50 100644
--- a/data/icons/24x24/status/xfpm-primary-000.png
+++ b/data/icons/24x24/xfpm-primary-000.png
diff --git a/data/icons/24x24/status/xfpm-primary-020-charging.png b/data/icons/24x24/xfpm-primary-020-charging.png
index ef10f526..ef10f526 100644
--- a/data/icons/24x24/status/xfpm-primary-020-charging.png
+++ b/data/icons/24x24/xfpm-primary-020-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-020.png b/data/icons/24x24/xfpm-primary-020.png
index d0f3752f..d0f3752f 100644
--- a/data/icons/24x24/status/xfpm-primary-020.png
+++ b/data/icons/24x24/xfpm-primary-020.png
diff --git a/data/icons/24x24/status/xfpm-primary-040-charging.png b/data/icons/24x24/xfpm-primary-040-charging.png
index 6d6b9296..6d6b9296 100644
--- a/data/icons/24x24/status/xfpm-primary-040-charging.png
+++ b/data/icons/24x24/xfpm-primary-040-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-040.png b/data/icons/24x24/xfpm-primary-040.png
index e0e17a6d..e0e17a6d 100644
--- a/data/icons/24x24/status/xfpm-primary-040.png
+++ b/data/icons/24x24/xfpm-primary-040.png
diff --git a/data/icons/24x24/status/xfpm-primary-060-charging.png b/data/icons/24x24/xfpm-primary-060-charging.png
index 9395cbed..9395cbed 100644
--- a/data/icons/24x24/status/xfpm-primary-060-charging.png
+++ b/data/icons/24x24/xfpm-primary-060-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-060.png b/data/icons/24x24/xfpm-primary-060.png
index 90485485..90485485 100644
--- a/data/icons/24x24/status/xfpm-primary-060.png
+++ b/data/icons/24x24/xfpm-primary-060.png
diff --git a/data/icons/24x24/status/xfpm-primary-080-charging.png b/data/icons/24x24/xfpm-primary-080-charging.png
index e90469a5..e90469a5 100644
--- a/data/icons/24x24/status/xfpm-primary-080-charging.png
+++ b/data/icons/24x24/xfpm-primary-080-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-080.png b/data/icons/24x24/xfpm-primary-080.png
index 7eee50a0..7eee50a0 100644
--- a/data/icons/24x24/status/xfpm-primary-080.png
+++ b/data/icons/24x24/xfpm-primary-080.png
diff --git a/data/icons/24x24/status/xfpm-primary-100-charging.png b/data/icons/24x24/xfpm-primary-100-charging.png
index 06b226ec..06b226ec 100644
--- a/data/icons/24x24/status/xfpm-primary-100-charging.png
+++ b/data/icons/24x24/xfpm-primary-100-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-100.png b/data/icons/24x24/xfpm-primary-100.png
index 51cd816b..51cd816b 100644
--- a/data/icons/24x24/status/xfpm-primary-100.png
+++ b/data/icons/24x24/xfpm-primary-100.png
diff --git a/data/icons/24x24/status/xfpm-primary-charged.png b/data/icons/24x24/xfpm-primary-charged.png
index 99f50b03..99f50b03 100644
--- a/data/icons/24x24/status/xfpm-primary-charged.png
+++ b/data/icons/24x24/xfpm-primary-charged.png
diff --git a/data/icons/24x24/status/xfpm-primary-missing.png b/data/icons/24x24/xfpm-primary-missing.png
index 41fca82b..41fca82b 100644
--- a/data/icons/24x24/status/xfpm-primary-missing.png
+++ b/data/icons/24x24/xfpm-primary-missing.png
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index d52da2b9..2a47d2da 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -1 +1,63 @@
-SUBDIRS = status
+EXTRA_DIST =				\
+	$(Data_DATA)
+
+Datadir = $(datadir)/icons/hicolor/32x32/status
+
+Data_DATA =				\
+	xfpm-ac-adapter.png		\
+	xfpm-keyboard-000.png		\
+	xfpm-keyboard-020.png		\
+	xfpm-keyboard-040.png		\
+	xfpm-keyboard-060.png		\
+	xfpm-keyboard-080.png		\
+	xfpm-keyboard-100.png		\
+	xfpm-mediaplayer-000.png		\
+	xfpm-mediaplayer-020.png		\
+	xfpm-mediaplayer-040.png		\
+	xfpm-mediaplayer-060.png		\
+	xfpm-mediaplayer-080.png		\
+	xfpm-mediaplayer-100.png		\
+	xfpm-monitor-000.png		\
+	xfpm-monitor-020.png		\
+	xfpm-monitor-040.png		\
+	xfpm-monitor-060.png		\
+	xfpm-monitor-080.png		\
+	xfpm-monitor-100.png		\
+	xfpm-mouse-000.png		\
+	xfpm-mouse-020.png		\
+	xfpm-mouse-040.png		\
+	xfpm-mouse-060.png		\
+	xfpm-mouse-080.png		\
+	xfpm-mouse-100.png		\
+	xfpm-pda-000.png		\
+	xfpm-pda-020.png		\
+	xfpm-pda-040.png		\
+	xfpm-pda-060.png		\
+	xfpm-pda-080.png		\
+	xfpm-pda-100.png		\
+	xfpm-phone-000.png		\
+	xfpm-phone-020.png		\
+	xfpm-phone-040.png		\
+	xfpm-phone-060.png		\
+	xfpm-phone-080.png		\
+	xfpm-phone-100.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		\
+	xfpm-ups-000.png		\
+	xfpm-ups-020.png		\
+	xfpm-ups-040.png		\
+	xfpm-ups-060.png		\
+	xfpm-ups-080.png		\
+	xfpm-ups-100.png
\ No newline at end of file
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
deleted file mode 100644
index 1608cb0f..00000000
--- a/data/icons/32x32/status/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-EXTRA_DIST =				\
-	$(Data_DATA)
-
-Datadir = $(datadir)/icons/hicolor/32x32/status
-
-Data_DATA =				\
-	xfpm-ac-adapter.png		\
-	xfpm-keyboard-000.png		\
-	xfpm-keyboard-020.png		\
-	xfpm-keyboard-040.png		\
-	xfpm-keyboard-060.png		\
-	xfpm-keyboard-080.png		\
-	xfpm-keyboard-100.png		\
-	xfpm-mediaplayer-000.png		\
-	xfpm-mediaplayer-020.png		\
-	xfpm-mediaplayer-040.png		\
-	xfpm-mediaplayer-060.png		\
-	xfpm-mediaplayer-080.png		\
-	xfpm-mediaplayer-100.png		\
-	xfpm-monitor-000.png		\
-	xfpm-monitor-020.png		\
-	xfpm-monitor-040.png		\
-	xfpm-monitor-060.png		\
-	xfpm-monitor-080.png		\
-	xfpm-monitor-100.png		\
-	xfpm-mouse-000.png		\
-	xfpm-mouse-020.png		\
-	xfpm-mouse-040.png		\
-	xfpm-mouse-060.png		\
-	xfpm-mouse-080.png		\
-	xfpm-mouse-100.png		\
-	xfpm-pda-000.png		\
-	xfpm-pda-020.png		\
-	xfpm-pda-040.png		\
-	xfpm-pda-060.png		\
-	xfpm-pda-080.png		\
-	xfpm-pda-100.png		\
-	xfpm-phone-000.png		\
-	xfpm-phone-020.png		\
-	xfpm-phone-040.png		\
-	xfpm-phone-060.png		\
-	xfpm-phone-080.png		\
-	xfpm-phone-100.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		\
-	xfpm-ups-000.png		\
-	xfpm-ups-020.png		\
-	xfpm-ups-040.png		\
-	xfpm-ups-060.png		\
-	xfpm-ups-080.png		\
-	xfpm-ups-100.png
diff --git a/data/icons/32x32/status/xfpm-ac-adapter.png b/data/icons/32x32/xfpm-ac-adapter.png
index 4b190b81..4b190b81 100644
--- a/data/icons/32x32/status/xfpm-ac-adapter.png
+++ b/data/icons/32x32/xfpm-ac-adapter.png
diff --git a/data/icons/32x32/xfpm-brightness-lcd.svg b/data/icons/32x32/xfpm-brightness-lcd.svg
new file mode 100644
index 00000000..d65c98ec
--- /dev/null
+++ b/data/icons/32x32/xfpm-brightness-lcd.svg
@@ -0,0 +1,189 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="32"
+   height="32"
+   id="svg11300"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="xfpm-brightness-lcd.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1084"
+     inkscape:window-height="777"
+     id="namedview21"
+     showgrid="true"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="6.5890976"
+     inkscape:cy="16.436761"
+     inkscape:window-x="471"
+     inkscape:window-y="146"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg11300"
+     inkscape:snap-global="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3007"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient5170">
+      <stop
+         id="stop5172"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5174"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5160">
+      <stop
+         id="stop5162"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5164"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5152">
+      <stop
+         id="stop5154"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5156"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.28125"
+       y1="21.40625"
+       x2="21.78125"
+       y2="55.90625"
+       id="linearGradient5158"
+       xlink:href="#linearGradient5152"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="25.90625"
+       cy="18.03125"
+       r="19.005075"
+       fx="25.90625"
+       fy="18.03125"
+       id="radialGradient5166"
+       xlink:href="#linearGradient5160"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.73703,0,0,0.73703,6.812572,4.741682)" />
+    <radialGradient
+       cx="25.3125"
+       cy="40.75"
+       r="18.0625"
+       fx="25.3125"
+       fy="40.75"
+       id="radialGradient5176"
+       xlink:href="#linearGradient5170"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.352941,0,26.36765)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5152"
+       id="linearGradient2999"
+       gradientUnits="userSpaceOnUse"
+       x1="23.28125"
+       y1="21.40625"
+       x2="21.78125"
+       y2="55.90625"
+       gradientTransform="matrix(0.7032588,0,0,0.7032588,-2.093307,-1.3312918)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5160"
+       id="radialGradient3002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53152803,0,0,0.53152803,33.966011,0.01313909)"
+       cx="25.90625"
+       cy="18.03125"
+       fx="25.90625"
+       fy="18.03125"
+       r="19.005075" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5170"
+       id="radialGradient3005"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.83044982,0,0,0.29309979,-5.0207612,14.762063)"
+       cx="25.3125"
+       cy="40.75"
+       fx="25.3125"
+       fy="40.75"
+       r="18.0625" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5160"
+       id="radialGradient3823"
+       cx="17"
+       cy="11.077868"
+       fx="17"
+       fy="11.077868"
+       r="15"
+       gradientTransform="matrix(0.8,0,0,0.86666666,3.4,1.3991807)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5152"
+       id="linearGradient3837"
+       x1="18"
+       y1="15"
+       x2="17"
+       y2="33"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     style="opacity:0.23595503;fill:url(#radialGradient3005);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="path5168"
+     inkscape:connector-curvature="0"
+     d="M 31,26.705882 C 31,29.629743 24.284271,32 16,32 7.715729,32 1,29.629743 1,26.705882 c 0,-2.92386 6.715729,-5.294117 15,-5.294117 8.284271,0 15,2.370257 15,5.294117 z" />
+  <path
+     style="fill:url(#radialGradient3823);fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 16,1.200125 c -0.75,0 -1.5,0.5 -1.5,1.5 l 0,3.90625 c -1.55621,0.2482913 -2.980474,0.8741538 -4.1875,1.78125 l -2.75,-2.78125 c -1.414214,-1.4142136 -3.539213,0.7107864 -2.125,2.125 l 2.78125,2.8125 C 7.4128716,11.694595 6.8557854,13.053511 6.625,14.5 L 3,14.5 c -2,0 -2,3 0,3 l 3.625,0 c 0.2458429,1.540865 0.8573427,2.738028 1.75,3.9375 L 5.5625,24.25 c -1.414213,1.414213 0.710786,3.539214 2.125,2.125 l 2.84375,-2.84375 c 1.158912,0.819749 2.506915,1.391766 3.96875,1.625 L 14.5,29 c 0,2 3,2 3,0 l 0,-3.84375 c 1.595725,-0.254596 3.055258,-0.899059 4.28125,-1.84375 l 2.625,2.625 c 1.414214,1.414214 3.539213,-0.710787 2.125,-2.125 L 23.84375,21.125 C 24.614347,19.995842 25.150519,18.906974 25.375,17.5 l 3.625,0 c 2,0 2,-3 0,-3 l -3.625,0 c -0.244435,-1.532041 -0.865604,-2.948545 -1.75,-4.143625 l 2.75,-2.78125 C 27.789213,6.1609114 25.664214,4.0671612 24.25,5.481375 l -2.75,2.75 c -1.163577,-0.8277675 -2.529342,-1.3903584 -4,-1.625 l 0,-3.90625 c 0,-1 -0.75,-1.5 -1.5,-1.5 z"
+     id="path3796"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssccccccssccssccssccssccsscccsccss" />
+</svg>
diff --git a/data/icons/32x32/status/xfpm-keyboard-000.png b/data/icons/32x32/xfpm-keyboard-000.png
index edcfa3a2..edcfa3a2 100644
--- a/data/icons/32x32/status/xfpm-keyboard-000.png
+++ b/data/icons/32x32/xfpm-keyboard-000.png
diff --git a/data/icons/32x32/status/xfpm-keyboard-000.svg b/data/icons/32x32/xfpm-keyboard-000.svg
index e574a59f..e574a59f 100644
--- a/data/icons/32x32/status/xfpm-keyboard-000.svg
+++ b/data/icons/32x32/xfpm-keyboard-000.svg
diff --git a/data/icons/32x32/status/xfpm-keyboard-020.png b/data/icons/32x32/xfpm-keyboard-020.png
index 76fd3e02..76fd3e02 100644
--- a/data/icons/32x32/status/xfpm-keyboard-020.png
+++ b/data/icons/32x32/xfpm-keyboard-020.png
diff --git a/data/icons/32x32/status/xfpm-keyboard-020.svg b/data/icons/32x32/xfpm-keyboard-020.svg
index 87bef1dc..87bef1dc 100644
--- a/data/icons/32x32/status/xfpm-keyboard-020.svg
+++ b/data/icons/32x32/xfpm-keyboard-020.svg
diff --git a/data/icons/32x32/status/xfpm-keyboard-040.png b/data/icons/32x32/xfpm-keyboard-040.png
index afd47db2..afd47db2 100644
--- a/data/icons/32x32/status/xfpm-keyboard-040.png
+++ b/data/icons/32x32/xfpm-keyboard-040.png
diff --git a/data/icons/32x32/status/xfpm-keyboard-040.svg b/data/icons/32x32/xfpm-keyboard-040.svg
index bc828b24..bc828b24 100644
--- a/data/icons/32x32/status/xfpm-keyboard-040.svg
+++ b/data/icons/32x32/xfpm-keyboard-040.svg
diff --git a/data/icons/32x32/status/xfpm-keyboard-060.png b/data/icons/32x32/xfpm-keyboard-060.png
index 250667ee..250667ee 100644
--- a/data/icons/32x32/status/xfpm-keyboard-060.png
+++ b/data/icons/32x32/xfpm-keyboard-060.png
diff --git a/data/icons/32x32/status/xfpm-keyboard-060.svg b/data/icons/32x32/xfpm-keyboard-060.svg
index 72a8abfa..72a8abfa 100644
--- a/data/icons/32x32/status/xfpm-keyboard-060.svg
+++ b/data/icons/32x32/xfpm-keyboard-060.svg
diff --git a/data/icons/32x32/status/xfpm-keyboard-080.png b/data/icons/32x32/xfpm-keyboard-080.png
index 3445d9c3..3445d9c3 100644
--- a/data/icons/32x32/status/xfpm-keyboard-080.png
+++ b/data/icons/32x32/xfpm-keyboard-080.png
diff --git a/data/icons/32x32/status/xfpm-keyboard-080.svg b/data/icons/32x32/xfpm-keyboard-080.svg
index 024e9d42..024e9d42 100644
--- a/data/icons/32x32/status/xfpm-keyboard-080.svg
+++ b/data/icons/32x32/xfpm-keyboard-080.svg
diff --git a/data/icons/32x32/status/xfpm-keyboard-100.png b/data/icons/32x32/xfpm-keyboard-100.png
index c09fd15d..c09fd15d 100644
--- a/data/icons/32x32/status/xfpm-keyboard-100.png
+++ b/data/icons/32x32/xfpm-keyboard-100.png
diff --git a/data/icons/32x32/status/xfpm-keyboard-100.svg b/data/icons/32x32/xfpm-keyboard-100.svg
index edafadcc..edafadcc 100644
--- a/data/icons/32x32/status/xfpm-keyboard-100.svg
+++ b/data/icons/32x32/xfpm-keyboard-100.svg
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-000.png b/data/icons/32x32/xfpm-mediaplayer-000.png
index 59e92af9..59e92af9 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-000.png
+++ b/data/icons/32x32/xfpm-mediaplayer-000.png
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-000.svg b/data/icons/32x32/xfpm-mediaplayer-000.svg
index 0b86cd3e..0b86cd3e 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-000.svg
+++ b/data/icons/32x32/xfpm-mediaplayer-000.svg
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-020.png b/data/icons/32x32/xfpm-mediaplayer-020.png
index cc5b3ba8..cc5b3ba8 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-020.png
+++ b/data/icons/32x32/xfpm-mediaplayer-020.png
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-020.svg b/data/icons/32x32/xfpm-mediaplayer-020.svg
index 2da07824..2da07824 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-020.svg
+++ b/data/icons/32x32/xfpm-mediaplayer-020.svg
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-040.png b/data/icons/32x32/xfpm-mediaplayer-040.png
index 9faad65f..9faad65f 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-040.png
+++ b/data/icons/32x32/xfpm-mediaplayer-040.png
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-040.svg b/data/icons/32x32/xfpm-mediaplayer-040.svg
index 22a8e8e1..22a8e8e1 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-040.svg
+++ b/data/icons/32x32/xfpm-mediaplayer-040.svg
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-060.png b/data/icons/32x32/xfpm-mediaplayer-060.png
index efd6ac5b..efd6ac5b 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-060.png
+++ b/data/icons/32x32/xfpm-mediaplayer-060.png
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-060.svg b/data/icons/32x32/xfpm-mediaplayer-060.svg
index 1d3323d8..1d3323d8 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-060.svg
+++ b/data/icons/32x32/xfpm-mediaplayer-060.svg
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-080.png b/data/icons/32x32/xfpm-mediaplayer-080.png
index 0eeb1c36..0eeb1c36 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-080.png
+++ b/data/icons/32x32/xfpm-mediaplayer-080.png
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-080.svg b/data/icons/32x32/xfpm-mediaplayer-080.svg
index 9cb2d47e..9cb2d47e 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-080.svg
+++ b/data/icons/32x32/xfpm-mediaplayer-080.svg
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-100.png b/data/icons/32x32/xfpm-mediaplayer-100.png
index 0b0b4e53..0b0b4e53 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-100.png
+++ b/data/icons/32x32/xfpm-mediaplayer-100.png
diff --git a/data/icons/32x32/status/xfpm-mediaplayer-100.svg b/data/icons/32x32/xfpm-mediaplayer-100.svg
index 304aafd5..304aafd5 100644
--- a/data/icons/32x32/status/xfpm-mediaplayer-100.svg
+++ b/data/icons/32x32/xfpm-mediaplayer-100.svg
diff --git a/data/icons/32x32/status/xfpm-monitor-000.png b/data/icons/32x32/xfpm-monitor-000.png
index e35cef67..e35cef67 100644
--- a/data/icons/32x32/status/xfpm-monitor-000.png
+++ b/data/icons/32x32/xfpm-monitor-000.png
diff --git a/data/icons/32x32/status/xfpm-monitor-000.svg b/data/icons/32x32/xfpm-monitor-000.svg
index f85c2056..f85c2056 100644
--- a/data/icons/32x32/status/xfpm-monitor-000.svg
+++ b/data/icons/32x32/xfpm-monitor-000.svg
diff --git a/data/icons/32x32/status/xfpm-monitor-020.png b/data/icons/32x32/xfpm-monitor-020.png
index 34893699..34893699 100644
--- a/data/icons/32x32/status/xfpm-monitor-020.png
+++ b/data/icons/32x32/xfpm-monitor-020.png
diff --git a/data/icons/32x32/status/xfpm-monitor-020.svg b/data/icons/32x32/xfpm-monitor-020.svg
index de48e905..de48e905 100644
--- a/data/icons/32x32/status/xfpm-monitor-020.svg
+++ b/data/icons/32x32/xfpm-monitor-020.svg
diff --git a/data/icons/32x32/status/xfpm-monitor-040.png b/data/icons/32x32/xfpm-monitor-040.png
index 3c703e7f..3c703e7f 100644
--- a/data/icons/32x32/status/xfpm-monitor-040.png
+++ b/data/icons/32x32/xfpm-monitor-040.png
diff --git a/data/icons/32x32/status/xfpm-monitor-040.svg b/data/icons/32x32/xfpm-monitor-040.svg
index d55ae58e..d55ae58e 100644
--- a/data/icons/32x32/status/xfpm-monitor-040.svg
+++ b/data/icons/32x32/xfpm-monitor-040.svg
diff --git a/data/icons/32x32/status/xfpm-monitor-060.png b/data/icons/32x32/xfpm-monitor-060.png
index 26b63092..26b63092 100644
--- a/data/icons/32x32/status/xfpm-monitor-060.png
+++ b/data/icons/32x32/xfpm-monitor-060.png
diff --git a/data/icons/32x32/status/xfpm-monitor-060.svg b/data/icons/32x32/xfpm-monitor-060.svg
index fa81b8b2..fa81b8b2 100644
--- a/data/icons/32x32/status/xfpm-monitor-060.svg
+++ b/data/icons/32x32/xfpm-monitor-060.svg
diff --git a/data/icons/32x32/status/xfpm-monitor-080.png b/data/icons/32x32/xfpm-monitor-080.png
index 610ff5be..610ff5be 100644
--- a/data/icons/32x32/status/xfpm-monitor-080.png
+++ b/data/icons/32x32/xfpm-monitor-080.png
diff --git a/data/icons/32x32/status/xfpm-monitor-080.svg b/data/icons/32x32/xfpm-monitor-080.svg
index 93513527..93513527 100644
--- a/data/icons/32x32/status/xfpm-monitor-080.svg
+++ b/data/icons/32x32/xfpm-monitor-080.svg
diff --git a/data/icons/32x32/status/xfpm-monitor-100.png b/data/icons/32x32/xfpm-monitor-100.png
index a01699d8..a01699d8 100644
--- a/data/icons/32x32/status/xfpm-monitor-100.png
+++ b/data/icons/32x32/xfpm-monitor-100.png
diff --git a/data/icons/32x32/status/xfpm-monitor-100.svg b/data/icons/32x32/xfpm-monitor-100.svg
index 61c72b1b..61c72b1b 100644
--- a/data/icons/32x32/status/xfpm-monitor-100.svg
+++ b/data/icons/32x32/xfpm-monitor-100.svg
diff --git a/data/icons/32x32/status/xfpm-mouse-000.png b/data/icons/32x32/xfpm-mouse-000.png
index cc943c7b..cc943c7b 100644
--- a/data/icons/32x32/status/xfpm-mouse-000.png
+++ b/data/icons/32x32/xfpm-mouse-000.png
diff --git a/data/icons/32x32/status/xfpm-mouse-000.svg b/data/icons/32x32/xfpm-mouse-000.svg
index cbc8b919..cbc8b919 100644
--- a/data/icons/32x32/status/xfpm-mouse-000.svg
+++ b/data/icons/32x32/xfpm-mouse-000.svg
diff --git a/data/icons/32x32/status/xfpm-mouse-020.png b/data/icons/32x32/xfpm-mouse-020.png
index ccf55727..ccf55727 100644
--- a/data/icons/32x32/status/xfpm-mouse-020.png
+++ b/data/icons/32x32/xfpm-mouse-020.png
diff --git a/data/icons/32x32/status/xfpm-mouse-020.svg b/data/icons/32x32/xfpm-mouse-020.svg
index aacb10ae..aacb10ae 100644
--- a/data/icons/32x32/status/xfpm-mouse-020.svg
+++ b/data/icons/32x32/xfpm-mouse-020.svg
diff --git a/data/icons/32x32/status/xfpm-mouse-040.png b/data/icons/32x32/xfpm-mouse-040.png
index dad14b6a..dad14b6a 100644
--- a/data/icons/32x32/status/xfpm-mouse-040.png
+++ b/data/icons/32x32/xfpm-mouse-040.png
diff --git a/data/icons/32x32/status/xfpm-mouse-040.svg b/data/icons/32x32/xfpm-mouse-040.svg
index 992c9756..992c9756 100644
--- a/data/icons/32x32/status/xfpm-mouse-040.svg
+++ b/data/icons/32x32/xfpm-mouse-040.svg
diff --git a/data/icons/32x32/status/xfpm-mouse-060.png b/data/icons/32x32/xfpm-mouse-060.png
index 16c6fc59..16c6fc59 100644
--- a/data/icons/32x32/status/xfpm-mouse-060.png
+++ b/data/icons/32x32/xfpm-mouse-060.png
diff --git a/data/icons/32x32/status/xfpm-mouse-060.svg b/data/icons/32x32/xfpm-mouse-060.svg
index eb55db17..eb55db17 100644
--- a/data/icons/32x32/status/xfpm-mouse-060.svg
+++ b/data/icons/32x32/xfpm-mouse-060.svg
diff --git a/data/icons/32x32/status/xfpm-mouse-080.png b/data/icons/32x32/xfpm-mouse-080.png
index c2005dc5..c2005dc5 100644
--- a/data/icons/32x32/status/xfpm-mouse-080.png
+++ b/data/icons/32x32/xfpm-mouse-080.png
diff --git a/data/icons/32x32/status/xfpm-mouse-080.svg b/data/icons/32x32/xfpm-mouse-080.svg
index 41e843ee..41e843ee 100644
--- a/data/icons/32x32/status/xfpm-mouse-080.svg
+++ b/data/icons/32x32/xfpm-mouse-080.svg
diff --git a/data/icons/32x32/status/xfpm-mouse-100.png b/data/icons/32x32/xfpm-mouse-100.png
index 1404b2aa..1404b2aa 100644
--- a/data/icons/32x32/status/xfpm-mouse-100.png
+++ b/data/icons/32x32/xfpm-mouse-100.png
diff --git a/data/icons/32x32/status/xfpm-mouse-100.svg b/data/icons/32x32/xfpm-mouse-100.svg
index e6323026..e6323026 100644
--- a/data/icons/32x32/status/xfpm-mouse-100.svg
+++ b/data/icons/32x32/xfpm-mouse-100.svg
diff --git a/data/icons/32x32/status/xfpm-pda-000.png b/data/icons/32x32/xfpm-pda-000.png
index 934aa66c..934aa66c 100644
--- a/data/icons/32x32/status/xfpm-pda-000.png
+++ b/data/icons/32x32/xfpm-pda-000.png
diff --git a/data/icons/32x32/status/xfpm-pda-000.svg b/data/icons/32x32/xfpm-pda-000.svg
index 02a11bb1..02a11bb1 100644
--- a/data/icons/32x32/status/xfpm-pda-000.svg
+++ b/data/icons/32x32/xfpm-pda-000.svg
diff --git a/data/icons/32x32/status/xfpm-pda-020.png b/data/icons/32x32/xfpm-pda-020.png
index e3ced996..e3ced996 100644
--- a/data/icons/32x32/status/xfpm-pda-020.png
+++ b/data/icons/32x32/xfpm-pda-020.png
diff --git a/data/icons/32x32/status/xfpm-pda-020.svg b/data/icons/32x32/xfpm-pda-020.svg
index bd5f77c2..bd5f77c2 100644
--- a/data/icons/32x32/status/xfpm-pda-020.svg
+++ b/data/icons/32x32/xfpm-pda-020.svg
diff --git a/data/icons/32x32/status/xfpm-pda-040.png b/data/icons/32x32/xfpm-pda-040.png
index 56d53c96..56d53c96 100644
--- a/data/icons/32x32/status/xfpm-pda-040.png
+++ b/data/icons/32x32/xfpm-pda-040.png
diff --git a/data/icons/32x32/status/xfpm-pda-040.svg b/data/icons/32x32/xfpm-pda-040.svg
index e11698a0..e11698a0 100644
--- a/data/icons/32x32/status/xfpm-pda-040.svg
+++ b/data/icons/32x32/xfpm-pda-040.svg
diff --git a/data/icons/32x32/status/xfpm-pda-060.png b/data/icons/32x32/xfpm-pda-060.png
index b0cec074..b0cec074 100644
--- a/data/icons/32x32/status/xfpm-pda-060.png
+++ b/data/icons/32x32/xfpm-pda-060.png
diff --git a/data/icons/32x32/status/xfpm-pda-060.svg b/data/icons/32x32/xfpm-pda-060.svg
index a5ac9551..a5ac9551 100644
--- a/data/icons/32x32/status/xfpm-pda-060.svg
+++ b/data/icons/32x32/xfpm-pda-060.svg
diff --git a/data/icons/32x32/status/xfpm-pda-080.png b/data/icons/32x32/xfpm-pda-080.png
index 79aec563..79aec563 100644
--- a/data/icons/32x32/status/xfpm-pda-080.png
+++ b/data/icons/32x32/xfpm-pda-080.png
diff --git a/data/icons/32x32/status/xfpm-pda-080.svg b/data/icons/32x32/xfpm-pda-080.svg
index 4c4a260d..4c4a260d 100644
--- a/data/icons/32x32/status/xfpm-pda-080.svg
+++ b/data/icons/32x32/xfpm-pda-080.svg
diff --git a/data/icons/32x32/status/xfpm-pda-100.png b/data/icons/32x32/xfpm-pda-100.png
index 89514709..89514709 100644
--- a/data/icons/32x32/status/xfpm-pda-100.png
+++ b/data/icons/32x32/xfpm-pda-100.png
diff --git a/data/icons/32x32/status/xfpm-pda-100.svg b/data/icons/32x32/xfpm-pda-100.svg
index 56f0e1c9..56f0e1c9 100644
--- a/data/icons/32x32/status/xfpm-pda-100.svg
+++ b/data/icons/32x32/xfpm-pda-100.svg
diff --git a/data/icons/32x32/status/xfpm-phone-000.png b/data/icons/32x32/xfpm-phone-000.png
index feef82dd..feef82dd 100644
--- a/data/icons/32x32/status/xfpm-phone-000.png
+++ b/data/icons/32x32/xfpm-phone-000.png
diff --git a/data/icons/32x32/status/xfpm-phone-000.svg b/data/icons/32x32/xfpm-phone-000.svg
index b4cfdf23..b4cfdf23 100644
--- a/data/icons/32x32/status/xfpm-phone-000.svg
+++ b/data/icons/32x32/xfpm-phone-000.svg
diff --git a/data/icons/32x32/status/xfpm-phone-020.png b/data/icons/32x32/xfpm-phone-020.png
index a7d8f537..a7d8f537 100644
--- a/data/icons/32x32/status/xfpm-phone-020.png
+++ b/data/icons/32x32/xfpm-phone-020.png
diff --git a/data/icons/32x32/status/xfpm-phone-020.svg b/data/icons/32x32/xfpm-phone-020.svg
index f99274e3..f99274e3 100644
--- a/data/icons/32x32/status/xfpm-phone-020.svg
+++ b/data/icons/32x32/xfpm-phone-020.svg
diff --git a/data/icons/32x32/status/xfpm-phone-040.png b/data/icons/32x32/xfpm-phone-040.png
index c99f9752..c99f9752 100644
--- a/data/icons/32x32/status/xfpm-phone-040.png
+++ b/data/icons/32x32/xfpm-phone-040.png
diff --git a/data/icons/32x32/status/xfpm-phone-040.svg b/data/icons/32x32/xfpm-phone-040.svg
index a49fe99e..a49fe99e 100644
--- a/data/icons/32x32/status/xfpm-phone-040.svg
+++ b/data/icons/32x32/xfpm-phone-040.svg
diff --git a/data/icons/32x32/status/xfpm-phone-060.png b/data/icons/32x32/xfpm-phone-060.png
index 38fa1a4b..38fa1a4b 100644
--- a/data/icons/32x32/status/xfpm-phone-060.png
+++ b/data/icons/32x32/xfpm-phone-060.png
diff --git a/data/icons/32x32/status/xfpm-phone-060.svg b/data/icons/32x32/xfpm-phone-060.svg
index 837cca02..837cca02 100644
--- a/data/icons/32x32/status/xfpm-phone-060.svg
+++ b/data/icons/32x32/xfpm-phone-060.svg
diff --git a/data/icons/32x32/status/xfpm-phone-080.png b/data/icons/32x32/xfpm-phone-080.png
index 3efddd0f..3efddd0f 100644
--- a/data/icons/32x32/status/xfpm-phone-080.png
+++ b/data/icons/32x32/xfpm-phone-080.png
diff --git a/data/icons/32x32/status/xfpm-phone-080.svg b/data/icons/32x32/xfpm-phone-080.svg
index fd3f587b..fd3f587b 100644
--- a/data/icons/32x32/status/xfpm-phone-080.svg
+++ b/data/icons/32x32/xfpm-phone-080.svg
diff --git a/data/icons/32x32/status/xfpm-phone-100.png b/data/icons/32x32/xfpm-phone-100.png
index 6e51436e..6e51436e 100644
--- a/data/icons/32x32/status/xfpm-phone-100.png
+++ b/data/icons/32x32/xfpm-phone-100.png
diff --git a/data/icons/32x32/status/xfpm-phone-100.svg b/data/icons/32x32/xfpm-phone-100.svg
index e3f6dcff..e3f6dcff 100644
--- a/data/icons/32x32/status/xfpm-phone-100.svg
+++ b/data/icons/32x32/xfpm-phone-100.svg
diff --git a/data/icons/32x32/status/xfpm-primary-000-charging.png b/data/icons/32x32/xfpm-primary-000-charging.png
index c22f0afd..c22f0afd 100644
--- a/data/icons/32x32/status/xfpm-primary-000-charging.png
+++ b/data/icons/32x32/xfpm-primary-000-charging.png
diff --git a/data/icons/32x32/status/xfpm-primary-000.png b/data/icons/32x32/xfpm-primary-000.png
index 5e667cc1..5e667cc1 100644
--- a/data/icons/32x32/status/xfpm-primary-000.png
+++ b/data/icons/32x32/xfpm-primary-000.png
diff --git a/data/icons/32x32/status/xfpm-primary-020-charging.png b/data/icons/32x32/xfpm-primary-020-charging.png
index f999837e..f999837e 100644
--- a/data/icons/32x32/status/xfpm-primary-020-charging.png
+++ b/data/icons/32x32/xfpm-primary-020-charging.png
diff --git a/data/icons/32x32/status/xfpm-primary-020.png b/data/icons/32x32/xfpm-primary-020.png
index bba45d73..bba45d73 100644
--- a/data/icons/32x32/status/xfpm-primary-020.png
+++ b/data/icons/32x32/xfpm-primary-020.png
diff --git a/data/icons/32x32/status/xfpm-primary-040-charging.png b/data/icons/32x32/xfpm-primary-040-charging.png
index 20dcd122..20dcd122 100644
--- a/data/icons/32x32/status/xfpm-primary-040-charging.png
+++ b/data/icons/32x32/xfpm-primary-040-charging.png
diff --git a/data/icons/32x32/status/xfpm-primary-040.png b/data/icons/32x32/xfpm-primary-040.png
index e637beb2..e637beb2 100644
--- a/data/icons/32x32/status/xfpm-primary-040.png
+++ b/data/icons/32x32/xfpm-primary-040.png
diff --git a/data/icons/32x32/status/xfpm-primary-060-charging.png b/data/icons/32x32/xfpm-primary-060-charging.png
index 0303f527..0303f527 100644
--- a/data/icons/32x32/status/xfpm-primary-060-charging.png
+++ b/data/icons/32x32/xfpm-primary-060-charging.png
diff --git a/data/icons/32x32/status/xfpm-primary-060.png b/data/icons/32x32/xfpm-primary-060.png
index bf052a8a..bf052a8a 100644
--- a/data/icons/32x32/status/xfpm-primary-060.png
+++ b/data/icons/32x32/xfpm-primary-060.png
diff --git a/data/icons/32x32/status/xfpm-primary-080-charging.png b/data/icons/32x32/xfpm-primary-080-charging.png
index cc2a9bf2..cc2a9bf2 100644
--- a/data/icons/32x32/status/xfpm-primary-080-charging.png
+++ b/data/icons/32x32/xfpm-primary-080-charging.png
diff --git a/data/icons/32x32/status/xfpm-primary-080.png b/data/icons/32x32/xfpm-primary-080.png
index 8bae646c..8bae646c 100644
--- a/data/icons/32x32/status/xfpm-primary-080.png
+++ b/data/icons/32x32/xfpm-primary-080.png
diff --git a/data/icons/32x32/status/xfpm-primary-100-charging.png b/data/icons/32x32/xfpm-primary-100-charging.png
index c352fe7e..c352fe7e 100644
--- a/data/icons/32x32/status/xfpm-primary-100-charging.png
+++ b/data/icons/32x32/xfpm-primary-100-charging.png
diff --git a/data/icons/32x32/status/xfpm-primary-100.png b/data/icons/32x32/xfpm-primary-100.png
index f80529b1..f80529b1 100644
--- a/data/icons/32x32/status/xfpm-primary-100.png
+++ b/data/icons/32x32/xfpm-primary-100.png
diff --git a/data/icons/32x32/status/xfpm-primary-charged.png b/data/icons/32x32/xfpm-primary-charged.png
index 7a248afa..7a248afa 100644
--- a/data/icons/32x32/status/xfpm-primary-charged.png
+++ b/data/icons/32x32/xfpm-primary-charged.png
diff --git a/data/icons/32x32/status/xfpm-primary-missing.png b/data/icons/32x32/xfpm-primary-missing.png
index 632907e5..632907e5 100644
--- a/data/icons/32x32/status/xfpm-primary-missing.png
+++ b/data/icons/32x32/xfpm-primary-missing.png
diff --git a/data/icons/32x32/status/xfpm-ups-000.png b/data/icons/32x32/xfpm-ups-000.png
index 84293154..84293154 100644
--- a/data/icons/32x32/status/xfpm-ups-000.png
+++ b/data/icons/32x32/xfpm-ups-000.png
diff --git a/data/icons/32x32/status/xfpm-ups-000.svg b/data/icons/32x32/xfpm-ups-000.svg
index b22059b3..b22059b3 100644
--- a/data/icons/32x32/status/xfpm-ups-000.svg
+++ b/data/icons/32x32/xfpm-ups-000.svg
diff --git a/data/icons/32x32/status/xfpm-ups-020.png b/data/icons/32x32/xfpm-ups-020.png
index 2078977e..2078977e 100644
--- a/data/icons/32x32/status/xfpm-ups-020.png
+++ b/data/icons/32x32/xfpm-ups-020.png
diff --git a/data/icons/32x32/status/xfpm-ups-020.svg b/data/icons/32x32/xfpm-ups-020.svg
index c10ac128..c10ac128 100644
--- a/data/icons/32x32/status/xfpm-ups-020.svg
+++ b/data/icons/32x32/xfpm-ups-020.svg
diff --git a/data/icons/32x32/status/xfpm-ups-040.png b/data/icons/32x32/xfpm-ups-040.png
index 87671e36..87671e36 100644
--- a/data/icons/32x32/status/xfpm-ups-040.png
+++ b/data/icons/32x32/xfpm-ups-040.png
diff --git a/data/icons/32x32/status/xfpm-ups-040.svg b/data/icons/32x32/xfpm-ups-040.svg
index d9f81cbe..d9f81cbe 100644
--- a/data/icons/32x32/status/xfpm-ups-040.svg
+++ b/data/icons/32x32/xfpm-ups-040.svg
diff --git a/data/icons/32x32/status/xfpm-ups-060.png b/data/icons/32x32/xfpm-ups-060.png
index 60d0ea5e..60d0ea5e 100644
--- a/data/icons/32x32/status/xfpm-ups-060.png
+++ b/data/icons/32x32/xfpm-ups-060.png
diff --git a/data/icons/32x32/status/xfpm-ups-060.svg b/data/icons/32x32/xfpm-ups-060.svg
index df0d1021..df0d1021 100644
--- a/data/icons/32x32/status/xfpm-ups-060.svg
+++ b/data/icons/32x32/xfpm-ups-060.svg
diff --git a/data/icons/32x32/status/xfpm-ups-080.png b/data/icons/32x32/xfpm-ups-080.png
index 15be7145..15be7145 100644
--- a/data/icons/32x32/status/xfpm-ups-080.png
+++ b/data/icons/32x32/xfpm-ups-080.png
diff --git a/data/icons/32x32/status/xfpm-ups-080.svg b/data/icons/32x32/xfpm-ups-080.svg
index 2bab3173..2bab3173 100644
--- a/data/icons/32x32/status/xfpm-ups-080.svg
+++ b/data/icons/32x32/xfpm-ups-080.svg
diff --git a/data/icons/32x32/status/xfpm-ups-100.png b/data/icons/32x32/xfpm-ups-100.png
index ffd44a5d..ffd44a5d 100644
--- a/data/icons/32x32/status/xfpm-ups-100.png
+++ b/data/icons/32x32/xfpm-ups-100.png
diff --git a/data/icons/32x32/status/xfpm-ups-100.svg b/data/icons/32x32/xfpm-ups-100.svg
index 5a622871..5a622871 100644
--- a/data/icons/32x32/status/xfpm-ups-100.svg
+++ b/data/icons/32x32/xfpm-ups-100.svg
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index c2458c15..d27be2f9 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -1,2 +1,23 @@
-SUBDIRS = status
+EXTRA_DIST =				\
+	$(Data_DATA)
 
+Datadir = $(datadir)/icons/hicolor/48x48/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		\
+	xfpm-brightness-lcd-invalid.png	\
+	xfpm-brightness-lcd.png
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
deleted file mode 100644
index d27be2f9..00000000
--- a/data/icons/48x48/status/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-EXTRA_DIST =				\
-	$(Data_DATA)
-
-Datadir = $(datadir)/icons/hicolor/48x48/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		\
-	xfpm-brightness-lcd-invalid.png	\
-	xfpm-brightness-lcd.png
diff --git a/data/icons/48x48/status/xfpm-ac-adapter.png b/data/icons/48x48/xfpm-ac-adapter.png
index 4e9b9865..4e9b9865 100644
--- a/data/icons/48x48/status/xfpm-ac-adapter.png
+++ b/data/icons/48x48/xfpm-ac-adapter.png
diff --git a/data/icons/48x48/status/xfpm-brightness-lcd-invalid.png b/data/icons/48x48/xfpm-brightness-lcd-invalid.png
index 878e54ec..878e54ec 100644
--- a/data/icons/48x48/status/xfpm-brightness-lcd-invalid.png
+++ b/data/icons/48x48/xfpm-brightness-lcd-invalid.png
diff --git a/data/icons/48x48/status/xfpm-brightness-lcd.png b/data/icons/48x48/xfpm-brightness-lcd.png
index d03329da..d03329da 100644
--- a/data/icons/48x48/status/xfpm-brightness-lcd.png
+++ b/data/icons/48x48/xfpm-brightness-lcd.png
diff --git a/data/icons/48x48/status/xfpm-primary-000-charging.png b/data/icons/48x48/xfpm-primary-000-charging.png
index 61c8238f..61c8238f 100644
--- a/data/icons/48x48/status/xfpm-primary-000-charging.png
+++ b/data/icons/48x48/xfpm-primary-000-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-000.png b/data/icons/48x48/xfpm-primary-000.png
index 7dce54b1..7dce54b1 100644
--- a/data/icons/48x48/status/xfpm-primary-000.png
+++ b/data/icons/48x48/xfpm-primary-000.png
diff --git a/data/icons/48x48/status/xfpm-primary-020-charging.png b/data/icons/48x48/xfpm-primary-020-charging.png
index 8c968c6c..8c968c6c 100644
--- a/data/icons/48x48/status/xfpm-primary-020-charging.png
+++ b/data/icons/48x48/xfpm-primary-020-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-020.png b/data/icons/48x48/xfpm-primary-020.png
index a7d8d910..a7d8d910 100644
--- a/data/icons/48x48/status/xfpm-primary-020.png
+++ b/data/icons/48x48/xfpm-primary-020.png
diff --git a/data/icons/48x48/status/xfpm-primary-040-charging.png b/data/icons/48x48/xfpm-primary-040-charging.png
index 54675fa8..54675fa8 100644
--- a/data/icons/48x48/status/xfpm-primary-040-charging.png
+++ b/data/icons/48x48/xfpm-primary-040-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-040.png b/data/icons/48x48/xfpm-primary-040.png
index 417b3953..417b3953 100644
--- a/data/icons/48x48/status/xfpm-primary-040.png
+++ b/data/icons/48x48/xfpm-primary-040.png
diff --git a/data/icons/48x48/status/xfpm-primary-060-charging.png b/data/icons/48x48/xfpm-primary-060-charging.png
index 020d30a4..020d30a4 100644
--- a/data/icons/48x48/status/xfpm-primary-060-charging.png
+++ b/data/icons/48x48/xfpm-primary-060-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-060.png b/data/icons/48x48/xfpm-primary-060.png
index aa976241..aa976241 100644
--- a/data/icons/48x48/status/xfpm-primary-060.png
+++ b/data/icons/48x48/xfpm-primary-060.png
diff --git a/data/icons/48x48/status/xfpm-primary-080-charging.png b/data/icons/48x48/xfpm-primary-080-charging.png
index 93091fc4..93091fc4 100644
--- a/data/icons/48x48/status/xfpm-primary-080-charging.png
+++ b/data/icons/48x48/xfpm-primary-080-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-080.png b/data/icons/48x48/xfpm-primary-080.png
index 362f38a1..362f38a1 100644
--- a/data/icons/48x48/status/xfpm-primary-080.png
+++ b/data/icons/48x48/xfpm-primary-080.png
diff --git a/data/icons/48x48/status/xfpm-primary-100-charging.png b/data/icons/48x48/xfpm-primary-100-charging.png
index b2e0c802..b2e0c802 100644
--- a/data/icons/48x48/status/xfpm-primary-100-charging.png
+++ b/data/icons/48x48/xfpm-primary-100-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-100.png b/data/icons/48x48/xfpm-primary-100.png
index d3fb24e8..d3fb24e8 100644
--- a/data/icons/48x48/status/xfpm-primary-100.png
+++ b/data/icons/48x48/xfpm-primary-100.png
diff --git a/data/icons/48x48/status/xfpm-primary-charged.png b/data/icons/48x48/xfpm-primary-charged.png
index 8368c713..8368c713 100644
--- a/data/icons/48x48/status/xfpm-primary-charged.png
+++ b/data/icons/48x48/xfpm-primary-charged.png
diff --git a/data/icons/48x48/status/xfpm-primary-missing.png b/data/icons/48x48/xfpm-primary-missing.png
index 95d7c549..95d7c549 100644
--- a/data/icons/48x48/status/xfpm-primary-missing.png
+++ b/data/icons/48x48/xfpm-primary-missing.png
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index c2458c15..9467c2cb 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1,2 +1,23 @@
-SUBDIRS = status
+EXTRA_DIST =				\
+	$(Data_DATA)
 
+Datadir = $(datadir)/icons/hicolor/scalable/status
+
+Data_DATA =				\
+	xfpm-ac-adapter.svg		\
+	xfpm-primary-000.svg		\
+	xfpm-primary-020.svg		\
+	xfpm-primary-040.svg		\
+	xfpm-primary-060.svg		\
+	xfpm-primary-080.svg		\
+	xfpm-primary-100.svg		\
+	xfpm-primary-000-charging.svg	\
+	xfpm-primary-020-charging.svg	\
+	xfpm-primary-040-charging.svg	\
+	xfpm-primary-060-charging.svg	\
+	xfpm-primary-080-charging.svg	\
+	xfpm-primary-100-charging.svg	\
+	xfpm-primary-charged.svg		\
+	xfpm-primary-missing.svg		\
+	xfpm-brightness-lcd-invalid.svg	\
+	xfpm-brightness-lcd.svg
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
deleted file mode 100644
index 9467c2cb..00000000
--- a/data/icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-EXTRA_DIST =				\
-	$(Data_DATA)
-
-Datadir = $(datadir)/icons/hicolor/scalable/status
-
-Data_DATA =				\
-	xfpm-ac-adapter.svg		\
-	xfpm-primary-000.svg		\
-	xfpm-primary-020.svg		\
-	xfpm-primary-040.svg		\
-	xfpm-primary-060.svg		\
-	xfpm-primary-080.svg		\
-	xfpm-primary-100.svg		\
-	xfpm-primary-000-charging.svg	\
-	xfpm-primary-020-charging.svg	\
-	xfpm-primary-040-charging.svg	\
-	xfpm-primary-060-charging.svg	\
-	xfpm-primary-080-charging.svg	\
-	xfpm-primary-100-charging.svg	\
-	xfpm-primary-charged.svg		\
-	xfpm-primary-missing.svg		\
-	xfpm-brightness-lcd-invalid.svg	\
-	xfpm-brightness-lcd.svg
diff --git a/data/icons/scalable/status/xfpm-ac-adapter.svg b/data/icons/scalable/xfpm-ac-adapter.svg
index f40ab722..f40ab722 100644
--- a/data/icons/scalable/status/xfpm-ac-adapter.svg
+++ b/data/icons/scalable/xfpm-ac-adapter.svg
diff --git a/data/icons/scalable/status/xfpm-brightness-lcd-invalid.svg b/data/icons/scalable/xfpm-brightness-lcd-invalid.svg
index 6b92a7fb..6b92a7fb 100644
--- a/data/icons/scalable/status/xfpm-brightness-lcd-invalid.svg
+++ b/data/icons/scalable/xfpm-brightness-lcd-invalid.svg
diff --git a/data/icons/scalable/status/xfpm-brightness-lcd.svg b/data/icons/scalable/xfpm-brightness-lcd.svg
index 5c94c70c..5c94c70c 100644
--- a/data/icons/scalable/status/xfpm-brightness-lcd.svg
+++ b/data/icons/scalable/xfpm-brightness-lcd.svg
diff --git a/data/icons/scalable/status/xfpm-primary-000-charging.svg b/data/icons/scalable/xfpm-primary-000-charging.svg
index f9d3529a..f9d3529a 100644
--- a/data/icons/scalable/status/xfpm-primary-000-charging.svg
+++ b/data/icons/scalable/xfpm-primary-000-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-000.svg b/data/icons/scalable/xfpm-primary-000.svg
index 7e67f647..7e67f647 100644
--- a/data/icons/scalable/status/xfpm-primary-000.svg
+++ b/data/icons/scalable/xfpm-primary-000.svg
diff --git a/data/icons/scalable/status/xfpm-primary-020-charging.svg b/data/icons/scalable/xfpm-primary-020-charging.svg
index 3bcf151e..3bcf151e 100644
--- a/data/icons/scalable/status/xfpm-primary-020-charging.svg
+++ b/data/icons/scalable/xfpm-primary-020-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-020.svg b/data/icons/scalable/xfpm-primary-020.svg
index 54eca18c..54eca18c 100644
--- a/data/icons/scalable/status/xfpm-primary-020.svg
+++ b/data/icons/scalable/xfpm-primary-020.svg
diff --git a/data/icons/scalable/status/xfpm-primary-040-charging.svg b/data/icons/scalable/xfpm-primary-040-charging.svg
index 9f746b04..9f746b04 100644
--- a/data/icons/scalable/status/xfpm-primary-040-charging.svg
+++ b/data/icons/scalable/xfpm-primary-040-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-040.svg b/data/icons/scalable/xfpm-primary-040.svg
index 04f0f89e..04f0f89e 100644
--- a/data/icons/scalable/status/xfpm-primary-040.svg
+++ b/data/icons/scalable/xfpm-primary-040.svg
diff --git a/data/icons/scalable/status/xfpm-primary-060-charging.svg b/data/icons/scalable/xfpm-primary-060-charging.svg
index 78802ca3..78802ca3 100644
--- a/data/icons/scalable/status/xfpm-primary-060-charging.svg
+++ b/data/icons/scalable/xfpm-primary-060-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-060.svg b/data/icons/scalable/xfpm-primary-060.svg
index 4ce9f7b7..4ce9f7b7 100644
--- a/data/icons/scalable/status/xfpm-primary-060.svg
+++ b/data/icons/scalable/xfpm-primary-060.svg
diff --git a/data/icons/scalable/status/xfpm-primary-080-charging.svg b/data/icons/scalable/xfpm-primary-080-charging.svg
index 6dfa4049..6dfa4049 100644
--- a/data/icons/scalable/status/xfpm-primary-080-charging.svg
+++ b/data/icons/scalable/xfpm-primary-080-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-080.svg b/data/icons/scalable/xfpm-primary-080.svg
index ffae4a5b..ffae4a5b 100644
--- a/data/icons/scalable/status/xfpm-primary-080.svg
+++ b/data/icons/scalable/xfpm-primary-080.svg
diff --git a/data/icons/scalable/status/xfpm-primary-100-charging.svg b/data/icons/scalable/xfpm-primary-100-charging.svg
index 9a97fd7c..9a97fd7c 100644
--- a/data/icons/scalable/status/xfpm-primary-100-charging.svg
+++ b/data/icons/scalable/xfpm-primary-100-charging.svg
diff --git a/data/icons/scalable/status/xfpm-primary-100.svg b/data/icons/scalable/xfpm-primary-100.svg
index 039a6386..039a6386 100644
--- a/data/icons/scalable/status/xfpm-primary-100.svg
+++ b/data/icons/scalable/xfpm-primary-100.svg
diff --git a/data/icons/scalable/status/xfpm-primary-charged.svg b/data/icons/scalable/xfpm-primary-charged.svg
index 6054af22..6054af22 100644
--- a/data/icons/scalable/status/xfpm-primary-charged.svg
+++ b/data/icons/scalable/xfpm-primary-charged.svg
diff --git a/data/icons/scalable/status/xfpm-primary-missing.svg b/data/icons/scalable/xfpm-primary-missing.svg
index f1128516..f1128516 100644
--- a/data/icons/scalable/status/xfpm-primary-missing.svg
+++ b/data/icons/scalable/xfpm-primary-missing.svg