diff --git a/data/ui/Headerbar.ui b/data/ui/Headerbar.ui
index 3dafcb2..f001d52 100644
--- a/data/ui/Headerbar.ui
+++ b/data/ui/Headerbar.ui
@@ -197,13 +197,13 @@
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">6</property>
-            <property name="margin_right">6</property>
+            <property name="margin_left">12</property>
+            <property name="margin_right">12</property>
             <property name="margin_top">10</property>
             <property name="margin_bottom">12</property>
             <property name="spacing">10</property>
             <child>
-              <object class="GtkSwitch">
+              <object class="GtkSwitch" id="sync_scroll_switch">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
               </object>
diff --git a/data/ui/PreviewLayoutSwitcherItem.ui b/data/ui/PreviewLayoutSwitcherItem.ui
index 62a62a6..cddd539 100644
--- a/data/ui/PreviewLayoutSwitcherItem.ui
+++ b/data/ui/PreviewLayoutSwitcherItem.ui
@@ -1,48 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-    <object class="GtkListBoxRow" id="switcherItem">
-
-      <property name="visible">True</property>
-      <property name="can_focus">True</property>
-      <property name="action_name">app.preview_mode</property>
-      <child>
-        <object class="GtkBox">
-          <property name="visible">True</property>
-          <property name="can_focus">False</property>
-          <property name="margin_top">4</property>
-          <property name="margin_bottom">4</property>
-          <property name="margin_left">10</property>
-          <property name="margin_right">10</property>
-          <property name="spacing">10</property>
-          <child>
-            <object class="GtkImage" id="icon">
-              <property name="visible">True</property>
-              <property name="can_focus">False</property>
-              <property name="pixel_size">16</property>
-              <property name="icon_name">preview-layout-full-width-symbolic</property>
-            </object>
-            <packing>
-              <property name="expand">False</property>
-              <property name="fill">True</property>
-              <property name="position">0</property>
-            </packing>
-          </child>
-          <child>
-            <object class="GtkLabel" id="label">
-              <property name="visible">True</property>
-              <property name="can_focus">False</property>
-              <property name="halign">start</property>
-              <property name="margin_right">6</property>
-              <property name="label" translatable="yes">Full-Width</property>
-            </object>
-            <packing>
-              <property name="expand">True</property>
-              <property name="fill">True</property>
-              <property name="position">1</property>
-            </packing>
-          </child>
-        </object>
-      </child>
-    </object>
+  <object class="GtkListBoxRow" id="switcherItem">
+    <property name="visible">True</property>
+    <property name="can_focus">True</property>
+    <property name="action_name">app.preview_mode</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_top">4</property>
+        <property name="margin_bottom">4</property>
+        <property name="spacing">10</property>
+        <child>
+          <object class="GtkImage" id="icon">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">12</property>
+            <property name="pixel_size">16</property>
+            <property name="icon_name">preview-layout-full-width-symbolic</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin_right">12</property>
+            <property name="label" translatable="yes">Full-Width</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>
diff --git a/data/ui/Window.ui b/data/ui/Window.ui
index 21daefa..e62fc92 100644
--- a/data/ui/Window.ui
+++ b/data/ui/Window.ui
@@ -78,7 +78,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="margin_top">6</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
                         <child>