Index: src/eog-window.c
===================================================================
--- src/eog-window.c	(Revision 4119)
+++ src/eog-window.c	(Arbeitskopie)
@@ -2349,13 +2349,26 @@
 eog_window_cmd_edit_toolbar_cb (GtkDialog *dialog, gint response, gpointer data)
 {
 	EogWindow *window = EOG_WINDOW (data);
+	if (response == 128) {
+		EggToolbarsModel *model;
+		EggTbModelFlags old_flags;
 
+		model = eog_application_get_toolbars_model (EOG_APP);
+		old_flags = egg_toolbars_model_get_flags (model, 0); 
+		egg_toolbars_model_set_flags (model, 0,0);
+		egg_toolbars_model_remove_toolbar (model, 0);
+
+		egg_toolbars_model_load_toolbars (model,
+					EOG_DATA_DIR "/eog-toolbar.xml");
+		egg_toolbars_model_set_flags (model, 0, old_flags);
+	} else {
         egg_editable_toolbar_set_edit_mode
 		(EGG_EDITABLE_TOOLBAR (window->priv->toolbar), FALSE);
 
 	eog_application_save_toolbars_model (EOG_APP);
 
         gtk_widget_destroy (GTK_WIDGET (dialog));
+	}
 }
 
 static void
@@ -2371,7 +2384,9 @@
 
 	dialog = gtk_dialog_new_with_buttons (_("Toolbar Editor"),
 					      GTK_WINDOW (window), 
-				              GTK_DIALOG_DESTROY_WITH_PARENT, 
+				              GTK_DIALOG_DESTROY_WITH_PARENT,
+					      GTK_STOCK_CLEAR,
+					      128,
 					      GTK_STOCK_CLOSE,
 					      GTK_RESPONSE_CLOSE, 
 					      NULL);
