--- main.c	2006-01-30 00:06:31.000000000 -0600
+++ main.c-modif	2006-04-12 16:08:05.000000000 -0500
@@ -22,7 +22,6 @@
 #include <libintl.h>
 
 #include "gconf-editor-application.h"
-#include "gconf-stock-icons.h"
 #include "gconf-editor-window.h"
 
 
@@ -56,6 +55,8 @@
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
+	g_set_application_name (_("gconf-editor"));
+	gtk_window_set_default_icon_name ("gconf-editor");
 
 	program = gnome_program_init ("gconf-editor", VERSION, 
 	                              LIBGNOMEUI_MODULE, argc, argv,
@@ -68,9 +69,6 @@
 	pctx = g_value_get_pointer (&value);
 	g_value_unset (&value);
 
-	/* Register our stock icons */
-	gconf_stock_icons_register ();
-
 	window = gconf_editor_application_create_editor_window (GCONF_EDITOR_WINDOW_TYPE_NORMAL);
 	gtk_widget_show_now (window);
 
