--- gdbtk_orig/library/globalpref.itb	2008-08-03 00:08:32.000000000 +0200
+++ gdbtk/library/globalpref.itb	2012-03-09 16:22:34.047717300 +0100
@@ -77,14 +77,13 @@
 # ------------------------------------------------------------------
 itcl::body GlobalPref::_build_win {} {
   global gdbtk_platform GDBTK_LIBRARY
-  debug
   frame $itk_interior.f
   frame $itk_interior.x
   set frame $itk_interior.f
   
   # Icons
   frame $frame.icons
-  label $frame.icons.lab -text "Icons "
+  label $frame.icons.lab -text "Icons: "
   combobox::combobox $frame.icons.cb -editable 0 -maxheight 10\
     -command [code $this _change_icons] -bg $::Colors(textbg)
   
@@ -132,6 +131,7 @@
   # can be saved in the init file. A way should be provided
   # to rescan the font list, without deleting the entry from the
   # init file.
+
   set font_cache [pref get gdb/font_cache]
 
   # get list of fonts, removing some that typically
@@ -187,7 +187,6 @@
   _make_font_item $f default "Default Font:" $fam
   _make_font_item $f status  "Status Bar Font:" $fam
 
-
   iwidgets::Labeledframe $frame.misc -labelpos nw -labeltext "Misc"
   set f [$frame.misc childsite]
 
@@ -249,11 +248,11 @@
   }
 
   # make buttons
-  button $itk_interior.x.ok -text OK -underline 0 -width 7 -command [code $this _ok]
+  button $itk_interior.x.ok -text OK -width 7 -underline 0 -command [code $this _ok]
   button $itk_interior.x.apply -text Apply -width 7 -underline 0 -command [code $this _apply]
   button $itk_interior.x.cancel -text Cancel -width 7 -underline 0 -command [code $this _cancel]
-  pack $itk_interior.x.ok $itk_interior.x.apply $itk_interior.x.cancel -side left
   standard_button_box $itk_interior.x
+  pack $itk_interior.x -side left
 
   pack $itk_interior.x -fill x -padx 5 -pady 5 -side bottom
   pack $itk_interior.f -fill both -expand yes -padx 5 -pady 5
@@ -268,7 +267,6 @@
 
   _resize_font_item_height
   pack propagate $itk_interior.f 0
-
 }
 # ------------------------------------------------------------------
 #  PRIVATE METHOD:  _make_font_item