diff --git a/embedding/android/AwesomeBarTabs.java b/embedding/android/AwesomeBarTabs.java
index 12fd6f6521a..0960f8b69f2 100644
--- a/embedding/android/AwesomeBarTabs.java
+++ b/embedding/android/AwesomeBarTabs.java
@@ -423,9 +423,14 @@ public class AwesomeBarTabs extends TabHost {
     private TabSpec addAwesomeTab(String id, int titleId, int contentId) {
         TabSpec tab = newTabSpec(id);
 
-        Resources resources = mContext.getResources();
-        tab.setIndicator(resources.getString(titleId));
+        LayoutInflater inflater =
+                (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
+        View indicatorView = inflater.inflate(R.layout.awesomebar_tab_indicator, null);
+        TextView title = (TextView) indicatorView.findViewById(R.id.title);
+        title.setText(titleId);
+
+        tab.setIndicator(indicatorView);
         tab.setContent(contentId);
 
         addTab(tab);
diff --git a/embedding/android/Makefile.in b/embedding/android/Makefile.in
index a83d9621466..8fc1d079ada 100644
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -135,6 +135,7 @@ RES_LAYOUT = \
   res/layout/awesomebar_header_row.xml \
   res/layout/awesomebar_row.xml \
   res/layout/awesomebar_search.xml \
+  res/layout/awesomebar_tab_indicator.xml \
   res/layout/awesomebar_tabs.xml \
   res/layout/browser_toolbar.xml \
   res/layout/doorhangerpopup.xml \
@@ -177,6 +178,14 @@ endif
 
 MOZ_ANDROID_DRAWABLES += embedding/android/resources/drawable/addons.png                      \
                          embedding/android/resources/drawable/address_bar_bg.xml              \
+                         embedding/android/resources/drawable/awesomebar_tab_focus.9.png      \
+                         embedding/android/resources/drawable/awesomebar_tab_focus_selected.9.png \
+                         embedding/android/resources/drawable/awesomebar_tab_indicator.xml    \
+                         embedding/android/resources/drawable/awesomebar_tab_press.9.png      \
+                         embedding/android/resources/drawable/awesomebar_tab_press_selected.9.png \
+                         embedding/android/resources/drawable/awesomebar_tab_selected.9.png   \
+                         embedding/android/resources/drawable/awesomebar_tab_separator.9.png  \
+                         embedding/android/resources/drawable/awesomebar_tab_unselected.9.png \
                          embedding/android/resources/drawable/bookmark_add.png                \
                          embedding/android/resources/drawable/bookmark_remove.png             \
                          embedding/android/resources/drawable/desktop_notification.png        \
diff --git a/embedding/android/resources/drawable/awesomebar_tab_focus.9.png b/embedding/android/resources/drawable/awesomebar_tab_focus.9.png
new file mode 100644
index 00000000000..754e3c5fba9
Binary files /dev/null and b/embedding/android/resources/drawable/awesomebar_tab_focus.9.png differ
diff --git a/embedding/android/resources/drawable/awesomebar_tab_focus_selected.9.png b/embedding/android/resources/drawable/awesomebar_tab_focus_selected.9.png
new file mode 100644
index 00000000000..bd5dda7aa32
Binary files /dev/null and b/embedding/android/resources/drawable/awesomebar_tab_focus_selected.9.png differ
diff --git a/embedding/android/resources/drawable/awesomebar_tab_indicator.xml b/embedding/android/resources/drawable/awesomebar_tab_indicator.xml
new file mode 100644
index 00000000000..624024bea2a
--- /dev/null
+++ b/embedding/android/resources/drawable/awesomebar_tab_indicator.xml
@@ -0,0 +1,35 @@
+<?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"
+          android:drawable="@drawable/awesomebar_tab_press"/>
+
+    <item android:state_pressed="true"
+          android:state_selected="true"
+          android:drawable="@drawable/awesomebar_tab_press_selected"/>
+
+</selector>
diff --git a/embedding/android/resources/drawable/awesomebar_tab_press.9.png b/embedding/android/resources/drawable/awesomebar_tab_press.9.png
new file mode 100644
index 00000000000..6d19870cf18
Binary files /dev/null and b/embedding/android/resources/drawable/awesomebar_tab_press.9.png differ
diff --git a/embedding/android/resources/drawable/awesomebar_tab_press_selected.9.png b/embedding/android/resources/drawable/awesomebar_tab_press_selected.9.png
new file mode 100755
index 00000000000..b3c85ea63af
Binary files /dev/null and b/embedding/android/resources/drawable/awesomebar_tab_press_selected.9.png differ
diff --git a/embedding/android/resources/drawable/awesomebar_tab_selected.9.png b/embedding/android/resources/drawable/awesomebar_tab_selected.9.png
new file mode 100644
index 00000000000..60f35950604
Binary files /dev/null and b/embedding/android/resources/drawable/awesomebar_tab_selected.9.png differ
diff --git a/embedding/android/resources/drawable/awesomebar_tab_separator.9.png b/embedding/android/resources/drawable/awesomebar_tab_separator.9.png
new file mode 100644
index 00000000000..1905808b83d
Binary files /dev/null and b/embedding/android/resources/drawable/awesomebar_tab_separator.9.png differ
diff --git a/embedding/android/resources/drawable/awesomebar_tab_unselected.9.png b/embedding/android/resources/drawable/awesomebar_tab_unselected.9.png
new file mode 100644
index 00000000000..368d67c3fbf
Binary files /dev/null and b/embedding/android/resources/drawable/awesomebar_tab_unselected.9.png differ
diff --git a/embedding/android/resources/layout/awesomebar_tab_indicator.xml b/embedding/android/resources/layout/awesomebar_tab_indicator.xml
new file mode 100644
index 00000000000..862bda9cd3e
--- /dev/null
+++ b/embedding/android/resources/layout/awesomebar_tab_indicator.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:padding="10sp"
+              android:gravity="center"
+              android:background="@drawable/awesomebar_tab_indicator">
+
+    <TextView android:id="@+id/title"
+              style="?android:attr/tabWidgetStyle"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"/>
+
+</LinearLayout>
diff --git a/embedding/android/resources/layout/awesomebar_tabs.xml b/embedding/android/resources/layout/awesomebar_tabs.xml
index 7fd17aba8c4..f89117900b8 100644
--- a/embedding/android/resources/layout/awesomebar_tabs.xml
+++ b/embedding/android/resources/layout/awesomebar_tabs.xml
@@ -7,7 +7,9 @@
 
         <TabWidget android:id="@android:id/tabs"
                    android:layout_width="fill_parent"
-                   android:layout_height="wrap_content"/>
+                   android:layout_height="wrap_content"
+                   android:background="#3f3f3f"
+                   android:divider="@drawable/awesomebar_tab_separator"/>
 
         <FrameLayout android:id="@android:id/tabcontent"
                      android:layout_width="fill_parent"