diff --git a/mobile/android/base/resources/color-large-v11/tab_item_title.xml b/mobile/android/base/resources/color/tab_item_title.xml
similarity index 100%
rename from mobile/android/base/resources/color-large-v11/tab_item_title.xml
rename to mobile/android/base/resources/color/tab_item_title.xml
diff --git a/mobile/android/base/resources/drawable-hdpi/tab_close.png b/mobile/android/base/resources/drawable-hdpi/tab_close.png
index 9dbbcad93a86..7aadf4c45b51 100644
Binary files a/mobile/android/base/resources/drawable-hdpi/tab_close.png and b/mobile/android/base/resources/drawable-hdpi/tab_close.png differ
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close_active.png b/mobile/android/base/resources/drawable-hdpi/tab_close_active.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close_active.png
rename to mobile/android/base/resources/drawable-hdpi/tab_close_active.png
diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close.png b/mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close.png
deleted file mode 100644
index 7aadf4c45b51..000000000000
Binary files a/mobile/android/base/resources/drawable-large-hdpi-v11/tablet_tab_close.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close.png
deleted file mode 100644
index 8e4908e0c58f..000000000000
Binary files a/mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi/tab_close.png b/mobile/android/base/resources/drawable-xhdpi/tab_close.png
index 88797492bb31..8e4908e0c58f 100644
Binary files a/mobile/android/base/resources/drawable-xhdpi/tab_close.png and b/mobile/android/base/resources/drawable-xhdpi/tab_close.png differ
diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close_active.png b/mobile/android/base/resources/drawable-xhdpi/tab_close_active.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xhdpi-v11/tablet_tab_close_active.png
rename to mobile/android/base/resources/drawable-xhdpi/tab_close_active.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close.png b/mobile/android/base/resources/drawable-xxhdpi/tab_close.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close.png
rename to mobile/android/base/resources/drawable-xxhdpi/tab_close.png
diff --git a/mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close_active.png b/mobile/android/base/resources/drawable-xxhdpi/tab_close_active.png
similarity index 100%
rename from mobile/android/base/resources/drawable-large-xxhdpi-v11/tablet_tab_close_active.png
rename to mobile/android/base/resources/drawable-xxhdpi/tab_close_active.png
diff --git a/mobile/android/base/resources/drawable-large-v11/tab_item_close_button.xml b/mobile/android/base/resources/drawable/tab_item_close_button.xml
similarity index 71%
rename from mobile/android/base/resources/drawable-large-v11/tab_item_close_button.xml
rename to mobile/android/base/resources/drawable/tab_item_close_button.xml
index 94c56c68ef5c..401234633173 100644
--- a/mobile/android/base/resources/drawable-large-v11/tab_item_close_button.xml
+++ b/mobile/android/base/resources/drawable/tab_item_close_button.xml
@@ -7,12 +7,12 @@
 
     <!-- pressed state -->
     <item android:state_pressed="true"
-          android:drawable="@drawable/tablet_tab_close_active"/>
+          android:drawable="@drawable/tab_close_active"/>
 
     <item android:state_checked="true"
-          android:drawable="@drawable/tablet_tab_close_active"/>
+          android:drawable="@drawable/tab_close_active"/>
 
     <!-- normal mode -->
-    <item android:drawable="@drawable/tablet_tab_close"/>
+    <item android:drawable="@drawable/tab_close"/>
 
 </selector>
diff --git a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
index 9c263294b19e..03039e2b10f2 100644
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
+++ b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
@@ -46,7 +46,7 @@
         android:background="@android:color/transparent"
         android:scaleType="center"
         android:contentDescription="@string/close_tab"
-        android:src="@drawable/tablet_tab_close"
+        android:src="@drawable/tab_close"
         android:duplicateParentState="true"/>
 
 </merge>
diff --git a/mobile/android/base/resources/layout/tabs_item_cell.xml b/mobile/android/base/resources/layout/tabs_item_cell.xml
deleted file mode 100644
index 12ad7c38ccf5..000000000000
--- a/mobile/android/base/resources/layout/tabs_item_cell.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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/. -->
-
-<org.mozilla.gecko.tabs.TabsLayoutItemView xmlns:android="http://schemas.android.com/apk/res/android"
-                                           style="@style/TabsItem"
-                                           android:focusable="true"
-                                           android:id="@+id/info"
-                                           android:layout_width="wrap_content"
-                                           android:layout_height="wrap_content"
-                                           android:paddingTop="6dip"
-                                           android:paddingBottom="6dip"
-                                           android:paddingLeft="1dip"
-                                           android:paddingRight="1dip"
-                                           android:gravity="center">
-
-    <!-- We set state_private on this View dynamically in TabsListLayout. -->
-    <org.mozilla.gecko.widget.TabThumbnailWrapper
-            android:id="@+id/wrapper"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="6dip"
-            android:padding="4dip"
-            android:background="@drawable/tab_thumbnail"
-            android:duplicateParentState="true">
-
-        <org.mozilla.gecko.tabs.TabsPanelThumbnailView android:id="@+id/thumbnail"
-                                                       android:layout_width="@dimen/tab_thumbnail_width"
-                                                       android:layout_height="@dimen/tab_thumbnail_height"/>
-
-        <LinearLayout android:layout_width="@dimen/tab_thumbnail_width"
-                      android:layout_height="wrap_content"
-                      android:orientation="horizontal"
-                      android:background="#EFFF"
-                      android:layout_below="@id/thumbnail"
-                      android:duplicateParentState="true">
-
-            <TextView android:id="@+id/title"
-                      android:layout_width="0dip"
-                      android:layout_height="wrap_content"
-                      android:layout_weight="1.0"
-                      android:padding="4dip"
-                      style="@style/TabLayoutItemTextAppearance"
-                      android:textSize="12sp"
-                      android:textColor="@color/placeholder_active_grey"
-                      android:singleLine="true"
-                      android:duplicateParentState="true"/>
-
-            <ImageButton android:id="@+id/audio_playing"
-                         android:visibility="gone"
-                         android:layout_width="20dip"
-                         android:layout_height="match_parent"
-                         android:background="@drawable/action_bar_button_inverse"
-                         android:scaleType="center"
-                         android:contentDescription="@string/tab_audio_playing"
-                         android:src="@drawable/tab_audio_playing"/>
-
-            <ImageButton android:id="@+id/close"
-                         style="@style/TabsItemClose"
-                         android:layout_width="32dip"
-                         android:layout_height="match_parent"
-                         android:background="@drawable/action_bar_button_inverse"
-                         android:scaleType="center"
-                         android:contentDescription="@string/close_tab"
-                         android:src="@drawable/tab_close"/>
-
-        </LinearLayout>
-
-    </org.mozilla.gecko.widget.TabThumbnailWrapper>
-
-</org.mozilla.gecko.tabs.TabsLayoutItemView>
diff --git a/mobile/android/base/resources/layout/tabs_item_row.xml b/mobile/android/base/resources/layout/tabs_item_row.xml
deleted file mode 100644
index d3816671ab04..000000000000
--- a/mobile/android/base/resources/layout/tabs_item_row.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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/. -->
-
-<org.mozilla.gecko.tabs.TabsLayoutItemView xmlns:android="http://schemas.android.com/apk/res/android"
-                                           style="@style/TabsItem"
-                                           android:focusable="true"
-                                           android:id="@+id/info"
-                                           android:layout_width="match_parent"
-                                           android:layout_height="wrap_content"
-                                           android:paddingLeft="12dip"
-                                           android:paddingTop="6dip"
-                                           android:paddingBottom="6dip"
-                                           android:background="@drawable/tab_row">
-
-    <!-- We set state_private on this View dynamically in TabsListLayout. -->
-    <org.mozilla.gecko.widget.TabThumbnailWrapper
-                  android:id="@+id/wrapper"
-	          android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:padding="4dip"
-                  android:background="@drawable/tab_thumbnail"
-                  android:duplicateParentState="true">
-
-        <org.mozilla.gecko.tabs.TabsPanelThumbnailView android:id="@+id/thumbnail"
-                                                       android:layout_width="@dimen/tab_thumbnail_width"
-                                                       android:layout_height="@dimen/tab_thumbnail_height"/>
-
-    </org.mozilla.gecko.widget.TabThumbnailWrapper>
-
-    <LinearLayout android:layout_width="0dip"
-                  android:layout_height="match_parent"
-                  android:orientation="vertical"
-                  android:layout_weight="1.0"
-                  android:paddingTop="4dip"
-                  android:paddingLeft="8dip"
-                  android:paddingRight="4dip">
-
-        <TextView android:id="@+id/title"
-                  android:layout_width="match_parent"
-                  android:layout_height="0dip"
-                  android:layout_weight="1.0"
-                  style="@style/TabLayoutItemTextAppearance"
-                  android:textColor="#FFFFFFFF"
-                  android:textSize="14sp"
-                  android:singleLine="false"
-                  android:maxLines="4"
-                  android:duplicateParentState="true"/>
-
-        <ImageButton android:id="@+id/audio_playing"
-                     android:visibility="gone"
-                     android:layout_width="20dip"
-                     android:layout_height="20dip"
-                     android:gravity="bottom"
-                     android:background="@drawable/action_bar_button_inverse"
-                     android:scaleType="center"
-                     android:contentDescription="@string/tab_audio_playing"
-                     android:src="@drawable/tab_audio_playing"/>
-
-    </LinearLayout>
-
-    <ImageButton android:id="@+id/close"
-                 style="@style/TabsItemClose"
-                 android:layout_width="34dip"
-                 android:layout_height="match_parent"
-                 android:background="@drawable/action_bar_button_inverse"
-                 android:scaleType="center"
-                 android:contentDescription="@string/close_tab"
-                 android:src="@drawable/tab_close"/>
-
-</org.mozilla.gecko.tabs.TabsLayoutItemView>
diff --git a/mobile/android/base/resources/layout-v11/tablet_tabs_item_cell.xml b/mobile/android/base/resources/layout/tabs_layout_item_view.xml
similarity index 100%
rename from mobile/android/base/resources/layout-v11/tablet_tabs_item_cell.xml
rename to mobile/android/base/resources/layout/tabs_layout_item_view.xml
diff --git a/mobile/android/base/resources/values-land/layout.xml b/mobile/android/base/resources/values-land/layout.xml
deleted file mode 100644
index 00cc1d624540..000000000000
--- a/mobile/android/base/resources/values-land/layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/. -->
-
-<resources>
-    <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_cell</item>
-</resources>
diff --git a/mobile/android/base/resources/values-large-v11/layout.xml b/mobile/android/base/resources/values-large-v11/layout.xml
deleted file mode 100644
index 00cc1d624540..000000000000
--- a/mobile/android/base/resources/values-large-v11/layout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/. -->
-
-<resources>
-    <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_cell</item>
-</resources>
diff --git a/mobile/android/base/resources/values/layout.xml b/mobile/android/base/resources/values/layout.xml
index 2b03d10e713e..a11e2b9b92f2 100644
--- a/mobile/android/base/resources/values/layout.xml
+++ b/mobile/android/base/resources/values/layout.xml
@@ -4,13 +4,10 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
-    <item type="layout" name="tabs_layout_item_view">@layout/tabs_item_row</item>
-
     <!-- These items are v11+ resources but are referenced in code shipped with
          API 9 builds. Since v11+ resources don't ship on API 9 builds, in order
          for the resource ID to be found (and thus compilation to succeed), we
          provide dummy values below. -->
     <item type="layout" name="tab_strip">@null</item>
-    <item type="layout" name="tablet_tabs_item_cell">@null</item>
     <item type="layout" name="tabs_panel_back_button">@null</item>
 </resources>
diff --git a/mobile/android/base/tabs/TabsGridLayout.java b/mobile/android/base/tabs/TabsGridLayout.java
index 767d631ca0ed..451272ba644b 100644
--- a/mobile/android/base/tabs/TabsGridLayout.java
+++ b/mobile/android/base/tabs/TabsGridLayout.java
@@ -421,7 +421,7 @@ class TabsGridLayout extends GridView
         final private Button.OnClickListener mCloseClickListener;
 
         public TabsGridLayoutAdapter(Context context) {
-            super(context, R.layout.tablet_tabs_item_cell);
+            super(context, R.layout.tabs_layout_item_view);
 
             mCloseClickListener = new Button.OnClickListener() {
                 @Override
diff --git a/mobile/android/base/tabs/TabsLayoutItemView.java b/mobile/android/base/tabs/TabsLayoutItemView.java
index 2ef680725587..b6815aef63b8 100644
--- a/mobile/android/base/tabs/TabsLayoutItemView.java
+++ b/mobile/android/base/tabs/TabsLayoutItemView.java
@@ -102,9 +102,7 @@ public class TabsLayoutItemView extends LinearLayout
         mAudioPlayingButton = (ImageView) findViewById(R.id.audio_playing);
         mThumbnailWrapper = (TabThumbnailWrapper) findViewById(R.id.wrapper);
 
-        if (HardwareUtils.isTablet()) {
-            growCloseButtonHitArea();
-        }
+        growCloseButtonHitArea();
 
         mAudioPlayingButton.setOnClickListener(new View.OnClickListener() {
             @Override