diff --git a/res/drawable/ic_shortcut.xml b/res/drawable/ic_shortcut.xml
new file mode 100644
index 0000000..ffadd03
--- /dev/null
+++ b/res/drawable/ic_shortcut.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M12,14A2,2 0 0,1 14,16A2,2 0 0,1 12,18A2,2 0 0,1 10,16A2,2 0 0,1 12,14M23.46,8.86L21.87,15.75L15,14.16L18.8,11.78C17.39,9.5 14.87,8 12,8C8.05,8 4.77,10.86 4.12,14.63L2.15,14.28C2.96,9.58 7.06,6 12,6C15.58,6 18.73,7.89 20.5,10.72L23.46,8.86Z" />
+</vector>
\ No newline at end of file
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 8d935f5..5c0ff9c 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -681,4 +681,9 @@
     <string name="fp_unlock_keystore_title">Fingerprint unlock</string>  
     <string name="fp_unlock_keystore_summary">Unlock device with fingerprint after reboot without PIN/Password/Pattern\nNote: at your own risk!</string> 
 
+    <!-- Lockscreen -->
+    <string name="lockscreen_category">Lockscreen</string>
+    <string name="lockscreen_tuner_title">Lockscreen bottom shortcuts</string>
+    <string name="lockscreen_tuner_summary">Customize bottom left and right shortcuts</string>
+
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 7f594a2..1945f21 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -18,7 +18,12 @@
     android:title="@string/lockscreen_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+    <!-- Lock screen -->
+    <PreferenceCategory
+        android:key="lockscreen_category"
+        android:title="@string/lockscreen_category">
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="lockscreen_battery_info"
         android:icon="@drawable/ic_batteryenergy"
         android:title="@string/lockscreen_battery_info_title"
@@ -27,7 +32,7 @@
 		
 	<com.cherish.settings.preferences.SystemSettingListPreference
         android:key="lockscreen_charging_animation_style"
-		android:icon="@drawable/ic_charging"
+	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"
@@ -35,6 +40,19 @@
         android:summary="%s"
         android:defaultValue="1" />
 
+        <Preference
+            android:title="@string/lockscreen_tuner_title"
+            android:icon="@drawable/ic_shortcut"
+            android:summary="@string/lockscreen_tuner_summary" >
+            <intent android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.systemui"
+                android:targetClass="com.android.systemui.tuner.LockscreenActivity" />
+        </Preference>
+
+
+    </PreferenceCategory>
+
+
    <!-- Lockscreen Clock -->
     <PreferenceCategory
         android:key="lockscreen_clock"
@@ -108,6 +126,7 @@
         android:fragment="com.cherish.settings.fragments.FODIconPickerFragment" />
    </PreferenceCategory>
 
+
     <SwitchPreference
         android:key="fingerprint_success_vib"
         android:icon="@drawable/ic_fingerprint"