diff --git a/res/layout/alarm_time_collapsed.xml b/res/layout/alarm_time_collapsed.xml
index e4ee558c0d58c1f9bf5fb5f568e05decaa48855d..f806445582a33a4016ec967c73f4eaa41088e03e 100644
--- a/res/layout/alarm_time_collapsed.xml
+++ b/res/layout/alarm_time_collapsed.xml
@@ -37,22 +37,17 @@
         app:layout_row="0" />
 
     <!--android:theme="@style/ThemeOverlay.Control.Accent"-->
-    <androidx.appcompat.widget.SwitchCompat
+    <Switch
         android:id="@+id/onoff"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
         android:minHeight="@dimen/touch_target_min_size"
         android:minWidth="@dimen/touch_target_min_size"
-
         app:layout_column="3"
         app:layout_columnSpan="2"
         app:layout_gravity="center_vertical"
-        app:layout_row="0"
-
-        android:thumb="@drawable/thumb_selector"
-        app:track="@drawable/track_selector"
-        />
+        app:layout_row="0" />
 
     <com.android.deskclock.widget.EllipsizeLayout
         android:layout_width="0dp"
diff --git a/res/layout/alarm_time_expanded.xml b/res/layout/alarm_time_expanded.xml
index 7a699bd009a6026649720d2fde56acb59763a813..69b33e04526a8f1a5485dbb8a6f96e0e6c3e3f89 100644
--- a/res/layout/alarm_time_expanded.xml
+++ b/res/layout/alarm_time_expanded.xml
@@ -37,24 +37,17 @@
         app:layout_row="0" />
 
     <!-- android:theme="@style/ThemeOverlay.Control.Accent"-->
-    <androidx.appcompat.widget.SwitchCompat
+    <Switch
         android:id="@+id/onoff"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
         android:minHeight="@dimen/touch_target_min_size"
         android:minWidth="@dimen/touch_target_min_size"
-
         app:layout_column="6"
         app:layout_columnSpan="2"
         app:layout_gravity="center_vertical"
-        app:layout_row="0"
-
-
-        android:thumb="@drawable/thumb_selector"
-        app:track="@drawable/track_selector"
-        />
-
+        app:layout_row="0" />
 
     <CheckBox
         android:id="@+id/repeat_onoff"
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 6e65a3e259a258a294808eaeb21f14dff1babbd2..026b6e74c7885ba6af4a8f15cac27c05a51c23ff 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -25,11 +25,11 @@
             android:key="clock_style"
             android:title="@string/clock_style" />
 
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:key="display_clock_seconds"
             android:title="@string/display_clock_seconds_pref" />
 
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:defaultValue="true"
             android:key="automatic_home_clock"
             android:summary="@string/automatic_home_clock_summary"
@@ -126,7 +126,7 @@
             android:title="@string/crescendo_duration_title" />
 
 
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:defaultValue="false"
             android:key="timer_vibrate"
             android:title="@string/timer_vibrate_title" />