diff --git a/ui/BoxAdvancedOptions.ui b/ui/BoxAdvancedOptions.ui
index 0cfb87d..d80a52e 100644
--- a/ui/BoxAdvancedOptions.ui
+++ b/ui/BoxAdvancedOptions.ui
@@ -5,17 +5,17 @@
   <object class="GtkBox" id="box_advanced_options">
     <property name="orientation">vertical</property>
     <property name="width-request">600</property>
-    <property name="spacing">8</property>
+    <property name="spacing">12</property>
 
     <child>
       <object class="AdwPreferencesGroup">
-        <property name="margin-top">8</property>
-        <property name="margin-bottom">8</property>
-        <property name="margin-start">8</property>
-        <property name="margin-end">8</property>
+        <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" id="show_showdesktop_width_label">
+          <object class="AdwActionRow">
             <property name="title" translatable="yes">Nothing yet!</property>
             <property name="subtitle" translatable="yes">For real...</property>
           </object>
diff --git a/ui/BoxAnimateAppIconHoverOptions.ui b/ui/BoxAnimateAppIconHoverOptions.ui
index 28f7ad1..2babe5a 100644
--- a/ui/BoxAnimateAppIconHoverOptions.ui
+++ b/ui/BoxAnimateAppIconHoverOptions.ui
@@ -46,37 +46,21 @@
   </object>
 
   <object class="GtkBox" id="animate_appicon_hover_options">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-    <property name="hexpand">1</property>
-    <property name="vexpand">1</property>
+    <property name="width-request">600</property>
+    <property name="spacing">12</property>
+
     <child>
-      <object class="GtkListBoxRow" id="animate_appicon_hover_options_type_listboxrow">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="activatable">False</property>
+      <object class="AdwPreferencesGroup">
+        <property name="margin-top">12</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+
         <child>
-          <object class="GtkBox" id="animate_appicon_hover_options_type_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_start">12</property>
-            <property name="margin_end">12</property>
-            <property name="margin_top">12</property>
-            <property name="margin_bottom">12</property>
-            <property name="spacing">32</property>
-            <child>
-              <object class="GtkLabel" id="animate_appicon_hover_options_type_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="label" translatable="yes">Animation type</property>
-                <property name="xalign">0</property>
-              </object>
-            </child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Animation type</property>
             <child>
               <object class="GtkComboBoxText" id="animate_appicon_hover_options_type_combo">
-                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
                 <items>
@@ -88,72 +72,38 @@
             </child>
           </object>
         </child>
+
       </object>
     </child>
+
     <child>
-      <object class="GtkListBoxRow" id="animate_appicon_hover_options_params_listboxrow">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="activatable">False</property>
+      <object class="AdwPreferencesGroup">
+        <property name="margin-bottom">12</property>
+        <property name="margin-start">12</property>
+        <property name="margin-end">12</property>
+
         <child>
-          <object class="GtkGrid" id="animate_appicon_hover_options_params_grid">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_start">12</property>
-            <property name="margin_end">12</property>
-            <property name="margin_top">12</property>
-            <property name="margin_bottom">12</property>
-            <property name="row_spacing">24</property>
-            <property name="column_spacing">32</property>
-            <child>
-              <object class="GtkLabel" id="animate_appicon_hover_options_duration_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_end">12</property>
-                <property name="label" translatable="yes">Duration</property>
-                <property name="use_markup">True</property>
-                <property name="xalign">0</property>
-                <property name="valign">end</property>
-                <layout>
-                  <property name="row">0</property>
-                  <property name="column">0</property>
-                </layout>
-              </object>
-            </child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Duration</property>
             <child>
               <object class="GtkScale" id="animate_appicon_hover_options_duration_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="valign">end</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="adjustment">animate_appicon_hover_options_duration_adjustment</property>
                 <property name="round_digits">0</property>
                 <property name="digits">0</property>
                 <property name="value_pos">right</property>
                 <property name="draw_value">True</property>
-                <layout>
-                  <property name="row">0</property>
-                  <property name="column">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="animate_appicon_hover_options_extent_rotation">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Rotation</property>
-                <property name="xalign">0</property>
-                <property name="valign">end</property>
-                <layout>
-                  <property name="row">1</property>
-                  <property name="column">0</property>
-                </layout>
               </object>
             </child>
+          </object>
+        </child>
+
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Rotation</property>
             <child>
               <object class="GtkScale" id="animate_appicon_hover_options_rotation_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="valign">end</property>
                 <property name="hexpand">True</property>
                 <property name="adjustment">animate_appicon_hover_options_rotation_adjustment</property>
@@ -161,89 +111,50 @@
                 <property name="digits">0</property>
                 <property name="value_pos">right</property>
                 <property name="draw_value">True</property>
-                <layout>
-                  <property name="row">1</property>
-                  <property name="column">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="animate_appicon_hover_options_travel_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Travel</property>
-                <property name="xalign">0</property>
-                <property name="valign">end</property>
-                <layout>
-                  <property name="row">2</property>
-                  <property name="column">0</property>
-                </layout>
               </object>
             </child>
+          </object>
+        </child>
+
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Travel</property>
             <child>
               <object class="GtkScale" id="animate_appicon_hover_options_travel_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="valign">end</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="adjustment">animate_appicon_hover_options_travel_adjustment</property>
                 <property name="round_digits">0</property>
                 <property name="digits">0</property>
                 <property name="value_pos">right</property>
                 <property name="draw_value">True</property>
-                <layout>
-                  <property name="row">2</property>
-                  <property name="column">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="animate_appicon_hover_options_zoom_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Zoom</property>
-                <property name="xalign">0</property>
-                <property name="valign">end</property>
-                <layout>
-                  <property name="row">3</property>
-                  <property name="column">0</property>
-                </layout>
               </object>
             </child>
+          </object>
+        </child>
+
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Zoom</property>
             <child>
               <object class="GtkScale" id="animate_appicon_hover_options_zoom_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="valign">end</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="adjustment">animate_appicon_hover_options_zoom_adjustment</property>
                 <property name="round_digits">0</property>
                 <property name="digits">0</property>
                 <property name="value_pos">right</property>
                 <property name="draw_value">True</property>
-                <layout>
-                  <property name="row">3</property>
-                  <property name="column">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="animate_appicon_hover_options_convexity_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Convexity</property>
-                <property name="xalign">0</property>
-                <property name="valign">end</property>
-                <layout>
-                  <property name="row">4</property>
-                  <property name="column">0</property>
-                </layout>
               </object>
             </child>
+          </object>
+        </child>
+
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Convexity</property>
             <child>
               <object class="GtkScale" id="animate_appicon_hover_options_convexity_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
                 <property name="valign">end</property>
                 <property name="hexpand">True</property>
                 <property name="adjustment">animate_appicon_hover_options_convexity_adjustment</property>
@@ -251,46 +162,31 @@
                 <property name="digits">1</property>
                 <property name="value_pos">right</property>
                 <property name="draw_value">True</property>
-                <layout>
-                  <property name="row">4</property>
-                  <property name="column">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="animate_appicon_hover_options_extent_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Extent</property>
-                <property name="xalign">0</property>
-                <property name="valign">end</property>
-                <layout>
-                  <property name="row">5</property>
-                  <property name="column">0</property>
-                </layout>
               </object>
             </child>
+          </object>
+        </child>
+
+        <child>
+          <object class="AdwActionRow">
+            <property name="title" translatable="yes">Extent</property>
             <child>
               <object class="GtkScale" id="animate_appicon_hover_options_extent_scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="valign">end</property>
+                <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="adjustment">animate_appicon_hover_options_extent_adjustment</property>
                 <property name="round_digits">0</property>
                 <property name="digits">0</property>
                 <property name="value_pos">right</property>
                 <property name="draw_value">True</property>
-                <layout>
-                  <property name="row">5</property>
-                  <property name="column">1</property>
-                </layout>
               </object>
             </child>
           </object>
         </child>
+
       </object>
     </child>
+
   </object>
 
 </interface>
\ No newline at end of file
diff --git a/ui/SettingsFineTune.ui b/ui/SettingsFineTune.ui
index 61fd076..34eb1a5 100644
--- a/ui/SettingsFineTune.ui
+++ b/ui/SettingsFineTune.ui
@@ -52,8 +52,6 @@
               <property name="subtitle" translatable="yes">(0 = theme default)</property>
               <child>
                 <object class="GtkScale" id="tray_size_scale">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
                   <property name="valign">baseline</property>
                   <property name="hexpand">True</property>
                   <property name="adjustment">tray_size_adjustment</property>
@@ -73,8 +71,6 @@
               <property name="subtitle" translatable="yes">(0 = theme default)</property>
               <child>
                 <object class="GtkScale" id="leftbox_size_scale">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
                   <property name="valign">baseline</property>
                   <property name="hexpand">True</property>
                   <property name="adjustment">leftbox_size_adjustment</property>