diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f72968c2e..3773aecda 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,8 +24,6 @@
     android:versionCode="13"
     android:versionName="1.3.3">
 
-    <uses-permission android:name="android.permission.VIBRATE"/>
-
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="18" />
diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
index d703172a7..6f419f802 100644
--- a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
@@ -30,6 +30,7 @@ import android.support.annotation.Nullable;
 import android.view.ActionMode;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -322,7 +323,6 @@ public class ListHabitsFragment extends Fragment
         if (isShortToggleEnabled) return;
 
         toggleCheck(v);
-        DialogHelper.vibrate(activity, 100);
     }
 
     private void toggleCheck(View v)
@@ -335,6 +335,8 @@ public class ListHabitsFragment extends Fragment
         Habit habit = loader.habits.get(tag);
         if(habit == null) return;
 
+        listView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+
         helper.toggleCheckmarkView(v, habit);
         executeCommand(new ToggleRepetitionCommand(habit, timestamp), habit.getId());
     }
diff --git a/app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java
index 9fce7035c..4c36980d1 100644
--- a/app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java
+++ b/app/src/main/java/org/isoron/uhabits/helpers/DialogHelper.java
@@ -52,13 +52,6 @@ public abstract class DialogHelper
         imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
     }
 
-    public static void vibrate(Context context, int duration)
-    {
-        Vibrator vb = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
-        vb.vibrate(duration);
-    }
-
-
     public static void incrementLaunchCount(Context context)
     {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
diff --git a/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java
index 75d4b45a3..0cd6567fd 100644
--- a/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java
+++ b/app/src/main/java/org/isoron/uhabits/helpers/ListHabitsHelper.java
@@ -190,6 +190,7 @@ public class ListHabitsHelper
             btCheck.setTypeface(fontawesome);
             btCheck.setOnLongClickListener(onLongClickListener);
             btCheck.setOnClickListener(onClickListener);
+            btCheck.setHapticFeedbackEnabled(false);
             ((LinearLayout) view.findViewById(R.id.llButtons)).addView(check);
         }