diff --git a/res/layout/alarm_time_collapsed.xml b/res/layout/alarm_time_collapsed.xml
index 3ffc2a083934ef79857430b078b9c289fbb6ea35..2b0752dc320436e22bc312c864052fa39c8c48ed 100644
--- a/res/layout/alarm_time_collapsed.xml
+++ b/res/layout/alarm_time_collapsed.xml
@@ -37,21 +37,17 @@
         app:layout_row="0" />
 
     <!--android:theme="@style/ThemeOverlay.Control.Accent"-->
-    <android.support.v7.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"
         />
 
     <com.android.deskclock.widget.EllipsizeLayout
diff --git a/res/layout/alarm_time_expanded.xml b/res/layout/alarm_time_expanded.xml
index 24c4c79fcda08554816059de215741e30c3f8d75..e096dc0b0f5827eb79a2e984caeb46ec8cd9d60f 100644
--- a/res/layout/alarm_time_expanded.xml
+++ b/res/layout/alarm_time_expanded.xml
@@ -36,22 +36,17 @@
         app:layout_gravity="center_vertical"
         app:layout_row="0" />
    <!-- android:theme="@style/ThemeOverlay.Control.Accent"-->
-    <android.support.v7.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"
         />
 
     <CheckBox
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index e4e6f32b0d36b06e91912225dda3ff5061f6adff..c4bc9da0f9fa06f8bf3539661b01bff6db282aa1 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"
@@ -125,7 +125,7 @@
             android:title="@string/crescendo_duration_title" />
 
 
-        <SwitchPreferenceCompat
+        <SwitchPreference
             android:defaultValue="false"
             android:key="timer_vibrate"
             android:title="@string/timer_vibrate_title" />