diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 19d316f3..7bbef65d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.subsonic.androidapp"
           a:versionCode="47"
-          a:versionName="3.9.9.7" a:installLocation="auto">
+          a:versionName="3.9.9.8" a:installLocation="auto">
 
     <uses-permission a:name="android.permission.INTERNET"/>
     <uses-permission a:name="android.permission.READ_PHONE_STATE"/>
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 1b7b81eb..d32bf17f 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -3,16 +3,19 @@
 
     <item
         a:id="@+id/download_equalizer"
+        a:showAsAction="ifRoom|withText"
         a:title="@string/download.menu_equalizer"
         />
     
     <item
         a:id="@+id/download_visualizer"
+        a:showAsAction="ifRoom|withText"
         a:title="@string/download.menu_visualizer"
         />
     
     <item
         a:id="@+id/download_jukebox"
+        a:showAsAction="ifRoom|withText"
         a:title="@string/download.menu_jukebox"
         />  
     
diff --git a/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java b/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java
index f238af46..6a3707b0 100644
--- a/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java
+++ b/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java
@@ -290,7 +290,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
         visualizerAvailable = downloadService != null && downloadService.getVisualizerController() != null;
         equalizerAvailable = downloadService != null && downloadService.getEqualizerController() != null;
 
-
         if (visualizerAvailable) {
             visualizerView = new VisualizerView(this);
             visualizerViewLayout.addView(visualizerView, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
@@ -300,7 +299,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
                 public boolean onTouch(View view, MotionEvent motionEvent) {
                     visualizerView.setActive(!visualizerView.isActive());
                     getDownloadService().setShowVisualization(visualizerView.isActive());
-                    updateButtons();
+                    //updateButtons();
                     return true;
                 }
             });
@@ -347,7 +346,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
             visualizerView.setActive(downloadService != null && downloadService.getShowVisualization());
         }
 
-        updateButtons();
+        //updateButtons();
     }
 
     private void updateButtons() {
@@ -559,13 +558,13 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
                 boolean active = !visualizerView.isActive();
                 visualizerView.setActive(active);
                 getDownloadService().setShowVisualization(visualizerView.isActive());
-                updateButtons();
+                //updateButtons();
                 Util.toast(DownloadActivity.this, active ? R.string.download_visualizer_on : R.string.download_visualizer_off);
             	return true;
             case R.id.download_jukebox:
                 boolean jukeboxEnabled = !getDownloadService().isJukeboxEnabled();
                 getDownloadService().setJukeboxEnabled(jukeboxEnabled);
-                updateButtons();
+                //updateButtons();
                 Util.toast(DownloadActivity.this, jukeboxEnabled ? R.string.download_jukebox_on : R.string.download_jukebox_off, false);
             	return true;            	
             default: