From 5641898ccc58ebfb969ffcfcee76c00702051831 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 10 Apr 2024 11:41:33 -0700
Subject: [PATCH] Remove all the custom attr entries. 
 https://redmine.stoutner.com/issues/1189

---
 .../activities/ViewHeadersActivity.kt         |   2 +-
 ...ist_selector_day.xml => list_selector.xml} |   6 +-
 .../main/res/drawable/list_selector_night.xml |  26 --
 .../bookmarks_drawer_bottom_appbar.xml        |  10 +-
 .../bookmarks_drawer_top_appbar.xml           |  10 +-
 .../bookmarks_activity_item_linearlayout.xml  |   8 +-
 .../res/layout/bookmarks_bottom_appbar.xml    |  10 +-
 ...okmarks_databaseview_item_linearlayout.xml |   6 +-
 .../layout/bookmarks_drawer_bottom_appbar.xml |  10 +-
 .../layout/bookmarks_drawer_top_appbar.xml    |  10 +-
 .../main/res/layout/bookmarks_top_appbar.xml  |  10 +-
 .../res/layout/domain_name_linearlayout.xml   |   8 +-
 .../main/res/layout/domains_bottom_appbar.xml |   8 +-
 .../main/res/layout/domains_top_appbar.xml    |   8 +-
 .../layout/main_framelayout_bottom_appbar.xml |   2 +-
 .../layout/main_framelayout_top_appbar.xml    |   2 +-
 .../move_to_folder_item_linearlayout.xml      |   6 +-
 .../res/layout/view_headers_bottom_appbar.xml | 300 ++++++++---------
 .../res/layout/view_headers_top_appbar.xml    | 301 +++++++++---------
 .../webview_framelayout_bottom_appbar.xml     |   6 +-
 .../layout/webview_framelayout_top_appbar.xml |   6 +-
 app/src/main/res/values-night-v27/styles.xml  |   8 -
 app/src/main/res/values-night/colors.xml      |   6 +-
 app/src/main/res/values-night/styles.xml      |   8 -
 app/src/main/res/values-v27/styles.xml        |   8 -
 app/src/main/res/values/attrs.xml             |  33 --
 app/src/main/res/values/colors.xml            |   6 +-
 app/src/main/res/values/styles.xml            |   8 -
 28 files changed, 372 insertions(+), 460 deletions(-)
 rename app/src/main/res/drawable/{list_selector_day.xml => list_selector.xml} (85%)
 delete mode 100644 app/src/main/res/drawable/list_selector_night.xml
 delete mode 100644 app/src/main/res/values/attrs.xml

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt
index b18365a5..8a0cc653 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewHeadersActivity.kt
@@ -1,7 +1,7 @@
 /*
  * Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
  *
- * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+ * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
  *
  * Privacy Browser Android is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/res/drawable/list_selector_day.xml b/app/src/main/res/drawable/list_selector.xml
similarity index 85%
rename from app/src/main/res/drawable/list_selector_day.xml
rename to app/src/main/res/drawable/list_selector.xml
index 16547855..20629ba4 100644
--- a/app/src/main/res/drawable/list_selector_day.xml
+++ b/app/src/main/res/drawable/list_selector.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017,2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,5 +22,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_activated="true"
-        android:drawable="@color/blue_200" />
+        android:drawable="@color/list_selector_activated" />
 </selector>
diff --git a/app/src/main/res/drawable/list_selector_night.xml b/app/src/main/res/drawable/list_selector_night.xml
deleted file mode 100644
index 2c5059ec..00000000
--- a/app/src/main/res/drawable/list_selector_night.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2017,2020,2023 Soren Stoutner <soren@stoutner.com>.
-
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
-
-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
-
-<!-- This selector changes the background of activated items in a list view. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_activated="true"
-        android:drawable="@color/violet_700" />
-</selector>
diff --git a/app/src/main/res/layout-w900dp/bookmarks_drawer_bottom_appbar.xml b/app/src/main/res/layout-w900dp/bookmarks_drawer_bottom_appbar.xml
index fd756a30..952eab6e 100644
--- a/app/src/main/res/layout-w900dp/bookmarks_drawer_bottom_appbar.xml
+++ b/app/src/main/res/layout-w900dp/bookmarks_drawer_bottom_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017,2019-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2019-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -92,7 +92,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="200dp"
         android:src="@drawable/bookmarks"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -103,7 +103,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="130dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -114,6 +114,6 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="60dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
 </FrameLayout>
diff --git a/app/src/main/res/layout-w900dp/bookmarks_drawer_top_appbar.xml b/app/src/main/res/layout-w900dp/bookmarks_drawer_top_appbar.xml
index cda02c0a..5c104efa 100644
--- a/app/src/main/res/layout-w900dp/bookmarks_drawer_top_appbar.xml
+++ b/app/src/main/res/layout-w900dp/bookmarks_drawer_top_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017,2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2019-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -92,7 +92,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="155dp"
         android:src="@drawable/bookmarks"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -103,7 +103,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="85dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -113,6 +113,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/bookmarks_activity_item_linearlayout.xml b/app/src/main/res/layout/bookmarks_activity_item_linearlayout.xml
index 91d72724..5ca452b2 100644
--- a/app/src/main/res/layout/bookmarks_activity_item_linearlayout.xml
+++ b/app/src/main/res/layout/bookmarks_activity_item_linearlayout.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:background="?attr/listSelectorDrawable"
+    android:background="@drawable/list_selector"
     tools:ignore="UseCompoundDrawables" >
 
     <ImageView
@@ -46,4 +46,4 @@
         android:layout_margin="10dp"
         android:lines="1"
         android:ellipsize="end" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/bookmarks_bottom_appbar.xml b/app/src/main/res/layout/bookmarks_bottom_appbar.xml
index 37293566..2f54dafd 100644
--- a/app/src/main/res/layout/bookmarks_bottom_appbar.xml
+++ b/app/src/main/res/layout/bookmarks_bottom_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="140dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -77,6 +77,6 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="70dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml b/app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml
index 548b56bd..9a09da34 100644
--- a/app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml
+++ b/app/src/main/res/layout/bookmarks_databaseview_item_linearlayout.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2017,2019,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2019, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="vertical"
-    android:background="?attr/listSelectorDrawable" >
+    android:background="@drawable/list_selector" >
 
     <!-- First row. -->
     <LinearLayout
diff --git a/app/src/main/res/layout/bookmarks_drawer_bottom_appbar.xml b/app/src/main/res/layout/bookmarks_drawer_bottom_appbar.xml
index 3ec8e144..f6531e72 100644
--- a/app/src/main/res/layout/bookmarks_drawer_bottom_appbar.xml
+++ b/app/src/main/res/layout/bookmarks_drawer_bottom_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -91,7 +91,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="200dp"
         android:src="@drawable/bookmarks"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -102,7 +102,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="130dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -113,6 +113,6 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="60dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/bookmarks_drawer_top_appbar.xml b/app/src/main/res/layout/bookmarks_drawer_top_appbar.xml
index bea5b9d2..4f70475b 100644
--- a/app/src/main/res/layout/bookmarks_drawer_top_appbar.xml
+++ b/app/src/main/res/layout/bookmarks_drawer_top_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017-2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -91,7 +91,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="155dp"
         android:src="@drawable/bookmarks"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -102,7 +102,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="85dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -112,6 +112,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/bookmarks_top_appbar.xml b/app/src/main/res/layout/bookmarks_top_appbar.xml
index b87da014..9ba8a120 100644
--- a/app/src/main/res/layout/bookmarks_top_appbar.xml
+++ b/app/src/main/res/layout/bookmarks_top_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2016-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="85dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -73,6 +73,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/domain_name_linearlayout.xml b/app/src/main/res/layout/domain_name_linearlayout.xml
index 1317d281..a42fd086 100644
--- a/app/src/main/res/layout/domain_name_linearlayout.xml
+++ b/app/src/main/res/layout/domain_name_linearlayout.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017,2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:background="?attr/listSelectorDrawable" >
+    android:background="@drawable/list_selector" >
 
     <TextView
         android:id="@+id/domain_name_textview"
@@ -36,4 +36,4 @@
         android:layout_margin="10dp"
         android:lines="1"
         android:ellipsize="end" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/domains_bottom_appbar.xml b/app/src/main/res/layout/domains_bottom_appbar.xml
index c91af5db..7fc27db4 100644
--- a/app/src/main/res/layout/domains_bottom_appbar.xml
+++ b/app/src/main/res/layout/domains_bottom_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017,2019-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2019-2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -57,6 +57,6 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="70dp"
         android:src="@drawable/add"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/add_domain" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/domains_top_appbar.xml b/app/src/main/res/layout/domains_top_appbar.xml
index 1d62297f..101cfe36 100644
--- a/app/src/main/res/layout/domains_top_appbar.xml
+++ b/app/src/main/res/layout/domains_top_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017,2019-2020,2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017, 2019-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -54,6 +54,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/add"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/add_domain" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
index 497a823b..d11ae7cf 100644
--- a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
@@ -187,7 +187,7 @@
             android:layout_width="wrap_content"
             android:layout_gravity="start"
             app:menu="@menu/webview_navigation_menu_bottom_appbar"
-            app:itemIconTint="?attr/navigationIconTintColor" />
+            app:itemIconTint="@color/blue_icon" />
 
         <!-- Include the bookmarks drawer, which varies based on screen width. -->
         <include layout="@layout/bookmarks_drawer_bottom_appbar" />
diff --git a/app/src/main/res/layout/main_framelayout_top_appbar.xml b/app/src/main/res/layout/main_framelayout_top_appbar.xml
index 3b43be9d..ea289cd7 100644
--- a/app/src/main/res/layout/main_framelayout_top_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_top_appbar.xml
@@ -190,7 +190,7 @@
             android:layout_width="wrap_content"
             android:layout_gravity="start"
             app:menu="@menu/webview_navigation_menu_top_appbar"
-            app:itemIconTint="?attr/navigationIconTintColor" />
+            app:itemIconTint="@color/blue_icon" />
 
         <!-- Include the bookmarks drawer, which varies based on screen width. -->
         <include layout="@layout/bookmarks_drawer_top_appbar" />
diff --git a/app/src/main/res/layout/move_to_folder_item_linearlayout.xml b/app/src/main/res/layout/move_to_folder_item_linearlayout.xml
index 144b0ac2..76f041c6 100644
--- a/app/src/main/res/layout/move_to_folder_item_linearlayout.xml
+++ b/app/src/main/res/layout/move_to_folder_item_linearlayout.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="horizontal"
-    android:background="?attr/listSelectorDrawable"
+    android:background="@drawable/list_selector"
     tools:ignore="UseCompoundDrawables">
 
     <!-- Subfolder spacer. -->
diff --git a/app/src/main/res/layout/view_headers_bottom_appbar.xml b/app/src/main/res/layout/view_headers_bottom_appbar.xml
index eddf4477..0219c09a 100644
--- a/app/src/main/res/layout/view_headers_bottom_appbar.xml
+++ b/app/src/main/res/layout/view_headers_bottom_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -36,152 +36,171 @@
         android:orientation="vertical"
         app:layout_dodgeInsetEdges="bottom" >
 
-        <!-- `android:layout_weight="1"` causes the swipe refresh layout to fill all the remaining space. -->
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swiperefreshlayout"
+        <!-- The frame layout allows the swipe refresh layout and the progress bar to occupy the same space. -->
+        <FrameLayout
             android:layout_height="0dp"
             android:layout_width="match_parent"
-            android:layout_weight="1">
+            android:layout_weight="1" >
 
-            <ScrollView
-                android:id="@+id/scrollview"
-                android:layout_height="wrap_content"
+            <!-- `android:layout_weight="1"` causes the swipe refresh layout to fill all the remaining space. -->
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swiperefreshlayout"
+                android:layout_height="match_parent"
                 android:layout_width="match_parent" >
 
-                <LinearLayout
+                <ScrollView
+                    android:id="@+id/scrollview"
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:orientation="vertical"
-                    android:layout_margin="10dp" >
-
-                    <!-- SSL information. -->
-                    <TextView
-                        android:id="@+id/ssl_information_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/ssl_information"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/ssl_information_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                    android:layout_width="match_parent" >
 
-                    <!-- SSL Buttons. -->
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/ssl_buttons_constraintlayout"
+                    <LinearLayout
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        android:layout_marginBottom="16dp"
-                        tools:ignore="MissingConstraints" >
+                        android:orientation="vertical"
+                        android:layout_margin="10dp" >
 
-                        <androidx.constraintlayout.helper.widget.Flow
+                        <!-- SSL information. -->
+                        <TextView
+                            android:id="@+id/ssl_information_title_textview"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
-                            app:constraint_referenced_ids="ciphers_button,certificate_button"
-                            app:flow_wrapMode="chain"
-                            app:flow_firstHorizontalStyle="packed"
-                            app:flow_horizontalGap="15dp" />
+                            android:text="@string/ssl_information"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/ssl_information_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/ciphers_button"
+                        <!-- SSL Buttons. -->
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/ssl_buttons_constraintlayout"
                             android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@string/ciphers"
-                            android:onClick="showCiphers"
-                            app:backgroundTint="@color/button_background_selector"
-                            android:textColor="@color/button_text_selector"
-                            tools:ignore="ButtonStyle" />
-
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/certificate_button"
+                            android:layout_width="match_parent"
+                            android:layout_marginBottom="16dp"
+                            tools:ignore="MissingConstraints" >
+
+                            <androidx.constraintlayout.helper.widget.Flow
+                                android:layout_height="wrap_content"
+                                android:layout_width="match_parent"
+                                app:constraint_referenced_ids="ciphers_button,certificate_button"
+                                app:flow_wrapMode="chain"
+                                app:flow_firstHorizontalStyle="packed"
+                                app:flow_horizontalGap="15dp" />
+
+                            <androidx.appcompat.widget.AppCompatButton
+                                android:id="@+id/ciphers_button"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/ciphers"
+                                android:onClick="showCiphers"
+                                app:backgroundTint="@color/button_background_selector"
+                                android:textColor="@color/button_text_selector"
+                                tools:ignore="ButtonStyle" />
+
+                            <androidx.appcompat.widget.AppCompatButton
+                                android:id="@+id/certificate_button"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/certificate"
+                                android:onClick="showCertificate"
+                                app:backgroundTint="@color/button_background_selector"
+                                android:textColor="@color/button_text_selector"
+                                tools:ignore="ButtonStyle" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <!-- Request headers. -->
+                        <TextView
+                            android:id="@+id/request_headers_title_textview"
                             android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@string/certificate"
-                            android:onClick="showCertificate"
-                            app:backgroundTint="@color/button_background_selector"
-                            android:textColor="@color/button_text_selector"
-                            tools:ignore="ButtonStyle" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <!-- Request headers. -->
-                    <TextView
-                        android:id="@+id/request_headers_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/request_headers"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/request_headers_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                            android:layout_width="match_parent"
+                            android:text="@string/request_headers"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/request_headers_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response message. -->
-                    <TextView
-                        android:id="@+id/response_message_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/response_message"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/response_message_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        <!-- Response message. -->
+                        <TextView
+                            android:id="@+id/response_message_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:text="@string/response_message"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/response_message_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response headers. -->
-                    <!-- The title text is set programatically. -->
-                    <TextView
-                        android:id="@+id/response_headers_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
+                        <!-- Response headers. -->
+                        <!-- The title text is set programatically. -->
+                        <TextView
+                            android:id="@+id/response_headers_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/response_headers_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        <TextView
+                            android:id="@+id/response_headers_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response body. -->
-                    <!-- The title text is set programatically. -->
-                    <TextView
-                        android:id="@+id/response_body_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
+                        <!-- Response body. -->
+                        <!-- The title text is set programatically. -->
+                        <TextView
+                            android:id="@+id/response_body_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/response_body_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true" />
-                </LinearLayout>
-            </ScrollView>
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                        <TextView
+                            android:id="@+id/response_body_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true" />
+                    </LinearLayout>
+                </ScrollView>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+            <!-- The progress bar looks best with a minimum height of 3dp for the top app bar and 4dp for the bottom app bar. -->
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_gravity="bottom"
+                android:minHeight="4dp"
+                android:progressTint="@color/blue_text"
+                android:progressBackgroundTint="@color/transparent"
+                android:background="?android:attr/colorBackground"
+                android:visibility="gone" />
+        </FrameLayout>
 
         <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
         <com.google.android.material.appbar.AppBarLayout
@@ -190,29 +209,10 @@
             android:background="?android:attr/colorBackground"
             android:theme="@style/PrivacyBrowserAppBar" >
 
-            <!-- The frame layout allows the toolbar and the progress bar to occupy the same space. -->
-            <FrameLayout
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent" >
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent" />
-
-                <!-- Android automatically uses a different, skinnier drawable with padding for indeterminate horizontal progress bars in API >= 21.
-                    They make this very difficult to override.  https://redmine.stoutner.com/issues/241
-                    `tools:ignore="UnusedAttribute"` removes the lint warning about `progressTint` and `progressBackgroundTint` not applying to API < 21. -->
-                <ProgressBar
-                    android:id="@+id/progress_bar"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:minHeight="3dp"
-                    android:layout_gravity="bottom"
-                    android:visibility="gone"
-                    tools:ignore="UnusedAttribute" />
-            </FrameLayout>
+                android:layout_width="match_parent" />
         </com.google.android.material.appbar.AppBarLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/view_headers_top_appbar.xml b/app/src/main/res/layout/view_headers_top_appbar.xml
index 0358048c..588ff6b7 100644
--- a/app/src/main/res/layout/view_headers_top_appbar.xml
+++ b/app/src/main/res/layout/view_headers_top_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,174 +42,173 @@
             android:background="?android:attr/colorBackground"
             android:theme="@style/PrivacyBrowserAppBar" >
 
-            <!-- The frame layout allows the toolbar and the progress bar to occupy the same space. -->
-            <FrameLayout
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent" >
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent" />
-
-                <!-- Android automatically uses a different, skinnier drawable with padding for indeterminate horizontal progress bars in API >= 21.
-                    They make this very difficult to override.  https://redmine.stoutner.com/issues/241
-                    `tools:ignore="UnusedAttribute"` removes the lint warning about `progressTint` and `progressBackgroundTint` not applying to API < 21. -->
-                <ProgressBar
-                    android:id="@+id/progress_bar"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:minHeight="3dp"
-                    android:layout_gravity="bottom"
-                    android:visibility="gone"
-                    tools:ignore="UnusedAttribute" />
-            </FrameLayout>
+                android:layout_width="match_parent" />
         </com.google.android.material.appbar.AppBarLayout>
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swiperefreshlayout"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent">
+        <!-- The frame layout allows the progress bar and the swipe refresh layout to occupy the same space. -->
+        <FrameLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent" >
 
-            <ScrollView
-                android:id="@+id/view_source_scrollview"
+            <!-- The progress bar looks best with a minimum height of 3dp for the top app bar and 4dp for the bottom app bar. -->
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="?android:attr/progressBarStyleHorizontal"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent" >
-
-                <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_gravity="top"
+                android:minHeight="3dp"
+                android:progressTint="@color/blue_text"
+                android:progressBackgroundTint="@color/transparent"
+                android:visibility="gone" />
+
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swiperefreshlayout"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent">
+
+                <ScrollView
+                    android:id="@+id/view_source_scrollview"
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:orientation="vertical"
-                    android:layout_margin="10dp" >
+                    android:layout_width="match_parent" >
 
-                    <!-- SSL information. -->
-                    <TextView
-                        android:id="@+id/ssl_information_title_textview"
+                    <LinearLayout
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
-                        android:text="@string/ssl_information"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/ssl_information_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        android:orientation="vertical"
+                        android:layout_margin="10dp" >
 
-                    <!-- SSL Buttons. -->
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/ssl_buttons_constraintlayout"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:layout_marginBottom="16dp"
-                        tools:ignore="MissingConstraints" >
-
-                        <androidx.constraintlayout.helper.widget.Flow
+                        <!-- SSL information. -->
+                        <TextView
+                            android:id="@+id/ssl_information_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:text="@string/ssl_information"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/ssl_information_textview"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
-                            app:constraint_referenced_ids="ciphers_button,certificate_button"
-                            app:flow_wrapMode="chain"
-                            app:flow_firstHorizontalStyle="packed"
-                            app:flow_horizontalGap="15dp" />
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/ciphers_button"
+                        <!-- SSL Buttons. -->
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/ssl_buttons_constraintlayout"
                             android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@string/ciphers"
-                            android:onClick="showCiphers"
-                            app:backgroundTint="@color/button_background_selector"
-                            android:textColor="@color/button_text_selector"
-                            tools:ignore="ButtonStyle" />
-
-                        <androidx.appcompat.widget.AppCompatButton
-                            android:id="@+id/certificate_button"
+                            android:layout_width="match_parent"
+                            android:layout_marginBottom="16dp"
+                            tools:ignore="MissingConstraints" >
+
+                            <androidx.constraintlayout.helper.widget.Flow
+                                android:layout_height="wrap_content"
+                                android:layout_width="match_parent"
+                                app:constraint_referenced_ids="ciphers_button,certificate_button"
+                                app:flow_wrapMode="chain"
+                                app:flow_firstHorizontalStyle="packed"
+                                app:flow_horizontalGap="15dp" />
+
+                            <androidx.appcompat.widget.AppCompatButton
+                                android:id="@+id/ciphers_button"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/ciphers"
+                                android:onClick="showCiphers"
+                                app:backgroundTint="@color/button_background_selector"
+                                android:textColor="@color/button_text_selector"
+                                tools:ignore="ButtonStyle" />
+
+                            <androidx.appcompat.widget.AppCompatButton
+                                android:id="@+id/certificate_button"
+                                android:layout_height="wrap_content"
+                                android:layout_width="wrap_content"
+                                android:text="@string/certificate"
+                                android:onClick="showCertificate"
+                                app:backgroundTint="@color/button_background_selector"
+                                android:textColor="@color/button_text_selector"
+                                tools:ignore="ButtonStyle" />
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <!-- Request headers. -->
+                        <TextView
+                            android:id="@+id/request_headers_title_textview"
                             android:layout_height="wrap_content"
-                            android:layout_width="wrap_content"
-                            android:text="@string/certificate"
-                            android:onClick="showCertificate"
-                            app:backgroundTint="@color/button_background_selector"
-                            android:textColor="@color/button_text_selector"
-                            tools:ignore="ButtonStyle" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <!-- Request headers. -->
-                    <TextView
-                        android:id="@+id/request_headers_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/request_headers"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/request_headers_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                            android:layout_width="match_parent"
+                            android:text="@string/request_headers"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/request_headers_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response message. -->
-                    <TextView
-                        android:id="@+id/response_message_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:text="@string/response_message"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/response_message_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        <!-- Response message. -->
+                        <TextView
+                            android:id="@+id/response_message_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:text="@string/response_message"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/response_message_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response headers. -->
-                    <!-- The title text is set programatically. -->
-                    <TextView
-                        android:id="@+id/response_headers_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
+                        <!-- Response headers. -->
+                        <!-- The title text is set programatically. -->
+                        <TextView
+                            android:id="@+id/response_headers_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/response_headers_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true"
-                        android:layout_marginBottom="8dp" />
+                        <TextView
+                            android:id="@+id/response_headers_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true"
+                            android:layout_marginBottom="8dp" />
 
-                    <!-- Response body. -->
-                    <!-- The title text is set programatically. -->
-                    <TextView
-                        android:id="@+id/response_body_title_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textAlignment="center"
-                        android:textSize="18sp"
-                        android:textColor="@color/blue_text"
-                        android:textStyle="bold" />
+                        <!-- Response body. -->
+                        <!-- The title text is set programatically. -->
+                        <TextView
+                            android:id="@+id/response_body_title_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textAlignment="center"
+                            android:textSize="18sp"
+                            android:textColor="@color/blue_text"
+                            android:textStyle="bold" />
 
-                    <TextView
-                        android:id="@+id/response_body_textview"
-                        android:layout_height="wrap_content"
-                        android:layout_width="match_parent"
-                        android:textIsSelectable="true" />
-                </LinearLayout>
-            </ScrollView>
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+                        <TextView
+                            android:id="@+id/response_body_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            android:textIsSelectable="true" />
+                    </LinearLayout>
+                </ScrollView>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+        </FrameLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml b/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml
index e9460c65..db8dfddd 100644
--- a/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml
+++ b/app/src/main/res/layout/webview_framelayout_bottom_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2019-2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2019-2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
         android:layout_width="match_parent"
         android:layout_gravity="bottom"
         android:max="100"
-        android:progressTint="?attr/progressTintColor"
+        android:progressTint="@color/blue_text"
         android:progressBackgroundTint="@color/transparent"
         android:visibility="gone" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/webview_framelayout_top_appbar.xml b/app/src/main/res/layout/webview_framelayout_top_appbar.xml
index 084e9d36..417bb311 100644
--- a/app/src/main/res/layout/webview_framelayout_top_appbar.xml
+++ b/app/src/main/res/layout/webview_framelayout_top_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2019-2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2019-2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@
         android:layout_height="2dp"
         android:layout_width="match_parent"
         android:max="100"
-        android:progressTint="?attr/progressTintColor"
+        android:progressTint="@color/blue_text"
         android:progressBackgroundTint="@color/transparent"
         android:visibility="gone" />
 </FrameLayout>
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 7edb9a6e..0875d83d 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -30,14 +30,6 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/violet_700</item>
         <item name="colorAccent">@color/violet_500</item>
-
-        <!-- Tints. -->
-        <item name="fabIconTintColor">@color/gray_875</item>
-        <item name="navigationIconTintColor">@color/violet_500</item>
-        <item name="progressTintColor">@color/violet_500</item>
-
-        <!-- Drawables. -->
-        <item name="listSelectorDrawable">@drawable/list_selector_night</item>
     </style>
 
     <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index fee950be..9056ce1e 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017,2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,8 +31,10 @@
     <color name="disabled_button_text">@color/gray_500</color>
     <color name="disabled_icon">@color/gray_500</color>
     <color name="domain_settings_url_background">@color/dark_blue_40</color>
+    <color name="fab_icon">@color/gray_875</color>
     <color name="ghosted_icon">@color/gray_700</color>
     <color name="icon">@color/white</color>
+    <color name="list_selector_activated">@color/violet_700</color>
     <color name="parent_folder_text">@color/gray_300</color>
     <color name="red_background">@color/red_700_40</color>
     <color name="red_icon">@color/red_night</color>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 06703b20..8020167b 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -28,14 +28,6 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/violet_700</item>
         <item name="colorAccent">@color/violet_500</item>
-
-        <!-- Tints. -->
-        <item name="fabIconTintColor">@color/gray_875</item>
-        <item name="navigationIconTintColor">@color/violet_500</item>
-        <item name="progressTintColor">@color/violet_500</item>
-
-        <!-- Drawables. -->
-        <item name="listSelectorDrawable">@drawable/list_selector_night</item>
     </style>
 
     <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index a78f4c79..6c0b35cd 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -30,14 +30,6 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="colorAccent">@color/blue_700</item>
-
-        <!-- Tints. -->
-        <item name="fabIconTintColor">@color/white</item>
-        <item name="navigationIconTintColor">@color/blue_800</item>
-        <item name="progressTintColor">@color/blue_700</item>
-
-        <!-- Drawables. -->
-        <item name="listSelectorDrawable">@drawable/list_selector_day</item>
     </style>
 
     <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
deleted file mode 100644
index ecce2323..00000000
--- a/app/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2017-2022, 2024 Soren Stoutner <soren@stoutner.com>.
-
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
-
-  Privacy Browser Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Privacy Browser Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
-
-<resources>
-    <!-- Colors. -->
-    <attr name="aboutBackground" format="color" />
-    <attr name="activatedListViewItemBackground" format="color" />
-
-    <!-- Tint Colors. -->
-    <attr name="fabIconTintColor" format="color" />
-    <attr name="navigationIconTintColor" format="color" />
-    <attr name="progressTintColor" format="color" />
-
-    <!-- Drawables.  -->
-    <attr name="listSelectorDrawable" format="reference" />
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 807bca3a..19bc3810 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016-2017,2020,2022-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2016-2017, 2020, 2022-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,8 +31,10 @@
     <color name="disabled_button_text">@color/gray_400</color>
     <color name="disabled_icon">@color/gray_600</color>
     <color name="domain_settings_url_background">@color/green_200</color>
+    <color name="fab_icon">@color/white</color>
     <color name="ghosted_icon">@color/gray_425</color>
     <color name="icon">@color/gray_925</color>
+    <color name="list_selector_activated">@color/blue_200</color>
     <color name="parent_folder_text">@color/gray_700</color>
     <color name="red_background">@color/red_100</color>
     <color name="red_icon">@color/red_900</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 470b1a73..6dd998ad 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,14 +28,6 @@
         <item name="android:actionModeBackground">?android:attr/colorBackground</item>
         <item name="android:textColorHighlight">@color/blue_200</item>
         <item name="colorAccent">@color/blue_700</item>
-
-        <!-- Tints. -->
-        <item name="fabIconTintColor">@color/white</item>
-        <item name="navigationIconTintColor">@color/blue_800</item>
-        <item name="progressTintColor">@color/blue_700</item>
-
-        <!-- Drawables. -->
-        <item name="listSelectorDrawable">@drawable/list_selector_day</item>
     </style>
 
     <style name="PrivacyBrowserAppBar" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" >
-- 
2.43.0