Use the battery names from the shared-icon-specification

97 files changed, 102 insertions, 2365 deletions

diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
index 38f48d1..595cb2c 100644
--- a/data/icons/16x16/status/Makefile.am
+++ b/data/icons/16x16/status/Makefile.am
@@ -33,21 +33,16 @@ icons_DATA = 			        \
 	gpm-mouse-060.png		\
 	gpm-mouse-080.png		\
 	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
+	battery-caution.png		\
+	battery-low.png			\
+	battery-good.png		\
+	battery-full.png		\
+	battery-caution-charging.png	\
+	battery-low-charging.png	\
+	battery-good-charging.png	\
+	battery-full-charging.png	\
+	battery-missing.png		\
+	battery-empty.png		\
 	gpm-ups-000.png			\
 	gpm-ups-020.png			\
 	gpm-ups-040.png			\
diff --git a/data/icons/16x16/status/gpm-battery-000-charging.png b/data/icons/16x16/status/battery-caution-charging.png
index 716a1f8..716a1f8 100644
--- a/data/icons/16x16/status/gpm-battery-000-charging.png
+++ b/data/icons/16x16/status/battery-caution-charging.png
diff --git a/data/icons/16x16/status/gpm-battery-000.png b/data/icons/16x16/status/battery-caution.png
index 7a72959..7a72959 100644
--- a/data/icons/16x16/status/gpm-battery-000.png
+++ b/data/icons/16x16/status/battery-caution.png
diff --git a/data/icons/16x16/status/gpm-battery-empty.png b/data/icons/16x16/status/battery-empty.png
index 6445d87..6445d87 100644
--- a/data/icons/16x16/status/gpm-battery-empty.png
+++ b/data/icons/16x16/status/battery-empty.png
diff --git a/data/icons/16x16/status/gpm-battery-100-charging.png b/data/icons/16x16/status/battery-full-charging.png
index 983cea1..983cea1 100644
--- a/data/icons/16x16/status/gpm-battery-100-charging.png
+++ b/data/icons/16x16/status/battery-full-charging.png
diff --git a/data/icons/16x16/status/gpm-battery-100.png b/data/icons/16x16/status/battery-full.png
index 14e93eb..14e93eb 100644
--- a/data/icons/16x16/status/gpm-battery-100.png
+++ b/data/icons/16x16/status/battery-full.png
diff --git a/data/icons/16x16/status/gpm-battery-060-charging.png b/data/icons/16x16/status/battery-good-charging.png
index 42946e7..42946e7 100644
--- a/data/icons/16x16/status/gpm-battery-060-charging.png
+++ b/data/icons/16x16/status/battery-good-charging.png
diff --git a/data/icons/16x16/status/gpm-battery-060.png b/data/icons/16x16/status/battery-good.png
index e947351..e947351 100644
--- a/data/icons/16x16/status/gpm-battery-060.png
+++ b/data/icons/16x16/status/battery-good.png
diff --git a/data/icons/16x16/status/gpm-battery-020-charging.png b/data/icons/16x16/status/battery-low-charging.png
index a5b83cd..a5b83cd 100644
--- a/data/icons/16x16/status/gpm-battery-020-charging.png
+++ b/data/icons/16x16/status/battery-low-charging.png
diff --git a/data/icons/16x16/status/gpm-battery-020.png b/data/icons/16x16/status/battery-low.png
index bdc8cb2..bdc8cb2 100644
--- a/data/icons/16x16/status/gpm-battery-020.png
+++ b/data/icons/16x16/status/battery-low.png
diff --git a/data/icons/16x16/status/gpm-battery-missing.png b/data/icons/16x16/status/battery-missing.png
index 43ddbb0..43ddbb0 100644
--- a/data/icons/16x16/status/gpm-battery-missing.png
+++ b/data/icons/16x16/status/battery-missing.png
diff --git a/data/icons/16x16/status/gpm-battery-040-charging.png b/data/icons/16x16/status/gpm-battery-040-charging.png
deleted file mode 100644
index 26b22a3..0000000
--- a/data/icons/16x16/status/gpm-battery-040-charging.png
+++ /dev/null
diff --git a/data/icons/16x16/status/gpm-battery-040.png b/data/icons/16x16/status/gpm-battery-040.png
deleted file mode 100644
index e653ac1..0000000
--- a/data/icons/16x16/status/gpm-battery-040.png
+++ /dev/null
diff --git a/data/icons/16x16/status/gpm-battery-080-charging.png b/data/icons/16x16/status/gpm-battery-080-charging.png
deleted file mode 100644
index 8d80ac4..0000000
--- a/data/icons/16x16/status/gpm-battery-080-charging.png
+++ /dev/null
diff --git a/data/icons/16x16/status/gpm-battery-080.png b/data/icons/16x16/status/gpm-battery-080.png
deleted file mode 100644
index e91d416..0000000
--- a/data/icons/16x16/status/gpm-battery-080.png
+++ /dev/null
diff --git a/data/icons/16x16/status/gpm-battery-charged.png b/data/icons/16x16/status/gpm-battery-charged.png
deleted file mode 100644
index eb912cb..0000000
--- a/data/icons/16x16/status/gpm-battery-charged.png
+++ /dev/null
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
index 1184c55..142237c 100644
--- a/data/icons/22x22/status/Makefile.am
+++ b/data/icons/22x22/status/Makefile.am
@@ -33,21 +33,16 @@ icons_DATA = 			        \
 	gpm-mouse-060.png		\
 	gpm-mouse-080.png		\
 	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
+	battery-caution.png		\
+	battery-low.png			\
+	battery-good.png		\
+	battery-full.png		\
+	battery-caution-charging.png	\
+	battery-low-charging.png	\
+	battery-good-charging.png	\
+	battery-full-charging.png	\
+	battery-missing.png		\
+	battery-empty.png		\
 	gpm-ups-000.png			\
 	gpm-ups-020.png			\
 	gpm-ups-040.png			\
diff --git a/data/icons/22x22/status/gpm-battery-000-charging.png b/data/icons/22x22/status/battery-caution-charging.png
index 212803b..212803b 100644
--- a/data/icons/22x22/status/gpm-battery-000-charging.png
+++ b/data/icons/22x22/status/battery-caution-charging.png
diff --git a/data/icons/22x22/status/gpm-battery-000.png b/data/icons/22x22/status/battery-caution.png
index 57262e5..57262e5 100644
--- a/data/icons/22x22/status/gpm-battery-000.png
+++ b/data/icons/22x22/status/battery-caution.png
diff --git a/data/icons/22x22/status/gpm-battery-empty.png b/data/icons/22x22/status/battery-empty.png
index 261bdfc..261bdfc 100644
--- a/data/icons/22x22/status/gpm-battery-empty.png
+++ b/data/icons/22x22/status/battery-empty.png
diff --git a/data/icons/22x22/status/gpm-battery-100-charging.png b/data/icons/22x22/status/battery-full-charging.png
index 8653958..8653958 100644
--- a/data/icons/22x22/status/gpm-battery-100-charging.png
+++ b/data/icons/22x22/status/battery-full-charging.png
diff --git a/data/icons/22x22/status/gpm-battery-100.png b/data/icons/22x22/status/battery-full.png
index 02357f6..02357f6 100644
--- a/data/icons/22x22/status/gpm-battery-100.png
+++ b/data/icons/22x22/status/battery-full.png
diff --git a/data/icons/22x22/status/gpm-battery-060-charging.png b/data/icons/22x22/status/battery-good-charging.png
index 622b90d..622b90d 100644
--- a/data/icons/22x22/status/gpm-battery-060-charging.png
+++ b/data/icons/22x22/status/battery-good-charging.png
diff --git a/data/icons/22x22/status/gpm-battery-060.png b/data/icons/22x22/status/battery-good.png
index ca84196..ca84196 100644
--- a/data/icons/22x22/status/gpm-battery-060.png
+++ b/data/icons/22x22/status/battery-good.png
diff --git a/data/icons/22x22/status/gpm-battery-020-charging.png b/data/icons/22x22/status/battery-low-charging.png
index 848e22c..848e22c 100644
--- a/data/icons/22x22/status/gpm-battery-020-charging.png
+++ b/data/icons/22x22/status/battery-low-charging.png
diff --git a/data/icons/22x22/status/gpm-battery-020.png b/data/icons/22x22/status/battery-low.png
index f0079a6..f0079a6 100644
--- a/data/icons/22x22/status/gpm-battery-020.png
+++ b/data/icons/22x22/status/battery-low.png
diff --git a/data/icons/22x22/status/gpm-battery-missing.png b/data/icons/22x22/status/battery-missing.png
index a315701..a315701 100644
--- a/data/icons/22x22/status/gpm-battery-missing.png
+++ b/data/icons/22x22/status/battery-missing.png
diff --git a/data/icons/22x22/status/gpm-battery-040-charging.png b/data/icons/22x22/status/gpm-battery-040-charging.png
deleted file mode 100644
index 510d207..0000000
--- a/data/icons/22x22/status/gpm-battery-040-charging.png
+++ /dev/null
diff --git a/data/icons/22x22/status/gpm-battery-040.png b/data/icons/22x22/status/gpm-battery-040.png
deleted file mode 100644
index 3982b78..0000000
--- a/data/icons/22x22/status/gpm-battery-040.png
+++ /dev/null
diff --git a/data/icons/22x22/status/gpm-battery-080-charging.png b/data/icons/22x22/status/gpm-battery-080-charging.png
deleted file mode 100644
index 91f6274..0000000
--- a/data/icons/22x22/status/gpm-battery-080-charging.png
+++ /dev/null
diff --git a/data/icons/22x22/status/gpm-battery-080.png b/data/icons/22x22/status/gpm-battery-080.png
deleted file mode 100644
index 1c39401..0000000
--- a/data/icons/22x22/status/gpm-battery-080.png
+++ /dev/null
diff --git a/data/icons/22x22/status/gpm-battery-charged.png b/data/icons/22x22/status/gpm-battery-charged.png
deleted file mode 100644
index 93b89e6..0000000
--- a/data/icons/22x22/status/gpm-battery-charged.png
+++ /dev/null
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
index d5af505..8e21052 100644
--- a/data/icons/24x24/status/Makefile.am
+++ b/data/icons/24x24/status/Makefile.am
@@ -33,21 +33,16 @@ icons_DATA = 			        \
 	gpm-mouse-060.png		\
 	gpm-mouse-080.png		\
 	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
+	battery-caution.png		\
+	battery-low.png			\
+	battery-good.png		\
+	battery-full.png		\
+	battery-caution-charging.png	\
+	battery-low-charging.png	\
+	battery-good-charging.png	\
+	battery-full-charging.png	\
+	battery-missing.png		\
+	battery-empty.png		\
 	gpm-ups-000.png			\
 	gpm-ups-020.png			\
 	gpm-ups-040.png			\
diff --git a/data/icons/24x24/status/gpm-battery-000-charging.png b/data/icons/24x24/status/battery-caution-charging.png
index f3f77c7..f3f77c7 100644
--- a/data/icons/24x24/status/gpm-battery-000-charging.png
+++ b/data/icons/24x24/status/battery-caution-charging.png
diff --git a/data/icons/24x24/status/gpm-battery-000.png b/data/icons/24x24/status/battery-caution.png
index 72d8638..72d8638 100644
--- a/data/icons/24x24/status/gpm-battery-000.png
+++ b/data/icons/24x24/status/battery-caution.png
diff --git a/data/icons/24x24/status/gpm-battery-empty.png b/data/icons/24x24/status/battery-empty.png
index 063b765..063b765 100644
--- a/data/icons/24x24/status/gpm-battery-empty.png
+++ b/data/icons/24x24/status/battery-empty.png
diff --git a/data/icons/24x24/status/gpm-battery-100-charging.png b/data/icons/24x24/status/battery-full-charging.png
index b1b0556..b1b0556 100644
--- a/data/icons/24x24/status/gpm-battery-100-charging.png
+++ b/data/icons/24x24/status/battery-full-charging.png
diff --git a/data/icons/24x24/status/gpm-battery-100.png b/data/icons/24x24/status/battery-full.png
index 20743fb..20743fb 100644
--- a/data/icons/24x24/status/gpm-battery-100.png
+++ b/data/icons/24x24/status/battery-full.png
diff --git a/data/icons/24x24/status/gpm-battery-060-charging.png b/data/icons/24x24/status/battery-good-charging.png
index 6c01650..6c01650 100644
--- a/data/icons/24x24/status/gpm-battery-060-charging.png
+++ b/data/icons/24x24/status/battery-good-charging.png
diff --git a/data/icons/24x24/status/gpm-battery-060.png b/data/icons/24x24/status/battery-good.png
index fbd33ca..fbd33ca 100644
--- a/data/icons/24x24/status/gpm-battery-060.png
+++ b/data/icons/24x24/status/battery-good.png
diff --git a/data/icons/24x24/status/gpm-battery-020-charging.png b/data/icons/24x24/status/battery-low-charging.png
index 09ec6f0..09ec6f0 100644
--- a/data/icons/24x24/status/gpm-battery-020-charging.png
+++ b/data/icons/24x24/status/battery-low-charging.png
diff --git a/data/icons/24x24/status/gpm-battery-020.png b/data/icons/24x24/status/battery-low.png
index afa7567..afa7567 100644
--- a/data/icons/24x24/status/gpm-battery-020.png
+++ b/data/icons/24x24/status/battery-low.png
diff --git a/data/icons/24x24/status/gpm-battery-missing.png b/data/icons/24x24/status/battery-missing.png
index 7e30086..7e30086 100644
--- a/data/icons/24x24/status/gpm-battery-missing.png
+++ b/data/icons/24x24/status/battery-missing.png
diff --git a/data/icons/24x24/status/gpm-battery-040-charging.png b/data/icons/24x24/status/gpm-battery-040-charging.png
deleted file mode 100644
index 5a36c1e..0000000
--- a/data/icons/24x24/status/gpm-battery-040-charging.png
+++ /dev/null
diff --git a/data/icons/24x24/status/gpm-battery-040.png b/data/icons/24x24/status/gpm-battery-040.png
deleted file mode 100644
index fb6f490..0000000
--- a/data/icons/24x24/status/gpm-battery-040.png
+++ /dev/null
diff --git a/data/icons/24x24/status/gpm-battery-080-charging.png b/data/icons/24x24/status/gpm-battery-080-charging.png
deleted file mode 100644
index e3a695b..0000000
--- a/data/icons/24x24/status/gpm-battery-080-charging.png
+++ /dev/null
diff --git a/data/icons/24x24/status/gpm-battery-080.png b/data/icons/24x24/status/gpm-battery-080.png
deleted file mode 100644
index d27bb55..0000000
--- a/data/icons/24x24/status/gpm-battery-080.png
+++ /dev/null
diff --git a/data/icons/24x24/status/gpm-battery-charged.png b/data/icons/24x24/status/gpm-battery-charged.png
deleted file mode 100644
index 341d4f2..0000000
--- a/data/icons/24x24/status/gpm-battery-charged.png
+++ /dev/null
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
index 7eefec8..21b01cf 100644
--- a/data/icons/32x32/status/Makefile.am
+++ b/data/icons/32x32/status/Makefile.am
@@ -33,21 +33,16 @@ icons_DATA = 			        \
 	gpm-mouse-060.png		\
 	gpm-mouse-080.png		\
 	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
+	battery-caution.png		\
+	battery-low.png			\
+	battery-good.png		\
+	battery-full.png		\
+	battery-caution-charging.png	\
+	battery-low-charging.png	\
+	battery-good-charging.png	\
+	battery-full-charging.png	\
+	battery-missing.png		\
+	battery-empty.png		\
 	gpm-ups-000.png			\
 	gpm-ups-020.png			\
 	gpm-ups-040.png			\
diff --git a/data/icons/32x32/status/gpm-battery-000-charging.png b/data/icons/32x32/status/battery-caution-charging.png
index c972efd..c972efd 100644
--- a/data/icons/32x32/status/gpm-battery-000-charging.png
+++ b/data/icons/32x32/status/battery-caution-charging.png
diff --git a/data/icons/32x32/status/gpm-battery-000.png b/data/icons/32x32/status/battery-caution.png
index 70718db..70718db 100644
--- a/data/icons/32x32/status/gpm-battery-000.png
+++ b/data/icons/32x32/status/battery-caution.png
diff --git a/data/icons/32x32/status/gpm-battery-empty.png b/data/icons/32x32/status/battery-empty.png
index 8abb520..8abb520 100644
--- a/data/icons/32x32/status/gpm-battery-empty.png
+++ b/data/icons/32x32/status/battery-empty.png
diff --git a/data/icons/32x32/status/gpm-battery-100-charging.png b/data/icons/32x32/status/battery-full-charging.png
index c7bbdbf..c7bbdbf 100644
--- a/data/icons/32x32/status/gpm-battery-100-charging.png
+++ b/data/icons/32x32/status/battery-full-charging.png
diff --git a/data/icons/32x32/status/gpm-battery-100.png b/data/icons/32x32/status/battery-full.png
index cfa6fc8..cfa6fc8 100644
--- a/data/icons/32x32/status/gpm-battery-100.png
+++ b/data/icons/32x32/status/battery-full.png
diff --git a/data/icons/32x32/status/gpm-battery-060-charging.png b/data/icons/32x32/status/battery-good-charging.png
index 217cb9e..217cb9e 100644
--- a/data/icons/32x32/status/gpm-battery-060-charging.png
+++ b/data/icons/32x32/status/battery-good-charging.png
diff --git a/data/icons/32x32/status/gpm-battery-060.png b/data/icons/32x32/status/battery-good.png
index 8320860..8320860 100644
--- a/data/icons/32x32/status/gpm-battery-060.png
+++ b/data/icons/32x32/status/battery-good.png
diff --git a/data/icons/32x32/status/gpm-battery-020-charging.png b/data/icons/32x32/status/battery-low-charging.png
index 62574ed..62574ed 100644
--- a/data/icons/32x32/status/gpm-battery-020-charging.png
+++ b/data/icons/32x32/status/battery-low-charging.png
diff --git a/data/icons/32x32/status/gpm-battery-020.png b/data/icons/32x32/status/battery-low.png
index c5db0e3..c5db0e3 100644
--- a/data/icons/32x32/status/gpm-battery-020.png
+++ b/data/icons/32x32/status/battery-low.png
diff --git a/data/icons/32x32/status/gpm-battery-missing.png b/data/icons/32x32/status/battery-missing.png
index 2c98a0f..2c98a0f 100644
--- a/data/icons/32x32/status/gpm-battery-missing.png
+++ b/data/icons/32x32/status/battery-missing.png
diff --git a/data/icons/32x32/status/gpm-battery-040-charging.png b/data/icons/32x32/status/gpm-battery-040-charging.png
deleted file mode 100644
index 6896510..0000000
--- a/data/icons/32x32/status/gpm-battery-040-charging.png
+++ /dev/null
diff --git a/data/icons/32x32/status/gpm-battery-040.png b/data/icons/32x32/status/gpm-battery-040.png
deleted file mode 100644
index 595bfa6..0000000
--- a/data/icons/32x32/status/gpm-battery-040.png
+++ /dev/null
diff --git a/data/icons/32x32/status/gpm-battery-080-charging.png b/data/icons/32x32/status/gpm-battery-080-charging.png
deleted file mode 100644
index 1beb9ed..0000000
--- a/data/icons/32x32/status/gpm-battery-080-charging.png
+++ /dev/null
diff --git a/data/icons/32x32/status/gpm-battery-080.png b/data/icons/32x32/status/gpm-battery-080.png
deleted file mode 100644
index ed8c0db..0000000
--- a/data/icons/32x32/status/gpm-battery-080.png
+++ /dev/null
diff --git a/data/icons/32x32/status/gpm-battery-charged.png b/data/icons/32x32/status/gpm-battery-charged.png
deleted file mode 100644
index 8ccdc5a..0000000
--- a/data/icons/32x32/status/gpm-battery-charged.png
+++ /dev/null
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
index 53124c8..e34edf8 100644
--- a/data/icons/48x48/status/Makefile.am
+++ b/data/icons/48x48/status/Makefile.am
@@ -34,21 +34,16 @@ icons_DATA = 			        \
 	gpm-mouse-060.png		\
 	gpm-mouse-080.png		\
 	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
+	battery-caution.png		\
+	battery-low.png			\
+	battery-good.png		\
+	battery-full.png		\
+	battery-caution-charging.png	\
+	battery-low-charging.png	\
+	battery-good-charging.png	\
+	battery-full-charging.png	\
+	battery-missing.png		\
+	battery-empty.png		\
 	gpm-ups-000.png			\
 	gpm-ups-020.png			\
 	gpm-ups-040.png			\
diff --git a/data/icons/48x48/status/gpm-battery-000-charging.png b/data/icons/48x48/status/battery-caution-charging.png
index 60ddf8c..60ddf8c 100644
--- a/data/icons/48x48/status/gpm-battery-000-charging.png
+++ b/data/icons/48x48/status/battery-caution-charging.png
diff --git a/data/icons/48x48/status/gpm-battery-000.png b/data/icons/48x48/status/battery-caution.png
index 28529a4..28529a4 100644
--- a/data/icons/48x48/status/gpm-battery-000.png
+++ b/data/icons/48x48/status/battery-caution.png
diff --git a/data/icons/48x48/status/gpm-battery-empty.png b/data/icons/48x48/status/battery-empty.png
index 0f0b6f1..0f0b6f1 100644
--- a/data/icons/48x48/status/gpm-battery-empty.png
+++ b/data/icons/48x48/status/battery-empty.png
diff --git a/data/icons/48x48/status/gpm-battery-100-charging.png b/data/icons/48x48/status/battery-full-charging.png
index d92059b..d92059b 100644
--- a/data/icons/48x48/status/gpm-battery-100-charging.png
+++ b/data/icons/48x48/status/battery-full-charging.png
diff --git a/data/icons/48x48/status/gpm-battery-100.png b/data/icons/48x48/status/battery-full.png
index 57763cd..57763cd 100644
--- a/data/icons/48x48/status/gpm-battery-100.png
+++ b/data/icons/48x48/status/battery-full.png
diff --git a/data/icons/48x48/status/gpm-battery-060-charging.png b/data/icons/48x48/status/battery-good-charging.png
index e0960d8..e0960d8 100644
--- a/data/icons/48x48/status/gpm-battery-060-charging.png
+++ b/data/icons/48x48/status/battery-good-charging.png
diff --git a/data/icons/48x48/status/gpm-battery-060.png b/data/icons/48x48/status/battery-good.png
index ca47917..ca47917 100644
--- a/data/icons/48x48/status/gpm-battery-060.png
+++ b/data/icons/48x48/status/battery-good.png
diff --git a/data/icons/48x48/status/gpm-battery-020-charging.png b/data/icons/48x48/status/battery-low-charging.png
index 9f31ab4..9f31ab4 100644
--- a/data/icons/48x48/status/gpm-battery-020-charging.png
+++ b/data/icons/48x48/status/battery-low-charging.png
diff --git a/data/icons/48x48/status/gpm-battery-020.png b/data/icons/48x48/status/battery-low.png
index 18d2e20..18d2e20 100644
--- a/data/icons/48x48/status/gpm-battery-020.png
+++ b/data/icons/48x48/status/battery-low.png
diff --git a/data/icons/48x48/status/gpm-battery-missing.png b/data/icons/48x48/status/battery-missing.png
index 893a946..893a946 100644
--- a/data/icons/48x48/status/gpm-battery-missing.png
+++ b/data/icons/48x48/status/battery-missing.png
diff --git a/data/icons/48x48/status/gpm-battery-040-charging.png b/data/icons/48x48/status/gpm-battery-040-charging.png
deleted file mode 100644
index 2f882ad..0000000
--- a/data/icons/48x48/status/gpm-battery-040-charging.png
+++ /dev/null
diff --git a/data/icons/48x48/status/gpm-battery-040.png b/data/icons/48x48/status/gpm-battery-040.png
deleted file mode 100644
index c4973c7..0000000
--- a/data/icons/48x48/status/gpm-battery-040.png
+++ /dev/null
diff --git a/data/icons/48x48/status/gpm-battery-080-charging.png b/data/icons/48x48/status/gpm-battery-080-charging.png
deleted file mode 100644
index da30e54..0000000
--- a/data/icons/48x48/status/gpm-battery-080-charging.png
+++ /dev/null
diff --git a/data/icons/48x48/status/gpm-battery-080.png b/data/icons/48x48/status/gpm-battery-080.png
deleted file mode 100644
index cbb2efb..0000000
--- a/data/icons/48x48/status/gpm-battery-080.png
+++ /dev/null
diff --git a/data/icons/48x48/status/gpm-battery-charged.png b/data/icons/48x48/status/gpm-battery-charged.png
deleted file mode 100644
index eaa8618..0000000
--- a/data/icons/48x48/status/gpm-battery-charged.png
+++ /dev/null
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
index e7b6c04..b8bdd68 100644
--- a/data/icons/scalable/status/Makefile.am
+++ b/data/icons/scalable/status/Makefile.am
@@ -25,21 +25,16 @@ icons_DATA = 			        \
 	gpm-mouse-000.svg		\
 	gpm-mouse-060.svg		\
 	gpm-mouse-100.svg		\
-	gpm-battery-000.svg		\
-	gpm-battery-020.svg		\
-	gpm-battery-040.svg		\
-	gpm-battery-060.svg		\
-	gpm-battery-080.svg		\
-	gpm-battery-100.svg		\
-	gpm-battery-000-charging.svg	\
-	gpm-battery-020-charging.svg	\
-	gpm-battery-040-charging.svg	\
-	gpm-battery-060-charging.svg	\
-	gpm-battery-080-charging.svg	\
-	gpm-battery-100-charging.svg	\
-	gpm-battery-missing.svg		\
-	gpm-battery-charged.svg		\
-	gpm-battery-empty.svg		\
+	battery-caution.svg		\
+	battery-low.svg			\
+	battery-good.svg		\
+	battery-full.svg		\
+	battery-caution-charging.svg	\
+	battery-low-charging.svg	\
+	battery-good-charging.svg	\
+	battery-full-charging.svg	\
+	battery-missing.svg		\
+	battery-empty.svg		\
 	gpm-ups-000.svg			\
 	gpm-ups-020.svg			\
 	gpm-ups-040.svg			\
diff --git a/data/icons/scalable/status/gpm-battery-000-charging.svg b/data/icons/scalable/status/battery-caution-charging.svg
index 7b19f84..7b19f84 100644
--- a/data/icons/scalable/status/gpm-battery-000-charging.svg
+++ b/data/icons/scalable/status/battery-caution-charging.svg
diff --git a/data/icons/scalable/status/gpm-battery-000.svg b/data/icons/scalable/status/battery-caution.svg
index f1ea6fb..f1ea6fb 100644
--- a/data/icons/scalable/status/gpm-battery-000.svg
+++ b/data/icons/scalable/status/battery-caution.svg
diff --git a/data/icons/scalable/status/gpm-battery-empty.svg b/data/icons/scalable/status/battery-empty.svg
index 7d8e5d5..f4b8a87 100644
--- a/data/icons/scalable/status/gpm-battery-empty.svg
+++ b/data/icons/scalable/status/battery-empty.svg
@@ -16,9 +16,9 @@
    id="svg1328"
    sodipodi:version="0.32"
    inkscape:version="0.46+devel"
-   sodipodi:docname="gpm-battery-empty.svg"
+   sodipodi:docname="battery-empty.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/hughsie/Code/gnome-power-manager/data/icons/48x48/status/gpm-battery-empty.png"
+   inkscape:export-filename="/home/hughsie/Code/gnome-power-manager/data/icons/48x48/status/battery-empty.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <metadata
diff --git a/data/icons/scalable/status/gpm-battery-100-charging.svg b/data/icons/scalable/status/battery-full-charging.svg
index 37b3a6f..37b3a6f 100644
--- a/data/icons/scalable/status/gpm-battery-100-charging.svg
+++ b/data/icons/scalable/status/battery-full-charging.svg
diff --git a/data/icons/scalable/status/gpm-battery-100.svg b/data/icons/scalable/status/battery-full.svg
index 482768a..482768a 100644
--- a/data/icons/scalable/status/gpm-battery-100.svg
+++ b/data/icons/scalable/status/battery-full.svg
diff --git a/data/icons/scalable/status/gpm-battery-060-charging.svg b/data/icons/scalable/status/battery-good-charging.svg
index dc1e34a..dc1e34a 100644
--- a/data/icons/scalable/status/gpm-battery-060-charging.svg
+++ b/data/icons/scalable/status/battery-good-charging.svg
diff --git a/data/icons/scalable/status/gpm-battery-060.svg b/data/icons/scalable/status/battery-good.svg
index 703ee3d..703ee3d 100644
--- a/data/icons/scalable/status/gpm-battery-060.svg
+++ b/data/icons/scalable/status/battery-good.svg
diff --git a/data/icons/scalable/status/gpm-battery-020-charging.svg b/data/icons/scalable/status/battery-low-charging.svg
index 219cf92..219cf92 100644
--- a/data/icons/scalable/status/gpm-battery-020-charging.svg
+++ b/data/icons/scalable/status/battery-low-charging.svg
diff --git a/data/icons/scalable/status/gpm-battery-020.svg b/data/icons/scalable/status/battery-low.svg
index b7933d8..b7933d8 100644
--- a/data/icons/scalable/status/gpm-battery-020.svg
+++ b/data/icons/scalable/status/battery-low.svg
diff --git a/data/icons/scalable/status/gpm-battery-missing.svg b/data/icons/scalable/status/battery-missing.svg
index 2a46084..2a46084 100644
--- a/data/icons/scalable/status/gpm-battery-missing.svg
+++ b/data/icons/scalable/status/battery-missing.svg
diff --git a/data/icons/scalable/status/gpm-battery-040-charging.svg b/data/icons/scalable/status/gpm-battery-040-charging.svg
deleted file mode 100644
index fe12001..0000000
--- a/data/icons/scalable/status/gpm-battery-040-charging.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="48"
-   height="48"
-   id="svg1328">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3289">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop3291" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3293" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3271">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop3273" />
-      <stop
-         style="stop-color:#d3d3ce;stop-opacity:1"
-         offset="1"
-         id="stop3275" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3309">
-      <stop
-         style="stop-color:#e5e6e3;stop-opacity:1"
-         offset="0"
-         id="stop3311" />
-      <stop
-         style="stop-color:#d1d3cf;stop-opacity:1"
-         offset="0.5"
-         id="stop3317" />
-      <stop
-         style="stop-color:#767c6f;stop-opacity:1"
-         offset="1"
-         id="stop3313" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3323">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop3325" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3327" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="0"
-         id="stop3343" />
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:0"
-         offset="1"
-         id="stop3345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3353">
-      <stop
-         style="stop-color:#969696;stop-opacity:1"
-         offset="0"
-         id="stop3355" />
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:0"
-         offset="1"
-         id="stop3357" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3260">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="0"
-         id="stop3262" />
-      <stop
-         style="stop-color:#8fb1dc;stop-opacity:1"
-         offset="1"
-         id="stop3264" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3815">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:#98b8e7;stop-opacity:1"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         style="stop-color:#284e7f;stop-opacity:1"
-         offset="0"
-         id="stop3807" />
-      <stop
-         style="stop-color:#6694cf;stop-opacity:1"
-         offset="0.5"
-         id="stop3813" />
-      <stop
-         style="stop-color:#234570;stop-opacity:1"
-         offset="1"
-         id="stop3809" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3247">
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0"
-         id="stop3249" />
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:0"
-         offset="1"
-         id="stop3251" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3233">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop3235" />
-      <stop
-         style="stop-color:#a3a398;stop-opacity:1"
-         offset="1"
-         id="stop3237" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6924">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop6926" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop6928" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4176">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4178" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop4180" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4134">
-      <stop
-         style="stop-color:#d6d7d5;stop-opacity:1"
-         offset="0"
-         id="stop4136" />
-      <stop
-         style="stop-color:#d1d2d0;stop-opacity:1"
-         offset="0.25"
-         id="stop4148" />
-      <stop
-         style="stop-color:#a5a6a3;stop-opacity:1"
-         offset="0.5"
-         id="stop4142" />
-      <stop
-         style="stop-color:#dddedc;stop-opacity:1"
-         offset="1"
-         id="stop4138" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4128" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop4130" />
-    </linearGradient>
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient4132"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="9.3030529"
-       y1="26.71875"
-       x2="38.826412"
-       y2="26.71875"
-       id="linearGradient4140"
-       xlink:href="#linearGradient4134"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,0.991346,-7.269358,-4.826537)" />
-    <linearGradient
-       x1="17.160095"
-       y1="14.004482"
-       x2="37.969398"
-       y2="56.575912"
-       id="linearGradient4182"
-       xlink:href="#linearGradient4176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,0.992756,-7.269358,-4.832743)" />
-    <linearGradient
-       x1="16.07143"
-       y1="19.5"
-       x2="16.035715"
-       y2="31.75"
-       id="linearGradient6930"
-       xlink:href="#linearGradient6924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,1,-7.269359,-2.32786)" />
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient6946"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="34.244171"
-       y1="17.695425"
-       x2="34.244171"
-       y2="29.91827"
-       id="linearGradient3253"
-       xlink:href="#linearGradient3247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,1,-7.269359,-3.185003)" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient3255"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="11.003058"
-       y1="32.489445"
-       x2="32.396713"
-       y2="32.489445"
-       id="linearGradient3811"
-       xlink:href="#linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-6.539405,-3.021202)" />
-    <linearGradient
-       x1="25.698481"
-       y1="11.170371"
-       x2="25.573168"
-       y2="20.118456"
-       id="linearGradient3821"
-       xlink:href="#linearGradient3815"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="21.486856"
-       y1="25.114395"
-       x2="21.756248"
-       y2="5.5616603"
-       id="linearGradient3266"
-       xlink:href="#linearGradient3260"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-27.27899"
-       y1="-5.7469382"
-       x2="-28.46833"
-       y2="-11.99264"
-       id="linearGradient3797"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(36.7012,10.5)" />
-    <radialGradient
-       cx="22.5"
-       cy="34"
-       r="23.5"
-       fx="22.5"
-       fy="34"
-       id="radialGradient3806"
-       xlink:href="#linearGradient3323"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.595745,0,13.74468)" />
-    <radialGradient
-       cx="77.499115"
-       cy="-9.0639915"
-       r="17.500887"
-       fx="77.499115"
-       fy="-9.0639915"
-       id="radialGradient3825"
-       xlink:href="#linearGradient3309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.468277,0,0,1.290652,-34.29018,41.60653)" />
-    <linearGradient
-       x1="78.98452"
-       y1="12.350954"
-       x2="79.109146"
-       y2="8.7270317"
-       id="linearGradient3827"
-       xlink:href="#linearGradient3271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.667726,0,0,0.695494,27.74038,34.63412)" />
-    <radialGradient
-       cx="69.296463"
-       cy="14.854369"
-       r="3.5355339"
-       fx="69.296463"
-       fy="14.854369"
-       id="radialGradient3829"
-       xlink:href="#linearGradient3289"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.575,0,-8.541261)" />
-    <radialGradient
-       cx="69.296463"
-       cy="14.854369"
-       r="3.5355339"
-       fx="69.296463"
-       fy="14.854369"
-       id="radialGradient3831"
-       xlink:href="#linearGradient3289"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.575,0,-8.541261)" />
-    <linearGradient
-       x1="-87.031296"
-       y1="-12.199734"
-       x2="-88.677742"
-       y2="-17.884775"
-       id="linearGradient3837"
-       xlink:href="#linearGradient3353"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(106.4527,16.53554)" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient4230"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="M 35.20123,24 C 33.70123,17.25 40.684722,15.592611 38.70123,10.75 C 34.282764,-0.037494208 17.45123,15.25 12.70123,14.75 C 7.95123,14.25 6.84768,-1.785534 6.84768,-1.785534"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3837);stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3835" />
-    <path
-       d="M 46 34 A 23.5 14 0 1 1  -1,34 A 23.5 14 0 1 1  46 34 z"
-       transform="matrix(0.7,0,0,1,17.8,1)"
-       style="opacity:0.58241763;color:#000000;fill:url(#radialGradient3806);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3321" />
-    <path
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(1.058752,0,0,1.151259,-7.591514,-14.46191)"
-       style="opacity:1;color:#000000;fill:url(#radialGradient4132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3366" />
-    <path
-       d="M 35.20123,24 C 33.70123,17.25 40.684722,15.592611 38.70123,10.75 C 34.282764,-0.037494208 17.45123,15.25 12.70123,14.75 C 7.95123,14.25 6.84768,-1.785534 6.84768,-1.785534"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3797);stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3339" />
-    <path
-       d="M 33.829323,25.323223 C 32.41511,16.130835 42.523381,13.496137 36.480967,7.822331 C 30.34962,2.0650171 15.332069,16.672654 10.671569,14.009515 C 6.9592589,11.888195 5.7218254,-0.83972765 5.7218254,-0.83972765"
-       style="opacity:0.52197804;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3361" />
-    <path
-       d="M 16.925566,4.0026374 C 8.981619,4.0026374 2.5223224,6.7808855 2.5223214,10.198551 C 2.5223214,10.443795 2.5223214,32.868017 2.5223214,33.123427 C 2.5223214,36.541093 8.981618,39.31934 16.925566,39.31934 C 24.869514,39.31934 31.586013,36.541092 31.586011,33.123427 C 31.586011,32.921132 31.586011,10.400846 31.586011,10.198551 C 31.586011,6.7808845 24.869513,4.0026374 16.925566,4.0026374 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient4140);fill-opacity:1;fill-rule:nonzero;stroke:#767973;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3068" />
-    <path
-       d="M 16.231737,17.875039 C 9.555495,18.009765 4.2352783,20.214977 4.2352783,22.903252 C 4.2352783,23.221943 4.2352783,32.093633 4.2352783,32.410156 C 4.2352783,35.185149 9.875756,37.438366 16.853775,37.438368 C 23.831793,37.438368 29.501891,35.185149 29.501892,32.410156 C 29.501892,32.093633 29.501892,23.221943 29.501892,22.903252 C 29.501892,20.128258 23.831793,17.87504 16.853775,17.875039 C 16.635712,17.875039 16.447099,17.870693 16.231737,17.875039 z "
-       style="opacity:0.79120878;color:#000000;fill:url(#linearGradient3811);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99621511;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3275" />
-    <path
-       d="M 16.934282,4.7826643 C 9.5277209,4.7826643 3.505378,7.376656 3.505377,10.567657 C 3.505377,10.796637 3.505377,32.295174 3.505377,32.533645 C 3.505377,35.724648 9.5277198,38.318638 16.934282,38.318638 C 24.340842,38.318638 30.602988,35.724647 30.602986,32.533645 C 30.602986,32.344768 30.602986,10.756537 30.602986,10.567657 C 30.602986,7.376655 24.340841,4.7826643 16.934282,4.7826643 z "
-       style="opacity:0.5443038;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4182);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path4174" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(0.983216,0,0,0.865862,-6.738532,10.55384)"
-       style="opacity:1;color:#000000;fill:url(#linearGradient3266);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3821);stroke-width:1.08380461;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3277" />
-    <path
-       d="M 28.976705,8.500013 C 27.855663,7.514903 26.907756,7.214975 25.913658,6.7322461 L 26.219962,25.420069 L 28.976705,28.652556 L 28.976705,8.500013 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient3253);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3245" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(1.048446,0,0,0.964345,-8.173962,-3.540415)"
-       style="opacity:0.467033;color:#000000;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4230);stroke-width:0.99451303;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3364" />
-    <path
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(0.367338,0,0,0.36343,7.992393,-7.837317)"
-       style="opacity:0.30769234;color:#000000;fill:url(#radialGradient6946);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6944" />
-    <path
-       d="M 17.079287,2.5 C 15.054955,2.5 12.398199,3.214153 12.398199,4.092669 C 12.398199,4.155709 12.398199,6.656674 12.398199,6.722328 C 12.398199,7.600844 15.054955,8.314997 17.079287,8.314997 C 19.10362,8.314997 21.537133,7.600844 21.537132,6.722328 C 21.537132,6.670328 21.537132,4.144669 21.537132,4.092669 C 21.537132,3.214152 19.10362,2.5 17.079287,2.5 z "
-       style="opacity:1;color:#000000;fill:#9d9e9b;fill-opacity:1;fill-rule:nonzero;stroke:#7d7f7a;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3362" />
-    <path
-       d="M 6.6646107,14.743568 L 7.0255934,31.529283 L 11.646184,32.814997 L 11.501791,16.100711 C 11.501791,16.100711 13.461486,16.012323 16.854733,15.798037 C 10.287485,15.748054 5.9977868,14.219867 3.6323481,11.957854 C 5.0644847,14.05003 6.6646107,14.743568 6.6646107,14.743568 z "
-       style="opacity:0.58241763;color:#000000;fill:url(#linearGradient6930);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6922" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(0.274904,0,0,0.192106,10.38789,1.668374)"
-       style="opacity:1;color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3255);stroke-width:4.35150146;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6940" />
-    <g
-       transform="translate(-45.004,-5.936464)"
-       id="g3814">
-      <path
-         d="M 79.191286,28.437593 C 72.690514,28.59762 67.504624,33.772305 67.504624,40.1711 L 67.504624,40.451497 C 67.502838,40.460078 67.505539,40.485767 67.504624,40.494634 C 67.504392,40.499132 67.504624,40.511648 67.504624,40.516203 L 67.504624,49.186919 C 67.500718,49.355538 67.662376,49.5117 67.796572,49.504341 C 67.796572,49.504341 90.655668,49.540472 90.655668,49.540472 C 91.053415,49.518375 91.506406,49.303728 91.517454,48.839689 C 91.517454,48.839689 91.495357,40.516203 91.495357,40.516203 C 91.495357,40.511648 91.495588,40.499132 91.495357,40.494634 C 91.494442,40.485767 91.497142,40.460078 91.495357,40.451497 L 91.495357,40.1711 C 91.495357,33.670737 86.145424,28.437593 79.499991,28.437593 C 79.396156,28.437593 79.294473,28.435053 79.191286,28.437593 z "
-         style="color:#000000;fill:url(#radialGradient3825);fill-opacity:1;fill-rule:nonzero;stroke:#848781;stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect2393" />
-      <rect
-         width="20.013201"
-         height="6.9925261"
-         rx="0.38128209"
-         ry="0.38128221"
-         x="69.482597"
-         y="40.527031"
-         style="color:#000000;fill:url(#linearGradient3827);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect2391" />
-      <path
-         d="M 72.831997 14.854369 A 3.5355339 5.5684657 0 1 1  65.760929,14.854369 A 3.5355339 5.5684657 0 1 1  72.831997 14.854369 z"
-         transform="matrix(0.7,0,0,0.7,37.13251,35.09136)"
-         style="opacity:0.48901098;color:#000000;fill:url(#radialGradient3829);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="path3297" />
-      <path
-         d="M 72.831997 14.854369 A 3.5355339 5.5684657 0 1 1  65.760929,14.854369 A 3.5355339 5.5684657 0 1 1  72.831997 14.854369 z"
-         transform="matrix(0.7,0,0,0.7,25.15124,35.09136)"
-         style="opacity:0.48901098;color:#000000;fill:url(#radialGradient3831);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="path3287" />
-      <path
-         d="M 79.311448,29.482533 C 73.404864,29.626641 68.560395,34.286528 68.560395,40.048745 C 68.560395,40.048745 68.516201,48.487142 68.516201,48.491244 C 68.516201,48.491244 90.512993,48.496419 90.512993,48.496419 L 90.490896,40.048745 C 90.490896,34.195064 85.62996,29.482533 79.591936,29.482533 C 79.497592,29.482533 79.405205,29.480246 79.311448,29.482533 z "
-         style="opacity:0.58241763;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="path3319" />
-      <rect
-         width="2.0417981"
-         height="9.9702358"
-         rx="0.38128215"
-         ry="0.38128218"
-         x="84.47113"
-         y="42.462387"
-         style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect3283" />
-      <rect
-         width="1"
-         height="6"
-         x="85"
-         y="46"
-         style="opacity:0.68131869;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect3808" />
-      <rect
-         width="2.0417981"
-         height="9.9702358"
-         rx="0.38128215"
-         ry="0.38128218"
-         x="72.5"
-         y="42.462387"
-         style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect3810" />
-      <rect
-         width="1"
-         height="6"
-         x="73.02887"
-         y="46"
-         style="opacity:0.68131869;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect3812" />
-    </g>
-    <path
-       d="M 18.009886,18.575938 L 12.470041,24.937721 L 16.45867,24.937721 L 14.395922,30.833073 L 20.447301,23.359244 L 16.225022,23.359244 L 18.009886,18.575938 z "
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#edd400;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3914" />
-    <path
-       d="M 18.009884,18.575937 L 12.470041,24.937721 L 16.458672,24.937721 L 14.395923,30.833071 L 20.447302,23.359244 L 16.225023,23.359244 L 18.009884,18.575937 z "
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3912" />
-    <g
-       transform="translate(-53.99282,-31.64138)"
-       id="g4438" />
-  </g>
-  <g
-     id="layer2" />
-</svg>
diff --git a/data/icons/scalable/status/gpm-battery-040.svg b/data/icons/scalable/status/gpm-battery-040.svg
deleted file mode 100644
index 2bc3ba6..0000000
--- a/data/icons/scalable/status/gpm-battery-040.svg
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="48"
-   height="48"
-   id="svg1328">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3260">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="0"
-         id="stop3262" />
-      <stop
-         style="stop-color:#8fb1dc;stop-opacity:1"
-         offset="1"
-         id="stop3264" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3815">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:#98b8e7;stop-opacity:1"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         style="stop-color:#284e7f;stop-opacity:1"
-         offset="0"
-         id="stop3807" />
-      <stop
-         style="stop-color:#6694cf;stop-opacity:1"
-         offset="0.5"
-         id="stop3813" />
-      <stop
-         style="stop-color:#234570;stop-opacity:1"
-         offset="1"
-         id="stop3809" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3247">
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0"
-         id="stop3249" />
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:0"
-         offset="1"
-         id="stop3251" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3233">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop3235" />
-      <stop
-         style="stop-color:#a3a398;stop-opacity:1"
-         offset="1"
-         id="stop3237" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6924">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop6926" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop6928" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4176">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4178" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop4180" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4134">
-      <stop
-         style="stop-color:#d6d7d5;stop-opacity:1"
-         offset="0"
-         id="stop4136" />
-      <stop
-         style="stop-color:#d1d2d0;stop-opacity:1"
-         offset="0.25"
-         id="stop4148" />
-      <stop
-         style="stop-color:#a5a6a3;stop-opacity:1"
-         offset="0.5"
-         id="stop4142" />
-      <stop
-         style="stop-color:#dddedc;stop-opacity:1"
-         offset="1"
-         id="stop4138" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4128" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop4130" />
-    </linearGradient>
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient4132"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="9.3030529"
-       y1="26.71875"
-       x2="38.826412"
-       y2="26.71875"
-       id="linearGradient4140"
-       xlink:href="#linearGradient4134"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,0.991346,-0.183016,-3.826537)" />
-    <linearGradient
-       x1="17.160095"
-       y1="14.004482"
-       x2="37.969398"
-       y2="56.575912"
-       id="linearGradient4182"
-       xlink:href="#linearGradient4176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,0.992756,-0.183016,-3.832743)" />
-    <linearGradient
-       x1="16.07143"
-       y1="19.5"
-       x2="16.035715"
-       y2="31.75"
-       id="linearGradient6930"
-       xlink:href="#linearGradient6924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,1,-0.183017,-1.32786)" />
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient6946"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="34.244171"
-       y1="17.695425"
-       x2="34.244171"
-       y2="29.91827"
-       id="linearGradient3253"
-       xlink:href="#linearGradient3247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,1,-0.183017,-2.185003)" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient3255"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="11.003058"
-       y1="32.489445"
-       x2="32.396713"
-       y2="32.489445"
-       id="linearGradient3811"
-       xlink:href="#linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.989992,0,0,1,0.912613,-2.021202)" />
-    <linearGradient
-       x1="25.698481"
-       y1="11.170371"
-       x2="25.573168"
-       y2="20.118456"
-       id="linearGradient3821"
-       xlink:href="#linearGradient3815"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="21.486856"
-       y1="25.114395"
-       x2="21.756248"
-       y2="5.5616603"
-       id="linearGradient3266"
-       xlink:href="#linearGradient3260"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient4230"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(1.05,0,0,1.163968,-1.050001,-13.53559)"
-       style="opacity:1;color:#000000;fill:url(#radialGradient4132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3366" />
-    <path
-       d="M 24.011908,5.0026374 C 16.067961,5.0026374 9.6086644,7.7808855 9.6086634,11.198551 C 9.6086634,11.443795 9.6086634,33.868017 9.6086634,34.123427 C 9.6086634,37.541093 16.06796,40.31934 24.011908,40.31934 C 31.955856,40.31934 38.672355,37.541092 38.672353,34.123427 C 38.672353,33.921132 38.672353,11.400846 38.672353,11.198551 C 38.672353,7.7808845 31.955855,5.0026374 24.011908,5.0026374 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient4140);fill-opacity:1;fill-rule:nonzero;stroke:#767973;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3068" />
-    <path
-       d="M 23.455862,18.875039 C 16.846436,19.009765 11.579464,21.214977 11.579464,23.903252 C 11.579464,24.221943 11.579464,33.093633 11.579464,33.410156 C 11.579464,36.185149 17.163491,38.438366 24.071674,38.438368 C 30.979856,38.438368 36.593208,36.185149 36.593209,33.410156 C 36.593209,33.093633 36.593209,24.221943 36.593209,23.903252 C 36.593209,21.128258 30.979856,18.87504 24.071674,18.875039 C 23.855794,18.875039 23.669068,18.870693 23.455862,18.875039 z "
-       style="opacity:0.79120878;color:#000000;fill:url(#linearGradient3811);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99621499;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3275" />
-    <path
-       d="M 24.020624,5.7826643 C 16.614063,5.7826643 10.59172,8.376656 10.591719,11.567657 C 10.591719,11.796637 10.591719,33.295174 10.591719,33.533645 C 10.591719,36.724648 16.614062,39.318638 24.020624,39.318638 C 31.427184,39.318638 37.68933,36.724647 37.689328,33.533645 C 37.689328,33.344768 37.689328,11.756537 37.689328,11.567657 C 37.689328,8.376655 31.427183,5.7826643 24.020624,5.7826643 z "
-       style="opacity:0.5443038;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4182);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path4174" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(0.972641,0,0,0.865862,0.742969,11.55384)"
-       style="opacity:1;color:#000000;fill:url(#linearGradient3266);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3821);stroke-width:1.08968079;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3277" />
-    <path
-       d="M 36.063047,9.500013 C 34.942005,8.514903 33.994098,8.214975 33,7.7322461 L 33.306304,26.420069 L 36.063047,29.652556 L 36.063047,9.500013 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient3253);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3245" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(1.048446,0,0,0.964345,-1.08762,-2.540415)"
-       style="opacity:0.467033;color:#000000;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4230);stroke-width:0.99451303;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3364" />
-    <path
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(0.367338,0,0,0.36343,15.07873,-6.837317)"
-       style="opacity:0.30769234;color:#000000;fill:url(#radialGradient6946);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6944" />
-    <path
-       d="M 24.165629,3.5 C 22.141297,3.5 19.484541,4.214153 19.484541,5.092669 C 19.484541,5.155709 19.484541,7.656674 19.484541,7.722328 C 19.484541,8.600844 22.141297,9.314997 24.165629,9.314997 C 26.189962,9.314997 28.623475,8.600844 28.623474,7.722328 C 28.623474,7.670328 28.623474,5.144669 28.623474,5.092669 C 28.623474,4.214152 26.189962,3.5 24.165629,3.5 z "
-       style="opacity:1;color:#000000;fill:#9d9e9b;fill-opacity:1;fill-rule:nonzero;stroke:#7d7f7a;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3362" />
-    <path
-       d="M 13.750953,15.743568 L 14.111935,32.529283 L 18.732526,33.814997 L 18.588133,17.100711 C 18.588133,17.100711 20.547828,17.012323 23.941075,16.798037 C 17.373827,16.748054 13.084129,15.219867 10.71869,12.957854 C 12.150827,15.05003 13.750953,15.743568 13.750953,15.743568 z "
-       style="opacity:0.58241763;color:#000000;fill:url(#linearGradient6930);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6922" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(0.274904,0,0,0.192106,17.47423,2.668374)"
-       style="opacity:1;color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3255);stroke-width:4.35150146;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6940" />
-    <g
-       transform="translate(-53.99282,-31.64138)"
-       id="g4438" />
-  </g>
-  <g
-     id="layer2" />
-</svg>
diff --git a/data/icons/scalable/status/gpm-battery-080-charging.svg b/data/icons/scalable/status/gpm-battery-080-charging.svg
deleted file mode 100644
index fa0e052..0000000
--- a/data/icons/scalable/status/gpm-battery-080-charging.svg
+++ /dev/null
@@ -1,504 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="48"
-   height="48"
-   id="svg1328">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3289">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop3291" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3293" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3271">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop3273" />
-      <stop
-         style="stop-color:#d3d3ce;stop-opacity:1"
-         offset="1"
-         id="stop3275" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3309">
-      <stop
-         style="stop-color:#e5e6e3;stop-opacity:1"
-         offset="0"
-         id="stop3311" />
-      <stop
-         style="stop-color:#d1d3cf;stop-opacity:1"
-         offset="0.5"
-         id="stop3317" />
-      <stop
-         style="stop-color:#767c6f;stop-opacity:1"
-         offset="1"
-         id="stop3313" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3323">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop3325" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3327" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="0"
-         id="stop3343" />
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:0"
-         offset="1"
-         id="stop3345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3353">
-      <stop
-         style="stop-color:#969696;stop-opacity:1"
-         offset="0"
-         id="stop3355" />
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:0"
-         offset="1"
-         id="stop3357" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3260">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="0"
-         id="stop3262" />
-      <stop
-         style="stop-color:#8fb1dc;stop-opacity:1"
-         offset="1"
-         id="stop3264" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3815">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:#98b8e7;stop-opacity:1"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         style="stop-color:#284e7f;stop-opacity:1"
-         offset="0"
-         id="stop3807" />
-      <stop
-         style="stop-color:#6694cf;stop-opacity:1"
-         offset="0.5"
-         id="stop3813" />
-      <stop
-         style="stop-color:#234570;stop-opacity:1"
-         offset="1"
-         id="stop3809" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3247">
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0"
-         id="stop3249" />
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:0"
-         offset="1"
-         id="stop3251" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3233">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop3235" />
-      <stop
-         style="stop-color:#a3a398;stop-opacity:1"
-         offset="1"
-         id="stop3237" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6924">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop6926" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop6928" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4176">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4178" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop4180" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4134">
-      <stop
-         style="stop-color:#d6d7d5;stop-opacity:1"
-         offset="0"
-         id="stop4136" />
-      <stop
-         style="stop-color:#d1d2d0;stop-opacity:1"
-         offset="0.25"
-         id="stop4148" />
-      <stop
-         style="stop-color:#a5a6a3;stop-opacity:1"
-         offset="0.5"
-         id="stop4142" />
-      <stop
-         style="stop-color:#dddedc;stop-opacity:1"
-         offset="1"
-         id="stop4138" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4128" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop4130" />
-    </linearGradient>
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient4132"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="9.3030529"
-       y1="26.71875"
-       x2="38.826412"
-       y2="26.71875"
-       id="linearGradient4140"
-       xlink:href="#linearGradient4134"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,0.991346,-7.269358,-4.826537)" />
-    <linearGradient
-       x1="17.160095"
-       y1="14.004482"
-       x2="37.969398"
-       y2="56.575912"
-       id="linearGradient4182"
-       xlink:href="#linearGradient4176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,0.992756,-7.269358,-4.832743)" />
-    <linearGradient
-       x1="16.07143"
-       y1="19.5"
-       x2="16.035715"
-       y2="31.75"
-       id="linearGradient6930"
-       xlink:href="#linearGradient6924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,1,-7.269359,-2.32786)" />
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient6946"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="34.244171"
-       y1="17.695425"
-       x2="34.244171"
-       y2="29.91827"
-       id="linearGradient3253"
-       xlink:href="#linearGradient3247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,1,-7.269359,-3.185003)" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient3255"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="11.003058"
-       y1="32.489445"
-       x2="32.396713"
-       y2="32.489445"
-       id="linearGradient3811"
-       xlink:href="#linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.989992,0,0,1,-6.173729,-3.021202)" />
-    <linearGradient
-       x1="25.698481"
-       y1="11.170371"
-       x2="25.573168"
-       y2="20.118456"
-       id="linearGradient3821"
-       xlink:href="#linearGradient3815"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="21.486856"
-       y1="25.114395"
-       x2="21.756248"
-       y2="5.5616603"
-       id="linearGradient3266"
-       xlink:href="#linearGradient3260"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-27.27899"
-       y1="-5.7469382"
-       x2="-28.46833"
-       y2="-11.99264"
-       id="linearGradient3797"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(36.7012,10.5)" />
-    <radialGradient
-       cx="22.5"
-       cy="34"
-       r="23.5"
-       fx="22.5"
-       fy="34"
-       id="radialGradient3806"
-       xlink:href="#linearGradient3323"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.595745,0,13.74468)" />
-    <radialGradient
-       cx="77.499115"
-       cy="-9.0639915"
-       r="17.500887"
-       fx="77.499115"
-       fy="-9.0639915"
-       id="radialGradient3825"
-       xlink:href="#linearGradient3309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.468277,0,0,1.290652,-34.29018,41.60653)" />
-    <linearGradient
-       x1="78.98452"
-       y1="12.350954"
-       x2="79.109146"
-       y2="8.7270317"
-       id="linearGradient3827"
-       xlink:href="#linearGradient3271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.667726,0,0,0.695494,27.74038,34.63412)" />
-    <radialGradient
-       cx="69.296463"
-       cy="14.854369"
-       r="3.5355339"
-       fx="69.296463"
-       fy="14.854369"
-       id="radialGradient3829"
-       xlink:href="#linearGradient3289"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.575,0,-8.541261)" />
-    <radialGradient
-       cx="69.296463"
-       cy="14.854369"
-       r="3.5355339"
-       fx="69.296463"
-       fy="14.854369"
-       id="radialGradient3831"
-       xlink:href="#linearGradient3289"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.575,0,-8.541261)" />
-    <linearGradient
-       x1="-87.031296"
-       y1="-12.199734"
-       x2="-88.677742"
-       y2="-17.884775"
-       id="linearGradient3837"
-       xlink:href="#linearGradient3353"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(106.4527,16.53554)" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient4230"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="M 35.20123,24 C 33.70123,17.25 40.684722,15.592611 38.70123,10.75 C 34.282764,-0.037494208 17.45123,15.25 12.70123,14.75 C 7.95123,14.25 6.84768,-1.785534 6.84768,-1.785534"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3837);stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3835" />
-    <path
-       d="M 46 34 A 23.5 14 0 1 1  -1,34 A 23.5 14 0 1 1  46 34 z"
-       transform="matrix(0.7,0,0,1,17.8,1)"
-       style="opacity:0.58241763;color:#000000;fill:url(#radialGradient3806);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3321" />
-    <path
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(1.058752,0,0,1.151259,-7.591514,-14.46191)"
-       style="opacity:1;color:#000000;fill:url(#radialGradient4132);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3366" />
-    <path
-       d="M 35.20123,24 C 33.70123,17.25 40.684722,15.592611 38.70123,10.75 C 34.282764,-0.037494208 17.45123,15.25 12.70123,14.75 C 7.95123,14.25 6.84768,-1.785534 6.84768,-1.785534"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3797);stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3339" />
-    <path
-       d="M 33.829323,25.323223 C 32.41511,16.130835 42.523381,13.496137 36.480967,7.822331 C 30.34962,2.0650171 15.332069,16.672654 10.671569,14.009515 C 6.9592589,11.888195 5.7218254,-0.83972765 5.7218254,-0.83972765"
-       style="opacity:0.52197804;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3361" />
-    <path
-       d="M 16.925566,4.0026374 C 8.981619,4.0026374 2.5223224,6.7808855 2.5223214,10.198551 C 2.5223214,10.443795 2.5223214,32.868017 2.5223214,33.123427 C 2.5223214,36.541093 8.981618,39.31934 16.925566,39.31934 C 24.869514,39.31934 31.586013,36.541092 31.586011,33.123427 C 31.586011,32.921132 31.586011,10.400846 31.586011,10.198551 C 31.586011,6.7808845 24.869513,4.0026374 16.925566,4.0026374 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient4140);fill-opacity:1;fill-rule:nonzero;stroke:#767973;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3068" />
-    <path
-       d="M 16.36952,9.687539 C 9.7600936,9.822265 4.4931216,12.027477 4.4931216,14.715752 C 4.4931216,15.034443 4.4931216,32.093633 4.4931216,32.410156 C 4.4931216,35.185149 10.077149,37.438366 16.985332,37.438368 C 23.893514,37.438368 29.506866,35.185149 29.506867,32.410156 C 29.506867,32.093633 29.506867,15.034443 29.506867,14.715752 C 29.506867,11.940758 23.893514,9.68754 16.985332,9.687539 C 16.769452,9.687539 16.582726,9.683193 16.36952,9.687539 z "
-       style="opacity:0.79120878;color:#000000;fill:url(#linearGradient3811);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99621499;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3275" />
-    <path
-       d="M 16.934282,4.7826643 C 9.5277209,4.7826643 3.505378,7.376656 3.505377,10.567657 C 3.505377,10.796637 3.505377,32.295174 3.505377,32.533645 C 3.505377,35.724648 9.5277198,38.318638 16.934282,38.318638 C 24.340842,38.318638 30.602988,35.724647 30.602986,32.533645 C 30.602986,32.344768 30.602986,10.756537 30.602986,10.567657 C 30.602986,7.376655 24.340841,4.7826643 16.934282,4.7826643 z "
-       style="opacity:0.5443038;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4182);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path4174" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(0.972641,0,0,0.865862,-6.338,2.078326)"
-       style="opacity:1;color:#000000;fill:url(#linearGradient3266);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3821);stroke-width:1.08968079;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3277" />
-    <path
-       d="M 28.976705,8.500013 C 27.855663,7.514903 26.907756,7.214975 25.913658,6.7322461 L 26.219962,25.420069 L 28.976705,28.652556 L 28.976705,8.500013 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient3253);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3245" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(1.048446,0,0,0.964345,-8.173962,-3.540415)"
-       style="opacity:0.467033;color:#000000;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4230);stroke-width:0.99451303;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3364" />
-    <path
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(0.367338,0,0,0.36343,7.992393,-7.837317)"
-       style="opacity:0.30769234;color:#000000;fill:url(#radialGradient6946);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6944" />
-    <path
-       d="M 17.079287,2.5 C 15.054955,2.5 12.398199,3.214153 12.398199,4.092669 C 12.398199,4.155709 12.398199,6.656674 12.398199,6.722328 C 12.398199,7.600844 15.054955,8.314997 17.079287,8.314997 C 19.10362,8.314997 21.537133,7.600844 21.537132,6.722328 C 21.537132,6.670328 21.537132,4.144669 21.537132,4.092669 C 21.537132,3.214152 19.10362,2.5 17.079287,2.5 z "
-       style="opacity:1;color:#000000;fill:#9d9e9b;fill-opacity:1;fill-rule:nonzero;stroke:#7d7f7a;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3362" />
-    <path
-       d="M 6.6646107,14.743568 L 7.0255934,31.529283 L 11.646184,32.814997 L 11.501791,16.100711 C 11.501791,16.100711 13.461486,16.012323 16.854733,15.798037 C 10.287485,15.748054 5.9977868,14.219867 3.6323481,11.957854 C 5.0644847,14.05003 6.6646107,14.743568 6.6646107,14.743568 z "
-       style="opacity:0.58241763;color:#000000;fill:url(#linearGradient6930);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6922" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(0.274904,0,0,0.192106,10.38789,1.668374)"
-       style="opacity:1;color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3255);stroke-width:4.35150146;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6940" />
-    <g
-       transform="translate(-45.004,-5.936464)"
-       id="g3814">
-      <path
-         d="M 79.191286,28.437593 C 72.690514,28.59762 67.504624,33.772305 67.504624,40.1711 L 67.504624,40.451497 C 67.502838,40.460078 67.505539,40.485767 67.504624,40.494634 C 67.504392,40.499132 67.504624,40.511648 67.504624,40.516203 L 67.504624,49.186919 C 67.500718,49.355538 67.662376,49.5117 67.796572,49.504341 C 67.796572,49.504341 90.655668,49.540472 90.655668,49.540472 C 91.053415,49.518375 91.506406,49.303728 91.517454,48.839689 C 91.517454,48.839689 91.495357,40.516203 91.495357,40.516203 C 91.495357,40.511648 91.495588,40.499132 91.495357,40.494634 C 91.494442,40.485767 91.497142,40.460078 91.495357,40.451497 L 91.495357,40.1711 C 91.495357,33.670737 86.145424,28.437593 79.499991,28.437593 C 79.396156,28.437593 79.294473,28.435053 79.191286,28.437593 z "
-         style="color:#000000;fill:url(#radialGradient3825);fill-opacity:1;fill-rule:nonzero;stroke:#848781;stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect2393" />
-      <rect
-         width="20.013201"
-         height="6.9925261"
-         rx="0.38128209"
-         ry="0.38128221"
-         x="69.482597"
-         y="40.527031"
-         style="color:#000000;fill:url(#linearGradient3827);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect2391" />
-      <path
-         d="M 72.831997 14.854369 A 3.5355339 5.5684657 0 1 1  65.760929,14.854369 A 3.5355339 5.5684657 0 1 1  72.831997 14.854369 z"
-         transform="matrix(0.7,0,0,0.7,37.13251,35.09136)"
-         style="opacity:0.48901098;color:#000000;fill:url(#radialGradient3829);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="path3297" />
-      <path
-         d="M 72.831997 14.854369 A 3.5355339 5.5684657 0 1 1  65.760929,14.854369 A 3.5355339 5.5684657 0 1 1  72.831997 14.854369 z"
-         transform="matrix(0.7,0,0,0.7,25.15124,35.09136)"
-         style="opacity:0.48901098;color:#000000;fill:url(#radialGradient3831);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="path3287" />
-      <path
-         d="M 79.311448,29.482533 C 73.404864,29.626641 68.560395,34.286528 68.560395,40.048745 C 68.560395,40.048745 68.516201,48.487142 68.516201,48.491244 C 68.516201,48.491244 90.512993,48.496419 90.512993,48.496419 L 90.490896,40.048745 C 90.490896,34.195064 85.62996,29.482533 79.591936,29.482533 C 79.497592,29.482533 79.405205,29.480246 79.311448,29.482533 z "
-         style="opacity:0.58241763;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="path3319" />
-      <rect
-         width="2.0417981"
-         height="9.9702358"
-         rx="0.38128215"
-         ry="0.38128218"
-         x="84.47113"
-         y="42.462387"
-         style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect3283" />
-      <rect
-         width="1"
-         height="6"
-         x="85"
-         y="46"
-         style="opacity:0.68131869;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect3808" />
-      <rect
-         width="2.0417981"
-         height="9.9702358"
-         rx="0.38128215"
-         ry="0.38128218"
-         x="72.5"
-         y="42.462387"
-         style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect3810" />
-      <rect
-         width="1"
-         height="6"
-         x="73.02887"
-         y="46"
-         style="opacity:0.68131869;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="rect3812" />
-    </g>
-    <path
-       d="M 18.009886,18.575938 L 12.470041,24.937721 L 16.45867,24.937721 L 14.395922,30.833073 L 20.447301,23.359244 L 16.225022,23.359244 L 18.009886,18.575938 z "
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#edd400;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3914" />
-    <path
-       d="M 18.009884,18.575937 L 12.470041,24.937721 L 16.458672,24.937721 L 14.395923,30.833071 L 20.447302,23.359244 L 16.225023,23.359244 L 18.009884,18.575937 z "
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3912" />
-    <g
-       transform="translate(-53.99282,-31.64138)"
-       id="g4438" />
-  </g>
-  <g
-     id="layer2" />
-</svg>
diff --git a/data/icons/scalable/status/gpm-battery-080.svg b/data/icons/scalable/status/gpm-battery-080.svg
deleted file mode 100644
index 7c19adf..0000000
--- a/data/icons/scalable/status/gpm-battery-080.svg
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="48"
-   height="48"
-   id="svg1328">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3260">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="0"
-         id="stop3262" />
-      <stop
-         style="stop-color:#8fb1dc;stop-opacity:1"
-         offset="1"
-         id="stop3264" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3815">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:#98b8e7;stop-opacity:1"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         style="stop-color:#284e7f;stop-opacity:1"
-         offset="0"
-         id="stop3807" />
-      <stop
-         style="stop-color:#6694cf;stop-opacity:1"
-         offset="0.5"
-         id="stop3813" />
-      <stop
-         style="stop-color:#234570;stop-opacity:1"
-         offset="1"
-         id="stop3809" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3247">
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0"
-         id="stop3249" />
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:0"
-         offset="1"
-         id="stop3251" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3233">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop3235" />
-      <stop
-         style="stop-color:#a3a398;stop-opacity:1"
-         offset="1"
-         id="stop3237" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6924">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop6926" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop6928" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4176">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4178" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop4180" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4134">
-      <stop
-         style="stop-color:#d6d7d5;stop-opacity:1"
-         offset="0"
-         id="stop4136" />
-      <stop
-         style="stop-color:#d1d2d0;stop-opacity:1"
-         offset="0.25"
-         id="stop4148" />
-      <stop
-         style="stop-color:#a5a6a3;stop-opacity:1"
-         offset="0.5"
-         id="stop4142" />
-      <stop
-         style="stop-color:#dddedc;stop-opacity:1"
-         offset="1"
-         id="stop4138" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4128" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop4130" />
-    </linearGradient>
-    <linearGradient
-       x1="9.3030529"
-       y1="26.71875"
-       x2="38.826412"
-       y2="26.71875"
-       id="linearGradient4140"
-       xlink:href="#linearGradient4134"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.008042,0,0,0.991346,-0.266749,-3.763012)" />
-    <linearGradient
-       x1="17.160095"
-       y1="14.004482"
-       x2="37.969398"
-       y2="56.575912"
-       id="linearGradient4182"
-       xlink:href="#linearGradient4176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.007243,0,0,0.992756,-0.239041,-3.769218)" />
-    <linearGradient
-       x1="16.07143"
-       y1="19.5"
-       x2="16.035715"
-       y2="31.75"
-       id="linearGradient6930"
-       xlink:href="#linearGradient6924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,1,-0.372345,-1.264335)" />
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient6946"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="34.244171"
-       y1="17.695425"
-       x2="34.244171"
-       y2="29.91827"
-       id="linearGradient3253"
-       xlink:href="#linearGradient3247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010754,0,0,1,-0.372345,-2.121478)" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient3255"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="11.003058"
-       y1="32.489445"
-       x2="32.396713"
-       y2="32.489445"
-       id="linearGradient3811"
-       xlink:href="#linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.989992,0,0,1,0.723285,-1.957677)" />
-    <linearGradient
-       x1="25.698481"
-       y1="11.170371"
-       x2="25.573168"
-       y2="20.118456"
-       id="linearGradient3821"
-       xlink:href="#linearGradient3815"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="21.486856"
-       y1="25.114395"
-       x2="21.756248"
-       y2="5.5616603"
-       id="linearGradient3266"
-       xlink:href="#linearGradient3260"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient4230"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient1544"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(1.05,0,0,1.166667,-1.049999,-13.60315)"
-       style="opacity:1;color:#000000;fill:url(#radialGradient1544);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3366" />
-    <path
-       d="M 23.86326,5.0661616 C 15.940627,5.0661616 9.4986602,7.8444097 9.4986592,11.262076 C 9.4986592,11.50732 9.4986592,33.931542 9.4986592,34.186952 C 9.4986592,37.604618 15.940626,40.382865 23.86326,40.382865 C 31.785894,40.382865 38.484373,37.604617 38.484371,34.186952 C 38.484371,33.984657 38.484371,11.464371 38.484371,11.262076 C 38.484371,7.8444087 31.785893,5.0661616 23.86326,5.0661616 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient4140);fill-opacity:1;fill-rule:nonzero;stroke:#767973;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3068" />
-    <path
-       d="M 23.266534,10.751064 C 16.657108,10.88579 11.390136,13.091002 11.390136,15.779277 C 11.390136,16.097968 11.390136,33.157158 11.390136,33.473681 C 11.390136,36.248674 16.974163,38.501891 23.882346,38.501893 C 30.790528,38.501893 36.40388,36.248674 36.403881,33.473681 C 36.403881,33.157158 36.403881,16.097968 36.403881,15.779277 C 36.403881,13.004283 30.790528,10.751065 23.882346,10.751064 C 23.666466,10.751064 23.47974,10.746718 23.266534,10.751064 z "
-       style="opacity:0.79120878;color:#000000;fill:url(#linearGradient3811);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99621499;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3275" />
-    <path
-       d="M 23.880515,5.8461885 C 16.499684,5.8461885 10.498263,8.4401802 10.498262,11.631182 C 10.498262,11.860162 10.498262,33.358699 10.498262,33.59717 C 10.498262,36.788173 16.499683,39.382163 23.880515,39.382163 C 31.261345,39.382163 37.501736,36.788172 37.501734,33.59717 C 37.501734,33.408293 37.501734,11.820062 37.501734,11.631182 C 37.501734,8.4401792 31.261344,5.8461885 23.880515,5.8461885 z "
-       style="opacity:0.5443038;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4182);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path4174" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(0.972641,0,0,0.865862,0.559014,3.141851)"
-       style="opacity:1;color:#000000;fill:url(#linearGradient3266);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3821);stroke-width:1.08968079;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3277" />
-    <path
-       d="M 35.873719,9.5635372 C 34.752677,8.5784272 33.80477,8.2784992 32.810672,7.7957703 L 33.116976,26.483594 L 35.873719,29.716081 L 35.873719,9.5635372 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient3253);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3245" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(1.048446,0,0,0.964345,-1.276948,-2.47689)"
-       style="opacity:0.467033;color:#000000;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4230);stroke-width:0.99451303;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3364" />
-    <path
-       d="M 41 40 A 17.142857 8.5714283 0 1 1  6.7142868,40 A 17.142857 8.5714283 0 1 1  41 40 z"
-       transform="matrix(0.367338,0,0,0.36343,14.88941,-6.773792)"
-       style="opacity:0.30769234;color:#000000;fill:url(#radialGradient6946);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6944" />
-    <path
-       d="M 23.976301,3.5635242 C 21.951969,3.5635242 19.295213,4.2776772 19.295213,5.1561932 C 19.295213,5.2192332 19.295213,7.7201982 19.295213,7.7858522 C 19.295213,8.6643682 21.951969,9.3785212 23.976301,9.3785212 C 26.000634,9.3785212 28.434147,8.6643682 28.434146,7.7858522 C 28.434146,7.7338522 28.434146,5.2081932 28.434146,5.1561932 C 28.434146,4.2776762 26.000634,3.5635242 23.976301,3.5635242 z "
-       style="opacity:1;color:#000000;fill:#9d9e9b;fill-opacity:1;fill-rule:nonzero;stroke:#7d7f7a;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path3362" />
-    <path
-       d="M 13.561625,15.807093 L 13.922608,32.592808 L 18.543198,33.878522 L 18.398805,17.164236 C 18.398805,17.164236 20.3585,17.075848 23.751747,16.861562 C 17.184499,16.811579 12.894801,15.283392 10.529362,13.021379 C 11.961499,15.113555 13.561625,15.807093 13.561625,15.807093 z "
-       style="opacity:0.58241763;color:#000000;fill:url(#linearGradient6930);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6922" />
-    <path
-       d="M 36.857142 14.071428 A 12.857142 5.5 0 1 1  11.142858,14.071428 A 12.857142 5.5 0 1 1  36.857142 14.071428 z"
-       transform="matrix(0.274904,0,0,0.192106,17.2849,2.731899)"
-       style="opacity:1;color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3255);stroke-width:4.35150146;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="path6940" />
-    <g
-       transform="translate(-53.99282,-31.64138)"
-       id="g4438" />
-  </g>
-  <g
-     id="layer2" />
-</svg>
diff --git a/data/icons/scalable/status/gpm-battery-charged.svg b/data/icons/scalable/status/gpm-battery-charged.svg
deleted file mode 100644
index 467afe8..0000000
--- a/data/icons/scalable/status/gpm-battery-charged.svg
+++ /dev/null
@@ -1,673 +0,0 @@
-<?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="48"
-   height="48"
-   id="svg1328"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="gpm-battery-charged.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata101">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="682"
-     inkscape:window-width="641"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="9.5833333"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:window-x="0"
-     inkscape:window-y="47"
-     inkscape:current-layer="svg1328" />
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective103" />
-    <linearGradient
-       id="linearGradient3289">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop3291" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3293" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3271">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop3273" />
-      <stop
-         style="stop-color:#d3d3ce;stop-opacity:1"
-         offset="1"
-         id="stop3275" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3309">
-      <stop
-         style="stop-color:#e5e6e3;stop-opacity:1"
-         offset="0"
-         id="stop3311" />
-      <stop
-         style="stop-color:#d1d3cf;stop-opacity:1"
-         offset="0.5"
-         id="stop3317" />
-      <stop
-         style="stop-color:#767c6f;stop-opacity:1"
-         offset="1"
-         id="stop3313" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3323">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop3325" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop3327" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3341">
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="0"
-         id="stop3343" />
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:0"
-         offset="1"
-         id="stop3345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3353">
-      <stop
-         style="stop-color:#969696;stop-opacity:1"
-         offset="0"
-         id="stop3355" />
-      <stop
-         style="stop-color:#b6b6b6;stop-opacity:0"
-         offset="1"
-         id="stop3357" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3260">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="0"
-         id="stop3262" />
-      <stop
-         style="stop-color:#8fb1dc;stop-opacity:1"
-         offset="1"
-         id="stop3264" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3815">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3817" />
-      <stop
-         style="stop-color:#98b8e7;stop-opacity:1"
-         offset="1"
-         id="stop3819" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3805">
-      <stop
-         style="stop-color:#284e7f;stop-opacity:1"
-         offset="0"
-         id="stop3807" />
-      <stop
-         style="stop-color:#6694cf;stop-opacity:1"
-         offset="0.5"
-         id="stop3813" />
-      <stop
-         style="stop-color:#234570;stop-opacity:1"
-         offset="1"
-         id="stop3809" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3247">
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0"
-         id="stop3249" />
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:0"
-         offset="1"
-         id="stop3251" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3233">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
-         offset="0"
-         id="stop3235" />
-      <stop
-         style="stop-color:#a3a398;stop-opacity:1"
-         offset="1"
-         id="stop3237" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6924">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop6926" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop6928" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4176">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0"
-         id="stop4178" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop4180" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4134">
-      <stop
-         style="stop-color:#d6d7d5;stop-opacity:1"
-         offset="0"
-         id="stop4136" />
-      <stop
-         style="stop-color:#d1d2d0;stop-opacity:1"
-         offset="0.25"
-         id="stop4148" />
-      <stop
-         style="stop-color:#a5a6a3;stop-opacity:1"
-         offset="0.5"
-         id="stop4142" />
-      <stop
-         style="stop-color:#dddedc;stop-opacity:1"
-         offset="1"
-         id="stop4138" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4126">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4128" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1"
-         id="stop4130" />
-    </linearGradient>
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient4132"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="9.3030529"
-       y1="26.71875"
-       x2="38.826412"
-       y2="26.71875"
-       id="linearGradient4140"
-       xlink:href="#linearGradient4134"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,0.991346,-7.327667,-4.826537)" />
-    <linearGradient
-       x1="17.160095"
-       y1="14.004482"
-       x2="37.969398"
-       y2="56.575912"
-       id="linearGradient4182"
-       xlink:href="#linearGradient4176"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,0.992756,-7.327667,-4.832743)" />
-    <linearGradient
-       x1="16.07143"
-       y1="19.5"
-       x2="16.035715"
-       y2="31.75"
-       id="linearGradient6930"
-       xlink:href="#linearGradient6924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,1,-7.327668,-2.32786)" />
-    <radialGradient
-       cx="23.857143"
-       cy="40"
-       r="17.142857"
-       fx="23.857143"
-       fy="40"
-       id="radialGradient6946"
-       xlink:href="#linearGradient4126"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.5,0,20)" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient3239"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="34.244171"
-       y1="17.695425"
-       x2="34.244171"
-       y2="29.91827"
-       id="linearGradient3253"
-       xlink:href="#linearGradient3247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,1,-7.327668,-3.185003)" />
-    <linearGradient
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       id="linearGradient3255"
-       xlink:href="#linearGradient3233"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="11.003058"
-       y1="32.489445"
-       x2="32.396713"
-       y2="32.489445"
-       id="linearGradient3811"
-       xlink:href="#linearGradient3805"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,1,-7.327666,-3.185003)" />
-    <linearGradient
-       x1="25.698481"
-       y1="11.170371"
-       x2="25.573168"
-       y2="20.118456"
-       id="linearGradient3821"
-       xlink:href="#linearGradient3815"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="21.486856"
-       y1="25.114395"
-       x2="21.756248"
-       y2="5.5616603"
-       id="linearGradient3266"
-       xlink:href="#linearGradient3260"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="-27.27899"
-       y1="-5.7469382"
-       x2="-28.46833"
-       y2="-11.99264"
-       id="linearGradient3797"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(36.7012,10.5)" />
-    <radialGradient
-       cx="22.5"
-       cy="34"
-       r="23.5"
-       fx="22.5"
-       fy="34"
-       id="radialGradient3806"
-       xlink:href="#linearGradient3323"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.595745,0,13.74468)" />
-    <radialGradient
-       cx="77.499115"
-       cy="-9.0639915"
-       r="17.500887"
-       fx="77.499115"
-       fy="-9.0639915"
-       id="radialGradient3825"
-       xlink:href="#linearGradient3309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.468277,0,0,1.290652,-34.29018,41.60653)" />
-    <linearGradient
-       x1="78.98452"
-       y1="12.350954"
-       x2="79.109146"
-       y2="8.7270317"
-       id="linearGradient3827"
-       xlink:href="#linearGradient3271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.667726,0,0,0.695494,27.74038,34.63412)" />
-    <radialGradient
-       cx="69.296463"
-       cy="14.854369"
-       r="3.5355339"
-       fx="69.296463"
-       fy="14.854369"
-       id="radialGradient3829"
-       xlink:href="#linearGradient3289"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.575,0,-8.541261)" />
-    <radialGradient
-       cx="69.296463"
-       cy="14.854369"
-       r="3.5355339"
-       fx="69.296463"
-       fy="14.854369"
-       id="radialGradient3831"
-       xlink:href="#linearGradient3289"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.575,0,-8.541261)" />
-    <linearGradient
-       x1="-87.031296"
-       y1="-12.199734"
-       x2="-88.677742"
-       y2="-17.884775"
-       id="linearGradient3837"
-       xlink:href="#linearGradient3353"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(106.4527,16.53554)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3233"
-       id="linearGradient2489"
-       gradientUnits="userSpaceOnUse"
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       gradientTransform="matrix(0.27495,0,0,0.192106,10.33251,1.668374)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6924"
-       id="linearGradient2492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,1,-7.327668,-2.32786)"
-       x1="16.07143"
-       y1="19.5"
-       x2="16.035715"
-       y2="31.75" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient2496"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.367399,0,0,0.181715,7.936622,-0.568717)"
-       cx="23.857143"
-       cy="40"
-       fx="23.857143"
-       fy="40"
-       r="17.142857" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3233"
-       id="linearGradient2499"
-       gradientUnits="userSpaceOnUse"
-       x1="24"
-       y1="17.245949"
-       x2="23.433737"
-       y2="8.0476589"
-       gradientTransform="matrix(1.048621,0,0,0.964345,-8.232422,-3.540415)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3260"
-       id="linearGradient2502"
-       gradientUnits="userSpaceOnUse"
-       x1="21.486856"
-       y1="25.114395"
-       x2="21.756248"
-       y2="5.5616603"
-       gradientTransform="matrix(0.983216,0,0,0.865862,-6.665776,-1.604813)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient2504"
-       gradientUnits="userSpaceOnUse"
-       x1="25.698481"
-       y1="11.170371"
-       x2="25.573168"
-       y2="20.118456"
-       gradientTransform="matrix(0.983216,0,0,0.865862,-6.665776,-1.604813)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3805"
-       id="linearGradient2507"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,1,-7.327666,-3.185003)"
-       x1="11.003058"
-       y1="32.489445"
-       x2="32.396713"
-       y2="32.489445" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3247"
-       id="linearGradient2510"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,1,-7.327668,-3.185003)"
-       x1="34.244171"
-       y1="17.695425"
-       x2="34.244171"
-       y2="29.91827" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4176"
-       id="linearGradient2513"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,0.992756,-7.327667,-4.832743)"
-       x1="17.160095"
-       y1="14.004482"
-       x2="37.969398"
-       y2="56.575912" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4134"
-       id="linearGradient2516"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.010922,0,0,0.991346,-7.327667,-4.826537)"
-       x1="9.3030529"
-       y1="26.71875"
-       x2="38.826412"
-       y2="26.71875" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3341"
-       id="linearGradient2520"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(36.7012,10.5)"
-       x1="-27.27899"
-       y1="-5.7469382"
-       x2="-28.46833"
-       y2="-11.99264" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4126"
-       id="radialGradient2523"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.070316,0,0,0.5756295,-8.4558,8.56327)"
-       cx="23.857143"
-       cy="40"
-       fx="23.857143"
-       fy="40"
-       r="17.142857" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3323"
-       id="radialGradient2526"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7,0,0,0.595745,17.8,14.74468)"
-       cx="22.5"
-       cy="34"
-       fx="22.5"
-       fy="34"
-       r="23.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3353"
-       id="linearGradient2529"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(106.4527,16.53554)"
-       x1="-87.031296"
-       y1="-12.199734"
-       x2="-88.677742"
-       y2="-17.884775" />
-  </defs>
-  <path
-     id="path3835"
-     style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2529);stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 35.20123,24 C 33.70123,17.25 40.684722,15.592611 38.70123,10.75 C 34.282764,-0.037494208 17.45123,15.25 12.70123,14.75 C 7.95123,14.25 6.84768,-1.785534 6.84768,-1.785534" />
-  <path
-     id="path3321"
-     style="opacity:0.58241763;fill:url(#radialGradient2526);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 50,35 C 50,42.731986 42.635084,49 33.55,49 C 24.464916,49 17.1,42.731986 17.1,35 C 17.1,27.268014 24.464916,21 33.55,21 C 42.635084,21 50,27.268014 50,35 L 50,35 z" />
-  <path
-     id="path3366"
-     style="fill:url(#radialGradient2523);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 35.427156,31.58845 C 35.429346,37.039192 27.213902,41.458516 17.078882,41.458516 C 6.9438627,41.458516 -1.2715808,37.039192 -1.2693914,31.58845 C -1.2715808,26.137708 6.9438627,21.718384 17.078882,21.718384 C 27.213902,21.718384 35.429346,26.137708 35.427156,31.58845 L 35.427156,31.58845 z" />
-  <path
-     id="path3339"
-     style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2520);stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 35.20123,24 C 33.70123,17.25 40.684722,15.592611 38.70123,10.75 C 34.282764,-0.037494208 17.45123,15.25 12.70123,14.75 C 7.95123,14.25 6.84768,-1.785534 6.84768,-1.785534" />
-  <path
-     id="path3361"
-     style="opacity:0.52197804;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 33.829323,25.323223 C 32.41511,16.130835 42.523381,13.496137 36.480967,7.822331 C 30.34962,2.0650171 15.332069,16.672654 10.671569,14.009515 C 6.9592589,11.888195 5.7218254,-0.83972765 5.7218254,-0.83972765" />
-  <path
-     id="path3068"
-     style="fill:url(#linearGradient2516);fill-opacity:1;fill-rule:nonzero;stroke:#767973;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 16.871279,4.0026374 C 8.9260107,4.0026374 2.4656405,6.7808855 2.4656395,10.198551 C 2.4656395,10.443795 2.4656395,32.868017 2.4656395,33.123427 C 2.4656395,36.541093 8.9260096,39.31934 16.871279,39.31934 C 24.816547,39.31934 31.534163,36.541092 31.534161,33.123427 C 31.534161,32.921132 31.534161,10.400846 31.534161,10.198551 C 31.534161,6.7808845 24.816546,4.0026374 16.871279,4.0026374 z" />
-  <path
-     id="path4174"
-     style="opacity:0.5443038;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2513);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 16.879996,4.7826643 C 9.4722033,4.7826643 3.4488595,7.376656 3.4488585,10.567657 C 3.4488585,10.796637 3.4488585,32.295174 3.4488585,32.533645 C 3.4488585,35.724648 9.4722023,38.318638 16.879996,38.318638 C 24.287788,38.318638 30.550974,35.724647 30.550972,32.533645 C 30.550972,32.344768 30.550972,10.756537 30.550972,10.567657 C 30.550972,7.376655 24.287787,4.7826643 16.879996,4.7826643 z" />
-  <path
-     id="path3245"
-     style="fill:url(#linearGradient2510);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 28.924424,8.500013 C 27.803195,7.514903 26.855131,7.214975 25.860868,6.7322461 L 26.167222,25.420069 L 28.924424,28.652556 L 28.924424,8.500013 z" />
-  <path
-     id="path3275"
-     style="opacity:0.79120878;fill:url(#linearGradient2507);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.99621511;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 16.295574,6.336243 C 9.6193322,6.470969 4.2991157,8.676181 4.2991157,11.364456 C 4.2991157,11.683147 4.2991157,31.929837 4.2991157,32.24636 C 4.2991157,35.021353 9.9395939,37.27457 16.917612,37.274572 C 23.895631,37.274572 29.565729,35.021353 29.56573,32.24636 C 29.56573,31.929837 29.56573,11.683147 29.56573,11.364456 C 29.56573,8.589462 23.895631,6.336244 16.917612,6.336243 C 16.699549,6.336243 16.510936,6.331897 16.295574,6.336243 z" />
-  <path
-     id="path3277"
-     style="fill:url(#linearGradient2502);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2504);stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 29.572756,10.579102 C 29.572756,13.209215 23.913032,15.341343 16.931408,15.341343 C 9.9497839,15.341343 4.2900603,13.209215 4.2900603,10.579102 C 4.2900603,7.9489888 9.9497839,5.8168607 16.931408,5.8168607 C 23.913032,5.8168607 29.572756,7.9489888 29.572756,10.579102 L 29.572756,10.579102 z" />
-  <path
-     id="path3364"
-     style="opacity:0.467033;fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2499);stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 30.416751,10.029296 C 30.416751,12.958558 24.380534,15.333194 16.934482,15.333194 C 9.4884298,15.333194 3.4522129,12.958558 3.4522129,10.029296 C 3.4522129,7.1000347 9.4884298,4.7253986 16.934482,4.7253986 C 24.380534,4.7253986 30.416751,7.1000347 30.416751,10.029296 L 30.416751,10.029296 z" />
-  <path
-     id="path6944"
-     style="opacity:0.30769234;fill:url(#radialGradient2496);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 22.999981,6.699883 C 23.000733,8.4205758 20.180682,9.8156702 16.701712,9.8156702 C 13.222744,9.8156702 10.402693,8.4205758 10.403444,6.699883 C 10.402693,4.9791902 13.222744,3.5840958 16.701712,3.5840958 C 20.180682,3.5840958 23.000733,4.9791902 22.999981,6.699883 L 22.999981,6.699883 z" />
-  <path
-     id="path3362"
-     style="fill:#9d9e9b;fill-opacity:1;fill-rule:nonzero;stroke:#7d7f7a;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 17.025026,2.5 C 15.000357,2.5 12.343159,3.214153 12.343159,4.092669 C 12.343159,4.155709 12.343159,6.656674 12.343159,6.722328 C 12.343159,7.600844 15.000357,8.314997 17.025026,8.314997 C 19.049695,8.314997 21.483612,7.600844 21.483611,6.722328 C 21.483611,6.670328 21.483611,4.144669 21.483611,4.092669 C 21.483611,3.214152 19.049695,2.5 17.025026,2.5 z" />
-  <path
-     id="path6922"
-     style="opacity:0.58241763;fill:url(#linearGradient2492);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 6.608618,14.743568 L 6.9696608,31.529283 L 11.591021,32.814997 L 11.446603,16.100711 C 11.446603,16.100711 13.406625,16.012323 16.800435,15.798037 C 10.232095,15.748054 5.9416833,14.219867 3.5758513,11.957854 C 5.008226,14.05003 6.608618,14.743568 6.608618,14.743568 z" />
-  <path
-     id="path6940"
-     style="fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2489);stroke-width:1.00000083;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-     d="M 20.466381,4.3715797 C 20.466381,4.9551144 18.883676,5.4281627 16.93131,5.4281627 C 14.978944,5.4281627 13.396239,4.9551144 13.396239,4.3715797 C 13.396239,3.7880451 14.978944,3.3149967 16.93131,3.3149967 C 18.883676,3.3149967 20.466381,3.7880451 20.466381,4.3715797 L 20.466381,4.3715797 z" />
-  <g
-     id="g3814"
-     transform="translate(-45.004,-5.936464)">
-    <path
-       id="rect2393"
-       style="fill:url(#radialGradient3825);fill-opacity:1;fill-rule:nonzero;stroke:#848781;stroke-width:0.99999952;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 79.191286,28.437593 C 72.690514,28.59762 67.504624,33.772305 67.504624,40.1711 L 67.504624,40.451497 C 67.502838,40.460078 67.505539,40.485767 67.504624,40.494634 C 67.504392,40.499132 67.504624,40.511648 67.504624,40.516203 L 67.504624,49.186919 C 67.500718,49.355538 67.662376,49.5117 67.796572,49.504341 C 67.796572,49.504341 90.655668,49.540472 90.655668,49.540472 C 91.053415,49.518375 91.506406,49.303728 91.517454,48.839689 C 91.517454,48.839689 91.495357,40.516203 91.495357,40.516203 C 91.495357,40.511648 91.495588,40.499132 91.495357,40.494634 C 91.494442,40.485767 91.497142,40.460078 91.495357,40.451497 L 91.495357,40.1711 C 91.495357,33.670737 86.145424,28.437593 79.499991,28.437593 C 79.396156,28.437593 79.294473,28.435053 79.191286,28.437593 z" />
-    <rect
-       id="rect2391"
-       style="fill:url(#linearGradient3827);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       y="40.527031"
-       x="69.482597"
-       ry="0.38128221"
-       rx="0.38128209"
-       height="6.9925261"
-       width="20.013201" />
-    <path
-       id="path3297"
-       style="opacity:0.48901098;fill:url(#radialGradient3829);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       transform="matrix(0.7,0,0,0.7,37.13251,35.09136)"
-       d="M 72.831997,14.854369 C 72.831997,17.929748 71.249085,20.422835 69.296463,20.422835 C 67.343841,20.422835 65.760929,17.929748 65.760929,14.854369 C 65.760929,11.77899 67.343841,9.2859031 69.296463,9.2859031 C 71.249085,9.2859031 72.831997,11.77899 72.831997,14.854369 z" />
-    <path
-       id="path3287"
-       style="opacity:0.48901098;fill:url(#radialGradient3831);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       transform="matrix(0.7,0,0,0.7,25.15124,35.09136)"
-       d="M 72.831997,14.854369 C 72.831997,17.929748 71.249085,20.422835 69.296463,20.422835 C 67.343841,20.422835 65.760929,17.929748 65.760929,14.854369 C 65.760929,11.77899 67.343841,9.2859031 69.296463,9.2859031 C 71.249085,9.2859031 72.831997,11.77899 72.831997,14.854369 z" />
-    <path
-       id="path3319"
-       style="opacity:0.58241763;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 79.311448,29.482533 C 73.404864,29.626641 68.560395,34.286528 68.560395,40.048745 C 68.560395,40.048745 68.516201,48.487142 68.516201,48.491244 C 68.516201,48.491244 90.512993,48.496419 90.512993,48.496419 L 90.490896,40.048745 C 90.490896,34.195064 85.62996,29.482533 79.591936,29.482533 C 79.497592,29.482533 79.405205,29.480246 79.311448,29.482533 z" />
-    <rect
-       id="rect3283"
-       style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       y="42.462387"
-       x="84.47113"
-       ry="0.38128218"
-       rx="0.38128215"
-       height="9.9702358"
-       width="2.0417981" />
-    <rect
-       id="rect3808"
-       style="opacity:0.68131869;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       y="46"
-       x="85"
-       height="6"
-       width="1" />
-    <rect
-       id="rect3810"
-       style="fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.9999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       y="42.462387"
-       x="72.5"
-       ry="0.38128218"
-       rx="0.38128215"
-       height="9.9702358"
-       width="2.0417981" />
-    <rect
-       id="rect3812"
-       style="opacity:0.68131869;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       y="46"
-       x="73.02887"
-       height="6"
-       width="1" />
-  </g>
-  <g
-     id="layer2" />
-</svg>
diff --git a/src/gpm-upower.c b/src/gpm-upower.c
index f3463f6..80ef8a0 100644
--- a/src/gpm-upower.c
+++ b/src/gpm-upower.c
@@ -35,15 +35,7 @@
 
 /**
  * gpm_upower_get_device_icon_index:
- * @percent: The charge of the device
- *
- * The index value depends on the percentage charge:
- *	00-10  = 000
- *	10-30  = 020
- *	30-50  = 040
- *	50-70  = 060
- *	70-90  = 080
- *	90-100 = 100
+ * @device: The UpDevice
  *
  * Return value: The character string for the filename suffix.
  **/
@@ -67,16 +59,36 @@ gpm_upower_get_device_icon_index (UpDevice *device)
 }
 
 /**
- * gpm_upower_get_device_icon:
+ * gpm_upower_get_device_icon_suffix:
+ * @device: The UpDevice
  *
- * Need to free the return value
+ * Return value: The character string for the filename suffix.
+ **/
+static const gchar *
+gpm_upower_get_device_icon_suffix (UpDevice *device)
+{
+	gdouble percentage;
+	/* get device properties */
+	g_object_get (device, "percentage", &percentage, NULL);
+	if (percentage < 10)
+		return "caution";
+	else if (percentage < 30)
+		return "low";
+	else if (percentage < 60)
+		return "good";
+	return "full";
+}
+
+/**
+ * gpm_upower_get_device_icon:
  *
+ * Return value: The device icon, use g_object_unref() when done.
  **/
 GIcon *
 gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
 {
 	GString *filename;
-	const gchar *prefix = NULL;
+	const gchar *kind_str;
 	const gchar *index_str;
 	UpDeviceKind kind;
 	UpDeviceState state;
@@ -121,48 +133,42 @@ gpm_upower_get_device_icon (UpDevice *device, gboolean use_symbolic)
 	} else if (kind == UP_DEVICE_KIND_BATTERY) {
 		if (!is_present) {
 			/* battery missing */
-			g_string_append (filename, "gpm-battery-missing");
+			g_string_append (filename, "battery-missing");
 
 		} else if (state == UP_DEVICE_STATE_EMPTY) {
-			g_string_append (filename, "gpm-battery-empty");
+			g_string_append (filename, "battery-empty");
 
 		} else if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
-			g_string_append (filename, "gpm-battery-charged");
+			g_string_append (filename, "battery-full");
 
-		} else if (state == UP_DEVICE_STATE_CHARGING) {
-			index_str = gpm_upower_get_device_icon_index (device);
-			g_string_append_printf (filename, "gpm-battery-%s-charging", index_str);
+		} else if (state == UP_DEVICE_STATE_CHARGING ||
+			   state == UP_DEVICE_STATE_PENDING_CHARGE) {
+			index_str = gpm_upower_get_device_icon_suffix (device);
+			g_string_append_printf (filename, "battery-%s-charging", index_str);
 
-		} else if (state == UP_DEVICE_STATE_DISCHARGING) {
-			index_str = gpm_upower_get_device_icon_index (device);
-			g_string_append_printf (filename, "gpm-battery-%s", index_str);
+		} else if (state == UP_DEVICE_STATE_DISCHARGING ||
+			   state == UP_DEVICE_STATE_PENDING_DISCHARGE) {
+			index_str = gpm_upower_get_device_icon_suffix (device);
+			g_string_append_printf (filename, "battery-%s", index_str);
 
-		} else if (state == UP_DEVICE_STATE_PENDING_CHARGE) {
-			index_str = gpm_upower_get_device_icon_index (device);
-			/* FIXME: do new grey icons */
-			g_string_append_printf (filename, "gpm-battery-%s-charging", index_str);
-
-		} else if (state == UP_DEVICE_STATE_PENDING_DISCHARGE) {
-			index_str = gpm_upower_get_device_icon_index (device);
-			g_string_append_printf (filename, "gpm-battery-%s", index_str);
 		} else {
-			g_string_append (filename, "gpm-battery-missing");
+			g_string_append (filename, "battery-missing");
 		}
 
 	} else if (kind == UP_DEVICE_KIND_MOUSE ||
 		   kind == UP_DEVICE_KIND_KEYBOARD ||
 		   kind == UP_DEVICE_KIND_PHONE) {
-		prefix = up_device_kind_to_string (kind);
+		kind_str = up_device_kind_to_string (kind);
 		if (!is_present) {
 			/* battery missing */
-			g_string_append_printf (filename, "gpm-%s-000", prefix);
+			g_string_append_printf (filename, "gpm-%s-000", kind_str);
 
 		} else if (state == UP_DEVICE_STATE_FULLY_CHARGED) {
-			g_string_append_printf (filename, "gpm-%s-100", prefix);
+			g_string_append_printf (filename, "gpm-%s-100", kind_str);
 
 		} else if (state == UP_DEVICE_STATE_DISCHARGING) {
 			index_str = gpm_upower_get_device_icon_index (device);
-			g_string_append_printf (filename, "gpm-%s-%s", prefix, index_str);
+			g_string_append_printf (filename, "gpm-%s-%s", kind_str, index_str);
 		}
 	}