diff --git a/res/xml/privacy_and_security_preferences.xml b/res/xml/privacy_and_security_preferences.xml
index b15509f..d543498 100644
--- a/res/xml/privacy_and_security_preferences.xml
+++ b/res/xml/privacy_and_security_preferences.xml
@@ -66,6 +66,7 @@
 
         <PreferenceScreen android:title="@string/webstorage_private_data_title"
             android:layout="@layout/swe_preference"
+            android:key="clear_private_data"
             android:widgetLayout="@layout/swe_preference_storage_widget"
             >
             <CheckBoxPreference
diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index cef6e62..d0930ff 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -93,6 +93,8 @@
 
         Bitmap b;
 
+        thumb.setFloating(false);
+
         if (item.is_folder) {
             b = BitmapFactory.decodeResource(mContext.getResources(),
                     R.drawable.ic_deco_folder_normal);
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index ca5c283..995f84a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -792,7 +792,8 @@
     }
 
     public boolean blockPopupWindows() {
-        return !mPrefs.getBoolean(PREF_POPUP_WINDOWS, false);
+        return !PermissionsServiceFactory.getDefaultPermissions(
+                PermissionsServiceFactory.PermissionType.POPUP);
     }
 
     public boolean loadImages() {