diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index cfabec7..9c9ae3d 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -658,4 +658,23 @@
         <item>7</item>
         <item>5</item>
     </string-array>
+
+    <!-- Lockscreen Charging Animation -->
+    <string-array name="lockscreen_charging_animation_entries" translatable="false">
+        <item>@string/disabled</item>
+        <item>@string/lockscreen_charging_animation_flash</item>
+        <item>@string/lockscreen_charging_animation_battery</item>
+        <item>@string/lockscreen_charging_animation_drop</item>
+        <item>@string/lockscreen_charging_animation_explosion</item>
+        <item>@string/lockscreen_charging_animation_water</item>
+    </string-array>
+
+    <string-array name="lockscreen_charging_animation_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index a1155e4..02b02f1 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -725,8 +725,12 @@
     <!-- Charging animation -->
     <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">Lockscreen charging animation</string>
-    <string name="lockscreen_charging_animation_summary">Display a fancy animation when the device is charging</string>
+    <string name="lockscreen_charging_animation_title">Charging animation</string>
+    <string name="lockscreen_charging_animation_flash">Flash</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>
+    <string name="lockscreen_charging_animation_water">Water</string>
 
     <string name="click_partial_screenshot_title">Click to partial screenshot</string>
     <string name="click_partial_screenshot_summary">Short click Volume Down and Power to take partial screenshot</string>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 7f6476d..c3193b4 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -32,12 +32,13 @@
         android:summary="@string/charging_animation_summary"
         android:defaultValue="true" />
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="lockscreen_charging_animation"
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="lockscreen_charging_animation_style"
         android:icon="@drawable/ic_flash"
         android:title="@string/lockscreen_charging_animation_title"
-        android:summary="@string/lockscreen_charging_animation_summary"
-        android:defaultValue="true" />
+        android:entries="@array/lockscreen_charging_animation_entries"
+        android:entryValues="@array/lockscreen_charging_animation_values"
+        android:defaultValue="1" />
 
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="fingerprint_success_vib"