diff --git a/ChangeLog b/ChangeLog
index fb9702fc..426e7445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 22 17:42:29 2007  Søren Sandmann  <sandmann@redhat.com>
+
+	* sysprof-icon-32.png
+	* sysprof.c: Add a 32x32 version (also from Diana) of the icon.
+
 Mon Jan 22 16:37:12 2007  Søren Sandmann  <sandmann@redhat.com>
 
 	* sysprof-icon-16/24/48.png:
diff --git a/Makefile.am b/Makefile.am
index 62844e8f..fd7f750a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ dist_udev_DATA = 60-sysprof.rules
 pixmapsdir = $(datadir)/pixmaps
 
 dist_pkgdata_DATA = sysprof.glade
-dist_pixmaps_DATA = sysprof-icon-16.png sysprof-icon-24.png sysprof-icon-48.png
+dist_pixmaps_DATA = sysprof-icon-16.png sysprof-icon-24.png sysprof-icon-32.png sysprof-icon-48.png
 
 #
 # Command line version
diff --git a/sysprof-icon-32.png b/sysprof-icon-32.png
new file mode 100644
index 00000000..6130df61
Binary files /dev/null and b/sysprof-icon-32.png differ
diff --git a/sysprof.c b/sysprof.c
index 51e6e401..994465de 100644
--- a/sysprof.c
+++ b/sysprof.c
@@ -1343,6 +1343,7 @@ set_icons (Application *app)
     const char *icon_files [] = {
 	PIXMAPDIR "/sysprof-icon-16.png",
 	PIXMAPDIR "/sysprof-icon-24.png",
+	PIXMAPDIR "/sysprof-icon-32.png",
 	PIXMAPDIR "/sysprof-icon-48.png",
 	NULL
     };
@@ -1351,15 +1352,20 @@ set_icons (Application *app)
 
     for (i = 0; icon_files[i] != NULL; ++i)
     {
-	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (icon_files[i], NULL);
+	const char *file = icon_files[i];
+	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
 
 	if (pixbuf)
 	{
 	    pixbufs = g_list_prepend (pixbufs, pixbuf);
 
-	    if (i == 2) /* 48 x 48 */
+	    if (i == 3) /* 48 x 48 */
 		app->icon = g_object_ref (pixbuf);
 	}
+	else
+	{
+	    g_warning ("Could not open %s\n", file);
+	}
     }
 
     gtk_window_set_icon_list (GTK_WINDOW (app->main_window), pixbufs);