Added png icons.0.8.50.8-hal-based

146 files changed, 194 insertions, 7 deletions

diff --git a/configure.ac.in b/configure.ac.in
index a2919d45..e6bb0e2f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,9 +1,9 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major],  [0])
 m4_define([xfpm_version_minor],  [8])
-m4_define([xfpm_version_micro],  [4.1])
-m4_define([xfpm_version_build],  [@REVISION@])
-m4_define([xfpm_version_tag],[git])
+m4_define([xfpm_version_micro],  [5])
+m4_define([xfpm_version_build],  [])
+m4_define([xfpm_version_tag],[])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [git], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
 
 AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])
@@ -175,6 +175,15 @@ panel-plugins/Makefile
 panel-plugins/brightness/Makefile
 data/Makefile
 data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/16x16/actions/Makefile
+data/icons/16x16/status/Makefile
+data/icons/24x24/Makefile
+data/icons/24x24/actions/Makefile
+data/icons/24x24/status/Makefile
+data/icons/48x48/Makefile
+data/icons/48x48/actions/Makefile
+data/icons/48x48/status/Makefile
 data/icons/scalable/Makefile
 data/icons/scalable/status/Makefile
 data/icons/scalable/actions/Makefile
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
new file mode 100644
index 00000000..db8e2253
--- /dev/null
+++ b/data/icons/16x16/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = actions status
+
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
new file mode 100644
index 00000000..11e3e355
--- /dev/null
+++ b/data/icons/16x16/actions/Makefile.am
@@ -0,0 +1,8 @@
+EXTRA_DIST =				\
+	$(Data_DATA)
+
+Datadir = $(datadir)/icons/hicolor/16x16/actions
+
+Data_DATA =				\
+	xfpm-hibernate.png		\
+	xfpm-suspend.png		
diff --git a/data/icons/16x16/actions/xfpm-hibernate.png b/data/icons/16x16/actions/xfpm-hibernate.png
new file mode 100644
index 00000000..36dde47b
--- /dev/null
+++ b/data/icons/16x16/actions/xfpm-hibernate.png
diff --git a/data/icons/16x16/actions/xfpm-suspend.png b/data/icons/16x16/actions/xfpm-suspend.png
new file mode 100644
index 00000000..b4357713
--- /dev/null
+++ b/data/icons/16x16/actions/xfpm-suspend.png
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
new file mode 100644
index 00000000..038842d4
--- /dev/null
+++ b/data/icons/16x16/status/Makefile.am
@@ -0,0 +1,49 @@
+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-ups-000.png			\
+	xfpm-ups-020.png			\
+	xfpm-ups-040.png			\
+	xfpm-ups-060.png			\
+	xfpm-ups-080.png			\
+	xfpm-ups-100.png			\
+	xfpm-ups-000-charging.png	\
+	xfpm-ups-020-charging.png	\
+	xfpm-ups-040-charging.png	\
+	xfpm-ups-060-charging.png	\
+	xfpm-ups-080-charging.png	\
+	xfpm-ups-100-charging.png	\
+	xfpm-ups-charged.png		\
+	xfpm-ups-missing.png		\
+	xfpm-keyboard-000.png		\
+	xfpm-keyboard-030.png		\
+	xfpm-keyboard-060.png		\
+	xfpm-keyboard-100.png		\
+	xfpm-mouse-000.png		\
+	xfpm-mouse-030.png		\
+	xfpm-mouse-060.png		\
+	xfpm-mouse-100.png		\
+	xfpm-phone-000.png		\
+	xfpm-phone-030.png		\
+	xfpm-phone-060.png		\
+	xfpm-phone-100.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/status/xfpm-ac-adapter.png
new file mode 100644
index 00000000..6020a292
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ac-adapter.png
diff --git a/data/icons/16x16/status/xfpm-brightness-lcd-invalid.png b/data/icons/16x16/status/xfpm-brightness-lcd-invalid.png
new file mode 100644
index 00000000..6406490c
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-brightness-lcd-invalid.png
diff --git a/data/icons/16x16/status/xfpm-brightness-lcd.png b/data/icons/16x16/status/xfpm-brightness-lcd.png
new file mode 100644
index 00000000..6406490c
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-brightness-lcd.png
diff --git a/data/icons/16x16/status/xfpm-keyboard-000.png b/data/icons/16x16/status/xfpm-keyboard-000.png
new file mode 100644
index 00000000..417fa7c5
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-keyboard-000.png
diff --git a/data/icons/16x16/status/xfpm-keyboard-030.png b/data/icons/16x16/status/xfpm-keyboard-030.png
new file mode 100644
index 00000000..822785eb
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-keyboard-030.png
diff --git a/data/icons/16x16/status/xfpm-keyboard-060.png b/data/icons/16x16/status/xfpm-keyboard-060.png
new file mode 100644
index 00000000..9f147a35
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-keyboard-060.png
diff --git a/data/icons/16x16/status/xfpm-keyboard-100.png b/data/icons/16x16/status/xfpm-keyboard-100.png
new file mode 100644
index 00000000..c56a8350
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-keyboard-100.png
diff --git a/data/icons/16x16/status/xfpm-mouse-000.png b/data/icons/16x16/status/xfpm-mouse-000.png
new file mode 100644
index 00000000..cf7a808c
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-mouse-000.png
diff --git a/data/icons/16x16/status/xfpm-mouse-030.png b/data/icons/16x16/status/xfpm-mouse-030.png
new file mode 100644
index 00000000..793c0918
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-mouse-030.png
diff --git a/data/icons/16x16/status/xfpm-mouse-060.png b/data/icons/16x16/status/xfpm-mouse-060.png
new file mode 100644
index 00000000..91a727df
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-mouse-060.png
diff --git a/data/icons/16x16/status/xfpm-mouse-100.png b/data/icons/16x16/status/xfpm-mouse-100.png
new file mode 100644
index 00000000..b52e9eb2
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-mouse-100.png
diff --git a/data/icons/16x16/status/xfpm-phone-000.png b/data/icons/16x16/status/xfpm-phone-000.png
new file mode 100644
index 00000000..14265777
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-phone-000.png
diff --git a/data/icons/16x16/status/xfpm-phone-030.png b/data/icons/16x16/status/xfpm-phone-030.png
new file mode 100644
index 00000000..3dc211cf
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-phone-030.png
diff --git a/data/icons/16x16/status/xfpm-phone-060.png b/data/icons/16x16/status/xfpm-phone-060.png
new file mode 100644
index 00000000..88f955e4
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-phone-060.png
diff --git a/data/icons/16x16/status/xfpm-phone-100.png b/data/icons/16x16/status/xfpm-phone-100.png
new file mode 100644
index 00000000..c01357c4
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-phone-100.png
diff --git a/data/icons/16x16/status/xfpm-primary-000-charging.png b/data/icons/16x16/status/xfpm-primary-000-charging.png
new file mode 100644
index 00000000..4b2e0a9b
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-000-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-000.png b/data/icons/16x16/status/xfpm-primary-000.png
new file mode 100644
index 00000000..eae43791
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-000.png
diff --git a/data/icons/16x16/status/xfpm-primary-020-charging.png b/data/icons/16x16/status/xfpm-primary-020-charging.png
new file mode 100644
index 00000000..b3124165
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-020-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-020.png b/data/icons/16x16/status/xfpm-primary-020.png
new file mode 100644
index 00000000..51df8112
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-020.png
diff --git a/data/icons/16x16/status/xfpm-primary-040-charging.png b/data/icons/16x16/status/xfpm-primary-040-charging.png
new file mode 100644
index 00000000..dee55974
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-040-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-040.png b/data/icons/16x16/status/xfpm-primary-040.png
new file mode 100644
index 00000000..e23d85fa
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-040.png
diff --git a/data/icons/16x16/status/xfpm-primary-060-charging.png b/data/icons/16x16/status/xfpm-primary-060-charging.png
new file mode 100644
index 00000000..45c83f88
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-060-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-060.png b/data/icons/16x16/status/xfpm-primary-060.png
new file mode 100644
index 00000000..f3dc4b79
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-060.png
diff --git a/data/icons/16x16/status/xfpm-primary-080-charging.png b/data/icons/16x16/status/xfpm-primary-080-charging.png
new file mode 100644
index 00000000..03fd467e
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-080-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-080.png b/data/icons/16x16/status/xfpm-primary-080.png
new file mode 100644
index 00000000..5c962812
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-080.png
diff --git a/data/icons/16x16/status/xfpm-primary-100-charging.png b/data/icons/16x16/status/xfpm-primary-100-charging.png
new file mode 100644
index 00000000..b4714fcb
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-100-charging.png
diff --git a/data/icons/16x16/status/xfpm-primary-100.png b/data/icons/16x16/status/xfpm-primary-100.png
new file mode 100644
index 00000000..15ae4cba
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-100.png
diff --git a/data/icons/16x16/status/xfpm-primary-charged.png b/data/icons/16x16/status/xfpm-primary-charged.png
new file mode 100644
index 00000000..ab08d6da
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-charged.png
diff --git a/data/icons/16x16/status/xfpm-primary-missing.png b/data/icons/16x16/status/xfpm-primary-missing.png
new file mode 100644
index 00000000..b104d2a9
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-primary-missing.png
diff --git a/data/icons/16x16/status/xfpm-ups-000-charging.png b/data/icons/16x16/status/xfpm-ups-000-charging.png
new file mode 100644
index 00000000..1de0f748
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-000-charging.png
diff --git a/data/icons/16x16/status/xfpm-ups-000.png b/data/icons/16x16/status/xfpm-ups-000.png
new file mode 100644
index 00000000..495a08af
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-000.png
diff --git a/data/icons/16x16/status/xfpm-ups-020-charging.png b/data/icons/16x16/status/xfpm-ups-020-charging.png
new file mode 100644
index 00000000..f00740e1
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-020-charging.png
diff --git a/data/icons/16x16/status/xfpm-ups-020.png b/data/icons/16x16/status/xfpm-ups-020.png
new file mode 100644
index 00000000..6e489807
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-020.png
diff --git a/data/icons/16x16/status/xfpm-ups-040-charging.png b/data/icons/16x16/status/xfpm-ups-040-charging.png
new file mode 100644
index 00000000..bb4cf5ce
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-040-charging.png
diff --git a/data/icons/16x16/status/xfpm-ups-040.png b/data/icons/16x16/status/xfpm-ups-040.png
new file mode 100644
index 00000000..2cd93614
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-040.png
diff --git a/data/icons/16x16/status/xfpm-ups-060-charging.png b/data/icons/16x16/status/xfpm-ups-060-charging.png
new file mode 100644
index 00000000..0bf4d314
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-060-charging.png
diff --git a/data/icons/16x16/status/xfpm-ups-060.png b/data/icons/16x16/status/xfpm-ups-060.png
new file mode 100644
index 00000000..05ac77d1
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-060.png
diff --git a/data/icons/16x16/status/xfpm-ups-080-charging.png b/data/icons/16x16/status/xfpm-ups-080-charging.png
new file mode 100644
index 00000000..3a7596ad
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-080-charging.png
diff --git a/data/icons/16x16/status/xfpm-ups-080.png b/data/icons/16x16/status/xfpm-ups-080.png
new file mode 100644
index 00000000..a90f941c
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-080.png
diff --git a/data/icons/16x16/status/xfpm-ups-100-charging.png b/data/icons/16x16/status/xfpm-ups-100-charging.png
new file mode 100644
index 00000000..2c324847
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-100-charging.png
diff --git a/data/icons/16x16/status/xfpm-ups-100.png b/data/icons/16x16/status/xfpm-ups-100.png
new file mode 100644
index 00000000..ad9c60a9
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-100.png
diff --git a/data/icons/16x16/status/xfpm-ups-charged.png b/data/icons/16x16/status/xfpm-ups-charged.png
new file mode 100644
index 00000000..1f58376c
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-charged.png
diff --git a/data/icons/16x16/status/xfpm-ups-missing.png b/data/icons/16x16/status/xfpm-ups-missing.png
new file mode 100644
index 00000000..7012903d
--- /dev/null
+++ b/data/icons/16x16/status/xfpm-ups-missing.png
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
new file mode 100644
index 00000000..db8e2253
--- /dev/null
+++ b/data/icons/24x24/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = actions status
+
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
new file mode 100644
index 00000000..310b3140
--- /dev/null
+++ b/data/icons/24x24/actions/Makefile.am
@@ -0,0 +1,8 @@
+EXTRA_DIST =				\
+	$(Data_DATA)
+
+Datadir = $(datadir)/icons/hicolor/24x24/actions
+
+Data_DATA =				\
+	xfpm-hibernate.png		\
+	xfpm-suspend.png		
diff --git a/data/icons/24x24/actions/xfpm-hibernate.png b/data/icons/24x24/actions/xfpm-hibernate.png
new file mode 100644
index 00000000..0e118632
--- /dev/null
+++ b/data/icons/24x24/actions/xfpm-hibernate.png
diff --git a/data/icons/24x24/actions/xfpm-suspend.png b/data/icons/24x24/actions/xfpm-suspend.png
new file mode 100644
index 00000000..46247169
--- /dev/null
+++ b/data/icons/24x24/actions/xfpm-suspend.png
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
new file mode 100644
index 00000000..327187a4
--- /dev/null
+++ b/data/icons/24x24/status/Makefile.am
@@ -0,0 +1,49 @@
+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-ups-000.png			\
+	xfpm-ups-020.png			\
+	xfpm-ups-040.png			\
+	xfpm-ups-060.png			\
+	xfpm-ups-080.png			\
+	xfpm-ups-100.png			\
+	xfpm-ups-000-charging.png	\
+	xfpm-ups-020-charging.png	\
+	xfpm-ups-040-charging.png	\
+	xfpm-ups-060-charging.png	\
+	xfpm-ups-080-charging.png	\
+	xfpm-ups-100-charging.png	\
+	xfpm-ups-charged.png		\
+	xfpm-ups-missing.png		\
+	xfpm-keyboard-000.png		\
+	xfpm-keyboard-030.png		\
+	xfpm-keyboard-060.png		\
+	xfpm-keyboard-100.png		\
+	xfpm-mouse-000.png		\
+	xfpm-mouse-030.png		\
+	xfpm-mouse-060.png		\
+	xfpm-mouse-100.png		\
+	xfpm-phone-000.png		\
+	xfpm-phone-030.png		\
+	xfpm-phone-060.png		\
+	xfpm-phone-100.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/status/xfpm-ac-adapter.png
new file mode 100644
index 00000000..1ae4afea
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ac-adapter.png
diff --git a/data/icons/24x24/status/xfpm-brightness-lcd-invalid.png b/data/icons/24x24/status/xfpm-brightness-lcd-invalid.png
new file mode 100644
index 00000000..ceb8b791
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-brightness-lcd-invalid.png
diff --git a/data/icons/24x24/status/xfpm-brightness-lcd.png b/data/icons/24x24/status/xfpm-brightness-lcd.png
new file mode 100644
index 00000000..8a52068a
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-brightness-lcd.png
diff --git a/data/icons/24x24/status/xfpm-keyboard-000.png b/data/icons/24x24/status/xfpm-keyboard-000.png
new file mode 100644
index 00000000..f96bc7e8
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-keyboard-000.png
diff --git a/data/icons/24x24/status/xfpm-keyboard-030.png b/data/icons/24x24/status/xfpm-keyboard-030.png
new file mode 100644
index 00000000..c725538d
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-keyboard-030.png
diff --git a/data/icons/24x24/status/xfpm-keyboard-060.png b/data/icons/24x24/status/xfpm-keyboard-060.png
new file mode 100644
index 00000000..95e95f75
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-keyboard-060.png
diff --git a/data/icons/24x24/status/xfpm-keyboard-100.png b/data/icons/24x24/status/xfpm-keyboard-100.png
new file mode 100644
index 00000000..c0d73e64
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-keyboard-100.png
diff --git a/data/icons/24x24/status/xfpm-mouse-000.png b/data/icons/24x24/status/xfpm-mouse-000.png
new file mode 100644
index 00000000..a667f3fc
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-mouse-000.png
diff --git a/data/icons/24x24/status/xfpm-mouse-030.png b/data/icons/24x24/status/xfpm-mouse-030.png
new file mode 100644
index 00000000..99001fb6
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-mouse-030.png
diff --git a/data/icons/24x24/status/xfpm-mouse-060.png b/data/icons/24x24/status/xfpm-mouse-060.png
new file mode 100644
index 00000000..7c7e5d84
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-mouse-060.png
diff --git a/data/icons/24x24/status/xfpm-mouse-100.png b/data/icons/24x24/status/xfpm-mouse-100.png
new file mode 100644
index 00000000..3b3dde75
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-mouse-100.png
diff --git a/data/icons/24x24/status/xfpm-phone-000.png b/data/icons/24x24/status/xfpm-phone-000.png
new file mode 100644
index 00000000..e89001ae
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-phone-000.png
diff --git a/data/icons/24x24/status/xfpm-phone-030.png b/data/icons/24x24/status/xfpm-phone-030.png
new file mode 100644
index 00000000..3f03b693
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-phone-030.png
diff --git a/data/icons/24x24/status/xfpm-phone-060.png b/data/icons/24x24/status/xfpm-phone-060.png
new file mode 100644
index 00000000..f5738979
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-phone-060.png
diff --git a/data/icons/24x24/status/xfpm-phone-100.png b/data/icons/24x24/status/xfpm-phone-100.png
new file mode 100644
index 00000000..035ee289
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-phone-100.png
diff --git a/data/icons/24x24/status/xfpm-primary-000-charging.png b/data/icons/24x24/status/xfpm-primary-000-charging.png
new file mode 100644
index 00000000..9255e66b
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-000-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-000.png b/data/icons/24x24/status/xfpm-primary-000.png
new file mode 100644
index 00000000..2554a6a9
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-000.png
diff --git a/data/icons/24x24/status/xfpm-primary-020-charging.png b/data/icons/24x24/status/xfpm-primary-020-charging.png
new file mode 100644
index 00000000..aabd7789
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-020-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-020.png b/data/icons/24x24/status/xfpm-primary-020.png
new file mode 100644
index 00000000..83e70658
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-020.png
diff --git a/data/icons/24x24/status/xfpm-primary-040-charging.png b/data/icons/24x24/status/xfpm-primary-040-charging.png
new file mode 100644
index 00000000..c016a282
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-040-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-040.png b/data/icons/24x24/status/xfpm-primary-040.png
new file mode 100644
index 00000000..3245106b
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-040.png
diff --git a/data/icons/24x24/status/xfpm-primary-060-charging.png b/data/icons/24x24/status/xfpm-primary-060-charging.png
new file mode 100644
index 00000000..16674584
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-060-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-060.png b/data/icons/24x24/status/xfpm-primary-060.png
new file mode 100644
index 00000000..aa258033
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-060.png
diff --git a/data/icons/24x24/status/xfpm-primary-080-charging.png b/data/icons/24x24/status/xfpm-primary-080-charging.png
new file mode 100644
index 00000000..b9c69910
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-080-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-080.png b/data/icons/24x24/status/xfpm-primary-080.png
new file mode 100644
index 00000000..e649be05
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-080.png
diff --git a/data/icons/24x24/status/xfpm-primary-100-charging.png b/data/icons/24x24/status/xfpm-primary-100-charging.png
new file mode 100644
index 00000000..bae3a435
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-100-charging.png
diff --git a/data/icons/24x24/status/xfpm-primary-100.png b/data/icons/24x24/status/xfpm-primary-100.png
new file mode 100644
index 00000000..fe4ba7fd
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-100.png
diff --git a/data/icons/24x24/status/xfpm-primary-charged.png b/data/icons/24x24/status/xfpm-primary-charged.png
new file mode 100644
index 00000000..1e619402
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-charged.png
diff --git a/data/icons/24x24/status/xfpm-primary-missing.png b/data/icons/24x24/status/xfpm-primary-missing.png
new file mode 100644
index 00000000..4c1a538a
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-primary-missing.png
diff --git a/data/icons/24x24/status/xfpm-ups-000-charging.png b/data/icons/24x24/status/xfpm-ups-000-charging.png
new file mode 100644
index 00000000..a41047d4
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-000-charging.png
diff --git a/data/icons/24x24/status/xfpm-ups-000.png b/data/icons/24x24/status/xfpm-ups-000.png
new file mode 100644
index 00000000..bce1925d
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-000.png
diff --git a/data/icons/24x24/status/xfpm-ups-020-charging.png b/data/icons/24x24/status/xfpm-ups-020-charging.png
new file mode 100644
index 00000000..126613e3
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-020-charging.png
diff --git a/data/icons/24x24/status/xfpm-ups-020.png b/data/icons/24x24/status/xfpm-ups-020.png
new file mode 100644
index 00000000..cc2c6084
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-020.png
diff --git a/data/icons/24x24/status/xfpm-ups-040-charging.png b/data/icons/24x24/status/xfpm-ups-040-charging.png
new file mode 100644
index 00000000..7abefee6
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-040-charging.png
diff --git a/data/icons/24x24/status/xfpm-ups-040.png b/data/icons/24x24/status/xfpm-ups-040.png
new file mode 100644
index 00000000..29d75573
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-040.png
diff --git a/data/icons/24x24/status/xfpm-ups-060-charging.png b/data/icons/24x24/status/xfpm-ups-060-charging.png
new file mode 100644
index 00000000..5ec3918d
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-060-charging.png
diff --git a/data/icons/24x24/status/xfpm-ups-060.png b/data/icons/24x24/status/xfpm-ups-060.png
new file mode 100644
index 00000000..e15226fb
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-060.png
diff --git a/data/icons/24x24/status/xfpm-ups-080-charging.png b/data/icons/24x24/status/xfpm-ups-080-charging.png
new file mode 100644
index 00000000..f8832be9
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-080-charging.png
diff --git a/data/icons/24x24/status/xfpm-ups-080.png b/data/icons/24x24/status/xfpm-ups-080.png
new file mode 100644
index 00000000..afb2dd13
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-080.png
diff --git a/data/icons/24x24/status/xfpm-ups-100-charging.png b/data/icons/24x24/status/xfpm-ups-100-charging.png
new file mode 100644
index 00000000..be45d0b6
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-100-charging.png
diff --git a/data/icons/24x24/status/xfpm-ups-100.png b/data/icons/24x24/status/xfpm-ups-100.png
new file mode 100644
index 00000000..be45d0b6
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-100.png
diff --git a/data/icons/24x24/status/xfpm-ups-charged.png b/data/icons/24x24/status/xfpm-ups-charged.png
new file mode 100644
index 00000000..be45d0b6
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-charged.png
diff --git a/data/icons/24x24/status/xfpm-ups-missing.png b/data/icons/24x24/status/xfpm-ups-missing.png
new file mode 100644
index 00000000..23367b52
--- /dev/null
+++ b/data/icons/24x24/status/xfpm-ups-missing.png
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
new file mode 100644
index 00000000..db8e2253
--- /dev/null
+++ b/data/icons/48x48/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = actions status
+
diff --git a/data/icons/48x48/actions/Makefile.am b/data/icons/48x48/actions/Makefile.am
new file mode 100644
index 00000000..04f4f387
--- /dev/null
+++ b/data/icons/48x48/actions/Makefile.am
@@ -0,0 +1,8 @@
+EXTRA_DIST =				\
+	$(Data_DATA)
+
+Datadir = $(datadir)/icons/hicolor/48x48/actions
+
+Data_DATA =				\
+	xfpm-hibernate.png		\
+	xfpm-suspend.png		
diff --git a/data/icons/48x48/actions/xfpm-hibernate.png b/data/icons/48x48/actions/xfpm-hibernate.png
new file mode 100644
index 00000000..b9815ebd
--- /dev/null
+++ b/data/icons/48x48/actions/xfpm-hibernate.png
diff --git a/data/icons/48x48/actions/xfpm-suspend.png b/data/icons/48x48/actions/xfpm-suspend.png
new file mode 100644
index 00000000..f933d826
--- /dev/null
+++ b/data/icons/48x48/actions/xfpm-suspend.png
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
new file mode 100644
index 00000000..f442fede
--- /dev/null
+++ b/data/icons/48x48/status/Makefile.am
@@ -0,0 +1,49 @@
+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-ups-000.png			\
+	xfpm-ups-020.png			\
+	xfpm-ups-040.png			\
+	xfpm-ups-060.png			\
+	xfpm-ups-080.png			\
+	xfpm-ups-100.png			\
+	xfpm-ups-000-charging.png	\
+	xfpm-ups-020-charging.png	\
+	xfpm-ups-040-charging.png	\
+	xfpm-ups-060-charging.png	\
+	xfpm-ups-080-charging.png	\
+	xfpm-ups-100-charging.png	\
+	xfpm-ups-charged.png		\
+	xfpm-ups-missing.png		\
+	xfpm-keyboard-000.png		\
+	xfpm-keyboard-030.png		\
+	xfpm-keyboard-060.png		\
+	xfpm-keyboard-100.png		\
+	xfpm-mouse-000.png		\
+	xfpm-mouse-030.png		\
+	xfpm-mouse-060.png		\
+	xfpm-mouse-100.png		\
+	xfpm-phone-000.png		\
+	xfpm-phone-030.png		\
+	xfpm-phone-060.png		\
+	xfpm-phone-100.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/status/xfpm-ac-adapter.png
new file mode 100644
index 00000000..5b38115c
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ac-adapter.png
diff --git a/data/icons/48x48/status/xfpm-brightness-lcd-invalid.png b/data/icons/48x48/status/xfpm-brightness-lcd-invalid.png
new file mode 100644
index 00000000..916c4279
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-brightness-lcd-invalid.png
diff --git a/data/icons/48x48/status/xfpm-brightness-lcd.png b/data/icons/48x48/status/xfpm-brightness-lcd.png
new file mode 100644
index 00000000..5cc29157
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-brightness-lcd.png
diff --git a/data/icons/48x48/status/xfpm-keyboard-000.png b/data/icons/48x48/status/xfpm-keyboard-000.png
new file mode 100644
index 00000000..86401030
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-keyboard-000.png
diff --git a/data/icons/48x48/status/xfpm-keyboard-030.png b/data/icons/48x48/status/xfpm-keyboard-030.png
new file mode 100644
index 00000000..19b2078b
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-keyboard-030.png
diff --git a/data/icons/48x48/status/xfpm-keyboard-060.png b/data/icons/48x48/status/xfpm-keyboard-060.png
new file mode 100644
index 00000000..0304329f
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-keyboard-060.png
diff --git a/data/icons/48x48/status/xfpm-keyboard-100.png b/data/icons/48x48/status/xfpm-keyboard-100.png
new file mode 100644
index 00000000..b00651ac
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-keyboard-100.png
diff --git a/data/icons/48x48/status/xfpm-mouse-000.png b/data/icons/48x48/status/xfpm-mouse-000.png
new file mode 100644
index 00000000..a8a726eb
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-mouse-000.png
diff --git a/data/icons/48x48/status/xfpm-mouse-030.png b/data/icons/48x48/status/xfpm-mouse-030.png
new file mode 100644
index 00000000..2eb705de
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-mouse-030.png
diff --git a/data/icons/48x48/status/xfpm-mouse-060.png b/data/icons/48x48/status/xfpm-mouse-060.png
new file mode 100644
index 00000000..cc1417ff
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-mouse-060.png
diff --git a/data/icons/48x48/status/xfpm-mouse-100.png b/data/icons/48x48/status/xfpm-mouse-100.png
new file mode 100644
index 00000000..10e7344f
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-mouse-100.png
diff --git a/data/icons/48x48/status/xfpm-phone-000.png b/data/icons/48x48/status/xfpm-phone-000.png
new file mode 100644
index 00000000..7ea9999f
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-phone-000.png
diff --git a/data/icons/48x48/status/xfpm-phone-030.png b/data/icons/48x48/status/xfpm-phone-030.png
new file mode 100644
index 00000000..c0c3437b
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-phone-030.png
diff --git a/data/icons/48x48/status/xfpm-phone-060.png b/data/icons/48x48/status/xfpm-phone-060.png
new file mode 100644
index 00000000..92c5d30c
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-phone-060.png
diff --git a/data/icons/48x48/status/xfpm-phone-100.png b/data/icons/48x48/status/xfpm-phone-100.png
new file mode 100644
index 00000000..9b011efd
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-phone-100.png
diff --git a/data/icons/48x48/status/xfpm-primary-000-charging.png b/data/icons/48x48/status/xfpm-primary-000-charging.png
new file mode 100644
index 00000000..6e742d36
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-000-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-000.png b/data/icons/48x48/status/xfpm-primary-000.png
new file mode 100644
index 00000000..7cf4ab09
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-000.png
diff --git a/data/icons/48x48/status/xfpm-primary-020-charging.png b/data/icons/48x48/status/xfpm-primary-020-charging.png
new file mode 100644
index 00000000..e8d2a711
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-020-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-020.png b/data/icons/48x48/status/xfpm-primary-020.png
new file mode 100644
index 00000000..c8ecb293
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-020.png
diff --git a/data/icons/48x48/status/xfpm-primary-040-charging.png b/data/icons/48x48/status/xfpm-primary-040-charging.png
new file mode 100644
index 00000000..83e3b603
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-040-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-040.png b/data/icons/48x48/status/xfpm-primary-040.png
new file mode 100644
index 00000000..2b5bc562
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-040.png
diff --git a/data/icons/48x48/status/xfpm-primary-060-charging.png b/data/icons/48x48/status/xfpm-primary-060-charging.png
new file mode 100644
index 00000000..5e62c04d
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-060-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-060.png b/data/icons/48x48/status/xfpm-primary-060.png
new file mode 100644
index 00000000..279f4a6d
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-060.png
diff --git a/data/icons/48x48/status/xfpm-primary-080-charging.png b/data/icons/48x48/status/xfpm-primary-080-charging.png
new file mode 100644
index 00000000..e92565e8
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-080-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-080.png b/data/icons/48x48/status/xfpm-primary-080.png
new file mode 100644
index 00000000..e0f80ce2
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-080.png
diff --git a/data/icons/48x48/status/xfpm-primary-100-charging.png b/data/icons/48x48/status/xfpm-primary-100-charging.png
new file mode 100644
index 00000000..ddde2852
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-100-charging.png
diff --git a/data/icons/48x48/status/xfpm-primary-100.png b/data/icons/48x48/status/xfpm-primary-100.png
new file mode 100644
index 00000000..3531ba23
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-100.png
diff --git a/data/icons/48x48/status/xfpm-primary-charged.png b/data/icons/48x48/status/xfpm-primary-charged.png
new file mode 100644
index 00000000..ea5c5089
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-charged.png
diff --git a/data/icons/48x48/status/xfpm-primary-missing.png b/data/icons/48x48/status/xfpm-primary-missing.png
new file mode 100644
index 00000000..05a23b07
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-primary-missing.png
diff --git a/data/icons/48x48/status/xfpm-ups-000-charging.png b/data/icons/48x48/status/xfpm-ups-000-charging.png
new file mode 100644
index 00000000..3fbab4e3
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-000-charging.png
diff --git a/data/icons/48x48/status/xfpm-ups-000.png b/data/icons/48x48/status/xfpm-ups-000.png
new file mode 100644
index 00000000..efac18c1
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-000.png
diff --git a/data/icons/48x48/status/xfpm-ups-020-charging.png b/data/icons/48x48/status/xfpm-ups-020-charging.png
new file mode 100644
index 00000000..b78ab99f
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-020-charging.png
diff --git a/data/icons/48x48/status/xfpm-ups-020.png b/data/icons/48x48/status/xfpm-ups-020.png
new file mode 100644
index 00000000..ebd25488
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-020.png
diff --git a/data/icons/48x48/status/xfpm-ups-040-charging.png b/data/icons/48x48/status/xfpm-ups-040-charging.png
new file mode 100644
index 00000000..72be3035
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-040-charging.png
diff --git a/data/icons/48x48/status/xfpm-ups-040.png b/data/icons/48x48/status/xfpm-ups-040.png
new file mode 100644
index 00000000..cda0c46a
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-040.png
diff --git a/data/icons/48x48/status/xfpm-ups-060-charging.png b/data/icons/48x48/status/xfpm-ups-060-charging.png
new file mode 100644
index 00000000..03b9f597
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-060-charging.png
diff --git a/data/icons/48x48/status/xfpm-ups-060.png b/data/icons/48x48/status/xfpm-ups-060.png
new file mode 100644
index 00000000..12adf48c
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-060.png
diff --git a/data/icons/48x48/status/xfpm-ups-080-charging.png b/data/icons/48x48/status/xfpm-ups-080-charging.png
new file mode 100644
index 00000000..910718de
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-080-charging.png
diff --git a/data/icons/48x48/status/xfpm-ups-080.png b/data/icons/48x48/status/xfpm-ups-080.png
new file mode 100644
index 00000000..2a8d5c5f
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-080.png
diff --git a/data/icons/48x48/status/xfpm-ups-100-charging.png b/data/icons/48x48/status/xfpm-ups-100-charging.png
new file mode 100644
index 00000000..4c149022
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-100-charging.png
diff --git a/data/icons/48x48/status/xfpm-ups-100.png b/data/icons/48x48/status/xfpm-ups-100.png
new file mode 100644
index 00000000..110d6a0f
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-100.png
diff --git a/data/icons/48x48/status/xfpm-ups-charged.png b/data/icons/48x48/status/xfpm-ups-charged.png
new file mode 100644
index 00000000..51ef7566
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-charged.png
diff --git a/data/icons/48x48/status/xfpm-ups-missing.png b/data/icons/48x48/status/xfpm-ups-missing.png
new file mode 100644
index 00000000..fefe77e9
--- /dev/null
+++ b/data/icons/48x48/status/xfpm-ups-missing.png
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index ce272906..77af40fa 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,7 +1,8 @@
-SUBDIRS =         \
-	scalable  
-        						
-	
+SUBDIRS =         	\
+	16x16		\
+	24x24		\
+	48x48		\
+	scalable
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor