[Xfce4-commits] [xfce/xfce4-power-manager] 56/64: Simplify icons directory structure

noreply at xfce.org noreply at xfce.org
Mon May 26 06:00:51 CEST 2014


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 12ab779e997d8cc3b508d42393f26ca6b3e46c59
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon May 19 17:29:34 2014 +0200

    Simplify icons directory structure
---
 data/icons/16x16/Makefile.am                       |   23 ++-
 data/icons/16x16/status/Makefile.am                |   23 ---
 data/icons/16x16/{status => }/xfpm-ac-adapter.png  |  Bin 606 -> 606 bytes
 .../{status => }/xfpm-brightness-lcd-invalid.png   |  Bin 462 -> 462 bytes
 .../16x16/{status => }/xfpm-brightness-lcd.png     |  Bin 462 -> 462 bytes
 .../{status => }/xfpm-primary-000-charging.png     |  Bin 857 -> 857 bytes
 data/icons/16x16/{status => }/xfpm-primary-000.png |  Bin 728 -> 728 bytes
 .../{status => }/xfpm-primary-020-charging.png     |  Bin 940 -> 940 bytes
 data/icons/16x16/{status => }/xfpm-primary-020.png |  Bin 496 -> 496 bytes
 .../{status => }/xfpm-primary-040-charging.png     |  Bin 905 -> 905 bytes
 data/icons/16x16/{status => }/xfpm-primary-040.png |  Bin 456 -> 456 bytes
 .../{status => }/xfpm-primary-060-charging.png     |  Bin 907 -> 907 bytes
 data/icons/16x16/{status => }/xfpm-primary-060.png |  Bin 459 -> 459 bytes
 .../{status => }/xfpm-primary-080-charging.png     |  Bin 839 -> 839 bytes
 data/icons/16x16/{status => }/xfpm-primary-080.png |  Bin 477 -> 477 bytes
 .../{status => }/xfpm-primary-100-charging.png     |  Bin 848 -> 848 bytes
 data/icons/16x16/{status => }/xfpm-primary-100.png |  Bin 472 -> 472 bytes
 .../16x16/{status => }/xfpm-primary-charged.png    |  Bin 729 -> 729 bytes
 .../16x16/{status => }/xfpm-primary-missing.png    |  Bin 635 -> 635 bytes
 data/icons/22x22/Makefile.am                       |   23 ++-
 data/icons/22x22/status/Makefile.am                |   23 ---
 data/icons/22x22/{status => }/xfpm-ac-adapter.png  |  Bin 1189 -> 1189 bytes
 .../{status => }/xfpm-brightness-lcd-invalid.png   |  Bin 1228 -> 1228 bytes
 .../22x22/{status => }/xfpm-brightness-lcd.png     |  Bin 1157 -> 1157 bytes
 .../{status => }/xfpm-primary-000-charging.png     |  Bin 1324 -> 1324 bytes
 data/icons/22x22/{status => }/xfpm-primary-000.png |  Bin 1113 -> 1113 bytes
 .../{status => }/xfpm-primary-020-charging.png     |  Bin 1317 -> 1317 bytes
 data/icons/22x22/{status => }/xfpm-primary-020.png |  Bin 775 -> 775 bytes
 .../{status => }/xfpm-primary-040-charging.png     |  Bin 1159 -> 1159 bytes
 data/icons/22x22/{status => }/xfpm-primary-040.png |  Bin 711 -> 711 bytes
 .../{status => }/xfpm-primary-060-charging.png     |  Bin 1162 -> 1162 bytes
 data/icons/22x22/{status => }/xfpm-primary-060.png |  Bin 703 -> 703 bytes
 .../{status => }/xfpm-primary-080-charging.png     |  Bin 1293 -> 1293 bytes
 data/icons/22x22/{status => }/xfpm-primary-080.png |  Bin 768 -> 768 bytes
 .../{status => }/xfpm-primary-100-charging.png     |  Bin 1258 -> 1258 bytes
 data/icons/22x22/{status => }/xfpm-primary-100.png |  Bin 705 -> 705 bytes
 .../22x22/{status => }/xfpm-primary-charged.png    |  Bin 1099 -> 1099 bytes
 .../22x22/{status => }/xfpm-primary-missing.png    |  Bin 887 -> 887 bytes
 data/icons/24x24/Makefile.am                       |   23 ++-
 data/icons/24x24/status/Makefile.am                |   23 ---
 data/icons/24x24/{status => }/xfpm-ac-adapter.png  |  Bin 1004 -> 1004 bytes
 .../{status => }/xfpm-brightness-lcd-invalid.png   |  Bin 1458 -> 1458 bytes
 .../24x24/{status => }/xfpm-brightness-lcd.png     |  Bin 1160 -> 1160 bytes
 .../{status => }/xfpm-primary-000-charging.png     |  Bin 1315 -> 1315 bytes
 data/icons/24x24/{status => }/xfpm-primary-000.png |  Bin 1138 -> 1138 bytes
 .../{status => }/xfpm-primary-020-charging.png     |  Bin 1308 -> 1308 bytes
 data/icons/24x24/{status => }/xfpm-primary-020.png |  Bin 780 -> 780 bytes
 .../{status => }/xfpm-primary-040-charging.png     |  Bin 1252 -> 1252 bytes
 data/icons/24x24/{status => }/xfpm-primary-040.png |  Bin 720 -> 720 bytes
 .../{status => }/xfpm-primary-060-charging.png     |  Bin 1252 -> 1252 bytes
 data/icons/24x24/{status => }/xfpm-primary-060.png |  Bin 714 -> 714 bytes
 .../{status => }/xfpm-primary-080-charging.png     |  Bin 1283 -> 1283 bytes
 data/icons/24x24/{status => }/xfpm-primary-080.png |  Bin 762 -> 762 bytes
 .../{status => }/xfpm-primary-100-charging.png     |  Bin 1250 -> 1250 bytes
 data/icons/24x24/{status => }/xfpm-primary-100.png |  Bin 707 -> 707 bytes
 .../24x24/{status => }/xfpm-primary-charged.png    |  Bin 1077 -> 1077 bytes
 .../24x24/{status => }/xfpm-primary-missing.png    |  Bin 882 -> 882 bytes
 data/icons/32x32/Makefile.am                       |   64 ++++++-
 data/icons/32x32/status/Makefile.am                |   63 -------
 data/icons/32x32/{status => }/xfpm-ac-adapter.png  |  Bin 2037 -> 2037 bytes
 data/icons/32x32/xfpm-brightness-lcd.svg           |  189 ++++++++++++++++++++
 .../icons/32x32/{status => }/xfpm-keyboard-000.png |  Bin 1161 -> 1161 bytes
 .../icons/32x32/{status => }/xfpm-keyboard-000.svg |    0
 .../icons/32x32/{status => }/xfpm-keyboard-020.png |  Bin 1161 -> 1161 bytes
 .../icons/32x32/{status => }/xfpm-keyboard-020.svg |    0
 .../icons/32x32/{status => }/xfpm-keyboard-040.png |  Bin 1155 -> 1155 bytes
 .../icons/32x32/{status => }/xfpm-keyboard-040.svg |    0
 .../icons/32x32/{status => }/xfpm-keyboard-060.png |  Bin 1154 -> 1154 bytes
 .../icons/32x32/{status => }/xfpm-keyboard-060.svg |    0
 .../icons/32x32/{status => }/xfpm-keyboard-080.png |  Bin 1154 -> 1154 bytes
 .../icons/32x32/{status => }/xfpm-keyboard-080.svg |    0
 .../icons/32x32/{status => }/xfpm-keyboard-100.png |  Bin 1127 -> 1127 bytes
 .../icons/32x32/{status => }/xfpm-keyboard-100.svg |    0
 .../32x32/{status => }/xfpm-mediaplayer-000.png    |  Bin 1367 -> 1367 bytes
 .../32x32/{status => }/xfpm-mediaplayer-000.svg    |    0
 .../32x32/{status => }/xfpm-mediaplayer-020.png    |  Bin 1364 -> 1364 bytes
 .../32x32/{status => }/xfpm-mediaplayer-020.svg    |    0
 .../32x32/{status => }/xfpm-mediaplayer-040.png    |  Bin 1372 -> 1372 bytes
 .../32x32/{status => }/xfpm-mediaplayer-040.svg    |    0
 .../32x32/{status => }/xfpm-mediaplayer-060.png    |  Bin 1362 -> 1362 bytes
 .../32x32/{status => }/xfpm-mediaplayer-060.svg    |    0
 .../32x32/{status => }/xfpm-mediaplayer-080.png    |  Bin 1349 -> 1349 bytes
 .../32x32/{status => }/xfpm-mediaplayer-080.svg    |    0
 .../32x32/{status => }/xfpm-mediaplayer-100.png    |  Bin 1332 -> 1332 bytes
 .../32x32/{status => }/xfpm-mediaplayer-100.svg    |    0
 data/icons/32x32/{status => }/xfpm-monitor-000.png |  Bin 1337 -> 1337 bytes
 data/icons/32x32/{status => }/xfpm-monitor-000.svg |    0
 data/icons/32x32/{status => }/xfpm-monitor-020.png |  Bin 1334 -> 1334 bytes
 data/icons/32x32/{status => }/xfpm-monitor-020.svg |    0
 data/icons/32x32/{status => }/xfpm-monitor-040.png |  Bin 1334 -> 1334 bytes
 data/icons/32x32/{status => }/xfpm-monitor-040.svg |    0
 data/icons/32x32/{status => }/xfpm-monitor-060.png |  Bin 1334 -> 1334 bytes
 data/icons/32x32/{status => }/xfpm-monitor-060.svg |    0
 data/icons/32x32/{status => }/xfpm-monitor-080.png |  Bin 1319 -> 1319 bytes
 data/icons/32x32/{status => }/xfpm-monitor-080.svg |    0
 data/icons/32x32/{status => }/xfpm-monitor-100.png |  Bin 1294 -> 1294 bytes
 data/icons/32x32/{status => }/xfpm-monitor-100.svg |    0
 data/icons/32x32/{status => }/xfpm-mouse-000.png   |  Bin 1970 -> 1970 bytes
 data/icons/32x32/{status => }/xfpm-mouse-000.svg   |    0
 data/icons/32x32/{status => }/xfpm-mouse-020.png   |  Bin 1967 -> 1967 bytes
 data/icons/32x32/{status => }/xfpm-mouse-020.svg   |    0
 data/icons/32x32/{status => }/xfpm-mouse-040.png   |  Bin 1968 -> 1968 bytes
 data/icons/32x32/{status => }/xfpm-mouse-040.svg   |    0
 data/icons/32x32/{status => }/xfpm-mouse-060.png   |  Bin 1965 -> 1965 bytes
 data/icons/32x32/{status => }/xfpm-mouse-060.svg   |    0
 data/icons/32x32/{status => }/xfpm-mouse-080.png   |  Bin 1941 -> 1941 bytes
 data/icons/32x32/{status => }/xfpm-mouse-080.svg   |    0
 data/icons/32x32/{status => }/xfpm-mouse-100.png   |  Bin 1916 -> 1916 bytes
 data/icons/32x32/{status => }/xfpm-mouse-100.svg   |    0
 data/icons/32x32/{status => }/xfpm-pda-000.png     |  Bin 1203 -> 1203 bytes
 data/icons/32x32/{status => }/xfpm-pda-000.svg     |    0
 data/icons/32x32/{status => }/xfpm-pda-020.png     |  Bin 1210 -> 1210 bytes
 data/icons/32x32/{status => }/xfpm-pda-020.svg     |    0
 data/icons/32x32/{status => }/xfpm-pda-040.png     |  Bin 1215 -> 1215 bytes
 data/icons/32x32/{status => }/xfpm-pda-040.svg     |    0
 data/icons/32x32/{status => }/xfpm-pda-060.png     |  Bin 1208 -> 1208 bytes
 data/icons/32x32/{status => }/xfpm-pda-060.svg     |    0
 data/icons/32x32/{status => }/xfpm-pda-080.png     |  Bin 1196 -> 1196 bytes
 data/icons/32x32/{status => }/xfpm-pda-080.svg     |    0
 data/icons/32x32/{status => }/xfpm-pda-100.png     |  Bin 1173 -> 1173 bytes
 data/icons/32x32/{status => }/xfpm-pda-100.svg     |    0
 data/icons/32x32/{status => }/xfpm-phone-000.png   |  Bin 1646 -> 1646 bytes
 data/icons/32x32/{status => }/xfpm-phone-000.svg   |    0
 data/icons/32x32/{status => }/xfpm-phone-020.png   |  Bin 1643 -> 1643 bytes
 data/icons/32x32/{status => }/xfpm-phone-020.svg   |    0
 data/icons/32x32/{status => }/xfpm-phone-040.png   |  Bin 1653 -> 1653 bytes
 data/icons/32x32/{status => }/xfpm-phone-040.svg   |    0
 data/icons/32x32/{status => }/xfpm-phone-060.png   |  Bin 1643 -> 1643 bytes
 data/icons/32x32/{status => }/xfpm-phone-060.svg   |    0
 data/icons/32x32/{status => }/xfpm-phone-080.png   |  Bin 1621 -> 1621 bytes
 data/icons/32x32/{status => }/xfpm-phone-080.svg   |    0
 data/icons/32x32/{status => }/xfpm-phone-100.png   |  Bin 1594 -> 1594 bytes
 data/icons/32x32/{status => }/xfpm-phone-100.svg   |    0
 .../{status => }/xfpm-primary-000-charging.png     |  Bin 2589 -> 2589 bytes
 data/icons/32x32/{status => }/xfpm-primary-000.png |  Bin 1865 -> 1865 bytes
 .../{status => }/xfpm-primary-020-charging.png     |  Bin 2599 -> 2599 bytes
 data/icons/32x32/{status => }/xfpm-primary-020.png |  Bin 1407 -> 1407 bytes
 .../{status => }/xfpm-primary-040-charging.png     |  Bin 2665 -> 2665 bytes
 data/icons/32x32/{status => }/xfpm-primary-040.png |  Bin 1361 -> 1361 bytes
 .../{status => }/xfpm-primary-060-charging.png     |  Bin 2517 -> 2517 bytes
 data/icons/32x32/{status => }/xfpm-primary-060.png |  Bin 1347 -> 1347 bytes
 .../{status => }/xfpm-primary-080-charging.png     |  Bin 2566 -> 2566 bytes
 data/icons/32x32/{status => }/xfpm-primary-080.png |  Bin 1371 -> 1371 bytes
 .../{status => }/xfpm-primary-100-charging.png     |  Bin 2469 -> 2469 bytes
 data/icons/32x32/{status => }/xfpm-primary-100.png |  Bin 1223 -> 1223 bytes
 .../32x32/{status => }/xfpm-primary-charged.png    |  Bin 2268 -> 2268 bytes
 .../32x32/{status => }/xfpm-primary-missing.png    |  Bin 1561 -> 1561 bytes
 data/icons/32x32/{status => }/xfpm-ups-000.png     |  Bin 1667 -> 1667 bytes
 data/icons/32x32/{status => }/xfpm-ups-000.svg     |    0
 data/icons/32x32/{status => }/xfpm-ups-020.png     |  Bin 1666 -> 1666 bytes
 data/icons/32x32/{status => }/xfpm-ups-020.svg     |    0
 data/icons/32x32/{status => }/xfpm-ups-040.png     |  Bin 1668 -> 1668 bytes
 data/icons/32x32/{status => }/xfpm-ups-040.svg     |    0
 data/icons/32x32/{status => }/xfpm-ups-060.png     |  Bin 1656 -> 1656 bytes
 data/icons/32x32/{status => }/xfpm-ups-060.svg     |    0
 data/icons/32x32/{status => }/xfpm-ups-080.png     |  Bin 1640 -> 1640 bytes
 data/icons/32x32/{status => }/xfpm-ups-080.svg     |    0
 data/icons/32x32/{status => }/xfpm-ups-100.png     |  Bin 1620 -> 1620 bytes
 data/icons/32x32/{status => }/xfpm-ups-100.svg     |    0
 data/icons/48x48/Makefile.am                       |   23 ++-
 data/icons/48x48/status/Makefile.am                |   23 ---
 data/icons/48x48/{status => }/xfpm-ac-adapter.png  |  Bin 3249 -> 3249 bytes
 .../{status => }/xfpm-brightness-lcd-invalid.png   |  Bin 3346 -> 3346 bytes
 .../48x48/{status => }/xfpm-brightness-lcd.png     |  Bin 2713 -> 2713 bytes
 .../{status => }/xfpm-primary-000-charging.png     |  Bin 4589 -> 4589 bytes
 data/icons/48x48/{status => }/xfpm-primary-000.png |  Bin 3049 -> 3049 bytes
 .../{status => }/xfpm-primary-020-charging.png     |  Bin 4552 -> 4552 bytes
 data/icons/48x48/{status => }/xfpm-primary-020.png |  Bin 2220 -> 2220 bytes
 .../{status => }/xfpm-primary-040-charging.png     |  Bin 4388 -> 4388 bytes
 data/icons/48x48/{status => }/xfpm-primary-040.png |  Bin 2101 -> 2101 bytes
 .../{status => }/xfpm-primary-060-charging.png     |  Bin 4379 -> 4379 bytes
 data/icons/48x48/{status => }/xfpm-primary-060.png |  Bin 2092 -> 2092 bytes
 .../{status => }/xfpm-primary-080-charging.png     |  Bin 4497 -> 4497 bytes
 data/icons/48x48/{status => }/xfpm-primary-080.png |  Bin 2125 -> 2125 bytes
 .../{status => }/xfpm-primary-100-charging.png     |  Bin 4244 -> 4244 bytes
 data/icons/48x48/{status => }/xfpm-primary-100.png |  Bin 1854 -> 1854 bytes
 .../48x48/{status => }/xfpm-primary-charged.png    |  Bin 3743 -> 3743 bytes
 .../48x48/{status => }/xfpm-primary-missing.png    |  Bin 2270 -> 2270 bytes
 data/icons/scalable/Makefile.am                    |   23 ++-
 data/icons/scalable/status/Makefile.am             |   23 ---
 .../scalable/{status => }/xfpm-ac-adapter.svg      |    0
 .../{status => }/xfpm-brightness-lcd-invalid.svg   |    0
 .../scalable/{status => }/xfpm-brightness-lcd.svg  |    0
 .../{status => }/xfpm-primary-000-charging.svg     |    0
 .../scalable/{status => }/xfpm-primary-000.svg     |    0
 .../{status => }/xfpm-primary-020-charging.svg     |    0
 .../scalable/{status => }/xfpm-primary-020.svg     |    0
 .../{status => }/xfpm-primary-040-charging.svg     |    0
 .../scalable/{status => }/xfpm-primary-040.svg     |    0
 .../{status => }/xfpm-primary-060-charging.svg     |    0
 .../scalable/{status => }/xfpm-primary-060.svg     |    0
 .../{status => }/xfpm-primary-080-charging.svg     |    0
 .../scalable/{status => }/xfpm-primary-080.svg     |    0
 .../{status => }/xfpm-primary-100-charging.svg     |    0
 .../scalable/{status => }/xfpm-primary-100.svg     |    0
 .../scalable/{status => }/xfpm-primary-charged.svg |    0
 .../scalable/{status => }/xfpm-primary-missing.svg |    0
 197 files changed, 362 insertions(+), 184 deletions(-)

diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index c2458c1..76fce21 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 76fce21..0000000
--- 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-ac-adapter.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-brightness-lcd-invalid.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-brightness-lcd.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-000-charging.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-000.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-020-charging.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-020.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-040-charging.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-040.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-060-charging.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-060.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-080-charging.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-080.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-100-charging.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-100.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-charged.png
rename to 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
similarity index 100%
rename from data/icons/16x16/status/xfpm-primary-missing.png
rename to data/icons/16x16/xfpm-primary-missing.png
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index c2458c1..f20327c 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 f20327c..0000000
--- 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-ac-adapter.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-brightness-lcd-invalid.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-brightness-lcd.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-000-charging.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-000.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-020-charging.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-020.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-040-charging.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-040.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-060-charging.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-060.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-080-charging.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-080.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-100-charging.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-100.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-charged.png
rename to 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
similarity index 100%
rename from data/icons/22x22/status/xfpm-primary-missing.png
rename to data/icons/22x22/xfpm-primary-missing.png
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index c2458c1..08e23cc 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 08e23cc..0000000
--- 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-ac-adapter.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-brightness-lcd-invalid.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-brightness-lcd.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-000-charging.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-000.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-020-charging.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-020.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-040-charging.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-040.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-060-charging.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-060.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-080-charging.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-080.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-100-charging.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-100.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-charged.png
rename to 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
similarity index 100%
rename from data/icons/24x24/status/xfpm-primary-missing.png
rename to data/icons/24x24/xfpm-primary-missing.png
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index d52da2b..2a47d2d 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 1608cb0..0000000
--- 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ac-adapter.png
rename to 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 0000000..d65c98e
--- /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 [...]
+     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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-000.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-000.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-020.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-020.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-040.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-040.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-060.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-060.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-080.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-080.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-100.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-keyboard-100.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-000.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-000.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-020.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-020.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-040.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-040.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-060.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-060.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-080.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-080.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-100.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mediaplayer-100.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-000.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-000.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-020.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-020.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-040.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-040.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-060.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-060.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-080.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-080.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-100.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-monitor-100.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-000.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-000.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-020.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-020.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-040.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-040.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-060.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-060.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-080.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-080.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-100.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-mouse-100.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-000.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-000.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-020.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-020.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-040.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-040.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-060.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-060.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-080.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-080.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-100.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-pda-100.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-000.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-000.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-020.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-020.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-040.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-040.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-060.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-060.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-080.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-080.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-100.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-phone-100.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-000-charging.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-000.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-020-charging.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-020.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-040-charging.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-040.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-060-charging.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-060.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-080-charging.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-080.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-100-charging.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-100.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-charged.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-primary-missing.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-000.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-000.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-020.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-020.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-040.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-040.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-060.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-060.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-080.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-080.svg
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-100.png
rename to 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
similarity index 100%
rename from data/icons/32x32/status/xfpm-ups-100.svg
rename to data/icons/32x32/xfpm-ups-100.svg
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index c2458c1..d27be2f 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 d27be2f..0000000
--- 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-ac-adapter.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-brightness-lcd-invalid.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-brightness-lcd.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-000-charging.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-000.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-020-charging.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-020.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-040-charging.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-040.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-060-charging.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-060.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-080-charging.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-080.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-100-charging.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-100.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-charged.png
rename to 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
similarity index 100%
rename from data/icons/48x48/status/xfpm-primary-missing.png
rename to data/icons/48x48/xfpm-primary-missing.png
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index c2458c1..9467c2c 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 9467c2c..0000000
--- 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-ac-adapter.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-brightness-lcd-invalid.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-brightness-lcd.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-000-charging.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-000.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-020-charging.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-020.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-040-charging.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-040.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-060-charging.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-060.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-080-charging.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-080.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-100-charging.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-100.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-charged.svg
rename to 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
similarity index 100%
rename from data/icons/scalable/status/xfpm-primary-missing.svg
rename to data/icons/scalable/xfpm-primary-missing.svg

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


More information about the Xfce4-commits mailing list