diff --git a/res/drawable/ic_charging.xml b/res/drawable/ic_charging.xml
new file mode 100644
index 0000000..ad7453a
--- /dev/null
+++ b/res/drawable/ic_charging.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="480"
+    android:viewportWidth="480" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m432,240c0,106.039 -85.961,192 -192,192s-192,-85.961 -192,-192 85.961,-192 192,-192 192,85.961 192,192zM432,240"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m240,480c-132.547,0 -240,-107.453 -240,-240s107.453,-240 240,-240 240,107.453 240,240c-0.148,132.484 -107.516,239.852 -240,240zM240,16c-123.711,0 -224,100.289 -224,224s100.289,224 224,224 224,-100.289 224,-224c-0.141,-123.652 -100.348,-223.859 -224,-224zM240,16"/>
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="m320,216h-64v-96l-96,144h64v96zM320,216"/>
+</vector>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 9d7626a..173de64 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -152,4 +152,8 @@
     <string name="status_bar_clock_auto_hide_hdur_title">Hide duration</string>
     <string name="status_bar_clock_auto_hide_sdur_title">Show duration</string>
 
+    <!-- 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>
+
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 9edc1c5..5dcb842 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -31,6 +31,13 @@
             android:icon="@drawable/ic_media"
             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" />
+
    <!-- Lockscreen Clock -->
     <PreferenceCategory
         android:key="lockscreen_clock"