diff --git a/res/drawable/appwidget_bg.9.png b/res/drawable/appwidget_bg.9.png
deleted file mode 100644
index 3b29eae7..00000000
Binary files a/res/drawable/appwidget_bg.9.png and /dev/null differ
diff --git a/res/drawable/appwidget_divider.9.png b/res/drawable/appwidget_divider.9.png
deleted file mode 100644
index 3445e842..00000000
Binary files a/res/drawable/appwidget_divider.9.png and /dev/null differ
diff --git a/res/drawable/button_background.xml b/res/drawable/button_background.xml
deleted file mode 100644
index cd92d6cf..00000000
--- a/res/drawable/button_background.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-	Copyright (C) 2010 Christopher Eby <kreed@kreed.org>
-
-	This file is part of Vanilla Music Player.
-
-	Vanilla Music Player is free software; you can redistribute it and/or modify
-	it under the terms of the GNU Library General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or (at your
-	option) any later version.
-
-	Vanilla Music Player is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-	or FITNESS FOR A PARTICULAR PURPOSE.
-
-	You should have received a copy of the GNU General Public License
-	along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:state_pressed="true"
-		android:drawable="@drawable/button_background_focused" />
-	<item
-		android:state_focused="true"
-		android:drawable="@drawable/button_background_focused" />
-	<item android:drawable="@android:color/transparent" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/button_background_focused.xml b/res/drawable/button_background_focused.xml
deleted file mode 100644
index bf37741b..00000000
--- a/res/drawable/button_background_focused.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-	Copyright (C) 2010 Christopher Eby <kreed@kreed.org>
-
-	This file is part of Vanilla Music Player.
-
-	Vanilla Music Player is free software; you can redistribute it and/or modify
-	it under the terms of the GNU Library General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or (at your
-	option) any later version.
-
-	Vanilla Music Player is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-	or FITNESS FOR A PARTICULAR PURPOSE.
-
-	You should have received a copy of the GNU General Public License
-	along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<gradient
-		android:endColor="#A9D2E2"
-		android:startColor="#274162"
-		android:angle="90" />
-</shape>
\ No newline at end of file
diff --git a/res/drawable/next_focused.png b/res/drawable/next_focused.png
new file mode 100644
index 00000000..9d654d60
Binary files /dev/null and b/res/drawable/next_focused.png differ
diff --git a/res/drawable/next_multi.xml b/res/drawable/next_multi.xml
new file mode 100644
index 00000000..622be397
--- /dev/null
+++ b/res/drawable/next_multi.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:state_pressed="true"
+		android:drawable="@drawable/next_focused" />
+	<item
+		android:state_focused="true"
+		android:drawable="@drawable/next_focused" />
+	<item android:drawable="@drawable/next" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/pause_focused.png b/res/drawable/pause_focused.png
new file mode 100644
index 00000000..c0730b0a
Binary files /dev/null and b/res/drawable/pause_focused.png differ
diff --git a/res/drawable/pause_multi.xml b/res/drawable/pause_multi.xml
new file mode 100644
index 00000000..899963da
--- /dev/null
+++ b/res/drawable/pause_multi.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:state_pressed="true"
+		android:drawable="@drawable/pause_focused" />
+	<item
+		android:state_focused="true"
+		android:drawable="@drawable/pause_focused" />
+	<item android:drawable="@drawable/pause" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/play_focused.png b/res/drawable/play_focused.png
new file mode 100644
index 00000000..233a5655
Binary files /dev/null and b/res/drawable/play_focused.png differ
diff --git a/res/drawable/play_multi.xml b/res/drawable/play_multi.xml
new file mode 100644
index 00000000..4891bc78
--- /dev/null
+++ b/res/drawable/play_multi.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:state_pressed="true"
+		android:drawable="@drawable/play_focused" />
+	<item
+		android:state_focused="true"
+		android:drawable="@drawable/play_focused" />
+	<item android:drawable="@drawable/play" />
+</selector>
\ No newline at end of file
diff --git a/res/layout/four_long_widget.xml b/res/layout/four_long_widget.xml
index e434801a..9bb44ac6 100644
--- a/res/layout/four_long_widget.xml
+++ b/res/layout/four_long_widget.xml
@@ -21,80 +21,66 @@
 	android:layout_height="fill_parent"
 	android:orientation="horizontal"
 	android:clickable="true"
-	android:background="@drawable/appwidget_bg">
+	android:layout_marginTop="5dip"
+	android:layout_marginBottom="5dip"
+	android:background="#B2191919">
 	<ImageView
 		android:id="@+id/cover"
 		android:visibility="gone"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
 		android:adjustViewBounds="true"
-		android:padding="4dip"
+		android:padding="5dip"
 		android:scaleType="fitCenter" />
 	<LinearLayout
+		android:id="@+id/text"
+		android:layout_width="0px"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_gravity="center"
 		android:orientation="vertical"
-		android:layout_width="0dip"
-		android:layout_height="fill_parent"
-		android:layout_weight="1">
-		<LinearLayout
-			android:id="@+id/text"
+		android:paddingLeft="8dip"
+		android:paddingRight="8dip">
+		<TextView
+			android:id="@+id/title"
 			android:layout_width="fill_parent"
-			android:layout_height="0dip"
+			android:layout_height="wrap_content"
+			android:textColor="#fff"
+			android:textSize="24dip"
+			android:singleLine="true"
+			android:fadingEdge="horizontal"
+			android:fadingEdgeLength="10dip"
+			android:ellipsize="none" />
+		<TextView
+			android:id="@+id/artist"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textColor="#fff"
+			android:textSize="20dip"
+			android:singleLine="true"
+			android:fadingEdge="horizontal"
+			android:fadingEdgeLength="10dip"
+			android:ellipsize="none" />
+	</LinearLayout>
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent">
+		<ImageButton
+			android:id="@+id/play_pause"
+			android:layout_width="fill_parent"
+			android:layout_height="0px"
 			android:layout_weight="1"
-			android:layout_gravity="center"
-			android:orientation="vertical"
-			android:paddingLeft="8dip"
-			android:paddingRight="8dip">
-			<TextView
-				android:id="@+id/title"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:textColor="#fff"
-				android:textStyle="bold"
-				android:textSize="13dip"
-				android:singleLine="true"
-				android:fadingEdge="horizontal"
-				android:fadingEdgeLength="10dip"
-				android:ellipsize="none" />
-			<TextView
-				android:id="@+id/artist"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:textColor="#fff"
-				android:textSize="13dip"
-				android:singleLine="true"
-				android:fadingEdge="horizontal"
-				android:fadingEdgeLength="10dip"
-				android:ellipsize="none" />
-		</LinearLayout>
-		<LinearLayout
-			android:orientation="horizontal"
+			android:src="@drawable/play_multi"
+			android:background="#0000"
+			android:scaleType="fitCenter" />
+		<ImageButton
+			android:id="@+id/next"
 			android:layout_width="fill_parent"
-			android:layout_height="0dip"
-			android:layout_weight="1">
-			<ImageButton
-				android:id="@+id/previous"
-				android:background="@drawable/button_background"
-				android:layout_width="0dip"
-				android:layout_weight="1"
-				android:layout_height="fill_parent"
-				android:src="@drawable/previous"
-				android:scaleType="fitCenter" />
-			<ImageButton
-				android:id="@+id/play"
-				android:background="@drawable/button_background"
-				android:layout_width="0dip"
-				android:layout_weight="1"
-				android:layout_height="fill_parent"
-				android:src="@drawable/play"
-				android:scaleType="fitCenter" />
-			<ImageButton
-				android:id="@+id/next"
-				android:background="@drawable/button_background"
-				android:layout_width="0dip"
-				android:layout_weight="1"
-				android:layout_height="fill_parent"
-				android:src="@drawable/next"
-				android:scaleType="fitCenter" />
-		</LinearLayout>
+			android:layout_height="0px"
+			android:layout_weight="1"
+			android:src="@drawable/next_multi"
+			android:background="#0000"
+			android:scaleType="fitCenter" />
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/org/kreed/vanilla/FourLongWidget.java b/src/org/kreed/vanilla/FourLongWidget.java
index a749e9d4..2df1998b 100644
--- a/src/org/kreed/vanilla/FourLongWidget.java
+++ b/src/org/kreed/vanilla/FourLongWidget.java
@@ -101,6 +101,8 @@ public class FourLongWidget extends AppWidgetProvider {
 
 		if (song == null) {
 			views.setViewVisibility(R.id.title, View.GONE);
+			views.setViewVisibility(R.id.next, View.GONE);
+			views.setViewVisibility(R.id.play_pause, View.GONE);
 			views.setTextViewText(R.id.artist, res.getText(R.string.no_songs));
 		} else {
 			views.setViewVisibility(R.id.title, View.VISIBLE);
@@ -118,7 +120,7 @@ public class FourLongWidget extends AppWidgetProvider {
 
 		if (state != -1) {
 			boolean playing = (state & PlaybackService.FLAG_PLAYING) != 0;
-			views.setImageViewResource(R.id.play, playing ? R.drawable.pause : R.drawable.play);
+			views.setImageViewResource(R.id.play_pause, playing ? R.drawable.pause_multi : R.drawable.play_multi);
 		}
 
 		Intent intent;
@@ -131,13 +133,9 @@ public class FourLongWidget extends AppWidgetProvider {
 		views.setOnClickPendingIntent(R.id.cover, pendingIntent);
 		views.setOnClickPendingIntent(R.id.text, pendingIntent);
 
-		intent = new Intent(PlaybackService.ACTION_PREVIOUS_SONG).setComponent(service);
-		pendingIntent = PendingIntent.getService(context, 0, intent, 0);
-		views.setOnClickPendingIntent(R.id.previous, pendingIntent);
-
 		intent = new Intent(PlaybackService.ACTION_TOGGLE_PLAYBACK).setComponent(service);
 		pendingIntent = PendingIntent.getService(context, 0, intent, 0);
-		views.setOnClickPendingIntent(R.id.play, pendingIntent);
+		views.setOnClickPendingIntent(R.id.play_pause, pendingIntent);
 
 		intent = new Intent(PlaybackService.ACTION_NEXT_SONG).setComponent(service);
 		pendingIntent = PendingIntent.getService(context, 0, intent, 0);