diff --git a/res/drawable/ic_media.xml b/res/drawable/ic_media.xml
new file mode 100755
index 0000000..ee72419
--- /dev/null
+++ b/res/drawable/ic_media.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="399.321"
+    android:viewportWidth="399.321" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M245.082,251.814l-82.721,-41.831c-2.79,-1.41 -6.112,-1.272 -8.776,0.364c-2.663,1.638 -4.286,4.54 -4.286,7.667v83.661c0,3.127 1.623,6.029 4.286,7.667c1.441,0.886 4.741,1.984 8.776,0.364l82.721,-41.83c3.029,-1.531 4.938,-4.637 4.938,-8.031S248.111,253.345 245.082,251.814zM167.3,287.039v-54.388l53.777,27.194L167.3,287.039zM389.378,2.376c-1.852,-1.703 -4.327,-2.55 -6.841,-2.346L15.29,30.612c-4.665,0.389 -8.253,4.288 -8.253,8.969v43.492c0,2.517 1.054,4.919 2.906,6.623c1.668,1.534 3.845,2.377 6.094,2.377c0.248,0 0.498,-0.011 0.748,-0.031L384.031,61.46c4.665,-0.389 8.253,-4.288 8.253,-8.969V8.999C392.284,6.482 391.23,4.08 389.378,2.376zM374.284,44.21L25.037,73.293V47.862l349.247,-29.083V44.21zM383.284,120.37H282.979c-0.029,0 -0.06,0 -0.09,0H179.985c-0.024,0 -0.048,0 -0.072,0H77.007c-0.031,-0.001 -0.062,-0.001 -0.092,0H16.037c-4.971,0 -9,4.029 -9,9v260.951c0,4.971 4.029,9 9,9h60.878c0.016,0 0.031,0 0.047,0c0.015,0 0.03,0 0.045,0h102.906c0.024,0 0.049,0 0.072,0h102.904c0.03,0 0.061,0 0.09,0h100.305c4.971,0 9,-4.029 9,-9V129.37C392.284,124.399 388.255,120.37 383.284,120.37zM278.948,138.37l23.105,25.491H223.36l-23.104,-25.491H278.948zM175.962,138.37l23.104,25.491h-78.694L97.268,138.37H175.962zM25.037,138.37h47.938l23.104,25.491H25.037V138.37zM72.975,381.321H25.037V355.83h71.042L72.975,381.321zM175.962,381.321H97.268l23.104,-25.491h78.694L175.962,381.321zM278.948,381.321h-78.692l23.104,-25.491h78.694L278.948,381.321zM374.284,381.321h-71.042l23.105,-25.491h47.937V381.321zM374.284,337.83h-51.898c-0.016,0 -0.032,0 -0.047,0H219.4c-0.019,0 -0.036,0 -0.052,0H116.404c-0.011,0 -0.022,0 -0.034,0H25.037V181.861h91.333c0.012,0.001 0.023,0.001 0.034,0h102.943c0.018,0.001 0.035,0.001 0.052,0h102.938c0.016,0 0.032,0 0.047,0h51.898V337.83zM374.284,163.861h-47.937l-23.105,-25.491h71.042V163.861z"/>
+</vector>
\ No newline at end of file
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 26d3c53..cb10a36 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -57,4 +57,7 @@
     <!-- In-call feedback -->
     <string name="incall_feeedback_vibrate_title">Vibrate to indicate call status</string>
 
+    <!-- Lock screen cover art -->
+    <string name="lockscreen_media_art_title">Display media cover art</string>
+
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index d86e5c8..e5abff6 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -24,4 +24,10 @@
         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_media_metadata"
+            android:title="@string/lockscreen_media_art_title"
+            android:icon="@drawable/ic_media"
+            android:defaultValue="true" />
 </PreferenceScreen>