diff --git a/SettingsFineTune.ui b/SettingsFineTune.ui
new file mode 100644
index 0000000..1b7ed5e
--- /dev/null
+++ b/SettingsFineTune.ui
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+
+  <object class="GtkAdjustment" id="tray_size_adjustment">
+    <property name="lower">0.33</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.1</property>
+  </object>
+
+  <object class="GtkAdjustment" id="leftbox_size_adjustment">
+    <property name="lower">0.33</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.1</property>
+  </object>
+
+  <object class="GtkAdjustment" id="tray_padding_adjustment">
+    <property name="lower">0.33</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.1</property>
+  </object>
+
+  <object class="GtkAdjustment" id="statusicon_padding_adjustment">
+    <property name="lower">0.33</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.1</property>
+  </object>
+
+  <object class="GtkAdjustment" id="leftbox_padding_adjustment">
+    <property name="lower">0.33</property>
+    <property name="upper">1</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.1</property>
+  </object>
+
+  <object class="AdwPreferencesPage" id="finetune">
+    <property name="title">Fine-Tune</property>
+    <property name="icon_name">document-properties</property>
+
+      <!-- group font -->
+      <child>
+        <object class="AdwPreferencesGroup" id="finetune_group_font">
+          <property name="title" translatable="yes">Font size</property>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Tray Font Size</property>
+              <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>
+                  <property name="round_digits">0</property>
+                  <property name="digits">0</property>
+                  <property name="value_pos">right</property>
+                  <property name="draw_value">True</property>
+                  <signal name="value-changed" handler="tray_size_scale_value_changed_cb" swapped="no"/>
+                </object>
+              </child>
+            </object>
+          </child>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">LeftBox Font Size</property>
+              <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>
+                  <property name="round_digits">0</property>
+                  <property name="digits">0</property>
+                  <property name="value_pos">right</property>
+                  <property name="draw_value">True</property>
+                  <signal name="value-changed" handler="leftbox_size_scale_value_changed_cb" swapped="no"/>
+                </object>
+              </child>
+            </object>
+          </child>
+
+        </object>
+      </child>
+
+      <!-- group panel -->
+      <child>
+        <object class="AdwPreferencesGroup" id="finetune_group_padding">
+          <property name="title" translatable="yes">Padding</property>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Tray Item Padding</property>
+              <property name="subtitle" translatable="yes">(-1 = theme default)</property>
+              <child>
+                <object class="GtkScale" id="tray_padding_scale">
+                  <property name="valign">baseline</property>
+                  <property name="hexpand">True</property>
+                  <property name="adjustment">tray_padding_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>
+                  <signal name="value-changed" handler="tray_padding_scale_value_changed_cb" swapped="no"/>
+                </object>
+              </child>
+            </object>
+          </child>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Status Icon Padding</property>
+              <property name="subtitle" translatable="yes">(-1 = theme default)</property>
+              <child>
+                <object class="GtkScale" id="statusicon_padding_scale">
+                  <property name="valign">baseline</property>
+                  <property name="hexpand">True</property>
+                  <property name="adjustment">statusicon_padding_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>
+                  <signal name="value-changed" handler="statusicon_padding_scale_value_changed_cb" swapped="no"/>
+                </object>
+              </child>
+            </object>
+          </child>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">LeftBox Padding</property>
+              <property name="subtitle" translatable="yes">(-1 = theme default)</property>
+              <child>
+                <object class="GtkScale" id="leftbox_padding_scale">
+                  <property name="valign">baseline</property>
+                  <property name="hexpand">True</property>
+                  <property name="adjustment">leftbox_padding_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>
+                  <signal name="value-changed" handler="leftbox_padding_scale_value_changed_cb" swapped="no"/>
+                </object>
+              </child>
+            </object>
+          </child>
+
+        </object>
+      </child>
+
+      <!-- group animate -->
+      <child>
+        <object class="AdwPreferencesGroup" id="finetune_group_animate">
+          <property name="title" translatable="yes">Animate</property>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Animate switching applications</property>
+              <child>
+                <object class="GtkSwitch" id="animate_app_switch_switch">
+                  <property name="valign">center</property>
+                </object>
+              </child>
+            </object>
+          </child>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Animate launching new windows</property>
+              <child>
+                <object class="GtkSwitch" id="animate_window_launch_switch">
+                  <property name="valign">center</property>
+                </object>
+              </child>
+            </object>
+          </child>
+
+        </object>
+      </child>
+
+      <!-- group gnome -->
+      <child>
+        <object class="AdwPreferencesGroup" id="finetune_group_gnome">
+          <property name="title" translatable="yes">Gnome functionality</property>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Keep original gnome-shell dash</property>
+              <property name="subtitle" translatable="yes">(overview)</property>
+              <child>
+                <object class="GtkSwitch" id="stockgs_dash_switch">
+                  <property name="valign">center</property>
+                </object>
+              </child>
+            </object>
+          </child>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Keep original gnome-shell top panel</property>
+              <child>
+                <object class="GtkSwitch" id="stockgs_top_panel_switch">
+                  <property name="valign">center</property>
+                </object>
+              </child>
+            </object>
+          </child>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Activate panel menu buttons on click only</property>
+              <property name="subtitle" translatable="yes">(e.g. date menu)</property>
+              <child>
+                <object class="GtkSwitch" id="stockgs_panelbtn_switch">
+                  <property name="valign">center</property>
+                </object>
+              </child>
+            </object>
+          </child>
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">Force Activities hot corner on primary monitor</property>
+              <child>
+                <object class="GtkSwitch" id="stockgs_hotcorner_switch">
+                  <property name="valign">center</property>
+                </object>
+              </child>
+            </object>
+          </child>
+
+        </object>
+      </child>
+
+      <!-- group panel -->
+      <child>
+        <object class="AdwPreferencesGroup" id="finetune_group_">
+
+          <child>
+            <object class="AdwActionRow">
+              <property name="title" translatable="yes">App icon secondary menu</property>
+              <property name="subtitle" translatable="yes">(right-click menu)</property>
+              <child>
+                <object class="GtkButton" id="secondarymenu_options_button">
+                  <property name="receives_default">True</property>
+                  <property name="valign">center</property>
+                  <child>
+                    <object class="GtkImage" id="secondarymenu_options_button_image">
+                      <property name="can_focus">False</property>
+                      <property name="icon_name">emblem-system-symbolic</property>
+                    </object>
+                  </child>
+                  <style>
+                    <class name="circular"/>
+                  </style>
+                </object>
+              </child>
+            </object>
+          </child>
+
+        </object>
+      </child>
+
+  </object>
+</interface>
\ No newline at end of file
diff --git a/prefs.js b/prefs.js
index 8e5b5ab..13ff119 100644
--- a/prefs.js
+++ b/prefs.js
@@ -2466,9 +2466,8 @@ function fillPreferencesWindow(window) {
     builder.set_scope(new BuilderScope());
     builder.set_translation_domain(Me.metadata['gettext-domain']);
 
-    let pagePosition = new Adw.PreferencesPage();
-    pagePosition.set_title("Position");
-    pagePosition.set_icon_name("document-properties");
+    builder.add_from_file(Me.path + '/SettingsPosition.ui');
+    let pagePosition = builder.get_object('position');
     window.add(pagePosition);
 
     builder.add_from_file(Me.path + '/SettingsStyle.ui');
@@ -2483,9 +2482,8 @@ function fillPreferencesWindow(window) {
     let pageAction = builder.get_object('action');
     window.add(pageAction);
 
-    let pageFineTune = new Adw.PreferencesPage();
-    pageFineTune.set_title("Fine-Tune");
-    pageFineTune.set_icon_name("document-properties");
+    builder.add_from_file(Me.path + '/SettingsFineTune.ui');
+    let pageFineTune = builder.get_object('finetune');
     window.add(pageFineTune);
 
     builder.add_from_file(Me.path + '/SettingsAbout.ui');