diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 318b7b2..c25df62 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -160,4 +160,76 @@
         <item>6</item>
         <item>7</item>
     </string-array>
+	
+	<string-array name="status_bar_battery_style_entries" translatable="false">
+        <item>@string/status_bar_battery_style_icon_portrait</item>
+        <!--<item>@string/status_bar_battery_style_q</item>-->	
+        <item>@string/status_bar_battery_style_circle</item>
+        <item>@string/status_bar_battery_style_dotted_circle</item>
+        <!--<item>@string/status_bar_battery_style_square</item>-->
+        <!--<item>@string/status_bar_battery_style_text</item>-->
+        <item>@string/status_bar_battery_style_hidden</item>
+        <!--<item>@string/status_bar_battery_style_icon_landscape</item>-->
+        <!--<item>@string/status_bar_battery_style_solid</item>-->
+    </string-array>
+
+    <string-array name="status_bar_battery_style_values" translatable="false">
+        <item>0</item>
+        <!--<item>6</item>-->
+        <item>1</item>
+        <item>2</item>
+        <!--<item>3</item>-->
+        <!--<item>4</item>-->
+        <item>5</item>
+    </string-array>
+
+    <string-array name="text_charging_symbol_entries" translatable="false">
+        <item>@string/text_charging_symbol_default</item>
+        <item>@string/text_charging_symbol_flash</item>
+        <item>@string/text_charging_symbol_tilde</item>
+    </string-array>
+
+    <string-array name="text_charging_symbol_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Battery percent -->
+    <string-array name="status_bar_battery_percentage_entries" translatable="false">
+        <item>@string/battery_percentage_off</item>
+        <item>@string/battery_percentage_inside</item>
+        <item>@string/battery_percentage_next</item>
+    </string-array>
+
+    <string-array name="status_bar_battery_percentage_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- Battery percent position -->
+    <string-array name="status_bar_battery_text_position_entries" translatable="false">
+        <item>@string/status_bar_battery_text_position_left</item>
+        <item>@string/status_bar_battery_text_position_right</item>
+    </string-array>
+
+    <string-array name="status_bar_battery_text_position_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="qs_battery_mode_entries">
+        <item>@string/battery_percentage_off</item>
+        <item>@string/battery_percentage_next</item>
+        <item>@string/battery_percentage_inside</item>
+        <item>@string/battery_percentage_estimate</item>
+    </string-array>
+
+    <string-array name="qs_battery_mode_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 52ffb24..55910e2 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -300,4 +300,47 @@
     <string name="qs_show_brightness_summary">Brightness slider visability and settings</string>
     <string name="qs_brightness_position_bottom_title">Bottom brightness slider</string>
     <string name="qs_brightness_position_bottom_summary">Show the brightness slider on the bottom of QS</string>
+
+    <!-- Battery Styles -->
+    <string name="battery_style_category_title">Battery level</string>
+
+    <!-- Battery mode -->
+    <string name="battery_percentage_title">Battery percentage</string>
+    <string name="battery_percentage_off">Disabled</string>
+    <string name="battery_percentage_next">Enabled</string>
+    <string name="battery_percentage_inside">Enabled (inside icon)</string>
+    <string name="battery_percentage_estimate">Enabled (estimate)</string>
+
+    <!-- Status bar - Battery -->
+    <string name="status_bar_battery_style_title">Battery style</string>
+    <string name="status_bar_battery_style_icon_portrait">Icon portrait</string>
+    <string name="status_bar_battery_style_icon_landscape">Icon landscape</string>
+    <string name="status_bar_battery_style_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <string name="status_bar_battery_style_square">Square</string>
+    <string name="status_bar_battery_style_solid">Solid</string>
+    <string name="status_bar_battery_style_text">Text</string>
+    <string name="status_bar_battery_style_hidden">Hidden</string>
+    <string name="status_bar_battery_style_q">Q style</string>	
+
+    <string name="status_bar_battery_style_tile_title">Override battery tile</string>
+    <string name="status_bar_battery_style_tile_summary">Use same icon style as above in QS battery tile</string>
+
+    <!-- Status bar - Battery custom charging symbol -->
+    <string name="text_charging_symbol_title">Custom charging symbol for text style</string>
+    <string name="text_charging_symbol_dialog">Custom charging symbol near battery percentage text</string>
+    <string name="text_charging_symbol_default">Disabled</string>
+    <string name="text_charging_symbol_flash">Flash</string>
+    <string name="text_charging_symbol_tilde">Tilde</string>
+
+    <!-- Status bar - Battery percentage -->
+    <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="status_bar_battery_text_position_title">Battery percent position</string>
+    <string name="status_bar_battery_text_position_left">Left of the icon</string>
+    <string name="status_bar_battery_text_position_right">Right of the icon</string>
+    <string name="status_bar_battery_text_charging_title">Battery percentage when charging</string>
+    <string name="status_bar_battery_text_charging_summary">Always display battery percentage when charging</string>
 </resources>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index e6a3cee..6e54847 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -33,5 +33,14 @@
             android:title="@string/quick_settings_vibrate_title"
             android:summary="@string/quick_settings_vibrate_summary"
             android:defaultValue="false"/>
+			
+    <!-- Battery mode -->
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="qs_battery_mode"
+        android:icon="@drawable/ic_battery_percent"
+        android:title="@string/battery_percentage_title"
+        android:entries="@array/qs_battery_mode_entries"
+        android:entryValues="@array/qs_battery_mode_values"
+        android:defaultValue="1" />
 
 </PreferenceScreen>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index 3ec88a1..31cf616 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -27,7 +27,7 @@
                 android:targetClass="com.android.systemui.tuner.StatusbarItemsActivity" />
 				
     </Preference>
-	
+
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="show_fourg"
 		android:icon="@drawable/ic_4g"
@@ -70,6 +70,38 @@
          android:summary="%s"
          android:defaultValue="0"/>
 
-
 </PreferenceCategory>
+
+     <PreferenceCategory
+
+        android:key="battery_style_category"
+        android:title="@string/battery_style_category_title" >
+
+	<com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="status_bar_battery_style"
+	android:icon="@drawable/ic_battery_styles"
+        android:title="@string/status_bar_battery_style_title"
+        android:summary="%s"
+        android:dialogTitle="@string/status_bar_battery_style_title"
+        android:entries="@array/status_bar_battery_style_entries"
+        android:entryValues="@array/status_bar_battery_style_values"
+        android:defaultValue="0" />
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="status_bar_show_battery_percent"
+	android:icon="@drawable/ic_battery_percent"
+        android:title="@string/battery_percentage_title"
+        android:entries="@array/status_bar_battery_percentage_entries"
+        android:entryValues="@array/status_bar_battery_percentage_values"
+        android:summary="%s"
+        android:defaultValue="0" />
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="status_bar_battery_text_charging"
+	android:icon="@drawable/ic_battery_charging"
+        android:title="@string/status_bar_battery_text_charging_title"
+        android:summary="@string/status_bar_battery_text_charging_summary"
+        android:defaultValue="true" />
+	
+   </PreferenceCategory>
 </PreferenceScreen>