X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdomain_settings_fragment.xml;h=a519047839ac7a81a2369a8b3c4770ef1d723117;hb=fb1d23a702622f51fde491f8b868062603f4ccad;hp=ed2c1fb793685e3548a915283ed662dfb9aec735;hpb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
index ed2c1fb7..a5190478 100644
--- a/app/src/main/res/layout/domain_settings_fragment.xml
+++ b/app/src/main/res/layout/domain_settings_fragment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2023 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -20,18 +20,17 @@
 
 <ScrollView android:id="@+id/domain_settings_scrollview"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:descendantFocusability="beforeDescendants"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:descendantFocusability="beforeDescendants" >
 
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_margin="12dp"
         android:orientation="vertical"
         android:divider="?android:attr/dividerVertical" >
 
@@ -39,7 +38,10 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="vertical" >
+            android:orientation="vertical"
+            android:layout_marginTop="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp" >
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -52,8 +54,8 @@
                     android:layout_marginEnd="10dp"
                     android:layout_marginBottom="12dp"
                     android:layout_gravity="bottom"
-                    android:src="@drawable/domains_day"
-                    app:tint="?attr/domainSettingsIconTintColor"
+                    android:src="@drawable/domains"
+                    app:tint="@color/blue_icon"
                     tools:ignore="contentDescription" />
 
                 <!-- `TextInputLayout` makes the `android:hint` float above the `EditText`. -->
@@ -83,308 +85,498 @@
 
         <!-- JavaScript. -->
         <LinearLayout
+            android:id="@+id/javascript_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
 
-            <ImageView
-                android:id="@+id/javascript_imageview"
+            <TextView
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/javascript" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/javascript_switch"
+            <LinearLayout
                 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"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:text="@string/javascript" >
+
+                <ImageView
+                    android:id="@+id/javascript_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:contentDescription="@string/javascript" />
+
+                <Spinner
+                    android:id="@+id/javascript_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/javascript_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- Cookies. -->
         <LinearLayout
+            android:id="@+id/cookies_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/cookies" />
 
-            <ImageView
-                android:id="@+id/cookies_imageview"
+            <LinearLayout
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/cookies" >
+
+                <ImageView
+                    android:id="@+id/cookies_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/cookies_enabled"
+                    app:tint="@color/yellow_icon_selector"
+                    android:contentDescription="@string/cookies" />
+
+                <Spinner
+                    android:id="@+id/cookies_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/cookies_switch"
+            <TextView
+                android:id="@+id/cookies_textview"
                 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/cookies"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- DOM Storage. -->
         <LinearLayout
+            android:id="@+id/dom_storage_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
 
-            <ImageView
-                android:id="@+id/dom_storage_imageview"
+            <TextView
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/dom_storage" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/dom_storage_switch"
+            <LinearLayout
                 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_preference"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:text="@string/dom_storage" >
+
+                <ImageView
+                    android:id="@+id/dom_storage_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/dom_storage_enabled"
+                    app:tint="@color/yellow_icon_selector"
+                    android:contentDescription="@string/dom_storage" />
+
+                <Spinner
+                    android:id="@+id/dom_storage_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/dom_storage_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
-        <!-- Form Data. -->
+        <!-- Form Data. This may be removed one the minimum API >= 26. -->
         <LinearLayout
+            android:id="@+id/form_data_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
 
-            <ImageView
-                android:id="@+id/form_data_imageview"
+            <TextView
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/form_data" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/form_data_switch"
+            <LinearLayout
                 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"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/form_data_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/form_data_enabled"
+                    app:tint="@color/yellow_icon_selector"
+                    android:contentDescription="@string/form_data" />
+
+                <Spinner
+                    android:id="@+id/form_data_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/form_data_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- EasyList. -->
         <LinearLayout
+            android:id="@+id/easylist_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
 
-            <ImageView
-                android:id="@+id/easylist_imageview"
+            <TextView
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/easylist" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/easylist_switch"
+            <LinearLayout
                 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/easylist"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/easylist_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/block_ads_enabled"
+                    app:tint="@color/blue_icon_selector"
+                    android:contentDescription="@string/easylist" />
+
+                <Spinner
+                    android:id="@+id/easylist_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/easylist_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- EasyPrivacy. -->
         <LinearLayout
+            android:id="@+id/easyprivacy_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/easyprivacy" />
 
-            <ImageView
-                android:id="@+id/easyprivacy_imageview"
+            <LinearLayout
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/easyprivacy_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/block_tracking_enabled"
+                    app:tint="@color/blue_icon_selector"
+                    android:contentDescription="@string/easyprivacy" />
+
+                <Spinner
+                    android:id="@+id/easyprivacy_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/easyprivacy_switch"
+            <TextView
+                android:id="@+id/easyprivacy_textview"
                 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/easyprivacy"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- Fanboy's Annoyance List. -->
         <LinearLayout
+            android:id="@+id/fanboys_annoyance_list_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/fanboys_annoyance_list" />
 
-            <ImageView
-                android:id="@+id/fanboys_annoyance_list_imageview"
+            <LinearLayout
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/fanboys_annoyance_list_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/social_media_enabled"
+                    app:tint="@color/blue_icon_selector"
+                    android:contentDescription="@string/fanboys_annoyance_list" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/fanboys_annoyance_list_switch"
+                <Spinner
+                    android:id="@+id/fanboys_annoyance_list_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/fanboys_annoyance_list_textview"
                 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/fanboys_annoyance_list"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- Fanboy's Social Blocking List. -->
         <LinearLayout
+            android:id="@+id/fanboys_social_blocking_list_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
 
-            <ImageView
-                android:id="@+id/fanboys_social_blocking_list_imageview"
+            <TextView
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/fanboys_social_blocking_list" />
+
+            <LinearLayout
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/fanboys_social_blocking_list_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/social_media_enabled"
+                    app:tint="@color/blue_icon_selector"
+                    android:contentDescription="@string/fanboys_social_blocking_list" />
+
+                <Spinner
+                    android:id="@+id/fanboys_social_blocking_list_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/fanboys_social_blocking_list_switch"
+            <TextView
+                android:id="@+id/fanboys_social_blocking_list_textview"
                 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/fanboys_social_blocking_list"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- UltraList. -->
         <LinearLayout
+            android:id="@+id/ultralist_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
 
-            <ImageView
-                android:id="@+id/ultralist_imageview"
+            <TextView
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/ultralist" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/ultralist_switch"
+            <LinearLayout
                 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/ultralist"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/ultralist_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/block_ads_enabled"
+                    app:tint="@color/blue_icon_selector"
+                    android:contentDescription="@string/ultralist" />
+
+                <Spinner
+                    android:id="@+id/ultralist_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/ultralist_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- UltraPrivacy. -->
         <LinearLayout
+            android:id="@+id/ultraprivacy_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
 
-            <ImageView
-                android:id="@+id/ultraprivacy_imageview"
+            <TextView
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/ultraprivacy" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/ultraprivacy_switch"
+            <LinearLayout
                 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/ultraprivacy"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/ultraprivacy_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/block_tracking_enabled"
+                    app:tint="@color/blue_icon_selector"
+                    android:contentDescription="@string/ultraprivacy" />
+
+                <Spinner
+                    android:id="@+id/ultraprivacy_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/ultraprivacy_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- Block All Third Party Requests. -->
         <LinearLayout
+            android:id="@+id/block_all_third_party_requests_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="12dp" >
 
-            <ImageView
-                android:id="@+id/block_all_third_party_requests_imageview"
+            <TextView
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:layout_marginTop="1dp"
-                android:layout_marginEnd="10dp"
-                android:layout_gravity="center_vertical"
-                tools:ignore="contentDescription" />
+                android:layout_width="match_parent"
+                android:text="@string/block_all_third_party_requests" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/block_all_third_party_requests_switch"
+            <LinearLayout
                 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/block_all_third_party_requests"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="18sp" />
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:id="@+id/block_all_third_party_requests_imageview"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:layout_marginTop="1dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/block_all_third_party_requests_enabled"
+                    app:tint="@color/blue_icon_selector"
+                    android:contentDescription="@string/block_all_third_party_requests" />
+
+                <Spinner
+                    android:id="@+id/block_all_third_party_requests_spinner"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent" />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/block_all_third_party_requests_textview"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="45dp"
+                android:layout_marginEnd="36dp"
+                android:textSize="13sp" />
         </LinearLayout>
 
         <!-- User Agent. -->
         <LinearLayout
+            android:id="@+id/user_agent_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="14dp" >
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/user_agent" />
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -397,8 +589,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/user_agent_day"
-                    app:tint="?attr/domainSettingsIconTintColor"
+                    android:src="@drawable/user_agent"
+                    app:tint="@color/blue_icon"
                     android:contentDescription="@string/user_agent" />
 
                 <Spinner
@@ -409,7 +601,7 @@
 
             <TextView
                 android:id="@+id/user_agent_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -428,11 +620,16 @@
 
         <!-- Font Size. -->
         <LinearLayout
+            android:id="@+id/font_size_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="14dp" >
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/font_size" />
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -445,8 +642,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
-                    android:src="@drawable/font_size_day"
-                    app:tint="?attr/domainSettingsIconTintColor"
+                    android:src="@drawable/font_size"
+                    app:tint="@color/blue_icon"
                     android:contentDescription="@string/font_size" />
 
                 <Spinner
@@ -457,7 +654,7 @@
 
             <TextView
                 android:id="@+id/default_font_size_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -476,11 +673,17 @@
 
         <!-- Swipe to Refresh. -->
         <LinearLayout
+            android:id="@+id/swipe_to_refresh_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="14dp" >
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/swipe_to_refresh"
+                tools:ignore="TooManyViews" />
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -494,6 +697,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/refresh_enabled"
+                    app:tint="@color/blue_icon_selector"
                     android:contentDescription="@string/swipe_to_refresh" />
 
                 <Spinner
@@ -504,7 +709,7 @@
 
             <TextView
                 android:id="@+id/swipe_to_refresh_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -517,8 +722,12 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="14dp" >
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/webview_theme" />
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -532,6 +741,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/webview_light_theme"
+                    app:tint="@color/blue_icon_selector"
                     android:contentDescription="@string/webview_theme" />
 
                 <Spinner
@@ -542,7 +753,7 @@
 
             <TextView
                 android:id="@+id/webview_theme_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -551,11 +762,16 @@
 
         <!-- Wide Viewport. -->
         <LinearLayout
+            android:id="@+id/wide_viewport_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="14dp" >
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/wide_viewport" />
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -569,6 +785,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/wide_viewport_enabled"
+                    app:tint="@color/blue_icon_selector"
                     android:contentDescription="@string/wide_viewport" />
 
                 <Spinner
@@ -579,7 +797,7 @@
 
             <TextView
                 android:id="@+id/wide_viewport_textview"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -588,11 +806,16 @@
 
         <!-- Display Images. -->
         <LinearLayout
+            android:id="@+id/display_images_linearlayout"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="vertical"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="14dp" >
+            android:padding="12dp" >
+
+            <TextView
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="@string/display_images" />
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -600,23 +823,25 @@
                 android:orientation="horizontal" >
 
                 <ImageView
-                    android:id="@+id/display_webpage_images_imageview"
+                    android:id="@+id/display_images_imageview"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/images_enabled"
+                    app:tint="@color/blue_icon_selector"
                     android:contentDescription="@string/display_webpage_images" />
 
                 <Spinner
-                    android:id="@+id/display_webpage_images_spinner"
+                    android:id="@+id/display_images_spinner"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent" />
             </LinearLayout>
 
             <TextView
-                android:id="@+id/display_webpage_images_textview"
-                android:layout_height="match_parent"
+                android:id="@+id/display_images_textview"
+                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="45dp"
                 android:layout_marginEnd="36dp"
@@ -629,7 +854,9 @@
             android:layout_width="match_parent"
             android:orientation="vertical"
             android:layout_marginTop="18dp"
-            android:layout_marginBottom="18dp" >
+            android:layout_marginBottom="18dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp" >
 
             <!-- Switch -->
             <LinearLayout
@@ -644,6 +871,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/ssl_certificate"
+                    app:tint="@color/blue_icon_selector"
                     tools:ignore="contentDescription" />
 
                 <androidx.appcompat.widget.SwitchCompat
@@ -653,8 +882,7 @@
                     android:layout_marginStart="8dp"
                     android:text="@string/pinned_ssl_certificate"
                     android:textColor="?android:textColorPrimary"
-                    android:textSize="18sp"
-                    tools:ignore="TooManyViews" />
+                    android:textSize="18sp" />
             </LinearLayout>
 
             <!-- Saved Certificate -->
@@ -681,7 +909,8 @@
                         android:textSize="17sp"
                         android:textAllCaps="true"
                         android:textStyle="bold"
-                        android:textColor="?android:textColorPrimary" />
+                        android:textColor="?android:textColorPrimary"
+                        tools:ignore="TooManyViews" />
 
                     <LinearLayout
                         android:layout_height="wrap_content"
@@ -696,7 +925,7 @@
                             android:text="@string/issued_to"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor" />
+                            android:textColor="@color/blue_title_text" />
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_issued_to_cname"
@@ -721,7 +950,7 @@
                             android:text="@string/issued_by"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor"/>
+                            android:textColor="@color/blue_title_text"/>
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_issued_by_cname"
@@ -746,7 +975,7 @@
                             android:text="@string/valid_dates"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor"/>
+                            android:textColor="@color/blue_title_text"/>
 
                         <TextView
                             android:id="@+id/saved_ssl_certificate_start_date"
@@ -798,7 +1027,7 @@
                             android:text="@string/issued_to"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor" />
+                            android:textColor="@color/blue_title_text" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_issued_to_cname"
@@ -823,7 +1052,7 @@
                             android:text="@string/issued_by"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor" />
+                            android:textColor="@color/blue_title_text" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_issued_by_cname"
@@ -848,7 +1077,7 @@
                             android:text="@string/valid_dates"
                             android:textAllCaps="true"
                             android:textStyle="bold"
-                            android:textColor="?attr/blueTitleTextColor" />
+                            android:textColor="@color/blue_title_text" />
 
                         <TextView
                             android:id="@+id/current_website_certificate_start_date"
@@ -882,7 +1111,9 @@
             android:layout_width="match_parent"
             android:orientation="vertical"
             android:layout_marginTop="18dp"
-            android:layout_marginBottom="18dp" >
+            android:layout_marginBottom="18dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp" >
 
             <!-- Switch -->
             <LinearLayout
@@ -897,6 +1128,8 @@
                     android:layout_marginTop="1dp"
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
+                    android:src="@drawable/ssl_certificate"
+                    app:tint="@color/blue_icon_selector"
                     tools:ignore="contentDescription" />
 
                 <androidx.appcompat.widget.SwitchCompat
@@ -940,7 +1173,7 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         android:layout_marginStart="32dp"
-                        android:textColor="?attr/blueTextColor" />
+                        android:textColor="@color/blue_text" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
 
@@ -972,9 +1205,9 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         android:layout_marginStart="32dp"
-                        android:textColor="?attr/blueTextColor" />
+                        android:textColor="@color/blue_text" />
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>