diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index d90842f..c9846a5 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -663,5 +663,9 @@
 	<!-- Screen off FOD -->
     <string name="screen_off_fod_title">Screen off FOD</string>
     <string name="screen_off_fod_summary">Keep FOD enabled when the screen is off</string>
+	
+	<!-- Udfps Haptic Feedback -->
+    <string name="udfps_haptic_feedback_title">FOD haptic feedback</string>
+    <string name="udfps_haptic_feedback_summary">Vibrate when touching FOD icon</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index d823a0b..a4de6af 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -91,6 +91,12 @@
 
     </PreferenceCategory>
 	
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="udfps_haptic_feedback"
+            android:title="@string/udfps_haptic_feedback_title"
+            android:summary="@string/udfps_haptic_feedback_summary"
+            android:defaultValue="true" />
+	
 	<com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="screen_off_fod"
             android:title="@string/screen_off_fod_title"
diff --git a/src/com/cherish/settings/fragments/LockScreenSettings.java b/src/com/cherish/settings/fragments/LockScreenSettings.java
index 3c2f3e0..f1a353a 100644
--- a/src/com/cherish/settings/fragments/LockScreenSettings.java
+++ b/src/com/cherish/settings/fragments/LockScreenSettings.java
@@ -60,6 +60,7 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
 			
 	private static final String AOD_SCHEDULE_KEY = "always_on_display_schedule";
 	private static final String SCREEN_OFF_FOD_KEY = "screen_off_fod";
+	private static final String UDFPS_HAPTIC_FEEDBACK = "udfps_haptic_feedback";
 	
 	static final int MODE_DISABLED = 0;
     static final int MODE_NIGHT = 1;
@@ -69,6 +70,8 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
 	
 	Preference mAODPref;
 	Preference mFODPref;
+	private SystemSettingSwitchPreference mFODScreenOff;
+    private SystemSettingSwitchPreference mUdfpsHapticFeedback;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -89,9 +92,11 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
             e.printStackTrace();
         }
 		
-		mFODPref = findPreference(SCREEN_OFF_FOD_KEY);
+		mFODScreenOff = (SystemSettingSwitchPreference) findPreference(SCREEN_OFF_FOD_KEY);
+        mUdfpsHapticFeedback = (SystemSettingSwitchPreference) findPreference(UDFPS_HAPTIC_FEEDBACK);
         if (!FodUtils.hasFodSupport(getContext())) {
-            removePreference(SCREEN_OFF_FOD_KEY);
+            prefScreen.removePreference(mFODScreenOff);
+            prefScreen.removePreference(mUdfpsHapticFeedback);
         }
 		
 		mAODPref = findPreference(AOD_SCHEDULE_KEY);