diff --git a/src/BudgiePixelSaverApplet.vala b/src/BudgiePixelSaverApplet.vala
index bd59064..ebcdd94 100644
--- a/src/BudgiePixelSaverApplet.vala
+++ b/src/BudgiePixelSaverApplet.vala
@@ -191,10 +191,10 @@ public class AppletSettings : Gtk.Grid
     private Gtk.ComboBox? combobox_visibility;
 
     [GtkChild]
-    private Gtk.CheckButton? checkbutton_csd;
+    private Gtk.Switch? switch_csd;
 
     [GtkChild]
-    private Gtk.CheckButton? checkbutton_maximized;
+    private Gtk.Switch? switch_unmaximized;
 
     public AppletSettings(Settings? settings)
     {
@@ -202,8 +202,8 @@ public class AppletSettings : Gtk.Grid
 
         this.settings.bind("size", spinbutton_length, "value", SettingsBindFlags.DEFAULT);
         this.settings.bind("visibility", combobox_visibility, "active", SettingsBindFlags.DEFAULT);
-        this.settings.bind("hide-for-csd", checkbutton_csd, "active", SettingsBindFlags.DEFAULT);
-        this.settings.bind("hide-for-unmaximized", checkbutton_maximized, "active", SettingsBindFlags.DEFAULT);
+        this.settings.bind("hide-for-csd", switch_csd, "active", SettingsBindFlags.DEFAULT);
+        this.settings.bind("hide-for-unmaximized", switch_unmaximized, "active", SettingsBindFlags.DEFAULT);
     }
 }
 
diff --git a/src/settings.ui b/src/settings.ui
index ce32e39..6ebc443 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -95,6 +95,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="halign">end</property>
+        <property name="valign">start</property>
         <property name="adjustment">adjustment1</property>
         <property name="climb_rate">1</property>
       </object>
@@ -108,6 +109,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">end</property>
+        <property name="valign">start</property>
         <property name="model">liststore1</property>
         <property name="active">0</property>
         <property name="id_column">0</property>
@@ -124,35 +126,27 @@
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="checkbutton_csd">
+      <object class="GtkSwitch" id="switch_unmaximized">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
         <property name="halign">end</property>
-        <property name="draw_indicator">True</property>
-        <child>
-          <placeholder/>
-        </child>
+        <property name="valign">start</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">2</property>
+        <property name="top_attach">3</property>
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="checkbutton_maximized">
+      <object class="GtkSwitch" id="switch_csd">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
         <property name="halign">end</property>
-        <property name="draw_indicator">True</property>
-        <child>
-          <placeholder/>
-        </child>
+        <property name="valign">start</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">3</property>
+        <property name="top_attach">2</property>
       </packing>
     </child>
   </template>