diff --git a/res/drawable/ic_menu_incognito.png b/res/drawable/ic_menu_incognito.png
new file mode 100644
index 0000000..d5a7022
--- /dev/null
+++ b/res/drawable/ic_menu_incognito.png
Binary files differ
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 9fdddeb..d3d5176 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -19,6 +19,13 @@
     android:orientation="horizontal"
     android:background="@drawable/tab_background" >
     <ImageView
+        android:id="@+id/incognito"
+        android:layout_width="36dip"
+        android:layout_height="36dip"
+        android:layout_marginLeft="3dip"
+        android:src="@drawable/ic_menu_incognito"
+        android:visibility="gone" />
+    <ImageView
         android:id="@+id/favicon"
         android:layout_width="20dip"
         android:layout_height="20dip"
diff --git a/res/menu-xlarge/browser.xml b/res/menu-xlarge/browser.xml
index 191f99f..36e10d0 100644
--- a/res/menu-xlarge/browser.xml
+++ b/res/menu-xlarge/browser.xml
@@ -21,6 +21,9 @@
             android:title="@string/new_tab"
             android:showAsAction="always"
             android:alphabeticShortcut="n" />
+        <item android:id="@+id/incognito_menu_id"
+            android:title="@string/incognito_tab"
+            android:icon="@drawable/ic_menu_incognito" />
         <item android:id="@+id/find_menu_id"
             android:title="@string/find_dot"
             android:icon="@drawable/ic_menu_find"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 00e2008..238cf5c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -197,6 +197,8 @@
     <string name="open_in_new_window">Open in new window</string>
     <!-- Menu item to open a dialog which allows the user to enter a url or do search-->
     <string name="goto_dot">Go</string>
+    <!-- Menu item that opens up a new incognito tab.  -->
+    <string name="incognito_tab">Open new incognito tab</string>
     <!-- Menu item that opens up a dialog which allows the user to provide a
             string and search for it on the page. -->
     <string name="find_dot">Find on page</string>
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 50f4189..54fb96f 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -1379,6 +1379,10 @@
                 openTabToHomePage();
                 break;
 
+            case R.id.incognito_menu_id:
+                openIncognitoTab();
+                break;
+
             case R.id.goto_menu_id:
                 editUrl();
                 break;
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 6fc919e..3d8a44f 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -209,6 +209,7 @@
         TabViewData mTabData;
         View mTabContent;
         TextView mTitle;
+        View mIncognito;
         ImageView mIconView;
         ImageView mLock;
         ImageView mClose;
@@ -231,6 +232,7 @@
             mLock = (ImageView) mTabContent.findViewById(R.id.lock);
             mClose = (ImageView) mTabContent.findViewById(R.id.close);
             mClose.setOnClickListener(this);
+            mIncognito = mTabContent.findViewById(R.id.incognito);
             mSelected = false;
             mInLoad = false;
             // update the status
@@ -259,6 +261,11 @@
             if (mTabData.mLock != null) {
                 setLock(mTabData.mLock);
             }
+            if (mTabData.mTab != null) {
+                mIncognito.setVisibility(
+                        mTabData.mTab.getWebView().isPrivateBrowsingEnabled() ?
+                        View.VISIBLE : View.GONE);
+            }
         }
 
         @Override
