diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 84364c3a..09c30b27 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -26,6 +26,7 @@
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
 				<action android:name="org.kreed.vanilla.event.CHANGED" />
+				<action android:name="org.kreed.vanilla.event.REPLACE_SONG" />
 			</intent-filter>
 			<meta-data
 				android:name="android.appwidget.provider"
diff --git a/src/org/kreed/vanilla/OneCellWidget.java b/src/org/kreed/vanilla/OneCellWidget.java
index 206edb2e..49c73adb 100644
--- a/src/org/kreed/vanilla/OneCellWidget.java
+++ b/src/org/kreed/vanilla/OneCellWidget.java
@@ -39,19 +39,20 @@ public class OneCellWidget extends AppWidgetProvider {
 				song = null;
 		}
 
-		RemoteViews views = createViews(context, song, false);
+		RemoteViews views = createViews(context, song, 0);
 		manager.updateAppWidget(ids, views);
 	}
 
 	@Override
 	public void onReceive(Context context, Intent intent)
 	{
-		if (PlaybackService.EVENT_CHANGED.equals(intent.getAction())) {
+		String action = intent.getAction();
+		if (PlaybackService.EVENT_CHANGED.equals(action) || PlaybackService.EVENT_REPLACE_SONG.equals(action)) {
 			Song song = intent.getParcelableExtra("song");
-			boolean playing = (intent.getIntExtra("state", 0) & PlaybackService.FLAG_PLAYING) != 0;
+			int state = intent.getIntExtra("state", -1);
 
 			ComponentName widget = new ComponentName(context, OneCellWidget.class);
-			RemoteViews views = createViews(context, song, playing);
+			RemoteViews views = createViews(context, song, state);
 
 			AppWidgetManager.getInstance(context).updateAppWidget(widget, views);
 		} else {
@@ -59,14 +60,19 @@ public class OneCellWidget extends AppWidgetProvider {
 		}
 	}
 
-	public static RemoteViews createViews(Context context, Song song, boolean playing)
+	public static RemoteViews createViews(Context context, Song song, int state)
 	{
 		RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.one_cell_widget);
 
-		views.setImageViewResource(R.id.play_pause, playing ? R.drawable.hidden_pause : R.drawable.hidden_play);
+		if (state != -1) {
+			boolean playing = (state & PlaybackService.FLAG_PLAYING) != 0;
+			views.setImageViewResource(R.id.play_pause, playing ? R.drawable.hidden_pause : R.drawable.hidden_play);
+		}
+
 		Intent playPause = new Intent(context, PlaybackService.class);
 		playPause.setAction(PlaybackService.TOGGLE_PLAYBACK);
 		views.setOnClickPendingIntent(R.id.play_pause, PendingIntent.getService(context, 0, playPause, 0));
+
 		Intent next = new Intent(context, PlaybackService.class);
 		next.setAction(PlaybackService.NEXT_SONG);
 		views.setOnClickPendingIntent(R.id.next, PendingIntent.getService(context, 0, next, 0));
diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index e7f59833..3a9072f3 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -147,16 +147,18 @@ public final class PlaybackService extends Service implements Handler.Callback,
 			String action = intent.getAction();
 			int delta;
 
-			if (TOGGLE_PLAYBACK.equals(action))
+			if (TOGGLE_PLAYBACK.equals(action)) {
 				delta = 0;
-			else if (NEXT_SONG.equals(action))
+			} else if (NEXT_SONG.equals(action)) {
 				delta = 1;
-			else if (PREVIOUS_SONG.equals(action))
+				broadcastReplaceSong(0, getSong(+1));
+			} else if (PREVIOUS_SONG.equals(action)) {
 				delta = -1;
-			else if (Intent.ACTION_MEDIA_BUTTON.equals(action))
+			} else if (Intent.ACTION_MEDIA_BUTTON.equals(action)) {
 				delta = 10;
-			else
+			} else {
 				delta = -10;
+			}
 
 			if (delta != -10) {
 				if (!mLoaded)