diff --git a/res/menu-xlarge/incognito.xml b/res/menu-xlarge/incognito.xml
index d0e2b4a..21af914 100644
--- a/res/menu-xlarge/incognito.xml
+++ b/res/menu-xlarge/incognito.xml
@@ -1,27 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
+
     <item
         android:id="@+id/action_back"
         android:checkable="false"
         android:enabled="true"
         android:icon="?arrowBackDrawable"
-        android:showAsAction="always"
         android:title="@string/action_back"
-        android:visible="true">
-    </item>
+        android:visible="true"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_forward"
         android:checkable="false"
         android:enabled="true"
         android:icon="?arrowForwardDrawable"
-        android:showAsAction="always"
         android:title="@string/action_forward"
-        android:visible="true">
-    </item>
-    <item android:id="@+id/action_new_tab" android:title="@string/action_new_tab"></item>
-    <item android:id="@+id/action_share" android:title="@string/action_share" />
-    <item android:id="@+id/action_find" android:title="@string/action_find"></item>
-    <item android:id="@+id/action_history" android:title="@string/action_history" ></item>    
-    <item android:id="@+id/action_bookmarks" android:title="@string/action_bookmarks" ></item>
+        android:visible="true"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/action_new_tab"
+        android:title="@string/action_new_tab"/>
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/action_share"/>
+    <item
+        android:id="@+id/action_find"
+        android:title="@string/action_find"/>
+    <item
+        android:id="@+id/action_history"
+        android:title="@string/action_history"/>
+    <item
+        android:id="@+id/action_bookmarks"
+        android:title="@string/action_bookmarks"/>
 
-</menu>
+</menu>
\ No newline at end of file
diff --git a/res/menu-xlarge/main.xml b/res/menu-xlarge/main.xml
index b9b33df..7439e7b 100644
--- a/res/menu-xlarge/main.xml
+++ b/res/menu-xlarge/main.xml
@@ -11,67 +11,57 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitations under the License.

+  limitations under the License.


 -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/action_back"
         android:checkable="false"
         android:enabled="true"
         android:icon="?arrowBackDrawable"
-        android:showAsAction="always"
         android:title="@string/action_back"
-        android:visible="true">
-    </item>
+        android:visible="true"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_forward"
         android:checkable="false"
         android:enabled="true"
         android:icon="?arrowForwardDrawable"
-        android:showAsAction="always"
         android:title="@string/action_forward"
-        android:visible="true">
-    </item>
+        android:visible="true"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_new_tab"
-        android:title="@string/action_new_tab">
-    </item>
+        android:title="@string/action_new_tab"/>
     <item
         android:id="@+id/action_incognito"
-        android:title="@string/action_incognito">
-    </item>
+        android:title="@string/action_incognito"/>
     <item
         android:id="@+id/action_share"
         android:title="@string/action_share"/>
     <item
         android:id="@+id/action_history"
-        android:title="@string/action_history">
-    </item>
+        android:title="@string/action_history"/>
     <item
         android:id="@+id/action_find"
-        android:title="@string/action_find">
-    </item>
+        android:title="@string/action_find"/>
     <item
         android:id="@+id/action_copy"
-        android:title="@string/action_copy">
-    </item>
+        android:title="@string/action_copy"/>
     <item
         android:id="@+id/action_bookmarks"
-        android:title="@string/action_bookmarks">
-    </item>
+        android:title="@string/action_bookmarks"/>
     <item
         android:id="@+id/action_add_bookmark"
-        android:title="@string/action_add_bookmark">
-    </item>
+        android:title="@string/action_add_bookmark"/>
     <item
         android:id="@+id/action_reading_mode"
-        android:title="@string/reading_mode">
-    </item>
+        android:title="@string/reading_mode"/>
     <item
         android:id="@+id/action_settings"
-        android:title="@string/settings">
-    </item>
+        android:title="@string/settings"/>
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/incognito.xml b/res/menu/incognito.xml
index 4d23bfd..44e8079 100644
--- a/res/menu/incognito.xml
+++ b/res/menu/incognito.xml
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/action_new_tab" android:title="@string/action_new_tab"></item>
-    <item android:id="@+id/action_share" android:title="@string/action_share" />
-    <item android:id="@+id/action_find" android:title="@string/action_find"></item>
-    <item android:id="@+id/action_history" android:title="@string/action_history" ></item>    
-    <item android:id="@+id/action_bookmarks" android:title="@string/action_bookmarks" ></item>
 
-</menu>
+    <item
+        android:id="@+id/action_new_tab"
+        android:title="@string/action_new_tab"/>
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/action_share"/>
+    <item
+        android:id="@+id/action_find"
+        android:title="@string/action_find"/>
+    <item
+        android:id="@+id/action_history"
+        android:title="@string/action_history"/>
+    <item
+        android:id="@+id/action_bookmarks"
+        android:title="@string/action_bookmarks"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 9631c95..1f7be7a 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -1,29 +1,50 @@
-<!--
-  Copyright 2014 A.C.R. Development
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_new_tab" android:title="@string/action_new_tab"></item>
-    <item android:id="@+id/action_incognito" android:title="@string/action_incognito" ></item>
-    <item android:id="@+id/action_share" android:title="@string/action_share" />
-    <item android:id="@+id/action_history" android:title="@string/action_history" ></item> 
-    <item android:id="@+id/action_find" android:title="@string/action_find"></item>   
-    <item android:id="@+id/action_copy" android:title="@string/action_copy" ></item>
-    <item android:id="@+id/action_bookmarks" android:title="@string/action_bookmarks" ></item>
-    <item android:id="@+id/action_add_bookmark" android:title="@string/action_add_bookmark" ></item>
-    <item android:id="@+id/action_reading_mode" android:title="@string/reading_mode" ></item>
-    <item android:id="@+id/action_settings" android:title="@string/settings" ></item>
-    
+<!--
+  Copyright 2014 A.C.R. Development
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.

+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_new_tab"
+        android:title="@string/action_new_tab"/>
+    <item
+        android:id="@+id/action_incognito"
+        android:title="@string/action_incognito"/>
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/action_share"/>
+    <item
+        android:id="@+id/action_history"
+        android:title="@string/action_history"/>
+    <item
+        android:id="@+id/action_find"
+        android:title="@string/action_find"/>
+    <item
+        android:id="@+id/action_copy"
+        android:title="@string/action_copy"/>
+    <item
+        android:id="@+id/action_bookmarks"
+        android:title="@string/action_bookmarks"/>
+    <item
+        android:id="@+id/action_add_bookmark"
+        android:title="@string/action_add_bookmark"/>
+    <item
+        android:id="@+id/action_reading_mode"
+        android:title="@string/reading_mode"/>
+    <item
+        android:id="@+id/action_settings"
+        android:title="@string/settings"/>
+
 </menu>
\ No newline at end of file