diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 593b49b..d04353a 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1067,18 +1067,6 @@
         <item>3</item>
         <item>4</item>
     </string-array>
-	
-	<string-array name="qs_show_brightness_slider_entries" translatable="false">
-        <item>@string/qs_show_brightness_slider_show_never</item>
-        <item>@string/qs_show_brightness_slider_show_expanded</item>
-        <item>@string/qs_show_brightness_slider_show_always</item>
-    </string-array>
-
-    <string-array name="qs_show_brightness_slider_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
 
     <!-- Panel Background Style-->
     <string-array name="panel_bg_titles" translatable="false">
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 9aa4c57..9b6cacc 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -967,15 +967,14 @@
     <string name="ui_style_round_medium">Round Medium</string>
 
     <!-- Quick Settings brightness slider -->
-    <string name="qs_show_brightness_slider_title">Brightness slider</string>
-    <string name="qs_show_brightness_slider_summary">Show a brightness slider in the quick settings panel</string>
+    <string name="qs_show_brightness_slider_title">Quick QS brightness slider</string>
+    <string name="qs_show_brightness_slider_summary">Show brightness slider in quickbar</string>
+    <string name="qs_show_brightness_slider_expanded_title">Expanded QS brightness slider</string>
+    <string name="qs_show_brightness_slider_expanded_summary">Show brightness slider when expanded</string>
     <string name="qs_show_auto_brightness_title">Autobrightness icon</string>
     <string name="qs_show_auto_brightness_summary">Show toggle for adaptive brightness near the slider</string>
-    <string name="qs_show_brightness_slider_show_never">Never show</string>
-    <string name="qs_show_brightness_slider_show_expanded">Show when expanded</string>
-    <string name="qs_show_brightness_slider_show_always">Show always</string>
-    <string name="qs_brightness_position_bottom_title">Brightness slider at bottom</string>
-    <string name="qs_brightness_position_bottom_summary">Show the brightness slider on bottom quick settings</string>
+    <string name="qs_brightness_position_bottom_title">Brightness slider at bottom (only works for Expanded QS)</string>
+    <string name="qs_brightness_position_bottom_summary">Show the brightness slider on bottom of expanded quick settings</string>
 
     <!-- Panel Background style -->
     <string name="panel_bg_title">Panel background style</string>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 551bce1..31874b9 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -78,20 +78,24 @@
    <PreferenceCategory
         android:title="@string/qs_show_brightness_slider_title">
 	
-	<com.cherish.settings.preferences.SecureSettingListPreference
+	<com.cherish.settings.preferences.SecureSettingSwitchPreference
         android:key="qs_show_brightness_slider"
         android:title="@string/qs_show_brightness_slider_title"
-        android:summary="%s"
-        android:dialogTitle="@string/qs_show_brightness_slider_title"
-        android:entries="@array/qs_show_brightness_slider_entries"
-        android:entryValues="@array/qs_show_brightness_slider_values"
-        android:defaultValue="1" />
+        android:summary="@string/qs_show_brightness_slider_summary"
+        android:defaultValue="false" />
+		
+	<com.cherish.settings.preferences.SecureSettingSwitchPreference
+            android:key="qs_show_brightness_slider_show_expanded"
+            android:title="@string/qs_show_brightness_slider_expanded_title"
+            android:summary="@string/qs_show_brightness_slider_expanded_summary"
+            android:defaultValue="true" />
 
        <com.cherish.settings.preferences.SecureSettingSwitchPreference
             android:key="qs_brightness_position_bottom"
             android:icon="@drawable/ic_brightness"
             android:title="@string/qs_brightness_position_bottom_title"
             android:summary="@string/qs_brightness_position_bottom_summary"
+            android:dependency="qs_show_brightness_slider_show_expanded"
             android:defaultValue="false" />
 
     <com.cherish.settings.preferences.SecureSettingSwitchPreference