diff --git a/ChangeLog b/ChangeLog
index 3b02beeb70..0db6efae88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-11-14  David Hampton  <hampton@employees.org>
 
+	* src/gnome-utils/dialog-preferences.c:
+	* src/gnome-utils/preferences.glade:
+	* src/gnome/glade/sched-xact.glade: Andreas Köhler's patch to set
+	some border widths inside the main preferences window to the HIG
+	specified 6px. Fix alignment of the "General / New search limit"
+	label.
+
 	* src/gnome-utils/gnc-plugin-file-history.c: Read the maxfiles key
 	from gconf.  Move one function and change another to take a
 	partial key instead of a full key.
diff --git a/src/gnome-utils/dialog-preferences.c b/src/gnome-utils/dialog-preferences.c
index ac0edd9673..4c0814b083 100644
--- a/src/gnome-utils/dialog-preferences.c
+++ b/src/gnome-utils/dialog-preferences.c
@@ -504,6 +504,7 @@ gnc_preferences_build_page (gpointer data,
     location.exact = FALSE;
     rows = 0;
     existing_content = gtk_table_new(0, 4, FALSE);
+    gtk_container_set_border_width(GTK_CONTAINER(existing_content), 6);
     gtk_container_foreach(GTK_CONTAINER(notebook), gnc_prefs_find_page,
 			  &location);
     label = gtk_label_new(add_in->tabname);
diff --git a/src/gnome-utils/preferences.glade b/src/gnome-utils/preferences.glade
index 3f678b2a0b..952dd036bb 100644
--- a/src/gnome-utils/preferences.glade
+++ b/src/gnome-utils/preferences.glade
@@ -751,6 +751,7 @@
 
 	  <child>
 	    <widget class="GtkTable" id="table10">
+	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="n_rows">17</property>
 	      <property name="n_columns">4</property>
@@ -1649,40 +1650,28 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkAlignment" id="alignment1">
+		<widget class="GtkLabel" id="label44">
 		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
+		  <property name="label" translatable="yes">New search _limit:</property>
+		  <property name="use_underline">True</property>
+		  <property name="use_markup">False</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="xscale">1</property>
-		  <property name="yscale">1</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">12</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label44">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">New search _limit:</property>
-		      <property name="use_underline">True</property>
-		      <property name="use_markup">False</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>
-		      <property name="mnemonic_widget">gconf/dialogs/search/new_search_limit</property>
-		    </widget>
-		  </child>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="mnemonic_widget">gconf/dialogs/search/new_search_limit</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">16</property>
 		  <property name="bottom_attach">17</property>
+		  <property name="x_padding">12</property>
 		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
@@ -2109,7 +2098,7 @@
 	    <widget class="GtkTable" id="table4">
 	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
-	      <property name="n_rows">11</property>
+	      <property name="n_rows">10</property>
 	      <property name="n_columns">4</property>
 	      <property name="homogeneous">False</property>
 	      <property name="row_spacing">0</property>
@@ -2434,6 +2423,7 @@
 
 	  <child>
 	    <widget class="GtkTable" id="table8">
+	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="n_rows">6</property>
 	      <property name="n_columns">4</property>
@@ -2681,6 +2671,7 @@
 
 	  <child>
 	    <widget class="GtkTable" id="table9">
+	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="n_rows">11</property>
 	      <property name="n_columns">4</property>
@@ -3054,7 +3045,7 @@
 	    <widget class="GtkTable" id="table5">
 	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
-	      <property name="n_rows">12</property>
+	      <property name="n_rows">9</property>
 	      <property name="n_columns">4</property>
 	      <property name="homogeneous">False</property>
 	      <property name="row_spacing">0</property>
diff --git a/src/gnome/glade/sched-xact.glade b/src/gnome/glade/sched-xact.glade
index fde915ea9e..10f2c91c71 100644
--- a/src/gnome/glade/sched-xact.glade
+++ b/src/gnome/glade/sched-xact.glade
@@ -8739,6 +8739,7 @@ the created Scheduled Transactions directly.</property>
 
   <child>
     <widget class="GtkTable" id="sx_prefs">
+      <property name="border_width">6</property>
       <property name="visible">True</property>
       <property name="n_rows">12</property>
       <property name="n_columns">4</property>