Index: ddccontrol/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
===================================================================
--- ddccontrol.orig/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
+++ ddccontrol/src/gnome-ddcc-applet/GNOME_ddcc-applet.server.in.in
@@ -25,7 +25,7 @@
         <oaf_attribute name="name" type="string" _value="Monitor Profile Switcher"/>
         <oaf_attribute name="description" type="string" _value="Quickly switch monitor profiles created with gddccontrol"/>
         <oaf_attribute name="panel:category" type="string" value="System"/>
-        <oaf_attribute name="panel:icon" type="string" value="display-capplet.png"/>
+        <oaf_attribute name="panel:icon" type="string" value="gddccontrol"/>
 
 </oaf_server>
 
Index: ddccontrol/src/gnome-ddcc-applet/ddcc-applet.c
===================================================================
--- ddccontrol.orig/src/gnome-ddcc-applet/ddcc-applet.c
+++ ddccontrol/src/gnome-ddcc-applet/ddcc-applet.c
@@ -488,7 +488,7 @@ ddcc_applet_main (PanelApplet* root_appl
 
 	icon_theme = gtk_icon_theme_get_default();
 
-	icon = gtk_image_new_from_icon_name ("display-capplet", GTK_ICON_SIZE_BUTTON);
+	icon = gtk_image_new_from_icon_name ("gddccontrol", GTK_ICON_SIZE_BUTTON);
 	applet_hbox = gtk_hbox_new (FALSE,0);
 
 	gtk_box_pack_start (GTK_BOX (applet_hbox), icon, 0, 0, 0);
Index: ddccontrol/src/gddccontrol/Makefile.am
===================================================================
--- ddccontrol.orig/src/gddccontrol/Makefile.am
+++ ddccontrol/src/gddccontrol/Makefile.am
@@ -16,11 +16,8 @@ desktop_in_files = gddccontrol.desktop.i
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = gddccontrol.png
-
-install-data-local:
-	-@INSTALL@ -m 644 gddccontrol-bluecurve.png $(DESTDIR)/$(datadir)/icons/Bluecurve/48x48/apps/gddccontrol.png
-
-@INTLTOOL_DESKTOP_RULE@
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = gddccontrol.png
 
+Bluecurvedir = $(datadir)/icons/Bluecurve/48x48/apps
+Bluecurve_DATA = gddccontrol.png