diff --git a/F-Droid/res/menu/main.xml b/F-Droid/res/menu/main.xml
index f595eb197..f06e36cd1 100644
--- a/F-Droid/res/menu/main.xml
+++ b/F-Droid/res/menu/main.xml
@@ -6,7 +6,7 @@
         android:id="@+id/action_search"
         android:icon="@drawable/ic_search_white"
         android:title="@string/menu_search"
-        app:showAsAction="always"/>
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_update_repo"
         android:icon="@drawable/ic_refresh_white"
diff --git a/F-Droid/res/menu/manage_repos.xml b/F-Droid/res/menu/manage_repos.xml
index be6c8b271..d764884bf 100644
--- a/F-Droid/res/menu/manage_repos.xml
+++ b/F-Droid/res/menu/manage_repos.xml
@@ -6,11 +6,11 @@
         android:id="@+id/action_update_repo"
         android:icon="@drawable/ic_refresh_white"
         android:title="@string/menu_update_repo"
-        app:showAsAction="always|withText"/>
+        app:showAsAction="ifRoom|withText"/>
     <item
         android:id="@+id/action_add_repo"
         android:icon="@drawable/ic_add_white"
         android:title="@string/menu_add_repo"
-        app:showAsAction="always|withText"/>
+        app:showAsAction="ifRoom|withText"/>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index 94ce0b15f..a975ab49d 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -646,11 +646,13 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
         if (app == null)
             return true;
 
-        MenuItemCompat.setShowAsAction(menu.add(
-                        Menu.NONE, SHARE, 1, R.string.menu_share)
-                        .setIcon(R.drawable.ic_share_white),
-                MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
-                        MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
+        if (mPm.getLaunchIntentForPackage(app.id) != null && app.canAndWantToUpdate()) {
+            MenuItemCompat.setShowAsAction(menu.add(
+                            Menu.NONE, LAUNCH, 1, R.string.menu_launch)
+                            .setIcon(R.drawable.ic_play_arrow_white),
+                    MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
+                            MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
+        }
 
         if (app.isInstalled()) {
             MenuItemCompat.setShowAsAction(menu.add(
@@ -660,13 +662,11 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A
                             MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
         }
 
-        if (mPm.getLaunchIntentForPackage(app.id) != null && app.canAndWantToUpdate()) {
-            MenuItemCompat.setShowAsAction(menu.add(
-                            Menu.NONE, LAUNCH, 1, R.string.menu_launch)
-                            .setIcon(R.drawable.ic_play_arrow_white),
-                    MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
-                            MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
-        }
+        MenuItemCompat.setShowAsAction(menu.add(
+                        Menu.NONE, SHARE, 1, R.string.menu_share)
+                        .setIcon(R.drawable.ic_share_white),
+                MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
+                        MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 
         menu.add(Menu.NONE, IGNOREALL, 2, R.string.menu_ignore_all)
                     .setIcon(R.drawable.ic_do_not_disturb_white)
diff --git a/F-Droid/src/org/fdroid/fdroid/SearchResults.java b/F-Droid/src/org/fdroid/fdroid/SearchResults.java
index e78b05b5e..97e3fc307 100644
--- a/F-Droid/src/org/fdroid/fdroid/SearchResults.java
+++ b/F-Droid/src/org/fdroid/fdroid/SearchResults.java
@@ -78,7 +78,7 @@ public class SearchResults extends ActionBarActivity {
         super.onCreateOptionsMenu(menu);
         MenuItem search = menu.add(Menu.NONE, SEARCH, 1, R.string.menu_search).setIcon(
                 android.R.drawable.ic_menu_search);
-        MenuItemCompat.setShowAsAction(search, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+        MenuItemCompat.setShowAsAction(search, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
         return true;
     }