]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
Refactor style code to use attrs.xml. Create a dark theme for Find on Page.
[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / fragments / SettingsFragment.java
index 95ca66b720e9b73a8ab75f503cdff0ca748185c5..340e455215f360b96077f4c890d607aab39edd57 100644 (file)
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+/*
+ * Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -20,7 +20,9 @@
 package com.stoutner.privacybrowser.fragments;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
@@ -29,6 +31,7 @@ import android.view.View;
 import android.webkit.WebView;
 
 import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.activities.MainWebViewActivity;
 
 public class SettingsFragment extends PreferenceFragment {
     private SharedPreferences.OnSharedPreferenceChangeListener preferencesListener;
@@ -42,26 +45,69 @@ public class SettingsFragment extends PreferenceFragment {
         // Initialize savedPreferences.
         savedPreferences = getPreferenceScreen().getSharedPreferences();
 
-        // Allow the user to access "dom_storage_enabled" if "javascript_enabled" is enabled.  The default is false.
-        final Preference domStorageEnabled = findPreference("dom_storage_enabled");
-        domStorageEnabled.setEnabled(savedPreferences.getBoolean("javascript_enabled", false));
-
-        // Allow the user to access "third_party_cookies_enabled" if "first_party_cookies_enabled" is enabled.  The default is false.
-        final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled");
-        thirdPartyCookiesEnabled.setEnabled(savedPreferences.getBoolean("first_party_cookies_enabled", false));
-
-
-        // We need an inflated `WebView` to get the default user agent.
+        // Get handles for the preferences we need to modify.
+        final Preference javaScriptPreference = findPreference("javascript_enabled");
+        final Preference firstPartyCookiesPreference = findPreference("first_party_cookies_enabled");
+        final Preference thirdPartyCookiesPreference = findPreference("third_party_cookies_enabled");
+        final Preference domStoragePreference = findPreference("dom_storage_enabled");
+        final Preference saveFormDataPreference = findPreference("save_form_data_enabled");
+        final Preference userAgentPreference = findPreference("user_agent");
+        final Preference customUserAgentPreference = findPreference("custom_user_agent");
+        final Preference blockAdsPreference = findPreference("block_ads");
+        final Preference incognitoModePreference = findPreference("incognito_mode");
+        final Preference doNotTrackPreference = findPreference("do_not_track");
+        final Preference proxyThroughOrbotPreference = findPreference("proxy_through_orbot");
+        final Preference torHomepagePreference = findPreference("tor_homepage");
+        final Preference torSearchPreference = findPreference("tor_search");
+        final Preference torSearchCustomURLPreference = findPreference("tor_search_custom_url");
+        final Preference searchPreference = findPreference("search");
+        final Preference searchCustomURLPreference = findPreference("search_custom_url");
+        final Preference fullScreenBrowsingModePreference = findPreference("full_screen_browsing_mode");
+        final Preference hideSystemBarsPreference = findPreference("hide_system_bars");
+        final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar");
+        final Preference clearEverythingPreference = findPreference("clear_everything");
+        final Preference clearCookiesPreference = findPreference("clear_cookies");
+        final Preference clearDomStoragePreference = findPreference("clear_dom_storage");
+        final Preference clearFormDataPreference = findPreference("clear_form_data");
+        final Preference clearCachePreference = findPreference("clear_cache");
+        final Preference homepagePreference = findPreference("homepage");
+        final Preference defaultFontSizePreference = findPreference("default_font_size");
+        final Preference swipeToRefreshPreference = findPreference("swipe_to_refresh");
+        final Preference displayAdditionalAppBarIconsPreference = findPreference("display_additional_app_bar_icons");
+        final Preference darkThemePreference = findPreference("dark_theme");
+        final Preference displayWebpageImagesPreference = findPreference("display_webpage_images");
+
+        // Set dependencies.
+        domStoragePreference.setDependency("javascript_enabled");
+        torHomepagePreference.setDependency("proxy_through_orbot");
+        torSearchPreference.setDependency("proxy_through_orbot");
+        hideSystemBarsPreference.setDependency("full_screen_browsing_mode");
+
+        // Get strings from the preferences.
+        String torSearchString = savedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
+        String searchString = savedPreferences.getString("search", "https://duckduckgo.com/html/?q=");
+
+        // Get booleans from the preferences.
+        boolean javaScriptEnabledBoolean = savedPreferences.getBoolean("javascript_enabled", false);
+        boolean firstPartyCookiesEnabledBoolean = savedPreferences.getBoolean("first_party_cookies_enabled", false);
+        boolean thirdPartyCookiesEnabledBoolean = savedPreferences.getBoolean("third_party_cookies_enabled", false);
+        boolean proxyThroughOrbotBoolean = savedPreferences.getBoolean("proxy_through_orbot", false);
+        boolean fullScreenBrowsingModeBoolean = savedPreferences.getBoolean("full_screen_browsing_mode", false);
+        boolean hideSystemBarsBoolean = savedPreferences.getBoolean("hide_system_bars", false);
+        boolean clearEverythingBoolean = savedPreferences.getBoolean("clear_everything", true);
+
+        // Only enable `thirdPartyCookiesPreference` if `firstPartyCookiesEnabledBoolean` is `true` and API >= 21.
+        thirdPartyCookiesPreference.setEnabled(firstPartyCookiesEnabledBoolean && (Build.VERSION.SDK_INT >= 21));
+
+        // We need to inflated a `WebView` to get the default user agent.
         LayoutInflater inflater = getActivity().getLayoutInflater();
-        // `@SuppressLint("InflateParams")` removes the warning about using `null` as the `ViewGroup`, which in this case makes sense because we don't want to display `bare_webview` on the screen.
-        // `false` does not attach the view to the root.
+        // `@SuppressLint("InflateParams")` removes the warning about using `null` as the `ViewGroup`, which in this case makes sense because we don't want to display `bare_webview` on the screen.  `false` does not attach the view to the root.
         @SuppressLint("InflateParams") View bareWebViewLayout = inflater.inflate(R.layout.bare_webview, null, false);
         final WebView bareWebView = (WebView) bareWebViewLayout.findViewById(R.id.bare_webview);
 
         // Set the current user-agent as the summary text for the "user_agent" preference when the preference screen is loaded.
-        final Preference userAgentPreference = findPreference("user_agent");
         switch (savedPreferences.getString("user_agent", "PrivacyBrowser/1.0")) {
-            case "Default user agent":
+            case "WebView default user agent":
                 // Get the user agent text from the webview (which changes based on the version of Android and WebView installed).
                 userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString());
                 break;
@@ -77,70 +123,254 @@ public class SettingsFragment extends PreferenceFragment {
                 break;
         }
 
-        // Set the summary text for "custom_user_agent" (the default is "PrivacyBrowser/1.0") and enable it if "user_agent" it set to "Custom user agent".
-        final Preference customUserAgent = findPreference("custom_user_agent");
-        customUserAgent.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
-        customUserAgent.setEnabled(userAgentPreference.getSummary().equals("Custom user agent"));
+        // Set the summary text for "customUserAgentPreference" (the default is `PrivacyBrowser/1.0`) and enable it if `userAgentPreference` it set to `Custom user agent`.
+        customUserAgentPreference.setSummary(savedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
+        customUserAgentPreference.setEnabled(userAgentPreference.getSummary().equals("Custom user agent"));
 
 
-        // Set the JavaScript-disabled search URL as the summary text for the JavaScript-disabled search preference when the preference screen is loaded.
-        // The default is `https://duckduckgo.com/html/?q=`.
-        final Preference javaScriptDisabledSearchPreference = findPreference("javascript_disabled_search");
-        String javaScriptDisabledSearchString = savedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=");
-        if (javaScriptDisabledSearchString.equals("Custom URL")) {
-            // If set to "Custom URL", use R.string.custom_url, which will be translated, instead of the array value, which will not.
-            javaScriptDisabledSearchPreference.setSummary(R.string.custom_url);
+        // Set the Tor homepage URL as the summary text for the `tor_homepage` preference when the preference screen is loaded.  The default is DuckDuckGo: `https://3g2upl4pq6kufc4m.onion`.
+        torHomepagePreference.setSummary(savedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion"));
+
+
+        // Set the Tor search URL as the summary text for the Tor preference when the preference screen is loaded.  The default is `https://3g2upl4pq6kufc4m.onion/html/?q=`
+        if (torSearchString.equals("Custom URL")) {
+            // Use R.string.custom_url, which will be translated, instead of the array value, which will not.
+            torSearchPreference.setSummary(R.string.custom_url);
         } else {
             // Set the array value as the summary text.
-            javaScriptDisabledSearchPreference.setSummary(javaScriptDisabledSearchString);
+            torSearchPreference.setSummary(torSearchString);
         }
 
-        // Set the summary text for `javascript_disabled_search_custom_url` (the default is `""`) and enable it if `javascript_disabled_search` is set to `Custom URL`.
-        final Preference javaScriptDisabledSearchCustomURLPreference = findPreference("javascript_disabled_search_custom_url");
-        javaScriptDisabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_disabled_search_custom_url", ""));
-        javaScriptDisabledSearchCustomURLPreference.setEnabled(javaScriptDisabledSearchString.equals("Custom URL"));
+        // Set the summary text for `tor_search_custom_url`.  The default is `""`.
+        torSearchCustomURLPreference.setSummary(savedPreferences.getString("tor_search_custom_url", ""));
+
+        // Enable the Tor custom URL search options only if proxying through Orbot and the search is set to `Custom URL`.
+        torSearchCustomURLPreference.setEnabled(proxyThroughOrbotBoolean && torSearchString.equals("Custom URL"));
 
 
-        // Set the JavaScript-enabled searchURL as the summary text for the JavaScript-enabled search preference when the preference screen is loaded.
-        // The default is `https://duckduckgo.com/?q=`.
-        final Preference javaScriptEnabledSearchPreference = findPreference("javascript_enabled_search");
-        String javaScriptEnabledSearchString = savedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=");
-        if (javaScriptEnabledSearchString.equals("Custom URL")) {
-            // If set to "Custom URL", use R.string.custom_url, which will be translated, instead of the array value, which will not.
-            javaScriptEnabledSearchPreference.setSummary(R.string.custom_url);
+        // Set the search URL as the summary text for the search preference when the preference screen is loaded.  The default is `https://duckduckgo.com/html/?q=`.
+        if (searchString.equals("Custom URL")) {
+            // Use R.string.custom_url, which will be translated, instead of the array value, which will not.
+            searchPreference.setSummary(R.string.custom_url);
         } else {
             // Set the array value as the summary text.
-            javaScriptEnabledSearchPreference.setSummary(javaScriptEnabledSearchString);
+            searchPreference.setSummary(searchString);
         }
 
-        // Set the summary text for `javascript_enabled_search_custom_url` (the default is `""`) and enable it if `javascript_enabled_search` is set to `Custom URL`.
-        final Preference javaScriptEnabledSearchCustomURLPreference = findPreference("javascript_enabled_search_custom_url");
-        javaScriptEnabledSearchCustomURLPreference.setSummary(savedPreferences.getString("javascript_enabled_search_custom_url", ""));
-        javaScriptEnabledSearchCustomURLPreference.setEnabled(javaScriptEnabledSearchString.equals("Custom URL"));
+        // Set the summary text for `search_custom_url` (the default is `""`) and enable it if `search` is set to `Custom URL`.
+        searchCustomURLPreference.setSummary(savedPreferences.getString("search_custom_url", ""));
+        searchCustomURLPreference.setEnabled(searchString.equals("Custom URL"));
 
 
-        // Enable the full screen options if full screen browsing mode is enabled.
-        final Preference hideSystemBarsPreference = findPreference("hide_system_bars");
-        final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar");
-        final boolean fullScreenBrowsingModeEnabled = savedPreferences.getBoolean("enable_full_screen_browsing_mode", false);
-        if (!fullScreenBrowsingModeEnabled) {
-            // Disable the full screen options.
-            hideSystemBarsPreference.setEnabled(false);
-            translucentNavigationBarPreference.setEnabled(false);
+        // Enable `translucentNavigationBarPreference` only if full screen browsing mode is enabled and `hide_system_bars` is disabled.
+        translucentNavigationBarPreference.setEnabled(fullScreenBrowsingModeBoolean && !hideSystemBarsBoolean);
+
+        // Set the status of the `Clear and Exit` preferences.
+        clearCookiesPreference.setEnabled(!clearEverythingBoolean);
+        clearDomStoragePreference.setEnabled(!clearEverythingBoolean);
+        clearFormDataPreference.setEnabled(!clearEverythingBoolean);
+        clearCachePreference.setEnabled(!clearEverythingBoolean);
+
+        // Set the homepage URL as the summary text for the `Homepage` preference when the preference screen is loaded.  The default is `https://duckduckgo.com`.
+        homepagePreference.setSummary(savedPreferences.getString("homepage", "https://duckduckgo.com"));
+
+        // Set the default font size as the summary text for the `Default Font Size` preference when the preference screen is loaded.  The default is `100`.
+        defaultFontSizePreference.setSummary(savedPreferences.getString("default_font_size", "100") + "%%");
+
+
+        // Set the `javaScriptPreference` icon.
+        if (javaScriptEnabledBoolean) {
+            javaScriptPreference.setIcon(R.drawable.javascript_enabled);
         } else {
-            // Disable `transparent_navigation_bar` if `hide_system_bars` is `true`.
-            translucentNavigationBarPreference.setEnabled(!savedPreferences.getBoolean("hide_system_bars", false));
+            javaScriptPreference.setIcon(R.drawable.privacy_mode);
         }
 
+        // Set the `firstPartyCookiesPreference` icon.
+        if (firstPartyCookiesEnabledBoolean) {
+            firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
+        } else {
+            firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+        }
 
-        // Set the homepage URL as the summary text for the `Homepage` preference when the preference screen is loaded.  The default is `https://www.duckduckgo.com`.
-        final Preference homepagePreference = findPreference("homepage");
-        homepagePreference.setSummary(savedPreferences.getString("homepage", "https://www.duckduckgo.com"));
+        // Set the `thirdPartyCookiesPreference` icon.
+        if (firstPartyCookiesEnabledBoolean && Build.VERSION.SDK_INT >= 21) {
+            if (thirdPartyCookiesEnabledBoolean) {
+                thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
+            } else {
+                thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+            }
+        } else {
+            thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
+        }
 
-        // Set the default font size as the summary text for the `Default Font Size` preference when the preference screen is loaded.  The default is `100`.
-        final Preference defaultFontSizePreference = findPreference("default_font_size");
-        String defaultFontSizeString = savedPreferences.getString("default_font_size", "100");
-        defaultFontSizePreference.setSummary(defaultFontSizeString + "%%");
+        // Set the `domStoragePreference` icon.
+        if (javaScriptEnabledBoolean) {
+            if (savedPreferences.getBoolean("dom_storage_enabled", false)) {
+                domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+            } else {
+                domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
+            }
+        } else {
+            domStoragePreference.setIcon(R.drawable.dom_storage_ghosted);
+        }
+
+        // Set the `saveFormDataPreference` icon.
+        if (savedPreferences.getBoolean("save_form_data_enabled", false)) {
+            saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
+        } else {
+            saveFormDataPreference.setIcon(R.drawable.form_data_disabled);
+        }
+
+        // Set the `customUserAgentPreference` icon.
+        if (customUserAgentPreference.isEnabled()) {
+            customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled);
+        } else {
+            customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted);
+        }
+
+        // Set the `blockAdsPreference` icon.
+        if (savedPreferences.getBoolean("block_ads", true)) {
+            blockAdsPreference.setIcon(R.drawable.block_ads_enabled);
+        } else {
+            blockAdsPreference.setIcon(R.drawable.block_ads_disabled);
+        }
+
+        // Set the `incognitoModePreference` icon.
+        if (savedPreferences.getBoolean("incognito_mode", false)) {
+            incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled);
+        } else {
+            incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled);
+        }
+
+        // Set the `doNotTrackPreference` icon.
+        if (savedPreferences.getBoolean("do_not_track", false)) {
+            doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled);
+        } else {
+            doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled);
+        }
+
+        // Set the `proxyThroughOrbotPreference` icon.
+        if (proxyThroughOrbotBoolean) {
+            proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled);
+        } else {
+            proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled);
+        }
+
+        // Set the `torSearchPreference` and `torSearchCustomURLPreference` icons.
+        if (proxyThroughOrbotBoolean) {
+            // Set the `torHomepagePreference` and `torSearchPreference` icons.
+            torHomepagePreference.setIcon(R.drawable.home_enabled);
+            torSearchPreference.setIcon(R.drawable.search_enabled);
+
+            // Set the `torSearchCustomURLPreference` icon.
+            if (torSearchCustomURLPreference.isEnabled()) {
+                torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
+            } else {
+                torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled);
+            }
+        } else {  // Proxy through Orbot is disabled.
+            torHomepagePreference.setIcon(R.drawable.home_ghosted);
+            torSearchPreference.setIcon(R.drawable.search_ghosted);
+            torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
+        }
+
+        // Set the `searchCustomURLPreference` icon.
+        if (searchCustomURLPreference.isEnabled()) {
+            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
+        } else {
+            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
+        }
+
+        // Set the full screen browsing mode icons.
+        if (fullScreenBrowsingModeBoolean) {
+            // Set the `fullScreenBrowsingModePreference` icon.
+            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled);
+
+            if (hideSystemBarsBoolean) {
+                // Set `hideSystemBarsPreference` to use the enabled icon.
+                hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled);
+
+                // Set `translucentNavigationBarPreference` to use the ghosted icon.
+                translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+            } else {  // `hideSystemBarsBoolean` is false.
+                // Set `hideSystemBarsPreference` to use the disabled icon.
+                hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled);
+
+                // Set the correct icon for `translucentNavigationBarPreference`.
+                if (savedPreferences.getBoolean("translucent_navigation_bar", true)) {
+                    translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled);
+                } else {
+                    translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled);
+                }
+            }
+        } else {  // `fullScreenBrowsingModeBoolean` is false.
+            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled);
+            hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted);
+            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+        }
+
+        // Set the `clearEverythingPreference` icon.
+        if (clearEverythingBoolean) {
+            clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled);
+        } else {
+            clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled);
+        }
+
+        // Set the `clearCookiesPreference` icon.
+        if (clearEverythingBoolean || savedPreferences.getBoolean("clear_cookies", true)) {
+            clearCookiesPreference.setIcon(R.drawable.cookies_cleared);
+        } else {
+            clearCookiesPreference.setIcon(R.drawable.cookies_warning);
+        }
+
+        // Set the `clearDomStoragePreference` icon.
+        if (clearEverythingBoolean || savedPreferences.getBoolean("clear_dom_storage", true)) {
+            clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared);
+        } else {
+            clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning);
+        }
+
+        // Set the `clearFormDataPreference` icon.
+        if (clearEverythingBoolean || savedPreferences.getBoolean("clear_form_data", true)) {
+            clearFormDataPreference.setIcon(R.drawable.form_data_cleared);
+        } else {
+            clearFormDataPreference.setIcon(R.drawable.form_data_warning);
+        }
+
+        // Set the `clearCachePreference` icon.
+        if (clearEverythingBoolean || savedPreferences.getBoolean("clear_cache", true)) {
+            clearCachePreference.setIcon(R.drawable.cache_cleared);
+        } else {
+            clearCachePreference.setIcon(R.drawable.cache_warning);
+        }
+
+        // Set the `swipeToRefreshPreference` icon.
+        if (savedPreferences.getBoolean("swipe_to_refresh", false)) {
+            swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled);
+        } else {
+            swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled);
+        }
+
+        // Set the `displayAdditionalAppBarIconsPreference` icon.
+        if (savedPreferences.getBoolean("display_additional_app_bar_icons", false)) {
+            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled);
+        } else {
+            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled);
+        }
+
+        // Set the `darkThemePreference` icon.
+        if (savedPreferences.getBoolean("dark_theme", false)) {
+            darkThemePreference.setIcon(R.drawable.theme_dark);
+        } else {
+            darkThemePreference.setIcon(R.drawable.theme_light);
+        }
+
+        // Set the `displayWebpageImagesPreference` icon.
+        if (savedPreferences.getBoolean("display_webpage_images", true)) {
+            displayWebpageImagesPreference.setIcon(R.drawable.images_enabled);
+        } else {
+            displayWebpageImagesPreference.setIcon(R.drawable.images_disabled);
+        }
 
 
         // Listen for preference changes.
@@ -152,92 +382,379 @@ public class SettingsFragment extends PreferenceFragment {
 
                 switch (key) {
                     case "javascript_enabled":
-                        // Toggle the state of the `dom_storage_enabled` preference.  The default is `false`.
-                        final Preference domStorageEnabled = findPreference("dom_storage_enabled");
-                        domStorageEnabled.setEnabled(sharedPreferences.getBoolean("javascript_enabled", false));
+                        // Update the icons.
+                        if (sharedPreferences.getBoolean("javascript_enabled", false)) {
+                            // Update the icon for `javascript_enabled`.
+                            javaScriptPreference.setIcon(R.drawable.javascript_enabled);
+
+                            // Update the icon for `dom_storage_enabled`.
+                            if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+                                domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+                            } else {
+                                domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
+                            }
+                        } else {  // `javascript_enabled` is `false`.
+                            // Update the icon for `javascript_enabled`.
+                            javaScriptPreference.setIcon(R.drawable.privacy_mode);
+
+                            // Set the icon for `dom_storage_disabled` to be ghosted.
+                            domStoragePreference.setIcon(R.drawable.dom_storage_ghosted);
+                        }
                         break;
 
                     case "first_party_cookies_enabled":
-                        // Toggle the state of the `third_party_cookies_enabled` preference.  The default is `false`.
-                        final Preference thirdPartyCookiesEnabled = findPreference("third_party_cookies_enabled");
-                        thirdPartyCookiesEnabled.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false));
+                        // Update the icons for `first_party_cookies_enabled` and `third_party_cookies_enabled`.
+                        if (sharedPreferences.getBoolean("first_party_cookies_enabled", false)) {
+                            // Set the icon for `first_party_cookies_enabled`.
+                            firstPartyCookiesPreference.setIcon(R.drawable.cookies_enabled);
+
+                            // Update the icon for `third_party_cookies_enabled`.
+                            if (Build.VERSION.SDK_INT >= 21) {
+                                if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+                                    thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
+                                } else {
+                                    thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+                                }
+                            } else {
+                                thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
+                            }
+                        } else {  // `first_party_cookies_enabled` is `false`.
+                            // Update the icon for `first_party_cookies_enabled`.
+                            firstPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+
+                            // Set the icon for `third_party_cookies_enabled` to be ghosted.
+                            thirdPartyCookiesPreference.setIcon(R.drawable.cookies_ghosted);
+                        }
+
+                        // Enable `third_party_cookies_enabled` if `first_party_cookies_enabled` is `true` and API >= 21.
+                        thirdPartyCookiesPreference.setEnabled(sharedPreferences.getBoolean("first_party_cookies_enabled", false) && (Build.VERSION.SDK_INT >= 21));
+                        break;
+
+                    case "third_party_cookies_enabled":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("third_party_cookies_enabled", false)) {
+                            thirdPartyCookiesPreference.setIcon(R.drawable.cookies_warning);
+                        } else {
+                            thirdPartyCookiesPreference.setIcon(R.drawable.cookies_disabled);
+                        }
+                        break;
+
+                    case "dom_storage_enabled":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("dom_storage_enabled", false)) {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+                        } else {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_disabled);
+                        }
                         break;
 
+                    case "save_form_data_enabled":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("save_form_data_enabled", false)) {
+                            saveFormDataPreference.setIcon(R.drawable.form_data_enabled);
+                        } else {
+                            saveFormDataPreference.setIcon(R.drawable.form_data_disabled);
+                        }
+
                     case "user_agent":
                         String userAgentString = sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0");
 
                         switch (userAgentString) {
-                            case "Default user agent":
-                                // Display the user agent as the summary text for `userAgentPreference`, and disable `customUserAgent`.
+                            case "WebView default user agent":
+                                // Display the user agent as the summary text for `userAgentPreference`.
                                 userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString());
-                                customUserAgent.setEnabled(false);
+
+                                // Update `customUserAgentPreference`.
+                                customUserAgentPreference.setEnabled(false);
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted);
                                 break;
 
                             case "Custom user agent":
-                                // Display "Custom user agent" as the summary text for userAgentPreference, and enable customUserAgent.
+                                // Display `Custom user agent` as the summary text for `userAgentPreference`.
                                 userAgentPreference.setSummary(R.string.custom_user_agent);
-                                customUserAgent.setEnabled(true);
+
+                                // Update `customUserAgentPreference`.
+                                customUserAgentPreference.setEnabled(true);
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled);
                                 break;
 
                             default:
-                                // Display the user agent as the summary text for userAgentPreference, and disable customUserAgent.
+                                // Display the user agent as the summary text for `userAgentPreference`.
                                 userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"));
-                                customUserAgent.setEnabled(false);
+
+                                // Update `customUserAgentPreference`.
+                                customUserAgentPreference.setEnabled(false);
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted);
                                 break;
                         }
                         break;
 
                     case "custom_user_agent":
                         // Set the new custom user agent as the summary text for `custom_user_agent`.  The default is `PrivacyBrowser/1.0`.
-                        customUserAgent.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
+                        customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", "PrivacyBrowser/1.0"));
                         break;
 
-                    case "javascript_disabled_search":
-                        String newJavaScriptDisabledSearchString = sharedPreferences.getString("javascript_disabled_search", "https://duckduckgo.com/html/?q=");
-                        if (newJavaScriptDisabledSearchString.equals("Custom URL")) {  // Set the summary text to `R.string.custom_url`, which is translated.
-                            javaScriptDisabledSearchPreference.setSummary(R.string.custom_url);
-                        } else {  // Set the new search URL as the summary text for the JavaScript-disabled search preference.
-                            javaScriptDisabledSearchPreference.setSummary(newJavaScriptDisabledSearchString);
+                    case "block_ads":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("block_ads", true)) {
+                            blockAdsPreference.setIcon(R.drawable.block_ads_enabled);
+                        } else {
+                            blockAdsPreference.setIcon(R.drawable.block_ads_disabled);
                         }
-
-                        // Enable or disable javaScriptDisabledSearchCustomURLPreference.
-                        javaScriptDisabledSearchCustomURLPreference.setEnabled(newJavaScriptDisabledSearchString.equals("Custom URL"));
                         break;
 
-                    case "javascript_disabled_search_custom_url":
-                        // Set the new custom search URL as the summary text for `javascript_disabled_search_custom_url`.  The default is `""`.
-                        javaScriptDisabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("javascript_disabled_search_custom_url", ""));
+                    case "incognito_mode":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("incognito_mode", false)) {
+                            incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled);
+                        } else {
+                            incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled);
+                        }
                         break;
 
-                    case "javascript_enabled_search":
-                        String newJavaScriptEnabledSearchString = sharedPreferences.getString("javascript_enabled_search", "https://duckduckgo.com/?q=");
-                        if (newJavaScriptEnabledSearchString.equals("Custom URL")) {  // Set the summary text to `R.string.custom_url`, which is translated.
-                            javaScriptEnabledSearchPreference.setSummary(R.string.custom_url);
-                        } else {  // Set the new search URL as the summary text for the JavaScript-enabled search preference..
-                            javaScriptEnabledSearchPreference.setSummary(newJavaScriptEnabledSearchString);
+                    case "do_not_track":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("do_not_track", false)) {
+                            doNotTrackPreference.setIcon(R.drawable.do_not_track_enabled);
+                        } else {
+                            doNotTrackPreference.setIcon(R.drawable.do_not_track_disabled);
                         }
 
-                        // Enable or disable javaScriptEnabledSearchCustomURLPreference.
-                        javaScriptEnabledSearchCustomURLPreference.setEnabled(newJavaScriptEnabledSearchString.equals("Custom URL"));
                         break;
 
-                    case "javascript_enabled_search_custom_url":
-                        // Set the new custom search URL as the summary text for `javascript_enabled_search_custom_url`.  The default is `""`.
-                        javaScriptEnabledSearchCustomURLPreference.setSummary(sharedPreferences.getString("javascript_enabled_search_custom_url", ""));
+                    case "proxy_through_orbot":
+                        // Get current settings.
+                        boolean currentProxyThroughOrbot = sharedPreferences.getBoolean("proxy_through_orbot", false);
+                        String currentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
+
+                        // Enable the Tor custom URL search option only if `currentProxyThroughOrbot` is true and the search is set to `Custom URL`.
+                        torSearchCustomURLPreference.setEnabled(currentProxyThroughOrbot && currentTorSearchString.equals("Custom URL"));
+
+                        // Update the icons.
+                        if (currentProxyThroughOrbot) {
+                            // Set the `proxyThroughOrbotPreference`, `torHomepagePreference`, and `torSearchPreference` icons.
+                            proxyThroughOrbotPreference.setIcon(R.drawable.orbot_enabled);
+                            torHomepagePreference.setIcon(R.drawable.home_enabled);
+                            torSearchPreference.setIcon(R.drawable.search_enabled);
+
+                            // Set the `torSearchCustomURLPreference` icon.
+                            if (torSearchCustomURLPreference.isEnabled()) {
+                                torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
+                            } else {
+                                torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled);
+                            }
+                        } else {  // Proxy through Orbot is disabled.
+                            proxyThroughOrbotPreference.setIcon(R.drawable.orbot_disabled);
+                            torHomepagePreference.setIcon(R.drawable.home_ghosted);
+                            torSearchPreference.setIcon(R.drawable.search_ghosted);
+                            torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
+                        }
+                        break;
+
+                    case "tor_homepage":
+                        // Set the new tor homepage URL as the summary text for the `tor_homepage` preference.  The default is DuckDuckGo:  `https://3g2upl4pq6kufc4m.onion`.
+                        torHomepagePreference.setSummary(sharedPreferences.getString("tor_homepage", "https://3g2upl4pq6kufc4m.onion"));
                         break;
 
-                    case "enable_full_screen_browsing_mode":
-                        boolean newFullScreenBrowsingModeEnabled = sharedPreferences.getBoolean("enable_full_screen_browsing_mode", false);
-                        if (newFullScreenBrowsingModeEnabled) {
-                            // Enable `hideSystemBarsPreference`.
-                            hideSystemBarsPreference.setEnabled(true);
+                    case "tor_search":
+                        // Get the present search string.
+                        String presentTorSearchString = sharedPreferences.getString("tor_search", "https://3g2upl4pq6kufc4m.onion/html/?q=");
+
+                        // Update the preferences.
+                        if (presentTorSearchString.equals("Custom URL")) {
+                            // Use `R.string.custom_url`, which is translated, as the summary instead of the array value, which isn't.
+                            torSearchPreference.setSummary(R.string.custom_url);
 
-                            // Only enable `transparent_navigation_bar` if `hide_system_bars` is `false`.
-                            translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
+                            // Update `torSearchCustomURLPreference`.
+                            torSearchCustomURLPreference.setEnabled(true);
+                            torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
                         } else {
-                            // Disable the full screen options.
-                            hideSystemBarsPreference.setEnabled(false);
+                            // Set the array value as the summary text.
+                            torSearchPreference.setSummary(presentTorSearchString);
+
+                            // Update `torSearchCustomURLPreference`.
+                            torSearchCustomURLPreference.setEnabled(false);
+                            torSearchCustomURLPreference.setIcon(R.drawable.search_custom_url_disabled);
+                        }
+                        break;
+
+                    case "tor_search_custom_url":
+                        // Set the summary text for `tor_search_custom_url`.
+                        torSearchCustomURLPreference.setSummary(sharedPreferences.getString("tor_search_custom_url", ""));
+                        break;
+
+                    case "search":
+                        // Store the new search string.
+                        String newSearchString = sharedPreferences.getString("search", "https://duckduckgo.com/html/?q=");
+
+                        // Update `searchPreference` and `searchCustomURLPreference`.
+                        if (newSearchString.equals("Custom URL")) {  // `Custom URL` is selected.
+                            // Set the summary text to `R.string.custom_url`, which is translated.
+                            searchPreference.setSummary(R.string.custom_url);
+
+                            // Update `searchCustomURLPreference`.
+                            searchCustomURLPreference.setEnabled(true);
+                            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled);
+                        } else {  // `Custom URL` is not selected.
+                            // Set the summary text to `newSearchString`.
+                            searchPreference.setSummary(newSearchString);
+
+                            // Update `searchCustomURLPreference`.
+                            searchCustomURLPreference.setEnabled(false);
+                            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted);
+                        }
+                        break;
+
+                    case "search_custom_url":
+                        // Set the new custom search URL as the summary text for `search_custom_url`.  The default is `""`.
+                        searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", ""));
+                        break;
+
+                    case "full_screen_browsing_mode":
+                        if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) {
+                            // Set `fullScreenBrowsingModePreference` to use the enabled icon.
+                            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled);
+
+                            if (sharedPreferences.getBoolean("hide_system_bars", false)) {
+                                // Set `hideSystemBarsPreference` to use the enabled icon.
+                                hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled);
+
+                                // Update `translucentNavigationBarPreference`.
+                                translucentNavigationBarPreference.setEnabled(false);
+                                translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+                            } else {  // `hide_system_bars` is false.
+                                // Set `hideSystemBarsPreference` to use the disabled icon.
+                                hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled);
+
+                                // Update `translucentNavigationBarPreference`.
+                                translucentNavigationBarPreference.setEnabled(true);
+                                if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
+                                    translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled);
+                                } else {
+                                    translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled);
+                                }
+                            }
+                        } else {  // `full_screen_browsing_mode` is false.
+                            // Disable `translucentNavigationBarPreference`.
+                            translucentNavigationBarPreference.setEnabled(false);
+
+                            // Update the icons.
+                            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled);
+                            hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_ghosted);
+                            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+                        }
+                        break;
+
+                    case "hide_system_bars":
+                        if (sharedPreferences.getBoolean("hide_system_bars", false)) {
+                            // Set `hideSystemBarsPreference` to use the enabled icon.
+                            hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_enabled);
+
+                            // Update `translucentNavigationBarPreference`.
                             translucentNavigationBarPreference.setEnabled(false);
+                            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_ghosted);
+                        } else {  // `hide_system_bars` is false.
+                            // Set `hideSystemBarsPreference` to use the disabled icon.
+                            hideSystemBarsPreference.setIcon(R.drawable.hide_system_bars_disabled);
+
+                            // Update `translucentNavigationBarPreference`.
+                            translucentNavigationBarPreference.setEnabled(true);
+                            if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
+                                translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled);
+                            } else {
+                                translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled);
+                            }
+                        }
+                        break;
+
+                    case "translucent_navigation_bar":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("translucent_navigation_bar", true)) {
+                            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_enabled);
+                        } else {
+                            translucentNavigationBarPreference.setIcon(R.drawable.translucent_bar_disabled);
+                        }
+                        break;
+
+                    case "clear_everything":
+                        // Store the new `clear_everything` status
+                        boolean newClearEverythingBoolean = sharedPreferences.getBoolean("clear_everything", true);
+
+                        // Update the status of the `Clear and Exit` preferences.
+                        clearCookiesPreference.setEnabled(!newClearEverythingBoolean);
+                        clearDomStoragePreference.setEnabled(!newClearEverythingBoolean);
+                        clearFormDataPreference.setEnabled(!newClearEverythingBoolean);
+                        clearCachePreference.setEnabled(!newClearEverythingBoolean);
+
+                        // Update the `clearEverythingPreference` icon.
+                        if (newClearEverythingBoolean) {
+                            clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled);
+                        } else {
+                            clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled);
+                        }
+
+                        // Update the `clearCookiesPreference` icon.
+                        if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) {
+                            clearCookiesPreference.setIcon(R.drawable.cookies_cleared);
+                        } else {
+                            clearCookiesPreference.setIcon(R.drawable.cookies_warning);
+                        }
+
+                        // Update the `clearDomStoragePreference` icon.
+                        if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) {
+                            clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared);
+                        } else {
+                            clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning);
+                        }
+
+                        // Update the `clearFormDataPreference` icon.
+                        if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) {
+                            clearFormDataPreference.setIcon(R.drawable.form_data_cleared);
+                        } else {
+                            clearFormDataPreference.setIcon(R.drawable.form_data_warning);
+                        }
+
+                        // Update the `clearCachePreference` icon.
+                        if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) {
+                            clearCachePreference.setIcon(R.drawable.cache_cleared);
+                        } else {
+                            clearCachePreference.setIcon(R.drawable.cache_warning);
+                        }
+                        break;
+
+                    case "clear_cookies":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("clear_cookies", true)) {
+                            clearCookiesPreference.setIcon(R.drawable.cookies_cleared);
+                        } else {
+                            clearCookiesPreference.setIcon(R.drawable.cookies_warning);
+                        }
+                        break;
+
+                    case "clear_dom_storage":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("clear_dom_storage", true)) {
+                            clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared);
+                        } else {
+                            clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning);
+                        }
+                        break;
+
+                    case "clear_form_data":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("clear_form_data", true)) {
+                            clearFormDataPreference.setIcon(R.drawable.form_data_cleared);
+                        } else {
+                            clearFormDataPreference.setIcon(R.drawable.form_data_warning);
+                        }
+                        break;
+
+                    case "clear_cache":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("clear_cache", true)) {
+                            clearCachePreference.setIcon(R.drawable.cache_cleared);
+                        } else {
+                            clearCachePreference.setIcon(R.drawable.cache_warning);
                         }
                         break;
 
@@ -247,20 +764,63 @@ public class SettingsFragment extends PreferenceFragment {
                         break;
 
                     case "default_font_size":
-                        // Get the default font size as a string.  The default is `100`.
-                        String newDefaultFontSizeString = sharedPreferences.getString("default_font_size", "100");
-
                         // Update the summary text of `default_font_size`.
-                        defaultFontSizePreference.setSummary(newDefaultFontSizeString + "%%");
+                        defaultFontSizePreference.setSummary(sharedPreferences.getString("default_font_size", "100") + "%%");
                         break;
 
-                    case "hide_system_bars":
-                        // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled.
-                        translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
+                    case "swipe_to_refresh":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("swipe_to_refresh", false)) {
+                            swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled);
+                        } else {
+                            swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled);
+                        }
+                        break;
+
+                    case "display_additional_app_bar_icons":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("display_additional_app_bar_icons", false)) {
+                            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled);
+                        } else {
+                            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled);
+                        }
                         break;
 
-                    default:
-                        // If no match, do nothing.
+                    case "dark_theme":
+                        // Update the icon.
+                        if (sharedPreferences.getBoolean("dark_theme", false)) {
+                            darkThemePreference.setIcon(R.drawable.theme_dark);
+                        } else {
+                            darkThemePreference.setIcon(R.drawable.theme_light);
+                        }
+
+                        // Create an `Intent` to restart Privacy Browser.
+                        Intent intent = getActivity().getParentActivityIntent();
+
+                        // Assert that `intent` is not `null` to remove the lint error below.
+                        assert intent != null;
+
+                        // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack.  It requires `Intent.FLAG_ACTIVITY_NEW_TASK`.
+                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+                        // Make it so.
+                        startActivity(intent);
+                        break;
+
+                    case "display_webpage_images":
+                        if (sharedPreferences.getBoolean("display_webpage_images", true)) {
+                            // Update the icon.
+                            displayWebpageImagesPreference.setIcon(R.drawable.images_enabled);
+
+                            // `mainWebView` does not need to be reloaded because unloaded images will load automatically.
+                            MainWebViewActivity.reloadOnRestartBoolean = false;
+                        } else {
+                            // Update the icon.
+                            displayWebpageImagesPreference.setIcon(R.drawable.images_disabled);
+
+                            // Set `mainWebView` to reload on restart to remove the current images.
+                            MainWebViewActivity.reloadOnRestartBoolean = true;
+                        }
                         break;
                 }
             }