diff --git a/panels/background/background.ui b/panels/background/background.ui
index 22f13f4e8..ae9992404 100644
--- a/panels/background/background.ui
+++ b/panels/background/background.ui
@@ -27,10 +27,13 @@
   <object class="GtkHBox" id="background-panel">
     <property name="visible">True</property>
     <property name="spacing">12</property>
+    <property name="border_width">10</property>
+    <property name="orientation">horizontal</property>
     <child>
       <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
         <property name="spacing">6</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkComboBox" id="sources-combobox">
             <property name="visible">True</property>
@@ -85,6 +88,8 @@
     <child>
       <object class="GtkVBox" id="vbox3">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">10</property>
         <child>
           <object class="GtkDrawingArea" id="preview-area">
             <property name="visible">True</property>
@@ -96,6 +101,7 @@
         <child>
           <object class="GtkHBox" id="bottom-hbox">
             <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
             <child>
               <object class="GtkLabel" id="background-label">
                 <property name="visible">True</property>
@@ -110,6 +116,7 @@
               <object class="GtkHBox" id="edit-hbox">
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
+                <property name="orientation">horizontal</property>
                 <child>
                   <object class="GtkColorButton" id="style-color">
                     <property name="visible">True</property>
diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
index 286b2292a..8c825ea9b 100644
--- a/panels/datetime/datetime.ui
+++ b/panels/datetime/datetime.ui
@@ -6,8 +6,10 @@
     <child>
       <object class="GtkAlignment" id="datetime-panel">
         <property name="visible">True</property>
-        <property name="bottom_padding">12</property>
-        <property name="right_padding">12</property>
+        <property name="top_padding">10</property>
+        <property name="left_padding">10</property>
+        <property name="bottom_padding">10</property>
+        <property name="right_padding">10</property>
         <child>
           <object class="GtkVBox" id="hbox">
             <property name="visible">True</property>
diff --git a/panels/default-applications/gnome-default-applications-properties.ui b/panels/default-applications/gnome-default-applications-properties.ui
index dfef55f67..d71e45c0c 100644
--- a/panels/default-applications/gnome-default-applications-properties.ui
+++ b/panels/default-applications/gnome-default-applications-properties.ui
@@ -14,7 +14,7 @@
           <object class="GtkNotebook" id="preferred_apps_notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="border_width">5</property>
+            <property name="border_width">10</property>
             <child>
               <object class="GtkVBox" id="internet_vbox">
                 <property name="visible">True</property>
diff --git a/panels/keyboard/gnome-keyboard-panel.ui b/panels/keyboard/gnome-keyboard-panel.ui
index 26269dbc4..2ac1d8016 100644
--- a/panels/keyboard/gnome-keyboard-panel.ui
+++ b/panels/keyboard/gnome-keyboard-panel.ui
@@ -15,6 +15,7 @@
           <object class="GtkNotebook" id="keyboard_notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="border_width">10</property>
             <child>
               <object class="GtkVBox" id="general_page">
                 <property name="visible">True</property>
diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
index b7d49f112..f2fb5b20e 100644
--- a/panels/mouse/gnome-mouse-properties.ui
+++ b/panels/mouse/gnome-mouse-properties.ui
@@ -63,7 +63,7 @@
           <object class="GtkNotebook" id="prefs_widget">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="border_width">5</property>
+            <property name="border_width">10</property>
             <child>
               <object class="GtkVBox" id="general_vbox">
                 <property name="visible">True</property>
diff --git a/panels/region/gnome-region-panel.ui b/panels/region/gnome-region-panel.ui
index ba156ed34..ad5caf938 100644
--- a/panels/region/gnome-region-panel.ui
+++ b/panels/region/gnome-region-panel.ui
@@ -91,6 +91,7 @@
               <object class="GtkNotebook" id="region_notebook">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="border_width">10</property>
                 <child>
                   <object class="GtkVBox" id="vbox33">
                     <property name="visible">True</property>
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui
index cccf1cdc6..76124aec4 100644
--- a/panels/universal-access/uap.ui
+++ b/panels/universal-access/uap.ui
@@ -123,6 +123,7 @@
       <object class="GtkVBox" id="universal_access_box">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
+        <property name="border_width">10</property>
         <child>
           <object class="GtkFrame" id="frame1">
             <property name="visible">True</property>
@@ -2989,16 +2990,6 @@
                 </child>
               </object>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="assistance_label">
-                <property name="visible">True</property>
-                <property name="xalign">0.47999998927116394</property>
-                <property name="label" translatable="yes">I need assistance with:</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/panels/user-accounts/data/user-accounts-dialog.ui b/panels/user-accounts/data/user-accounts-dialog.ui
index 5c669f218..a053b51b7 100644
--- a/panels/user-accounts/data/user-accounts-dialog.ui
+++ b/panels/user-accounts/data/user-accounts-dialog.ui
@@ -59,7 +59,7 @@
             <property name="visible">True</property>
             <property name="show_tabs">True</property>
             <property name="show_border">True</property>
-            <property name="border_width">5</property>
+            <property name="border_width">10</property>
             <child>
               <object class="GtkHBox" id="hbox2">
                 <property name="visible">True</property>
diff --git a/shell/shell.ui b/shell/shell.ui
index 7d6fc7271..1fd009b3f 100644
--- a/shell/shell.ui
+++ b/shell/shell.ui
@@ -17,40 +17,48 @@
               <object class="GtkToolItem" id="toolbutton1">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
-                    <property name="border_width">5</property>
+                    <property name="top_padding">5</property>
+                    <property name="bottom_padding">5</property>
+                    <property name="left_padding">10</property>
+                    <property name="right_padding">5</property>
                     <child>
-                      <object class="GtkButton" id="home-button">
-                        <property name="label" translatable="yes">_All Settings</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="no_show_all">True</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="entry-alignment">
+                      <object class="GtkHBox" id="hbox1">
                         <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="xscale">0</property>
                         <child>
-                          <object class="GtkEntry" id="search-entry">
-                            <property name="width_request">210</property>
-                            <property name="visible">True</property>
+                          <object class="GtkButton" id="home-button">
+                            <property name="label" translatable="yes">_All Settings</property>
                             <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                            <property name="secondary_icon_stock">gtk-find</property>
+                            <property name="receives_default">True</property>
+                            <property name="no_show_all">True</property>
+                            <property name="use_underline">True</property>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="entry-alignment">
+                            <property name="visible">True</property>
+                            <property name="xalign">1</property>
+                            <property name="xscale">0</property>
+                            <child>
+                              <object class="GtkEntry" id="search-entry">
+                                <property name="width_request">210</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">&#x25CF;</property>
+                                <property name="secondary_icon_stock">gtk-find</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
@@ -137,8 +145,8 @@
   <object class="GtkSizeGroup" id="sizegroup">
     <property name="mode">vertical</property>
     <widgets>
-      <widget name="entry-alignment"/>
       <widget name="home-button"/>
+      <widget name="entry-alignment"/>
     </widgets>
   </object>
 </interface>