diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 9075ea02acf..f5aad31f2aa 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -252,6 +252,11 @@ toolbar[customizing] > .overflow-button {
 
 %endif
 
+#main-window[inFullscreen] #global-notificationbox,
+#main-window[inFullscreen] #high-priority-global-notificationbox {
+  visibility: collapse;
+}
+
 /* Rules to help integrate SDK widgets */
 toolbaritem[sdkstylewidget="true"] > toolbarbutton,
 toolbarpaletteitem > toolbaritem[sdkstylewidget="true"] > iframe,
diff --git a/configure.in b/configure.in
index 117556ad6b7..3816dcb16e3 100644
--- a/configure.in
+++ b/configure.in
@@ -3849,6 +3849,7 @@ MOZ_ANDROID_SEARCH_ACTIVITY=
 MOZ_ANDROID_DOWNLOADS_INTEGRATION=
 MOZ_ANDROID_MLS_STUMBLER=
 MOZ_ANDROID_SHARE_OVERLAY=
+MOZ_ANDROID_NEW_TABLET_UI=
 ACCESSIBILITY=1
 MOZ_TIME_MANAGER=
 MOZ_PAY=
@@ -4908,6 +4909,14 @@ if test -n "$MOZ_ANDROID_SHARE_OVERLAY"; then
     AC_DEFINE(MOZ_ANDROID_SHARE_OVERLAY)
 fi
 
+dnl ========================================================
+dnl = Include New Tablet UI on Android
+dnl = Temporary build flag to allow development in Nightly
+dnl ========================================================
+if test -n "$MOZ_ANDROID_NEW_TABLET_UI"; then
+    AC_DEFINE(MOZ_ANDROID_NEW_TABLET_UI)
+fi
+
 dnl ========================================================
 dnl = Enable IPDL's "expensive" unit tests
 dnl ========================================================
@@ -8517,6 +8526,7 @@ AC_SUBST(MOZ_LOCALE_SWITCHER)
 AC_SUBST(MOZ_DISABLE_GECKOVIEW)
 AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY)
 AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY)
+AC_SUBST(MOZ_ANDROID_NEW_TABLET_UI)
 AC_SUBST(MOZ_ANDROID_MLS_STUMBLER)
 AC_SUBST(MOZ_ANDROID_DOWNLOADS_INTEGRATION)
 AC_SUBST(ENABLE_STRIP)
diff --git a/mobile/android/base/favicons/Favicons.java b/mobile/android/base/favicons/Favicons.java
index d2d9bf7f8e6..8a1cf8afc98 100644
--- a/mobile/android/base/favicons/Favicons.java
+++ b/mobile/android/base/favicons/Favicons.java
@@ -409,7 +409,7 @@ public class Favicons {
 
         // TODO: Remove this branch when old tablet is removed.
         final int defaultFaviconSizeDimenID =
-                isNewTabletEnabled ? R.dimen.tab_strip_favicon_size : R.dimen.favicon_bg;
+                isNewTabletEnabled ? R.dimen.new_tablet_tab_strip_favicon_size : R.dimen.favicon_bg;
         defaultFaviconSize = res.getDimensionPixelSize(defaultFaviconSizeDimenID);
 
         // Screen-density-adjusted upper limit on favicon size. Favicons larger than this are
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index bae34b8821c..8776f63fd64 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -400,10 +400,6 @@ gbjar.sources += [
     'tabs/TabsLayoutItemView.java',
     'tabs/TabsListLayout.java',
     'tabs/TabsPanel.java',
-    'tabs/TabStrip.java',
-    'tabs/TabStripAdapter.java',
-    'tabs/TabStripItemView.java',
-    'tabs/TabStripView.java',
     'TabsAccessor.java',
     'Telemetry.java',
     'TelemetryContract.java',
@@ -513,6 +509,20 @@ if CONFIG['MOZ_ANDROID_SHARE_OVERLAY']:
         'overlays/ui/ShareDialog.java',
     ]
 
+if (CONFIG['MOZ_ANDROID_MAX_SDK_VERSION']):
+    max_sdk_version = int(CONFIG['MOZ_ANDROID_MAX_SDK_VERSION'])
+else:
+    max_sdk_version = 999
+
+if CONFIG['MOZ_ANDROID_NEW_TABLET_UI'] and max_sdk_version >= 11:
+    gbjar.sources += [
+        'tabs/TabStrip.java',
+        'tabs/TabStripAdapter.java',
+        'tabs/TabStripItemView.java',
+        'tabs/TabStripView.java'
+    ]
+    ANDROID_RES_DIRS += [ SRCDIR + '/newtablet/res' ]
+
 gbjar.sources += sync_java_files
 gbjar.generated_sources += sync_generated_java_files
 gbjar.extra_jars = [
@@ -619,7 +629,8 @@ ANDROID_GENERATED_RESFILES += [
 
 for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG',
             'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER',
-            'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION'):
+            'MOZ_ANDROID_SHARE_OVERLAY', 'MOZ_ANDROID_DOWNLOADS_INTEGRATION',
+            'MOZ_ANDROID_NEW_TABLET_UI'):
     if CONFIG[var]:
         DEFINES[var] = 1
 
diff --git a/mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml b/mobile/android/base/newtablet/res/color-large-v11/new_tablet_tab_strip_item_title.xml
similarity index 100%
rename from mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml
rename to mobile/android/base/newtablet/res/color-large-v11/new_tablet_tab_strip_item_title.xml
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_default_favicon.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_default_favicon.png
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_menu.png b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_menu.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_menu.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_menu.png
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count.png b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tabs_count.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tabs_count.png
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_default_favicon.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_default_favicon.png
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_menu.png b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_menu.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_menu.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_menu.png
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count.png b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tabs_count.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tabs_count.png
diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
diff --git a/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_divider.xml b/mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_divider.xml
similarity index 100%
rename from mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_divider.xml
rename to mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_divider.xml
diff --git a/mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_item_bg.xml b/mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
similarity index 100%
rename from mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
rename to mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_item_bg.xml
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_default_favicon.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_default_favicon.png
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_menu.png b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_menu.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_menu.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_menu.png
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count.png b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png b/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png b/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png b/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png b/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_menu.png b/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_menu.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_menu.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_menu.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png b/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png b/mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png
rename to mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png
diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml b/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml
similarity index 100%
rename from mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml
diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml b/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tab_strip.xml
similarity index 100%
rename from mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tab_strip.xml
diff --git a/mobile/android/base/resources/layout-large-v11/new_tablet_tabs_counter.xml b/mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tabs_counter.xml
similarity index 100%
rename from mobile/android/base/resources/layout-large-v11/new_tablet_tabs_counter.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tabs_counter.xml
diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip.xml b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml
similarity index 100%
rename from mobile/android/base/resources/layout-large-v11/tab_strip.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml
diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip_item.xml b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item.xml
similarity index 100%
rename from mobile/android/base/resources/layout-large-v11/tab_strip_item.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item.xml
diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item_view.xml
similarity index 95%
rename from mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
rename to mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item_view.xml
index fd64328f750..57106e9c5bf 100644
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
+++ b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item_view.xml
@@ -8,7 +8,7 @@
 
    <ImageView
         android:id="@+id/favicon"
-        android:layout_width="@dimen/tab_strip_favicon_size"
+        android:layout_width="@dimen/new_tablet_tab_strip_favicon_size"
         android:layout_height="match_parent"
         android:layout_marginRight="9dp"
         android:scaleType="centerInside"
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png b/mobile/android/base/resources/drawable-hdpi/ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png
rename to mobile/android/base/resources/drawable-hdpi/ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_back.png b/mobile/android/base/resources/drawable-mdpi/ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-mdpi-v11/ic_menu_back.png
rename to mobile/android/base/resources/drawable-mdpi/ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png b/mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png
similarity index 100%
rename from mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png
rename to mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png
diff --git a/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml b/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml
new file mode 100644
index 00000000000..d3e7c791725
--- /dev/null
+++ b/mobile/android/base/resources/drawable/new_tablet_default_favicon.xml
@@ -0,0 +1,7 @@
+<?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/. -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
diff --git a/mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml b/mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml
new file mode 100644
index 00000000000..d3e7c791725
--- /dev/null
+++ b/mobile/android/base/resources/drawable/new_tablet_ic_menu_forward.xml
@@ -0,0 +1,7 @@
+<?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/. -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
diff --git a/mobile/android/base/resources/drawable/new_tablet_ic_menu_reload.xml b/mobile/android/base/resources/drawable/new_tablet_ic_menu_reload.xml
new file mode 100644
index 00000000000..d3e7c791725
--- /dev/null
+++ b/mobile/android/base/resources/drawable/new_tablet_ic_menu_reload.xml
@@ -0,0 +1,7 @@
+<?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/. -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
diff --git a/mobile/android/base/resources/drawable/new_tablet_tabs_count.xml b/mobile/android/base/resources/drawable/new_tablet_tabs_count.xml
new file mode 100644
index 00000000000..d3e7c791725
--- /dev/null
+++ b/mobile/android/base/resources/drawable/new_tablet_tabs_count.xml
@@ -0,0 +1,7 @@
+<?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/. -->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@null"/>
diff --git a/mobile/android/base/resources/values-large-v11/dimens.xml b/mobile/android/base/resources/values-large-v11/dimens.xml
index 466d546804d..1b508753a89 100644
--- a/mobile/android/base/resources/values-large-v11/dimens.xml
+++ b/mobile/android/base/resources/values-large-v11/dimens.xml
@@ -12,14 +12,7 @@
     <dimen name="back_button_width">42dp</dimen>
     <dimen name="back_button_width_half">21dp</dimen>
 
-    <dimen name="forward_default_offset">-13dip</dimen>
-    <dimen name="new_tablet_forward_default_offset">-6dp</dimen>
-
-    <dimen name="new_tablet_browser_toolbar_menu_item_padding">19dp</dimen>
-
     <dimen name="tabs_counter_size">26sp</dimen>
     <dimen name="panel_grid_view_column_width">200dp</dimen>
 
-    <dimen name="tab_strip_favicon_size">16dp</dimen>
-
 </resources>
diff --git a/mobile/android/base/resources/values-large-v11/themes.xml b/mobile/android/base/resources/values-large-v11/themes.xml
index f9a32b91ad0..b4a3fea5c2d 100644
--- a/mobile/android/base/resources/values-large-v11/themes.xml
+++ b/mobile/android/base/resources/values-large-v11/themes.xml
@@ -14,6 +14,7 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="arrowPopupWidth">400dp</item>
+        <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
     </style>
 
     <style name="GeckoStartPane" parent="Gecko.Dialog"/>
diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml
index 4cda485d95a..c219635b6a9 100644
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -20,6 +20,10 @@
     <dimen name="new_tablet_tab_strip_height">48dp</dimen>
     <dimen name="new_tablet_tab_strip_item_width">250dp</dimen>
     <dimen name="new_tablet_tab_strip_item_margin">-30dp</dimen>
+    <dimen name="new_tablet_tab_strip_favicon_size">-30dp</dimen>
+    <dimen name="new_tablet_forward_default_offset">-6dp</dimen>
+    <dimen name="new_tablet_browser_toolbar_menu_item_padding">19dp</dimen>
+    <dimen name="forward_default_offset">-13dip</dimen>
 
     <!-- Dimensions used by Favicons and FaviconView -->
     <dimen name="favicon_size_small">16dp</dimen>
diff --git a/mobile/android/base/resources/values/ids.xml b/mobile/android/base/resources/values/ids.xml
index 1f0af22fb4d..5dfad221447 100644
--- a/mobile/android/base/resources/values/ids.xml
+++ b/mobile/android/base/resources/values/ids.xml
@@ -7,5 +7,6 @@
 
     <item type="id" name="guestNotification"/>
     <item type="id" name="original_height"/>
+    <item type="id" name="menu_items"/>
 
 </resources>
diff --git a/mobile/android/base/resources/values/layout.xml b/mobile/android/base/resources/values/layout.xml
index 854537a2ed9..3c854729b84 100644
--- a/mobile/android/base/resources/values/layout.xml
+++ b/mobile/android/base/resources/values/layout.xml
@@ -5,4 +5,6 @@
 
 <resources>
     <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_row</item>
+    <item type="layout" name="new_tablet_browser_toolbar">@null</item>
+    <item type="layout" name="new_tablet_tab_strip">@null</item>
 </resources>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index 63ed3e8987a..3e5f0ecf6bd 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -93,7 +93,6 @@
         <item name="geckoMenuListViewStyle">@style/Widget.GeckoMenuListView</item>
         <item name="homeListViewStyle">@style/Widget.HomeListView</item>
         <item name="menuItemActionBarStyle">@style/Widget.MenuItemActionBar</item>
-        <item name="menuItemActionBarStyleNewTablet">@style/Widget.MenuItemActionBar.NewTablet</item>
         <item name="menuItemActionModeStyle">@style/GeckoActionBar.Button</item>
         <item name="menuItemShareActionButtonStyle">@style/Widget.MenuItemSecondaryActionBar</item>
         <item name="panelGridViewStyle">@style/Widget.PanelGridView</item>
diff --git a/mobile/android/base/tabs/TabStripItemView.java b/mobile/android/base/tabs/TabStripItemView.java
index 0e9c16c88f3..c695666724d 100644
--- a/mobile/android/base/tabs/TabStripItemView.java
+++ b/mobile/android/base/tabs/TabStripItemView.java
@@ -69,7 +69,7 @@ public class TabStripItemView extends ThemedLinearLayout
         tabPaint.setStrokeWidth(0.0f);
         tabPaint.setXfermode(new PorterDuffXfermode(Mode.DST_IN));
 
-        faviconSize = getResources().getDimensionPixelSize(R.dimen.tab_strip_favicon_size);
+        faviconSize = getResources().getDimensionPixelSize(R.dimen.new_tablet_tab_strip_favicon_size);
 
         LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
         setOnClickListener(new View.OnClickListener() {
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index feb9662597f..14b5ffbbb46 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -81,6 +81,12 @@ else
   MOZ_ANDROID_SEARCH_ACTIVITY=
 fi
 
+# Enable the new tablet UI in pre-release builds
+# if the max Android sdk is undefined or at least 11.
+if test ! "$RELEASE_BUILD"; then
+  MOZ_ANDROID_NEW_TABLET_UI=1
+fi
+
 # Enable the share handler in pre-release builds.
 if test ! "$RELEASE_BUILD"; then
   MOZ_ANDROID_SHARE_OVERLAY=1