From a6d829c39b356e9134cb488c4ae7e0e29bf9df96 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 14 Jun 2017 13:25:22 -0700
Subject: [PATCH] Create a dark theme for `GuideActivity`.

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../activities/GuideActivity.java             | 16 ++++-
 .../activities/MainWebViewActivity.java       |  2 +-
 .../fragments/GuideTabFragment.java           | 33 ++++++++-
 app/src/main/res/drawable/about.xml           |  2 +-
 app/src/main/res/drawable/add.xml             |  2 +-
 app/src/main/res/drawable/back.xml            |  2 +-
 .../main/res/drawable/block_ads_disabled.xml  |  2 +-
 .../main/res/drawable/block_ads_enabled.xml   |  2 +-
 app/src/main/res/drawable/bookmarks.xml       |  2 +-
 app/src/main/res/drawable/cache_cleared.xml   |  2 +-
 app/src/main/res/drawable/cache_warning.xml   |  2 +-
 .../drawable/clear_everything_disabled.xml    |  2 +-
 .../res/drawable/clear_everything_enabled.xml |  2 +-
 app/src/main/res/drawable/close.xml           |  2 +-
 app/src/main/res/drawable/cookies_cleared.xml |  2 +-
 .../main/res/drawable/cookies_disabled.xml    |  2 +-
 app/src/main/res/drawable/cookies_enabled.xml |  2 +-
 app/src/main/res/drawable/cookies_ghosted.xml |  2 +-
 app/src/main/res/drawable/cookies_warning.xml |  2 +-
 app/src/main/res/drawable/create_folder.xml   |  2 +-
 .../drawable/custom_user_agent_enabled.xml    |  2 +-
 .../drawable/custom_user_agent_ghosted.xml    |  2 +-
 app/src/main/res/drawable/delete.xml          |  2 +-
 app/src/main/res/drawable/delete_blue.xml     |  2 +-
 .../res/drawable/do_not_track_disabled.xml    |  2 +-
 .../res/drawable/do_not_track_enabled.xml     |  2 +-
 .../main/res/drawable/dom_storage_cleared.xml |  2 +-
 .../res/drawable/dom_storage_disabled.xml     |  2 +-
 .../main/res/drawable/dom_storage_enabled.xml |  2 +-
 .../main/res/drawable/dom_storage_ghosted.xml |  2 +-
 .../main/res/drawable/dom_storage_warning.xml |  2 +-
 app/src/main/res/drawable/domains.xml         |  2 +-
 .../res/drawable/domains_list_selector.xml    |  2 +-
 app/src/main/res/drawable/downloads.xml       |  2 +-
 app/src/main/res/drawable/edit.xml            |  2 +-
 app/src/main/res/drawable/exit.xml            |  2 +-
 .../main/res/drawable/folder_dark_blue.xml    |  2 +-
 app/src/main/res/drawable/folder_gray.xml     |  2 +-
 app/src/main/res/drawable/font_size.xml       |  2 +-
 .../main/res/drawable/form_data_cleared.xml   |  2 +-
 .../main/res/drawable/form_data_disabled.xml  |  2 +-
 .../main/res/drawable/form_data_enabled.xml   |  2 +-
 .../main/res/drawable/form_data_warning.xml   |  2 +-
 app/src/main/res/drawable/forward.xml         |  2 +-
 .../res/drawable/full_screen_disabled.xml     |  2 +-
 .../main/res/drawable/full_screen_enabled.xml |  2 +-
 app/src/main/res/drawable/guide.xml           |  2 +-
 .../drawable/hide_system_bars_disabled.xml    |  2 +-
 .../res/drawable/hide_system_bars_enabled.xml |  2 +-
 .../res/drawable/hide_system_bars_ghosted.xml |  2 +-
 app/src/main/res/drawable/history.xml         |  2 +-
 app/src/main/res/drawable/home_enabled.xml    |  2 +-
 app/src/main/res/drawable/home_ghosted.xml    |  2 +-
 app/src/main/res/drawable/images_disabled.xml |  2 +-
 app/src/main/res/drawable/images_enabled.xml  |  2 +-
 .../res/drawable/incognito_mode_disabled.xml  |  2 +-
 .../res/drawable/incognito_mode_enabled.xml   |  2 +-
 .../main/res/drawable/javascript_enabled.xml  |  8 +--
 .../listview_item_background_selector.xml     |  2 +-
 app/src/main/res/drawable/more_disabled.xml   |  2 +-
 app/src/main/res/drawable/more_enabled.xml    |  2 +-
 .../drawable/move_bookmark_down_disabled.xml  |  2 +-
 .../drawable/move_bookmark_down_enabled.xml   |  2 +-
 .../drawable/move_bookmark_up_disabled.xml    |  2 +-
 .../res/drawable/move_bookmark_up_enabled.xml |  2 +-
 app/src/main/res/drawable/move_to_folder.xml  |  2 +-
 app/src/main/res/drawable/next.xml            |  2 +-
 app/src/main/res/drawable/orbot_disabled.xml  |  2 +-
 app/src/main/res/drawable/orbot_enabled.xml   |  2 +-
 app/src/main/res/drawable/previous.xml        |  2 +-
 app/src/main/res/drawable/privacy_mode.xml    |  8 +--
 .../main/res/drawable/refresh_disabled.xml    |  2 +-
 app/src/main/res/drawable/refresh_enabled.xml |  2 +-
 .../drawable/search_custom_url_disabled.xml   |  2 +-
 .../drawable/search_custom_url_enabled.xml    |  2 +-
 .../drawable/search_custom_url_ghosted.xml    |  2 +-
 app/src/main/res/drawable/search_enabled.xml  |  2 +-
 app/src/main/res/drawable/search_ghosted.xml  |  2 +-
 app/src/main/res/drawable/select_all.xml      |  2 +-
 app/src/main/res/drawable/settings.xml        |  2 +-
 app/src/main/res/drawable/theme_dark.xml      |  4 +-
 app/src/main/res/drawable/theme_light.xml     |  2 +-
 .../res/drawable/translucent_bar_disabled.xml |  2 +-
 .../res/drawable/translucent_bar_enabled.xml  |  2 +-
 .../res/drawable/translucent_bar_ghosted.xml  |  2 +-
 .../drawable/url_bar_background_dark_blue.xml |  2 +-
 .../url_bar_background_light_green.xml        |  2 +-
 .../url_bar_background_transparent.xml        |  2 +-
 app/src/main/res/drawable/user_agent.xml      |  2 +-
 app/src/main/res/drawable/warning.xml         |  8 +--
 .../layout/about_coordinatorlayout_dark.xml   | 20 +++---
 .../layout/about_coordinatorlayout_light.xml  | 20 +++---
 .../layout/guide_coordinatorlayout_dark.xml   | 70 +++++++++++++++++++
 ....xml => guide_coordinatorlayout_light.xml} | 30 ++++----
 app/src/main/res/layout/guide_tab_webview.xml | 26 -------
 app/src/main/res/values/colors.xml            |  3 +
 app/src/main/res/values/styles.xml            | 14 ++++
 98 files changed, 263 insertions(+), 166 deletions(-)
 create mode 100644 app/src/main/res/layout/guide_coordinatorlayout_dark.xml
 rename app/src/main/res/layout/{guide_coordinatorlayout.xml => guide_coordinatorlayout_light.xml} (70%)
 delete mode 100644 app/src/main/res/layout/guide_tab_webview.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cca1063f..48e48789 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -149,7 +149,6 @@
         <activity
             android:name=".activities.GuideActivity"
             android:label="@string/privacy_browser_guide"
-            android:theme="@style/PrivacyBrowserLight.SecondaryActivity"
             android:parentActivityName=".activities.MainWebViewActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
index 70907fca..a8728fe6 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
@@ -35,8 +35,22 @@ import com.stoutner.privacybrowser.R;
 public class GuideActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // Set the theme.
+        if (MainWebViewActivity.darkTheme) {
+            setTheme(R.style.PrivacyBrowserDark_SecondaryActivity);
+        } else {
+            setTheme(R.style.PrivacyBrowserLight_SecondaryActivity);
+        }
+
+        // Run the default commands.
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.guide_coordinatorlayout);
+
+        // Set the content view according to the theme.
+        if (MainWebViewActivity.darkTheme) {
+            setContentView(R.layout.guide_coordinatorlayout_dark);
+        } else {
+            setContentView(R.layout.guide_coordinatorlayout_light);
+        }
 
         // We need to use `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21.
         Toolbar guideAppBar = (Toolbar) findViewById(R.id.guide_toolbar);
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
index e7286522..0012898e 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.java
@@ -122,7 +122,7 @@ import java.util.Set;
 public class MainWebViewActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, CreateHomeScreenShortcutDialog.CreateHomeScreenSchortcutListener,
         SslCertificateErrorDialog.SslCertificateErrorListener, DownloadFileDialog.DownloadFileListener, DownloadImageDialog.DownloadImageListener, UrlHistoryDialog.UrlHistoryListener {
 
-    // `darkTheme` is public static so it can be accessed from `AboutActivity`.  It is also used in `onCreate()`, `applyAppSettings()`, and `applyDomainSettings()`.
+    // `darkTheme` is public static so it can be accessed from `AboutActivity` and `GuideActivity`.  It is also used in `onCreate()`, `applyAppSettings()`, and `applyDomainSettings()`.
     public static boolean darkTheme;
 
     // `favoriteIconBitmap` is public static so it can be accessed from `CreateHomeScreenShortcutDialog`, `BookmarksActivity`, `CreateBookmarkDialog`, `CreateBookmarkFolderDialog`, `EditBookmarkDialog`, `EditBookmarkFolderDialog`, `ViewSslCertificateDialog`.
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
index a3b2249a..7cec388b 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
@@ -19,6 +19,8 @@
 
 package com.stoutner.privacybrowser.fragments;
 
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Paint;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
@@ -27,6 +29,7 @@ import android.view.ViewGroup;
 import android.webkit.WebView;
 
 import com.stoutner.privacybrowser.R;
+import com.stoutner.privacybrowser.activities.MainWebViewActivity;
 
 public class GuideTabFragment extends Fragment {
     // `tabNumber` is used in `onCreate()` and `onCreateView()`.
@@ -52,11 +55,35 @@ public class GuideTabFragment extends Fragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.
-        // The fragment will take care of attaching the root automatically.
-        View tabLayout = inflater.inflate(R.layout.guide_tab_webview, container, false);
+        // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container.  The fragment will take care of attaching the root automatically.
+        View tabLayout = inflater.inflate(R.layout.bare_webview, container, false);
+
+        // Get a handle for `tabWebView`.
         WebView tabWebView = (WebView) tabLayout;
 
+        // Filter the colors if `darkTheme` is `true`.
+        if (MainWebViewActivity.darkTheme) {
+            // Initialize `darkPaint`.
+            Paint darkPaint = new Paint();
+
+            // Setup a float array that inverts and tempers the colors (no hard whites or blacks).
+            float[] darkFilterFloatArray = {
+                    -.8f, 0, 0, 0, 255,  // Red.
+                    0, -.8f, 0, 0, 255,  // Green.
+                    0, 0, -.8f, 0, 255,  // Blue.
+                    0, 0, 0, .8f, 0      // Alpha.
+            };
+
+            // Set `darkPaint` to use `darkFilterFloatArray`.
+            darkPaint.setColorFilter(new ColorMatrixColorFilter(darkFilterFloatArray));
+
+            // Apply `darkPaint` to `tabWebView`.
+            tabWebView.setLayerType(View.LAYER_TYPE_HARDWARE, darkPaint);
+        } else {
+            // Reset `tabWebView` to use the normal colors.
+            tabWebView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        }
+
         // Tab numbers start at 0.
         switch (tabNumber) {
             case 0:
diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml
index b61f8172..8a20c678 100644
--- a/app/src/main/res/drawable/about.xml
+++ b/app/src/main/res/drawable/about.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml
index 752e75c9..d902679e 100644
--- a/app/src/main/res/drawable/add.xml
+++ b/app/src/main/res/drawable/add.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml
index b8581cf3..51dc3f07 100644
--- a/app/src/main/res/drawable/back.xml
+++ b/app/src/main/res/drawable/back.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
diff --git a/app/src/main/res/drawable/block_ads_disabled.xml b/app/src/main/res/drawable/block_ads_disabled.xml
index 90199e1f..e4b999a7 100644
--- a/app/src/main/res/drawable/block_ads_disabled.xml
+++ b/app/src/main/res/drawable/block_ads_disabled.xml
@@ -5,7 +5,7 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
diff --git a/app/src/main/res/drawable/block_ads_enabled.xml b/app/src/main/res/drawable/block_ads_enabled.xml
index de1efc61..b71fce2f 100644
--- a/app/src/main/res/drawable/block_ads_enabled.xml
+++ b/app/src/main/res/drawable/block_ads_enabled.xml
@@ -5,7 +5,7 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
diff --git a/app/src/main/res/drawable/bookmarks.xml b/app/src/main/res/drawable/bookmarks.xml
index 995775bc..d2825600 100644
--- a/app/src/main/res/drawable/bookmarks.xml
+++ b/app/src/main/res/drawable/bookmarks.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
diff --git a/app/src/main/res/drawable/cache_cleared.xml b/app/src/main/res/drawable/cache_cleared.xml
index 4edfd872..4eea31a9 100644
--- a/app/src/main/res/drawable/cache_cleared.xml
+++ b/app/src/main/res/drawable/cache_cleared.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M11,9.16V2c-5,0.5 -9,4.79 -9,10s4,9.5 9,10v-7.16c-1,-0.41 -2,-1.52 -2,-2.84s1,-2.43 2,-2.84zM14.86,11H22c-0.48,-4.75 -4,-8.53 -9,-9v7.16c1,0.3 1.52,0.98 1.86,1.84zM13,14.84V22c5,-0.47 8.52,-4.25 9,-9h-7.14c-0.34,0.86 -0.86,1.54 -1.86,1.84z"/>
diff --git a/app/src/main/res/drawable/cache_warning.xml b/app/src/main/res/drawable/cache_warning.xml
index add2185f..7b997605 100644
--- a/app/src/main/res/drawable/cache_warning.xml
+++ b/app/src/main/res/drawable/cache_warning.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFD50000"
         android:pathData="M11,9.16V2c-5,0.5 -9,4.79 -9,10s4,9.5 9,10v-7.16c-1,-0.41 -2,-1.52 -2,-2.84s1,-2.43 2,-2.84zM14.86,11H22c-0.48,-4.75 -4,-8.53 -9,-9v7.16c1,0.3 1.52,0.98 1.86,1.84zM13,14.84V22c5,-0.47 8.52,-4.25 9,-9h-7.14c-0.34,0.86 -0.86,1.54 -1.86,1.84z"/>
diff --git a/app/src/main/res/drawable/clear_everything_disabled.xml b/app/src/main/res/drawable/clear_everything_disabled.xml
index fcf007af..9432434e 100644
--- a/app/src/main/res/drawable/clear_everything_disabled.xml
+++ b/app/src/main/res/drawable/clear_everything_disabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFD50000"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
diff --git a/app/src/main/res/drawable/clear_everything_enabled.xml b/app/src/main/res/drawable/clear_everything_enabled.xml
index 6c901aba..9cebc872 100644
--- a/app/src/main/res/drawable/clear_everything_enabled.xml
+++ b/app/src/main/res/drawable/clear_everything_enabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml
index c0dff6b8..afb25c0b 100644
--- a/app/src/main/res/drawable/close.xml
+++ b/app/src/main/res/drawable/close.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
diff --git a/app/src/main/res/drawable/cookies_cleared.xml b/app/src/main/res/drawable/cookies_cleared.xml
index f0ba32b1..32c1abee 100644
--- a/app/src/main/res/drawable/cookies_cleared.xml
+++ b/app/src/main/res/drawable/cookies_cleared.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
diff --git a/app/src/main/res/drawable/cookies_disabled.xml b/app/src/main/res/drawable/cookies_disabled.xml
index df2fe2ae..ea28b274 100644
--- a/app/src/main/res/drawable/cookies_disabled.xml
+++ b/app/src/main/res/drawable/cookies_disabled.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
diff --git a/app/src/main/res/drawable/cookies_enabled.xml b/app/src/main/res/drawable/cookies_enabled.xml
index 383573d6..df39e058 100644
--- a/app/src/main/res/drawable/cookies_enabled.xml
+++ b/app/src/main/res/drawable/cookies_enabled.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFF57F17"
         android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
diff --git a/app/src/main/res/drawable/cookies_ghosted.xml b/app/src/main/res/drawable/cookies_ghosted.xml
index aa265522..cd1cc86b 100644
--- a/app/src/main/res/drawable/cookies_ghosted.xml
+++ b/app/src/main/res/drawable/cookies_ghosted.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
diff --git a/app/src/main/res/drawable/cookies_warning.xml b/app/src/main/res/drawable/cookies_warning.xml
index d8efc4d0..55678cd6 100644
--- a/app/src/main/res/drawable/cookies_warning.xml
+++ b/app/src/main/res/drawable/cookies_warning.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFD50000"
         android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
diff --git a/app/src/main/res/drawable/create_folder.xml b/app/src/main/res/drawable/create_folder.xml
index 7d060b8c..78c67f21 100644
--- a/app/src/main/res/drawable/create_folder.xml
+++ b/app/src/main/res/drawable/create_folder.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
diff --git a/app/src/main/res/drawable/custom_user_agent_enabled.xml b/app/src/main/res/drawable/custom_user_agent_enabled.xml
index 817d6233..bb47570e 100644
--- a/app/src/main/res/drawable/custom_user_agent_enabled.xml
+++ b/app/src/main/res/drawable/custom_user_agent_enabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted.xml b/app/src/main/res/drawable/custom_user_agent_ghosted.xml
index 86bdf912..d6c46e83 100644
--- a/app/src/main/res/drawable/custom_user_agent_ghosted.xml
+++ b/app/src/main/res/drawable/custom_user_agent_ghosted.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml
index 853d272c..eb9ac2ce 100644
--- a/app/src/main/res/drawable/delete.xml
+++ b/app/src/main/res/drawable/delete.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
diff --git a/app/src/main/res/drawable/delete_blue.xml b/app/src/main/res/drawable/delete_blue.xml
index 83e524cf..ac23cef7 100644
--- a/app/src/main/res/drawable/delete_blue.xml
+++ b/app/src/main/res/drawable/delete_blue.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF90CAF9"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
diff --git a/app/src/main/res/drawable/do_not_track_disabled.xml b/app/src/main/res/drawable/do_not_track_disabled.xml
index 7303b01e..89101050 100644
--- a/app/src/main/res/drawable/do_not_track_disabled.xml
+++ b/app/src/main/res/drawable/do_not_track_disabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
diff --git a/app/src/main/res/drawable/do_not_track_enabled.xml b/app/src/main/res/drawable/do_not_track_enabled.xml
index dafb11e6..4aa90fdd 100644
--- a/app/src/main/res/drawable/do_not_track_enabled.xml
+++ b/app/src/main/res/drawable/do_not_track_enabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
diff --git a/app/src/main/res/drawable/dom_storage_cleared.xml b/app/src/main/res/drawable/dom_storage_cleared.xml
index a20c8ca2..6e8a9e29 100644
--- a/app/src/main/res/drawable/dom_storage_cleared.xml
+++ b/app/src/main/res/drawable/dom_storage_cleared.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
diff --git a/app/src/main/res/drawable/dom_storage_disabled.xml b/app/src/main/res/drawable/dom_storage_disabled.xml
index d6180570..50678912 100644
--- a/app/src/main/res/drawable/dom_storage_disabled.xml
+++ b/app/src/main/res/drawable/dom_storage_disabled.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
diff --git a/app/src/main/res/drawable/dom_storage_enabled.xml b/app/src/main/res/drawable/dom_storage_enabled.xml
index 0c297bda..19a910f0 100644
--- a/app/src/main/res/drawable/dom_storage_enabled.xml
+++ b/app/src/main/res/drawable/dom_storage_enabled.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFF57F17"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
diff --git a/app/src/main/res/drawable/dom_storage_ghosted.xml b/app/src/main/res/drawable/dom_storage_ghosted.xml
index 6ae15e56..6f00eb0d 100644
--- a/app/src/main/res/drawable/dom_storage_ghosted.xml
+++ b/app/src/main/res/drawable/dom_storage_ghosted.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
diff --git a/app/src/main/res/drawable/dom_storage_warning.xml b/app/src/main/res/drawable/dom_storage_warning.xml
index ee18ccf1..f036ad88 100644
--- a/app/src/main/res/drawable/dom_storage_warning.xml
+++ b/app/src/main/res/drawable/dom_storage_warning.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFD50000"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
diff --git a/app/src/main/res/drawable/domains.xml b/app/src/main/res/drawable/domains.xml
index 3d756b69..07bde4aa 100644
--- a/app/src/main/res/drawable/domains.xml
+++ b/app/src/main/res/drawable/domains.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M20,13H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1zM7,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM20,3H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1zM7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
diff --git a/app/src/main/res/drawable/domains_list_selector.xml b/app/src/main/res/drawable/domains_list_selector.xml
index 254cc974..904cf996 100644
--- a/app/src/main/res/drawable/domains_list_selector.xml
+++ b/app/src/main/res/drawable/domains_list_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/drawable/downloads.xml b/app/src/main/res/drawable/downloads.xml
index f43a105f..f4b6ec2c 100644
--- a/app/src/main/res/drawable/downloads.xml
+++ b/app/src/main/res/drawable/downloads.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml
index 115d4bfd..93320210 100644
--- a/app/src/main/res/drawable/edit.xml
+++ b/app/src/main/res/drawable/edit.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml
index 9adf3d84..49b5841c 100644
--- a/app/src/main/res/drawable/exit.xml
+++ b/app/src/main/res/drawable/exit.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
diff --git a/app/src/main/res/drawable/folder_dark_blue.xml b/app/src/main/res/drawable/folder_dark_blue.xml
index 501733d9..4a5436c0 100644
--- a/app/src/main/res/drawable/folder_dark_blue.xml
+++ b/app/src/main/res/drawable/folder_dark_blue.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF0D47A1"
         android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
diff --git a/app/src/main/res/drawable/folder_gray.xml b/app/src/main/res/drawable/folder_gray.xml
index 18dfc195..2b45fce0 100644
--- a/app/src/main/res/drawable/folder_gray.xml
+++ b/app/src/main/res/drawable/folder_gray.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF9E9E9E"
         android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
diff --git a/app/src/main/res/drawable/font_size.xml b/app/src/main/res/drawable/font_size.xml
index c8d11837..9371c71b 100644
--- a/app/src/main/res/drawable/font_size.xml
+++ b/app/src/main/res/drawable/font_size.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z" />
diff --git a/app/src/main/res/drawable/form_data_cleared.xml b/app/src/main/res/drawable/form_data_cleared.xml
index 4437a3e0..4b5a1bb7 100644
--- a/app/src/main/res/drawable/form_data_cleared.xml
+++ b/app/src/main/res/drawable/form_data_cleared.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
diff --git a/app/src/main/res/drawable/form_data_disabled.xml b/app/src/main/res/drawable/form_data_disabled.xml
index 57cf70a6..5cd02765 100644
--- a/app/src/main/res/drawable/form_data_disabled.xml
+++ b/app/src/main/res/drawable/form_data_disabled.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml
index 53546ce6..fa609665 100644
--- a/app/src/main/res/drawable/form_data_enabled.xml
+++ b/app/src/main/res/drawable/form_data_enabled.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFF57F17"
         android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
diff --git a/app/src/main/res/drawable/form_data_warning.xml b/app/src/main/res/drawable/form_data_warning.xml
index 71d77a71..8205e883 100644
--- a/app/src/main/res/drawable/form_data_warning.xml
+++ b/app/src/main/res/drawable/form_data_warning.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFD50000"
         android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
diff --git a/app/src/main/res/drawable/forward.xml b/app/src/main/res/drawable/forward.xml
index 593cd840..47e77405 100644
--- a/app/src/main/res/drawable/forward.xml
+++ b/app/src/main/res/drawable/forward.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z" />
diff --git a/app/src/main/res/drawable/full_screen_disabled.xml b/app/src/main/res/drawable/full_screen_disabled.xml
index d7d02a37..76ecc6b6 100644
--- a/app/src/main/res/drawable/full_screen_disabled.xml
+++ b/app/src/main/res/drawable/full_screen_disabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
diff --git a/app/src/main/res/drawable/full_screen_enabled.xml b/app/src/main/res/drawable/full_screen_enabled.xml
index 533a5eb2..e9a72ca9 100644
--- a/app/src/main/res/drawable/full_screen_enabled.xml
+++ b/app/src/main/res/drawable/full_screen_enabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
diff --git a/app/src/main/res/drawable/guide.xml b/app/src/main/res/drawable/guide.xml
index daa8d2ed..6a458f66 100644
--- a/app/src/main/res/drawable/guide.xml
+++ b/app/src/main/res/drawable/guide.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M21,5c-1.11,-0.35 -2.33,-0.5 -3.5,-0.5 -1.95,0 -4.05,0.4 -5.5,1.5 -1.45,-1.1 -3.55,-1.5 -5.5,-1.5S2.45,4.9 1,6v14.65c0,0.25 0.25,0.5 0.5,0.5 0.1,0 0.15,-0.05 0.25,-0.05C3.1,20.45 5.05,20 6.5,20c1.95,0 4.05,0.4 5.5,1.5 1.35,-0.85 3.8,-1.5 5.5,-1.5 1.65,0 3.35,0.3 4.75,1.05 0.1,0.05 0.15,0.05 0.25,0.05 0.25,0 0.5,-0.25 0.5,-0.5L23,6c-0.6,-0.45 -1.25,-0.75 -2,-1zM21,18.5c-1.1,-0.35 -2.3,-0.5 -3.5,-0.5 -1.7,0 -4.15,0.65 -5.5,1.5L12,8c1.35,-0.85 3.8,-1.5 5.5,-1.5 1.2,0 2.4,0.15 3.5,0.5v11.5z" />
diff --git a/app/src/main/res/drawable/hide_system_bars_disabled.xml b/app/src/main/res/drawable/hide_system_bars_disabled.xml
index 82f5ba16..819a896f 100644
--- a/app/src/main/res/drawable/hide_system_bars_disabled.xml
+++ b/app/src/main/res/drawable/hide_system_bars_disabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
diff --git a/app/src/main/res/drawable/hide_system_bars_enabled.xml b/app/src/main/res/drawable/hide_system_bars_enabled.xml
index 36fb7a61..b9d95944 100644
--- a/app/src/main/res/drawable/hide_system_bars_enabled.xml
+++ b/app/src/main/res/drawable/hide_system_bars_enabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
diff --git a/app/src/main/res/drawable/hide_system_bars_ghosted.xml b/app/src/main/res/drawable/hide_system_bars_ghosted.xml
index 59a673b6..831e33b5 100644
--- a/app/src/main/res/drawable/hide_system_bars_ghosted.xml
+++ b/app/src/main/res/drawable/hide_system_bars_ghosted.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
diff --git a/app/src/main/res/drawable/history.xml b/app/src/main/res/drawable/history.xml
index 17118dd4..43612110 100644
--- a/app/src/main/res/drawable/history.xml
+++ b/app/src/main/res/drawable/history.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z" />
diff --git a/app/src/main/res/drawable/home_enabled.xml b/app/src/main/res/drawable/home_enabled.xml
index 349e6099..c2a19a77 100644
--- a/app/src/main/res/drawable/home_enabled.xml
+++ b/app/src/main/res/drawable/home_enabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
diff --git a/app/src/main/res/drawable/home_ghosted.xml b/app/src/main/res/drawable/home_ghosted.xml
index 44c366c8..1cded8c3 100644
--- a/app/src/main/res/drawable/home_ghosted.xml
+++ b/app/src/main/res/drawable/home_ghosted.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
diff --git a/app/src/main/res/drawable/images_disabled.xml b/app/src/main/res/drawable/images_disabled.xml
index bd8526c0..0051e2e3 100644
--- a/app/src/main/res/drawable/images_disabled.xml
+++ b/app/src/main/res/drawable/images_disabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
diff --git a/app/src/main/res/drawable/images_enabled.xml b/app/src/main/res/drawable/images_enabled.xml
index ee3387bc..0b4c4054 100644
--- a/app/src/main/res/drawable/images_enabled.xml
+++ b/app/src/main/res/drawable/images_enabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
diff --git a/app/src/main/res/drawable/incognito_mode_disabled.xml b/app/src/main/res/drawable/incognito_mode_disabled.xml
index 277149c9..cde555b6 100644
--- a/app/src/main/res/drawable/incognito_mode_disabled.xml
+++ b/app/src/main/res/drawable/incognito_mode_disabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
diff --git a/app/src/main/res/drawable/incognito_mode_enabled.xml b/app/src/main/res/drawable/incognito_mode_enabled.xml
index a8fee863..9bfa3c14 100644
--- a/app/src/main/res/drawable/incognito_mode_enabled.xml
+++ b/app/src/main/res/drawable/incognito_mode_enabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml
index 02c9b168..5631974e 100644
--- a/app/src/main/res/drawable/javascript_enabled.xml
+++ b/app/src/main/res/drawable/javascript_enabled.xml
@@ -1,5 +1,5 @@
 <!-- `javascript_enabled.xml` is derived from `ic_security` and `ic_language`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
-    Modifications copyright Soren Stoutner <soren@stoutner.com> 2016.  The resulting image is released under the GPLv3+ license. -->
+    Modifications copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -8,21 +8,21 @@
     android:viewportHeight="256.0"
     android:viewportWidth="256.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#b71c1c"
         android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z"
         android:strokeColor="#00000000" />
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#d32f2f"
         android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z"
         android:strokeColor="#00000000" />
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#ffffff"
diff --git a/app/src/main/res/drawable/listview_item_background_selector.xml b/app/src/main/res/drawable/listview_item_background_selector.xml
index 3f74269f..7720acaa 100644
--- a/app/src/main/res/drawable/listview_item_background_selector.xml
+++ b/app/src/main/res/drawable/listview_item_background_selector.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/drawable/more_disabled.xml b/app/src/main/res/drawable/more_disabled.xml
index 2484a22d..8b303c34 100644
--- a/app/src/main/res/drawable/more_disabled.xml
+++ b/app/src/main/res/drawable/more_disabled.xml
@@ -11,7 +11,7 @@
     android:width="24dp"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
diff --git a/app/src/main/res/drawable/more_enabled.xml b/app/src/main/res/drawable/more_enabled.xml
index 458c8d29..127938b9 100644
--- a/app/src/main/res/drawable/more_enabled.xml
+++ b/app/src/main/res/drawable/more_enabled.xml
@@ -11,7 +11,7 @@
     android:width="24dp"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
diff --git a/app/src/main/res/drawable/move_bookmark_down_disabled.xml b/app/src/main/res/drawable/move_bookmark_down_disabled.xml
index e6217f08..4148b5e4 100644
--- a/app/src/main/res/drawable/move_bookmark_down_disabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_down_disabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFBBDEFB"
         android:pathData="M16,13h-3V3h-2v10H8l4,4 4,-4zM4,19v2h16v-2H4z"/>
diff --git a/app/src/main/res/drawable/move_bookmark_down_enabled.xml b/app/src/main/res/drawable/move_bookmark_down_enabled.xml
index 0b86a9ca..dc9806db 100644
--- a/app/src/main/res/drawable/move_bookmark_down_enabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_down_enabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M16,13h-3V3h-2v10H8l4,4 4,-4zM4,19v2h16v-2H4z"/>
diff --git a/app/src/main/res/drawable/move_bookmark_up_disabled.xml b/app/src/main/res/drawable/move_bookmark_up_disabled.xml
index 3245337a..20851821 100644
--- a/app/src/main/res/drawable/move_bookmark_up_disabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_up_disabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFBBDEFB"
         android:pathData="M8,11h3v10h2V11h3l-4,-4 -4,4zM4,3v2h16V3H4z"/>
diff --git a/app/src/main/res/drawable/move_bookmark_up_enabled.xml b/app/src/main/res/drawable/move_bookmark_up_enabled.xml
index 74609253..c0d2986c 100644
--- a/app/src/main/res/drawable/move_bookmark_up_enabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_up_enabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M8,11h3v10h2V11h3l-4,-4 -4,4zM4,3v2h16V3H4z"/>
diff --git a/app/src/main/res/drawable/move_to_folder.xml b/app/src/main/res/drawable/move_to_folder.xml
index 6fb70c2e..410ad13e 100644
--- a/app/src/main/res/drawable/move_to_folder.xml
+++ b/app/src/main/res/drawable/move_to_folder.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM17.94,17L15,15.28 12.06,17l0.78,-3.33 -2.59,-2.24 3.41,-0.29L15,8l1.34,3.14 3.41,0.29 -2.59,2.24 0.78,3.33z"/>
diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml
index 42f665ca..4a7cfd60 100644
--- a/app/src/main/res/drawable/next.xml
+++ b/app/src/main/res/drawable/next.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
diff --git a/app/src/main/res/drawable/orbot_disabled.xml b/app/src/main/res/drawable/orbot_disabled.xml
index f52197c1..a431e87a 100644
--- a/app/src/main/res/drawable/orbot_disabled.xml
+++ b/app/src/main/res/drawable/orbot_disabled.xml
@@ -12,7 +12,7 @@
     android:viewportWidth="33.866665"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
diff --git a/app/src/main/res/drawable/orbot_enabled.xml b/app/src/main/res/drawable/orbot_enabled.xml
index 1b3c2cc7..43ab496f 100644
--- a/app/src/main/res/drawable/orbot_enabled.xml
+++ b/app/src/main/res/drawable/orbot_enabled.xml
@@ -12,7 +12,7 @@
     android:viewportWidth="33.866665"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="m12.18,32.04c-4.14,-1.92 -6.77,-6.03 -6.77,-10.58 0,-4.35 1.64,-7.16 5.91,-10.12 1.46,-1.01 2.25,-1.97 2.45,-2.98 0.21,-1.03 0.52,-1.41 1.02,-1.22 0.4,0.15 1.72,0.28 2.93,0.28 1.94,0 2.24,0.15 2.52,1.27 0.18,0.7 1.25,1.92 2.39,2.7 4.22,2.92 5.84,5.75 5.82,10.17 -0.02,4.59 -2.89,8.88 -7.12,10.64 -2.51,1.05 -6.7,0.97 -9.17,-0.18zM14.95,5.83c-1.05,-1.13 -1.48,-4.92 -0.56,-4.92 0.96,0 2.54,2.69 2.54,4.33 0,1.96 -0.56,2.13 -1.99,0.59zM17.44,6.25c0,-0.68 1.54,-2.33 2.17,-2.33 0.68,0 0.31,1.37 -0.58,2.18 -1.11,1.01 -1.59,1.05 -1.59,0.16z" android:strokeWidth="0.50134861"/>
diff --git a/app/src/main/res/drawable/previous.xml b/app/src/main/res/drawable/previous.xml
index c10bb3d4..46c3762c 100644
--- a/app/src/main/res/drawable/previous.xml
+++ b/app/src/main/res/drawable/previous.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml
index 30fdd776..d5879ce9 100644
--- a/app/src/main/res/drawable/privacy_mode.xml
+++ b/app/src/main/res/drawable/privacy_mode.xml
@@ -1,5 +1,5 @@
 <!-- `privacy_mode.xml` is derived from `ic_security` and `ic_language`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
-    Modifications copyright Soren Stoutner <soren@stoutner.com> 2016.  The resulting image is released under the GPLv3+ license. -->
+    Modifications copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -8,21 +8,21 @@
     android:viewportHeight="256.0"
     android:viewportWidth="256.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#0d4781"
         android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z"
         android:strokeColor="#00000000" />
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#1976d2"
         android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z"
         android:strokeColor="#00000000" />
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#ffffff"
diff --git a/app/src/main/res/drawable/refresh_disabled.xml b/app/src/main/res/drawable/refresh_disabled.xml
index b0a3e7b4..5e06bb62 100644
--- a/app/src/main/res/drawable/refresh_disabled.xml
+++ b/app/src/main/res/drawable/refresh_disabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
diff --git a/app/src/main/res/drawable/refresh_enabled.xml b/app/src/main/res/drawable/refresh_enabled.xml
index 9d1b023e..c9786fea 100644
--- a/app/src/main/res/drawable/refresh_enabled.xml
+++ b/app/src/main/res/drawable/refresh_enabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
diff --git a/app/src/main/res/drawable/search_custom_url_disabled.xml b/app/src/main/res/drawable/search_custom_url_disabled.xml
index ff0969b9..88677668 100644
--- a/app/src/main/res/drawable/search_custom_url_disabled.xml
+++ b/app/src/main/res/drawable/search_custom_url_disabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
diff --git a/app/src/main/res/drawable/search_custom_url_enabled.xml b/app/src/main/res/drawable/search_custom_url_enabled.xml
index 5ecb30d7..3b9579a3 100644
--- a/app/src/main/res/drawable/search_custom_url_enabled.xml
+++ b/app/src/main/res/drawable/search_custom_url_enabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
diff --git a/app/src/main/res/drawable/search_custom_url_ghosted.xml b/app/src/main/res/drawable/search_custom_url_ghosted.xml
index c2cc1177..08aed01c 100644
--- a/app/src/main/res/drawable/search_custom_url_ghosted.xml
+++ b/app/src/main/res/drawable/search_custom_url_ghosted.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
diff --git a/app/src/main/res/drawable/search_enabled.xml b/app/src/main/res/drawable/search_enabled.xml
index 7f4a880e..cab15922 100644
--- a/app/src/main/res/drawable/search_enabled.xml
+++ b/app/src/main/res/drawable/search_enabled.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/app/src/main/res/drawable/search_ghosted.xml b/app/src/main/res/drawable/search_ghosted.xml
index e078033b..596682ba 100644
--- a/app/src/main/res/drawable/search_ghosted.xml
+++ b/app/src/main/res/drawable/search_ghosted.xml
@@ -11,7 +11,7 @@
     android:viewportWidth="24.0"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/app/src/main/res/drawable/select_all.xml b/app/src/main/res/drawable/select_all.xml
index c27e108e..54151e54 100644
--- a/app/src/main/res/drawable/select_all.xml
+++ b/app/src/main/res/drawable/select_all.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml
index ba3e1e43..f486b75c 100644
--- a/app/src/main/res/drawable/settings.xml
+++ b/app/src/main/res/drawable/settings.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF000000"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
diff --git a/app/src/main/res/drawable/theme_dark.xml b/app/src/main/res/drawable/theme_dark.xml
index d294217b..2755effe 100644
--- a/app/src/main/res/drawable/theme_dark.xml
+++ b/app/src/main/res/drawable/theme_dark.xml
@@ -11,8 +11,8 @@
     android:viewportHeight="24.0"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FF424242"
         android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
 </vector>
diff --git a/app/src/main/res/drawable/theme_light.xml b/app/src/main/res/drawable/theme_light.xml
index 339b1e02..df0b9bce 100644
--- a/app/src/main/res/drawable/theme_light.xml
+++ b/app/src/main/res/drawable/theme_light.xml
@@ -11,7 +11,7 @@
     android:viewportHeight="24.0"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
diff --git a/app/src/main/res/drawable/translucent_bar_disabled.xml b/app/src/main/res/drawable/translucent_bar_disabled.xml
index 395dea04..4120c40f 100644
--- a/app/src/main/res/drawable/translucent_bar_disabled.xml
+++ b/app/src/main/res/drawable/translucent_bar_disabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#88000000"
         android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
diff --git a/app/src/main/res/drawable/translucent_bar_enabled.xml b/app/src/main/res/drawable/translucent_bar_enabled.xml
index d7b10efc..18a5f8b4 100644
--- a/app/src/main/res/drawable/translucent_bar_enabled.xml
+++ b/app/src/main/res/drawable/translucent_bar_enabled.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
diff --git a/app/src/main/res/drawable/translucent_bar_ghosted.xml b/app/src/main/res/drawable/translucent_bar_ghosted.xml
index efa1137d..3d64eb57 100644
--- a/app/src/main/res/drawable/translucent_bar_ghosted.xml
+++ b/app/src/main/res/drawable/translucent_bar_ghosted.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19v-3h18v3z"/>
diff --git a/app/src/main/res/drawable/url_bar_background_dark_blue.xml b/app/src/main/res/drawable/url_bar_background_dark_blue.xml
index 12bf4e84..ab78b691 100644
--- a/app/src/main/res/drawable/url_bar_background_dark_blue.xml
+++ b/app/src/main/res/drawable/url_bar_background_dark_blue.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/drawable/url_bar_background_light_green.xml b/app/src/main/res/drawable/url_bar_background_light_green.xml
index c5bf2d47..9d02fce2 100644
--- a/app/src/main/res/drawable/url_bar_background_light_green.xml
+++ b/app/src/main/res/drawable/url_bar_background_light_green.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/drawable/url_bar_background_transparent.xml b/app/src/main/res/drawable/url_bar_background_transparent.xml
index 99084fa7..ad27b437 100644
--- a/app/src/main/res/drawable/url_bar_background_transparent.xml
+++ b/app/src/main/res/drawable/url_bar_background_transparent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
diff --git a/app/src/main/res/drawable/user_agent.xml b/app/src/main/res/drawable/user_agent.xml
index 6ba66b99..cdaf0fb6 100644
--- a/app/src/main/res/drawable/user_agent.xml
+++ b/app/src/main/res/drawable/user_agent.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml
index 6225884c..c123ebb4 100644
--- a/app/src/main/res/drawable/warning.xml
+++ b/app/src/main/res/drawable/warning.xml
@@ -1,5 +1,5 @@
 <!-- `warning.xml` is derived from `ic_security` and `ic_language`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
-    Modifications copyright © 2016 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
+    Modifications copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -8,21 +8,21 @@
     android:viewportHeight="256.0"
     android:viewportWidth="256.0" >
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#f57f17"
         android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z"
         android:strokeColor="#00000000" />
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#fbc02d"
         android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z"
         android:strokeColor="#00000000" />
 
-    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#ffffff"
diff --git a/app/src/main/res/layout/about_coordinatorlayout_dark.xml b/app/src/main/res/layout/about_coordinatorlayout_dark.xml
index e07db78f..2034eaa2 100644
--- a/app/src/main/res/layout/about_coordinatorlayout_dark.xml
+++ b/app/src/main/res/layout/about_coordinatorlayout_dark.xml
@@ -28,19 +28,20 @@
     android:layout_width="match_parent"
     android:fitsSystemWindows="true" >
 
-    <!-- the LinearLayout with orientation="vertical" moves the ViewPager below the AppBarLayout. -->
+    <!-- The `LinearLayout` with `orientation="vertical"` moves the `ViewPager` below the `AppBarLayout`. -->
     <LinearLayout
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
-        <!-- We need to set android:background="@color/blue_700" here or any space to the right of the TabLayout on large devices will be white. -->
+        <!-- We need to set `android:background="?attr/colorPrimaryDark"` here or any space to the right of the `TabLayout` on large devices will be black. -->
         <android.support.design.widget.AppBarLayout
             android:id="@+id/about_appbarlayout"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent" >
+            android:layout_width="match_parent"
+            android:background="?attr/colorPrimaryDark" >
 
-            <!-- android:theme="@style/PrivacyBrowser.AppBarDark" makes the text and icons in the AppBar white. -->
+            <!-- `android:theme="@style/PrivacyBrowserAppBarDark"` makes the text and icons in the `AppBar` gray. -->
             <android.support.v7.widget.Toolbar
                 android:id="@+id/about_toolbar"
                 android:layout_height="wrap_content"
@@ -48,19 +49,18 @@
                 android:background="?attr/colorPrimaryDark"
                 android:theme="@style/PrivacyBrowserAppBarDark" />
 
+            <!-- For some reason `tabIndicatorColor` does not pull from the style unless specified explicitly here. -->
             <android.support.design.widget.TabLayout
                 android:id="@+id/about_tablayout"
                 xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android.support.design:tabBackground="?attr/colorPrimaryDark"
-                android.support.design:tabTextColor="@color/blue_700"
-                android.support.design:tabSelectedTextColor="?android:attr/textColorPrimary"
-                android.support.design:tabIndicatorColor="?android:attr/textColorPrimary"
-                android.support.design:tabMode="scrollable" />
+                android.support.design:tabMode="scrollable"
+                android.support.design:tabIndicatorColor="?attr/tabIndicatorColor"
+                android:theme="@style/PrivacyBrowserTabLayoutDark" />
         </android.support.design.widget.AppBarLayout>
 
-        <!-- android:layout_weight="1" makes about_viewpager fill the rest of the screen. -->
+        <!-- `android:layout_weight="1"` makes `about_viewpager` fill the rest of the screen. -->
         <android.support.v4.view.ViewPager
             android:id="@+id/about_viewpager"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/about_coordinatorlayout_light.xml b/app/src/main/res/layout/about_coordinatorlayout_light.xml
index ce665c15..0038ed16 100644
--- a/app/src/main/res/layout/about_coordinatorlayout_light.xml
+++ b/app/src/main/res/layout/about_coordinatorlayout_light.xml
@@ -28,19 +28,20 @@
     android:layout_width="match_parent"
     android:fitsSystemWindows="true" >
 
-    <!-- the LinearLayout with orientation="vertical" moves the ViewPager below the AppBarLayout. -->
+    <!-- The `LinearLayout` with `orientation="vertical"` moves the `ViewPager` below the `AppBarLayout`. -->
     <LinearLayout
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:orientation="vertical" >
 
-        <!-- We need to set android:background="@color/blue_700" here or any space to the right of the TabLayout on large devices will be white. -->
+        <!-- We need to set `android:background="?attr/colorPrimaryDark"` here or any space to the right of the `TabLayout` on large devices will be white. -->
         <android.support.design.widget.AppBarLayout
             android:id="@+id/about_appbarlayout"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent" >
+            android:layout_width="match_parent"
+            android:background="?attr/colorPrimaryDark" >
 
-            <!-- android:theme="@style/PrivacyBrowser.AppBarDark" makes the text and icons in the AppBar white. -->
+            <!-- `android:theme="@style/PrivacyBrowserAppBarWhiteText"` makes the text and icons in the `AppBar` white. -->
             <android.support.v7.widget.Toolbar
                 android:id="@+id/about_toolbar"
                 android:layout_height="wrap_content"
@@ -48,19 +49,18 @@
                 android:background="?attr/colorPrimaryDark"
                 android:theme="@style/PrivacyBrowserAppBarWhiteText" />
 
+            <!-- For some reason `tabIndicatorColor` does not pull from the style unless specified explicitly here. -->
             <android.support.design.widget.TabLayout
                 android:id="@+id/about_tablayout"
                 xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android.support.design:tabBackground="?attr/colorPrimaryDark"
-                android.support.design:tabTextColor="@color/blue_100"
-                android.support.design:tabSelectedTextColor="@color/white"
-                android.support.design:tabIndicatorColor="@color/white"
-                android.support.design:tabMode="scrollable" />
+                android.support.design:tabMode="scrollable"
+                android.support.design:tabIndicatorColor="?attr/tabIndicatorColor"
+                android:theme="@style/PrivacyBrowserTabLayoutLight" />
         </android.support.design.widget.AppBarLayout>
 
-        <!-- android:layout_weight="1" makes about_viewpager fill the rest of the screen. -->
+        <!-- `android:layout_weight="1"` makes `about_viewpager` fill the rest of the screen. -->
         <android.support.v4.view.ViewPager
             android:id="@+id/about_viewpager"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/guide_coordinatorlayout_dark.xml b/app/src/main/res/layout/guide_coordinatorlayout_dark.xml
new file mode 100644
index 00000000..2bb50ad4
--- /dev/null
+++ b/app/src/main/res/layout/guide_coordinatorlayout_dark.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<!-- android:fitsSystemWindows="true" moves the AppBar below the status bar.
+  When it is specified the theme should include <item name="android:windowTranslucentStatus">true</item>
+  to make the status bar a transparent, darkened overlay. -->
+<android.support.design.widget.CoordinatorLayout
+    android:id="@+id/guide_coordinatorlayout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" >
+
+    <!-- The `LinearLayout` with `orientation="vertical"` moves the `ViewPager` below the `AppBarLayout`. -->
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:orientation="vertical" >
+
+        <!-- We need to set `android:background="?attr/colorPrimaryDark"` here or any space to the right of the `TabLayout` on large devices will be black. -->
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/guide_appbarlayout"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:background="?attr/colorPrimaryDark" >
+
+            <!-- `android:theme="@style/PrivacyBrowserAppBarDark"` makes the text and icons in the `AppBar` gray. -->
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/guide_toolbar"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:background="?attr/colorPrimaryDark"
+                android:theme="@style/PrivacyBrowserAppBarDark" />
+
+            <!-- For some reason `tabIndicatorColor` does not pull from the style unless specified explicitly here. -->
+            <android.support.design.widget.TabLayout
+                android:id="@+id/guide_tablayout"
+                xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android.support.design:tabMode="scrollable"
+                android.support.design:tabIndicatorColor="?attr/tabIndicatorColor"
+                android:theme="@style/PrivacyBrowserTabLayoutDark" />
+        </android.support.design.widget.AppBarLayout>
+
+        <!-- `android:layout_weight="1"` makes `about_viewpager` fill the rest of the screen. -->
+        <android.support.v4.view.ViewPager
+            android:id="@+id/guide_viewpager"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+    </LinearLayout>
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/guide_coordinatorlayout.xml b/app/src/main/res/layout/guide_coordinatorlayout_light.xml
similarity index 70%
rename from app/src/main/res/layout/guide_coordinatorlayout.xml
rename to app/src/main/res/layout/guide_coordinatorlayout_light.xml
index 233da963..506985db 100644
--- a/app/src/main/res/layout/guide_coordinatorlayout.xml
+++ b/app/src/main/res/layout/guide_coordinatorlayout_light.xml
@@ -24,47 +24,43 @@
 <android.support.design.widget.CoordinatorLayout
     android:id="@+id/guide_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:fitsSystemWindows="true" >
 
-    <!-- the LinearLayout with orientation="vertical" moves the ViewPager below the AppBarLayout. -->
+    <!-- The `LinearLayout` with `orientation="vertical"` moves the `ViewPager` below the `AppBarLayout`. -->
     <LinearLayout
-        android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_width="match_parent"
         android:orientation="vertical" >
 
-        <!-- We need to set android:background="@color/blue_700" here or any space to the right of the TabLayout on large devices will be white. -->
+        <!-- We need to set `android:background="?attr/colorPrimaryDark"` here or any space to the right of the `TabLayout` on large devices will be white. -->
         <android.support.design.widget.AppBarLayout
             android:id="@+id/guide_appbarlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:background="@color/blue_700"
-            android:theme="@style/PrivacyBrowserAppBarLight" >
+            android:background="?attr/colorPrimaryDark" >
 
-            <!-- android:theme="@style/PrivacyBrowser.DarkAppBar" makes the text and icons in the AppBar white. -->
+            <!-- `android:theme="@style/PrivacyBrowserAppBarWhiteText"` makes the text and icons in the `AppBar` white. -->
             <android.support.v7.widget.Toolbar
                 android:id="@+id/guide_toolbar"
-                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/blue_700"
-                android:theme="@style/PrivacyBrowserAppBarWhiteText"
-                app:popupTheme="@style/PrivacyBrowserPopupsLight" />
+                android:layout_width="match_parent"
+                android:background="?attr/colorPrimaryDark"
+                android:theme="@style/PrivacyBrowserAppBarWhiteText" />
 
+            <!-- For some reason `tabIndicatorColor` does not pull from the style unless specified explicitly here. -->
             <android.support.design.widget.TabLayout
                 android:id="@+id/guide_tablayout"
                 xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android.support.design:tabBackground="@color/blue_700"
-                android.support.design:tabTextColor="@color/blue_100"
-                android.support.design:tabSelectedTextColor="@color/white"
-                android.support.design:tabIndicatorColor="@color/white"
-                android.support.design:tabMode="scrollable" />
+                android.support.design:tabMode="scrollable"
+                android.support.design:tabIndicatorColor="?attr/tabIndicatorColor"
+                android:theme="@style/PrivacyBrowserTabLayoutLight" />
         </android.support.design.widget.AppBarLayout>
 
-        <!-- android:layout_weight="1" makes about_viewpager fill the rest of the screen. -->
+        <!-- `android:layout_weight="1"` makes `about_viewpager` fill the rest of the screen. -->
         <android.support.v4.view.ViewPager
             android:id="@+id/guide_viewpager"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/guide_tab_webview.xml b/app/src/main/res/layout/guide_tab_webview.xml
deleted file mode 100644
index e5447fb9..00000000
--- a/app/src/main/res/layout/guide_tab_webview.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
-
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
-
-  Privacy Browser is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Privacy Browser is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
-
-<!-- This WebView displays inside of the tabs in Guide. -->
-<WebView
-    android:id="@+id/guide_tab_webview"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ec44da43..e454aaad 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -50,6 +50,9 @@
     <color name="gray_300">#FFE0E0E0</color>
     <color name="gray_400">#FFBDBDBD</color>
     <color name="gray_500">#FF9E9E9E</color>
+    <color name="gray_600">#FF757575</color>
+    <color name="gray_700">#FF616161</color>
+    <color name="gray_800">#FF424242</color>
     <color name="gray_900">#FF212121</color>
 
     <color name="green_50">#FFE8F5E9</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5e76c6e4..b9706c69 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -55,6 +55,13 @@
     <!-- `ThemeOverlay.AppCompat.Light` makes the popups have a light background with dark text. -->
     <style name="PrivacyBrowserPopupsLight" parent="ThemeOverlay.AppCompat.Light" />
 
+    <!-- Configure the About and Guide `TabLayouts`. -->
+    <style name="PrivacyBrowserTabLayoutLight" parent="Widget.Design.TabLayout" >
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/blue_100</item>
+        <item name="tabIndicatorColor">@color/white</item>
+    </style>
+
     <style name="LightAlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert" >
         <item name="colorAccent">@color/blue_700</item>
     </style>
@@ -79,6 +86,13 @@
         <item name="android:textColorPrimary">@color/gray_300</item>
     </style>
 
+    <!-- Configure the About and Guide `TabLayouts`. -->
+    <style name="PrivacyBrowserTabLayoutDark" parent="Widget.Design.TabLayout" >
+        <item name="tabBackground">@color/blue_900</item>
+        <item name="android:textColorSecondary">@color/blue_700</item>
+        <item name="tabIndicatorColor">@color/gray_300</item>
+    </style>
+
     <!-- `ThemeOverlay.AppCompat.Dark` makes the popups have a dark background with light text. -->
     <!-- <style name="PrivacyBrowserPopupOverlayDark" parent="ThemeOverlay.AppCompat.Dark" /> -->
 
-- 
2.45.2