diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index ade71a55308a..337eefb866de 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -243,6 +243,8 @@ RES_DRAWABLE_MDPI_V8 = \
   res/drawable-mdpi-v8/abouthome_separator.9.png \
   res/drawable-mdpi-v8/abouthome_topsite_placeholder.png \
   res/drawable-mdpi-v8/abouthome_topsite_shadow.9.png \
+  res/drawable-mdpi-v8/awesomebar_tab.9.png \
+  res/drawable-mdpi-v8/awesomebar_tab_pressed.9.png \
   res/drawable-mdpi-v8/ic_awesomebar_go.png \
   res/drawable-mdpi-v8/ic_awesomebar_search.png \
   res/drawable-mdpi-v8/ic_menu_bookmark_add.png \
@@ -280,6 +282,8 @@ RES_DRAWABLE_HDPI_V8 = \
   res/drawable-hdpi-v8/abouthome_separator.9.png \
   res/drawable-hdpi-v8/abouthome_topsite_placeholder.png \
   res/drawable-hdpi-v8/abouthome_topsite_shadow.9.png \
+  res/drawable-hdpi-v8/awesomebar_tab.9.png \
+  res/drawable-hdpi-v8/awesomebar_tab_pressed.9.png \
   res/drawable-hdpi-v8/ic_awesomebar_go.png \
   res/drawable-hdpi-v8/ic_awesomebar_search.png \
   res/drawable-hdpi-v8/ic_menu_bookmark_add.png \
@@ -355,6 +359,8 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/abouthome_separator.9.png \
   res/drawable-xhdpi-v11/abouthome_topsite_placeholder.png \
   res/drawable-xhdpi-v11/abouthome_topsite_shadow.9.png \
+  res/drawable-xhdpi-v11/awesomebar_tab.9.png \
+  res/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png \
   res/drawable-xhdpi-v11/ic_awesomebar_go.png \
   res/drawable-xhdpi-v11/ic_awesomebar_search.png \
   res/drawable-xhdpi-v11/ic_menu_bookmark_add.png \
@@ -449,8 +455,6 @@ MOZ_ANDROID_DRAWABLES += mobile/android/base/resources/drawable/abouthome_bg_rep
                          mobile/android/base/resources/drawable/address_bar_url_default.xml     \
                          mobile/android/base/resources/drawable/address_bar_url_pressed.xml     \
                          mobile/android/base/resources/drawable/autocomplete_list_bg.9.png      \
-                         mobile/android/base/resources/drawable/awesomebar_tab_focus.xml        \
-                         mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml \
                          mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml    \
                          mobile/android/base/resources/drawable/awesomebar_tab_press.xml        \
                          mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml \
diff --git a/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png b/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png
new file mode 100644
index 000000000000..cfbc86b6be53
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab.9.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png b/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png
new file mode 100644
index 000000000000..6f4b9220f38e
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v8/awesomebar_tab_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab.9.png b/mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab.9.png
new file mode 100644
index 000000000000..cefcbcd693b1
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab.9.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab_pressed.9.png b/mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab_pressed.9.png
new file mode 100644
index 000000000000..0df3ead255dd
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v8/awesomebar_tab_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab.9.png
new file mode 100644
index 000000000000..cd2a80092578
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab.9.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png
new file mode 100644
index 000000000000..4f122b12fc3f
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/awesomebar_tab_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_focus.xml b/mobile/android/base/resources/drawable/awesomebar_tab_focus.xml
deleted file mode 100644
index 6bedfdd8ccae..000000000000
--- a/mobile/android/base/resources/drawable/awesomebar_tab_focus.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:top="46dip">
-        <shape android:shape="rectangle">
-            <solid android:color="#000000"/>
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml b/mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml
deleted file mode 100644
index 6a189a138eb6..000000000000
--- a/mobile/android/base/resources/drawable/awesomebar_tab_focus_selected.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:top="36dip">
-        <shape android:shape="rectangle">
-            <solid android:color="#111111"/>
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml b/mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml
index 624024bea2a7..860197f3fc63 100644
--- a/mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml
+++ b/mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Non focused states -->
-    <item android:state_focused="false"
-          android:state_selected="false"
-          android:state_pressed="false"
-          android:drawable="@drawable/awesomebar_tab_unselected"/>
-
-    <item android:state_focused="false"
-          android:state_selected="true"
-          android:state_pressed="false"
-          android:drawable="@drawable/awesomebar_tab_selected"/>
-
-    <!-- Focused states -->
-    <item android:state_focused="true"
-          android:state_selected="false"
-          android:state_pressed="false"
-          android:drawable="@drawable/awesomebar_tab_focus"/>
-
-    <item android:state_focused="true"
-          android:state_selected="true"
-          android:state_pressed="false"
-          android:drawable="@drawable/awesomebar_tab_focus_selected"/>
-
     <!-- Pressed -->
     <item android:state_pressed="true"
           android:state_selected="false"
@@ -32,4 +10,13 @@
           android:state_selected="true"
           android:drawable="@drawable/awesomebar_tab_press_selected"/>
 
+    <!-- Default states -->
+    <item android:state_selected="false"
+          android:state_pressed="false"
+          android:drawable="@drawable/awesomebar_tab_unselected"/>
+
+    <item android:state_selected="true"
+          android:state_pressed="false"
+          android:drawable="@drawable/awesomebar_tab_selected"/>
+
 </selector>
diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml b/mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml
index 6a189a138eb6..fdde9c8fae15 100644
--- a/mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml
+++ b/mobile/android/base/resources/drawable/awesomebar_tab_press_selected.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:top="36dip">
+    <item android:bottom="2dip"
+          android:drawable="@drawable/awesomebar_tab_pressed"/>
+
+    <item android:top="46dip">
         <shape android:shape="rectangle">
             <solid android:color="#111111"/>
         </shape>
diff --git a/mobile/android/base/resources/drawable/awesomebar_tab_selected.xml b/mobile/android/base/resources/drawable/awesomebar_tab_selected.xml
index e5fc7291e1e2..2873e5471c0e 100644
--- a/mobile/android/base/resources/drawable/awesomebar_tab_selected.xml
+++ b/mobile/android/base/resources/drawable/awesomebar_tab_selected.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:top="36dip">
+    <item android:bottom="2dip"
+          android:drawable="@drawable/awesomebar_tab"/>
+
+    <item android:top="46dip">
         <shape android:shape="rectangle">
             <solid android:color="#000000"/>
         </shape>
diff --git a/mobile/android/base/resources/layout/awesomebar_tabs.xml b/mobile/android/base/resources/layout/awesomebar_tabs.xml
index 50759f046850..2c50e72ff63a 100644
--- a/mobile/android/base/resources/layout/awesomebar_tabs.xml
+++ b/mobile/android/base/resources/layout/awesomebar_tabs.xml
@@ -6,9 +6,7 @@
                   android:layout_height="fill_parent">
 
         <TabWidget android:id="@android:id/tabs"
-                   android:layout_width="fill_parent"
-                   android:layout_height="48dip"
-                   android:background="@drawable/tabs_tray_bg_repeat"/>
+                   style="@style/TabWidget"/>
 
         <FrameLayout android:id="@android:id/tabcontent"
                      android:layout_width="fill_parent"
diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
index e0763584465f..b4f602d45ead 100644
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -28,4 +28,13 @@
         <item name="android:layout_weight">1</item>
     </style>
 
+    <!-- TabWidget --> 
+    <style name="TabWidget">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">48dip</item>
+        <item name="android:background">@drawable/tabs_tray_bg_repeat</item>
+        <item name="android:divider">@android:color/transparent</item>
+        <item name="android:tabStripEnabled">false</item>
+    </style>
+
 </resources>
diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml
index 11481e27f084..28d5a6ebb95d 100644
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -3,6 +3,7 @@
 
     <style name="Gecko" parent="@android:style/Theme.Holo">
         <item name="android:windowBackground">@color/splash_background</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
     
     <style name="Gecko.TitleBar" parent="Gecko"/>
@@ -15,6 +16,7 @@
     
     <style name="Gecko.Light" parent="@android:style/Theme.Holo.Light">
         <item name="android:windowBackground">@color/splash_background</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
     
     <style name="Gecko.Light.TitleBar" parent="Gecko.Light"/>
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index d7d5c2b40841..9e1c7763b5fe 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -69,4 +69,12 @@
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
     </style>
+
+    <!-- TabWidget --> 
+    <style name="TabWidget">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">48dip</item>
+        <item name="android:background">@drawable/tabs_tray_bg_repeat</item>
+    </style>
+
 </resources>
diff --git a/mobile/android/base/resources/values/themes.xml b/mobile/android/base/resources/values/themes.xml
index 6012e93d4330..e8481bc7e768 100644
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -4,6 +4,7 @@
     <style name="Gecko" parent="@android:style/Theme">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@color/splash_background</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
     
     <style name="Gecko.TitleBar" parent="Gecko">
@@ -15,6 +16,7 @@
     <style name="Gecko.Light" parent="@android:style/Theme.Light">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@color/splash_background</item>
+        <item name="android:windowContentOverlay">@null</item>
     </style>
     
     <style name="Gecko.Light.TitleBar" parent="Gecko.Light">