diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 6d75961cc..cc1cce01c 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-27  Sebastien Bacher  <seb128@debian.org>
+
+	* capplet-util.c: (capplet_set_icon): set a default icon for capplets, 
+	patch by Jaap A. Haitsma <jaap@haitsma.org> (Closes: #305086).
+
 2005-07-11  Rodney Dawes  <dobey@novell.com>
 
 	* capplet-util.c (capplet_set_icon): Remove the unref call on the
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index 258a4c32e..362d617d7 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -394,7 +394,11 @@ capplet_set_icon (GtkWidget *window, char const *icon_file_name)
 	}
 
 	if (icon_pixbuf != NULL) {
+		/* Make sure that every window gets an icon */
+		gtk_window_set_default_icon (icon_pixbuf);
+
 		gtk_window_set_icon (GTK_WINDOW (window), icon_pixbuf);
+
 		g_object_unref (icon_pixbuf);
 	}
 }