diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index 3905150ba..42bd61162 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-18  Dennis Cranston <dennis_cranston at yahoo com>
+
+	* gnome-ui-properties.c, gnome-ui-properties.glade:
+	Apply patch from Christian - Manny Calavera - Neumair
+	<chris@gnome-de.org> for ui-review bug # 99537.
+
 2003-07-11  Dennis Cranston <dennis_cranston at yahoo com>
 
 	* gnome-ui-properties.glade:  UI-Review fixes for bug
diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c
index 11c7af84a..93122814c 100644
--- a/capplets/ui-properties/gnome-ui-properties.c
+++ b/capplets/ui-properties/gnome-ui-properties.c
@@ -98,28 +98,28 @@ show_handlebar (GladeXML *dialog, gboolean show)
 {
   GtkWidget *handlebox;
   GtkWidget *toolbar;
-  GtkWidget *frame;
+  GtkWidget *align;
 
   handlebox = WID ("toolbar_handlebox");
   toolbar = WID ("toolbar_toolbar");
-  frame = WID ("toolbar_frame");
+  align = WID ("toolbar_align");
 
   g_object_ref (handlebox);
   g_object_ref (toolbar);
 
-  if (GTK_BIN (frame)->child)
-    gtk_container_remove (GTK_CONTAINER (frame), GTK_BIN (frame)->child);
+  if (GTK_BIN (align)->child)
+    gtk_container_remove (GTK_CONTAINER (align), GTK_BIN (align)->child);
   if (GTK_BIN (handlebox)->child)
     gtk_container_remove (GTK_CONTAINER (handlebox), GTK_BIN (handlebox)->child);
   if (show)
     {
-      gtk_container_add (GTK_CONTAINER (frame), handlebox);
+      gtk_container_add (GTK_CONTAINER (align), handlebox);
       gtk_container_add (GTK_CONTAINER (handlebox), toolbar);
       g_object_unref (handlebox);
     }
   else
     {
-      gtk_container_add (GTK_CONTAINER (frame), toolbar);
+      gtk_container_add (GTK_CONTAINER (align), toolbar);
     }
   g_object_unref (toolbar);
 
diff --git a/capplets/ui-properties/gnome-ui-properties.glade b/capplets/ui-properties/gnome-ui-properties.glade
index 9239faa74..e1a8b19d9 100644
--- a/capplets/ui-properties/gnome-ui-properties.glade
+++ b/capplets/ui-properties/gnome-ui-properties.glade
@@ -546,16 +546,17 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkFrame" id="toolbar_frame">
+			<widget class="GtkAlignment" id="toolbar_align">
 			  <property name="visible">True</property>
-			  <property name="label_xalign">0</property>
-			  <property name="label_yalign">0.5</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
 
 			  <child>
 			    <widget class="GtkHandleBox" id="toolbar_handlebox">
 			      <property name="visible">True</property>
-			      <property name="shadow_type">GTK_SHADOW_IN</property>
+			      <property name="shadow_type">GTK_SHADOW_OUT</property>
 			      <property name="handle_position">GTK_POS_LEFT</property>
 			      <property name="snap_edge">GTK_POS_TOP</property>