diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index f28ecbdf9..f9b680a26 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-13  Sebastien Bacher  <seb128@debian.org>
+
+	* gnome-ui-properties.c: (setup_dialog):
+	* gnome-ui-properties.glade:
+	patch from Christian - Manny Calavera - Neumair <chris@gnome-de.org>,
+	add an option in the UI to activate menus accelators changes 
+	(Closes: #148013). 
+
 2005-01-02  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-ui-properties.glade:
diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c
index c84cebc23..062862455 100644
--- a/capplets/ui-properties/gnome-ui-properties.c
+++ b/capplets/ui-properties/gnome-ui-properties.c
@@ -230,6 +230,9 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
     "value_changed",
     G_CALLBACK (toolbar_detachable_cb), dialog);
 
+  peditor = gconf_peditor_new_boolean
+    (changeset, "/desktop/gnome/interface/can_change_accels", WID ("menu_accel_toggle"), NULL);
+
   peditor = gconf_peditor_new_boolean
     (changeset, "/desktop/gnome/interface/menus_have_icons", WID ("menu_icons_toggle"), NULL);
   g_signal_connect (peditor,
diff --git a/capplets/ui-properties/gnome-ui-properties.glade b/capplets/ui-properties/gnome-ui-properties.glade
index e2caa2162..512939836 100644
--- a/capplets/ui-properties/gnome-ui-properties.glade
+++ b/capplets/ui-properties/gnome-ui-properties.glade
@@ -142,6 +142,24 @@
 			</packing>
 		      </child>
 
+		      <child>
+			<widget class="GtkCheckButton" id="menu_accel_toggle">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Editable menu accelerators</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
 		      <child>
 			<widget class="GtkCheckButton" id="detachable_toolbars_toggle">
 			  <property name="visible">True</property>
@@ -550,6 +568,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xscale">1</property>
 			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">0</property>
+			  <property name="right_padding">0</property>
 
 			  <child>
 			    <widget class="GtkHandleBox" id="toolbar_handlebox">
@@ -564,32 +586,51 @@
 				  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
 				  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
 				  <property name="tooltips">True</property>
+				  <property name="show_arrow">True</property>
 
 				  <child>
-				    <widget class="button" id="button7">
+				    <widget class="GtkToolButton" id="button7">
 				      <property name="visible">True</property>
 				      <property name="tooltip" translatable="yes">New File</property>
-				      <property name="label">gtk-new</property>
-				      <property name="use_stock">True</property>
+				      <property name="stock_id">gtk-new</property>
+				      <property name="visible_horizontal">True</property>
+				      <property name="visible_vertical">True</property>
+				      <property name="is_important">False</property>
 				    </widget>
+				    <packing>
+				      <property name="expand">False</property>
+				      <property name="homogeneous">True</property>
+				    </packing>
 				  </child>
 
 				  <child>
-				    <widget class="button" id="button8">
+				    <widget class="GtkToolButton" id="button8">
 				      <property name="visible">True</property>
 				      <property name="tooltip" translatable="yes">Open File</property>
-				      <property name="label">gtk-open</property>
-				      <property name="use_stock">True</property>
+				      <property name="stock_id">gtk-open</property>
+				      <property name="visible_horizontal">True</property>
+				      <property name="visible_vertical">True</property>
+				      <property name="is_important">False</property>
 				    </widget>
+				    <packing>
+				      <property name="expand">False</property>
+				      <property name="homogeneous">True</property>
+				    </packing>
 				  </child>
 
 				  <child>
-				    <widget class="button" id="save_button">
+				    <widget class="GtkToolButton" id="save_button">
 				      <property name="visible">True</property>
 				      <property name="tooltip" translatable="yes">Save File</property>
-				      <property name="label">gtk-save</property>
-				      <property name="use_stock">True</property>
+				      <property name="stock_id">gtk-save</property>
+				      <property name="visible_horizontal">True</property>
+				      <property name="visible_vertical">True</property>
+				      <property name="is_important">False</property>
 				    </widget>
+				    <packing>
+				      <property name="expand">False</property>
+				      <property name="homogeneous">True</property>
+				    </packing>
 				  </child>
 				</widget>
 			      </child>