diff --git a/mobile/android/base/GeckoMenuInflater.java b/mobile/android/base/GeckoMenuInflater.java
index 342ec0021fa..0cce15fb739 100644
--- a/mobile/android/base/GeckoMenuInflater.java
+++ b/mobile/android/base/GeckoMenuInflater.java
@@ -41,7 +41,7 @@ public class GeckoMenuInflater extends MenuInflater {
         public boolean checked;
         public boolean visible;
         public boolean enabled;
-        public boolean showAsAction;
+        public int showAsAction;
     }
 
     public GeckoMenuInflater(Context context) {
@@ -126,15 +126,15 @@ public class GeckoMenuInflater extends MenuInflater {
     public void parseItem(ParsedItem item, AttributeSet attrs) {
         TypedArray a = mContext.obtainStyledAttributes(attrs, R.styleable.MenuItem);
 
-        item.id = a.getResourceId(R.styleable.MenuItem_id, NO_ID);
-        item.order = a.getInt(R.styleable.MenuItem_orderInCategory, 0);
-        item.title = a.getText(R.styleable.MenuItem_title);
-        item.iconRes = a.getResourceId(R.styleable.MenuItem_icon, 0);
-        item.checkable = a.getBoolean(R.styleable.MenuItem_checkable, false);
-        item.checked = a.getBoolean(R.styleable.MenuItem_checked, false);
-        item.visible = a.getBoolean(R.styleable.MenuItem_visible, true);
-        item.enabled = a.getBoolean(R.styleable.MenuItem_enabled, true);
-        item.showAsAction = a.getBoolean(R.styleable.MenuItem_showAsAction, false);
+        item.id = a.getResourceId(R.styleable.MenuItem_android_id, NO_ID);
+        item.order = a.getInt(R.styleable.MenuItem_android_orderInCategory, 0);
+        item.title = a.getText(R.styleable.MenuItem_android_title);
+        item.iconRes = a.getResourceId(R.styleable.MenuItem_android_icon, 0);
+        item.checkable = a.getBoolean(R.styleable.MenuItem_android_checkable, false);
+        item.checked = a.getBoolean(R.styleable.MenuItem_android_checked, false);
+        item.visible = a.getBoolean(R.styleable.MenuItem_android_visible, true);
+        item.enabled = a.getBoolean(R.styleable.MenuItem_android_enabled, true);
+        item.showAsAction = a.getInt(R.styleable.MenuItem_android_showAsAction, 0);
 
         a.recycle();
     }
@@ -146,6 +146,6 @@ public class GeckoMenuInflater extends MenuInflater {
                 .setCheckable(item.checkable)
                 .setCheckable(item.checked)
                 .setIcon(item.iconRes)
-                .setShowAsAction(item.showAsAction ? 1 : 0);
+                .setShowAsAction(item.showAsAction);
     }
 }
diff --git a/mobile/android/base/GeckoMenuItem.java b/mobile/android/base/GeckoMenuItem.java
index f5e96909148..570867a2a36 100644
--- a/mobile/android/base/GeckoMenuItem.java
+++ b/mobile/android/base/GeckoMenuItem.java
@@ -276,10 +276,10 @@ public class GeckoMenuItem implements MenuItem, View.OnClickListener {
         if (mShowAsActionChangedListener == null)
             return;
 
-        if (mActionItem == (actionEnum == 1))
+        if (mActionItem == (actionEnum > 0))
             return;
 
-        if (actionEnum == 1) {
+        if (actionEnum > 0) {
             if (!mShowAsActionChangedListener.hasActionItemBar())
                 return;
 
@@ -290,7 +290,7 @@ public class GeckoMenuItem implements MenuItem, View.OnClickListener {
             mLayout = new MenuItemDefault(mContext, null);
         }
 
-        mActionItem = (actionEnum == 1);         
+        mActionItem = (actionEnum > 0);         
 
         mLayout.setId(mId);
         mLayout.setOnClickListener(this);
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 8a6aca889f1..ec48438481e 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -214,8 +214,6 @@ FENNEC_PP_XML_FILES = \
   res/xml/preferences.xml \
   res/menu/browser_app_menu.xml \
   res/menu-v11/browser_app_menu.xml \
-  res/menu-v11/gecko_app_menu.xml \
-  res/menu-v11/titlebar_contextmenu.xml \
   res/menu-large-v11/browser_app_menu.xml \
   res/menu-xlarge-v11/browser_app_menu.xml \
   $(NULL)
diff --git a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
index 76729e50f3d..5340dc76e66 100644
--- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
@@ -1,68 +1,67 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<menu xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item gecko:id="@+id/reload"
-          gecko:icon="@drawable/ic_menu_reload"
-          gecko:title="@string/reload"
-          gecko:showAsAction="true"/>
+    <item android:id="@+id/reload"
+          android:icon="@drawable/ic_menu_reload"
+          android:title="@string/reload"
+          android:showAsAction="always"/>
 
-    <item gecko:id="@+id/forward"
-          gecko:icon="@drawable/ic_menu_forward"
-          gecko:title="@string/forward"
-          gecko:visible="false"/>
+    <item android:id="@+id/forward"
+          android:icon="@drawable/ic_menu_forward"
+          android:title="@string/forward"
+          android:visible="false"/>
 
-    <item gecko:id="@+id/bookmark"
-          gecko:icon="@drawable/ic_menu_bookmark_add"
-          gecko:title="@string/bookmark"/>
+    <item android:id="@+id/bookmark"
+          android:icon="@drawable/ic_menu_bookmark_add"
+          android:title="@string/bookmark"/>
 
-    <item gecko:id="@+id/share"
-          gecko:icon="@drawable/ic_menu_share"
-          gecko:title="@string/share" /> 
+    <item android:id="@+id/share"
+          android:icon="@drawable/ic_menu_share"
+          android:title="@string/share" /> 
     
-    <item gecko:id="@+id/find_in_page"
-          gecko:icon="@drawable/ic_menu_find_in_page"
-          gecko:title="@string/find_in_page" />
+    <item android:id="@+id/find_in_page"
+          android:icon="@drawable/ic_menu_find_in_page"
+          android:title="@string/find_in_page" />
 
-    <item gecko:id="@+id/desktop_mode"
-          gecko:icon="@drawable/ic_menu_desktop_mode"
-          gecko:title="@string/desktop_mode"
-          gecko:checkable="true" />
+    <item android:id="@+id/desktop_mode"
+          android:icon="@drawable/ic_menu_desktop_mode"
+          android:title="@string/desktop_mode"
+          android:checkable="true" />
 
-    <item gecko:title="@string/tools">
+    <item android:title="@string/tools">
 
         <menu>
 
-            <item gecko:id="@+id/save_as_pdf"
-                  gecko:icon="@drawable/ic_menu_save_as_pdf"
-                  gecko:title="@string/save_as_pdf" />
+            <item android:id="@+id/save_as_pdf"
+                  android:icon="@drawable/ic_menu_save_as_pdf"
+                  android:title="@string/save_as_pdf" />
 
-            <item gecko:id="@+id/addons"
-                  gecko:title="@string/addons"/>
+            <item android:id="@+id/addons"
+                  android:title="@string/addons"/>
 
-            <item gecko:id="@+id/downloads"
-                  gecko:title="@string/downloads"/>
+            <item android:id="@+id/downloads"
+                  android:title="@string/downloads"/>
 
-            <item gecko:id="@+id/apps"
-                  gecko:title="@string/apps"/>
+            <item android:id="@+id/apps"
+                  android:title="@string/apps"/>
 
         </menu>
 
     </item>
 
-    <item gecko:id="@+id/char_encoding"
-          gecko:visible="false"
-          gecko:title="@string/char_encoding"/>
+    <item android:id="@+id/char_encoding"
+          android:visible="false"
+          android:title="@string/char_encoding"/>
 
-    <item gecko:id="@+id/settings"
-          gecko:title="@string/settings" />
+    <item android:id="@+id/settings"
+          android:title="@string/settings" />
 
 #ifdef MOZ_PROFILING
-    <item gecko:id="@+id/toggle_profiling"
-          gecko:title="@string/toggle_profiling" />
+    <item android:id="@+id/toggle_profiling"
+          android:title="@string/toggle_profiling" />
 #endif
 </menu>
diff --git a/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in b/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
index 9a8a8089baa..ae3473a2ac4 100644
--- a/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
@@ -1,69 +1,68 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<menu xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item gecko:id="@+id/forward"
-          gecko:icon="@drawable/ic_menu_forward"
-          gecko:title="@string/forward"
-          gecko:showAsAction="true"/>
+    <item android:id="@+id/forward"
+          android:icon="@drawable/ic_menu_forward"
+          android:title="@string/forward"
+          android:showAsAction="always"/>
 
-    <item gecko:id="@+id/reload"
-          gecko:icon="@drawable/ic_menu_reload"
-          gecko:title="@string/reload"
-          gecko:showAsAction="true"/>
+    <item android:id="@+id/reload"
+          android:icon="@drawable/ic_menu_reload"
+          android:title="@string/reload"
+          android:showAsAction="always"/>
 
-    <item gecko:id="@+id/bookmark"
-          gecko:icon="@drawable/ic_menu_bookmark_add"
-          gecko:title="@string/bookmark"
-          gecko:showAsAction="true"/>
+    <item android:id="@+id/bookmark"
+          android:icon="@drawable/ic_menu_bookmark_add"
+          android:title="@string/bookmark"
+          android:showAsAction="always"/>
 
-    <item gecko:id="@+id/share"
-          gecko:icon="@drawable/ic_menu_share"
-          gecko:title="@string/share" /> 
+    <item android:id="@+id/share"
+          android:icon="@drawable/ic_menu_share"
+          android:title="@string/share" /> 
     
-    <item gecko:id="@+id/find_in_page"
-          gecko:icon="@drawable/ic_menu_find_in_page"
-          gecko:title="@string/find_in_page" />
+    <item android:id="@+id/find_in_page"
+          android:icon="@drawable/ic_menu_find_in_page"
+          android:title="@string/find_in_page" />
 
-    <item gecko:id="@+id/desktop_mode"
-          gecko:icon="@drawable/ic_menu_desktop_mode"
-          gecko:title="@string/desktop_mode"
-          gecko:checkable="true" />
+    <item android:id="@+id/desktop_mode"
+          android:icon="@drawable/ic_menu_desktop_mode"
+          android:title="@string/desktop_mode"
+          android:checkable="true" />
 
-    <item gecko:title="@string/tools">
+    <item android:title="@string/tools">
 
         <menu>
 
-            <item gecko:id="@+id/save_as_pdf"
-                  gecko:icon="@drawable/ic_menu_save_as_pdf"
-                  gecko:title="@string/save_as_pdf" />
+            <item android:id="@+id/save_as_pdf"
+                  android:icon="@drawable/ic_menu_save_as_pdf"
+                  android:title="@string/save_as_pdf" />
 
-            <item gecko:id="@+id/addons"
-                  gecko:title="@string/addons"/>
+            <item android:id="@+id/addons"
+                  android:title="@string/addons"/>
 
-            <item gecko:id="@+id/downloads"
-                  gecko:title="@string/downloads"/>
+            <item android:id="@+id/downloads"
+                  android:title="@string/downloads"/>
 
-            <item gecko:id="@+id/apps"
-                  gecko:title="@string/apps"/>
+            <item android:id="@+id/apps"
+                  android:title="@string/apps"/>
 
         </menu>
 
     </item>
 
-    <item gecko:id="@+id/char_encoding"
-          gecko:visible="false"
-          gecko:title="@string/char_encoding"/>
+    <item android:id="@+id/char_encoding"
+          android:visible="false"
+          android:title="@string/char_encoding"/>
 
-    <item gecko:id="@+id/settings"
-          gecko:title="@string/settings" />
+    <item android:id="@+id/settings"
+          android:title="@string/settings" />
 
 #ifdef MOZ_PROFILING
-    <item gecko:id="@+id/toggle_profiling"
-          gecko:title="@string/toggle_profiling" />
+    <item android:id="@+id/toggle_profiling"
+          android:title="@string/toggle_profiling" />
 #endif
 </menu>
diff --git a/mobile/android/base/resources/menu-v11/gecko_app_menu.xml.in b/mobile/android/base/resources/menu-v11/gecko_app_menu.xml.in
deleted file mode 100644
index ec39afed6dc..00000000000
--- a/mobile/android/base/resources/menu-v11/gecko_app_menu.xml.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#filter substitution
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<menu xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
-    <item gecko:id="@+id/quit"
-          gecko:title="@string/quit"
-          gecko:orderInCategory="10" />
-</menu>
diff --git a/mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml.in b/mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml.in
deleted file mode 100644
index 6bb04f33aef..00000000000
--- a/mobile/android/base/resources/menu-v11/titlebar_contextmenu.xml.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#filter substitution
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<menu xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
-
-    <item gecko:id="@+id/pasteandgo"
-          gecko:title="@string/contextmenu_pasteandgo"/>
-
-    <item gecko:id="@+id/paste"
-          gecko:title="@string/contextmenu_paste"/>
-
-    <item gecko:id="@+id/share"
-          gecko:title="@string/contextmenu_share"/>
-
-    <item gecko:id="@+id/copyurl"
-          gecko:title="@string/contextmenu_copyurl"/>
-
-    <item gecko:id="@+id/site_settings"
-          gecko:title="@string/site_settings_title" />
-
-    <item gecko:id="@+id/add_to_launcher"
-          gecko:title="@string/contextmenu_add_to_launcher"/>
-
-</menu>
diff --git a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
index ff922626bf2..257522599da 100644
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
@@ -1,69 +1,68 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<menu xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item gecko:id="@+id/reload"
-          gecko:icon="@drawable/ic_menu_reload"
-          gecko:title="@string/reload"
-          gecko:showAsAction="true"/>
+    <item android:id="@+id/reload"
+          android:icon="@drawable/ic_menu_reload"
+          android:title="@string/reload"
+          android:showAsAction="always"/>
 
-    <item gecko:id="@+id/forward"
-          gecko:icon="@drawable/ic_menu_forward"
-          gecko:title="@string/forward"
-          gecko:visible="false"/>
+    <item android:id="@+id/forward"
+          android:icon="@drawable/ic_menu_forward"
+          android:title="@string/forward"
+          android:visible="false"/>
 
-    <item gecko:id="@+id/bookmark"
-          gecko:icon="@drawable/ic_menu_bookmark_add"
-          gecko:title="@string/bookmark"
-          gecko:showAsAction="true"/>
+    <item android:id="@+id/bookmark"
+          android:icon="@drawable/ic_menu_bookmark_add"
+          android:title="@string/bookmark"
+          android:showAsAction="always"/>
 
-    <item gecko:id="@+id/share"
-          gecko:icon="@drawable/ic_menu_share"
-          gecko:title="@string/share" /> 
+    <item android:id="@+id/share"
+          android:icon="@drawable/ic_menu_share"
+          android:title="@string/share" /> 
     
-    <item gecko:id="@+id/find_in_page"
-          gecko:icon="@drawable/ic_menu_find_in_page"
-          gecko:title="@string/find_in_page" />
+    <item android:id="@+id/find_in_page"
+          android:icon="@drawable/ic_menu_find_in_page"
+          android:title="@string/find_in_page" />
 
-    <item gecko:id="@+id/desktop_mode"
-          gecko:icon="@drawable/ic_menu_desktop_mode"
-          gecko:title="@string/desktop_mode"
-          gecko:checkable="true" />
+    <item android:id="@+id/desktop_mode"
+          android:icon="@drawable/ic_menu_desktop_mode"
+          android:title="@string/desktop_mode"
+          android:checkable="true" />
 
-    <item gecko:title="@string/tools">
+    <item android:title="@string/tools">
 
         <menu>
 
-            <item gecko:id="@+id/save_as_pdf"
-                  gecko:icon="@drawable/ic_menu_save_as_pdf"
-                  gecko:title="@string/save_as_pdf" />
+            <item android:id="@+id/save_as_pdf"
+                  android:icon="@drawable/ic_menu_save_as_pdf"
+                  android:title="@string/save_as_pdf" />
 
-            <item gecko:id="@+id/addons"
-                  gecko:title="@string/addons"/>
+            <item android:id="@+id/addons"
+                  android:title="@string/addons"/>
 
-            <item gecko:id="@+id/downloads"
-                  gecko:title="@string/downloads"/>
+            <item android:id="@+id/downloads"
+                  android:title="@string/downloads"/>
 
-            <item gecko:id="@+id/apps"
-                  gecko:title="@string/apps"/>
+            <item android:id="@+id/apps"
+                  android:title="@string/apps"/>
 
         </menu>
 
     </item>
 
-    <item gecko:id="@+id/char_encoding"
-          gecko:visible="false"
-          gecko:title="@string/char_encoding"/>
+    <item android:id="@+id/char_encoding"
+          android:visible="false"
+          android:title="@string/char_encoding"/>
 
-    <item gecko:id="@+id/settings"
-          gecko:title="@string/settings" />
+    <item android:id="@+id/settings"
+          android:title="@string/settings" />
 
 #ifdef MOZ_PROFILING
-    <item gecko:id="@+id/toggle_profiling"
-          gecko:title="@string/toggle_profiling" />
+    <item android:id="@+id/toggle_profiling"
+          android:title="@string/toggle_profiling" />
 #endif
 </menu>
diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml
index 610f1bfab2c..61112ab5641 100644
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -12,15 +12,15 @@
     </declare-styleable>
 
     <declare-styleable name="MenuItem">
-        <attr name="id" format="string"/>
-        <attr name="orderInCategory" format="string"/>
-        <attr name="title"/>
-        <attr name="icon" format="string"/>
-        <attr name="checkable" format="boolean"/>
-        <attr name="checked" format="boolean"/>
-        <attr name="visible" format="string"/>
-        <attr name="enabled" format="string"/>
-        <attr name="showAsAction" format="boolean"/>
+        <attr name="android:id"/>
+        <attr name="android:orderInCategory"/>
+        <attr name="android:title"/>
+        <attr name="android:icon"/>
+        <attr name="android:checkable"/>
+        <attr name="android:checked"/>
+        <attr name="android:visible"/>
+        <attr name="android:enabled"/>
+        <attr name="android:showAsAction"/>
     </declare-styleable>
 
     <declare-styleable name="FlowLayout">