diff --git a/ui/BoxAdvancedOptions.ui b/ui/BoxAdvancedOptions.ui
index d80a52e..3007d95 100644
--- a/ui/BoxAdvancedOptions.ui
+++ b/ui/BoxAdvancedOptions.ui
@@ -5,14 +5,14 @@
   <object class="GtkBox" id="box_advanced_options">
     <property name="orientation">vertical</property>
     <property name="width-request">600</property>
-    <property name="spacing">12</property>
+    <property name="spacing">24</property>
+    <property name="margin-top">32</property>
+    <property name="margin-bottom">32</property>
+    <property name="margin-start">32</property>
+    <property name="margin-end">32</property>
 
     <child>
       <object class="AdwPreferencesGroup">
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
 
         <child>
           <object class="AdwActionRow">
diff --git a/ui/BoxAnimateAppIconHoverOptions.ui b/ui/BoxAnimateAppIconHoverOptions.ui
index 26ed984..f59934c 100644
--- a/ui/BoxAnimateAppIconHoverOptions.ui
+++ b/ui/BoxAnimateAppIconHoverOptions.ui
@@ -48,13 +48,14 @@
   <object class="GtkBox" id="animate_appicon_hover_options">
     <property name="orientation">vertical</property>
     <property name="width-request">600</property>
-    <property name="spacing">12</property>
+    <property name="spacing">24</property>
+    <property name="margin-top">32</property>
+    <property name="margin-bottom">32</property>
+    <property name="margin-start">32</property>
+    <property name="margin-end">32</property>
 
     <child>
       <object class="AdwPreferencesGroup">
-        <property name="margin-top">12</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
 
         <child>
           <object class="AdwActionRow">
@@ -78,9 +79,6 @@
 
     <child>
       <object class="AdwPreferencesGroup">
-        <property name="margin-bottom">12</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
 
         <child>
           <object class="AdwActionRow">
diff --git a/ui/BoxDotOptions.ui b/ui/BoxDotOptions.ui
index 88c7cff..6ca19c4 100644
--- a/ui/BoxDotOptions.ui
+++ b/ui/BoxDotOptions.ui
@@ -23,13 +23,14 @@
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
+        <property name="spacing">24</property>
+        <property name="margin-top">32</property>
+        <property name="margin-bottom">32</property>
+        <property name="margin-start">32</property>
+        <property name="margin-end">32</property>
 
         <child>
           <object class="AdwPreferencesGroup">
-            <property name="margin-top">12</property>
-            <property name="margin-start">12</property>
-            <property name="margin-end">12</property>
 
             <child>
               <object class="AdwActionRow">
@@ -47,9 +48,6 @@
 
         <child>
           <object class="AdwPreferencesGroup" id="grid_focus_highlight_options">
-            <property name="margin-top">12</property>
-            <property name="margin-start">12</property>
-            <property name="margin-end">12</property>
 
             <child>
               <object class="AdwActionRow">
@@ -92,9 +90,6 @@
 
         <child>
           <object class="AdwPreferencesGroup">
-            <property name="margin-top">12</property>
-            <property name="margin-start">12</property>
-            <property name="margin-end">12</property>
 
             <child>
               <object class="AdwActionRow">
@@ -125,9 +120,6 @@
 
         <child>
           <object class="AdwPreferencesGroup">
-            <property name="margin-top">12</property>
-            <property name="margin-start">12</property>
-            <property name="margin-end">12</property>
 
             <child>
               <object class="AdwActionRow">
@@ -144,9 +136,6 @@
 
         <child>
           <object class="AdwPreferencesGroup" id="grid_dot_color">
-            <property name="margin-top">12</property>
-            <property name="margin-start">12</property>
-            <property name="margin-end">12</property>
 
             <child>
               <object class="AdwActionRow">
@@ -203,9 +192,6 @@
 
         <child>
           <object class="AdwPreferencesGroup" id="dot_color_unfocused_box">
-            <property name="margin-top">12</property>
-            <property name="margin-start">12</property>
-            <property name="margin-end">12</property>
 
             <child>
               <object class="AdwActionRow">
@@ -224,10 +210,6 @@
         <!-- TODO sensitivity of this group has to be connected to dot_color_override_switch -->
         <child>
           <object class="AdwPreferencesGroup" id="grid_dot_color_unfocused">
-            <property name="margin-top">12</property>
-            <property name="margin-bottom">12</property>
-            <property name="margin-start">12</property>
-            <property name="margin-end">12</property>
 
             <child>
               <object class="AdwActionRow">
diff --git a/ui/BoxDynamicOpacityOptions.ui b/ui/BoxDynamicOpacityOptions.ui
index 50f891b..e524aeb 100644
--- a/ui/BoxDynamicOpacityOptions.ui
+++ b/ui/BoxDynamicOpacityOptions.ui
@@ -23,14 +23,14 @@
   <object class="GtkBox" id="box_dynamic_opacity_options">
     <property name="orientation">vertical</property>
     <property name="width-request">600</property>
-    <property name="spacing">12</property>
+    <property name="spacing">24</property>
+    <property name="margin-top">32</property>
+    <property name="margin-bottom">32</property>
+    <property name="margin-start">32</property>
+    <property name="margin-end">32</property>
 
     <child>
       <object class="AdwPreferencesGroup">
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
 
         <child>
           <object class="AdwActionRow">
diff --git a/ui/BoxShowDesktopOptions.ui b/ui/BoxShowDesktopOptions.ui
index 8319b7e..e598218 100644
--- a/ui/BoxShowDesktopOptions.ui
+++ b/ui/BoxShowDesktopOptions.ui
@@ -24,13 +24,14 @@
   <object class="GtkBox" id="box_show_showdesktop_options">
     <property name="orientation">vertical</property>
     <property name="width-request">600</property>
-    <property name="spacing">8</property>
+    <property name="spacing">24</property>
+    <property name="margin-top">32</property>
+    <property name="margin-bottom">32</property>
+    <property name="margin-start">32</property>
+    <property name="margin-end">32</property>
 
     <child>
       <object class="AdwPreferencesGroup">
-        <property name="margin-top">8</property>
-        <property name="margin-start">8</property>
-        <property name="margin-end">8</property>
 
         <child>
           <object class="AdwActionRow" id="show_showdesktop_width_label">
@@ -70,9 +71,6 @@
 
     <child>
       <object class="AdwPreferencesGroup">
-        <property name="margin-start">8</property>
-        <property name="margin-end">8</property>
-        <property name="margin-bottom">8</property>
 
         <child>
           <object class="AdwActionRow">