diff --git a/app/src/main/res/menu/menu_detailed_change.xml b/app/src/main/res/menu/menu_detailed_change.xml
index 3e930fc..da4d0ba 100644
--- a/app/src/main/res/menu/menu_detailed_change.xml
+++ b/app/src/main/res/menu/menu_detailed_change.xml
@@ -18,22 +18,22 @@
       tools:context=".DetailedChangeFragment">
   <item
     android:id="@+id/action_ignore"
-    android:orderInCategory="100"
+    android:orderInCategory="90"
     android:title="@string/action_ignore"
     android:icon="@drawable/ic_visibility_off_white_18dp"
-    app:showAsAction="always"/>
+    app:showAsAction="ifRoom"/>
   <item
     android:id="@+id/action_skip"
     android:orderInCategory="100"
     android:title="@string/action_skip"
     android:icon="@drawable/ic_fast_forward_white_18dp"
-    app:showAsAction="always"/>
+    app:showAsAction="ifRoom"/>
   <item
     android:id="@+id/action_star"
-    android:orderInCategory="100"
+    android:orderInCategory="90"
     android:title="@string/action_star"
     android:icon="@drawable/ic_star_white_16dp"
-    app:showAsAction="always"/>
+    app:showAsAction="ifRoom"/>
   <item
     android:id="@+id/action_add_reviewer"
     android:orderInCategory="100"
diff --git a/app/src/main/res/menu/menu_sort_changes.xml b/app/src/main/res/menu/menu_sort_changes.xml
index cb5d24b..6e57e24 100644
--- a/app/src/main/res/menu/menu_sort_changes.xml
+++ b/app/src/main/res/menu/menu_sort_changes.xml
@@ -19,13 +19,13 @@
     android:orderInCategory="100"
     android:title="@string/action_undo"
     android:icon="@drawable/ic_restore_white_18dp"
-    app:showAsAction="always"/>
+    app:showAsAction="ifRoom"/>
   <item
     android:id="@+id/action_reload_change"
     android:orderInCategory="100"
     android:title="@string/action_reload_change"
     android:icon="@drawable/ic_refresh_white_18dp"
-    app:showAsAction="always"/>
+    app:showAsAction="ifRoom"/>
   <item
     android:id="@+id/action_add_reviewer"
     android:orderInCategory="100"