diff --git a/src/com/android/browser/SnapshotBar.java b/src/com/android/browser/SnapshotBar.java
index 344e732..cdaf3ef 100644
--- a/src/com/android/browser/SnapshotBar.java
+++ b/src/com/android/browser/SnapshotBar.java
@@ -126,9 +126,7 @@
         }
         if (mOverflowMenu != null) {
             mOverflowMenu.setOnClickListener(this);
-            boolean showMenu = !ViewConfiguration.get(getContext())
-                    .hasPermanentMenuKey();
-            mOverflowMenu.setVisibility(showMenu ? VISIBLE : GONE);
+            mOverflowMenu.setVisibility(VISIBLE);
         }
         if (mToggleContainer != null) {
             mToggleContainer.setOnClickListener(this);
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 03c207a..93f655d 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -304,7 +304,7 @@
                 mSnapshotBar.setReadericonVisibility(View.VISIBLE);
             } else {
                 mSnapshotBar.setSnapshoticonVisibility(View.VISIBLE);
-                mSnapshotBar.setFaviconVisibility(View.VISIBLE);
+                mSnapshotBar.setFaviconVisibility(View.GONE); // Snapshot Tabs don't have a Favicon
                 mSnapshotBar.setReadericonVisibility(View.GONE);
             }
         } else {
