diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61c5d9e..10fa74f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -310,7 +310,7 @@
     <!-- Menu item to open the Settings screen -->
     <string name="menu_preferences">Settings</string>
     <!-- Settings screen, section title -->
-    <string name="pref_content_title">Page content</string>
+    <string name="pref_content_title">Content settings</string>
     <!-- Settings label [CHAR LIMIT=45]-->
     <string name="pref_allow_apptabs">Allow multiple tabs per app</string>
     <!-- Settings label -->
@@ -440,8 +440,16 @@
 
     <!-- Settings screen, section title [CHAR-LIMIT=50] -->
     <string name="pref_privacy_security_title">Privacy &amp; security</string>
+    <!-- Popup dialog -->
+    <string name="pref_select_items">Select items to be cleared</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_cache">Clear cache</string>
+    <string name="pref_privacy_clear_selected">Clear selected items</string>
+    <!-- Settings summary -->
+    <string name="pref_privacy_clear_selected_summary">Clear selected items in the list</string>
+    <!-- Confirmation dialog message -->
+    <string name="pref_privacy_clear_selected_dlg">Clear following items?</string>
+    <!-- Settings label -->
+    <string name="pref_privacy_clear_cache">Cache</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_cache_summary">Clear locally cached content and databases</string>
     <!-- Confirmation dialog message -->
@@ -449,13 +457,13 @@
     <!-- Cookie settings category [CHAR-LIMIT=50] -->
     <string name="pref_privacy_cookies_title">Cookies</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_cookies">Clear all cookie data</string>
+    <string name="pref_privacy_clear_cookies">Cookies</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_cookies_summary">Clear all browser cookies</string>
     <!-- Confirmation dialog message -->
     <string name="pref_privacy_clear_cookies_dlg">Delete all cookies?</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_history">Clear history</string>
+    <string name="pref_privacy_clear_history">History</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_history_summary">Clear the browser navigation history</string>
     <!-- Confirmation dialog message -->
@@ -463,13 +471,13 @@
     <!-- Formdata settings category [CHAR-LIMIT=50] -->
     <string name="pref_privacy_formdata_title">Form data</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_form_data">Clear form data</string>
+    <string name="pref_privacy_clear_form_data">Form data</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_form_data_summary">Clear all saved form data</string>
     <!-- Confirmation dialog message -->
     <string name="pref_privacy_clear_form_data_dlg">Delete all saved form data?</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_passwords">Clear passwords</string>
+    <string name="pref_privacy_clear_passwords">Passwords</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_passwords_summary">Clear all saved passwords</string>
     <!-- Confirmation dialog message -->
@@ -481,7 +489,7 @@
     <!-- Settings summary -->
     <string name="pref_privacy_enable_geolocation_summary">Allow sites to request access to your location</string>
     <!-- Settings label -->
-    <string name="pref_privacy_clear_geolocation_access">Clear location access</string>
+    <string name="pref_privacy_clear_geolocation_access">Location access</string>
     <!-- Settings summary -->
     <string name="pref_privacy_clear_geolocation_access_summary">Clear location access for all websites</string>
     <!-- Confirmation dialog message -->
diff --git a/res/xml-sw600dp/advanced_preferences.xml b/res/xml-sw600dp/advanced_preferences.xml
deleted file mode 100644
index c8c9300..0000000
--- a/res/xml-sw600dp/advanced_preferences.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Entries and values in this list are set dynamically. -->
-    <com.android.browser.search.SearchEnginePreference
-            android:key="search_engine"
-            android:title="@string/pref_content_search_engine"
-            android:defaultValue="google"
-            android:summary="@string/pref_content_search_engine_summary"
-            android:dialogTitle="@string/pref_content_search_engine" />
-
-    <CheckBoxPreference
-            android:key="open_in_background"
-            android:defaultValue="false"
-            android:title="@string/pref_content_open_in_background"
-            android:summary="@string/pref_content_open_in_background_summary" />
-
-    <CheckBoxPreference
-            android:key="enable_javascript"
-            android:defaultValue="true"
-            android:title="@string/pref_content_javascript" />
-
-    <CheckBoxPreference
-            android:key="enable_memory_monitor"
-            android:defaultValue="true"
-            android:title="@string/pref_memory_monitor" />
-
-    <CheckBoxPreference
-            android:key="allow_media_downloads"
-            android:defaultValue="false"
-            android:title="@string/pref_allow_media_downloads" />
-
-    <PreferenceScreen
-            android:key="website_settings"
-            android:title="@string/pref_extras_website_settings"
-            android:summary="@string/pref_extras_website_settings_summary" />
-
-    <PreferenceCategory android:title="@string/pref_content_title">
-
-        <ListPreference
-                android:key="default_zoom"
-                android:title="@string/pref_default_zoom"
-                android:defaultValue="MEDIUM"
-                android:entries="@array/pref_default_zoom_choices"
-                android:entryValues="@array/pref_default_zoom_values"
-                android:dialogTitle="@string/pref_default_zoom_dialogtitle" />
-
-        <CheckBoxPreference
-                android:key="load_page"
-                android:defaultValue="true"
-                android:title="@string/pref_content_load_page"
-                android:summary="@string/pref_content_load_page_summary" />
-
-        <CheckBoxPreference
-                android:key="autofit_pages"
-                android:defaultValue="true"
-                android:title="@string/pref_content_autofit"
-                android:summary="@string/pref_content_autofit_summary" />
-
-        <CheckBoxPreference
-                android:key="block_popup_windows"
-                android:defaultValue="true"
-                android:title="@string/pref_content_block_popups" />
-
-        <ListPreference
-                android:key="default_text_encoding"
-                android:title="@string/pref_default_text_encoding"
-                android:defaultValue="@string/pref_default_text_encoding_default"
-                android:entries="@array/pref_default_text_encoding_choices"
-                android:entryValues="@array/pref_default_text_encoding_values"
-                android:dialogTitle="@string/pref_default_text_encoding_dialogtitle" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/pref_extras_reset_default_title">
-        <com.android.browser.BrowserYesNoPreference
-                android:key="reset_default_preferences"
-                android:title="@string/pref_extras_reset_default"
-                android:summary="@string/pref_extras_reset_default_summary"
-                android:dialogMessage="@string/pref_extras_reset_default_dlg"
-                android:dialogIcon="@android:drawable/ic_dialog_alert" />
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml-sw600dp/lab_preferences.xml b/res/xml-sw600dp/lab_preferences.xml
deleted file mode 100644
index 541f0cb..0000000
--- a/res/xml-sw600dp/lab_preferences.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android" >
-</PreferenceScreen>
diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml
deleted file mode 100644
index 05403eb..0000000
--- a/res/xml/accessibility_preferences.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <CheckBoxPreference android:key="force_userscalable"
-        android:title="@string/pref_force_userscalable"
-        android:summary="@string/pref_force_userscalable_summary"
-        android:defaultValue="false" />
-
-    <PreferenceCategory android:title="@string/pref_font_size_category">
-        <com.android.browser.preferences.FontSizePreview
-            android:title="@string/preview" />
-        <com.android.browser.preferences.SeekBarSummaryPreference
-            android:key="text_zoom"
-            android:title="@string/pref_text_zoom"
-            android:defaultValue="10"
-            android:max="30" />
-
-        <!-- SWE - remove double tap zoom from settings.
-        <com.android.browser.preferences.SeekBarSummaryPreference
-            android:key="double_tap_zoom"
-            android:title="@string/pref_zoom_on_double_tap"
-            android:defaultValue="5"
-            android:max="10" />
-        -->
-        <com.android.browser.preferences.SeekBarSummaryPreference
-            android:key="min_font_size"
-            android:title="@string/pref_min_font_size"
-            android:defaultValue="0"
-            android:max="20" />
-    </PreferenceCategory>
-
-    <!-- // SWE_TODO: Commenting out inverted rendering settings
-    <PreferenceCategory android:title="@string/pref_inverted_category">
-
-        <com.android.browser.preferences.InvertedContrastPreview
-            android:title="@string/preview" />
-
-        <CheckBoxPreference
-            android:key="inverted"
-            android:defaultValue="false"
-            android:title="@string/pref_inverted"
-            android:summary="@string/pref_inverted_summary" />
-
-        <com.android.browser.preferences.SeekBarSummaryPreference
-            android:key="inverted_contrast"
-            android:title="@string/pref_inverted_contrast"
-            android:dependency="inverted"
-            android:defaultValue="0"
-            android:max="20" />
-    </PreferenceCategory>
-    -->
-
-</PreferenceScreen>
diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml
deleted file mode 100644
index 35168a6..0000000
--- a/res/xml/advanced_preferences.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Entries and values in this list are set dynamically. -->
-    <com.android.browser.search.SearchEnginePreference
-            android:key="search_engine"
-            android:title="@string/pref_content_search_engine"
-            android:defaultValue="google"
-            android:summary="@string/pref_content_search_engine_summary"
-            android:dialogTitle="@string/pref_content_search_engine" />
-
-    <CheckBoxPreference
-            android:key="open_in_background"
-            android:defaultValue="false"
-            android:title="@string/pref_content_open_in_background"
-            android:summary="@string/pref_content_open_in_background_summary" />
-
-    <CheckBoxPreference
-            android:key="enable_javascript"
-            android:defaultValue="true"
-            android:title="@string/pref_content_javascript" />
-
-    <CheckBoxPreference
-            android:key="enable_memory_monitor"
-            android:defaultValue="true"
-            android:title="@string/pref_memory_monitor" />
-
-    <CheckBoxPreference
-            android:key="allow_media_downloads"
-            android:title="@string/pref_allow_media_downloads" />
-
-    <CheckBoxPreference
-            android:key="allow_apptabs"
-            android:defaultValue="false"
-            android:title="@string/pref_allow_apptabs" />
-
-    <PreferenceScreen
-            android:key="website_settings"
-            android:title="@string/pref_extras_website_settings"
-            android:summary="@string/pref_extras_website_settings_summary" />
-
-    <PreferenceCategory android:title="@string/pref_content_title">
-
-        <ListPreference
-                android:key="default_zoom"
-                android:title="@string/pref_default_zoom"
-                android:defaultValue="MEDIUM"
-                android:entries="@array/pref_default_zoom_choices"
-                android:entryValues="@array/pref_default_zoom_values"
-                android:dialogTitle="@string/pref_default_zoom_dialogtitle" />
-
-        <CheckBoxPreference
-                android:key="load_page"
-                android:defaultValue="true"
-                android:title="@string/pref_content_load_page"
-                android:summary="@string/pref_content_load_page_summary" />
-
-        <CheckBoxPreference
-                android:key="autofit_pages"
-                android:defaultValue="true"
-                android:title="@string/pref_content_autofit"
-                android:summary="@string/pref_content_autofit_summary" />
-
-        <CheckBoxPreference
-                android:key="block_popup_windows"
-                android:defaultValue="true"
-                android:title="@string/pref_content_block_popups" />
-
-        <ListPreference
-                android:key="default_text_encoding"
-                android:title="@string/pref_default_text_encoding"
-                android:defaultValue="@string/pref_default_text_encoding_default"
-                android:entries="@array/pref_default_text_encoding_choices"
-                android:entryValues="@array/pref_default_text_encoding_values"
-                android:dialogTitle="@string/pref_default_text_encoding_dialogtitle" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/pref_extras_reset_default_title">
-        <com.android.browser.BrowserYesNoPreference
-                android:key="reset_default_preferences"
-                android:title="@string/pref_extras_reset_default"
-                android:summary="@string/pref_extras_reset_default_summary"
-                android:dialogMessage="@string/pref_extras_reset_default_dlg"
-                android:dialogIcon="@android:drawable/ic_dialog_alert" />
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 6f42d3d..b965ae6 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -16,24 +16,224 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.android.browser.preferences.NonformattingListPreference
-        android:key="homepage_picker"
-        android:entries="@array/pref_homepage_choices"
-        android:entryValues="@array/pref_homepage_values"
-        android:title="@string/pref_content_homepage" />
+    <PreferenceCategory android:title="@string/pref_general_title">
+        <com.android.browser.preferences.NonformattingListPreference
+            android:key="homepage_picker"
+            android:entries="@array/pref_homepage_choices"
+            android:entryValues="@array/pref_homepage_values"
+            android:title="@string/pref_content_homepage" />
 
-    <PreferenceCategory android:title="@string/pref_general_autofill_title">
-        <CheckBoxPreference android:key="autofill_enabled"
+        <com.android.browser.search.SearchEnginePreference
+            android:defaultValue="google"
+            android:dialogTitle="@string/pref_content_search_engine"
+            android:key="search_engine"
+            android:summary="@string/pref_content_search_engine_summary"
+            android:title="@string/pref_content_search_engine" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="fullscreen"
+            android:summary="@string/pref_lab_fullscreen_summary"
+            android:title="@string/pref_lab_fullscreen" />
+
+        <CheckBoxPreference
+            android:key="autofill_enabled"
             android:title="@string/pref_autofill_enabled"
             android:summary="@string/pref_autofill_enabled_summary"
-            android:defaultValue="true"
-        />
+            android:defaultValue="true" />
 
         <PreferenceScreen
-            android:fragment="com.android.browser.AutoFillSettingsFragment"
             android:key="autofill_profile"
             android:title="@string/pref_autofill_profile_editor"
             android:summary="@string/pref_autofill_profile_editor_summary" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/pref_extras_title"
+        android:key="advanced">
+
+        <PreferenceScreen android:title="@string/pref_privacy_security_title">
+            <PreferenceScreen android:title="@string/webstorage_clear_data_title">
+                <com.android.browser.BrowserYesNoPreference
+                    android:dialogIcon="@android:drawable/ic_dialog_alert"
+                    android:dialogMessage="@string/pref_privacy_clear_selected_dlg"
+                    android:key="privacy_clear_selected"
+                    android:summary="@string/pref_privacy_clear_selected_summary"
+                    android:title="@string/pref_privacy_clear_selected" />
+
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="privacy_clear_history"
+                    android:summary="@string/pref_privacy_clear_history_summary"
+                    android:title="@string/pref_privacy_clear_history" />
+
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="privacy_clear_cache"
+                    android:summary="@string/pref_privacy_clear_cache_summary"
+                    android:title="@string/pref_privacy_clear_cache" />
+
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="privacy_clear_cookies"
+                    android:summary="@string/pref_privacy_clear_cookies_summary"
+                    android:title="@string/pref_privacy_clear_cookies" />
+
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="privacy_clear_form_data"
+                    android:summary="@string/pref_privacy_clear_form_data_summary"
+                    android:title="@string/pref_privacy_clear_form_data" />
+
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:key="privacy_clear_passwords"
+                    android:summary="@string/pref_privacy_clear_passwords_summary"
+                    android:title="@string/pref_privacy_clear_passwords" />
+
+                <CheckBoxPreference
+                    android:defaultValue="true"
+                    android:dependency="enable_geolocation"
+                    android:key="privacy_clear_geolocation_access"
+                    android:summary="@string/pref_privacy_clear_geolocation_access_summary"
+                    android:title="@string/pref_privacy_clear_geolocation_access" />
+
+            </PreferenceScreen>
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="show_security_warnings"
+                android:summary="@string/pref_security_show_security_warning_summary"
+                android:title="@string/pref_security_show_security_warning" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="do_not_track"
+                android:summary="@string/pref_do_not_track_summary"
+                android:title="@string/pref_do_not_track" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="accept_cookies"
+                android:summary="@string/pref_security_accept_cookies_summary"
+                android:title="@string/pref_security_accept_cookies" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="save_formdata"
+                android:summary="@string/pref_security_save_form_data_summary"
+                android:title="@string/pref_security_save_form_data" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="enable_geolocation"
+                android:summary="@string/pref_privacy_enable_geolocation_summary"
+                android:title="@string/pref_privacy_enable_geolocation" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="remember_passwords"
+                android:summary="@string/pref_security_remember_passwords_summary"
+                android:title="@string/pref_security_remember_passwords" />
+
+        </PreferenceScreen>
+
+        <PreferenceScreen android:title="@string/pref_accessibility_title">
+
+            <PreferenceCategory android:title="@string/pref_font_size_category">
+                <com.android.browser.preferences.FontSizePreview android:title="@string/preview" />
+                <com.android.browser.preferences.SeekBarSummaryPreference
+                    android:defaultValue="10"
+                    android:key="text_zoom"
+                    android:max="30"
+                    android:title="@string/pref_text_zoom" />
+
+                <com.android.browser.preferences.SeekBarSummaryPreference
+                    android:defaultValue="0"
+                    android:key="min_font_size"
+                    android:max="20"
+                    android:title="@string/pref_min_font_size" />
+
+                <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="force_userscalable"
+                    android:summary="@string/pref_force_userscalable_summary"
+                    android:title="@string/pref_force_userscalable" />
+
+                <ListPreference
+                    android:defaultValue="MEDIUM"
+                    android:dialogTitle="@string/pref_default_zoom_dialogtitle"
+                    android:entries="@array/pref_default_zoom_choices"
+                    android:entryValues="@array/pref_default_zoom_values"
+                    android:key="default_zoom"
+                    android:title="@string/pref_default_zoom" />
+
+            </PreferenceCategory>
+
+            <!-- // SWE_TODO: Commenting out inverted rendering settings
+            <PreferenceCategory android:title="@string/pref_inverted_category">
+
+                <com.android.browser.preferences.InvertedContrastPreview
+                    android:title="@string/preview" />
+
+                <CheckBoxPreference
+                    android:key="inverted"
+                    android:defaultValue="false"
+                    android:title="@string/pref_inverted"
+                    android:summary="@string/pref_inverted_summary" />
+
+                <com.android.browser.preferences.SeekBarSummaryPreference
+                    android:key="inverted_contrast"
+                    android:title="@string/pref_inverted_contrast"
+                    android:dependency="inverted"
+                    android:defaultValue="0"
+                    android:max="20" />
+            </PreferenceCategory>
+            -->
+
+        </PreferenceScreen>
+
+
+        <PreferenceScreen android:title="@string/pref_content_title">
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="block_popup_windows"
+                android:title="@string/pref_content_block_popups" />
+
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="open_in_background"
+                android:summary="@string/pref_content_open_in_background_summary"
+                android:title="@string/pref_content_open_in_background" />
+
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="enable_javascript"
+                android:title="@string/pref_content_javascript" />
+
+            <CheckBoxPreference
+                android:key="allow_media_downloads"
+                android:title="@string/pref_allow_media_downloads" />
+
+            <PreferenceScreen
+                android:key="download_path_setting_screen"
+                android:title="@string/pref_download_path_setting_screen_title"/>
+        </PreferenceScreen>
+
+
+        <PreferenceScreen
+            android:key="website_settings"
+            android:summary="@string/pref_extras_website_settings_summary"
+            android:title="@string/pref_extras_website_settings" />
+
+        <com.android.browser.BrowserYesNoPreference
+            android:key="reset_default_preferences"
+            android:title="@string/pref_extras_reset_default"
+            android:summary="@string/pref_extras_reset_default_summary"
+            android:dialogMessage="@string/pref_extras_reset_default_dlg"
+            android:dialogIcon="@android:drawable/ic_dialog_alert" />
+
+        <PreferenceScreen
+            android:key="debug_menu"
+            android:title="@string/pref_development_title" />
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/lab_preferences.xml b/res/xml/lab_preferences.xml
deleted file mode 100644
index 6912e7d..0000000
--- a/res/xml/lab_preferences.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android" >
-    <CheckBoxPreference
-        android:key="fullscreen"
-        android:defaultValue="false"
-        android:title="@string/pref_lab_fullscreen"
-        android:summary="@string/pref_lab_fullscreen_summary" />
-</PreferenceScreen>
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
deleted file mode 100644
index 76483d1..0000000
--- a/res/xml/preference_headers.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <header android:fragment="com.android.browser.preferences.GeneralPreferencesFragment"
-        android:title="@string/pref_general_title"
-    />
-
-    <header android:fragment="com.android.browser.preferences.PrivacySecurityPreferencesFragment"
-        android:title="@string/pref_privacy_security_title"
-    />
-
-    <header android:fragment="com.android.browser.preferences.AccessibilityPreferencesFragment"
-        android:title="@string/pref_accessibility_title"
-    />
-
-    <header android:fragment="com.android.browser.preferences.AdvancedPreferencesFragment"
-        android:title="@string/pref_extras_title"
-    />
-
-    <header android:fragment="com.android.browser.preferences.BandwidthPreferencesFragment"
-        android:title="@string/pref_data_title"
-    />
-
-    <header android:fragment="com.android.browser.preferences.LabPreferencesFragment"
-        android:title="@string/pref_lab_title"
-    />
-
-    <header android:fragment="com.android.browser.preferences.AboutPreferencesFragment"
-        android:title="@string/version"
-    />
-
-</preference-headers>
diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml
deleted file mode 100644
index 4c14c86..0000000
--- a/res/xml/privacy_security_preferences.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <com.android.browser.BrowserYesNoPreference
-            android:key="privacy_clear_cache"
-            android:title="@string/pref_privacy_clear_cache"
-            android:summary="@string/pref_privacy_clear_cache_summary"
-            android:dialogMessage="@string/pref_privacy_clear_cache_dlg"
-            android:dialogIcon="@android:drawable/ic_dialog_alert" />
-
-    <com.android.browser.BrowserYesNoPreference
-            android:key="privacy_clear_history"
-            android:title="@string/pref_privacy_clear_history"
-            android:summary="@string/pref_privacy_clear_history_summary"
-            android:dialogMessage="@string/pref_privacy_clear_history_dlg"
-            android:dialogIcon="@android:drawable/ic_dialog_alert"/>
-
-    <CheckBoxPreference
-            android:key="show_security_warnings"
-            android:defaultValue="true"
-            android:title="@string/pref_security_show_security_warning"
-            android:summary="@string/pref_security_show_security_warning_summary" />
-
-  <CheckBoxPreference
-            android:key="do_not_track"
-            android:defaultValue="true"
-            android:title="@string/pref_do_not_track"
-            android:summary="@string/pref_do_not_track_summary" />
-
-    <PreferenceCategory android:title="@string/pref_privacy_cookies_title">
-        <CheckBoxPreference
-                android:key="accept_cookies"
-                android:defaultValue="true"
-                android:title="@string/pref_security_accept_cookies"
-                android:summary="@string/pref_security_accept_cookies_summary" />
-
-        <com.android.browser.BrowserYesNoPreference
-                android:key="privacy_clear_cookies"
-                android:title="@string/pref_privacy_clear_cookies"
-                android:summary="@string/pref_privacy_clear_cookies_summary"
-                android:dialogMessage="@string/pref_privacy_clear_cookies_dlg"
-                android:dialogIcon="@android:drawable/ic_dialog_alert"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/pref_privacy_formdata_title">
-        <CheckBoxPreference
-                android:key="save_formdata"
-                android:defaultValue="true"
-                android:title="@string/pref_security_save_form_data"
-                android:summary="@string/pref_security_save_form_data_summary" />
-
-        <com.android.browser.BrowserYesNoPreference
-                android:key="privacy_clear_form_data"
-                android:title="@string/pref_privacy_clear_form_data"
-                android:summary="@string/pref_privacy_clear_form_data_summary"
-                android:dialogMessage="@string/pref_privacy_clear_form_data_dlg"
-                android:dialogIcon="@android:drawable/ic_dialog_alert"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/pref_privacy_location_title">
-        <CheckBoxPreference
-                android:key="enable_geolocation"
-                android:defaultValue="true"
-                android:title="@string/pref_privacy_enable_geolocation"
-                android:summary="@string/pref_privacy_enable_geolocation_summary" />
-
-        <com.android.browser.BrowserYesNoPreference
-                android:key="privacy_clear_geolocation_access"
-                android:dependency="enable_geolocation"
-                android:title="@string/pref_privacy_clear_geolocation_access"
-                android:summary="@string/pref_privacy_clear_geolocation_access_summary"
-                android:dialogMessage="@string/pref_privacy_clear_geolocation_access_dlg"
-                android:dialogIcon="@android:drawable/ic_dialog_alert"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/pref_security_passwords_title">
-        <CheckBoxPreference
-                android:key="remember_passwords"
-                android:defaultValue="true"
-                android:title="@string/pref_security_remember_passwords"
-                android:summary="@string/pref_security_remember_passwords_summary" />
-
-        <com.android.browser.BrowserYesNoPreference
-                android:key="privacy_clear_passwords"
-                android:title="@string/pref_privacy_clear_passwords"
-                android:summary="@string/pref_privacy_clear_passwords_summary"
-                android:dialogMessage="@string/pref_privacy_clear_passwords_dlg"
-                android:dialogIcon="@android:drawable/ic_dialog_alert"/>
-    </PreferenceCategory>
-
-</PreferenceScreen>