diff --git a/res/values-ar-rSA/cherish_strings.xml b/res/values-ar-rSA/cherish_strings.xml
index e207267..4c16a72 100644
--- a/res/values-ar-rSA/cherish_strings.xml
+++ b/res/values-ar-rSA/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-cs-rCZ/cherish_strings.xml b/res/values-cs-rCZ/cherish_strings.xml
index 8d99d6c..bd5998b 100644
--- a/res/values-cs-rCZ/cherish_strings.xml
+++ b/res/values-cs-rCZ/cherish_strings.xml
@@ -83,8 +83,8 @@
     <string name="theme_type_choco_x">Choco X</string>
     <string name="theme_type_dark_grey">Tmavě šedý</string>
     <string name="theme_type_du_pitchblack">Černočerný</string>
-    <string name="theme_type_material_ocean">Modrá – Material</string>
-    <string name="theme_type_clear_spring">Jarní – Čistá</string>
+    <string name="theme_type_material_ocean">Oceánová – Material</string>
+    <string name="theme_type_clear_spring">Jarní průhledná</string>
     <!--Accenter -->
     <string name="themes_hub_title">Motivy</string>
     <string name="themes_hub_summary">Odstíny-Přechody-Motivy</string>
@@ -210,197 +210,157 @@
     <string name="three_finger_gesture_summary">Snímek obrazovky přejetím tří prstů</string>
     <!-- VoWiFi icon -->
     <string name="vowifi_icon_title">Ikona VoWiFi</string>
-    <string name="vowifi_icon_enabled">VoWiFi icon enabled</string>
-    <string name="vowifi_icon_disabled">VoWiFi icon disabled</string>
-    <string name="vowifi_icon_enabled_volte_disabled">VoWiFi instead of VoLTE icon</string>
-    <string name="vowifi_icon_style_title">VoWiFi icon style</string>
-    <string name="vowifi_icon_default">Default Icon</string>
+    <string name="vowifi_icon_enabled">Ikona VoWiFi zapnuta</string>
+    <string name="vowifi_icon_disabled">Ikona VoWiFi vypnuta</string>
+    <string name="vowifi_icon_enabled_volte_disabled">Ikona VoWiFi namísto VoLTE</string>
+    <string name="vowifi_icon_style_title">Styl ikony VoWiFi</string>
+    <string name="vowifi_icon_default">Výchozí ikona</string>
     <string name="vowifi_icon_emui">Ikona EMUI</string>
-    <string name="vowifi_icon_asus">Asus Icon</string>
-    <string name="vowifi_icon_oneplus">OOS Icon</string>
-    <string name="vowifi_icon_moto">Motorola Icon</string>
-    <string name="vowifi_icon_simple1">Simple1 Icon</string>
-    <string name="vowifi_icon_simple2">Simple2 Icon</string>
-    <string name="vowifi_icon_simple3">Simple3 Icon</string>
+    <string name="vowifi_icon_asus">Ikona Asus</string>
+    <string name="vowifi_icon_oneplus">Ikona OOS</string>
+    <string name="vowifi_icon_moto">Ikona Motorola</string>
+    <string name="vowifi_icon_simple1">Ikona Simple1</string>
+    <string name="vowifi_icon_simple2">Ikona Simple2</string>
+    <string name="vowifi_icon_simple3">Ikona Simple3</string>
     <!-- Suppress notifications sound/vibration if screen is ON -->
-    <string name="notification_sound_vib_screen_on_title">Notification sound if active</string>
-    <string name="notification_sound_vib_screen_on_summary">Play sound and vibration for notifications when screen is on</string>
+    <string name="notification_sound_vib_screen_on_title">Zvukové oznámení při aktivitě</string>
+    <string name="notification_sound_vib_screen_on_summary">Přehrát zvuk a vibrace pro oznámení při zapnuté obrazovce</string>
     <!-- QuickSettings haptic feedback -->
-    <string name="quick_settings_vibrate_title">Vibrate on touch</string>
-    <string name="quick_settings_vibrate_summary">Vibrate when touching QS tiles</string>
+    <string name="quick_settings_vibrate_title">Vibrace při dotyku</string>
+    <string name="quick_settings_vibrate_summary">Vibrovat při dotyku dlaždice rychlého nastavení</string>
     <!-- Global Actions -->
     <string name="global_actions_title">Menu napájení</string>
-    <string name="global_actions_summary">Select what to show when you press the power button</string>
-    <string name="global_actions_power">Power</string>
+    <string name="global_actions_summary">Vyberte, co se má zobrazit po stisku tlačítka napájení</string>
+    <string name="global_actions_power">Napájení</string>
     <string name="global_actions_restart">Restartovat</string>
-    <string name="global_actions_airplane">Airplane</string>
+    <string name="global_actions_airplane">Letadlo</string>
     <string name="global_actions_settings">Nastavení</string>
-    <string name="global_actions_lockdown">Lock Down</string>
-    <string name="global_actions_soundpanel">Sound Panel</string>
-    <string name="global_actions_users">Users</string>
+    <string name="global_actions_lockdown">Uzamknout</string>
+    <string name="global_actions_soundpanel">Panel hlasitosti</string>
+    <string name="global_actions_users">Uživatelé</string>
     <string name="global_actions_screenshot">Snímek obrazovky</string>
     <string name="global_actions_screenrecord">Záznam obrazovky</string>
     <string name="global_actions_flashlight">Svítilna</string>
-    <string name="global_actions_emergency">Emergency</string>
-    <string name="global_actions_advanced_reboot_title">Enable advanced restart</string>
-    <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
-    <string name="global_actions_max_columns_title">Max actions to show</string>
-    <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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">Vypnuto</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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">Skryté</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">Vypnuto</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">Skryté</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>
+    <string name="global_actions_emergency">Stav nouze</string>
+    <string name="global_actions_advanced_reboot_title">Povolit rozšířený restart</string>
+    <string name="global_actions_advanced_reboot_summary">Při restartu se také zobrazí možnosti pro recovery a bootloader</string>
+    <string name="global_actions_max_columns_title">Maximální počet akcí k zobrazení</string>
+    <string name="global_actions_max_columns_summary">Nastavte, kolik akcí se má zobrazit, než se tlačítka přesunou do rozbalovací nabídky</string>
     <!-- Statusbar net monitor -->
-    <string name="traffic_title">Traffic indicators</string>
-    <string name="network_traffic_state_title">Network traffic</string>
-    <string name="network_traffic">Network traffic</string>
-    <string name="network_traffic_location">Traffic indicator placement</string>
+    <string name="traffic_title">Indikátor datových přenosů</string>
+    <string name="network_traffic_state_title">Síťový provoz</string>
+    <string name="network_traffic">Síťový provoz</string>
+    <string name="network_traffic_location">Umístění indikátoru síťového provozu</string>
     <string name="traffic_disabled">Vypnuto</string>
-    <string name="traffic_statusbar">Statusbar</string>
-    <string name="traffic_expanded_statusbar">Expanded header</string>
-    <string name="network_traffic_autohide_threshold_title">Net activity autohide threshold (KB/s)</string>
-    <string name="network_traffic_arrow">Show arrows</string>
-    <string name="network_traffic_arrow_summary">Show the network traffic indicator arrows</string>
-    <string name="network_traffic_type">Select net activity type</string>
-    <string name="show_network_traffic_combined">Combined (Upload + Download)</string>
+    <string name="traffic_statusbar">Stavový řádek</string>
+    <string name="traffic_expanded_statusbar">Rozšířené záhlaví</string>
+    <string name="network_traffic_autohide_threshold_title">Prahová hodnota pro automatické skrytí sítě (KB/s)</string>
+    <string name="network_traffic_arrow">Zobrazit šipky</string>
+    <string name="network_traffic_arrow_summary">Zobrazit šipky aktivity sítě</string>
+    <string name="network_traffic_type">Vyberte typ činnosti sítě</string>
+    <string name="show_network_traffic_combined">Kombinovaný (Nahrávání + Stahování)</string>
     <string name="show_network_traffic_dynamic">Dynamický</string>
-    <string name="show_network_traffic_up">Upload</string>
+    <string name="show_network_traffic_up">Nahrát</string>
     <string name="show_network_traffic_down">Stáhnout</string>
     <string name="show_network_traffic_all">Obojí</string>
-    <string name="nettraf_font_size">Single net font size</string>
-    <string name="network_traffic_layout">Activity layout</string>
-    <string name="network_traffic_layout_h">Horizontal</string>
-    <string name="network_traffic_layout_v">Vertical</string>
-    <string name="net_traffic_font">Fonts</string>
+    <string name="nettraf_font_size">Velikost textu jedné sítě</string>
+    <string name="network_traffic_layout">Vrstva aktivity</string>
+    <string name="network_traffic_layout_h">Horizontální</string>
+    <string name="network_traffic_layout_v">Vertikální</string>
+    <string name="net_traffic_font">Písma</string>
     <!-- Screenshot -->
-    <string name="screenshot_type_title">Screenshot type</string>
-    <string name="screenshot_type_fullscreen">Take fullscreen screenshots</string>
-    <string name="screenshot_type_partial">Drag selection on the area you want to take as a screenshot</string>
-    <string name="screenshot_options_category">Screenshot options</string>
-    <string name="screenshot_options_summary">Customize screenshot attributes like time, delay,type etc</string>
+    <string name="screenshot_type_title">Typ snímku obrazovky</string>
+    <string name="screenshot_type_fullscreen">Pořídit snímky celé obrazovky</string>
+    <string name="screenshot_type_partial">Přetažením vyberte oblast, kterou chcete použít jako snímek obrazovky</string>
+    <string name="screenshot_options_category">Možnosti snímku obrazovky</string>
+    <string name="screenshot_options_summary">Přizpůsobit atributy obrázků jako je čas, zpoždění, typ atd.</string>
     <!-- Lock Clock Fonts -->
-    <string name="lock_clock_font_title">Clock font options</string>
-    <string name="custom_text_clock_font_title">Typo Clock font options</string>
-    <string name="lock_clock_font_summary">Change the default font of the lockscreen clock widget</string>
-    <string name="lock_clock_font_dialog_title">Select lock clock font</string>
-    <string name="lock_clock_font_stock">Normal (default)</string>
-    <string name="lock_clock_font_bold">Bold</string>
-    <string name="lock_clock_font_italic">Italic</string>
-    <string name="lock_clock_font_bold_italic">Bold Italic</string>
-    <string name="lock_clock_font_light_italic">Light Italic</string>
-    <string name="lock_clock_font_thin_italic">Thin Italic</string>
+    <string name="lock_clock_font_title">Možnosti písma hodin</string>
+    <string name="custom_text_clock_font_title">Možnosti typu písma hodin</string>
+    <string name="lock_clock_font_summary">Změnit písmo widgetu hodin na zamykací obrazovce</string>
+    <string name="lock_clock_font_dialog_title">Vyberte písmo hodin zamykací obrazovky</string>
+    <string name="lock_clock_font_stock">Normální (výchozí)</string>
+    <string name="lock_clock_font_bold">Tučné</string>
+    <string name="lock_clock_font_italic">Kurzíva</string>
+    <string name="lock_clock_font_bold_italic">Tučně a kurzíva</string>
+    <string name="lock_clock_font_light_italic">Lehká kurzíva</string>
+    <string name="lock_clock_font_thin_italic">Tenká kurzíva</string>
     <string name="lock_clock_font_light">Světlý</string>
-    <string name="lock_clock_font_thin">Thin</string>
-    <string name="lock_clock_font_condensed_normal">Condensed</string>
-    <string name="lock_clock_font_condensed_italic">Condensed Italic</string>
-    <string name="lock_clock_font_condensed_bold">Condensed Bold</string>
-    <string name="lock_clock_font_condensed_bold_italic">Condensed Bold Italic</string>
-    <string name="lock_clock_font_condensed_light">Condensed Light</string>
-    <string name="lock_clock_font_condensed_light_italic">Condensed Light Italic</string>
-    <string name="lock_clock_font_medium_normal">Medium</string>
-    <string name="lock_clock_font_medium_italic">Medium Italic</string>
-    <string name="lock_clock_font_black">Black</string>
-    <string name="lock_clock_font_black_italic">Black Italic</string>
+    <string name="lock_clock_font_thin">Tenké</string>
+    <string name="lock_clock_font_condensed_normal">Zůžené</string>
+    <string name="lock_clock_font_condensed_italic">Zúžená kurzíva</string>
+    <string name="lock_clock_font_condensed_bold">Zúžené tučné</string>
+    <string name="lock_clock_font_condensed_bold_italic">Zůžené tučně kurzívou</string>
+    <string name="lock_clock_font_condensed_light">Lehce zúžené</string>
+    <string name="lock_clock_font_condensed_light_italic">Lehce zůžená kurzíva</string>
+    <string name="lock_clock_font_medium_normal">Střední</string>
+    <string name="lock_clock_font_medium_italic">Střední kurzíva</string>
+    <string name="lock_clock_font_black">Černé (Tlusté)</string>
+    <string name="lock_clock_font_black_italic">Černá kurzíva</string>
     <string name="lock_clock_font_dancingscript">DancingScript</string>
-    <string name="lock_clock_font_dancingscript_bold">DancingScript Bold</string>
+    <string name="lock_clock_font_dancingscript_bold">DancingScript tučné</string>
     <string name="lock_clock_font_comingsoon">ComingSoon</string>
-    <string name="lock_clock_font_notoserif">NotoSerif Normal</string>
-    <string name="lock_clock_font_notoserif_italic">NotoSerif Italic</string>
-    <string name="lock_clock_font_notoserif_bold">NotoSerif Bold</string>
-    <string name="lock_clock_font_notoserif_bold_italic">NotoSerif Bold Italic</string>
-    <string name="lock_clock_font_gobold">GoBold Light</string>
+    <string name="lock_clock_font_notoserif">NotoSerif normální</string>
+    <string name="lock_clock_font_notoserif_italic">NotoSerif kurzíva</string>
+    <string name="lock_clock_font_notoserif_bold">NotoSerif tučné</string>
+    <string name="lock_clock_font_notoserif_bold_italic">NotoSerif tučné kurzíva</string>
+    <string name="lock_clock_font_gobold">GoBold lehké</string>
     <string name="lock_clock_font_roadrage">Road Rage</string>
     <string name="lock_clock_font_snowstorm">Snowstorm</string>
     <string name="lock_clock_font_googlesans">Google Sans</string>
     <string name="lock_clock_font_neoneon">Neoneon</string>
-    <string name="lock_clock_font_themeable">Themeable (or VCR OSD Mono)</string>
+    <string name="lock_clock_font_themeable">Přizpůsobitelné (nebo VCR OSD Mono)</string>
     <string name="lock_clock_font_samsung">Shamshung</string>
     <string name="lock_clock_font_mexcellent">Mexcellent</string>
     <string name="lock_clock_font_burnstown">Burnstown</string>
     <string name="lock_clock_font_dumbledor">Dumbledor</string>
     <string name="lock_clock_font_phantombold">PhantomBold</string>
     <!-- Lock Date Fonts -->
-    <string name="lock_date_font_title">Date font options</string>
-    <string name="lock_date_font_summary">Change the default font of the lockscreen date widget</string>
-    <string name="lock_date_font_dialog_title">Select lock date font</string>
+    <string name="lock_date_font_title">Možnosti písma data</string>
+    <string name="lock_date_font_summary">Změnit písmo widgetu data na zamykací obrazovce</string>
+    <string name="lock_date_font_dialog_title">Vyberte písmo data na zamykací obrazovce</string>
     <!-- Lock Clock & Date Size -->
-    <string name="lockdate_font_size_title">Date font size</string>
-    <string name="lockclock_font_size_title">Clock font size</string>
-    <string name="custom_text_clock_font_size_title">Typography Clock size</string>
+    <string name="lockdate_font_size_title">Velikost písma data</string>
+    <string name="lockclock_font_size_title">Velikost písma hodin</string>
+    <string name="custom_text_clock_font_size_title">Velikost typografických hodin</string>
     <!-- Lockscreen Colors -->
-    <string name="lockscreen_colors">Lockscreen Colors</string>
-    <string name="lockscreen_clock_color">Lockscreen Clock</string>
-    <string name="lockscreen_colors_summary">Change color of lockscreen widgets</string>
-    <string name="lockscreen_clock_date_color">Lockscreen Date</string>
-    <string name="lockscreen_colors_reset_title">Reset lockscreen colors</string>
-    <string name="lockscreen_colors_reset_message">Are you sure you want to reset these colors to default?</string>
-    <string name="lockscreen_colors_title">Lockscreen colors</string>
-    <string name="lockscreen_owner_info_color">Owner info</string>
-    <string name="lockscreen_phone_icon_color">Lockscreen Bottom Left shortcut</string>
-    <string name="lockscreen_lock_icon_color">Lockscreen Lock icon</string>
-    <string name="lockscreen_camera_icon_color">Lockscreen Bottom Right shortcut</string>
-    <string name="ls_shortcut_icon_color">Lockscreen Shortcuts</string>
-    <string name="lockscreen_indication_text_color">Lockscreen Indication text</string>
-    <string name="lockscreen_weather_temp_color">Weather Temp Color</string>
-    <string name="lockscreen_weather_city_color">Weather City Color</string>
-    <string name="lockscreen_weather_icon_color">Weather Icon Color</string>
-    <string name="yes">YES</string>
+    <string name="lockscreen_colors">Barvy zamykací obrazovky</string>
+    <string name="lockscreen_clock_color">Hodiny zamykací obrazovky</string>
+    <string name="lockscreen_colors_summary">Změnit barvu widgetů zamykací obrazovky</string>
+    <string name="lockscreen_clock_date_color">Datum zamykací obrazovky</string>
+    <string name="lockscreen_colors_reset_title">Obnovit barvy na zamykací obrazovce</string>
+    <string name="lockscreen_colors_reset_message">Jste si jisti, že chcete obnovit tyto barvy na výchozí hodnoty?</string>
+    <string name="lockscreen_colors_title">Barvy zamykací obrazovky</string>
+    <string name="lockscreen_owner_info_color">Informace o vlastníkovi</string>
+    <string name="lockscreen_phone_icon_color">Levé dolní tlačítko na zamykací obrazovce</string>
+    <string name="lockscreen_lock_icon_color">Ikona zámku obrazovky</string>
+    <string name="lockscreen_camera_icon_color">Pravé dolní tlačítko na zamykací obrazovce</string>
+    <string name="ls_shortcut_icon_color">Zástupci na zamykací obrazovce</string>
+    <string name="lockscreen_indication_text_color">Indikace textu na obrazovce uzamčení</string>
+    <string name="lockscreen_weather_temp_color">Barva teploty počasí</string>
+    <string name="lockscreen_weather_city_color">Barva města počasí</string>
+    <string name="lockscreen_weather_icon_color">Barva ikony počasí</string>
+    <string name="yes">ANO</string>
     <!-- LS OwnerInfo Font & Size -->
-    <string name="lock_ownerinfo_font_title">OwnerInfo font options</string>
-    <string name="lock_ownerinfo_font_summary">Change the default font of the lockscreen owner info</string>
-    <string name="lock_ownerinfo_font_dialog_title">Select lock ownerinfo font</string>
-    <string name="lockowner_font_size_title">Owner info font size</string>
+    <string name="lock_ownerinfo_font_title">Možnosti písma vlastníka</string>
+    <string name="lock_ownerinfo_font_summary">Změnit písmo textu vlastníka na zamykací obrazovce</string>
+    <string name="lock_ownerinfo_font_dialog_title">Vyberte styl písma textu vlastníka na zamykací obrazovce</string>
+    <string name="lockowner_font_size_title">Velikost písma vlastníka</string>
     <!-- Lockscreen clock style -->
-    <string name="lockscreen_clock_title">Clock style</string>
-    <string name="lockscreen_clock_dialog_title">Select clock style</string>
-    <string name="lockscreen_clock_hide">Hide</string>
+    <string name="lockscreen_clock_title">Umístění hodin</string>
+    <string name="lockscreen_clock_dialog_title">Vyberte styl hodin</string>
+    <string name="lockscreen_clock_hide">Skrýt</string>
     <string name="lockscreen_clock_default">Výchozí</string>
-    <string name="lockscreen_clock_default_bold">Default (bold)</string>
+    <string name="lockscreen_clock_default_bold">Výchozí (tučné)</string>
     <string name="lockscreen_clock_sammy">Sammy</string>
-    <string name="lockscreen_clock_sammy_bold">Sammy (bold)</string>
-    <string name="lockscreen_clock_sammy_accent_hour">Sammy Accent(hours)</string>
-    <string name="lockscreen_clock_sammy_accent_mins">Sammy Accent(minutes)</string>
-    <string name="lockscreen_clock_text_style">Text clock</string>
-    <string name="lockscreen_clock_analog_style">Analog Q Style</string>
-    <string name="lockscreen_clock_analog_num_style">Analog clock(number)</string>
+    <string name="lockscreen_clock_sammy_bold">Sammy (tučné)</string>
+    <string name="lockscreen_clock_sammy_accent_hour">Sammy (zvýrazněné hodiny)</string>
+    <string name="lockscreen_clock_sammy_accent_mins">Sammy (zvýrazněné minuty)</string>
+    <string name="lockscreen_clock_text_style">Textové hodiny</string>
+    <string name="lockscreen_clock_analog_style">Analogové ve stylu Q</string>
+    <string name="lockscreen_clock_analog_num_style">Analogové hodiny (číselné)</string>
     <!-- Lockscreen Date styles -->
-    <string name="lockscreen_date_selection_title">Date style</string>
+    <string name="lockscreen_date_selection_title">Styl data</string>
     <string name="lockscreen_date_dialog_title">Select date style</string>
     <string name="lockscreen_date_selection_default">Výchozí</string>
     <string name="lockscreen_date_selection_str_box">Semi-transparent box</string>
@@ -422,8 +382,8 @@
     <string name="lock_item_center">Center Aligned</string>
     <string name="lock_item_right">Right Aligned</string>
     <string name="lockscreen_item_padding_title">Lockscreen Items Padding</string>
-    <string name="lockscreen_weather_alignment_title">Zarovnání počasí na zamykací obrazovce</string>
-    <string name="lockscreen_weather_selection_title">Styl pozadí WeatherView</string>
+    <string name="lockscreen_weather_alignment_title">LS Weather Alignment</string>
+    <string name="lockscreen_weather_selection_title">WeatherView Background Style</string>
     <!-- Data disabled icon -->
     <string name="data_disabled_icon_title">Data disabled icon</string>
     <string name="data_disabled_icon_summary">Display a cross sign next to signal bar when data is disabled</string>
@@ -447,21 +407,21 @@
     <string name="lockscreen_hide_shortcuts_summary">Hide Left-Right Shortcuts on secure lock screens</string>
     <!-- Lockscreen weather -->
     <string name="lockscreen_weather_category">Počasí</string>
-    <string name="lockscreen_weather_enabled_title">Zobrazovat na zamčené obrazovce</string>
-    <string name="lockscreen_weather_enabled_summary">Zobrazit informace o počasí na zamykací obrazovce a během režimu Doze</string>
-    <string name="lockscreen_weather_settings_title">Nastavit možnosti počasí</string>
-    <string name="lockscreen_weather_settings_summary">Nastavení balíčků ikon a služby počasí</string>
-    <string name="weather_config_title">Služba počasí</string>
-    <string name="weather_config_summary">Nastavení systémové služby</string>
-    <string name="header_weather_title">Zobrazit počasí v záhlaví</string>
-    <string name="header_weather_summary">Povolit zobrazení počasí v záhlaví panelu oznámení</string>
-    <string name="weather_icon_pack_title">Balíček ikon stavu počasí</string>
-    <string name="weather_icon_pack_note">Poznámka\u003a Nové balíčky ikon můžete nainstalovat z Obchodu Play vyhledáním „Chronus icons“</string>
-    <string name="weather_icon_pack_info_title">Balíček ikon stavu počasí je používán v rychlém nastavení a na obrazovce uzamčení</string>
+    <string name="lockscreen_weather_enabled_title">Show on lockscreen</string>
+    <string name="lockscreen_weather_enabled_summary">Show weather information on lockscreen and during doze</string>
+    <string name="lockscreen_weather_settings_title">Setup weather options</string>
+    <string name="lockscreen_weather_settings_summary">Setup icon pack and weather service</string>
+    <string name="weather_config_title">Weather service</string>
+    <string name="weather_config_summary">System service settings</string>
+    <string name="header_weather_title">Header view weather</string>
+    <string name="header_weather_summary">Enable notification panel header weather display</string>
+    <string name="weather_icon_pack_title">Condition icon pack</string>
+    <string name="weather_icon_pack_note">Note\u003a you can install new icon packs from play store by searching for \"Chronus icons\"</string>
+    <string name="weather_icon_pack_info_title">Condition icon pack is used in quick settings and lock screen</string>
     <!-- Lockscreen weather style -->
-    <string name="lockscreen_weather_style_title">Styl počasí</string>
-    <string name="lockscreen_weather_omni_style_title">Styl Omni</string>
-    <string name="lockscreen_weather_pixel_style_title">Styl Pixel</string>
+    <string name="lockscreen_weather_style_title">Weather style</string>
+    <string name="lockscreen_weather_omni_style_title">Omni style</string>
+    <string name="lockscreen_weather_pixel_style_title">Pixel style</string>
     <!-- Toast Animation -->
     <string name="toast_animation_title">Toast animation</string>
     <string name="toast_none_animation">Žádný</string>
@@ -604,7 +564,7 @@
     <string name="charging_animation_title">Charging animation</string>
     <string name="charging_animation_summary">Display an animation when the device is plugged in</string>
     <string name="lockscreen_charging_animation_title">Charging animation</string>
-    <string name="lockscreen_charging_animation_flash">Flash</string>
+    <string name="lockscreen_charging_animation_flash">Blesk</string>
     <string name="lockscreen_charging_animation_battery">Battery</string>
     <string name="lockscreen_charging_animation_drop">Drop</string>
     <string name="lockscreen_charging_animation_explosion">Explosion</string>
@@ -634,7 +594,7 @@
     <string name="clock_style_category_summary">Statusbar Clock Tuner</string>
     <string name="status_bar_clock_title">Clock settings</string>
     <string name="status_bar_clock_show">Show clock and date</string>
-    <string name="status_bar_clock_style_title">Clock style</string>
+    <string name="status_bar_clock_style_title">Umístění hodin</string>
     <string name="status_bar_clock_style_right">Right</string>
     <string name="status_bar_clock_style_center">Center</string>
     <string name="status_bar_clock_style_left">Left</string>
@@ -649,7 +609,7 @@
     <string name="clock_date_display_none">Don\'t show</string>
     <string name="clock_date_display_small">Small font size</string>
     <string name="clock_date_display_normal">Normal font size</string>
-    <string name="clock_date_style">Date style</string>
+    <string name="clock_date_style">Styl data</string>
     <string name="clock_date_style_normal">Normal</string>
     <string name="clock_date_style_lowercase">Lowercase</string>
     <string name="clock_date_style_uppercase">Uppercase</string>
@@ -659,7 +619,7 @@
     <string name="clock_date_string_edittext_summary">Enter string</string>
     <!-- Statusbar Clock Font Style, Size & Color -->
     <string name="status_bar_clock_font_style_title">Clock font style</string>
-    <string name="status_bar_clock_font_size_title">Clock font size</string>
+    <string name="status_bar_clock_font_size_title">Velikost písma hodin</string>
     <string name="status_bar_clock_color_title">Clock font color</string>
     <string name="clock_date_right">Right of time</string>
     <string name="clock_date_left">Left of time</string>
@@ -668,8 +628,8 @@
     <string name="battery_bar_title">Battery bar</string>
     <string name="battery_bar_summary">Display and customize battery bar near status bar or navigation bar</string>
     <string name="battery_bar_no_navbar">Battery bar location</string>
-    <string name="battery_bar_location_hide">Hide</string>
-    <string name="battery_bar_location_statusbar">Statusbar</string>
+    <string name="battery_bar_location_hide">Skrýt</string>
+    <string name="battery_bar_location_statusbar">Stavový řádek</string>
     <string name="battery_bar_color">Battery bar color</string>
     <string name="battery_bar_charging_color">Battery bar charging color</string>
     <string name="battery_bar_battery_low_color">Battery bar low battery color</string>
@@ -713,19 +673,19 @@
     <string name="pixel_navbar_anim_title">Pixel animation</string>
     <string name="pixel_navbar_anim_summary">Toggle home button animation</string>
     <!-- LockWeather Switches -->
-    <string name="lockscreen_weather_show_city_title">Zobrazit název města</string>
-    <string name="lockscreen_weather_show_city_summary">Zobrazit název aktuálního města vlevo od obrázku</string>
-    <string name="lockscreen_weather_show_temp_title">Zobrazit teplotu</string>
-    <string name="lockscreen_weather_show_temp_summary">Zobrazit aktuální teplotu ve městě vpravo od obrázku</string>
-    <string name="lockscreen_weather_show_image_title">Zobrazit obrázek stavu počasí</string>
-    <string name="lockscreen_weather_show_image_summary">Zobrazení stavu počasí</string>
+    <string name="lockscreen_weather_show_city_title">Show city name</string>
+    <string name="lockscreen_weather_show_city_summary">Show name of current city on left of image</string>
+    <string name="lockscreen_weather_show_temp_title">Show temperature</string>
+    <string name="lockscreen_weather_show_temp_summary">Show current city temperature on right of image</string>
+    <string name="lockscreen_weather_show_image_title">Show Condition Image</string>
+    <string name="lockscreen_weather_show_image_summary">Show weather conditions image</string>
     <!-- LS Weather Temp & City Fonts -->
-    <string name="lock_weather_temp_font_title">Písmo teploty počasí zamykací obrazovky</string>
-    <string name="lock_weather_temp_font_summary">Změnit písmo widgetu teploty počasí na zamykací obrazovce</string>
-    <string name="lock_weather_temp_font_dialog_title">Vyberte písmo teploty počasí na zamykací obrazovce</string>
-    <string name="lock_weather_city_font_title">Písmo města počasí zamykací obrazovky</string>
-    <string name="lock_weather_city_font_summary">Změnit písmo widgetu města počasí na zamykací obrazovce</string>
-    <string name="lock_weather_city_dialog_title">Vyberte písmo města počasí na zamykací obrazovce</string>
+    <string name="lock_weather_temp_font_title">LS Weather Temp font</string>
+    <string name="lock_weather_temp_font_summary">Change the default font of the lockscreen weather temp</string>
+    <string name="lock_weather_temp_font_dialog_title">Select lock weather temp font</string>
+    <string name="lock_weather_city_font_title">LS Weather City font</string>
+    <string name="lock_weather_city_font_summary">Change the default font of the lockscreen weather city</string>
+    <string name="lock_weather_city_dialog_title">Select lock weather city font</string>
     <!-- QS Footer Text -->
     <string name="qs_footer_text_title">QS footer text</string>
     <string name="qs_footer_text_summary">Display text at bottom of QS panel</string>
@@ -886,7 +846,7 @@
     <string name="panel_outline">Outline</string>
     <!-- QS header styles -->
     <string name="qs_header_style_title">QS Header style</string>
-    <string name="qs_header_black">Black</string>
+    <string name="qs_header_black">Černé (Tlusté)</string>
     <string name="qs_header_grey">Grey</string>
     <string name="qs_header_lightgrey">Light Grey</string>
     <string name="qs_header_accent">Accent Based</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <string name="status_bar_battery_style_title">Vzhled baterie</string>
+    <string name="status_bar_battery_style_icon_portrait">Ikona na výšku</string>
+    <string name="status_bar_battery_style_circle">Kruh</string>
+    <string name="status_bar_battery_style_dotted_circle">Tečkovaný kruh</string>
+    <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">Skryté</string>
+    <!-- Battery percentage -->
+    <string name="battery_percentage_title">Procenta baterie</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>
 </resources>
diff --git a/res/values-da-rDK/cherish_strings.xml b/res/values-da-rDK/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-da-rDK/cherish_strings.xml
+++ b/res/values-da-rDK/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-de-rDE/cherish_strings.xml b/res/values-de-rDE/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-de-rDE/cherish_strings.xml
+++ b/res/values-de-rDE/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-el-rGR/cherish_strings.xml b/res/values-el-rGR/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-el-rGR/cherish_strings.xml
+++ b/res/values-el-rGR/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-en-rUS/cherish_strings.xml b/res/values-en-rUS/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-en-rUS/cherish_strings.xml
+++ b/res/values-en-rUS/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-es-rES/cherish_strings.xml b/res/values-es-rES/cherish_strings.xml
index c8c3174..ed9a6da 100644
--- a/res/values-es-rES/cherish_strings.xml
+++ b/res/values-es-rES/cherish_strings.xml
@@ -112,7 +112,7 @@
     <!-- Language options - Volume rocker cursor control -->
     <string name="cursor_section_header">Cursor</string>
     <string name="volume_key_cursor_control_title">Control de cursor de tecla de volumen</string>
-    <string name="volume_key_cursor_control_off">Desabilitado</string>
+    <string name="volume_key_cursor_control_off">Deshabilitado</string>
     <string name="volume_key_cursor_control_on">Subir /bajar volumen mueve el cursor hacia la izquierda /derecha</string>
     <string name="volume_key_cursor_control_on_reverse">Subir /bajar volumen mueve el cursor hacia la derecha /izquierda</string>
     <string name="torch_long_press_power_gesture_title">Antorcha del botón de encendido de la pantalla apagada</string>
@@ -246,52 +246,12 @@
     <string name="global_actions_advanced_reboot_summary">Al reiniciar también se muestran opciones de recuperación y cargador de arranque</string>
     <string name="global_actions_max_columns_title">Acciones máximas para mostrar</string>
     <string name="global_actions_max_columns_summary">Establecer cuántas acciones mostrar antes de que los botones se muevan al menú de desbordamiento</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Nivel de bateria</string>
-    <!-- Battery mode -->
-    <string name="battery_percentage_title">Porcentaje de batería</string>
-    <string name="battery_percentage_off">Desabilitado</string>
-    <string name="battery_percentage_next">Habilitado</string>
-    <string name="battery_percentage_inside">Habilitado (icono interior)</string>
-    <string name="battery_percentage_estimate">Habilitado (estimación)</string>
-    <string name="battery_percentage_percentage_estimate">Habilitado (porcentaje | estimación)</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Estilo de batería</string>
-    <string name="status_bar_battery_style_icon_portrait">Retrato de icono</string>
-    <string name="status_bar_battery_style_icon_landscape">Paisaje de icono</string>
-    <string name="status_bar_battery_style_circle">Circulo</string>
-    <string name="status_bar_battery_style_dotted_circle">Círculo punteado</string>
-    <string name="status_bar_battery_style_big_circle">Círculo grande</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Gran círculo de puntos</string>
-    <string name="status_bar_battery_style_square">Cuadrado</string>
-    <string name="status_bar_battery_style_solid">Sólido</string>
-    <string name="status_bar_battery_style_text">Texto</string>
-    <string name="status_bar_battery_style_hidden">Oculto</string>
-    <string name="status_bar_battery_style_q">Estilo Q</string>
-    <string name="status_bar_battery_style_tile_title">Anular mosaico de batería</string>
-    <string name="status_bar_battery_style_tile_summary">Use el mismo estilo de icono que el anterior en el mosaico de batería QS</string>
-    <!-- Status bar - Battery custom charging symbol -->
-    <string name="text_charging_symbol_title">Símbolo de carga personalizado para estilo de texto</string>
-    <string name="text_charging_symbol_dialog">Símbolo de carga personalizado junto al texto de porcentaje de batería</string>
-    <string name="text_charging_symbol_default">Desabilitado</string>
-    <string name="text_charging_symbol_flash">Destello</string>
-    <string name="text_charging_symbol_tilde">Tilde</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Porcentaje de batería</string>
-    <string name="status_bar_battery_percentage_default">Oculto</string>
-    <string name="status_bar_battery_percentage_text_inside">Dentro del icono</string>
-    <string name="status_bar_battery_percentage_text_next">Junto al icono</string>
-    <string name="status_bar_battery_text_position_title">Posición porcentual de la batería</string>
-    <string name="status_bar_battery_text_position_left">Izquierda del icono</string>
-    <string name="status_bar_battery_text_position_right">Derecha del icono</string>
-    <string name="status_bar_battery_text_charging_title">Porcentaje de batería al cargar</string>
-    <string name="status_bar_battery_text_charging_summary">Mostrar siempre el porcentaje de batería al cargar</string>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Indicadores de tráfico</string>
     <string name="network_traffic_state_title">Tráfico de red</string>
     <string name="network_traffic">Tráfico de red</string>
     <string name="network_traffic_location">Colocación del indicador de tráfico</string>
-    <string name="traffic_disabled">Desabilitado</string>
+    <string name="traffic_disabled">Deshabilitado</string>
     <string name="traffic_statusbar">Barra de estado</string>
     <string name="traffic_expanded_statusbar">Encabezado expandido</string>
     <string name="network_traffic_autohide_threshold_title">Umbral de ocultación automática de actividad neta (KB /s)</string>
@@ -733,7 +693,7 @@
     <string name="qs_footer_text_string_summary">Establecer como vacío por defecto</string>
     <!-- QS Header data uasge -->
     <string name="qs_datausage_title">Uso de datos en el encabezado QS</string>
-    <string name="qs_datausage_disabled">Desabilitado</string>
+    <string name="qs_datausage_disabled">Deshabilitado</string>
     <string name="qs_datausage_daily">Uso diario</string>
     <string name="qs_datausage_monthly">Uso mensual</string>
     <!-- Navbar options -->
@@ -762,7 +722,7 @@
     <string name="daylight_header_provider_title">Automático (basado en el tiempo)</string>
     <string name="file_header_provider_title">Estático</string>
     <string name="daylight_header_pack_title">Colección de imágenes</string>
-    <string name="header_provider_disabled">Desabilitado</string>
+    <string name="header_provider_disabled">Deshabilitado</string>
     <string name="custom_header_pick_title">Elija una imagen de la colección</string>
     <string name="custom_header_pick_summary">Seleccione una imagen de las colecciones de imágenes preinstaladas</string>
     <string name="file_header_select_title">Elija la imagen del almacenamiento</string>
@@ -794,7 +754,7 @@
     <string name="gaming_mode_ringer_dnd_title">No molestar</string>
     <string name="gaming_mode_ringer_silent_title">Silencio</string>
     <string name="gaming_mode_notifications_title">Indicación del modo de juego</string>
-    <string name="gaming_mode_notifications_off_title">Desabilitado</string>
+    <string name="gaming_mode_notifications_off_title">Deshabilitado</string>
     <string name="gaming_mode_notifications_notif_title">Muestra la notificación</string>
     <string name="gaming_mode_notifications_toast_title">Mostrar brindis</string>
     <string name="gaming_mode_notifications_all_title">Mostrar brindis y notificación</string>
@@ -839,7 +799,7 @@
     <string name="custom_carrier_label_explain">Please enter a new label. Leave blank to revert to stock label.</string>
     <string name="custom_carrier_label_notset">Custom label currently not set</string>
     <string name="show_carrier_title">Carrier label</string>
-    <string name="show_carrier_disabled">Desabilitado</string>
+    <string name="show_carrier_disabled">Deshabilitado</string>
     <string name="show_carrier_keyguard">Lockscreen only</string>
     <string name="show_carrier_statusbar">Statusbar only</string>
     <string name="show_carrier_enabled">Lockscreen &amp; statusbar</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <string name="status_bar_battery_style_title">Estilo de batería</string>
+    <string name="status_bar_battery_style_icon_portrait">Retrato de icono</string>
+    <string name="status_bar_battery_style_circle">Circulo</string>
+    <string name="status_bar_battery_style_dotted_circle">Círculo punteado</string>
+    <string name="status_bar_battery_style_filled_circle">Filled circle</string>
+    <string name="status_bar_battery_style_text">Texto</string>
+    <string name="status_bar_battery_style_hidden">Oculto</string>
+    <!-- Battery percentage -->
+    <string name="battery_percentage_title">Porcentaje de batería</string>
+    <string name="battery_percentage_default">Oculto (predeterminado)</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>
 </resources>
diff --git a/res/values-fa-rIR/cherish_strings.xml b/res/values-fa-rIR/cherish_strings.xml
index 6b8710d..9861667 100644
--- a/res/values-fa-rIR/cherish_strings.xml
+++ b/res/values-fa-rIR/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-fi-rFI/cherish_strings.xml b/res/values-fi-rFI/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-fi-rFI/cherish_strings.xml
+++ b/res/values-fi-rFI/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-fr-rFR/cherish_strings.xml b/res/values-fr-rFR/cherish_strings.xml
index 42c6062..7b7ccc0 100644
--- a/res/values-fr-rFR/cherish_strings.xml
+++ b/res/values-fr-rFR/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-hi-rIN/cherish_strings.xml b/res/values-hi-rIN/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-hi-rIN/cherish_strings.xml
+++ b/res/values-hi-rIN/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-hu-rHU/cherish_strings.xml b/res/values-hu-rHU/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-hu-rHU/cherish_strings.xml
+++ b/res/values-hu-rHU/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-in-rID/cherish_strings.xml b/res/values-in-rID/cherish_strings.xml
index 179cedc..5391af5 100644
--- a/res/values-in-rID/cherish_strings.xml
+++ b/res/values-in-rID/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">Saat memulai ulang juga menunjukkan opsi untuk pemulihan dan bootloader</string>
     <string name="global_actions_max_columns_title">Tindakan maksimal untuk ditampilkan</string>
     <string name="global_actions_max_columns_summary">Setel berapa banyak tindakan yang akan ditampilkan sebelum tombol berpindah ke menu tambahan</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Tingkat Baterai</string>
-    <!-- Battery mode -->
-    <string name="battery_percentage_title">Persentase Baterai</string>
-    <string name="battery_percentage_off">Dinonaktifkan</string>
-    <string name="battery_percentage_next">Diaktifkan</string>
-    <string name="battery_percentage_inside">Diaktifkan (ikon di dalam)</string>
-    <string name="battery_percentage_estimate">Diaktifkan (perkiraan)</string>
-    <string name="battery_percentage_percentage_estimate">Diaktifkan (persen | perkiraan)</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Gaya Baterai</string>
-    <string name="status_bar_battery_style_icon_portrait">Ikon potret</string>
-    <string name="status_bar_battery_style_icon_landscape">Ikon lanskap</string>
-    <string name="status_bar_battery_style_circle">Lingkaran</string>
-    <string name="status_bar_battery_style_dotted_circle">Lingkaran putus-putus</string>
-    <string name="status_bar_battery_style_big_circle">Lingkaran besar</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Lingkaran besar putus-putus</string>
-    <string name="status_bar_battery_style_square">Persegi</string>
-    <string name="status_bar_battery_style_solid">Padat</string>
-    <string name="status_bar_battery_style_text">Teks</string>
-    <string name="status_bar_battery_style_hidden">Tersembunyi</string>
-    <string name="status_bar_battery_style_q">Gaya Q</string>
-    <string name="status_bar_battery_style_tile_title">Timpa ubin baterai</string>
-    <string name="status_bar_battery_style_tile_summary">Gunakan gaya ikon yang sama seperti di atas pada ubin baterai QS</string>
-    <!-- Status bar - Battery custom charging symbol -->
-    <string name="text_charging_symbol_title">Simbol pengisian khusus untuk gaya teks</string>
-    <string name="text_charging_symbol_dialog">Simbol pengisian khusus di dekat teks persentase baterai</string>
-    <string name="text_charging_symbol_default">Dinonaktifkan</string>
-    <string name="text_charging_symbol_flash">Lampu Kilat</string>
-    <string name="text_charging_symbol_tilde">Tilde</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Persentase Baterai</string>
-    <string name="status_bar_battery_percentage_default">Tersembunyi</string>
-    <string name="status_bar_battery_percentage_text_inside">Di dalam ikon</string>
-    <string name="status_bar_battery_percentage_text_next">Di samping ikon</string>
-    <string name="status_bar_battery_text_position_title">Posisi persentase baterai</string>
-    <string name="status_bar_battery_text_position_left">Di sebelah kiri ikon</string>
-    <string name="status_bar_battery_text_position_right">Di sebelah kanan ikon</string>
-    <string name="status_bar_battery_text_charging_title">Persentase baterai saat pengisian</string>
-    <string name="status_bar_battery_text_charging_summary">Selalu tampilkan persentase baterai saat mengisi daya</string>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Indikator jaringan</string>
     <string name="network_traffic_state_title">Lalu lintas jaringan</string>
@@ -422,8 +382,8 @@
     <string name="lock_item_center">Rata tengah</string>
     <string name="lock_item_right">Rata kanan</string>
     <string name="lockscreen_item_padding_title">Padding Item Layar Kunci</string>
-    <string name="lockscreen_weather_alignment_title">Penjajaran Cuaca Layar Kunci</string>
-    <string name="lockscreen_weather_selection_title">Gaya Latar Belakang WeatherView</string>
+    <string name="lockscreen_weather_alignment_title">LS Weather Alignment</string>
+    <string name="lockscreen_weather_selection_title">WeatherView Background Style</string>
     <!-- Data disabled icon -->
     <string name="data_disabled_icon_title">Tampilkan ikon data dinonaktifkan</string>
     <string name="data_disabled_icon_summary">Menampilkan tanda silang di ikon sinyal saat data dinonaktifkan</string>
@@ -447,21 +407,21 @@
     <string name="lockscreen_hide_shortcuts_summary">Sembunyikan pintasan Kiri-Kanan pada layar kunci aman</string>
     <!-- Lockscreen weather -->
     <string name="lockscreen_weather_category">Cuaca</string>
-    <string name="lockscreen_weather_enabled_title">Tampilkan di Layar Kunci</string>
-    <string name="lockscreen_weather_enabled_summary">Tampilkan informasi cuaca di Layar Kunci dan saat tidur</string>
-    <string name="lockscreen_weather_settings_title">Atur pilihan cuaca</string>
-    <string name="lockscreen_weather_settings_summary">Atur paket ikon dan servis cuaca</string>
-    <string name="weather_config_title">Layanan cuaca</string>
-    <string name="weather_config_summary">Pengaturan layanan sistem</string>
-    <string name="header_weather_title">Tampilkan cuaca di panel atas</string>
-    <string name="header_weather_summary">Hidupkan notifikasi cuaca di atas panel pemberitahuan</string>
-    <string name="weather_icon_pack_title">Keadaan paket ikon</string>
-    <string name="weather_icon_pack_note">Catatan\u003a Anda dapat menginstal paket ikon baru dari Play Store dengan mencari \"Chronus ikon\"</string>
-    <string name="weather_icon_pack_info_title">Paket ikon kondisi digunakan dalam pengaturan cepat dan layar kunci</string>
+    <string name="lockscreen_weather_enabled_title">Show on lockscreen</string>
+    <string name="lockscreen_weather_enabled_summary">Show weather information on lockscreen and during doze</string>
+    <string name="lockscreen_weather_settings_title">Setup weather options</string>
+    <string name="lockscreen_weather_settings_summary">Setup icon pack and weather service</string>
+    <string name="weather_config_title">Weather service</string>
+    <string name="weather_config_summary">System service settings</string>
+    <string name="header_weather_title">Header view weather</string>
+    <string name="header_weather_summary">Enable notification panel header weather display</string>
+    <string name="weather_icon_pack_title">Condition icon pack</string>
+    <string name="weather_icon_pack_note">Note\u003a you can install new icon packs from play store by searching for \"Chronus icons\"</string>
+    <string name="weather_icon_pack_info_title">Condition icon pack is used in quick settings and lock screen</string>
     <!-- Lockscreen weather style -->
-    <string name="lockscreen_weather_style_title">Gaya Cuaca</string>
-    <string name="lockscreen_weather_omni_style_title">Gaya omni</string>
-    <string name="lockscreen_weather_pixel_style_title">Gaya Pixel</string>
+    <string name="lockscreen_weather_style_title">Weather style</string>
+    <string name="lockscreen_weather_omni_style_title">Omni style</string>
+    <string name="lockscreen_weather_pixel_style_title">Pixel style</string>
     <!-- Toast Animation -->
     <string name="toast_animation_title">Animasi Toast</string>
     <string name="toast_none_animation">Tidak ada</string>
@@ -713,19 +673,19 @@
     <string name="pixel_navbar_anim_title">Animasi Piksel</string>
     <string name="pixel_navbar_anim_summary">Alihkan animasi tombol beranda</string>
     <!-- LockWeather Switches -->
-    <string name="lockscreen_weather_show_city_title">Tampilkan nama kota</string>
-    <string name="lockscreen_weather_show_city_summary">Tampilkan nama kota saat ini di sebelah kiri gambar</string>
-    <string name="lockscreen_weather_show_temp_title">Tampilkan suhu</string>
-    <string name="lockscreen_weather_show_temp_summary">Tampilkan suhu kota saat ini di sebelah kanan gambar</string>
-    <string name="lockscreen_weather_show_image_title">Tampilkan Gambar Kondisi</string>
-    <string name="lockscreen_weather_show_image_summary">Tampilkan gambar kondisi cuaca</string>
+    <string name="lockscreen_weather_show_city_title">Show city name</string>
+    <string name="lockscreen_weather_show_city_summary">Show name of current city on left of image</string>
+    <string name="lockscreen_weather_show_temp_title">Show temperature</string>
+    <string name="lockscreen_weather_show_temp_summary">Show current city temperature on right of image</string>
+    <string name="lockscreen_weather_show_image_title">Show Condition Image</string>
+    <string name="lockscreen_weather_show_image_summary">Show weather conditions image</string>
     <!-- LS Weather Temp & City Fonts -->
-    <string name="lock_weather_temp_font_title">Font Suhu Cuaca Layar Kunci</string>
-    <string name="lock_weather_temp_font_summary">Ubah font default suhu cuaca layar kunci</string>
-    <string name="lock_weather_temp_font_dialog_title">Pilih kunci font suhu cuaca</string>
-    <string name="lock_weather_city_font_title">Font Kota Cuaca Layar Kunci</string>
-    <string name="lock_weather_city_font_summary">Ubah font default kota cuaca layar kunci</string>
-    <string name="lock_weather_city_dialog_title">Pilih kunci font kota cuaca</string>
+    <string name="lock_weather_temp_font_title">LS Weather Temp font</string>
+    <string name="lock_weather_temp_font_summary">Change the default font of the lockscreen weather temp</string>
+    <string name="lock_weather_temp_font_dialog_title">Select lock weather temp font</string>
+    <string name="lock_weather_city_font_title">LS Weather City font</string>
+    <string name="lock_weather_city_font_summary">Change the default font of the lockscreen weather city</string>
+    <string name="lock_weather_city_dialog_title">Select lock weather city font</string>
     <!-- QS Footer Text -->
     <string name="qs_footer_text_title">Teks pada footer QS</string>
     <string name="qs_footer_text_summary">Tampilkan teks di bagian bawah panel QS</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Kolom ubin pada tampilan potret</string>
     <string name="qs_columns_landscape_title">Kolom ubin pada tampian mendatar</string>
     <string name="qs_tile_title_visibility_title">Tampilkan judul ikon</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <string name="status_bar_battery_style_title">Gaya Baterai</string>
+    <string name="status_bar_battery_style_icon_portrait">Ikon potret</string>
+    <string name="status_bar_battery_style_circle">Lingkaran</string>
+    <string name="status_bar_battery_style_dotted_circle">Lingkaran putus-putus</string>
+    <string name="status_bar_battery_style_filled_circle">Filled circle</string>
+    <string name="status_bar_battery_style_text">Teks</string>
+    <string name="status_bar_battery_style_hidden">Tersembunyi</string>
+    <!-- Battery percentage -->
+    <string name="battery_percentage_title">Persentase Baterai</string>
+    <string name="battery_percentage_default">Tersembunyi (bawaan)</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>
 </resources>
diff --git a/res/values-it-rIT/cherish_strings.xml b/res/values-it-rIT/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-it-rIT/cherish_strings.xml
+++ b/res/values-it-rIT/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-iw-rIL/cherish_strings.xml b/res/values-iw-rIL/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-iw-rIL/cherish_strings.xml
+++ b/res/values-iw-rIL/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-ja-rJP/cherish_strings.xml b/res/values-ja-rJP/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-ja-rJP/cherish_strings.xml
+++ b/res/values-ja-rJP/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-ko-rKR/cherish_strings.xml b/res/values-ko-rKR/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-ko-rKR/cherish_strings.xml
+++ b/res/values-ko-rKR/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-la-rLA/cherish_strings.xml b/res/values-la-rLA/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-la-rLA/cherish_strings.xml
+++ b/res/values-la-rLA/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-lo-rLA/cherish_strings.xml b/res/values-lo-rLA/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-lo-rLA/cherish_strings.xml
+++ b/res/values-lo-rLA/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-ne-rNP/cherish_strings.xml b/res/values-ne-rNP/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-ne-rNP/cherish_strings.xml
+++ b/res/values-ne-rNP/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-nl-rNL/cherish_strings.xml b/res/values-nl-rNL/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-nl-rNL/cherish_strings.xml
+++ b/res/values-nl-rNL/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-no-rNO/cherish_strings.xml b/res/values-no-rNO/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-no-rNO/cherish_strings.xml
+++ b/res/values-no-rNO/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-pl-rPL/cherish_strings.xml b/res/values-pl-rPL/cherish_strings.xml
index 77bde44..b828c21 100644
--- a/res/values-pl-rPL/cherish_strings.xml
+++ b/res/values-pl-rPL/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-pt-rBR/cherish_strings.xml b/res/values-pt-rBR/cherish_strings.xml
index 6b45684..2d93ddd 100644
--- a/res/values-pt-rBR/cherish_strings.xml
+++ b/res/values-pt-rBR/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">Ao reiniciar também mostra opções para recuperação e bootloader</string>
     <string name="global_actions_max_columns_title">Máximo de ações para mostrar</string>
     <string name="global_actions_max_columns_summary">Definir quantas ações mostrar antes que os botões movam para o menu flutuante</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Nível da bateria</string>
-    <!-- Battery mode -->
-    <string name="battery_percentage_title">Porcentagem da bateria</string>
-    <string name="battery_percentage_off">Desabilitado</string>
-    <string name="battery_percentage_next">Ativado</string>
-    <string name="battery_percentage_inside">Ativado (dentro do ícone)</string>
-    <string name="battery_percentage_estimate">Ativado (estimativa)</string>
-    <string name="battery_percentage_percentage_estimate">Ativado (porcentagem | estimativa)</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Estilo de bateria</string>
-    <string name="status_bar_battery_style_icon_portrait">Ícone em modo retrato</string>
-    <string name="status_bar_battery_style_icon_landscape">Ícone em modo paisagem</string>
-    <string name="status_bar_battery_style_circle">Círculo</string>
-    <string name="status_bar_battery_style_dotted_circle">Círculo pontilhado</string>
-    <string name="status_bar_battery_style_big_circle">Círculo grande</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Círculo pontilhado grande</string>
-    <string name="status_bar_battery_style_square">Quadrado</string>
-    <string name="status_bar_battery_style_solid">Sólido</string>
-    <string name="status_bar_battery_style_text">Texto</string>
-    <string name="status_bar_battery_style_hidden">Oculto</string>
-    <string name="status_bar_battery_style_q">Estilo Android Q</string>
-    <string name="status_bar_battery_style_tile_title">Substituir o bloco da bateria</string>
-    <string name="status_bar_battery_style_tile_summary">Usar o mesmo estilo de ícone como acima no bloco da bateria nas configurações rápidas</string>
-    <!-- Status bar - Battery custom charging symbol -->
-    <string name="text_charging_symbol_title">Ícone de carregamento personalizado para o estilo texto</string>
-    <string name="text_charging_symbol_dialog">Ícone de carregamento personalizado perto do texto de bateria</string>
-    <string name="text_charging_symbol_default">Desabilitado</string>
-    <string name="text_charging_symbol_flash">Raio</string>
-    <string name="text_charging_symbol_tilde">Linear</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Porcentagem da bateria</string>
-    <string name="status_bar_battery_percentage_default">Oculto</string>
-    <string name="status_bar_battery_percentage_text_inside">Dentro do ícone</string>
-    <string name="status_bar_battery_percentage_text_next">Ao lado do ícone</string>
-    <string name="status_bar_battery_text_position_title">Posição da Porcentagem de bateria</string>
-    <string name="status_bar_battery_text_position_left">À esquerda do ícone</string>
-    <string name="status_bar_battery_text_position_right">À Direita do ícone</string>
-    <string name="status_bar_battery_text_charging_title">Porcentagem da bateria ao carregar</string>
-    <string name="status_bar_battery_text_charging_summary">Sempre exibir a porcentagem da bateria ao carregar</string>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Indicadores de tráfego</string>
     <string name="network_traffic_state_title">Tráfego de rede</string>
@@ -422,8 +382,8 @@
     <string name="lock_item_center">Centralizar</string>
     <string name="lock_item_right">Alinhado à direita</string>
     <string name="lockscreen_item_padding_title">Preenchimento da tela de bloqueio</string>
-    <string name="lockscreen_weather_alignment_title">Alinhamento do Tempo LS</string>
-    <string name="lockscreen_weather_selection_title">Estilo de fundo WeatherView</string>
+    <string name="lockscreen_weather_alignment_title">LS Weather Alignment</string>
+    <string name="lockscreen_weather_selection_title">WeatherView Background Style</string>
     <!-- Data disabled icon -->
     <string name="data_disabled_icon_title">Exibir ícone de dados desativados</string>
     <string name="data_disabled_icon_summary">Mostrar um X no ícone do sinal de rede quando os dados móveis estiverem desligados</string>
@@ -447,21 +407,21 @@
     <string name="lockscreen_hide_shortcuts_summary">Esconder os atalhos da esquerda-direita nas telas de bloqueio seguras</string>
     <!-- Lockscreen weather -->
     <string name="lockscreen_weather_category">Clima</string>
-    <string name="lockscreen_weather_enabled_title">Mostrar na tela de bloqueio</string>
-    <string name="lockscreen_weather_enabled_summary">Mostrar informações sobre o tempo na tela de bloqueio e durante o modo doze</string>
-    <string name="lockscreen_weather_settings_title">Mostrar opções de tempo</string>
-    <string name="lockscreen_weather_settings_summary">Selecionar Ícones de clima e configurações de clima</string>
-    <string name="weather_config_title">Serviço meteorológico</string>
-    <string name="weather_config_summary">Configurações de serviço do sistema</string>
-    <string name="header_weather_title">Mostrar clima no cabeçalho</string>
-    <string name="header_weather_summary">Ativar notificação de clima no cabeçalho do painel de notificações</string>
-    <string name="weather_icon_pack_title">Pacote de ícones climáticos</string>
-    <string name="weather_icon_pack_note">Nota\u003a Você pode instalar novos pacotes de ícones da play store procurando por \"Chronus icons\"</string>
-    <string name="weather_icon_pack_info_title">O pacote de ícones de condições é usado em configurações rápidas e na tela de bloqueio</string>
+    <string name="lockscreen_weather_enabled_title">Show on lockscreen</string>
+    <string name="lockscreen_weather_enabled_summary">Show weather information on lockscreen and during doze</string>
+    <string name="lockscreen_weather_settings_title">Setup weather options</string>
+    <string name="lockscreen_weather_settings_summary">Setup icon pack and weather service</string>
+    <string name="weather_config_title">Weather service</string>
+    <string name="weather_config_summary">System service settings</string>
+    <string name="header_weather_title">Header view weather</string>
+    <string name="header_weather_summary">Enable notification panel header weather display</string>
+    <string name="weather_icon_pack_title">Condition icon pack</string>
+    <string name="weather_icon_pack_note">Note\u003a you can install new icon packs from play store by searching for \"Chronus icons\"</string>
+    <string name="weather_icon_pack_info_title">Condition icon pack is used in quick settings and lock screen</string>
     <!-- Lockscreen weather style -->
-    <string name="lockscreen_weather_style_title">Estilo do Clima</string>
-    <string name="lockscreen_weather_omni_style_title">Estilo Omni</string>
-    <string name="lockscreen_weather_pixel_style_title">Estilo Pixel</string>
+    <string name="lockscreen_weather_style_title">Weather style</string>
+    <string name="lockscreen_weather_omni_style_title">Omni style</string>
+    <string name="lockscreen_weather_pixel_style_title">Pixel style</string>
     <!-- Toast Animation -->
     <string name="toast_animation_title">Animação do Toast</string>
     <string name="toast_none_animation">Nenhum</string>
@@ -713,19 +673,19 @@
     <string name="pixel_navbar_anim_title">Animação do Pixel</string>
     <string name="pixel_navbar_anim_summary">Alternar animação do botão inicio</string>
     <!-- LockWeather Switches -->
-    <string name="lockscreen_weather_show_city_title">Mostrar nome da cidade</string>
-    <string name="lockscreen_weather_show_city_summary">Mostrar o nome da cidade atual à esquerda da imagem</string>
-    <string name="lockscreen_weather_show_temp_title">Mostrar temperatura</string>
-    <string name="lockscreen_weather_show_temp_summary">Mostrar a temperatura atual da cidade à direita da imagem</string>
-    <string name="lockscreen_weather_show_image_title">Mostrar condição da imagem</string>
-    <string name="lockscreen_weather_show_image_summary">Mostrar imagem das condições do clima</string>
+    <string name="lockscreen_weather_show_city_title">Show city name</string>
+    <string name="lockscreen_weather_show_city_summary">Show name of current city on left of image</string>
+    <string name="lockscreen_weather_show_temp_title">Show temperature</string>
+    <string name="lockscreen_weather_show_temp_summary">Show current city temperature on right of image</string>
+    <string name="lockscreen_weather_show_image_title">Show Condition Image</string>
+    <string name="lockscreen_weather_show_image_summary">Show weather conditions image</string>
     <!-- LS Weather Temp & City Fonts -->
-    <string name="lock_weather_temp_font_title">Fonte do clima da tela de bloqueio</string>
-    <string name="lock_weather_temp_font_summary">Alterar a fonte padrão da data na tela de bloqueio</string>
-    <string name="lock_weather_temp_font_dialog_title">Selecionar a fonte do tempo na tela de bloqueio</string>
-    <string name="lock_weather_city_font_title">Fonte do clima da tela de bloqueio</string>
-    <string name="lock_weather_city_font_summary">Alterar a fonte padrão da cidade do tempo da tela de bloqueio</string>
-    <string name="lock_weather_city_dialog_title">Selecionar fonte da cidade na tela de bloqueio</string>
+    <string name="lock_weather_temp_font_title">LS Weather Temp font</string>
+    <string name="lock_weather_temp_font_summary">Change the default font of the lockscreen weather temp</string>
+    <string name="lock_weather_temp_font_dialog_title">Select lock weather temp font</string>
+    <string name="lock_weather_city_font_title">LS Weather City font</string>
+    <string name="lock_weather_city_font_summary">Change the default font of the lockscreen weather city</string>
+    <string name="lock_weather_city_dialog_title">Select lock weather city font</string>
     <!-- QS Footer Text -->
     <string name="qs_footer_text_title">Texto do rodapé</string>
     <string name="qs_footer_text_summary">Exibir texto na parte inferior do painel de configurações rápidas</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Número de colunas em retrato</string>
     <string name="qs_columns_landscape_title">Número de colunas em paisagem</string>
     <string name="qs_tile_title_visibility_title">Exibir o título dos ícones</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <string name="status_bar_battery_style_title">Estilo de bateria</string>
+    <string name="status_bar_battery_style_icon_portrait">Ícone em modo retrato</string>
+    <string name="status_bar_battery_style_circle">Círculo</string>
+    <string name="status_bar_battery_style_dotted_circle">Círculo pontilhado</string>
+    <string name="status_bar_battery_style_filled_circle">Filled circle</string>
+    <string name="status_bar_battery_style_text">Texto</string>
+    <string name="status_bar_battery_style_hidden">Oculto</string>
+    <!-- Battery percentage -->
+    <string name="battery_percentage_title">Porcentagem da bateria</string>
+    <string name="battery_percentage_default">Oculto (padrão)</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>
 </resources>
diff --git a/res/values-pt-rPT/cherish_strings.xml b/res/values-pt-rPT/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-pt-rPT/cherish_strings.xml
+++ b/res/values-pt-rPT/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-ro-rRO/cherish_strings.xml b/res/values-ro-rRO/cherish_strings.xml
index 89c83bb..83e3ccc 100644
--- a/res/values-ro-rRO/cherish_strings.xml
+++ b/res/values-ro-rRO/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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">Dezactivat</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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">Ascuns</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">Dezactivat</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">Ascuns</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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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">Ascuns</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>
 </resources>
diff --git a/res/values-ru-rRU/cherish_strings.xml b/res/values-ru-rRU/cherish_strings.xml
index 2d025b9..234396e 100644
--- a/res/values-ru-rRU/cherish_strings.xml
+++ b/res/values-ru-rRU/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">При перезагрузке показывать вариант перезагрузки в Recovery и Bootloader</string>
     <string name="global_actions_max_columns_title">Максимальное количество действий для отображения</string>
     <string name="global_actions_max_columns_summary">Установить количество действий для отображения перед перемещением кнопок в переполненном меню</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Уровень заряда батареи</string>
-    <!-- Battery mode -->
-    <string name="battery_percentage_title">Процент заряда батареи</string>
-    <string name="battery_percentage_off">Выключен</string>
-    <string name="battery_percentage_next">Включено</string>
-    <string name="battery_percentage_inside">Включено (внутри значка)</string>
-    <string name="battery_percentage_estimate">Включено (оценка уровня заряда)</string>
-    <string name="battery_percentage_percentage_estimate">Включено (процент | оценка уровня заряда)</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Стиль значка батареи</string>
-    <string name="status_bar_battery_style_icon_portrait">Вертикальный значок</string>
-    <string name="status_bar_battery_style_icon_landscape">Горизонтальный значок</string>
-    <string name="status_bar_battery_style_circle">Круг</string>
-    <string name="status_bar_battery_style_dotted_circle">Точечный круг</string>
-    <string name="status_bar_battery_style_big_circle">Большой круг</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Большой точечный круг</string>
-    <string name="status_bar_battery_style_square">Квадрат</string>
-    <string name="status_bar_battery_style_solid">Сплошная</string>
-    <string name="status_bar_battery_style_text">Текст</string>
-    <string name="status_bar_battery_style_hidden">Скрывать</string>
-    <string name="status_bar_battery_style_q">Стиль Android Q</string>
-    <string name="status_bar_battery_style_tile_title">Пользовательский стиль плитки батареи</string>
-    <string name="status_bar_battery_style_tile_summary">Разрешить устанавливать тот же стиль значка батареи, что и в строке состояния</string>
-    <!-- Status bar - Battery custom charging symbol -->
-    <string name="text_charging_symbol_title">Пользовательский символ зарядки для текстового стиля</string>
-    <string name="text_charging_symbol_dialog">Символ зарядки рядом с процентом заряда</string>
-    <string name="text_charging_symbol_default">Выключен</string>
-    <string name="text_charging_symbol_flash">Вспышка</string>
-    <string name="text_charging_symbol_tilde">Тильда</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Процент заряда батареи</string>
-    <string name="status_bar_battery_percentage_default">Скрывать</string>
-    <string name="status_bar_battery_percentage_text_inside">Внутри значка</string>
-    <string name="status_bar_battery_percentage_text_next">Рядом со значком</string>
-    <string name="status_bar_battery_text_position_title">Положение процента заряда батареи</string>
-    <string name="status_bar_battery_text_position_left">Слева от значка</string>
-    <string name="status_bar_battery_text_position_right">Справа от значка</string>
-    <string name="status_bar_battery_text_charging_title">Процент использования батареи при зарядке</string>
-    <string name="status_bar_battery_text_charging_summary">Всегда отображать процент использования батареи при зарядке</string>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Индикатор скорости сети</string>
     <string name="network_traffic_state_title">Трафик сети</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <string name="status_bar_battery_style_title">Стиль значка батареи</string>
+    <string name="status_bar_battery_style_icon_portrait">Вертикальный значок</string>
+    <string name="status_bar_battery_style_circle">Круг</string>
+    <string name="status_bar_battery_style_dotted_circle">Точечный круг</string>
+    <string name="status_bar_battery_style_filled_circle">Filled circle</string>
+    <string name="status_bar_battery_style_text">Текст</string>
+    <string name="status_bar_battery_style_hidden">Скрывать</string>
+    <!-- Battery percentage -->
+    <string name="battery_percentage_title">Процент заряда батареи</string>
+    <string name="battery_percentage_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>
 </resources>
diff --git a/res/values-sr-rSP/cherish_strings.xml b/res/values-sr-rSP/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-sr-rSP/cherish_strings.xml
+++ b/res/values-sr-rSP/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-sv-rSE/cherish_strings.xml b/res/values-sv-rSE/cherish_strings.xml
index 72000b7..ef6f675 100644
--- a/res/values-sv-rSE/cherish_strings.xml
+++ b/res/values-sv-rSE/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>
diff --git a/res/values-tr-rTR/cherish_strings.xml b/res/values-tr-rTR/cherish_strings.xml
index df97b28..cfa48c8 100644
--- a/res/values-tr-rTR/cherish_strings.xml
+++ b/res/values-tr-rTR/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">Yeniden başlatılırken kurtarma ve önyükleyici seçeneklerini göster</string>
     <string name="global_actions_max_columns_title">Maksimum gösterilecek işlem</string>
     <string name="global_actions_max_columns_summary">Overflow menüsünü açmadan önce kaç tane işlem görüntüleneceğini belirleyin</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Pil seviyesi</string>
-    <!-- Battery mode -->
-    <string name="battery_percentage_title">Pil yüzdesi</string>
-    <string name="battery_percentage_off">Devre dışı</string>
-    <string name="battery_percentage_next">Etkin</string>
-    <string name="battery_percentage_inside">Etkin (simge içinde)</string>
-    <string name="battery_percentage_estimate">Etkin (tahmini süre)</string>
-    <string name="battery_percentage_percentage_estimate">Etkin (yüzde | tahmini süre)</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Pil stili</string>
-    <string name="status_bar_battery_style_icon_portrait">Dikey simge</string>
-    <string name="status_bar_battery_style_icon_landscape">Yatay simge</string>
-    <string name="status_bar_battery_style_circle">Daire</string>
-    <string name="status_bar_battery_style_dotted_circle">Noktalı daire</string>
-    <string name="status_bar_battery_style_big_circle">Büyük daire</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Büyük noktalı daire</string>
-    <string name="status_bar_battery_style_square">Kare</string>
-    <string name="status_bar_battery_style_solid">İçidolu</string>
-    <string name="status_bar_battery_style_text">Metin</string>
-    <string name="status_bar_battery_style_hidden">Gizli</string>
-    <string name="status_bar_battery_style_q">Q stili</string>
-    <string name="status_bar_battery_style_tile_title">Pil karesini geçersiz kıl</string>
-    <string name="status_bar_battery_style_tile_summary">Hızlı ayarlar pil karesinde yukarıdaki ile aynı simge stilini kullanın</string>
-    <!-- Status bar - Battery custom charging symbol -->
-    <string name="text_charging_symbol_title">Metin stili için özel şarj sembolü</string>
-    <string name="text_charging_symbol_dialog">Pil yüzdesi metninin yanında özel şarj simgesi</string>
-    <string name="text_charging_symbol_default">Devre dışı</string>
-    <string name="text_charging_symbol_flash">Flaş</string>
-    <string name="text_charging_symbol_tilde">Yaklaşık</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Pil yüzdesi</string>
-    <string name="status_bar_battery_percentage_default">Gizli</string>
-    <string name="status_bar_battery_percentage_text_inside">Simgenin içinde</string>
-    <string name="status_bar_battery_percentage_text_next">Simgenin yanında</string>
-    <string name="status_bar_battery_text_position_title">Pil yüzdesi konumu</string>
-    <string name="status_bar_battery_text_position_left">Simgenin solunda</string>
-    <string name="status_bar_battery_text_position_right">Simgenin sağında</string>
-    <string name="status_bar_battery_text_charging_title">Şarj olurken pil yüzdesi</string>
-    <string name="status_bar_battery_text_charging_summary">Şarj olurken her zaman pil yüzdesini göster</string>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Ağ göstergeleri</string>
     <string name="network_traffic_state_title">Ağ trafiği</string>
@@ -422,8 +382,8 @@
     <string name="lock_item_center">Ortaya hizalı</string>
     <string name="lock_item_right">Sağa hizalı</string>
     <string name="lockscreen_item_padding_title">Kilit Ekranı Öğeleri Dolgu</string>
-    <string name="lockscreen_weather_alignment_title">Kilit Ekranı Hava durumu Hizalaması</string>
-    <string name="lockscreen_weather_selection_title">Hava Durumu Görünümü Arka Plan Stili</string>
+    <string name="lockscreen_weather_alignment_title">LS Weather Alignment</string>
+    <string name="lockscreen_weather_selection_title">WeatherView Background Style</string>
     <!-- Data disabled icon -->
     <string name="data_disabled_icon_title">Mobil Veri devre dışı simgesi</string>
     <string name="data_disabled_icon_summary">Mobil veri devre dışı bırakıldığında sinyal çubuğunun yanında çarpı işareti gösterir</string>
@@ -447,21 +407,21 @@
     <string name="lockscreen_hide_shortcuts_summary">Güvenli kilit ekranında sağ ve sol alt kısayolları gizle</string>
     <!-- Lockscreen weather -->
     <string name="lockscreen_weather_category">Hava Durumu</string>
-    <string name="lockscreen_weather_enabled_title">Kilit ekranında göster</string>
-    <string name="lockscreen_weather_enabled_summary">Kilit ekranı ve doze sırasında hava durumu bilgilerini göster</string>
-    <string name="lockscreen_weather_settings_title">Hava durumu seçeneklerini ayarla</string>
-    <string name="lockscreen_weather_settings_summary">Simge paketi ve hava durumu servisini ayarla</string>
-    <string name="weather_config_title">Hava durumu kaynağı</string>
-    <string name="weather_config_summary">Sistem servisi ayarları</string>
-    <string name="header_weather_title">Başlık görünümünde hava durumu</string>
-    <string name="header_weather_summary">Bildirim paneli başlığında hava durumu görüntüsünü etkinleştir</string>
-    <string name="weather_icon_pack_title">Hava durumu simge paketi</string>
-    <string name="weather_icon_pack_note">Not\u003a Play Store\'den \"Chronus icons\" araması yaparak yeni simge paketleri yükleyebilirsiniz</string>
-    <string name="weather_icon_pack_info_title">Hava Durumu simge paketi hızlı ayarlarda ve kilit ekranında kullanılır</string>
+    <string name="lockscreen_weather_enabled_title">Show on lockscreen</string>
+    <string name="lockscreen_weather_enabled_summary">Show weather information on lockscreen and during doze</string>
+    <string name="lockscreen_weather_settings_title">Setup weather options</string>
+    <string name="lockscreen_weather_settings_summary">Setup icon pack and weather service</string>
+    <string name="weather_config_title">Weather service</string>
+    <string name="weather_config_summary">System service settings</string>
+    <string name="header_weather_title">Header view weather</string>
+    <string name="header_weather_summary">Enable notification panel header weather display</string>
+    <string name="weather_icon_pack_title">Condition icon pack</string>
+    <string name="weather_icon_pack_note">Note\u003a you can install new icon packs from play store by searching for \"Chronus icons\"</string>
+    <string name="weather_icon_pack_info_title">Condition icon pack is used in quick settings and lock screen</string>
     <!-- Lockscreen weather style -->
-    <string name="lockscreen_weather_style_title">Hava durumu stili</string>
-    <string name="lockscreen_weather_omni_style_title">Omni stili</string>
-    <string name="lockscreen_weather_pixel_style_title">Piksel stili</string>
+    <string name="lockscreen_weather_style_title">Weather style</string>
+    <string name="lockscreen_weather_omni_style_title">Omni style</string>
+    <string name="lockscreen_weather_pixel_style_title">Pixel style</string>
     <!-- Toast Animation -->
     <string name="toast_animation_title">Toast Animasyonu</string>
     <string name="toast_none_animation">Hiçbiri</string>
@@ -713,19 +673,19 @@
     <string name="pixel_navbar_anim_title">Piksel animasyonu</string>
     <string name="pixel_navbar_anim_summary">Ana ekran tuşu animasyonunu değiştir</string>
     <!-- LockWeather Switches -->
-    <string name="lockscreen_weather_show_city_title">Şehir adını göster</string>
-    <string name="lockscreen_weather_show_city_summary">Görüntünün solunda mevcut şehrin adını göster</string>
-    <string name="lockscreen_weather_show_temp_title">Sıcaklığı göster</string>
-    <string name="lockscreen_weather_show_temp_summary">Görüntünün sağında mevcut şehir sıcaklığını göster</string>
-    <string name="lockscreen_weather_show_image_title">Durum görüntüsünü göster</string>
-    <string name="lockscreen_weather_show_image_summary">Hava Durumu Simgesini Göster</string>
+    <string name="lockscreen_weather_show_city_title">Show city name</string>
+    <string name="lockscreen_weather_show_city_summary">Show name of current city on left of image</string>
+    <string name="lockscreen_weather_show_temp_title">Show temperature</string>
+    <string name="lockscreen_weather_show_temp_summary">Show current city temperature on right of image</string>
+    <string name="lockscreen_weather_show_image_title">Show Condition Image</string>
+    <string name="lockscreen_weather_show_image_summary">Show weather conditions image</string>
     <!-- LS Weather Temp & City Fonts -->
-    <string name="lock_weather_temp_font_title">Kilit ekranı hava durumu yazı tipi</string>
-    <string name="lock_weather_temp_font_summary">Kilit ekranı hava sıcaklığının varsayılan yazı tipini değiştirin</string>
-    <string name="lock_weather_temp_font_dialog_title">Kilit ekranı hava sıcaklığı yazı tipini seçin</string>
-    <string name="lock_weather_city_font_title">Kilit ekranı hava durumu Şehir yazı tipi</string>
-    <string name="lock_weather_city_font_summary">Kilit ekranı hava durumunun varsayılan şehir yazı tipini değiştir</string>
-    <string name="lock_weather_city_dialog_title">Kilit ekranı hava durumu şehir yazı tipini seçin</string>
+    <string name="lock_weather_temp_font_title">LS Weather Temp font</string>
+    <string name="lock_weather_temp_font_summary">Change the default font of the lockscreen weather temp</string>
+    <string name="lock_weather_temp_font_dialog_title">Select lock weather temp font</string>
+    <string name="lock_weather_city_font_title">LS Weather City font</string>
+    <string name="lock_weather_city_font_summary">Change the default font of the lockscreen weather city</string>
+    <string name="lock_weather_city_dialog_title">Select lock weather city font</string>
     <!-- QS Footer Text -->
     <string name="qs_footer_text_title">Hızlı ayarlar altbilgi metni</string>
     <string name="qs_footer_text_summary">Hızlı ayarlar panelinin en altında metni görüntüle</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Dikey modda kare sütunları</string>
     <string name="qs_columns_landscape_title">Yatay modda kare sütunları</string>
     <string name="qs_tile_title_visibility_title">Kare başlıklarını göster</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <string name="status_bar_battery_style_title">Pil stili</string>
+    <string name="status_bar_battery_style_icon_portrait">Dikey simge</string>
+    <string name="status_bar_battery_style_circle">Daire</string>
+    <string name="status_bar_battery_style_dotted_circle">Noktalı daire</string>
+    <string name="status_bar_battery_style_filled_circle">Filled circle</string>
+    <string name="status_bar_battery_style_text">Metin</string>
+    <string name="status_bar_battery_style_hidden">Gizli</string>
+    <!-- Battery percentage -->
+    <string name="battery_percentage_title">Pil yüzdesi</string>
+    <string name="battery_percentage_default">Gizli (varsayılan)</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>
 </resources>
diff --git a/res/values-uk-rUA/cherish_strings.xml b/res/values-uk-rUA/cherish_strings.xml
index 40f732f..65384fe 100644
--- a/res/values-uk-rUA/cherish_strings.xml
+++ b/res/values-uk-rUA/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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">Вимкнено</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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">Прихований</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">Вимкнено</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">Прихований</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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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">Прихований</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>
 </resources>
diff --git a/res/values-vi-rVN/cherish_strings.xml b/res/values-vi-rVN/cherish_strings.xml
index 62f56ac..3b848e5 100644
--- a/res/values-vi-rVN/cherish_strings.xml
+++ b/res/values-vi-rVN/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">Khi khởi động lại hiển thị tùy chọn vào chế độ phục hồi và bộ nạp khởi động</string>
     <string name="global_actions_max_columns_title">Hiện thị hành động tối đa</string>
     <string name="global_actions_max_columns_summary">Đặt số lượng hành động sẽ hiển thị trước khi các nút chuyển sang menu mục bổ sung</string>
-    <!-- Battery Styles -->
-    <string name="battery_style_category_title">Mức pin</string>
-    <!-- Battery mode -->
-    <string name="battery_percentage_title">Phần trăm pin</string>
-    <string name="battery_percentage_off">Tắt</string>
-    <string name="battery_percentage_next">Bật</string>
-    <string name="battery_percentage_inside">Đã bật (biểu tượng bên trong)</string>
-    <string name="battery_percentage_estimate">Đã bật (ước tính)</string>
-    <string name="battery_percentage_percentage_estimate">Đã bật (phần trăm | ước tính)</string>
-    <!-- Status bar - Battery -->
-    <string name="status_bar_battery_style_title">Kiểu pin</string>
-    <string name="status_bar_battery_style_icon_portrait">Biểu tượng dọc</string>
-    <string name="status_bar_battery_style_icon_landscape">Biểu tượng ngang</string>
-    <string name="status_bar_battery_style_circle">Vòng tròn</string>
-    <string name="status_bar_battery_style_dotted_circle">Vòng tròn chấm</string>
-    <string name="status_bar_battery_style_big_circle">Vòng tròn lớn</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Vòng tròn lớn chấm</string>
-    <string name="status_bar_battery_style_square">Vuông</string>
-    <string name="status_bar_battery_style_solid">Khối</string>
-    <string name="status_bar_battery_style_text">Văn bản</string>
-    <string name="status_bar_battery_style_hidden">Ẩn</string>
-    <string name="status_bar_battery_style_q">Android Q</string>
-    <string name="status_bar_battery_style_tile_title">Ghi đè lên biểu tượng pin</string>
-    <string name="status_bar_battery_style_tile_summary">Sử dụng phong cách biểu tượng tương tự trên QS</string>
-    <!-- Status bar - Battery custom charging symbol -->
-    <string name="text_charging_symbol_title">Ký hiệu sạc tùy chỉnh cho kiểu chữ</string>
-    <string name="text_charging_symbol_dialog">Ký tự sạc tùy chỉnh gần số phần trăm pin</string>
-    <string name="text_charging_symbol_default">Tắt</string>
-    <string name="text_charging_symbol_flash">Đèn flash</string>
-    <string name="text_charging_symbol_tilde">Dấu ngã</string>
-    <!-- Status bar - Battery percentage -->
-    <string name="status_bar_battery_percentage_title">Phần trăm pin</string>
-    <string name="status_bar_battery_percentage_default">Ẩn</string>
-    <string name="status_bar_battery_percentage_text_inside">Bên trong biểu tượng pin</string>
-    <string name="status_bar_battery_percentage_text_next">Bên cạnh biểu tượng pin</string>
-    <string name="status_bar_battery_text_position_title">Ví trí hiển thị dung lượng pin</string>
-    <string name="status_bar_battery_text_position_left">Bên trái biểu tượng pin</string>
-    <string name="status_bar_battery_text_position_right">Bên phải biểu tượng pin</string>
-    <string name="status_bar_battery_text_charging_title">Hiển thị phần trăm pin lúc sạc</string>
-    <string name="status_bar_battery_text_charging_summary">Luôn hiển thị dung lượng pin lúc sạc</string>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Hiển thị tốc độ mạng</string>
     <string name="network_traffic_state_title">Tốc độ mạng</string>
@@ -448,7 +408,7 @@
     <!-- Lockscreen weather -->
     <string name="lockscreen_weather_category">Thời tiết</string>
     <string name="lockscreen_weather_enabled_title">Hiển thị trên màn hình khóa</string>
-    <string name="lockscreen_weather_enabled_summary">Hiển thị thông tin thời tiết trên màn hình khóa và trong khi ngủ gật</string>
+    <string name="lockscreen_weather_enabled_summary">Hiển thị thông tin thời tiết trên màn hình khóa và trong khi ngủ</string>
     <string name="lockscreen_weather_settings_title">Cài đặt tùy chọn thời tiết</string>
     <string name="lockscreen_weather_settings_summary">Cài đặt gói biểu tượng và dịch vụ thời tiết</string>
     <string name="weather_config_title">Dịch vụ thời tiết</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Số cột theo chiều dọc</string>
     <string name="qs_columns_landscape_title">Số cột theo chiều ngang</string>
     <string name="qs_tile_title_visibility_title">Hiển thị ô tiêu đề</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Dung lượng pin trên thanh trạng thái</string>
+    <string name="battery_percent_summary">Thiết lập biểu tượng và phần trăm pin trên thanh trạng thái</string>
+    <string name="status_bar_battery_style_title">Kiểu pin</string>
+    <string name="status_bar_battery_style_icon_portrait">Biểu tượng dọc</string>
+    <string name="status_bar_battery_style_circle">Vòng tròn</string>
+    <string name="status_bar_battery_style_dotted_circle">Vòng tròn chấm</string>
+    <string name="status_bar_battery_style_filled_circle">Vòng tròn kín</string>
+    <string name="status_bar_battery_style_text">Văn bản</string>
+    <string name="status_bar_battery_style_hidden">Ẩn</string>
+    <!-- Battery percentage -->
+    <string name="battery_percentage_title">Phần trăm pin</string>
+    <string name="battery_percentage_default">Ẩn (mặc định)</string>
+    <string name="battery_percentage_text_inside">Bên trong biểu tượng pin</string>
+    <string name="battery_percentage_text_next">Bên cạnh biểu tượng pin</string>
+    <string name="battery_text_charging_title">Hiển thị phần trăm pin lúc sạc</string>
+    <string name="battery_text_charging_summary">Luôn hiển thị dung lượng pin lúc sạc</string>
+    <!-- Battery estimate -->
+    <string name="battery_estimate_title">Ước tính pin</string>
+    <string name="battery_estimate_summary">Hiển thị thời lượng pin còn lại ước tính khi khả dụng</string>
 </resources>
diff --git a/res/values-zh-rCN/cherish_strings.xml b/res/values-zh-rCN/cherish_strings.xml
index 33675ab..8ab8ef6 100644
--- a/res/values-zh-rCN/cherish_strings.xml
+++ b/res/values-zh-rCN/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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">已禁用</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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">隐藏</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">已禁用</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">隐藏</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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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">隐藏</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>
 </resources>
diff --git a/res/values-zh-rTW/cherish_strings.xml b/res/values-zh-rTW/cherish_strings.xml
index 2aef8a3..f748e4c 100644
--- a/res/values-zh-rTW/cherish_strings.xml
+++ b/res/values-zh-rTW/cherish_strings.xml
@@ -246,46 +246,6 @@
     <string name="global_actions_advanced_reboot_summary">When restarting also show options for recovery and bootloader</string>
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</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>
-    <string name="battery_percentage_percentage_estimate">Enabled (percent |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_big_circle">Big circle</string>
-    <string name="status_bar_battery_style_big_dotted_circle">Big 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>
     <!-- Statusbar net monitor -->
     <string name="traffic_title">Traffic indicators</string>
     <string name="network_traffic_state_title">Network traffic</string>
@@ -962,4 +922,24 @@
     <string name="qs_columns_portrait_title">Tiles columns on portrait</string>
     <string name="qs_columns_landscape_title">Tiles columns on landscape</string>
     <string name="qs_tile_title_visibility_title">Show tiles title</string>
+    <!-- Battery Styles -->
+    <string name="battery_percent_title">Statusbar battery indicator</string>
+    <string name="battery_percent_summary">Configure icon and text styles for the statusbar battery indicator</string>
+    <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_circle">Circle</string>
+    <string name="status_bar_battery_style_dotted_circle">Dotted circle</string>
+    <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>
 </resources>