diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 40201f921..186918790 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,11 @@
 2004-07-28  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/data/Makefile.am: Uninstall everything that we install.
+	* src/GrampsCfg.py: Remove unneeded id_edit widget. 
+	* src/gramps.glade: Manually switch toolbar items from 
+	to ToolButtons to buttons to work around libglade bug. Remove
+	unused id_edit widget and the label. 
+	* src/mergedata.glade: Switch button order to comply with HIG.
+	* src/plugins/merge.glade: Switch button order to comply with HIG.
 
 2004-07-27  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/RelLib.py, etc.: convert get_id to get_handle
diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py
index 1a19ad486..f90edb33e 100644
--- a/gramps2/src/GrampsCfg.py
+++ b/gramps2/src/GrampsCfg.py
@@ -220,9 +220,6 @@ def get_betawarn():
 def save_betawarn(val):
     set_bool("/apps/gramps/behavior/betawarn",val)
 
-def get_index_visible():
-    return client.get_bool("/apps/gramps/index-visible")
-
 def get_media_reference():
     return get_bool("/apps/gramps/behavior/make-reference")
 
@@ -705,7 +702,6 @@ class GrampsPreferences:
     def build(self):
 
         auto = self.top.get_widget("autoload")
-        index_vis = self.top.get_widget("show_child_id")
         auto.set_active(get_autoload())
         auto.connect('toggled',lambda obj: save_autoload(obj.get_active()))
 
@@ -734,10 +730,6 @@ class GrampsPreferences:
 
         cal.connect('toggled',lambda obj: save_calendar(obj.get_active()))
 
-        idedit = self.top.get_widget("gid_edit")
-        idedit.set_active(get_id_edit())
-        idedit.connect('toggled',lambda obj: save_id_edit(obj.get_active()))
-
         index_vis = self.top.get_widget("show_child_id")
         index_vis.set_active(get_index_visible())
         index_vis.connect('toggled',lambda obj: save_index_visible(obj.get_active()))
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index f84d71bdb..d88b581a4 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -702,209 +702,129 @@
 	      <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="GtkToolButton" id="button2">
+		<widget class="button" id="button2">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Open database</property>
 		  <property name="label" translatable="yes">Open</property>
 		  <property name="use_underline">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>
+		  <property name="stock_pixmap">gtk-open</property>
 		  <signal name="clicked" handler="on_open_activate"/>
 		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
-		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkSeparatorToolItem" id="separatortoolitem1">
+		<widget class="button" id="button3">
 		  <property name="visible">True</property>
-		  <property name="draw">True</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
+		  <property name="tooltip" translatable="yes">Save database</property>
+		  <property name="label" translatable="yes">Save As...</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_pixmap">gtk-save-as</property>
+		  <signal name="clicked" handler="on_export_activate"/>
 		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">False</property>
-		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkToolButton" id="back_btn">
+		<widget class="button" id="back_btn">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Go back in history</property>
 		  <property name="label" translatable="yes">Back</property>
 		  <property name="use_underline">True</property>
-		  <property name="stock_id">gtk-go-back</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		  <property name="is_important">False</property>
+		  <property name="stock_pixmap">gtk-go-back</property>
+		  <property name="new_group">True</property>
 		  <signal name="clicked" handler="on_back_clicked" last_modification_time="Thu, 14 Aug 2003 02:19:55 GMT"/>
 		  <signal name="button_press_event" handler="on_back_pressed" last_modification_time="Tue, 19 Aug 2003 00:07:23 GMT"/>
 		</widget>
 		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
+		  <property name="new_group">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkToolButton" id="fwd_btn">
+		<widget class="button" id="fwd_btn">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Go forward in history</property>
 		  <property name="label" translatable="yes">Forward</property>
 		  <property name="use_underline">True</property>
-		  <property name="stock_id">gtk-go-forward</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		  <property name="is_important">False</property>
+		  <property name="stock_pixmap">gtk-go-forward</property>
 		  <signal name="clicked" handler="on_fwd_clicked" last_modification_time="Thu, 14 Aug 2003 02:20:17 GMT"/>
 		  <signal name="button_press_event" handler="on_fwd_pressed" last_modification_time="Tue, 19 Aug 2003 00:27:51 GMT"/>
 		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
-		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkToolButton" id="button97">
+		<widget class="button" id="button97">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Make the Home Person the active person</property>
 		  <property name="label" translatable="yes">Home</property>
 		  <property name="use_underline">True</property>
-		  <property name="icon">home.png</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		  <property name="is_important">False</property>
+		  <property name="stock_pixmap">gtk-home</property>
 		  <signal name="clicked" handler="on_home_clicked"/>
 		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
-		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkSeparatorToolItem" id="separatortoolitem2">
-		  <property name="visible">True</property>
-		  <property name="draw">True</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkToolButton" id="reports">
+		<widget class="button" id="reports">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Generate reports</property>
 		  <property name="label" translatable="yes">Reports</property>
 		  <property name="use_underline">True</property>
-		  <property name="stock_id">gtk-dnd-multiple</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		  <property name="is_important">False</property>
+		  <property name="stock_pixmap">gtk-dnd-multiple</property>
+		  <property name="new_group">True</property>
 		  <signal name="clicked" handler="on_reports_clicked"/>
 		</widget>
 		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
+		  <property name="new_group">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkToolButton" id="tools">
+		<widget class="button" id="tools">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Run tools</property>
 		  <property name="label" translatable="yes">Tools</property>
 		  <property name="use_underline">True</property>
 		  <property name="icon">tools.png</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		  <property name="is_important">False</property>
 		  <signal name="clicked" handler="on_tools_clicked"/>
 		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
-		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkSeparatorToolItem" id="separatortoolitem3">
-		  <property name="visible">True</property>
-		  <property name="draw">True</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkToolButton" id="addbtn">
+		<widget class="button" id="addbtn">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Add a new item</property>
 		  <property name="label" translatable="yes">Add</property>
 		  <property name="use_underline">True</property>
-		  <property name="stock_id">gtk-add</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		  <property name="is_important">False</property>
+		  <property name="stock_pixmap">gtk-add</property>
+		  <property name="new_group">True</property>
 		  <signal name="clicked" handler="on_addbtn_clicked" last_modification_time="Sun, 22 Sep 2002 04:17:19 GMT"/>
 		</widget>
 		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
+		  <property name="new_group">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkToolButton" id="removebtn">
+		<widget class="button" id="removebtn">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Remove the currently selected item</property>
 		  <property name="label" translatable="yes">Remove</property>
 		  <property name="use_underline">True</property>
-		  <property name="stock_id">gtk-remove</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		  <property name="is_important">False</property>
+		  <property name="stock_pixmap">gtk-remove</property>
 		  <signal name="clicked" handler="on_removebtn_clicked" last_modification_time="Sun, 22 Sep 2002 04:17:33 GMT"/>
 		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
-		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkToolButton" id="editbtn">
+		<widget class="button" id="editbtn">
 		  <property name="visible">True</property>
 		  <property name="tooltip" translatable="yes">Edit the selected item</property>
 		  <property name="label" translatable="yes">Edit</property>
 		  <property name="use_underline">True</property>
 		  <property name="icon">edit.png</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		  <property name="is_important">False</property>
 		  <signal name="clicked" handler="on_editbtn_clicked" last_modification_time="Sun, 22 Sep 2002 04:17:44 GMT"/>
 		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">True</property>
-		</packing>
 	      </child>
 	    </widget>
 	  </child>
@@ -19543,30 +19463,6 @@
 				</packing>
 			      </child>
 
-			      <child>
-				<widget class="GtkLabel" id="label136">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">&lt;b&gt;User defined IDs&lt;/b&gt;</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">6</property>
-				  <property name="bottom_attach">7</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
 			      <child>
 				<widget class="GtkLabel" id="label135">
 				  <property name="visible">True</property>
@@ -19590,29 +19486,6 @@
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
-
-			      <child>
-				<widget class="GtkCheckButton" id="gid_edit">
-				  <property name="border_width">5</property>
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Allow internal GRAMPS ID numbers to be edited</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">3</property>
-				  <property name="top_attach">7</property>
-				  <property name="bottom_attach">8</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
diff --git a/gramps2/src/mergedata.glade b/gramps2/src/mergedata.glade
index f939914a4..1fa4eab30 100644
--- a/gramps2/src/mergedata.glade
+++ b/gramps2/src/mergedata.glade
@@ -25,19 +25,6 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
-	  <child>
-	    <widget class="GtkButton" id="button9">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="destroy_passed_object" object="merge_places"/>
-	    </widget>
-	  </child>
-
 	  <child>
 	    <widget class="GtkButton" id="button7">
 	      <property name="visible">True</property>
@@ -50,6 +37,19 @@
 	      <signal name="clicked" handler="on_merge_places_clicked" object="merge_places"/>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="button9">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="destroy_passed_object" object="merge_places"/>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -276,15 +276,15 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="button12">
+	    <widget class="GtkButton" id="button14">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Merge and close</property>
-	      <property name="use_underline">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="on_merge_clicked" object="merge"/>
+	      <signal name="clicked" handler="destroy_passed_object" object="merge"/>
 	    </widget>
 	  </child>
 
@@ -302,15 +302,15 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="button14">
+	    <widget class="GtkButton" id="button12">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
+	      <property name="label" translatable="yes">_Merge and close</property>
+	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="destroy_passed_object" object="merge"/>
+	      <signal name="clicked" handler="on_merge_clicked" object="merge"/>
 	    </widget>
 	  </child>
 	</widget>
diff --git a/gramps2/src/plugins/merge.glade b/gramps2/src/plugins/merge.glade
index 9cf180cb2..b65214553 100644
--- a/gramps2/src/plugins/merge.glade
+++ b/gramps2/src/plugins/merge.glade
@@ -125,20 +125,6 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
-	  <child>
-	    <widget class="GtkButton" id="button9">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="destroy_passed_object" object="mergelist"/>
-	    </widget>
-	  </child>
-
 	  <child>
 	    <widget class="GtkButton" id="button7">
 	      <property name="visible">True</property>
@@ -152,6 +138,20 @@
 	      <signal name="clicked" handler="on_do_merge_clicked"/>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="button9">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="destroy_passed_object" object="mergelist"/>
+	    </widget>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>