diff --git a/app/src/main/res/color-v23/selector_switch_thumb.xml b/app/src/main/res/color-v23/selector_switch_thumb.xml
new file mode 100644
index 000000000..ef1a3cc36
--- /dev/null
+++ b/app/src/main/res/color-v23/selector_switch_thumb.xml
@@ -0,0 +1,7 @@
+<?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" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorPrimaryContainer" android:state_checked="true" android:state_enabled="false" />
+	<item android:color="?colorSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color-v23/selector_switch_track.xml b/app/src/main/res/color-v23/selector_switch_track.xml
new file mode 100644
index 000000000..3779a794a
--- /dev/null
+++ b/app/src/main/res/color-v23/selector_switch_track.xml
@@ -0,0 +1,7 @@
+<?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" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorPrimary" android:state_checked="true" android:state_enabled="false" />
+	<item android:color="?colorOnSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorOnSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/selector_switch_thumb.xml b/app/src/main/res/color/selector_switch_thumb.xml
index ef1a3cc36..de8892285 100644
--- a/app/src/main/res/color/selector_switch_thumb.xml
+++ b/app/src/main/res/color/selector_switch_thumb.xml
@@ -1,7 +1,7 @@
 <?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" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorPrimaryContainer" android:state_checked="true" android:state_enabled="false" />
-	<item android:color="?colorSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
+	<item android:color="@color/kotatsu_primaryContainer" android:state_checked="true" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="@color/kotatsu_primaryContainer" android:state_checked="true" android:state_enabled="false" />
+	<item android:color="@color/kotatsu_surfaceVariant" android:state_checked="false" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="@color/kotatsu_surfaceVariant" android:state_checked="false" android:state_enabled="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
index 3779a794a..7b6c7c468 100644
--- a/app/src/main/res/color/selector_switch_track.xml
+++ b/app/src/main/res/color/selector_switch_track.xml
@@ -1,7 +1,7 @@
 <?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" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorPrimary" android:state_checked="true" android:state_enabled="false" />
-	<item android:color="?colorOnSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
-	<item android:alpha="@dimen/material_emphasis_disabled" android:color="?colorOnSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
+	<item android:color="@color/blue_primary" android:state_checked="true" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="@color/blue_primary" android:state_checked="true" android:state_enabled="false" />
+	<item android:color="@color/kotatsu_onSurfaceVariant" android:state_checked="false" android:state_enabled="true" />
+	<item android:alpha="@dimen/material_emphasis_disabled" android:color="@color/kotatsu_onSurfaceVariant" android:state_checked="false" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/app/src/main/res/drawable/ic_expand_less.xml
index 466a91a2e..86c53a93b 100644
--- a/app/src/main/res/drawable/ic_expand_less.xml
+++ b/app/src/main/res/drawable/ic_expand_less.xml
@@ -1,7 +1,11 @@
-<rotate
+<vector
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:drawable="@drawable/abc_ic_arrow_drop_right_black_24dp"
-	android:fromDegrees="-90"
-	android:pivotX="50%"
-	android:pivotY="50%"
-	android:toDegrees="-90" />
\ No newline at end of file
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M7,14l5,-5 5,5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/app/src/main/res/drawable/ic_expand_more.xml
index f7cae8b82..63e31a16f 100644
--- a/app/src/main/res/drawable/ic_expand_more.xml
+++ b/app/src/main/res/drawable/ic_expand_more.xml
@@ -1,7 +1,11 @@
-<rotate
+<vector
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:drawable="@drawable/abc_ic_arrow_drop_right_black_24dp"
-	android:fromDegrees="90"
-	android:pivotX="50%"
-	android:pivotY="50%"
-	android:toDegrees="90" />
\ No newline at end of file
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="@android:color/white"
+		android:pathData="M7,10l5,5 5,-5z" />
+</vector>
diff --git a/app/src/main/res/drawable/switch_thumb.xml b/app/src/main/res/drawable/switch_thumb.xml
index 548ff3bd8..12222e7f5 100644
--- a/app/src/main/res/drawable/switch_thumb.xml
+++ b/app/src/main/res/drawable/switch_thumb.xml
@@ -7,7 +7,7 @@
 		android:right="4dp"
 		android:top="4dp">
 		<shape android:shape="oval">
-			<solid android:color="#000000" />
+			<solid android:color="@color/selector_switch_thumb" />
 			<size
 				android:width="20dp"
 				android:height="20dp" />
diff --git a/app/src/main/res/drawable/switch_track.xml b/app/src/main/res/drawable/switch_track.xml
index ff149c727..005647294 100644
--- a/app/src/main/res/drawable/switch_track.xml
+++ b/app/src/main/res/drawable/switch_track.xml
@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android">
 	<item>
 		<shape android:shape="rectangle">
-			<solid android:color="#000000" />
+			<solid android:color="@color/selector_switch_track" />
 			<corners android:radius="56dp" />
 			<size
 				android:width="64dp"
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
new file mode 100644
index 000000000..f7eb9b21e
--- /dev/null
+++ b/app/src/main/res/values-v23/styles.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<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>
+</resources>
\ 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 e2f663c0e..8951634e9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -88,9 +88,8 @@
 
 	<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="useMaterialThemeColors">false</item>
 		<item name="materialThemeOverlay">@style/ThemeOverlay.Kotatsu.Switch</item>
 	</style>