From: Soren Stoutner <soren@stoutner.com>
Date: Sat, 11 Mar 2017 22:41:00 +0000 (-0700)
Subject: Add icons to `DomainSettingsFragment`.
X-Git-Tag: v2.0~6
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=30199e211f320d781774a8cfa683317c71635871;p=PrivacyBrowserAndroid.git

Add icons to `DomainSettingsFragment`.
---

diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml
index 84598132..4833f591 100644
--- a/.idea/dictionaries/soren.xml
+++ b/.idea/dictionaries/soren.xml
@@ -23,6 +23,7 @@
       <w>cname</w>
       <w>commitdiff</w>
       <w>coordinatorlayout</w>
+      <w>customuseragent</w>
       <w>didn</w>
       <w>displayorder</w>
       <w>dname</w>
@@ -32,12 +33,18 @@
       <w>dwallach</w>
       <w>eadd</w>
       <w>edittext</w>
+      <w>enabledomstorage</w>
+      <w>enablefirstpartycookies</w>
+      <w>enableformdata</w>
+      <w>enablejavascript</w>
+      <w>enablethirdpartycookies</w>
       <w>exynos</w>
       <w>favoriteicon</w>
       <w>fbee</w>
       <w>fdfilter</w>
       <w>fdid</w>
       <w>firebase</w>
+      <w>fontsize</w>
       <w>framelayout</w>
       <w>gerlach</w>
       <w>intl</w>
@@ -86,6 +93,9 @@
       <w>torproject</w>
       <w>uids</w>
       <w>uname</w>
+      <w>useragent</w>
+      <w>useragentname</w>
+      <w>useragentstring</w>
       <w>webkay</w>
       <w>webkitversion</w>
       <w>whatismyip</w>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 429fa66e..2d572fa7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -129,7 +129,8 @@
 
         <!-- `android:configChanges="orientation|screenSize"` makes the activity not reload when the orientation changes.
             `android:persistableMode="persistNever"` removes Privacy Browser from the recents screen on a device reboot.
-            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21. -->
+            `tools:ignore="unusedAttribute"` removes the lint warning that `persistableMode` does not apply to API < 21.
+             `android:windowSoftInputMode="stateAlwaysHidden"` removes the keyboard from the screen, which is displayed because `ScrollViews` always focus the first `EditText` despite being told not to. -->
         <activity
             android:name=".activities.DomainSettingsActivity"
             android:label="@string/domain_settings"
@@ -137,6 +138,7 @@
             android:parentActivityName=".activities.DomainsActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="fullUser"
+            android:windowSoftInputMode="stateAlwaysHidden"
             android:persistableMode="persistNever"
             tools:ignore="UnusedAttribute" />
 
diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html
index ecbb9b5d..dab96de5 100644
--- a/app/src/main/assets/de/about_licenses.html
+++ b/app/src/main/assets/de/about_licenses.html
@@ -65,6 +65,7 @@
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
+        <p><img class="icon" src="../en/images/ic_devices_other.png"> ic_devices_other.</p>
         <p><img class="icon" src="../en/images/ic_delete.png"> ic_download.</p>
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_edit.png"> ic_edit.</p>
@@ -84,6 +85,7 @@
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
+        <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
         <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html
index 45d31095..290ef38f 100644
--- a/app/src/main/assets/en/about_licenses.html
+++ b/app/src/main/assets/en/about_licenses.html
@@ -63,6 +63,7 @@
         <p><img class="icon" src="images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="images/ic_create_new_folder.png"> ic_create_new_folder.</p>
+        <p><img class="icon" src="images/ic_devices_other.png"> ic_devices_other.</p>
         <p><img class="icon" src="images/ic_delete.png"> ic_download.</p>
         <p><img class="icon" src="images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="images/ic_edit.png"> ic_edit.</p>
@@ -82,6 +83,7 @@
         <p><img class="icon" src="images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="images/ic_subtitles.png"> ic_subtitles.</p>
+        <p><img class="icon" src="images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
         <p><img class="icon" src="images/ic_web.png"> ic_web.</p>
diff --git a/app/src/main/assets/en/images/ic_devices_other.png b/app/src/main/assets/en/images/ic_devices_other.png
new file mode 100644
index 00000000..dcf7e12e
Binary files /dev/null and b/app/src/main/assets/en/images/ic_devices_other.png differ
diff --git a/app/src/main/assets/en/images/ic_text_fields.png b/app/src/main/assets/en/images/ic_text_fields.png
new file mode 100644
index 00000000..de558366
Binary files /dev/null and b/app/src/main/assets/en/images/ic_text_fields.png differ
diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html
index 8cc49e4d..0ffc6ab8 100644
--- a/app/src/main/assets/es/about_licenses.html
+++ b/app/src/main/assets/es/about_licenses.html
@@ -63,6 +63,7 @@
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
+        <p><img class="icon" src="../en/images/ic_devices_other.png"> ic_devices_other.</p>
         <p><img class="icon" src="../en/images/ic_delete.png"> ic_download.</p>
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_edit.png"> ic_edit.</p>
@@ -82,6 +83,7 @@
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
+        <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
         <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
diff --git a/app/src/main/assets/it/about_licenses.html b/app/src/main/assets/it/about_licenses.html
index 60b4a600..43b94350 100644
--- a/app/src/main/assets/it/about_licenses.html
+++ b/app/src/main/assets/it/about_licenses.html
@@ -69,6 +69,7 @@
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close.png"> ic_close.</p>
         <p><img class="icon" src="../en/images/ic_create_new_folder.png"> ic_create_new_folder.</p>
+        <p><img class="icon" src="../en/images/ic_devices_other.png"> ic_devices_other.</p>
         <p><img class="icon" src="../en/images/ic_delete.png"> ic_download.</p>
         <p><img class="icon" src="../en/images/ic_dns.png"> ic_dns.</p>
         <p><img class="icon" src="../en/images/ic_edit.png"> ic_edit.</p>
@@ -88,6 +89,7 @@
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
+        <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
         <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java
index ae3afa96..eba5f321 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainSettingsActivity.java
@@ -46,8 +46,8 @@ public class DomainSettingsActivity extends AppCompatActivity {
         // Get the intent that started the activity.
         final Intent launchingIntent = getIntent();
 
-        // Extract the `databaseID`.  The default value is `0`.
-        int databaseId = launchingIntent.getIntExtra(DomainSettingsFragment.DATABASE_ID, 0);
+        // Extract the `databaseID`.  The default value is `1`.
+        int databaseId = launchingIntent.getIntExtra(DomainSettingsFragment.DATABASE_ID, 1);
 
         // Store `databaseId` in `argumentsBundle`.
         Bundle argumentsBundle = new Bundle();
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java
index 0cc4d506..7cbe8d05 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/DomainsActivity.java
@@ -67,7 +67,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo
         domainsDatabaseHelper = new DomainsDatabaseHelper(this, null, null, 0);
 
         // Determine if we are in two pane mode.  `domains_settings_linearlayout` is only populated if two panes are present.
-        final boolean twoPaneMode = ((findViewById(R.id.domain_settings_linearlayout)) != null);
+        final boolean twoPaneMode = ((findViewById(R.id.domain_settings_scrollview)) != null);
 
         // Initialize `domainsListView`.
         domainsListView = (ListView) findViewById(R.id.domains_listview);
@@ -80,9 +80,6 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo
 
                 // Display the Domain Settings.
                 if (twoPaneMode) {  // Display a fragment in two paned mode.
-                    // Highlight the selected domain.
-                    domainsListView.setItemChecked(position, true);
-
                     // Store `databaseId` in `argumentsBundle`.
                     Bundle argumentsBundle = new Bundle();
                     argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, databaseId);
@@ -92,7 +89,7 @@ public class DomainsActivity extends AppCompatActivity implements AddDomainDialo
                     domainSettingsFragment.setArguments(argumentsBundle);
 
                     // Display `domainSettingsFragment`.
-                    getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_linearlayout, domainSettingsFragment).commit();
+                    getSupportFragmentManager().beginTransaction().replace(R.id.domain_settings_scrollview, domainSettingsFragment).commit();
                 } else { // Load the second activity on smaller screens.
                     // Get a handle for the context.
                     Context context = view.getContext();
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
index b3e9e5a4..fec8d70c 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/AboutTabFragment.java
@@ -37,7 +37,7 @@ import com.stoutner.privacybrowser.R;
 public class AboutTabFragment extends Fragment {
     private int tabNumber;
 
-    // AboutTabFragment.createTab stores the tab number in the bundle arguments so it can be referenced from onCreate().
+    // `AboutTabFragment.createTab` stores the tab number in the bundle arguments so it can be referenced from `onCreate()`.
     public static AboutTabFragment createTab(int tab) {
         Bundle thisTabArguments = new Bundle();
         thisTabArguments.putInt("Tab", tab);
@@ -51,7 +51,7 @@ public class AboutTabFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // Store the tab number in tabNumber.
+        // Store the tab number in `tabNumber`.
         tabNumber = getArguments().getInt("Tab");
     }
 
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
index 3e28fc7f..a6214174 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainSettingsFragment.java
@@ -19,6 +19,7 @@
 
 package com.stoutner.privacybrowser.fragments;
 
+import android.content.Context;
 import android.database.Cursor;
 import android.os.Bundle;
 // We have to use `android.support.v4.app.Fragment` until minimum API >= 23.  Otherwise we cannot call `getContext()`.
@@ -26,7 +27,9 @@ import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.EditText;
+import android.widget.Spinner;
 
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.helpers.DomainsDatabaseHelper;
@@ -51,6 +54,14 @@ public class DomainSettingsFragment extends Fragment {
         // Inflate `domain_settings`.  `false` does not attach it to the root `container`.
         View domainSettingsView = inflater.inflate(R.layout.domain_settings, container, false);
 
+        // Get a handle for the `Context`.
+        Context context = getContext();
+
+        // Get handles for the views in the fragment.
+        EditText domainNameEditText = (EditText) domainSettingsView.findViewById(R.id.domain_settings_name_edittext);
+        Spinner userAgentSpinner = (Spinner) domainSettingsView.findViewById(R.id.domain_settings_user_agent_spinner);
+        Spinner fontSizeSpinner = (Spinner) domainSettingsView.findViewById(R.id.domain_settings_font_size_spinner);
+
         // Initialize the database handler.  `this` specifies the context.  The two `nulls` do not specify the database name or a `CursorFactory`.
         // The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`.
         DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(getContext(), null, null, 0);
@@ -59,11 +70,34 @@ public class DomainSettingsFragment extends Fragment {
         Cursor domainCursor = domainsDatabaseHelper.getCursorForId(databaseId);
         domainCursor.moveToFirst();
 
-        // Get handles for the `EditTexts`.
-        EditText domainNameEditText = (EditText) domainSettingsView.findViewById(R.id.domain_settings_name_edittext);
+        // Save the `Cursor` entries as variables.
+        String domainNameString = domainCursor.getString(domainCursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN));
+        int fontSizeInt = domainCursor.getInt(domainCursor.getColumnIndex(DomainsDatabaseHelper.FONT_SIZE));
+
+        // Create `ArrayAdapters` for the `Spinners`and their `entry values`.
+        ArrayAdapter<CharSequence> userAgentArrayAdapter = ArrayAdapter.createFromResource(context, R.array.user_agent_entries, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> userAgentEntryValuesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.user_agent_entry_values, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> fontSizeArrayAdapter = ArrayAdapter.createFromResource(context, R.array.default_font_size_entries, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> fontSizeEntryValuesArrayAdapter = ArrayAdapter.createFromResource(context, R.array.default_font_size_entry_values, android.R.layout.simple_spinner_item);
+
+        // Set the drop down style for the `ArrayAdapters`.
+        userAgentArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        fontSizeArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+        // Set the `ArrayAdapters` for the `Spinners`.
+        userAgentSpinner.setAdapter(userAgentArrayAdapter);
+        fontSizeSpinner.setAdapter(fontSizeArrayAdapter);
+
+        //
+        // int userAgentArrayPosition =
+
+        // Set the selected font size.
+        int fontSizeArrayPosition = fontSizeEntryValuesArrayAdapter.getPosition(String.valueOf(fontSizeInt));
+        fontSizeSpinner.setSelection(fontSizeArrayPosition);
+
 
         // Set the text from the database cursor.
-        domainNameEditText.setText(domainCursor.getString(domainCursor.getColumnIndex(DomainsDatabaseHelper.DOMAIN)));
+        domainNameEditText.setText(domainNameString);
 
         return domainSettingsView;
     }
diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java
index 1a5c066b..5e792678 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.java
@@ -32,7 +32,16 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper {
     private static final String _ID = "_id";
 
     public static final String DOMAIN = "domain";
+    public static final String FONT_SIZE = "fontsize";
 
+    private static final String ENABLE_JAVASCRIPT = "enablejavascript";
+    private static final String ENABLE_FIRST_PARTY_COOKIES = "enablefirstpartycookies";
+    private static final String ENABLE_THIRD_PARTY_COOKIES = "enablethirdpartycookies";
+    private static final String ENABLE_DOM_STORAGE = "enabledomstorage";
+    private static final String ENABLE_FORM_DATA = "enableformdata";
+    private static final String USER_AGENT_NAME = "useragentname";
+    private static final String USER_AGENT_STRING = "useragentstring";
+    private static final String CUSTOM_USER_AGENT_STRING = "customuseragent";
 
     // Initialize the database.  The lint warnings for the unused parameters are suppressed.
     public DomainsDatabaseHelper(Context context, @SuppressWarnings("UnusedParameters") String name, SQLiteDatabase.CursorFactory cursorFactory, @SuppressWarnings("UnusedParameters") int version) {
@@ -44,7 +53,16 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper {
         // Setup the SQL string to create the `domains` table.
         final String CREATE_DOMAINS_TABLE = "CREATE TABLE " + DOMAINS_TABLE + " (" +
                 _ID + " integer primary key, " +
-                DOMAIN + " text);";
+                DOMAIN + " text, " +
+                ENABLE_JAVASCRIPT + " boolean, " +
+                ENABLE_FIRST_PARTY_COOKIES + " boolean, " +
+                ENABLE_THIRD_PARTY_COOKIES + " boolean, " +
+                ENABLE_DOM_STORAGE + " boolean, " +
+                ENABLE_FORM_DATA + " boolean, " +
+                USER_AGENT_NAME + " text, " +
+                USER_AGENT_STRING + " text, " +
+                CUSTOM_USER_AGENT_STRING + " text, " +
+                FONT_SIZE + " integer);";
 
         // Create the `domains` table if it doesn't exist.
         domainsDatabase.execSQL(CREATE_DOMAINS_TABLE);
@@ -83,8 +101,17 @@ public class DomainsDatabaseHelper extends SQLiteOpenHelper {
         // We need to store the domain data in a `ContentValues`.
         ContentValues domainContentValues = new ContentValues();
 
-        // ID is created automatically.
+        // Create entries for each field in the database.  The ID is created automatically.
         domainContentValues.put(DOMAIN, domainName);
+        domainContentValues.put(ENABLE_JAVASCRIPT, false);
+        domainContentValues.put(ENABLE_FIRST_PARTY_COOKIES, false);
+        domainContentValues.put(ENABLE_THIRD_PARTY_COOKIES, false);
+        domainContentValues.put(ENABLE_DOM_STORAGE, false);
+        domainContentValues.put(ENABLE_FORM_DATA, false);
+        domainContentValues.put(USER_AGENT_NAME, "Privacy Browser 1.0");
+        domainContentValues.put(USER_AGENT_STRING, "PrivacyBrowser/1.0");
+        domainContentValues.put(CUSTOM_USER_AGENT_STRING, "PrivacyBrowser/1.0");
+        domainContentValues.put(FONT_SIZE, "100");
 
         // Get a writable database handle.
         SQLiteDatabase domainsDatabase = this.getWritableDatabase();
diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml
index 20532efd..1057e2c4 100644
--- a/app/src/main/res/drawable/about.xml
+++ b/app/src/main/res/drawable/about.xml
@@ -1,4 +1,4 @@
-<!-- about.xml comes from the Android Material icon set, where it is called ic_info_outline.  It is released under the Apache License 2.0. -->
+<!-- `about.xml` comes from the Android Material icon set, where it is called `ic_info_outline`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml
index dbcd5efb..e49e3354 100644
--- a/app/src/main/res/drawable/add.xml
+++ b/app/src/main/res/drawable/add.xml
@@ -1,5 +1,4 @@
-<!-- add.xml comes from the Android Material icon set, where it is called ic_add.
-    It is released under the Apache License 2.0. -->
+<!-- `add.xml` comes from the Android Material icon set, where it is called `ic_add`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/back.xml b/app/src/main/res/drawable/back.xml
index fcba5091..0c007ff5 100644
--- a/app/src/main/res/drawable/back.xml
+++ b/app/src/main/res/drawable/back.xml
@@ -1,5 +1,4 @@
-<!-- back.xml comes from the Android Material icon set, where it is called ic_arrow_back.
-    It is released under the Apache License 2.0. -->
+<!-- `back.xml` comes from the Android Material icon set, where it is called `ic_arrow_back`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/bookmarks.xml b/app/src/main/res/drawable/bookmarks.xml
index 40d1c900..29b2648d 100644
--- a/app/src/main/res/drawable/bookmarks.xml
+++ b/app/src/main/res/drawable/bookmarks.xml
@@ -1,5 +1,4 @@
-<!-- bookmarks.xml comes from the Android Material icon set, where it is called ic_bookmark_border.
-    It is released under the Apache License 2.0. -->
+<!-- `bookmarks.xml` comes from the Android Material icon set, where it is called `ic_bookmark_border`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml
index 003e13bc..d6f6fcc8 100644
--- a/app/src/main/res/drawable/close.xml
+++ b/app/src/main/res/drawable/close.xml
@@ -1,5 +1,4 @@
-<!-- close.xml comes from the Android Material icon set, where it is called ic_close.
-    It is released under the Apache License 2.0. -->
+<!-- `close.xml` comes from the Android Material icon set, where it is called `ic_close`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/cookies_disabled.xml b/app/src/main/res/drawable/cookies_disabled.xml
index aa49aa04..b9b52ea3 100644
--- a/app/src/main/res/drawable/cookies_disabled.xml
+++ b/app/src/main/res/drawable/cookies_disabled.xml
@@ -1,5 +1,4 @@
-<!-- cookies_disabled.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie.
-    It is released under the Apache License 2.0. -->
+<!-- `cookies_disabled.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/cookies_enabled.xml b/app/src/main/res/drawable/cookies_enabled.xml
index 219f936c..7fef4cdf 100644
--- a/app/src/main/res/drawable/cookies_enabled.xml
+++ b/app/src/main/res/drawable/cookies_enabled.xml
@@ -1,5 +1,4 @@
-<!-- cookies_enabled.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie.
-    It is released under the Apache License 2.0. -->
+<!-- `cookies_enabled.xml` was created by Google and downloaded from <https://materialdesignicons.com/icon/cookie>.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/create_folder.xml b/app/src/main/res/drawable/create_folder.xml
index 77bed7ac..957a261c 100644
--- a/app/src/main/res/drawable/create_folder.xml
+++ b/app/src/main/res/drawable/create_folder.xml
@@ -1,5 +1,4 @@
-<!-- create_folder.xml comes from the Android Material icon set, where it is called ic_create_new_folder.
-    It is released under the Apache License 2.0. -->
+<!-- `create_folder.xml` comes from the Android Material icon set, where it is called `ic_create_new_folder`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml
index 2b74311a..15b276bd 100644
--- a/app/src/main/res/drawable/delete.xml
+++ b/app/src/main/res/drawable/delete.xml
@@ -1,5 +1,4 @@
-<!-- delete.xml comes from the Android Material icon set, where it is called ic_delete.
-    It is released under the Apache License 2.0. -->
+<!-- `delete.xml` comes from the Android Material icon set, where it is called `ic_delete`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/dom_storage_disabled.xml b/app/src/main/res/drawable/dom_storage_disabled.xml
index 0c1264cb..b6a8d83f 100644
--- a/app/src/main/res/drawable/dom_storage_disabled.xml
+++ b/app/src/main/res/drawable/dom_storage_disabled.xml
@@ -1,5 +1,4 @@
-<!-- dom_storage_disabled.xml comes from the Android Material icon set, where it is called ic_web.
-    It is released under the Apache License 2.0. -->
+<!-- `dom_storage_disabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/dom_storage_enabled.xml b/app/src/main/res/drawable/dom_storage_enabled.xml
index 66e3cd6e..5d8914e4 100644
--- a/app/src/main/res/drawable/dom_storage_enabled.xml
+++ b/app/src/main/res/drawable/dom_storage_enabled.xml
@@ -1,5 +1,4 @@
-<!-- dom_storage_enabled.xml comes from the Android Material icon set, where it is called ic_web.
-    It is released under the Apache License 2.0. -->
+<!-- `dom_storage_enabled.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/dom_storage_ghosted.xml b/app/src/main/res/drawable/dom_storage_ghosted.xml
index 85f411db..a0cc7557 100644
--- a/app/src/main/res/drawable/dom_storage_ghosted.xml
+++ b/app/src/main/res/drawable/dom_storage_ghosted.xml
@@ -1,5 +1,4 @@
-<!-- dom_storage_ghosted.xml comes from the Android Material icon set, where it is called ic_web.
-    It is released under the Apache License 2.0. -->
+<!-- `dom_storage_ghosted.xml` comes from the Android Material icon set, where it is called `ic_web`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/domains.xml b/app/src/main/res/drawable/domains.xml
index 01d336ca..5b09eb38 100644
--- a/app/src/main/res/drawable/domains.xml
+++ b/app/src/main/res/drawable/domains.xml
@@ -1,4 +1,4 @@
-<!-- domains.xml comes from the Android Material icon set, where it is called ic_import_contacts.  It is released under the Apache License 2.0. -->
+<!-- `domains.xml` comes from the Android Material icon set, where it is called `ic_import_contacts`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/downloads.xml b/app/src/main/res/drawable/downloads.xml
index 80fed0f3..9e493251 100644
--- a/app/src/main/res/drawable/downloads.xml
+++ b/app/src/main/res/drawable/downloads.xml
@@ -1,5 +1,4 @@
-<!-- downloads.xml comes from the Android Material icon set, where it is called ic_file_download.
-    It is released under the Apache License 2.0. -->
+<!-- `downloads.xml` comes from the Android Material icon set, where it is called `ic_file_download`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/edit.xml b/app/src/main/res/drawable/edit.xml
index 931ff660..48ebff80 100644
--- a/app/src/main/res/drawable/edit.xml
+++ b/app/src/main/res/drawable/edit.xml
@@ -1,5 +1,4 @@
-<!-- edit.xml comes from the Android Material icon set, where it is called ic_edit.
-    It is released under the Apache License 2.0. -->
+<!-- `edit.xml` comes from the Android Material icon set, where it is called `ic_edit`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/exit.xml b/app/src/main/res/drawable/exit.xml
index b8d6e676..71516f41 100644
--- a/app/src/main/res/drawable/exit.xml
+++ b/app/src/main/res/drawable/exit.xml
@@ -1,5 +1,4 @@
-<!-- exit.xml comes from the Android Material icon set, where it is called ic_exit_to_app.
-    It is released under the Apache License 2.0. -->
+<!-- `exit.xml` comes from the Android Material icon set, where it is called `ic_exit_to_app`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/folder_dark_blue.xml b/app/src/main/res/drawable/folder_dark_blue.xml
index 4f2284de..87036016 100644
--- a/app/src/main/res/drawable/folder_dark_blue.xml
+++ b/app/src/main/res/drawable/folder_dark_blue.xml
@@ -1,5 +1,4 @@
-<!-- folder_dark_blue.xml.xml comes from the Android Material icon set, where it is called ic_folder.
-    It is released under the Apache License 2.0. -->
+<!-- `folder_dark_blue.xml` comes from the Android Material icon set, where it is called `ic_folder`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/folder_gray.xml b/app/src/main/res/drawable/folder_gray.xml
index 60f059f8..1df998da 100644
--- a/app/src/main/res/drawable/folder_gray.xml
+++ b/app/src/main/res/drawable/folder_gray.xml
@@ -1,5 +1,4 @@
-<!-- folder_gray.xml comes from the Android Material icon set, where it is called ic_folder.
-    It is released under the Apache License 2.0. -->
+<!-- `folder_gray.xml` comes from the Android Material icon set, where it is called `ic_folder`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/font_size.xml b/app/src/main/res/drawable/font_size.xml
new file mode 100644
index 00000000..906a0dbc
--- /dev/null
+++ b/app/src/main/res/drawable/font_size.xml
@@ -0,0 +1,18 @@
+<!-- `font_size.xml` comes from the Android Material icon set, where it is called `ic_text_fields`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/form_data_disabled.xml b/app/src/main/res/drawable/form_data_disabled.xml
index b7226db6..7f44621f 100644
--- a/app/src/main/res/drawable/form_data_disabled.xml
+++ b/app/src/main/res/drawable/form_data_disabled.xml
@@ -1,5 +1,4 @@
-<!-- form_data_disabled.xml comes from the Android Material icon set, where it is called ic_subtitles.
-    It is released under the Apache License 2.0. -->
+<!-- `form_data_disabled.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml
index 45142524..7518407d 100644
--- a/app/src/main/res/drawable/form_data_enabled.xml
+++ b/app/src/main/res/drawable/form_data_enabled.xml
@@ -1,5 +1,4 @@
-<!-- form_data_enabled.xml comes from the Android Material icon set, where it is called ic_subtitles.
-    It is released under the Apache License 2.0. -->
+<!-- `form_data_enabled.xml` comes from the Android Material icon set, where it is called `ic_subtitles`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/forward.xml b/app/src/main/res/drawable/forward.xml
index b45f8ac8..5cdce49e 100644
--- a/app/src/main/res/drawable/forward.xml
+++ b/app/src/main/res/drawable/forward.xml
@@ -1,5 +1,4 @@
-<!-- forward.xml comes from the Android Material icon set, where it is called ic_arrow_forward.
-    It is released under the Apache License 2.0. -->
+<!-- `forward.xml` comes from the Android Material icon set, where it is called `ic_arrow_forward`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/guide.xml b/app/src/main/res/drawable/guide.xml
index ae237d81..b914018d 100644
--- a/app/src/main/res/drawable/guide.xml
+++ b/app/src/main/res/drawable/guide.xml
@@ -1,4 +1,4 @@
-<!-- guide.xml comes from the Android Material icon set, where it is called ic_import_contacts.  It is released under the Apache License 2.0. -->
+<!-- `guide.xml` comes from the Android Material icon set, where it is called `ic_import_contacts`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/history.xml b/app/src/main/res/drawable/history.xml
index 83e95cb4..f7eb1de7 100644
--- a/app/src/main/res/drawable/history.xml
+++ b/app/src/main/res/drawable/history.xml
@@ -1,5 +1,4 @@
-<!-- history.xml comes from the Android Material icon set, where it is called ic_list.
-    It is released under the Apache License 2.0. -->
+<!-- `history.xml` comes from the Android Material icon set, where it is called `ic_list`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/home.xml b/app/src/main/res/drawable/home.xml
index 300bffcf..6edf7a1e 100644
--- a/app/src/main/res/drawable/home.xml
+++ b/app/src/main/res/drawable/home.xml
@@ -1,5 +1,4 @@
-<!-- home.xml comes from the Android Material icon set, where it is called ic_home.
-    It is released under the Apache License 2.0. -->
+<!-- `home.xml` comes from the Android Material icon set, where it is called `ic_home`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml
index e02a9328..3af89ca6 100644
--- a/app/src/main/res/drawable/javascript_enabled.xml
+++ b/app/src/main/res/drawable/javascript_enabled.xml
@@ -1,6 +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 were made by Soren Stoutner <soren@stoutner.com> in 2016
-    and are released under the GPLv3+ license. -->
+<!-- `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 were made by Soren Stoutner <soren@stoutner.com> in 2016 and are released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
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 4e08350a..17be8698 100644
--- a/app/src/main/res/drawable/move_bookmark_down_disabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_down_disabled.xml
@@ -1,5 +1,4 @@
-<!-- move_bookmark_down_disabled.xml comes from the Android Material icon set, where it is called ic_vertical_align_bottom.
-    It is released under the Apache License 2.0. -->
+<!-- `move_bookmark_down_disabled.xml` comes from the Android Material icon set, where it is called `ic_vertical_align_bottom`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
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 a8199481..c8cfc24d 100644
--- a/app/src/main/res/drawable/move_bookmark_down_enabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_down_enabled.xml
@@ -1,5 +1,4 @@
-<!-- move_bookmark_down_enabled.xml comes from the Android Material icon set, where it is called ic_vertical_align_bottom.
-    It is released under the Apache License 2.0. -->
+<!-- `move_bookmark_down_enabled.xml` comes from the Android Material icon set, where it is called `ic_vertical_align_bottom`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
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 fb6a4573..b109d40c 100644
--- a/app/src/main/res/drawable/move_bookmark_up_disabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_up_disabled.xml
@@ -1,5 +1,4 @@
-<!-- move_bookmark_up_disabled.xml comes from the Android Material icon set, where it is called ic_vertical_align_top.
-    It is released under the Apache License 2.0. -->
+<!-- `move_bookmark_up_disabled.xml` comes from the Android Material icon set, where it is called `ic_vertical_align_top`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
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 d74ef364..eb22338d 100644
--- a/app/src/main/res/drawable/move_bookmark_up_enabled.xml
+++ b/app/src/main/res/drawable/move_bookmark_up_enabled.xml
@@ -1,5 +1,4 @@
-<!-- move_bookmark_up_enabled.xml comes from the Android Material icon set, where it is called ic_vertical_align_top.
-    It is released under the Apache License 2.0. -->
+<!-- `move_bookmark_up_enabled.xml` comes from the Android Material icon set, where it is called `ic_vertical_align_top`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/move_to_folder.xml b/app/src/main/res/drawable/move_to_folder.xml
index dd3c4ce6..14f3f448 100644
--- a/app/src/main/res/drawable/move_to_folder.xml
+++ b/app/src/main/res/drawable/move_to_folder.xml
@@ -1,5 +1,4 @@
-<!-- move_to_folder.xml comes from the Android Material icon set, where it is called ic_folder_special.
-    It is released under the Apache License 2.0. -->
+<!-- `move_to_folder.xml` comes from the Android Material icon set, where it is called `ic_folder_special`.  It is released under the Apache License 2.0. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
 <vector
diff --git a/app/src/main/res/drawable/next.xml b/app/src/main/res/drawable/next.xml
index 0ed52fca..4933c9d7 100644
--- a/app/src/main/res/drawable/next.xml
+++ b/app/src/main/res/drawable/next.xml
@@ -1,5 +1,4 @@
-<!-- next.xml comes from the Android Material icon set, where it is called ic_expand_more.
-    It is released under the Apache License 2.0. -->
+<!-- `next.xml` comes from the Android Material icon set, where it is called `ic_expand_more`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/previous.xml b/app/src/main/res/drawable/previous.xml
index 9908d7f4..2b0eb08f 100644
--- a/app/src/main/res/drawable/previous.xml
+++ b/app/src/main/res/drawable/previous.xml
@@ -1,5 +1,4 @@
-<!-- previous.xml comes from the Android Material icon set, where it is called ic_expand_less.
-    It is released under the Apache License 2.0. -->
+<!-- `previous.xml` comes from the Android Material icon set, where it is called `ic_expand_less`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/privacy_mode.xml b/app/src/main/res/drawable/privacy_mode.xml
index c1584f71..0f33a676 100644
--- a/app/src/main/res/drawable/privacy_mode.xml
+++ b/app/src/main/res/drawable/privacy_mode.xml
@@ -1,6 +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 were made by Soren Stoutner <soren@stoutner.com> in 2016.
-    and are released under the GPLv3+ license. -->
+<!-- `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 were made by Soren Stoutner <soren@stoutner.com> in 2016 and are released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/select_all.xml b/app/src/main/res/drawable/select_all.xml
index 95f60831..216677e3 100644
--- a/app/src/main/res/drawable/select_all.xml
+++ b/app/src/main/res/drawable/select_all.xml
@@ -1,5 +1,4 @@
-<!-- select_all.xml comes from the Android Material icon set, where it is called ic_select_all.
-    It is released under the Apache License 2.0. -->
+<!-- `select_all.xml` comes from the Android Material icon set, where it is called `ic_select_all`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml
index f267c6a4..3837ce86 100644
--- a/app/src/main/res/drawable/settings.xml
+++ b/app/src/main/res/drawable/settings.xml
@@ -1,5 +1,4 @@
-<!-- settings.xml comes from the Android Material icon set, where it is called ic_settings.
-    It is released under the Apache License 2.0. -->
+<!-- `settings.xml` comes from the Android Material icon set, where it is called `ic_settings`.  It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/user_agent.xml b/app/src/main/res/drawable/user_agent.xml
new file mode 100644
index 00000000..08b897e8
--- /dev/null
+++ b/app/src/main/res/drawable/user_agent.xml
@@ -0,0 +1,18 @@
+<!-- `move_to_folder.xml` comes from the Android Material icon set, where it is called `ic_folder_special`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true" not applying to API < 21. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:autoMirrored="true"
+    tools:ignore="VectorRaster" >
+
+    <!-- We have to use a hard coded color code until API >= 21.  Then we can use `@color`. -->
+    <path
+        android:fillColor="#FF000000"
+        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"/>
+</vector>
diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml
index 463aa30c..863c1262 100644
--- a/app/src/main/res/drawable/warning.xml
+++ b/app/src/main/res/drawable/warning.xml
@@ -1,6 +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 were made by Soren Stoutner <soren@stoutner.com> in 2016.
-        and are released under the GPLv3+ license. -->
+<!-- `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 were made by Soren Stoutner <soren@stoutner.com> in 2016 and are released under the GPLv3+ license. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-w900dp/domains_list.xml b/app/src/main/res/layout-w900dp/domains_list.xml
index 48428580..801d7ccc 100644
--- a/app/src/main/res/layout-w900dp/domains_list.xml
+++ b/app/src/main/res/layout-w900dp/domains_list.xml
@@ -36,15 +36,14 @@
         android:id="@+id/domains_listview"
         android:layout_height="match_parent"
         android:layout_width="0dp"
-        android:layout_weight="1"
+        android:layout_weight="2"
         android:choiceMode="singleChoice"
         android:divider="@color/white"
         android:dividerHeight="0dp" />
 
-    <LinearLayout
-        android:id="@+id/domain_settings_linearlayout"
+    <ScrollView
+        android:id="@+id/domain_settings_scrollview"
         android:layout_height="match_parent"
         android:layout_width="0dp"
-        android:layout_weight="3"
-        android:orientation="horizontal" />
+        android:layout_weight="3" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/domain_settings.xml b/app/src/main/res/layout/domain_settings.xml
index a71cd610..725041ea 100644
--- a/app/src/main/res/layout/domain_settings.xml
+++ b/app/src/main/res/layout/domain_settings.xml
@@ -18,37 +18,230 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:orientation="horizontal" >
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:descendantFocusability="beforeDescendants" >
 
-    <!-- Labels `LinearLayout`. -->
     <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:orientation="vertical" >
+        android:layout_width="match_parent"
+        android:layout_margin="12dp"
+        android:orientation="vertical"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle" >
 
-        <TextView
+        <!-- Domain name. -->
+        <LinearLayout
             android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:text="@string/domain_name"
-            android:labelFor="@+id/domain_settings_name_edittext"/>
-    </LinearLayout>
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
 
-    <!-- Data `LinearLayout`. -->
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:orientation="vertical" >
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginBottom="26dp"
+                android:layout_gravity="bottom"
+                android:src="@drawable/domains"
+                android:tint="@color/blue_800"
+                tools:ignore="contentDescription" />
+
+            <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+            <android.support.design.widget.TextInputLayout
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="6dp"
+                android:layout_marginBottom="14dp" >
 
-        <!-- `android:inputType="textUri"` disables spell check in the `EditText`. -->
-        <EditText
-            android:id="@id/domain_settings_name_edittext"
-            android:layout_width="wrap_content"
+                <!-- `android:inputType="textUri"` disables spell check in the `EditText`. -->
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/domain_settings_name_edittext"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/domain_name"
+                    android:inputType="textUri" />
+            </android.support.design.widget.TextInputLayout>
+        </LinearLayout>
+
+        <!-- JavaScript. -->
+        <LinearLayout
             android:layout_height="wrap_content"
-            android:inputType="textUri" />
-    </LinearLayout>
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/privacy_mode"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_javascript_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/javascript_enabled"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- First-Party Cookies. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/cookies_enabled"
+                android:tint="@color/blue_800"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_first_party_cookies_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/first_party_cookies_enabled"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- Third-Party Cookies. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/cookies_enabled"
+                android:tint="@color/blue_800"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_third_party_cookies_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/third_party_cookies_enabled"
+                android:textSize="18sp" />
+        </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+        <!-- DOM Storage. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/dom_storage_enabled"
+                android:tint="@color/blue_800"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_dom_storage_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/dom_storage_enabled"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- Form Data. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/form_data_enabled"
+                android:tint="@color/blue_800"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_form_data_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/form_data_enabled"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- User Agent. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/user_agent"
+                android:tint="@color/blue_800"
+                android:contentDescription="@string/user_agent" />
+
+            <Spinner
+                android:id="@+id/domain_settings_user_agent_spinner"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp" />
+        </LinearLayout>
+
+        <!-- Font Size. -->
+        <!-- We need to add an extra `android:layout_marginBottom="14dp"` to the last `LinearLayout` or the bottom of the `ScrollView` gets cutoff if API 25. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginBottom="14dp" >
+
+            <ImageView
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/font_size"
+                android:tint="@color/blue_800"
+                android:contentDescription="@string/font_size" />
+
+            <Spinner
+                android:id="@+id/domain_settings_font_size_spinner"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"/>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/url_app_bar.xml b/app/src/main/res/layout/url_app_bar.xml
index b2c7fb57..506e9c12 100644
--- a/app/src/main/res/layout/url_app_bar.xml
+++ b/app/src/main/res/layout/url_app_bar.xml
@@ -23,7 +23,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
-    android:layout_width="match_parent" >
+    android:layout_width="match_parent"
+    tools:context=".activities.MainWebViewActivity" >
 
     <!-- `RelativeLayout` is used instead of a `LinearLayout` because `supportAppBar` does not let `android:layout_weight="1"` cause `urlTextBox` to fill all the available space. -->
     <RelativeLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index efe7d613..9dbfc3bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,7 +188,7 @@
     <string name="domain_settings">Domain Settings</string>
     <string name="add_domain">Add Domain</string>
     <string name="add">Add</string>
-    <string name="domain_name">Domain Name</string>
+    <string name="domain_name">Domain name</string>
 
     <!-- Guide. -->
     <string name="privacy_browser_guide">Privacy Browser Guide</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4c8acdfd..ef87e8d0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,15 +24,19 @@
     <style name="PrivacyBrowser" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowTranslucentStatus">true</item>
         <item name="colorAccent">@color/blue_700</item>
+        <item name="android:textColorHighlight">@color/blue_200</item>
     </style>
 
     <!-- `colorPrimaryDark` goes behind the status bar, which is then darkened by the overlay.
         `windowActionModeOverlay` makes the contextual app bar cover the support app bar. -->
     <style name="PrivacyBrowser.SecondaryActivity">
         <item name="colorPrimaryDark">@color/blue_700</item>
+        <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/blue_700</item>
         <item name="actionBarPopupTheme">@style/LightPopupOverlay</item>
+        <item name="android:spinnerItemStyle">@style/spinnerItemStyle</item>
+        <item name="android:spinnerDropDownItemStyle">@style/spinnerDropDownItemStyle</item>
     </style>
 
     <!-- `colorPrimaryDark` is the color of the status bar. -->
@@ -53,4 +57,19 @@
     <style name="LightAlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert" >
         <item name="colorAccent">@color/blue_700</item>
     </style>
+
+    <style name="spinnerItemStyle" >
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="spinnerDropDownItemStyle" >
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textSize">18sp</item>
+    </style>
 </resources>
\ No newline at end of file