diff --git a/res/drawable/thumb_selector.xml b/res/drawable/thumb_selector.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d95aaa624dba6d87d43e6f03d5077879c252857
--- /dev/null
+++ b/res/drawable/thumb_selector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="false">
+        <shape android:shape="oval">
+            <solid android:color="@android:color/white" />
+            <size android:width="20dp" android:height="20dp" />
+            <stroke android:width="2dp" android:color="#0000ffff" />
+        </shape> <!-- shape circle -->
+    </item>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/track_selector.xml b/res/drawable/track_selector.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4b72f2f7b3ce85ca9c477f6d73baa0825cec5233
--- /dev/null
+++ b/res/drawable/track_selector.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <size android:width="36dp" android:height="20dp"/>
+            <solid android:width="1dp" android:color="@color/color_default_blue1"/>
+            <corners android:radius="50dp"/>
+        </shape>
+    </item>
+
+    <item android:state_checked="false">
+        <shape android:shape="rectangle">
+            <size android:width="36dp" android:height="20dp"/>
+            <solid android:width="1dp" android:color="@android:color/darker_gray"/>
+            <corners android:radius="50dp"/>
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/res/layout/alarm_time_collapsed.xml b/res/layout/alarm_time_collapsed.xml
index 6c0e3c70fbf13d5d503e5bab137b6f82a381208c..3ffc2a083934ef79857430b078b9c289fbb6ea35 100644
--- a/res/layout/alarm_time_collapsed.xml
+++ b/res/layout/alarm_time_collapsed.xml
@@ -36,6 +36,7 @@
         app:layout_gravity="center_vertical"
         app:layout_row="0" />
 
+    <!--android:theme="@style/ThemeOverlay.Control.Accent"-->
     <android.support.v7.widget.SwitchCompat
         android:id="@+id/onoff"
         android:layout_width="wrap_content"
@@ -43,11 +44,15 @@
         android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
         android:minHeight="@dimen/touch_target_min_size"
         android:minWidth="@dimen/touch_target_min_size"
-        android:theme="@style/ThemeOverlay.Control.Accent"
+
         app:layout_column="3"
         app:layout_columnSpan="2"
         app:layout_gravity="center_vertical"
-        app:layout_row="0" />
+        app:layout_row="0"
+
+        android:thumb="@drawable/thumb_selector"
+        app:track="@drawable/track_selector"
+        />
 
     <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 8c3513ce140bd9f069af758dc2bca418d4d8ac5e..24c4c79fcda08554816059de215741e30c3f8d75 100644
--- a/res/layout/alarm_time_expanded.xml
+++ b/res/layout/alarm_time_expanded.xml
@@ -35,7 +35,7 @@
         app:layout_columnSpan="4"
         app:layout_gravity="center_vertical"
         app:layout_row="0" />
-
+   <!-- android:theme="@style/ThemeOverlay.Control.Accent"-->
     <android.support.v7.widget.SwitchCompat
         android:id="@+id/onoff"
         android:layout_width="wrap_content"
@@ -43,11 +43,16 @@
         android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
         android:minHeight="@dimen/touch_target_min_size"
         android:minWidth="@dimen/touch_target_min_size"
-        android:theme="@style/ThemeOverlay.Control.Accent"
+
         app:layout_column="6"
         app:layout_columnSpan="2"
         app:layout_gravity="center_vertical"
-        app:layout_row="0" />
+        app:layout_row="0"
+
+
+        android:thumb="@drawable/thumb_selector"
+        app:track="@drawable/track_selector"
+        />
 
     <CheckBox
         android:id="@+id/repeat_onoff"