diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
new file mode 100644
index 00000000..44acda26
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_add.png differ
diff --git a/res/drawable-hdpi/ic_menu_close_clear_cancel.png b/res/drawable-hdpi/ic_menu_close_clear_cancel.png
new file mode 100644
index 00000000..193deda8
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_close_clear_cancel.png differ
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
new file mode 100644
index 00000000..e30700ea
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_add.png differ
diff --git a/res/drawable-mdpi/ic_menu_close_clear_cancel.png b/res/drawable-mdpi/ic_menu_close_clear_cancel.png
new file mode 100644
index 00000000..9e1233eb
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_close_clear_cancel.png differ
diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java
index 2eea7ecb..23cb1436 100644
--- a/src/org/kreed/vanilla/FullPlaybackActivity.java
+++ b/src/org/kreed/vanilla/FullPlaybackActivity.java
@@ -283,6 +283,10 @@ public class FullPlaybackActivity extends PlaybackActivity
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu)
 	{
+		menu.add(0, MENU_ENQUEUE_ALBUM, 0, R.string.enqueue_current_album).setIcon(R.drawable.ic_menu_add);
+		menu.add(0, MENU_ENQUEUE_ARTIST, 0, R.string.enqueue_current_artist).setIcon(R.drawable.ic_menu_add);
+		menu.add(0, MENU_ENQUEUE_GENRE, 0, R.string.enqueue_current_genre).setIcon(R.drawable.ic_menu_add);
+		menu.add(0, MENU_CLEAR_QUEUE, 0, R.string.clear_queue).setIcon(R.drawable.ic_menu_close_clear_cancel);
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
 			menu.add(0, MENU_LIBRARY, 0, R.string.library).setIcon(R.drawable.ic_menu_music_library);
 		}
@@ -296,10 +300,24 @@ public class FullPlaybackActivity extends PlaybackActivity
 		case android.R.id.home:
 		case MENU_LIBRARY:
 			openLibrary(null);
-			return true;
+			break;
+		case MENU_ENQUEUE_ALBUM:
+			PlaybackService.get(this).enqueueFromCurrent(MediaUtils.TYPE_ALBUM);
+			break;
+		case MENU_ENQUEUE_ARTIST:
+			PlaybackService.get(this).enqueueFromCurrent(MediaUtils.TYPE_ARTIST);
+			break;
+		case MENU_ENQUEUE_GENRE:
+			PlaybackService.get(this).enqueueFromCurrent(MediaUtils.TYPE_GENRE);
+			break;
+		case MENU_CLEAR_QUEUE:
+			PlaybackService.get(this).clearQueue();
+			break;
 		default:
 			return super.onOptionsItemSelected(item);
 		}
+
+		return true;
 	}
 
 	@Override
diff --git a/src/org/kreed/vanilla/PlaybackActivity.java b/src/org/kreed/vanilla/PlaybackActivity.java
index 26f87591..12d781ae 100644
--- a/src/org/kreed/vanilla/PlaybackActivity.java
+++ b/src/org/kreed/vanilla/PlaybackActivity.java
@@ -310,6 +310,10 @@ public class PlaybackActivity extends Activity
 	static final int MENU_LIBRARY = 3;
 	static final int MENU_PLAYBACK = 5;
 	static final int MENU_SEARCH = 7;
+	static final int MENU_ENQUEUE_ALBUM = 8;
+	static final int MENU_ENQUEUE_ARTIST = 9;
+	static final int MENU_ENQUEUE_GENRE = 10;
+	static final int MENU_CLEAR_QUEUE = 11;
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu)
@@ -369,11 +373,6 @@ public class PlaybackActivity extends Activity
 		startActivity(intent);
 	}
 
-	public void enqueue(int type)
-	{
-		PlaybackService.get(this).enqueueFromCurrent(type);
-	}
-
 	@Override
 	public void upSwipe()
 	{