diff --git a/app/src/main/res/drawable/switch_thumb.xml b/app/src/main/res/drawable/switch_thumb.xml
new file mode 100644
index 00000000..c5f48c5c
--- /dev/null
+++ b/app/src/main/res/drawable/switch_thumb.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp">
+        <shape>
+            <solid android:color="?android:colorAccent" />
+            <corners android:radius="24dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <size
+                android:width="24dp"
+                android:height="24dp" />
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/switch_track.xml b/app/src/main/res/drawable/switch_track.xml
new file mode 100644
index 00000000..cb59bb7e
--- /dev/null
+++ b/app/src/main/res/drawable/switch_track.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="?android:colorPrimary" />
+            <corners android:radius="56dp" />
+            <size
+                android:width="48dp"
+                android:height="24dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_view_switch.xml b/app/src/main/res/layout/list_item_view_switch.xml
index bf08f605..a536b1fa 100644
--- a/app/src/main/res/layout/list_item_view_switch.xml
+++ b/app/src/main/res/layout/list_item_view_switch.xml
@@ -76,9 +76,11 @@
         android:id="@android:id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@null"
+        app:showText="false"
         android:clickable="false"
         android:focusable="false"
+        app:track="@drawable/switch_track"
+        android:thumb="@drawable/switch_thumb"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/list_item_view_switch_no_title.xml b/app/src/main/res/layout/list_item_view_switch_no_title.xml
index 2eeb6a18..0a021dd2 100644
--- a/app/src/main/res/layout/list_item_view_switch_no_title.xml
+++ b/app/src/main/res/layout/list_item_view_switch_no_title.xml
@@ -64,7 +64,9 @@
         android:id="@android:id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@null"
+        app:showText="false"
+        app:track="@drawable/switch_track"
+        android:thumb="@drawable/switch_thumb"
         android:clickable="false"
         android:focusable="false"
         app:layout_constraintBottom_toBottomOf="parent"