diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index b1f5fa0..ed058b9 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1134,4 +1134,26 @@
         <item>3</item>
         <item>4</item>
     </string-array>
+
+    <!-- Switch styles -->
+    <string-array name="switch_style_entries" translatable="false">
+        <item>@string/switch_default</item>
+        <item>@string/switch_oneplus</item>
+        <item>@string/switch_narrow</item>
+        <item>@string/switch_contained</item>
+        <item>@string/switch_telegram</item>
+        <item>@string/switch_md2</item>
+        <item>@string/switch_retro</item>
+        <item>@string/switch_stockish</item>
+    </string-array>
+    <string-array name="switch_style_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 7b7a6fd..3a61b37 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1050,4 +1050,15 @@
     <string name="lockscreen_status_bar_summary">Display status bar on the lockscreen</string>
 	
 	<string name="qs_panel_alpha_title">Background opacity</string>
+
+    <!-- Switch styles -->
+    <string name="switch_style_title">Switch appearance</string>
+    <string name="switch_default">Default</string>
+    <string name="switch_oneplus">OnePlus</string>
+    <string name="switch_narrow">Narrow</string>
+    <string name="switch_contained">Contained</string>
+    <string name="switch_md2">MD2</string>
+    <string name="switch_retro">Retro</string>
+    <string name="switch_telegram">Telegram</string>
+    <string name="switch_stockish">Stockish</string>
 </resources>
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 61080db..928b5c6 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -55,6 +55,16 @@
         android:entries="@array/ui_style_selector_entries"
         android:entryValues="@array/ui_style_selector_values"
         android:persistent="false" />
+
+        <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="switch_style"
+        android:icon="@drawable/ic_switch_theme"
+        android:title="@string/switch_style_title"
+        android:dialogTitle="@string/switch_style_title"
+        android:entries="@array/switch_style_entries"
+        android:entryValues="@array/switch_style_values"
+        android:summary="%s"
+        android:defaultValue="0" />
 			
 	<ListPreference
         android:key="qs_header_style"