diff --git a/Makefile.am b/Makefile.am
index 0e8ceecf9..931625d7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
-SUBDIRS = libgd po panels shell search-provider
+SUBDIRS = data libgd po panels shell search-provider
if BUILD_DOCUMENTATION
SUBDIRS += man
endif
-DIST_SUBDIRS = libgd po panels shell man search-provider
+DIST_SUBDIRS = data libgd po panels shell man search-provider
MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \
diff --git a/configure.ac b/configure.ac
index 666a9c05a..cb82d69a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -451,6 +451,8 @@ fi
AC_CONFIG_FILES([
Makefile
+data/Makefile
+data/icons/Makefile
panels/Makefile
panels/common/Makefile
panels/background/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 000000000..b90cde955
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = icons
+DIST_SUBDIRS = icons
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 000000000..e3b950e79
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,84 @@
+NULL =
+
+public_icons_themes = \
+ hicolor \
+ $(NULL)
+
+public_icons = \
+ hicolor_apps_16x16_gnome-control-center.png \
+ hicolor_apps_24x24_gnome-control-center.png \
+ hicolor_apps_32x32_gnome-control-center.png \
+ hicolor_apps_48x48_gnome-control-center.png \
+ hicolor_apps_512x512_gnome-control-center.png \
+ hicolor_apps_symbolic_gnome-control-center-symbolic.svg \
+ $(NULL)
+
+private_icons = \
+ $(NULL)
+
+noinst_DATA = \
+ gnome-control-center-src.svg \
+ $(NULL)
+
+EXTRA_DIST = \
+ $(public_icons) \
+ $(private_icons) \
+ $(noinst_DATA) \
+ $(NULL)
+
+###############################################################################
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ for theme in $(public_icons_themes); do \
+ $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+ done; \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ for theme in $(public_icons_themes); do \
+ echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+ done; \
+ fi
+
+install-icons:
+ for icon in $(public_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done; \
+ for icon in $(private_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done
+
+uninstall-icons:
+ -for icon in $(public_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done; \
+ for icon in $(private_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/gnome-control-center-src.svg b/data/icons/gnome-control-center-src.svg
new file mode 100644
index 000000000..b010dc311
--- /dev/null
+++ b/data/icons/gnome-control-center-src.svg
@@ -0,0 +1,2854 @@
+
+
+
+
diff --git a/data/icons/hicolor_apps_16x16_gnome-control-center.png b/data/icons/hicolor_apps_16x16_gnome-control-center.png
new file mode 100644
index 000000000..202670c8e
Binary files /dev/null and b/data/icons/hicolor_apps_16x16_gnome-control-center.png differ
diff --git a/data/icons/hicolor_apps_24x24_gnome-control-center.png b/data/icons/hicolor_apps_24x24_gnome-control-center.png
new file mode 100644
index 000000000..0bc2ebfd2
Binary files /dev/null and b/data/icons/hicolor_apps_24x24_gnome-control-center.png differ
diff --git a/data/icons/hicolor_apps_32x32_gnome-control-center.png b/data/icons/hicolor_apps_32x32_gnome-control-center.png
new file mode 100644
index 000000000..77076b9dc
Binary files /dev/null and b/data/icons/hicolor_apps_32x32_gnome-control-center.png differ
diff --git a/data/icons/hicolor_apps_48x48_gnome-control-center.png b/data/icons/hicolor_apps_48x48_gnome-control-center.png
new file mode 100644
index 000000000..df687d1fd
Binary files /dev/null and b/data/icons/hicolor_apps_48x48_gnome-control-center.png differ
diff --git a/data/icons/hicolor_apps_512x512_gnome-control-center.png b/data/icons/hicolor_apps_512x512_gnome-control-center.png
new file mode 100644
index 000000000..4294e4502
Binary files /dev/null and b/data/icons/hicolor_apps_512x512_gnome-control-center.png differ
diff --git a/data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg b/data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg
new file mode 100644
index 000000000..d49ea7909
--- /dev/null
+++ b/data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg
@@ -0,0 +1,32 @@
+
+
+
+
diff --git a/shell/cc-window.c b/shell/cc-window.c
index 4fd1a4932..0b681da8a 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -43,7 +43,7 @@
#define MOUSE_BACK_BUTTON 8
-#define DEFAULT_WINDOW_ICON_NAME "preferences-system"
+#define DEFAULT_WINDOW_ICON_NAME "gnome-control-center"
struct _CcWindow
{
diff --git a/shell/gnome-control-center.desktop.in.in b/shell/gnome-control-center.desktop.in.in
index e124c10b8..1be3bbc08 100644
--- a/shell/gnome-control-center.desktop.in.in
+++ b/shell/gnome-control-center.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
_Name=Settings
-Icon=preferences-system
+Icon=gnome-control-center
Exec=gnome-control-center --overview
Terminal=false
Type=Application