diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 12b82a7..07c052e 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -850,4 +850,7 @@
     <string name="flashlight_on_call_dnd">Only in DND mode</string>
     <string name="flashlight_on_call_always">Always</string>
 
+    <string name="incall_notifications_vibrate">Less annoying in-call notifications</string>
+    <string name="incall_notifications_vibrate_summary">Vibrate instead of playing a sound for in-call notifications</string>
+
 </resources>
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index bcd1717..621146f 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -14,7 +14,9 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen 
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:key="button_settings"
         android:title="@string/button_settings_title" >
 
diff --git a/res/xml/more_settings.xml b/res/xml/more_settings.xml
index ef80885..048ec41 100644
--- a/res/xml/more_settings.xml
+++ b/res/xml/more_settings.xml
@@ -17,7 +17,6 @@
 
 <PreferenceScreen 
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="more_settings"
     android:title="@string/more_settings_title">
 
@@ -26,19 +25,25 @@
         android:title="@string/calls_category">
 
          <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
-                android:key="vibrate_on_connect"
-                android:title="@string/incall_vibrate_connect_title"
-                android:defaultValue="false" />
+            android:key="vibrate_on_connect"
+            android:title="@string/incall_vibrate_connect_title"
+            android:defaultValue="false" />
 
          <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
-                android:key="vibrate_on_callwaiting"
-                android:title="@string/incall_vibrate_call_wait_title"
-                android:defaultValue="false" />
+            android:key="vibrate_on_callwaiting"
+            android:title="@string/incall_vibrate_call_wait_title"
+            android:defaultValue="false" />
 
          <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
-                android:key="vibrate_on_disconnect"
-                android:title="@string/incall_vibrate_disconnect_title"
-                android:defaultValue="false" />
+            android:key="vibrate_on_disconnect"
+            android:title="@string/incall_vibrate_disconnect_title"
+            android:defaultValue="false" />
+
+         <org.omnirom.omnilib.preference.SystemSettingSwitchPreference
+            android:key="incall_notifications_vibrate"
+            android:title="@string/incall_notifications_vibrate"
+            android:summary="@string/incall_notifications_vibrate_summary"
+            android:defaultValue="false" />
 
         <!-- Flashlight on incoming calls -->
         <ListPreference