]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/java/com/stoutner/privacybrowser/fragments/SettingsFragment.java
Bump the minimum API to 23. https://redmine.stoutner.com/issues/793
[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / fragments / SettingsFragment.java
index 535b647a8d8e93aae123c2067156cb4a8772ec8b..bac86c1e1eb3dda46e0346bce93c2d97fba8f1c6 100644 (file)
@@ -1,5 +1,5 @@
-/**
- * Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+/*
+ * Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
 package com.stoutner.privacybrowser.fragments;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.webkit.WebView;
+import android.widget.ArrayAdapter;
+
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
 
 import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.activities.MainWebViewActivity;
+import com.stoutner.privacybrowser.helpers.ProxyHelper;
+
+public class SettingsFragment extends PreferenceFragmentCompat {
+    // Declare the class variables.
+    private int currentThemeStatus;
+    private String defaultUserAgent;
+    private ArrayAdapter<CharSequence> userAgentNamesArray;
+    private String[] translatedUserAgentNamesArray;
+    private String[] userAgentDataArray;
+    private String[] appThemeEntriesStringArray;
+    private String[] appThemeEntryValuesStringArray;
+    private String[] webViewThemeEntriesStringArray;
+    private String[] webViewThemeEntryValuesStringArray;
+    private SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener;
 
-public class SettingsFragment extends PreferenceFragment {
-    private SharedPreferences.OnSharedPreferenceChangeListener preferencesListener;
-    private SharedPreferences savedPreferences;
+    // Declare the class views.
+    private Preference javaScriptPreference;
+    private Preference cookiesPreference;
+    private Preference domStoragePreference;
+    private Preference formDataPreference;  // The form data preference can be removed once the minimum API >= 26.
+    private Preference userAgentPreference;
+    private Preference customUserAgentPreference;
+    private Preference incognitoModePreference;
+    private Preference allowScreenshotsPreference;
+    private Preference easyListPreference;
+    private Preference easyPrivacyPreference;
+    private Preference fanboyAnnoyanceListPreference;
+    private Preference fanboySocialBlockingListPreference;
+    private Preference ultraListPreference;
+    private Preference ultraPrivacyPreference;
+    private Preference blockAllThirdPartyRequestsPreference;
+    private Preference googleAnalyticsPreference;
+    private Preference facebookClickIdsPreference;
+    private Preference twitterAmpRedirectsPreference;
+    private Preference searchPreference;
+    private Preference searchCustomURLPreference;
+    private Preference proxyPreference;
+    private Preference proxyCustomUrlPreference;
+    private Preference fullScreenBrowsingModePreference;
+    private Preference hideAppBarPreference;
+    private Preference clearEverythingPreference;
+    private Preference clearCookiesPreference;
+    private Preference clearDomStoragePreference;
+    private Preference clearFormDataPreference;  // The clear form data preference can be removed once the minimum API >= 26.
+    private Preference clearLogcatPreference;
+    private Preference clearCachePreference;
+    private Preference homepagePreference;
+    private Preference fontSizePreference;
+    private Preference openIntentsInNewTabPreference;
+    private Preference swipeToRefreshPreference;
+    private Preference downloadWithExternalAppPreference;
+    private Preference scrollAppBarPreference;
+    private Preference bottomAppBarPreference;
+    private Preference displayAdditionalAppBarIconsPreference;
+    private Preference appThemePreference;
+    private Preference webViewThemePreference;
+    private Preference wideViewportPreference;
+    private Preference displayWebpageImagesPreference;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.preferences);
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        // Load the preferences from the XML file.
+        setPreferencesFromResource(R.xml.preferences, rootKey);
+
+        // Get a handle for the activity.
+        Activity activity = getActivity();
+
+        // Remove the lint warning below that `getApplicationContext()` might produce a null pointer exception.
+        assert activity != null;
+
+        // Get a handle for the resources.
+        Resources resources = getResources();
+
+        // Get the current theme status.
+        currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
+        // Get a handle for the shared preferences.
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+
+        // Get handles for the preferences.
+        javaScriptPreference = findPreference("javascript");
+        cookiesPreference = findPreference(getString(R.string.cookies_key));
+        domStoragePreference = findPreference("dom_storage");
+        formDataPreference = findPreference("save_form_data");  // The form data preference can be removed once the minimum API >= 26.
+        userAgentPreference = findPreference("user_agent");
+        customUserAgentPreference = findPreference("custom_user_agent");
+        incognitoModePreference = findPreference("incognito_mode");
+        allowScreenshotsPreference = findPreference(getString(R.string.allow_screenshots_key));
+        easyListPreference = findPreference("easylist");
+        easyPrivacyPreference = findPreference("easyprivacy");
+        fanboyAnnoyanceListPreference = findPreference("fanboys_annoyance_list");
+        fanboySocialBlockingListPreference = findPreference("fanboys_social_blocking_list");
+        ultraListPreference = findPreference("ultralist");
+        ultraPrivacyPreference = findPreference("ultraprivacy");
+        blockAllThirdPartyRequestsPreference = findPreference("block_all_third_party_requests");
+        googleAnalyticsPreference = findPreference("google_analytics");
+        facebookClickIdsPreference = findPreference("facebook_click_ids");
+        twitterAmpRedirectsPreference = findPreference("twitter_amp_redirects");
+        searchPreference = findPreference("search");
+        searchCustomURLPreference = findPreference("search_custom_url");
+        proxyPreference = findPreference("proxy");
+        proxyCustomUrlPreference = findPreference(getString(R.string.proxy_custom_url_key));
+        fullScreenBrowsingModePreference = findPreference("full_screen_browsing_mode");
+        hideAppBarPreference = findPreference("hide_app_bar");
+        clearEverythingPreference = findPreference("clear_everything");
+        clearCookiesPreference = findPreference("clear_cookies");
+        clearDomStoragePreference = findPreference("clear_dom_storage");
+        clearFormDataPreference = findPreference("clear_form_data");  // The clear form data preference can be removed once the minimum API >= 26.
+        clearLogcatPreference = findPreference(getString(R.string.clear_logcat_key));
+        clearCachePreference = findPreference("clear_cache");
+        homepagePreference = findPreference("homepage");
+        fontSizePreference = findPreference("font_size");
+        openIntentsInNewTabPreference = findPreference("open_intents_in_new_tab");
+        swipeToRefreshPreference = findPreference("swipe_to_refresh");
+        downloadWithExternalAppPreference = findPreference(getString(R.string.download_with_external_app_key));
+        scrollAppBarPreference = findPreference(getString(R.string.scroll_app_bar_key));
+        bottomAppBarPreference = findPreference(getString(R.string.bottom_app_bar_key));
+        displayAdditionalAppBarIconsPreference = findPreference(getString(R.string.display_additional_app_bar_icons_key));
+        appThemePreference = findPreference("app_theme");
+        webViewThemePreference = findPreference("webview_theme");
+        wideViewportPreference = findPreference("wide_viewport");
+        displayWebpageImagesPreference = findPreference("display_webpage_images");
+
+        // Remove the lint warnings below that the preferences might be null.
+        assert javaScriptPreference != null;
+        assert cookiesPreference != null;
+        assert domStoragePreference != null;
+        assert formDataPreference != null;
+        assert userAgentPreference != null;
+        assert customUserAgentPreference != null;
+        assert incognitoModePreference != null;
+        assert allowScreenshotsPreference != null;
+        assert easyListPreference != null;
+        assert easyPrivacyPreference != null;
+        assert fanboyAnnoyanceListPreference != null;
+        assert fanboySocialBlockingListPreference != null;
+        assert ultraListPreference != null;
+        assert ultraPrivacyPreference != null;
+        assert blockAllThirdPartyRequestsPreference != null;
+        assert googleAnalyticsPreference != null;
+        assert facebookClickIdsPreference != null;
+        assert twitterAmpRedirectsPreference != null;
+        assert searchPreference != null;
+        assert searchCustomURLPreference != null;
+        assert proxyPreference != null;
+        assert proxyCustomUrlPreference != null;
+        assert fullScreenBrowsingModePreference != null;
+        assert hideAppBarPreference != null;
+        assert clearEverythingPreference != null;
+        assert clearCookiesPreference != null;
+        assert clearDomStoragePreference != null;
+        assert clearFormDataPreference != null;
+        assert clearLogcatPreference != null;
+        assert clearCachePreference != null;
+        assert homepagePreference != null;
+        assert fontSizePreference != null;
+        assert openIntentsInNewTabPreference != null;
+        assert swipeToRefreshPreference != null;
+        assert downloadWithExternalAppPreference != null;
+        assert scrollAppBarPreference != null;
+        assert bottomAppBarPreference != null;
+        assert displayAdditionalAppBarIconsPreference != null;
+        assert appThemePreference != null;
+        assert webViewThemePreference != null;
+        assert wideViewportPreference != null;
+        assert displayWebpageImagesPreference != null;
+
+        // Set the preference dependencies.
+        hideAppBarPreference.setDependency("full_screen_browsing_mode");
+        domStoragePreference.setDependency("javascript");
+
+        // Get strings from the preferences.
+        String userAgentName = sharedPreferences.getString("user_agent", getString(R.string.user_agent_default_value));
+        String searchString = sharedPreferences.getString("search", getString(R.string.search_default_value));
+        String proxyString = sharedPreferences.getString("proxy", getString(R.string.proxy_default_value));
+
+        // Get booleans that are used in multiple places from the preferences.
+        boolean javaScriptEnabled = sharedPreferences.getBoolean("javascript", false);
+        boolean fanboyAnnoyanceListEnabled = sharedPreferences.getBoolean("fanboys_annoyance_list", true);
+        boolean fanboySocialBlockingEnabled = sharedPreferences.getBoolean("fanboys_social_blocking_list", true);
+        boolean fullScreenBrowsingMode = sharedPreferences.getBoolean("full_screen_browsing_mode", false);
+        boolean clearEverything = sharedPreferences.getBoolean("clear_everything", true);
+
+        // Remove the form data preferences if the API is >= 26 as they no longer do anything.
+        if (Build.VERSION.SDK_INT >= 26) {
+            // Get handles for the categories.
+            PreferenceCategory privacyCategory = findPreference("privacy");
+            PreferenceCategory clearAndExitCategory = findPreference("clear_and_exit");
 
-        // Initialize savedPreferences.
-        savedPreferences = getPreferenceScreen().getSharedPreferences();
+            // Remove the incorrect lint warnings below that the preference categories might be null.
+            assert privacyCategory != null;
+            assert clearAndExitCategory != null;
 
-        // 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));
+            // Remove the form data preferences.
+            privacyCategory.removePreference(formDataPreference);
+            clearAndExitCategory.removePreference(clearFormDataPreference);
+        }
 
-        // 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));
+        // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list is disabled.
+        fanboySocialBlockingListPreference.setEnabled(!fanboyAnnoyanceListEnabled);
 
 
-        // We need an inflated `WebView` to get the default user agent.
+        // Inflate 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 the `bare_webview` will not be displayed.
         @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":
+        // Get a handle for a bare WebView.
+        WebView bareWebView = bareWebViewLayout.findViewById(R.id.bare_webview);
+
+        // Get the default user agent.
+        defaultUserAgent = bareWebView.getSettings().getUserAgentString();
+
+        // Get the user agent arrays.
+        userAgentNamesArray = ArrayAdapter.createFromResource(requireContext(), R.array.user_agent_names, R.layout.spinner_item);
+        translatedUserAgentNamesArray = resources.getStringArray(R.array.translated_user_agent_names);
+        userAgentDataArray = resources.getStringArray(R.array.user_agent_data);
+
+        // Get the array position of the user agent name.
+        int userAgentArrayPosition = userAgentNamesArray.getPosition(userAgentName);
+
+        // Populate the user agent summary.
+        switch (userAgentArrayPosition) {
+            case MainWebViewActivity.UNRECOGNIZED_USER_AGENT:  // The user agent name is not on the canonical list.
+                // This is probably because it was set in an older version of Privacy Browser before the switch to persistent user agent names.  Use the current user agent entry name as the summary.
+                userAgentPreference.setSummary(userAgentName);
+                break;
+
+            case MainWebViewActivity.SETTINGS_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());
+                userAgentPreference.setSummary(translatedUserAgentNamesArray[userAgentArrayPosition] + ":\n" + defaultUserAgent);
                 break;
 
-            case "Custom user agent":
-                // We can't use the string from the array because it is referenced in code and can't be translated.
+            case MainWebViewActivity.SETTINGS_CUSTOM_USER_AGENT:
+                // Set the summary text.
                 userAgentPreference.setSummary(R.string.custom_user_agent);
                 break;
 
             default:
-                // Display the user agent from the preference as the summary text.
-                userAgentPreference.setSummary(savedPreferences.getString("user_agent", "PrivacyBrowser/1.0"));
-                break;
+                // Get the user agent summary from the user agent data array.
+                userAgentPreference.setSummary(translatedUserAgentNamesArray[userAgentArrayPosition] + ":\n" + userAgentDataArray[userAgentArrayPosition]);
         }
 
-        // 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 the custom user agent preference.
+        customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", getString(R.string.custom_user_agent_default_value)));
+
+        // Only enable the custom user agent preference if the user agent is set to `Custom`.
+        customUserAgentPreference.setEnabled(userAgentPreference.getSummary().equals(getString(R.string.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 search URL as the summary text for the search preference when the preference screen is loaded.
+        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.
-            javaScriptDisabledSearchPreference.setSummary(javaScriptDisabledSearchString);
+            searchPreference.setSummary(searchString);
+        }
+
+        // Set the summary text for the search custom URL (the default is `""`).
+        searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", getString(R.string.search_custom_url_default_value)));
+
+        // Only enable the search custom URL preference if the search is set to `Custom URL`.
+        searchCustomURLPreference.setEnabled(searchString.equals("Custom URL"));
+
+
+        // Set the summary text for the proxy preference when the preference screen is loaded.
+        switch (proxyString) {
+            case ProxyHelper.NONE:
+                proxyPreference.setSummary(getString(R.string.no_proxy_enabled));
+                break;
+
+            case ProxyHelper.TOR:
+                proxyPreference.setSummary(getString(R.string.tor_enabled));
+                break;
+
+            case ProxyHelper.I2P:
+                proxyPreference.setSummary(getString(R.string.i2p_enabled));
+                break;
+
+            case ProxyHelper.CUSTOM:
+                proxyPreference.setSummary(getString(R.string.custom_proxy));
+                break;
+        }
+
+        // Set the summary text for the custom proxy URL.
+        proxyCustomUrlPreference.setSummary(sharedPreferences.getString(getString(R.string.proxy_custom_url_key), getString(R.string.proxy_custom_url_default_value)));
+
+        // Only enable the custom proxy URL if a custom proxy is selected.
+        proxyCustomUrlPreference.setEnabled(proxyString.equals(ProxyHelper.CUSTOM));
+
+
+        // Set the status of the clear and exit preferences.
+        clearCookiesPreference.setEnabled(!clearEverything);
+        clearDomStoragePreference.setEnabled(!clearEverything);
+        clearFormDataPreference.setEnabled(!clearEverything);  // The form data line can be removed once the minimum API is >= 26.
+        clearLogcatPreference.setEnabled(!clearEverything);
+        clearCachePreference.setEnabled(!clearEverything);
+
+
+        // Set the homepage URL as the summary text for the homepage preference.
+        homepagePreference.setSummary(sharedPreferences.getString("homepage", getString(R.string.homepage_default_value)));
+
+
+        // Set the font size as the summary text for the preference.
+        fontSizePreference.setSummary(sharedPreferences.getString("font_size", getString(R.string.font_size_default_value)) + "%");
+
+
+        // Get the app theme string arrays.
+        appThemeEntriesStringArray = resources.getStringArray(R.array.app_theme_entries);
+        appThemeEntryValuesStringArray = resources.getStringArray(R.array.app_theme_entry_values);
+
+        // Get the current app theme.
+        String currentAppTheme = sharedPreferences.getString("app_theme", getString(R.string.app_theme_default_value));
+
+        // Define an app theme entry number.
+        int appThemeEntryNumber;
+
+        // Get the app theme entry number that matches the current app theme.  A switch statement cannot be used because the theme entry values string array is not a compile time constant.
+        if (currentAppTheme.equals(appThemeEntryValuesStringArray[1])) {  // The light theme is selected.
+            // Store the app theme entry number.
+            appThemeEntryNumber = 1;
+        } else if (currentAppTheme.equals(appThemeEntryValuesStringArray[2])) {  // The dark theme is selected.
+            // Store the app theme entry number.
+            appThemeEntryNumber = 2;
+        } else {  // The system default theme is selected.
+            // Store the app theme entry number.
+            appThemeEntryNumber = 0;
+        }
+
+        // Set the current theme as the summary text for the preference.
+        appThemePreference.setSummary(appThemeEntriesStringArray[appThemeEntryNumber]);
+
+
+        // Get the WebView theme string arrays.
+        webViewThemeEntriesStringArray = resources.getStringArray(R.array.webview_theme_entries);
+        webViewThemeEntryValuesStringArray = resources.getStringArray(R.array.webview_theme_entry_values);
+
+        // Get the current WebView theme.
+        String currentWebViewTheme = sharedPreferences.getString("webview_theme", getString(R.string.webview_theme_default_value));
+
+        // Define a WebView theme entry number.
+        int webViewThemeEntryNumber;
+
+        // Get the WebView theme entry number that matches the current WebView theme.  A switch statement cannot be used because the WebView theme entry values string array is not a compile time constant.
+        if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[1])) {  // The light theme is selected.
+            // Store the WebView theme entry number.
+            webViewThemeEntryNumber = 1;
+        } else if (currentWebViewTheme.equals(webViewThemeEntryValuesStringArray[2])) {  // The dark theme is selected.
+            // Store the WebView theme entry number.
+            webViewThemeEntryNumber = 2;
+        } else {  // The system default theme is selected.
+            // Store the WebView theme entry number.
+            webViewThemeEntryNumber = 0;
         }
 
-        // 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 current theme as the summary text for the preference.
+        webViewThemePreference.setSummary(webViewThemeEntriesStringArray[webViewThemeEntryNumber]);
 
 
-        // 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 JavaScript icon.
+        if (javaScriptEnabled) {
+            javaScriptPreference.setIcon(R.drawable.javascript_enabled);
         } else {
-            // Set the array value as the summary text.
-            javaScriptEnabledSearchPreference.setSummary(javaScriptEnabledSearchString);
-        }
-
-        // 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 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 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 + "%%");
-
-        // Disable `transparent_navigation_bar` if `hide_system_bars` is enabled.
-        final Preference translucentNavigationBarPreference = findPreference("translucent_navigation_bar");
-        translucentNavigationBarPreference.setEnabled(!savedPreferences.getBoolean("hide_system_bars", false));
-
-
-        // Listen for preference changes.
-        preferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-            @Override
-            // Remove Android Studio's warning about the dangers of using SetJavaScriptEnabled.  We know.
-            @SuppressLint("SetJavaScriptEnabled")
-            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-
-                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));
-                        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));
-                        break;
-
-                    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`.
-                                userAgentPreference.setSummary(bareWebView.getSettings().getUserAgentString());
-                                customUserAgent.setEnabled(false);
-                                break;
-
-                            case "Custom user agent":
-                                // Display "Custom user agent" as the summary text for userAgentPreference, and enable customUserAgent.
-                                userAgentPreference.setSummary(R.string.custom_user_agent);
-                                customUserAgent.setEnabled(true);
-                                break;
-
-                            default:
-                                // Display the user agent as the summary text for userAgentPreference, and disable customUserAgent.
-                                userAgentPreference.setSummary(sharedPreferences.getString("user_agent", "PrivacyBrowser/1.0"));
-                                customUserAgent.setEnabled(false);
-                                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"));
-                        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);
-                        }
-
-                        // 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", ""));
-                        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);
-                        }
-
-                        // 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", ""));
-                        break;
-
-                    case "homepage":
-                        // Set the new homepage URL as the summary text for the Homepage preference.  The default is `https://www.duckduckgo.com`.
-                        homepagePreference.setSummary(sharedPreferences.getString("homepage", "https://www.duckduckgo.com"));
-                        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 + "%%");
-                        break;
-
-                    case "hide_system_bars":
-                        // Enable `translucentNavigationBarPreference` if `hide_system_bars` is disabled.
-                        translucentNavigationBarPreference.setEnabled(!sharedPreferences.getBoolean("hide_system_bars", false));
-                        break;
-
-                    default:
-                        // If no match, do nothing.
-                        break;
+            javaScriptPreference.setIcon(R.drawable.privacy_mode);
+        }
+
+        // Set the cookies icon.
+        if (sharedPreferences.getBoolean(getString(R.string.cookies_key), false)) {
+            cookiesPreference.setIcon(R.drawable.cookies_enabled);
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                cookiesPreference.setIcon(R.drawable.cookies_disabled_day);
+            } else {
+                cookiesPreference.setIcon(R.drawable.cookies_disabled_night);
+            }
+        }
+
+        // Set the DOM storage icon.
+        if (javaScriptEnabled) {  // The preference is enabled.
+            if (sharedPreferences.getBoolean("dom_storage", false)) {  // DOM storage is enabled.
+                domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+            } else {  // DOM storage is disabled.
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                    domStoragePreference.setIcon(R.drawable.dom_storage_disabled_day);
+                } else {
+                    domStoragePreference.setIcon(R.drawable.dom_storage_disabled_night);
                 }
             }
-        };
+        } else {  // The preference is disabled.  The icon should be ghosted.
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_day);
+            } else {
+                domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_night);
+            }
+        }
+
+        // Set the save form data icon if API < 26.  Save form data has no effect on API >= 26.
+        if (Build.VERSION.SDK_INT < 26) {
+            if (sharedPreferences.getBoolean("save_form_data", false)) {
+                formDataPreference.setIcon(R.drawable.form_data_enabled);
+            } else {
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                    formDataPreference.setIcon(R.drawable.form_data_disabled_day);
+                } else {
+                    formDataPreference.setIcon(R.drawable.form_data_disabled_night);
+                }
+            }
+        }
+
+        // Set the custom user agent icon.
+        if (customUserAgentPreference.isEnabled()) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_day);
+            } else {
+                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_night);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_day);
+            } else {
+                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_night);
+            }
+        }
+
+        // Set the incognito mode icon.
+        if (sharedPreferences.getBoolean("incognito_mode", false)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_night);
+            } else {
+                incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_night);
+            } else {
+                incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_day);
+            }
+        }
+
+        // Set the allow screenshots icon.
+        if (sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day);
+            } else {
+                allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day);
+            } else {
+                allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night);
+            }
+        }
+
+        // Set the EasyList icon.
+        if (sharedPreferences.getBoolean("easylist", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                easyListPreference.setIcon(R.drawable.block_ads_enabled_night);
+            } else {
+                easyListPreference.setIcon(R.drawable.block_ads_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                easyListPreference.setIcon(R.drawable.block_ads_disabled_night);
+            } else {
+                easyListPreference.setIcon(R.drawable.block_ads_disabled_day);
+            }
+        }
+
+        // Set the EasyPrivacy icon.
+        if (sharedPreferences.getBoolean("easyprivacy", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_night);
+            } else {
+                easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_night);
+            } else {
+                easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_day);
+            }
+        }
+
+        // Set the Fanboy lists icons.
+        if (fanboyAnnoyanceListEnabled) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                // Set the Fanboy annoyance list icon.
+                fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_night);
+
+                // Set the Fanboy social blocking list icon.
+                fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_night);
+            } else {
+                // Set the Fanboy annoyance list icon.
+                fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_day);
+
+                // Set the Fanboy social blocking list icon.
+                fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                // Set the Fanboy annoyance list icon.
+                fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_night);
+
+                // Set the Fanboy social blocking list icon.
+                if (fanboySocialBlockingEnabled) {
+                    fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_night);
+                } else {
+                    fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_night);
+                }
+            } else {
+                // Set the Fanboy annoyance list icon.
+                fanboyAnnoyanceListPreference.setIcon(R.drawable.block_ads_disabled_day);
+
+                // Set the Fanboy social blocking list icon.
+                if (fanboySocialBlockingEnabled) {
+                    fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_day);
+                } else {
+                    fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_day);
+                }
+            }
+        }
+
+        // Set the UltraList icon.
+        if (sharedPreferences.getBoolean("ultralist", true)){
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                ultraListPreference.setIcon(R.drawable.block_ads_enabled_night);
+            } else {
+                ultraListPreference.setIcon(R.drawable.block_ads_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                ultraListPreference.setIcon(R.drawable.block_ads_disabled_night);
+            } else {
+                ultraListPreference.setIcon(R.drawable.block_ads_disabled_day);
+            }
+        }
+
+        // Set the UltraPrivacy icon.
+        if (sharedPreferences.getBoolean("ultraprivacy", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_night);
+            } else {
+                ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_night);
+            } else {
+                ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_day);
+            }
+        }
+
+        // Set the block all third-party requests icon.
+        if (sharedPreferences.getBoolean("block_all_third_party_requests", false)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_night);
+            } else {
+                blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_night);
+            } else {
+                blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_day);
+            }
+        }
+
+        // Set the Google Analytics icon according to the theme.
+        if (sharedPreferences.getBoolean("google_analytics", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_night);
+            } else {
+                googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_night);
+            } else {
+                googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_day);
+            }
+        }
+
+        // Set the Facebook Click IDs icon according to the theme.
+        if (sharedPreferences.getBoolean("facebook_click_ids", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_night);
+            } else {
+                facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_night);
+            } else {
+                facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_day);
+            }
+        }
+
+        // Set the Twitter AMP redirects icon according to the theme.
+        if (sharedPreferences.getBoolean("twitter_amp_redirects", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_night);
+            } else {
+                twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_night);
+            } else {
+                twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_day);
+            }
+        }
+
+        // Set the search custom URL icon.
+        if (searchCustomURLPreference.isEnabled()) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_night);
+            } else {
+                searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_night);
+            } else {
+                searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_day);
+            }
+        }
+
+        // Set the Proxy icons according to the theme and status.
+        if (proxyString.equals(ProxyHelper.NONE)) {  // Proxying is disabled.
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {  // Dark theme.
+                // Set the main proxy icon to be disabled.
+                proxyPreference.setIcon(R.drawable.proxy_disabled_night);
+
+                // Set the custom proxy URL icon to be ghosted.
+                proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_night);
+            } else {  // Light theme.
+                // Set the main proxy icon to be disabled.
+                proxyPreference.setIcon(R.drawable.proxy_disabled_day);
+
+                // Set the custom proxy URL icon to be ghosted.
+                proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_day);
+            }
+        } else {  // Proxying is enabled.
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {  // Dark theme.
+                // Set the main proxy icon to be enabled.
+                proxyPreference.setIcon(R.drawable.proxy_enabled_night);
+
+                // Set the custom proxy URL icon according to its status.
+                if (proxyCustomUrlPreference.isEnabled()) {  // Custom proxy is enabled.
+                    proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_night);
+                } else {  // Custom proxy is disabled.
+                    proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_night);
+                }
+            } else {  // Light theme.
+                // Set the main proxy icon to be enabled.
+                proxyPreference.setIcon(R.drawable.proxy_enabled_day);
+
+                // Set the custom proxy URL icon according to its status.
+                if (proxyCustomUrlPreference.isEnabled()) {  // Custom proxy is enabled.
+                    proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_day);
+                } else {  // Custom proxy is disabled.
+                    proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_day);
+                }
+            }
+        }
+
+        // Set the full screen browsing mode icons.
+        if (fullScreenBrowsingMode) {  // Full screen browsing mode is enabled.
+            // Set the `fullScreenBrowsingModePreference` icon according to the theme.
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_night);
+            } else {
+                fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_day);
+            }
+
+            // Set the hide app bar icon.
+            if (sharedPreferences.getBoolean("hide_app_bar", true)) {  // Hide app bar is enabled.
+                // Set the icon according to the theme.
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                    hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_night);
+                } else {
+                    hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_day);
+                }
+            } else {  // Hide app bar is disabled.
+                // Set the icon according to the theme.
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                    hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_night);
+                } else {
+                    hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_day);
+                }
+            }
+        } else {  // Full screen browsing mode is disabled.
+            // Set the icons according to the theme.
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_night);
+                hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_night);
+            } else {
+                fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_day);
+                hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_day);
+            }
+        }
+
+        // Set the clear everything preference icon.
+        if (clearEverything) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_day);
+            } else {
+                clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_night);
+            }
+        } else {
+            clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled);
+        }
+
+        // Set the clear cookies preference icon.
+        if (clearEverything || sharedPreferences.getBoolean("clear_cookies", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                clearCookiesPreference.setIcon(R.drawable.cookies_cleared_day);
+            } else {
+                clearCookiesPreference.setIcon(R.drawable.cookies_cleared_night);
+            }
+        } else {
+            clearCookiesPreference.setIcon(R.drawable.cookies_warning);
+        }
+
+        // Set the clear DOM storage preference icon.
+        if (clearEverything || sharedPreferences.getBoolean("clear_dom_storage", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_night);
+            } else {
+                clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_day);
+            }
+        } else {
+            clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning);
+        }
+
+        // Set the clear form data preference icon if the API < 26.  It has no effect on newer versions of Android.
+        if (Build.VERSION.SDK_INT < 26) {
+            if (clearEverything || sharedPreferences.getBoolean("clear_form_data", true)) {
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                    clearFormDataPreference.setIcon(R.drawable.form_data_cleared_night);
+                } else {
+                    clearFormDataPreference.setIcon(R.drawable.form_data_cleared_day);
+                }
+            } else {
+                clearFormDataPreference.setIcon(R.drawable.form_data_warning);
+            }
+        }
+
+        // Set the clear logcat preference icon.
+        if (clearEverything || sharedPreferences.getBoolean(getString(R.string.clear_logcat_key), true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                clearLogcatPreference.setIcon(R.drawable.bug_cleared_day);
+            } else {
+                clearLogcatPreference.setIcon(R.drawable.bug_cleared_night);
+            }
+        } else {
+            clearLogcatPreference.setIcon(R.drawable.bug_warning);
+        }
+
+        // Set the clear cache preference icon.
+        if (clearEverything || sharedPreferences.getBoolean("clear_cache", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                clearCachePreference.setIcon(R.drawable.cache_cleared_night);
+            } else {
+                clearCachePreference.setIcon(R.drawable.cache_cleared_day);
+            }
+        } else {
+            clearCachePreference.setIcon(R.drawable.cache_warning);
+        }
+
+        // Set the open intents in new tab preference icon.
+        if (sharedPreferences.getBoolean("open_intents_in_new_tab", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_night);
+            } else {
+                openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_night);
+            } else {
+                openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_day);
+            }
+        }
+
+        // Set the swipe to refresh preference icon.
+        if (sharedPreferences.getBoolean("swipe_to_refresh", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_day);
+            } else {
+                swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_night);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_day);
+            } else {
+                swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_night);
+            }
+        }
+
+        // Set the download with external app preference icon.
+        if (sharedPreferences.getBoolean(getString(R.string.download_with_external_app_key), false)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_enabled_day);
+            } else {
+                downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_enabled_night);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_disabled_day);
+            } else {
+                downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_disabled_night);
+            }
+        }
+
+        // Set the scroll app bar preference icon.
+        if (sharedPreferences.getBoolean(getString(R.string.scroll_app_bar_key), true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_day);
+            } else {
+                scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_night);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_day);
+            } else {
+                scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_night);
+            }
+        }
+
+        // Set the bottom app bar preference icon.
+        if (sharedPreferences.getBoolean(getString(R.string.bottom_app_bar_key), false)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_enabled_day);
+            } else {
+                bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_enabled_night);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_disabled_day);
+            } else {
+                bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_disabled_night);
+            }
+        }
+
+        // Set the display additional app bar icons preference icon.
+        if (sharedPreferences.getBoolean(getString(R.string.display_additional_app_bar_icons_key), false)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_day);
+            } else {
+                displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_night);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_day);
+            } else {
+                displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_night);
+            }
+        }
+
+        // Set the WebView theme preference icon.
+        switch (webViewThemeEntryNumber) {
+            case 0:  // The system default WebView theme is selected.
+                // Set the icon according to the app theme.
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                    webViewThemePreference.setIcon(R.drawable.webview_light_theme_day);
+                } else {
+                    webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night);
+                }
+                break;
+
+            case 1:  // The light WebView theme is selected.
+                // Set the icon according to the app theme.
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                    webViewThemePreference.setIcon(R.drawable.webview_light_theme_day);
+                } else {
+                    webViewThemePreference.setIcon(R.drawable.webview_light_theme_night);
+                }
+                break;
+
+            case 2:  // The dark WebView theme is selected.
+                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                    webViewThemePreference.setIcon(R.drawable.webview_dark_theme_day);
+                } else {
+                    webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night);
+                }
+                break;
+        }
 
-        // Register the listener.
-        savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener);
+        // Set the wide viewport preference icon.
+        if (sharedPreferences.getBoolean("wide_viewport", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_night);
+            } else {
+                wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_night);
+            } else {
+                wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_day);
+            }
+        }
+
+        // Set the display webpage images preference icon.
+        if (sharedPreferences.getBoolean("display_webpage_images", true)) {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_night);
+            } else {
+                displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_day);
+            }
+        } else {
+            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_night);
+            } else {
+                displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_day);
+            }
+        }
     }
 
-    // It is necessary to re-register the listener on every resume or it will randomly stop working because apps can be paused and resumed at any time
-    // even while running in the foreground.
+    // The listener should be unregistered when the app is paused.
     @Override
     public void onPause() {
+        // Run the default commands.
         super.onPause();
-        savedPreferences.unregisterOnSharedPreferenceChangeListener(preferencesListener);
+
+        // Get a handle for the shared preferences.
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+
+        // Unregister the shared preference listener.
+        sharedPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
     }
 
+    // The listener should be re-registered when the app is resumed.
     @Override
     public void onResume() {
+        // Run the default commands.
         super.onResume();
-        savedPreferences.registerOnSharedPreferenceChangeListener(preferencesListener);
+
+        // Get a new shared preference change listener.
+        sharedPreferenceChangeListener = getSharedPreferenceChangeListener(requireContext());
+
+        // Get a handle for the shared preferences.
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+
+        // Re-register the shared preference listener.
+        sharedPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+    }
+
+    // The context must be passed to the shared preference change listener or else any calls to the system `getString()` will crash if the app has been restarted.
+    // This can be removed at some future point, perhaps after the switch to PreferenceScreenCompat.  It isn't an issue in Privacy Cell.
+    private SharedPreferences.OnSharedPreferenceChangeListener getSharedPreferenceChangeListener(Context context) {
+        // Return the shared preference change listener.
+        return (SharedPreferences sharedPreferences, String key) -> {
+            switch (key) {
+                case "javascript":
+                    // Update the icons and the DOM storage preference status.
+                    if (sharedPreferences.getBoolean("javascript", false)) {  // The JavaScript preference is enabled.
+                        // Update the icon for the JavaScript preference.
+                        javaScriptPreference.setIcon(R.drawable.javascript_enabled);
+
+                        // Update the status of the DOM storage preference.
+                        domStoragePreference.setEnabled(true);
+
+                        // Update the icon for the DOM storage preference.
+                        if (sharedPreferences.getBoolean("dom_storage", false)) {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+                        } else {
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                                domStoragePreference.setIcon(R.drawable.dom_storage_disabled_day);
+                            } else {
+                                domStoragePreference.setIcon(R.drawable.dom_storage_disabled_night);
+                            }
+                        }
+                    } else {  // The JavaScript preference is disabled.
+                        // Update the icon for the JavaScript preference.
+                        javaScriptPreference.setIcon(R.drawable.privacy_mode);
+
+                        // Update the status of the DOM storage preference.
+                        domStoragePreference.setEnabled(false);
+
+                        // Set the icon for DOM storage preference to be ghosted.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_day);
+                        } else {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_ghosted_night);
+                        }
+                    }
+                    break;
+
+                case "cookies":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(context.getString(R.string.cookies_key), false)) {
+                        cookiesPreference.setIcon(R.drawable.cookies_enabled);
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            cookiesPreference.setIcon(R.drawable.cookies_disabled_day);
+                        } else {
+                            cookiesPreference.setIcon(R.drawable.cookies_disabled_night);
+                        }
+                    }
+                    break;
+
+                case "dom_storage":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("dom_storage", false)) {
+                        domStoragePreference.setIcon(R.drawable.dom_storage_enabled);
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_disabled_day);
+                        } else {
+                            domStoragePreference.setIcon(R.drawable.dom_storage_disabled_night);
+                        }
+                    }
+                    break;
+
+                // Save form data can be removed once the minimum API >= 26.
+                case "save_form_data":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("save_form_data", false)) {
+                        formDataPreference.setIcon(R.drawable.form_data_enabled);
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            formDataPreference.setIcon(R.drawable.form_data_disabled_day);
+                        } else {
+                            formDataPreference.setIcon(R.drawable.form_data_disabled_night);
+                        }
+                    }
+                    break;
+
+                case "user_agent":
+                    // Get the new user agent name.
+                    String newUserAgentName = sharedPreferences.getString("user_agent", context.getString(R.string.user_agent_default_value));
+
+                    // Get the array position for the new user agent name.
+                    int newUserAgentArrayPosition = userAgentNamesArray.getPosition(newUserAgentName);
+
+                    // Get the translated new user agent name.
+                    String translatedNewUserAgentName = translatedUserAgentNamesArray[newUserAgentArrayPosition];
+
+                    // Populate the user agent summary.
+                    switch (newUserAgentArrayPosition) {
+                        case MainWebViewActivity.SETTINGS_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(translatedNewUserAgentName + ":\n" + defaultUserAgent);
+
+                            // Disable the custom user agent preference.
+                            customUserAgentPreference.setEnabled(false);
+
+                            // Set the custom user agent preference icon according to the theme.
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_night);
+                            } else {
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_day);
+                            }
+                            break;
+
+                        case MainWebViewActivity.SETTINGS_CUSTOM_USER_AGENT:
+                            // Set the summary text.
+                            userAgentPreference.setSummary(R.string.custom_user_agent);
+
+                            // Enable the custom user agent preference.
+                            customUserAgentPreference.setEnabled(true);
+
+                            // Set the custom user agent preference icon according to the theme.
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_night);
+                            } else {
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_enabled_day);
+                            }
+                            break;
+
+                        default:
+                            // Get the user agent summary from the user agent data array.
+                            userAgentPreference.setSummary(translatedNewUserAgentName + ":\n" + userAgentDataArray[newUserAgentArrayPosition]);
+
+                            // Disable the custom user agent preference.
+                            customUserAgentPreference.setEnabled(false);
+
+                            // Set the custom user agent preference icon according to the theme.
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_night);
+                            } else {
+                                customUserAgentPreference.setIcon(R.drawable.custom_user_agent_ghosted_day);
+                            }
+                    }
+                    break;
+
+                case "custom_user_agent":
+                    // Set the new custom user agent as the summary text for the preference.
+                    customUserAgentPreference.setSummary(sharedPreferences.getString("custom_user_agent", context.getString(R.string.custom_user_agent_default_value)));
+                    break;
+
+                case "incognito_mode":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("incognito_mode", false)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_night);
+                        } else {
+                            incognitoModePreference.setIcon(R.drawable.incognito_mode_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_night);
+                        } else {
+                            incognitoModePreference.setIcon(R.drawable.incognito_mode_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "allow_screenshots":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(context.getString(R.string.allow_screenshots_key), false)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_day);
+                        } else {
+                            allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_enabled_night);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_day);
+                        } else {
+                            allowScreenshotsPreference.setIcon(R.drawable.allow_screenshots_disabled_night);
+                        }
+                    }
+
+                    // Restart Privacy Browser.
+                    restartPrivacyBrowser();
+                    break;
+
+                case "easylist":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("easylist", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            easyListPreference.setIcon(R.drawable.block_ads_enabled_night);
+                        } else {
+                            easyListPreference.setIcon(R.drawable.block_ads_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            easyListPreference.setIcon(R.drawable.block_ads_disabled_night);
+                        } else {
+                            easyListPreference.setIcon(R.drawable.block_ads_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "easyprivacy":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("easyprivacy", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_night);
+                        } else {
+                            easyPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_night);
+                        } else {
+                            easyPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "fanboys_annoyance_list":
+                    boolean currentFanboyAnnoyanceList = sharedPreferences.getBoolean("fanboys_annoyance_list", true);
+                    boolean currentFanboySocialBlockingList = sharedPreferences.getBoolean("fanboys_social_blocking_list", true);
+
+                    // Update the Fanboy icons.
+                    if (currentFanboyAnnoyanceList) {  // Fanboy's annoyance list is enabled.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            // Update the Fanboy's annoyance list icon.
+                            fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_night);
+
+                            // Update the Fanboy's social blocking list icon.
+                            fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_night);
+                        } else {
+                            // Update the Fanboy's annoyance list icon.
+                            fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_enabled_day);
+
+                            // Update the Fanboy's social blocking list icon.
+                            fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_ghosted_day);
+                        }
+                    } else {  // Fanboy's annoyance list is disabled.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            // Update the Fanboy's annoyance list icon.
+                            fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_night);
+
+                            // Update the Fanboy's social blocking list icon.
+                            if (currentFanboySocialBlockingList) {
+                                fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_night);
+                            } else {
+                                fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_night);
+                            }
+                        } else {
+                            // Update the Fanboy's annoyance list icon.
+                            fanboyAnnoyanceListPreference.setIcon(R.drawable.social_media_disabled_day);
+
+                            // Update the Fanboy's social blocking list icon.
+                            if (currentFanboySocialBlockingList) {
+                                fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_day);
+                            } else {
+                                fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_day);
+                            }
+                        }
+                    }
+
+                    // Only enable Fanboy's social blocking list preference if Fanboy's annoyance list preference is disabled.
+                    fanboySocialBlockingListPreference.setEnabled(!currentFanboyAnnoyanceList);
+                    break;
+
+                case "fanboys_social_blocking_list":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("fanboys_social_blocking_list", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_night);
+                        } else {
+                            fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_night);
+                        } else {
+                            fanboySocialBlockingListPreference.setIcon(R.drawable.social_media_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "ultralist":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("ultralist", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            ultraListPreference.setIcon(R.drawable.block_ads_enabled_night);
+                        } else {
+                            ultraListPreference.setIcon(R.drawable.block_ads_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            ultraListPreference.setIcon(R.drawable.block_ads_disabled_night);
+                        } else {
+                            ultraListPreference.setIcon(R.drawable.block_ads_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "ultraprivacy":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("ultraprivacy", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_night);
+                        } else {
+                            ultraPrivacyPreference.setIcon(R.drawable.block_tracking_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_night);
+                        } else {
+                            ultraPrivacyPreference.setIcon(R.drawable.block_tracking_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "block_all_third_party_requests":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("block_all_third_party_requests", false)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_night);
+                        } else {
+                            blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_night);
+                        } else {
+                            blockAllThirdPartyRequestsPreference.setIcon(R.drawable.block_all_third_party_requests_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "google_analytics":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("google_analytics", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_night);
+                        } else {
+                            googleAnalyticsPreference.setIcon(R.drawable.modify_url_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_night);
+                        } else {
+                            googleAnalyticsPreference.setIcon(R.drawable.modify_url_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "facebook_click_ids":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("facebook_click_ids", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_night);
+                        } else {
+                            facebookClickIdsPreference.setIcon(R.drawable.modify_url_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_night);
+                        } else {
+                            facebookClickIdsPreference.setIcon(R.drawable.modify_url_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "twitter_amp_redirects":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("twitter_amp_redirects", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_night);
+                        } else {
+                            twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_night);
+                        } else {
+                            twitterAmpRedirectsPreference.setIcon(R.drawable.modify_url_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "search":
+                    // Store the new search string.
+                    String newSearchString = sharedPreferences.getString("search", context.getString(R.string.search_default_value));
+
+                    // Update the search and search custom URL preferences.
+                    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);
+
+                        // Enable `searchCustomURLPreference`.
+                        searchCustomURLPreference.setEnabled(true);
+
+                        // Set the `searchCustomURLPreference` according to the theme.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_night);
+                        } else {
+                            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_enabled_day);
+                        }
+                    } else {  // `Custom URL` is not selected.
+                        // Set the summary text to `newSearchString`.
+                        searchPreference.setSummary(newSearchString);
+
+                        // Disable `searchCustomURLPreference`.
+                        searchCustomURLPreference.setEnabled(false);
+
+                        // Set the `searchCustomURLPreference` according to the theme.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_night);
+                        } else {
+                            searchCustomURLPreference.setIcon(R.drawable.search_custom_url_ghosted_day);
+                        }
+                    }
+                    break;
+
+                case "search_custom_url":
+                    // Set the new search custom URL as the summary text for the preference.
+                    searchCustomURLPreference.setSummary(sharedPreferences.getString("search_custom_url", context.getString(R.string.search_custom_url_default_value)));
+                    break;
+
+                case "proxy":
+                    // Get current proxy string.
+                    String currentProxyString = sharedPreferences.getString("proxy", context.getString(R.string.proxy_default_value));
+
+                    // Update the summary text for the proxy preference.
+                    switch (currentProxyString) {
+                        case ProxyHelper.NONE:
+                            proxyPreference.setSummary(context.getString(R.string.no_proxy_enabled));
+                            break;
+
+                        case ProxyHelper.TOR:
+                            proxyPreference.setSummary(context.getString(R.string.tor_enabled));
+                            break;
+
+                        case ProxyHelper.I2P:
+                            proxyPreference.setSummary(context.getString(R.string.i2p_enabled));
+                            break;
+
+                        case ProxyHelper.CUSTOM:
+                            proxyPreference.setSummary(context.getString(R.string.custom_proxy));
+                            break;
+                    }
+
+                    // Update the status of the custom URL preference.
+                    proxyCustomUrlPreference.setEnabled(currentProxyString.equals(ProxyHelper.CUSTOM));
+
+                    // Update the icons.
+                    if (currentProxyString.equals(ProxyHelper.NONE)) {  // Proxying is disabled.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {  // Dark theme.
+                            // Set the main proxy icon to be disabled
+                            proxyPreference.setIcon(R.drawable.proxy_disabled_night);
+
+                            // Set the custom proxy URL icon to be ghosted.
+                            proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_night);
+                        } else {  // Light theme.
+                            // Set the main proxy icon to be disabled.
+                            proxyPreference.setIcon(R.drawable.proxy_disabled_day);
+
+                            // Set the custom proxy URL icon to be ghosted.
+                            proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_day);
+                        }
+                    } else {  // Proxying is enabled.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {  // Dark theme.
+                            // Set the main proxy icon to be enabled.
+                            proxyPreference.setIcon(R.drawable.proxy_enabled_night);
+
+                            /// Set the custom proxy URL icon according to its status.
+                            if (proxyCustomUrlPreference.isEnabled()) {  // Custom proxy is enabled.
+                                proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_night);
+                            } else {  // Custom proxy is disabled.
+                                proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_night);
+                            }
+                        } else {  // Light theme.
+                            // Set the main proxy icon to be enabled.
+                            proxyPreference.setIcon(R.drawable.proxy_enabled_day);
+
+                            // Set the custom proxy URL icon according to its status.
+                            if (proxyCustomUrlPreference.isEnabled()) {  // Custom proxy is enabled.
+                                proxyCustomUrlPreference.setIcon(R.drawable.proxy_enabled_day);
+                            } else {  // Custom proxy is disabled.
+                                proxyCustomUrlPreference.setIcon(R.drawable.proxy_ghosted_day);
+                            }
+                        }
+                    }
+                    break;
+
+                case "proxy_custom_url":
+                    // Set the summary text for the proxy custom URL.
+                    proxyCustomUrlPreference.setSummary(sharedPreferences.getString(context.getString(R.string.proxy_custom_url_key), context.getString(R.string.proxy_custom_url_default_value)));
+                    break;
+
+                case "full_screen_browsing_mode":
+                    if (sharedPreferences.getBoolean("full_screen_browsing_mode", false)) {  // Full screen browsing is enabled.
+                        // Set the full screen browsing mode preference icon according to the theme.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_night);
+                        } else {
+                            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_enabled_day);
+                        }
+
+                        // Set the hide app bar preference icon.
+                        if (sharedPreferences.getBoolean("hide_app_bar", true)) {  //  Hide app bar is enabled.
+                            // Set the icon according to the theme.
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                                hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_night);
+                            } else {
+                                hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_day);
+                            }
+                        } else {  // Hide app bar is disabled.
+                            // Set the icon according to the theme.
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                                hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_night);
+                            } else {
+                                hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_day);
+                            }
+                        }
+                    } else {  // Full screen browsing is disabled.
+                        // Update the icons according to the theme.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_night);
+                            hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_night);
+                        } else {
+                            fullScreenBrowsingModePreference.setIcon(R.drawable.full_screen_disabled_day);
+                            hideAppBarPreference.setIcon(R.drawable.app_bar_ghosted_day);
+                        }
+                    }
+                    break;
+
+                case "hide_app_bar":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("hide_app_bar", true)) {  // Hide app bar is enabled.
+                        // Set the icon according to the theme.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_night);
+                        } else {
+                            hideAppBarPreference.setIcon(R.drawable.app_bar_enabled_day);
+                        }
+                    } else {  // Hide app bar is disabled.
+                        // Set the icon according to the theme.
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_night);
+                        } else {
+                            hideAppBarPreference.setIcon(R.drawable.app_bar_disabled_day);
+                        }
+                    }
+                    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);  // This line can be removed once the minimum API >= 26.
+                    clearLogcatPreference.setEnabled(!newClearEverythingBoolean);
+                    clearCachePreference.setEnabled(!newClearEverythingBoolean);
+
+                    // Update the clear everything preference icon.
+                    if (newClearEverythingBoolean) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_day);
+                        } else {
+                            clearEverythingPreference.setIcon(R.drawable.clear_everything_enabled_night);
+                        }
+                    } else {
+                        clearEverythingPreference.setIcon(R.drawable.clear_everything_disabled);
+                    }
+
+                    // Update the clear cookies preference icon.
+                    if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cookies", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearCookiesPreference.setIcon(R.drawable.cookies_cleared_day);
+                        } else {
+                            clearCookiesPreference.setIcon(R.drawable.cookies_cleared_night);
+                        }
+                    } else {
+                        clearCookiesPreference.setIcon(R.drawable.cookies_warning);
+                    }
+
+                    // Update the clear dom storage preference icon.
+                    if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_dom_storage", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_day);
+                        } else {
+                            clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_night);
+                        }
+                    } else {
+                        clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning);
+                    }
+
+                    // Update the clear form data preference icon if the API < 26.
+                    if (Build.VERSION.SDK_INT < 26) {
+                        if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_form_data", true)) {
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                                clearFormDataPreference.setIcon(R.drawable.form_data_cleared_day);
+                            } else {
+                                clearFormDataPreference.setIcon(R.drawable.form_data_cleared_night);
+                            }
+                        } else {
+                            clearFormDataPreference.setIcon(R.drawable.form_data_warning);
+                        }
+                    }
+
+                    // Update the clear logcat preference icon.
+                    if (newClearEverythingBoolean || sharedPreferences.getBoolean(context.getString(R.string.clear_logcat_key), true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearLogcatPreference.setIcon(R.drawable.bug_cleared_day);
+                        } else {
+                            clearLogcatPreference.setIcon(R.drawable.bug_cleared_night);
+                        }
+                    } else {
+                        clearLogcatPreference.setIcon(R.drawable.cache_warning);
+                    }
+
+                    // Update the clear cache preference icon.
+                    if (newClearEverythingBoolean || sharedPreferences.getBoolean("clear_cache", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearCachePreference.setIcon(R.drawable.cache_cleared_day);
+                        } else {
+                            clearCachePreference.setIcon(R.drawable.cache_cleared_night);
+                        }
+                    } else {
+                        clearCachePreference.setIcon(R.drawable.cache_warning);
+                    }
+                    break;
+
+                case "clear_cookies":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("clear_cookies", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearCookiesPreference.setIcon(R.drawable.cookies_cleared_day);
+                        } else {
+                            clearCookiesPreference.setIcon(R.drawable.cookies_cleared_night);
+                        }
+                    } else {
+                        clearCookiesPreference.setIcon(R.drawable.cookies_warning);
+                    }
+                    break;
+
+                case "clear_dom_storage":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("clear_dom_storage", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_day);
+                        } else {
+                            clearDomStoragePreference.setIcon(R.drawable.dom_storage_cleared_night);
+                        }
+                    } else {
+                        clearDomStoragePreference.setIcon(R.drawable.dom_storage_warning);
+                    }
+                    break;
+
+                // This section can be removed once the minimum API >= 26.
+                case "clear_form_data":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("clear_form_data", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearFormDataPreference.setIcon(R.drawable.form_data_cleared_day);
+                        } else {
+                            clearFormDataPreference.setIcon(R.drawable.form_data_cleared_night);
+                        }
+                    } else {
+                        clearFormDataPreference.setIcon(R.drawable.form_data_warning);
+                    }
+                    break;
+
+                case "clear_logcat":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(context.getString(R.string.clear_logcat_key), true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearLogcatPreference.setIcon(R.drawable.bug_cleared_day);
+                        } else {
+                            clearLogcatPreference.setIcon(R.drawable.bug_cleared_night);
+                        }
+                    } else {
+                        clearLogcatPreference.setIcon(R.drawable.bug_warning);
+                    }
+                    break;
+
+                case "clear_cache":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("clear_cache", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            clearCachePreference.setIcon(R.drawable.cache_cleared_day);
+                        } else {
+                            clearCachePreference.setIcon(R.drawable.cache_cleared_night);
+                        }
+                    } else {
+                        clearCachePreference.setIcon(R.drawable.cache_warning);
+                    }
+                    break;
+
+                case "homepage":
+                    // Set the new homepage URL as the summary text for the Homepage preference.
+                    homepagePreference.setSummary(sharedPreferences.getString("homepage", context.getString(R.string.homepage_default_value)));
+                    break;
+
+                case "font_size":
+                    // Update the font size summary text.
+                    fontSizePreference.setSummary(sharedPreferences.getString("font_size", context.getString(R.string.font_size_default_value)) + "%");
+                    break;
+
+                case "open_intents_in_new_tab":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("open_intents_in_new_tab", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_day);
+                        } else {
+                            openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_night);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_day);
+                        } else {
+                            openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_night);
+                        }
+                    }
+                    break;
+
+                case "swipe_to_refresh":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("swipe_to_refresh", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_day);
+                        } else {
+                            swipeToRefreshPreference.setIcon(R.drawable.refresh_enabled_night);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_day);
+                        } else {
+                            swipeToRefreshPreference.setIcon(R.drawable.refresh_disabled_night);
+                        }
+                    }
+                    break;
+
+                case "download_with_external_app":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(context.getString(R.string.download_with_external_app_key), false)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_enabled_day);
+                        } else {
+                            downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_enabled_night);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_disabled_day);
+                        } else {
+                            downloadWithExternalAppPreference.setIcon(R.drawable.download_with_external_app_disabled_night);
+                        }
+                    }
+                    break;
+
+                case "scroll_app_bar":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(context.getString(R.string.scroll_app_bar_key), true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_day);
+                        } else {
+                            scrollAppBarPreference.setIcon(R.drawable.app_bar_enabled_night);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_day);
+                        } else {
+                            scrollAppBarPreference.setIcon(R.drawable.app_bar_disabled_night);
+                        }
+                    }
+                    break;
+
+                case "bottom_app_bar":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(context.getString(R.string.bottom_app_bar_key), false)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_enabled_day);
+                        } else {
+                            bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_enabled_night);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_disabled_day);
+                        } else {
+                            bottomAppBarPreference.setIcon(R.drawable.bottom_app_bar_disabled_night);
+                        }
+                    }
+
+                    // Restart Privacy Browser.
+                    restartPrivacyBrowser();
+                    break;
+
+                case "display_additional_app_bar_icons":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean(context.getString(R.string.display_additional_app_bar_icons_key), false)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_day);
+                        } else {
+                            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_enabled_night);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_day);
+                        } else {
+                            displayAdditionalAppBarIconsPreference.setIcon(R.drawable.more_disabled_night);
+                        }
+                    }
+                    break;
+
+                case "app_theme":
+                    // Get the new theme.
+                    String newAppTheme = sharedPreferences.getString("app_theme", context.getString(R.string.app_theme_default_value));
+
+                    // Update the system according to the new theme.  A switch statement cannot be used because the theme entry values string array is not a compile time constant.
+                    if (newAppTheme.equals(appThemeEntryValuesStringArray[1])) {  // The light theme is selected.
+                        // Update the theme preference summary text.
+                        appThemePreference.setSummary(appThemeEntriesStringArray[1]);
+
+                        // Apply the new theme.
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    } else if (newAppTheme.equals(appThemeEntryValuesStringArray[2])) {  // The dark theme is selected.
+                        // Update the theme preference summary text.
+                        appThemePreference.setSummary(appThemeEntriesStringArray[2]);
+
+                        // Apply the new theme.
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    } else {  // The system default theme is selected.
+                        // Update the theme preference summary text.
+                        appThemePreference.setSummary(appThemeEntriesStringArray[0]);
+
+                        // Apply the new theme.
+                        if (Build.VERSION.SDK_INT >= 28) {  // The system default theme is supported.
+                            // Follow the system default theme.
+                            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                        } else {// The system default theme is not supported.
+                            // Follow the battery saver mode.
+                            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY);
+                        }
+                    }
+
+                    // Update the current theme status.
+                    currentThemeStatus = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+                    break;
+
+                case "webview_theme":
+                    // Get the new WebView theme.
+                    String newWebViewTheme = sharedPreferences.getString("webview_theme", context.getString(R.string.webview_theme_default_value));
+
+                    // Define a new WebView theme entry number.
+                    int newWebViewThemeEntryNumber;
+
+                    // Get the webView theme entry number that matches the new WebView theme.  A switch statement cannot be used because the theme entry values string array is not a compile time constant.
+                    if (newWebViewTheme.equals(webViewThemeEntriesStringArray[1])) {  // The light theme is selected.
+                        // Store the new WebView theme entry number.
+                        newWebViewThemeEntryNumber = 1;
+                    } else if (newWebViewTheme.equals(webViewThemeEntryValuesStringArray[2])) {  // The dark theme is selected.
+                        // Store the WebView theme entry number.
+                        newWebViewThemeEntryNumber = 2;
+                    } else {  // The system default theme is selected.
+                        // Store the WebView theme entry number.
+                        newWebViewThemeEntryNumber = 0;
+                    }
+
+                    // Update the icon.
+                    switch (newWebViewThemeEntryNumber) {
+                        case 0:  // The system default WebView theme is selected.
+                            // Set the icon according to the app theme.
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                                webViewThemePreference.setIcon(R.drawable.webview_light_theme_day);
+                            } else {
+                                webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night);
+                            }
+                            break;
+
+                        case 1:  // The system default WebView theme is selected.
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                                webViewThemePreference.setIcon(R.drawable.webview_light_theme_day);
+                            } else {
+                                webViewThemePreference.setIcon(R.drawable.webview_light_theme_night);
+                            }
+                            break;
+
+                        case 2:  // The system default WebView theme is selected.
+                            if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
+                                webViewThemePreference.setIcon(R.drawable.webview_dark_theme_day);
+                            } else {
+                                webViewThemePreference.setIcon(R.drawable.webview_dark_theme_night);
+                            }
+                            break;
+                    }
+
+                    // Set the current theme as the summary text for the preference.
+                    webViewThemePreference.setSummary(webViewThemeEntriesStringArray[newWebViewThemeEntryNumber]);
+                    break;
+
+                case "wide_viewport":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("wide_viewport", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_night);
+                        } else {
+                            wideViewportPreference.setIcon(R.drawable.wide_viewport_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_night);
+                        } else {
+                            wideViewportPreference.setIcon(R.drawable.wide_viewport_disabled_day);
+                        }
+                    }
+                    break;
+
+                case "display_webpage_images":
+                    // Update the icon.
+                    if (sharedPreferences.getBoolean("display_webpage_images", true)) {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_night);
+                        } else {
+                            displayWebpageImagesPreference.setIcon(R.drawable.images_enabled_day);
+                        }
+                    } else {
+                        if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
+                            displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_night);
+                        } else {
+                            displayWebpageImagesPreference.setIcon(R.drawable.images_disabled_day);
+                        }
+                    }
+                    break;
+            }
+        };
+    }
+
+    private void restartPrivacyBrowser() {
+        // Create an intent to restart Privacy Browser.
+        Intent restartIntent = requireActivity().getParentActivityIntent();
+
+        // Assert that the intent is not null to remove the lint error below.
+        assert restartIntent != null;
+
+        // `Intent.FLAG_ACTIVITY_CLEAR_TASK` removes all activities from the stack.  It requires `Intent.FLAG_ACTIVITY_NEW_TASK`.
+        restartIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+        // Create a handler to restart the activity.
+        Handler restartHandler = new Handler(Looper.getMainLooper());
+
+        // Create a runnable to restart the activity.
+        Runnable restartRunnable = () -> {
+            // Restart the activity.
+            startActivity(restartIntent);
+
+            // Kill this instance of Privacy Browser.  Otherwise, the app exhibits sporadic behavior after the restart.
+            System.exit(0);
+        };
+
+        // Restart the activity after 400 milliseconds, so that the app has enough time to save the change to the preference.
+        restartHandler.postDelayed(restartRunnable, 400);
     }
 }