diff --git a/res/xml/privacy_and_security_preferences.xml b/res/xml/privacy_and_security_preferences.xml
index 37eeaf8..b15509f 100644
--- a/res/xml/privacy_and_security_preferences.xml
+++ b/res/xml/privacy_and_security_preferences.xml
@@ -36,8 +36,8 @@
             android:layout="@layout/swe_preference"
             android:defaultValue="true"
             android:key="do_not_track"
-            android:summaryOn="@string/pref_security_protect"
-            android:summaryOff="@string/pref_security_not_allowed"
+            android:summaryOn="@string/pref_security_on"
+            android:summaryOff="@string/pref_security_off"
             android:title="@string/pref_do_not_track" />
 
         <SwitchPreference
@@ -128,6 +128,24 @@
         android:title="@string/pref_default_site_settings_title">
         <SwitchPreference
             android:layout="@layout/swe_preference"
+            android:defaultValue="false"
+            android:icon="@drawable/ic_sp_webrefiner"
+            android:key="distracting_contents"
+            android:summaryOn="@string/pref_security_allowed"
+            android:summaryOff="@string/pref_security_not_allowed"
+            android:title="@string/pref_security_web_refiner" />
+
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="true"
+            android:icon="@drawable/ic_sp_thirdcookies"
+            android:key="accept_cookies"
+            android:summaryOn="@string/pref_security_allowed"
+            android:summaryOff="@string/pref_security_not_allowed"
+            android:title="@string/pref_security_accept_cookies" />
+
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
             android:defaultValue="true"
             android:icon="@drawable/ic_sp_location"
             android:key="enable_geolocation"
@@ -156,29 +174,11 @@
         <SwitchPreference
             android:layout="@layout/swe_preference"
             android:defaultValue="false"
-            android:icon="@drawable/ic_sp_webrefiner"
-            android:key="distracting_contents"
-            android:summaryOn="@string/pref_security_allowed"
-            android:summaryOff="@string/pref_security_not_allowed"
-            android:title="@string/pref_security_web_refiner" />
-
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="false"
             android:icon="@drawable/ic_sp_popups"
             android:key="popup_windows"
             android:summaryOn="@string/pref_security_allowed"
             android:summaryOff="@string/pref_security_not_allowed"
             android:title="@string/pref_security_allow_popups" />
 
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="true"
-            android:icon="@drawable/ic_sp_thirdcookies"
-            android:key="accept_cookies"
-            android:summaryOn="@string/pref_security_allowed"
-            android:summaryOff="@string/pref_security_not_allowed"
-            android:title="@string/pref_security_accept_cookies" />
-
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/site_specific_preferences.xml b/res/xml/site_specific_preferences.xml
index 19aac5c..63e03b0 100644
--- a/res/xml/site_specific_preferences.xml
+++ b/res/xml/site_specific_preferences.xml
@@ -36,6 +36,7 @@
         android:title="@string/pref_website_title" >
         <Preference
             android:layout="@layout/swe_preference"
+            android:selectable="false"
             android:key="site_name"/>
     </PreferenceCategory>
 
@@ -46,6 +47,7 @@
 
         <PreferenceScreen
             android:key="site_security_info"
+            android:selectable="false"
             android:layout="@layout/site_specific_security_info"/>
     </PreferenceCategory>
 
@@ -54,6 +56,24 @@
         android:layout="@layout/swe_preference_category"
         android:key="reset_default">
 
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="false"
+            android:icon="@drawable/ic_sp_webrefiner"
+            android:key="distracting_contents"
+            android:summaryOn="@string/pref_security_allowed"
+            android:summaryOff="@string/pref_security_not_allowed"
+            android:title="@string/pref_security_web_refiner" />
+
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="true"
+            android:icon="@drawable/ic_sp_thirdcookies"
+            android:key="accept_cookies"
+            android:summaryOn="@string/pref_security_allowed"
+            android:summaryOff="@string/pref_security_not_allowed"
+            android:title="@string/pref_security_accept_cookies" />
+
         <ListPreference
             android:layout="@layout/swe_preference"
             android:widgetLayout="@layout/swe_preference_list_widget"
@@ -85,30 +105,12 @@
         <SwitchPreference
             android:layout="@layout/swe_preference"
             android:defaultValue="false"
-            android:icon="@drawable/ic_sp_webrefiner"
-            android:key="distracting_contents"
-            android:summaryOn="@string/pref_security_allowed"
-            android:summaryOff="@string/pref_security_not_allowed"
-            android:title="@string/pref_security_web_refiner" />
-
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="false"
             android:icon="@drawable/ic_sp_popups"
             android:key="popup_windows"
             android:summaryOn="@string/pref_security_allowed"
             android:summaryOff="@string/pref_security_not_allowed"
             android:title="@string/pref_security_allow_popups" />
 
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="true"
-            android:icon="@drawable/ic_sp_thirdcookies"
-            android:key="accept_cookies"
-            android:summaryOn="@string/pref_security_allowed"
-            android:summaryOff="@string/pref_security_not_allowed"
-            android:title="@string/pref_security_accept_cookies" />
-
         <Preference
             android:layout="@layout/swe_preference"
             android:widgetLayout="@layout/swe_preference_trashcan_widget"