diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 815b8a1..4f7cd8b 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -245,4 +245,23 @@
         <item>1</item>
         <item>0</item>
     </string-array>
+	
+	<!-- Lockscreen Charging Animation options -->
+    <string-array name="lockscreen_charging_animation_entries" translatable="false">
+        <item>@string/lockscreen_charging_animation_off</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 3f7bdbb..d65e044 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -165,6 +165,12 @@
     <!-- Charging animation -->
     <string name="lockscreen_charging_animation_title">Charging animation</string>
     <string name="lockscreen_charging_animation_summary">Display an animation when the device is plugged in</string>
+    <string name="lockscreen_charging_animation_off">Off</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>
 
     <!-- Battery Styles -->
     <string name="battery_style_category_title">Battery level</string>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 57e96fd..84b355f 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -24,13 +24,16 @@
         android:title="@string/lockscreen_battery_info_title"
         android:summary="@string/lockscreen_battery_info_summary"
         android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-            android:key="lockscreen_charging_animation"
-            android:icon="@drawable/ic_charging"
-            android:title="@string/lockscreen_charging_animation_title"
-            android:summary="@string/lockscreen_charging_animation_summary"
-            android:defaultValue="false" />
+		
+	<com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="lockscreen_charging_animation_style"
+		android:icon="@drawable/ic_charging"
+        android:dialogTitle="@string/lockscreen_charging_animation_title"
+        android:title="@string/lockscreen_charging_animation_title"
+        android:entries="@array/lockscreen_charging_animation_entries"
+        android:entryValues="@array/lockscreen_charging_animation_values"
+        android:summary="%s"
+        android:defaultValue="1" />
 
    <!-- Lockscreen Clock -->
     <PreferenceCategory
diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java
index 0dbba77..310caa1 100644
--- a/src/com/cherish/settings/fragments/LockScreenSettings.java
+++ b/src/com/cherish/settings/fragments/LockScreenSettings.java
@@ -38,6 +38,8 @@ import android.provider.Settings;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
+import com.cherish.settings.preferences.SystemSettingListPreference;
+
 public class LockScreenSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {