diff --git a/app/src/main/res/color/selector_switch_thumb.xml b/app/src/main/res/color/selector_switch_thumb.xml
new file mode 100644
index 000000000..83d334382
--- /dev/null
+++ b/app/src/main/res/color/selector_switch_thumb.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="?colorPrimaryContainer" android:state_checked="true" />
+	<item android:color="?colorSurfaceVariant" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_switch_track.xml b/app/src/main/res/color/selector_switch_track.xml
new file mode 100644
index 000000000..504337dcb
--- /dev/null
+++ b/app/src/main/res/color/selector_switch_track.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:color="?colorPrimary" android:state_checked="true" />
+	<item android:color="?colorOnSurfaceVariant" android:state_checked="false" />
+</selector>
\ No newline at end of file
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 000000000..d66a38608
--- /dev/null
+++ b/app/src/main/res/drawable/switch_thumb.xml
@@ -0,0 +1,15 @@
+<?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 android:shape="oval">
+			<solid android:color="#000000" />
+			<size
+				android:width="20dp"
+				android:height="20dp" />
+		</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 000000000..77d96d562
--- /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="#000000" />
+			<corners android:radius="56dp" />
+			<size
+				android:width="64dp"
+				android:height="28dp" />
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 99825b464..2b088ee38 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -61,6 +61,10 @@
 	</style>
 
 	<style name="Widget.Kotatsu.Switch" parent="Widget.Material3.CompoundButton.Switch">
+		<item name="android:thumb">@drawable/switch_thumb</item>
+		<item name="thumbTint">@color/selector_switch_thumb</item>
+		<item name="track">@drawable/switch_track</item>
+		<item name="trackTint">@color/selector_switch_track</item>
 		<item name="materialThemeOverlay">@style/ThemeOverlay.Kotatsu.Switch</item>
 	</style>
 
diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml
index 985e8bbf5..7be3e5c8a 100644
--- a/app/src/main/res/xml/pref_about.xml
+++ b/app/src/main/res/xml/pref_about.xml
@@ -15,7 +15,7 @@
 			app:persistent="false"
 			app:summary="@string/check_for_updates" />
 
-		<SwitchPreference
+		<SwitchPreferenceCompat
 			app:defaultValue="true"
 			app:iconSpaceReserved="false"
 			app:isPreferenceVisible="false"
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index db8f99335..dd72fe7c1 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -12,14 +12,14 @@
 		app:iconSpaceReserved="false"
 		app:useSimpleSummaryProvider="true" />
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="dynamic_theme"
 		android:summary="@string/dynamic_theme_summary"
 		android:title="@string/dynamic_theme"
 		app:iconSpaceReserved="false" />
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="amoled_theme"
 		android:summary="@string/black_dark_theme_summary"
diff --git a/app/src/main/res/xml/pref_tracker.xml b/app/src/main/res/xml/pref_tracker.xml
index 9b971ed7c..788403aef 100644
--- a/app/src/main/res/xml/pref_tracker.xml
+++ b/app/src/main/res/xml/pref_tracker.xml
@@ -11,7 +11,7 @@
 		android:title="@string/track_sources"
 		app:iconSpaceReserved="false" />
 
-	<SwitchPreference
+	<SwitchPreferenceCompat
 		android:defaultValue="true"
 		android:key="tracker_notifications"
 		android:summary="@string/show_notification_new_chapters"