diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 8c79dd7..4b0cd86 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -949,9 +949,9 @@
 	
 	<!-- Battery percent -->
     <string-array name="battery_percent_entries">
-        <item>@string/battery_percentage_default</item>
-        <item>@string/battery_percentage_text_inside</item>
-        <item>@string/battery_percentage_text_next</item>
+        <item>@string/status_bar_battery_percentage_default</item>
+        <item>@string/status_bar_battery_percentage_text_inside</item>
+        <item>@string/status_bar_battery_percentage_text_next</item>
     </string-array>
 
     <string-array name="battery_percent_values" translatable="false">
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 2960c69..7972734 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -957,17 +957,10 @@
     <string name="status_bar_battery_style_filled_circle">Filled circle</string>
     <string name="status_bar_battery_style_text">Text</string>
     <string name="status_bar_battery_style_hidden">Hidden</string>
-    <!-- Battery percentage -->
-    <string name="battery_percentage_title">Battery percentage</string>
-    <string name="battery_percentage_default">Hidden (default)</string>
-    <string name="battery_percentage_text_inside">Inside the icon</string>
-    <string name="battery_percentage_text_next">Next to the icon</string>
-    <string name="battery_text_charging_title">Battery percentage when charging</string>
-    <string name="battery_text_charging_summary">Always display battery percentage when charging</string>
-
-    <!-- Battery estimate -->
-    <string name="battery_estimate_title">Battery estimate</string>
-    <string name="battery_estimate_summary">Display estimated remaining battery life when available</string>
+    <string name="status_bar_battery_percentage_title">Battery percentage</string>
+    <string name="status_bar_battery_percentage_default">Hidden</string>
+    <string name="status_bar_battery_percentage_text_inside">Inside the icon</string>
+    <string name="status_bar_battery_percentage_text_next">Next to the icon</string>
 	
 	<string name="qs_media_player_title">QS Media player</string>
     <string name="qs_media_player_summary_on">Show media player in QS.\nRequires a SystemUI restart</string>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 40a1fbf..aee18da 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -185,23 +185,6 @@
             settings:units="" />
 
         </PreferenceCategory>
-		
-	<!-- Battery percent -->
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="qs_show_battery_percent"
-		android:icon="@drawable/ic_battery_percent"
-        android:title="@string/battery_percentage_title"
-        android:entries="@array/battery_percent_entries"
-        android:entryValues="@array/battery_percent_values"
-        android:defaultValue="0" />
-
-    <!-- Battery estimate -->
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="qs_show_battery_estimate"
-		android:icon="@drawable/ic_battery_percent"
-        android:title="@string/battery_estimate_title"
-        android:summary="@string/battery_estimate_summary"
-        android:defaultValue="true" />
 
        <!-- QS Quick Pull Down -->
     <com.cherish.settings.preferences.SecureSettingSwitchPreference
diff --git a/res/xml/cherish_settings_statusbar_battery.xml b/res/xml/cherish_settings_statusbar_battery.xml
index f1e9671..953f022 100644
--- a/res/xml/cherish_settings_statusbar_battery.xml
+++ b/res/xml/cherish_settings_statusbar_battery.xml
@@ -31,8 +31,8 @@
 
     <ListPreference
         android:key="status_bar_show_battery_percent"
-        android:title="@string/battery_percentage_title"
-        android:dialogTitle="@string/battery_percentage_title"
+        android:title="@string/status_bar_battery_percentage_title"
+        android:dialogTitle="@string/status_bar_battery_percentage_title"
         android:entries="@array/battery_percent_entries"
         android:entryValues="@array/battery_percent_values"
         android:summary="%s"
@@ -46,11 +46,5 @@
 			android:entryValues="@array/text_charging_symbol_values"
 			android:summary="%s"
 			android:defaultValue="1" />
-		
-		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="status_bar_battery_text_charging"
-        android:title="@string/battery_text_charging_title"
-        android:summary="@string/battery_text_charging_summary"
-        android:defaultValue="true" />
 
 </PreferenceScreen>