8 files changed, 25 insertions, 45 deletions
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png
deleted file mode 100644
index 28cad85e..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png
deleted file mode 100644
index 7e14e95d..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png
deleted file mode 100644
index 112196be..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png
deleted file mode 100644
index 34f6e01a..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png
+++ /dev/null
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png
deleted file mode 100644
index db9235fc..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png
+++ /dev/null
diff --git a/subsonic-android/res/menu/nowplaying.xml b/subsonic-android/res/menu/nowplaying.xml
index 28bcb5ef..a880438e 100644
--- a/subsonic-android/res/menu/nowplaying.xml
+++ b/subsonic-android/res/menu/nowplaying.xml
@@ -3,25 +3,25 @@
 
     <item
         android:id="@+id/menu_shuffle"
-        android:icon="@drawable/ic_menu_shuffle"
+        android:icon="@drawable/action_shuffle"
         android:title="@string/download.menu_shuffle"
-        />
+        android:showAsAction="always|withText"/>
+		
+	<item
+        android:id="@+id/menu_remove_all"
+        android:icon="@drawable/action_remove_all"
+        android:title="@string/download.menu_remove_all"
+        android:showAsAction="always|withText"/>
 
     <item
         android:id="@+id/menu_save_playlist"
-        android:icon="@drawable/ic_menu_save"
+        android:icon="@drawable/action_save"
         android:title="@string/download.menu_save"
-        />
-
-    <item
-        android:id="@+id/menu_remove_all"
-        android:icon="@drawable/ic_menu_remove_all"
-        android:title="@string/download.menu_remove_all"
-        />
+        android:showAsAction="ifRoom|withText"/>
 
     <item
         android:id="@+id/menu_screen_on_off"
-        android:icon="@drawable/ic_menu_screen_on_off"
+        android:icon="@drawable/action_screen_on_off"
         android:title="@string/download.menu_screen_on"
-        />
+        android:showAsAction="ifRoom|withText"/>
 </menu>
diff --git a/subsonic-android/res/menu/nowplaying_context.xml b/subsonic-android/res/menu/nowplaying_context.xml
index 04e56e1a..eeb49a26 100644
--- a/subsonic-android/res/menu/nowplaying_context.xml
+++ b/subsonic-android/res/menu/nowplaying_context.xml
@@ -1,39 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item 
-        android:id="@+id/menu_show_album"
-        android:title="@string/download.menu_show_album"
-        />
-
-    <item 
-        android:id="@+id/menu_lyrics"
-        android:title="@string/download.menu_lyrics"
-        />
-
-    <item 
-        android:id="@+id/menu_remove"
-        android:title="@string/download.menu_remove"
-        />
-		
 	<item 
-        android:id="@+id/menu_delete"
-        android:title="@string/download.menu_delete"
-        />
+		android:id="@+id/menu_show_album"
+		android:title="@string/download.menu_show_album"/>
 
-    <item 
-        android:id="@+id/menu_remove_all"
-        android:title="@string/download.menu_remove_all"
-        />
+	<item 
+		android:id="@+id/menu_lyrics"
+		android:title="@string/download.menu_lyrics"/>
 
-    <item 
-        android:id="@+id/menu_shuffle"
-        android:title="@string/download.menu_shuffle"
-        />
+	<item 
+		android:id="@+id/menu_remove"
+		android:title="@string/download.menu_remove"/>
 
-    <item 
-        android:id="@+id/menu_save_playlist"
-        android:title="@string/download.menu_save"
-        />
-        
+	<item 
+		android:id="@+id/menu_delete"
+		android:title="@string/download.menu_delete"/>        
 </menu>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
index 2f20c20e..9b65b351 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -645,8 +645,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
             buttonBarFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_in));
             buttonBarFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_out));
             buttonBarFlipper.setDisplayedChild(0);
-
-
+			getSupportActionBar().hide();
         } else {
             playlistFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_in));
             playlistFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_out));
@@ -654,6 +653,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
             buttonBarFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_in));
             buttonBarFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_out));
             buttonBarFlipper.setDisplayedChild(1);
+			getSupportActionBar().show();
         }
     }