diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c73b8dd8..400aeafd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,7 +37,7 @@ THE SOFTWARE.
 		android:backupAgent="PreferencesBackupAgent">
 		<activity
 			android:name="FullPlaybackActivity"
-			android:theme="@style/NoBackground"
+			android:theme="@style/Playback"
 			android:launchMode="singleTask" />
 		<activity
 			android:name="LibraryActivity"
diff --git a/res/values-v11/untranslatable.xml b/res/values-v11/untranslatable.xml
index 59f758dd..cdf4e9bc 100644
--- a/res/values-v11/untranslatable.xml
+++ b/res/values-v11/untranslatable.xml
@@ -22,11 +22,17 @@ THE SOFTWARE.
 -->
 <resources>
 	<style name="Dialog" parent="android:Theme.Holo.Dialog" />
-	<style name="Theme" parent="android:Theme.Holo" />
 	<style name="AlertDialogItem">
 		<item name="android:textColor">?android:textColorAlertDialogListItem</item>
 	</style>
-	<style name="Library" parent="Theme">
+	<style name="Playback" parent="android:Theme.Holo">
+		<item name="android:actionBarStyle">@style/PlaybackActionBar</item>
+		<item name="android:windowBackground">@android:color/black</item>
+	</style>
+	<style name="PlaybackActionBar" parent="android:Widget.Holo.ActionBar">
+		<item name="android:displayOptions">showTitle|homeAsUp</item>
+	</style>
+	<style name="Library" parent="android:Theme.Holo">
 		<item name="android:actionBarStyle">@style/LibraryActionBar</item>
 	</style>
 	<style name="LibraryActionBar" parent="android:Widget.Holo.ActionBar">
diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index e4b1bad8..2a4cfbca 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -22,11 +22,10 @@ THE SOFTWARE.
 -->
 <resources>
 	<style name="Dialog" parent="android:Theme.Dialog" />
-	<style name="Theme" parent="android:Theme" />
-	<style name="Library" parent="Theme">
+	<style name="Library" parent="android:Theme">
 		<item name="android:windowNoTitle">true</item>
 	</style>
-	<style name="NoBackground" parent="Theme">
+	<style name="Playback" parent="android:Theme">
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:windowBackground">@null</item>
 	</style>
diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java
index eaf84187..7b335bb5 100644
--- a/src/org/kreed/vanilla/FullPlaybackActivity.java
+++ b/src/org/kreed/vanilla/FullPlaybackActivity.java
@@ -25,6 +25,7 @@ package org.kreed.vanilla;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
 import android.text.format.DateUtils;
@@ -163,8 +164,6 @@ public class FullPlaybackActivity extends PlaybackActivity
 
 		setControlsVisible(settings.getBoolean("visible_controls", true));
 		setDuration(0);
-
-		getWindow().addFlags(0x08000000); // show menu key on ICS
 	}
 
 	@Override
@@ -289,7 +288,9 @@ public class FullPlaybackActivity extends PlaybackActivity
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu)
 	{
-		menu.add(0, MENU_LIBRARY, 0, R.string.library).setIcon(R.drawable.ic_menu_music_library);
+		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);
+		}
 		return super.onCreateOptionsMenu(menu);
 	}
 
@@ -297,6 +298,7 @@ public class FullPlaybackActivity extends PlaybackActivity
 	public boolean onOptionsItemSelected(MenuItem item)
 	{
 		switch (item.getItemId()) {
+		case android.R.id.home:
 		case MENU_LIBRARY:
 			openLibrary(null);
 			return true;