diff --git a/unite@hardpixel.eu/settings.ui b/unite@hardpixel.eu/settings.ui
index 32e61a0..377c770 100644
--- a/unite@hardpixel.eu/settings.ui
+++ b/unite@hardpixel.eu/settings.ui
@@ -20,7 +20,7 @@
         <property name="orientation">vertical</property>
         <property name="spacing">15</property>
         <child>
-          <object class="GtkBox" id="extend_left_box_section">
+          <object class="GtkBox" id="use_system_fonts_section">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">50</property>
@@ -29,7 +29,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">Extend top bar left box</property>
+                <property name="label" translatable="yes">Apply system fonts to shell theme</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -38,7 +38,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSwitch" id="extend_left_box">
+              <object class="GtkSwitch" id="use_system_fonts">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="valign">center</property>
@@ -59,7 +59,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="use_system_fonts_section">
+          <object class="GtkBox" id="extend_left_box_section">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">50</property>
@@ -68,7 +68,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">Apply system fonts to shell theme</property>
+                <property name="label" translatable="yes">Extend top bar left box</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -77,7 +77,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSwitch" id="use_system_fonts">
+              <object class="GtkSwitch" id="extend_left_box">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="valign">center</property>
@@ -98,7 +98,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="show_legacy_tray_section">
+          <object class="GtkBox" id="autofocus_windows_section">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">50</property>
@@ -107,7 +107,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">Show system tray in top bar</property>
+                <property name="label" translatable="yes">Auto focus new windows</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -116,7 +116,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSwitch" id="show_legacy_tray">
+              <object class="GtkSwitch" id="autofocus_windows">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="valign">center</property>
@@ -137,7 +137,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="greyscale_tray_icons_section">
+          <object class="GtkBox" id="show_legacy_tray_section">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">50</property>
@@ -146,7 +146,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">Convert tray icons to greyscale</property>
+                <property name="label" translatable="yes">Show system tray in top bar</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -155,10 +155,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSwitch" id="greyscale_tray_icons">
+              <object class="GtkSwitch" id="show_legacy_tray">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="valign">center</property>
+                <property name="active">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -175,7 +176,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="autofocus_windows_section">
+          <object class="GtkBox" id="greyscale_tray_icons_section">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">50</property>
@@ -184,7 +185,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="valign">center</property>
-                <property name="label" translatable="yes">Auto focus new windows</property>
+                <property name="label" translatable="yes">Convert tray icons to greyscale</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -193,11 +194,10 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSwitch" id="autofocus_windows">
+              <object class="GtkSwitch" id="greyscale_tray_icons">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="valign">center</property>
-                <property name="active">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>