diff --git a/app/src/main/java/org/oxycblt/auxio/settings/pref/M3SwitchPreference.kt b/app/src/main/java/org/oxycblt/auxio/settings/pref/M3SwitchPreference.kt
new file mode 100644
index 000000000..c3017a072
--- /dev/null
+++ b/app/src/main/java/org/oxycblt/auxio/settings/pref/M3SwitchPreference.kt
@@ -0,0 +1,40 @@
+package org.oxycblt.auxio.settings.pref
+
+import android.content.Context
+import android.os.Build
+import android.util.AttributeSet
+import androidx.appcompat.widget.SwitchCompat
+import androidx.preference.PreferenceViewHolder
+import androidx.preference.SwitchPreferenceCompat
+import org.oxycblt.auxio.R
+import org.oxycblt.auxio.util.resolveDrawable
+import org.oxycblt.auxio.util.resolveStateList
+
+class M3SwitchPreference @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = R.attr.switchPreferenceCompatStyle,
+    defStyleRes: Int = 0
+) : SwitchPreferenceCompat(context, attrs, defStyleAttr, defStyleRes) {
+    // Lollipop cannot into ColorStateList, disable this feature on that version
+    private var needToUpdateSwitch = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        super.onBindViewHolder(holder)
+
+        if (needToUpdateSwitch) {
+            val switch = holder.findViewById(androidx.preference.R.id.switchWidget)
+
+            if (switch is SwitchCompat) {
+                switch.apply {
+                    trackDrawable = R.drawable.ui_m3_switch_track.resolveDrawable(context)
+                    trackTintList = R.color.sel_m3_switch_track.resolveStateList(context)
+                    thumbDrawable = R.drawable.ui_m3_switch_thumb.resolveDrawable(context)
+                    thumbTintList = R.color.sel_m3_switch_thumb.resolveStateList(context)
+                }
+
+                needToUpdateSwitch = false
+            }
+        }
+    }
+}
diff --git a/app/src/main/res/color/sel_m3_switch_thumb.xml b/app/src/main/res/color/sel_m3_switch_thumb.xml
new file mode 100644
index 000000000..61c22f9ad
--- /dev/null
+++ b/app/src/main/res/color/sel_m3_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="?attr/colorOnPrimary" android:state_checked="true" />
+    <item android:color="?attr/colorSurfaceVariant" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_m3_switch_track.xml b/app/src/main/res/color/sel_m3_switch_track.xml
new file mode 100644
index 000000000..5d2e6df2f
--- /dev/null
+++ b/app/src/main/res/color/sel_m3_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="?attr/colorPrimary" android:state_checked="true" />
+    <item android:color="?attr/colorOnSurfaceVariant" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ui_m3_switch_thumb.xml b/app/src/main/res/drawable/ui_m3_switch_thumb.xml
new file mode 100644
index 000000000..04e5221cf
--- /dev/null
+++ b/app/src/main/res/drawable/ui_m3_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/ui_m3_switch_track.xml b/app/src/main/res/drawable/ui_m3_switch_track.xml
new file mode 100644
index 000000000..f89e5de3a
--- /dev/null
+++ b/app/src/main/res/drawable/ui_m3_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/typography.xml b/app/src/main/res/values/typography.xml
index 07cead865..e76ae0924 100644
--- a/app/src/main/res/values/typography.xml
+++ b/app/src/main/res/values/typography.xml
@@ -72,7 +72,7 @@
     </style>
 
     <style name="TextAppearance.Auxio.TitleSmallish" parent="TextAppearance.Material3.TitleSmall">
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">18sp</item>
     </style>
 
     <style name="TextAppearance.Auxio.LabelLarger" parent="TextAppearance.Auxio.LabelLarge">
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index cfab281d2..bfa305338 100644
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@@ -20,7 +20,7 @@
             app:key="auxio_accent"
             app:title="@string/set_accent" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:allowDividerBelow="false"
             app:defaultValue="false"
             app:iconSpaceReserved="false"
@@ -40,14 +40,14 @@
             app:summary="@string/set_lib_tabs_desc"
             app:title="@string/set_lib_tabs" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_SHOW_COVERS"
             app:summary="@string/set_show_covers_desc"
             app:title="@string/set_show_covers" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:defaultValue="false"
             app:dependency="KEY_SHOW_COVERS"
             app:iconSpaceReserved="false"
@@ -55,7 +55,7 @@
             app:summary="@string/set_quality_covers_desc"
             app:title="@string/set_quality_covers" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:defaultValue="false"
             app:dependency="KEY_SHOW_COVERS"
             app:iconSpaceReserved="false"
@@ -63,7 +63,7 @@
             app:summary="@string/set_round_covers_desc"
             app:title="@string/set_round_covers" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:allowDividerBelow="false"
             app:defaultValue="false"
             app:iconSpaceReserved="false"
@@ -78,14 +78,14 @@
         app:layout="@layout/item_header"
         app:title="@string/set_audio">
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_AUDIO_FOCUS"
             app:summary="@string/set_focus_desc"
             app:title="@string/set_focus" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_PLUG_MGT"
@@ -116,14 +116,14 @@
             app:title="@string/set_song_mode"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_KEEP_SHUFFLE"
             app:summary="@string/set_keep_shuffle_desc"
             app:title="@string/set_keep_shuffle" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:allowDividerBelow="false"
             app:defaultValue="true"
             app:iconSpaceReserved="false"
@@ -131,7 +131,7 @@
             app:summary="@string/set_rewind_prev_desc"
             app:title="@string/set_rewind_prev" />
 
-        <SwitchPreferenceCompat
+        <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:allowDividerBelow="false"
             app:defaultValue="false"
             app:iconSpaceReserved="false"