diff --git a/res/drawable-hdpi/fav_incognito.png b/res/drawable-hdpi/fav_incognito.png
deleted file mode 100644
index b8acde2..0000000
--- a/res/drawable-hdpi/fav_incognito.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_incognito_holo_dark.png b/res/drawable-hdpi/ic_incognito_holo_dark.png
index 8f7a9d4..f4997ae 100644
--- a/res/drawable-hdpi/ic_incognito_holo_dark.png
+++ b/res/drawable-hdpi/ic_incognito_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/fav_incognito.png b/res/drawable-mdpi/fav_incognito.png
deleted file mode 100644
index 6a120b9..0000000
--- a/res/drawable-mdpi/fav_incognito.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_incognito_holo_dark.png b/res/drawable-mdpi/ic_incognito_holo_dark.png
index e2e8b17..dfb380a 100644
--- a/res/drawable-mdpi/ic_incognito_holo_dark.png
+++ b/res/drawable-mdpi/ic_incognito_holo_dark.png
Binary files differ
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 164e9b6..0f500c7 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -26,11 +26,11 @@
         android:visibility="gone" />
     <ImageView
         android:id="@+id/incognito"
-        android:layout_width="16dip"
-        android:layout_height="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_marginRight="8dip"
         android:gravity="center_vertical"
-        android:src="@drawable/fav_incognito"
+        android:src="@drawable/ic_incognito_holo_dark"
         android:visibility="gone" />
     <ImageView
         android:id="@+id/favicon"
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 83db214..c4897f2 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -148,14 +148,12 @@
             if (incognito) {
                 mUrl = "browser:incognito";
                 mTitle = c.getString(R.string.new_incognito_tab);
-                mFavicon = BitmapFactory.decodeResource(
-                        c.getResources(), R.drawable.fav_incognito);
             } else {
                 mUrl = "";
                 mTitle = c.getString(R.string.new_tab);
-                mFavicon = BitmapFactory.decodeResource(
-                        c.getResources(), R.drawable.app_web_browser_sm);
             }
+            mFavicon = BitmapFactory.decodeResource(
+                    c.getResources(), R.drawable.app_web_browser_sm);
             mLockIcon = LockIcon.LOCK_ICON_UNSECURE;
         }
 
@@ -170,13 +168,8 @@
             if (favicon != null) {
                 mFavicon = favicon;
             } else {
-                if (incognito) {
-                    mFavicon = BitmapFactory.decodeResource(
-                            c.getResources(), R.drawable.fav_incognito);
-                } else {
-                    mFavicon = BitmapFactory.decodeResource(
-                            c.getResources(), R.drawable.app_web_browser_sm);
-                }
+                mFavicon = BitmapFactory.decodeResource(
+                        c.getResources(), R.drawable.app_web_browser_sm);
             }
         }
     }
