diff --git a/configure.ac b/configure.ac
index d8b54ec34..94a5e191b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,6 +370,13 @@ panels/info/Makefile
 panels/info/gnome-info-panel.desktop.in
 panels/power/Makefile
 panels/power/gnome-power-panel.desktop.in
+panels/power/icons/Makefile
+panels/power/icons/16x16/Makefile
+panels/power/icons/22x22/Makefile
+panels/power/icons/24x24/Makefile
+panels/power/icons/32x32/Makefile
+panels/power/icons/48x48/Makefile
+panels/power/icons/256x256/Makefile
 panels/color/Makefile
 panels/color/gnome-color-panel.desktop.in
 panels/color/icons/Makefile
diff --git a/panels/power/Makefile.am b/panels/power/Makefile.am
index 293958f6f..a0f68561d 100644
--- a/panels/power/Makefile.am
+++ b/panels/power/Makefile.am
@@ -1,5 +1,7 @@
 cappletname = power
 
+SUBDIRS = icons
+
 INCLUDES = 						\
 	$(PANEL_CFLAGS)					\
 	$(POWER_PANEL_CFLAGS)				\
diff --git a/panels/power/gnome-power-panel.desktop.in.in b/panels/power/gnome-power-panel.desktop.in.in
index 40102822e..08227810b 100644
--- a/panels/power/gnome-power-panel.desktop.in.in
+++ b/panels/power/gnome-power-panel.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Power
 _Comment=Power management settings
 Exec=gnome-control-center power
-Icon=battery-good-charging
+Icon=gnome-power-manager
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/panels/power/icons/16x16/Makefile.am b/panels/power/icons/16x16/Makefile.am
new file mode 100644
index 000000000..0a1f2a7a8
--- /dev/null
+++ b/panels/power/icons/16x16/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/16x16/apps
+icon_DATA =				\
+	gnome-power-manager.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/16x16/gnome-power-manager.png b/panels/power/icons/16x16/gnome-power-manager.png
new file mode 100644
index 000000000..4e72c76ce
Binary files /dev/null and b/panels/power/icons/16x16/gnome-power-manager.png differ
diff --git a/panels/power/icons/22x22/Makefile.am b/panels/power/icons/22x22/Makefile.am
new file mode 100644
index 000000000..927521380
--- /dev/null
+++ b/panels/power/icons/22x22/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/22x22/apps
+icon_DATA = 				\
+	gnome-power-manager.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/22x22/gnome-power-manager.png b/panels/power/icons/22x22/gnome-power-manager.png
new file mode 100644
index 000000000..6ad7e5da0
Binary files /dev/null and b/panels/power/icons/22x22/gnome-power-manager.png differ
diff --git a/panels/power/icons/24x24/Makefile.am b/panels/power/icons/24x24/Makefile.am
new file mode 100644
index 000000000..13f910dc7
--- /dev/null
+++ b/panels/power/icons/24x24/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/24x24/apps
+icon_DATA = 				\
+	gnome-power-manager.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/24x24/gnome-power-manager.png b/panels/power/icons/24x24/gnome-power-manager.png
new file mode 100644
index 000000000..9f806af6f
Binary files /dev/null and b/panels/power/icons/24x24/gnome-power-manager.png differ
diff --git a/panels/power/icons/256x256/Makefile.am b/panels/power/icons/256x256/Makefile.am
new file mode 100644
index 000000000..03327473a
--- /dev/null
+++ b/panels/power/icons/256x256/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/256x256/apps
+icon_DATA = 				\
+	gnome-power-manager.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/256x256/gnome-power-manager.png b/panels/power/icons/256x256/gnome-power-manager.png
new file mode 100644
index 000000000..bde1807e1
Binary files /dev/null and b/panels/power/icons/256x256/gnome-power-manager.png differ
diff --git a/panels/power/icons/32x32/Makefile.am b/panels/power/icons/32x32/Makefile.am
new file mode 100644
index 000000000..505eb36d6
--- /dev/null
+++ b/panels/power/icons/32x32/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = 				\
+	gnome-power-manager.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/32x32/gnome-power-manager.png b/panels/power/icons/32x32/gnome-power-manager.png
new file mode 100644
index 000000000..579f709bc
Binary files /dev/null and b/panels/power/icons/32x32/gnome-power-manager.png differ
diff --git a/panels/power/icons/48x48/Makefile.am b/panels/power/icons/48x48/Makefile.am
new file mode 100644
index 000000000..6dd8c652f
--- /dev/null
+++ b/panels/power/icons/48x48/Makefile.am
@@ -0,0 +1,14 @@
+NULL =
+
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = 				\
+	gnome-power-manager.png			\
+	$(NULL)
+
+EXTRA_DIST = \
+	$(icon_DATA)
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk
diff --git a/panels/power/icons/48x48/gnome-power-manager.png b/panels/power/icons/48x48/gnome-power-manager.png
new file mode 100644
index 000000000..f013b429f
Binary files /dev/null and b/panels/power/icons/48x48/gnome-power-manager.png differ
diff --git a/panels/power/icons/Makefile.am b/panels/power/icons/Makefile.am
new file mode 100644
index 000000000..604aa8600
--- /dev/null
+++ b/panels/power/icons/Makefile.am
@@ -0,0 +1,18 @@
+
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+clean-local :
+	rm -f *~
+
+-include $(top_srcdir)/git.mk