Move actions back into the option menu

app/src/main/res/menu/menu.xml

@@ -62,12 +62,12 @@
         android:id="@+id/settings"
         android:icon="@drawable/ic_settings_cog_vector"
         android:title="@string/settings"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
     <item
         android:id="@+id/about"
         android:icon="@drawable/ic_info_vector"
         android:title="@string/about"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
     <item
         android:id="@+id/more_apps_from_us"
         android:title="@string/more_apps_from_us"

app/src/main/res/menu/menu_editor.xml

@@ -17,7 +17,7 @@
         android:id="@+id/menu_print"
         android:icon="@drawable/ic_print_vector"
         android:title="@string/print"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_open_with"
         android:showAsAction="never"