diff --git a/panels/color/cc-color-device.c b/panels/color/cc-color-device.c
index 49ebf7d11..b31a8260f 100644
--- a/panels/color/cc-color-device.c
+++ b/panels/color/cc-color-device.c
@@ -292,9 +292,9 @@ cc_color_device_init (CcColorDevice *color_device)
   /* description */
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 9);
   priv->widget_description = gtk_label_new ("");
-  gtk_widget_set_margin_start (priv->widget_description, 12);
-  gtk_widget_set_margin_top (priv->widget_description, 6);
-  gtk_widget_set_margin_bottom (priv->widget_description, 6);
+  gtk_widget_set_margin_start (priv->widget_description, 20);
+  gtk_widget_set_margin_top (priv->widget_description, 12);
+  gtk_widget_set_margin_bottom (priv->widget_description, 12);
   gtk_widget_set_halign (priv->widget_description, GTK_ALIGN_START);
   gtk_box_pack_start (GTK_BOX (box), priv->widget_description, TRUE, TRUE, 0);
 
@@ -314,9 +314,9 @@ cc_color_device_init (CcColorDevice *color_device)
   gtk_button_set_relief (GTK_BUTTON (priv->widget_button), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER (priv->widget_button), priv->widget_arrow);
   gtk_widget_set_visible (priv->widget_arrow, TRUE);
-  gtk_widget_set_margin_top (priv->widget_button, 3);
-  gtk_widget_set_margin_bottom (priv->widget_button, 3);
-  gtk_widget_set_margin_end (priv->widget_button, 9);
+  gtk_widget_set_margin_top (priv->widget_button, 9);
+  gtk_widget_set_margin_bottom (priv->widget_button, 9);
+  gtk_widget_set_margin_end (priv->widget_button, 12);
   gtk_box_pack_start (GTK_BOX (box), priv->widget_button, FALSE, FALSE, 0);
 
   /* not calibrated */
diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
index 75847c610..5240d4bfd 100644
--- a/panels/datetime/datetime.ui
+++ b/panels/datetime/datetime.ui
@@ -292,8 +292,9 @@
                         <property name="can_focus">False</property>
                         <property name="margin_start">20</property>
                         <property name="margin_end">20</property>
-                        <property name="margin_top">6</property>
-                        <property name="margin_bottom">6</property>
+                        <property name="margin_top">12</property>
+                        <property name="margin_bottom">12</property>
+                        <property name="spacing">2</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkLabel" id="network_time_label">
@@ -319,6 +320,9 @@
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <attributes>
+                              <attribute name="scale" value="0.88"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -366,8 +370,9 @@
                         <property name="can_focus">False</property>
                         <property name="margin_start">20</property>
                         <property name="margin_end">20</property>
-                        <property name="margin_top">6</property>
-                        <property name="margin_bottom">6</property>
+                        <property name="margin_top">12</property>
+                        <property name="margin_bottom">12</property>
+                        <property name="spacing">2</property>
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkLabel" id="auto_timezone_label">
@@ -393,6 +398,9 @@
                             <style>
                               <class name="dim-label"/>
                             </style>
+                            <attributes>
+                              <attribute name="scale" value="0.88"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="expand">True</property>
diff --git a/panels/mouse/gnome-mouse-properties.ui b/panels/mouse/gnome-mouse-properties.ui
index af3e79540..018b374a2 100644
--- a/panels/mouse/gnome-mouse-properties.ui
+++ b/panels/mouse/gnome-mouse-properties.ui
@@ -68,12 +68,12 @@
                           <object class="GtkGrid" id="primary-button-grid">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="row_spacing">0</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">16</property>
-                            <property name="margin_start">12</property>
-                            <property name="margin_end">6</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
+                            <property name="margin_start">20</property>
+                            <property name="margin_end">20</property>
+                            <property name="margin_top">12</property>
+                            <property name="margin_bottom">12</property>
                             <child>
                               <object class="GtkLabel" id="primary-button-label">
                                 <property name="visible">True</property>
@@ -202,8 +202,8 @@
                             <property name="can_focus">False</property>
                             <property name="row_spacing">0</property>
                             <property name="column_spacing">32</property>
-                            <property name="margin_start">12</property>
-                            <property name="margin_end">6</property>
+                            <property name="margin_start">20</property>
+                            <property name="margin_end">20</property>
                             <property name="margin_top">8</property>
                             <property name="margin_bottom">8</property>
                             <property name="valign">center</property>
@@ -259,10 +259,10 @@
                           <object class="GtkGrid" id="mouse-natural-scrolling-grid">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="row_spacing">0</property>
+                            <property name="row_spacing">2</property>
                             <property name="column_spacing">16</property>
-                            <property name="margin_start">12</property>
-                            <property name="margin_end">6</property>
+                            <property name="margin_start">20</property>
+                            <property name="margin_end">20</property>
                             <property name="margin_top">6</property>
                             <property name="margin_bottom">6</property>
                             <property name="valign">center</property>
@@ -371,10 +371,10 @@
                                 <property name="can_focus">False</property>
                                 <property name="row_spacing">0</property>
                                 <property name="column_spacing">32</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">6</property>
-                                <property name="margin_top">6</property>
-                                <property name="margin_bottom">6</property>
+                                <property name="margin_start">20</property>
+                                <property name="margin_end">20</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
                                 <property name="valign">center</property>
                                 <child>
                                   <object class="GtkLabel" id="touchpad-toggle-label">
@@ -435,10 +435,10 @@
                               <object class="GtkGrid" id="touchpad-natural-scrolling-grid">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="row_spacing">0</property>
+                                <property name="row_spacing">2</property>
                                 <property name="column_spacing">16</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">6</property>
+                                <property name="margin_start">20</property>
+                                <property name="margin_end">20</property>
                                 <property name="margin_top">6</property>
                                 <property name="margin_bottom">6</property>
                                 <property name="valign">center</property>
@@ -508,8 +508,8 @@
                                 <property name="can_focus">False</property>
                                 <property name="row_spacing">0</property>
                                 <property name="column_spacing">16</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">6</property>
+                                <property name="margin_start">20</property>
+                                <property name="margin_end">20</property>
                                 <property name="margin_top">8</property>
                                 <property name="margin_bottom">8</property>
                                 <property name="valign">center</property>
@@ -566,10 +566,10 @@
                                 <property name="can_focus">False</property>
                                 <property name="row_spacing">0</property>
                                 <property name="column_spacing">32</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">6</property>
-                                <property name="margin_top">6</property>
-                                <property name="margin_bottom">6</property>
+                                <property name="margin_start">20</property>
+                                <property name="margin_end">20</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
                                 <property name="valign">center</property>
                                 <child>
                                   <object class="GtkLabel" id="tap-to-click-label">
@@ -619,10 +619,10 @@
                                 <property name="can_focus">False</property>
                                 <property name="row_spacing">0</property>
                                 <property name="column_spacing">32</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">6</property>
-                                <property name="margin_top">6</property>
-                                <property name="margin_bottom">6</property>
+                                <property name="margin_start">20</property>
+                                <property name="margin_end">20</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
                                 <property name="valign">center</property>
                                 <child>
                                   <object class="GtkLabel" id="two-finger-scrolling-label">
@@ -672,10 +672,10 @@
                                 <property name="can_focus">False</property>
                                 <property name="row_spacing">0</property>
                                 <property name="column_spacing">32</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">6</property>
-                                <property name="margin_top">6</property>
-                                <property name="margin_bottom">6</property>
+                                <property name="margin_start">20</property>
+                                <property name="margin_end">20</property>
+                                <property name="margin_top">12</property>
+                                <property name="margin_bottom">12</property>
                                 <property name="valign">center</property>
                                 <child>
                                   <object class="GtkLabel" id="edge-scrolling-label">
diff --git a/panels/network/network-ethernet.ui b/panels/network/network-ethernet.ui
index 2971e2462..f1b21c28f 100644
--- a/panels/network/network-ethernet.ui
+++ b/panels/network/network-ethernet.ui
@@ -80,7 +80,10 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">horizontal</property>
                         <property name="spacing">12</property>
-                        <property name="margin">12</property>
+                        <property name="margin_top">9</property>
+                        <property name="margin_bottom">9</property>
+                        <property name="margin_start">20</property>
+                        <property name="margin_end">20</property>
                         <child>
                           <object class="GtkLabel" id="label_status">
                             <property name="visible">True</property>
diff --git a/panels/network/network-proxy.ui b/panels/network/network-proxy.ui
index 232c4d00b..e92ee8c62 100644
--- a/panels/network/network-proxy.ui
+++ b/panels/network/network-proxy.ui
@@ -35,7 +35,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">12</property>
-                <property name="margin">12</property>
+                <property name="margin_top">9</property>
+                <property name="margin_bottom">9</property>
+                <property name="margin_start">20</property>
+                <property name="margin_end">20</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
diff --git a/panels/network/network-vpn.ui b/panels/network/network-vpn.ui
index 3fb080abf..71b72224a 100644
--- a/panels/network/network-vpn.ui
+++ b/panels/network/network-vpn.ui
@@ -31,7 +31,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">start</property>
-                <property name="margin">12</property>
+                <property name="margin_top">9</property>
+                <property name="margin_bottom">9</property>
+                <property name="margin_start">20</property>
+                <property name="margin_end">20</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="label_device">
diff --git a/panels/network/wifi.ui b/panels/network/wifi.ui
index a83c749c8..c4bd66f9b 100644
--- a/panels/network/wifi.ui
+++ b/panels/network/wifi.ui
@@ -121,7 +121,10 @@
                                   <object class="GtkGrid">
                                     <property name="visible">True</property>
                                     <property name="border-width">12</property>
+                                    <property name="margin_left">6</property>
+                                    <property name="margin_right">6</property>
                                     <property name="column-spacing">12</property>
+                                    <property name="row-spacing">2</property>
                                     <child>
                                       <object class="GtkLabel">
                                         <property name="visible">True</property>
diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
index fb985132c..ab367b6ca 100644
--- a/panels/privacy/cc-privacy-panel.c
+++ b/panels/privacy/cc-privacy-panel.c
@@ -296,8 +296,8 @@ add_row (CcPrivacyPanel *self,
   gtk_widget_set_halign (w, GTK_ALIGN_START);
   gtk_widget_set_margin_start (w, 20);
   gtk_widget_set_margin_end (w, 20);
-  gtk_widget_set_margin_top (w, 12);
-  gtk_widget_set_margin_bottom (w, 12);
+  gtk_widget_set_margin_top (w, 18);
+  gtk_widget_set_margin_bottom (w, 18);
   gtk_widget_set_halign (w, GTK_ALIGN_START);
   gtk_widget_set_valign (w, GTK_ALIGN_CENTER);
   gtk_widget_set_hexpand (w, TRUE);
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 290ee9124..48c0d7ac0 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -846,8 +846,8 @@ add_input_row (CcRegionPanel   *self,
         gtk_widget_set_halign (label, GTK_ALIGN_START);
         gtk_widget_set_margin_start (label, 20);
         gtk_widget_set_margin_end (label, 20);
-        gtk_widget_set_margin_top (label, 12);
-        gtk_widget_set_margin_bottom (label, 12);
+        gtk_widget_set_margin_top (label, 18);
+        gtk_widget_set_margin_bottom (label, 18);
         gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
 
         if (strcmp (type, INPUT_SOURCE_TYPE_IBUS) == 0) {
diff --git a/panels/region/region.ui b/panels/region/region.ui
index 53c6e2147..7e8f8d55e 100644
--- a/panels/region/region.ui
+++ b/panels/region/region.ui
@@ -61,8 +61,8 @@
                                 <property name="can_focus">False</property>
                                 <property name="margin_start">20</property>
                                 <property name="margin_end">20</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
+                                <property name="margin_top">18</property>
+                                <property name="margin_bottom">18</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">_Language</property>
                                 <property name="use_underline">True</property>
@@ -80,8 +80,8 @@
                                 <property name="xalign">1</property>
                                 <property name="margin_start">20</property>
                                 <property name="margin_end">20</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
+                                <property name="margin_top">18</property>
+                                <property name="margin_bottom">18</property>
                                 <property name="label" translatable="yes">English (United Kingdom)</property>
                               </object>
                               <packing>
@@ -163,8 +163,8 @@
                             <property name="can_focus">False</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
-                            <property name="margin_top">12</property>
-                            <property name="margin_bottom">12</property>
+                            <property name="margin_top">18</property>
+                            <property name="margin_bottom">18</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Formats</property>
                             <property name="use_underline">True</property>
@@ -182,8 +182,8 @@
                             <property name="xalign">1</property>
                             <property name="margin_start">20</property>
                             <property name="margin_end">20</property>
-                            <property name="margin_top">12</property>
-                            <property name="margin_bottom">12</property>
+                            <property name="margin_top">18</property>
+                            <property name="margin_bottom">18</property>
                             <property name="label" translatable="yes">United Kingdom</property>
                           </object>
                           <packing>
diff --git a/panels/sharing/sharing.ui b/panels/sharing/sharing.ui
index b1561ac32..8d1081147 100644
--- a/panels/sharing/sharing.ui
+++ b/panels/sharing/sharing.ui
@@ -89,7 +89,10 @@
                     <property name="visible">True</property>
                     <child>
                       <object class="GtkBox" id="box2">
-                        <property name="border-width">12</property>
+                        <property name="margin_top">18</property>
+                        <property name="margin_bottom">18</property>
+                        <property name="margin_left">12</property>
+                        <property name="margin_right">12</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -129,7 +132,10 @@
                     <property name="visible">True</property>
                     <child>
                       <object class="GtkBox" id="box3">
-                        <property name="border-width">12</property>
+                        <property name="margin_top">18</property>
+                        <property name="margin_bottom">18</property>
+                        <property name="margin_left">12</property>
+                        <property name="margin_right">12</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -169,7 +175,10 @@
                     <property name="visible">True</property>
                     <child>
                       <object class="GtkBox" id="box4">
-                        <property name="border-width">12</property>
+                        <property name="margin_top">18</property>
+                        <property name="margin_bottom">18</property>
+                        <property name="margin_left">12</property>
+                        <property name="margin_right">12</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -209,7 +218,10 @@
                     <property name="visible">True</property>
                     <child>
                       <object class="GtkBox" id="box5">
-                        <property name="border-width">12</property>
+                        <property name="margin_top">18</property>
+                        <property name="margin_bottom">18</property>
+                        <property name="margin_left">12</property>
+                        <property name="margin_right">12</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui
index 5f1059c3b..cdb766256 100644
--- a/panels/universal-access/uap.ui
+++ b/panels/universal-access/uap.ui
@@ -190,8 +190,8 @@
                                             <property name="can_focus">True</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -218,8 +218,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Large Text</property>
                                             <property name="use_underline">True</property>
@@ -237,8 +237,8 @@
                                             <property name="can_focus">True</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -264,8 +264,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="label" translatable="yes">C_ursor Size</property>
                                             <property name="use_underline">True</property>
                                             <property name="xalign">0</property>
@@ -282,8 +282,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="label">24 pixels</property>
                                             <property name="xalign">1</property>
                                           </object>
@@ -310,8 +310,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Zoom</property>
                                             <property name="use_underline">True</property>
@@ -328,8 +328,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Off</property>
                                           </object>
@@ -356,8 +356,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Screen _Reader</property>
                                             <property name="use_underline">True</property>
@@ -374,8 +374,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Off</property>
                                           </object>
@@ -402,8 +402,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Sound Keys</property>
                                             <property name="use_underline">True</property>
@@ -420,8 +420,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Off</property>
                                           </object>
@@ -508,8 +508,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Visual Alerts</property>
                                             <property name="use_underline">True</property>
@@ -526,8 +526,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Off</property>
                                           </object>
@@ -616,8 +616,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Screen _Keyboard</property>
                                             <property name="use_underline">True</property>
@@ -635,8 +635,8 @@
                                             <property name="can_focus">True</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -661,8 +661,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">R_epeat Keys</property>
                                             <property name="use_underline">True</property>
@@ -679,8 +679,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Off</property>
                                           </object>
@@ -707,8 +707,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">Cursor _Blinking</property>
                                             <property name="use_underline">True</property>
@@ -725,8 +725,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Off</property>
                                           </object>
@@ -753,8 +753,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Typing Assist (AccessX)</property>
                                             <property name="use_underline">True</property>
@@ -771,8 +771,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Off</property>
                                           </object>
@@ -860,8 +860,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Mouse Keys</property>
                                             <property name="use_underline">True</property>
@@ -879,8 +879,8 @@
                                             <property name="can_focus">True</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                           </object>
                                           <packing>
                                             <property name="expand">False</property>
@@ -905,8 +905,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Click Assist</property>
                                             <property name="use_underline">True</property>
@@ -923,8 +923,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes">Off</property>
                                           </object>
@@ -951,8 +951,8 @@
                                             <property name="can_focus">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <property name="xalign">0</property>
                                             <property name="label" translatable="yes">_Double-Click Delay</property>
                                             <property name="use_underline">True</property>
@@ -970,8 +970,8 @@
                                             <property name="draw_value">False</property>
                                             <property name="margin_start">12</property>
                                             <property name="margin_end">12</property>
-                                            <property name="margin_top">6</property>
-                                            <property name="margin_bottom">6</property>
+                                            <property name="margin_top">12</property>
+                                            <property name="margin_bottom">12</property>
                                             <child internal-child="accessible">
                                               <object class="AtkObject" id="double_click_scale-atkobject">
                                                 <property name="AtkObject::accessible-description" translatable="yes">Double-Click Delay</property>