diff --git a/res/layout-v16/notification.xml b/res/layout-v16/notification.xml
deleted file mode 100644
index 72ca6773..00000000
--- a/res/layout-v16/notification.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2012 Christopher Eby <kreed@kreed.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:layout_gravity="center_vertical"
-	android:orientation="horizontal">
-	<ImageView
-		android:id="@+id/cover"
-		android:scaleType="fitCenter"
-		android:layout_width="64dip"
-		android:layout_height="64dip"
-		android:layout_marginRight="8dip"
-		android:contentDescription="@string/cover_art" />
-	<LinearLayout
-		android:layout_width="0px"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:layout_gravity="center"
-		android:orientation="vertical">
-		<TextView
-			android:id="@+id/title"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
-			android:singleLine="true"
-			android:ellipsize="marquee" />
-		<TextView
-			android:id="@+id/artist"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
-			android:singleLine="true"
-			android:ellipsize="marquee" />
-	</LinearLayout>
-	<ImageButton
-		android:id="@+id/play_pause"
-		android:paddingTop="5dip"
-		android:paddingBottom="5dip"
-		android:layout_height="42dip"
-		android:layout_width="wrap_content"
-		android:layout_gravity="center"
-		android:background="?android:attr/selectableItemBackground"
-		android:scaleType="fitCenter"
-		android:src="@drawable/play"
-		android:contentDescription="@string/play_pause" />
-	<ImageButton
-		android:id="@+id/next"
-		android:paddingTop="5dip"
-		android:paddingBottom="5dip"
-		android:layout_height="42dip"
-		android:layout_width="wrap_content"
-		android:layout_gravity="center"
-		android:background="?android:attr/selectableItemBackground"
-		android:scaleType="fitCenter"
-		android:src="@drawable/next"
-		android:contentDescription="@string/next_song" />
-	<ImageButton
-		android:id="@+id/close"
-		android:padding="5dip"
-		android:layout_height="42dip"
-		android:layout_width="wrap_content"
-		android:layout_gravity="center"
-		android:background="?android:attr/selectableItemBackground"
-		android:scaleType="fitCenter"
-		android:src="@drawable/notification_close"
-		android:contentDescription="@string/close_notification" />
-</LinearLayout>
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index bfc6e671..72ca6773 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -30,7 +30,7 @@ THE SOFTWARE.
 		android:scaleType="fitCenter"
 		android:layout_width="64dip"
 		android:layout_height="64dip"
-		android:layout_marginRight="12dip"
+		android:layout_marginRight="8dip"
 		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:layout_width="0px"
diff --git a/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java b/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java
index a7bd8568..b50ee8ee 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java
@@ -43,7 +43,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
 	 * If another button event is received before this time in milliseconds
 	 * expires, the event with be considered a double click.
 	 */
-	private static final int DOUBLE_CLICK_DELAY = 400;
+	private static final int DOUBLE_CLICK_DELAY = 600;
 
 	/**
 	 * Whether the headset controls should be used. 1 for yes, 0 for no, -1 for