From 119b911ea7955f967c87e041ac2898412e689963 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 28 Oct 2023 21:05:06 +0630
Subject: [PATCH 1/3] Update strings.xml

Added some formatting to make help more readable.
---
 app/src/main/res/values-en/strings.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index e639b9dd22..4812149b7e 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -128,11 +128,11 @@ Other labels: all other labels.</string>
        The menu button at the top-right corner of each window 
 provides easy access to manipulate and customize the window.</string>
   <string name="help_contextmenus_text">
-        A long press opens a context menu in several views.
-        Long press on the Bible view to open the action mode for actions affecting the current verse.
-        Long press on a document item in list view of Choose Document or Download to delete document or view information.
-        Long press a bookmark in bookmarks listing to add labels or delete bookmark.
-        Long press links to choose if you want to open them in the current window, new window or special links window.
+        - A long press opens a context menu in several views.\n
+        - Long press on the Bible view to open the action mode for actions affecting the current verse.\n
+        - Long press on a document item in list view of Choose Document or Download to delete document or view information.\n
+        - Long press a bookmark in bookmarks listing to add labels or delete bookmark.\n
+        - Long press links to choose if you want to open them in the current window, new window or special links window.\n
     </string>
   <string name="help_search_text">Search text can include special characters like *, ?, AND, OR, NOT
         (see \"Apache Lucene - Query Parser Syntax\" for more details)
@@ -140,11 +140,11 @@ provides easy access to manipulate and customize the window.</string>
   <string name="help_workspaces_text">
 Workspaces allow having multiple working environments. Workspace functions can be accessed via the Workspaces item in the options menu (top-right corner). A quick way to access workspaces is by a swipe-down gesture from the Bible reference text in the toolbar. You may also use swipe-left and swipe-right gestures over the Bible reference text in the toolbar to switch to previous or next workspace.  </string>
   <string name="help_hidden_features_text">
-        Swipe down starting on the bible verse selector to show the workspace selector.
-        Long press the window button to quickly minimize.
-        Long press the Speak toolbar button to quickly go to speak settings.
-        Long press the verse location title in toolbar to jump to document selector.
-        Long press the Back button to access the History list.
+        - Swipe down starting on the bible verse selector to show the workspace selector.\n
+        - Long press the window button to quickly minimize.\n
+        - Long press the Speak toolbar button to quickly go to speak settings.\n
+        - Long press the verse location title in toolbar to jump to document selector.\n
+        - Long press the Back button to access the History list.
     </string>
   <!--Welcome text-->
   <string name="welcome_message">Thank you for downloading %s. There are currently no Bibles installed. To continue, please install

From 8dfadb02b611d70f05cde2e97aa00db2c4fedf84 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 28 Oct 2023 21:09:31 +0630
Subject: [PATCH 2/3] Added icons for one-tap actions

This has a cross in the Bible icon. It is only small but maybe needs to be considered for the "hide religious symbols". I included "one_tap_plain" if that is needed.
---
 .../main/res/drawable/ic_one_tap_bible_24.xml | 22 +++++++++++++++++++
 .../main/res/drawable/ic_one_tap_other_24.xml | 22 +++++++++++++++++++
 .../main/res/drawable/ic_one_tap_plain_24.xml | 22 +++++++++++++++++++
 app/src/main/res/xml/settings.xml             |  4 ++--
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_one_tap_bible_24.xml
 create mode 100644 app/src/main/res/drawable/ic_one_tap_other_24.xml
 create mode 100644 app/src/main/res/drawable/ic_one_tap_plain_24.xml

diff --git a/app/src/main/res/drawable/ic_one_tap_bible_24.xml b/app/src/main/res/drawable/ic_one_tap_bible_24.xml
new file mode 100644
index 0000000000..2a6c9ba8f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_one_tap_bible_24.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) 2021-2022 Martin Denham, Tuomas Airaksinen and the AndBible contributors.
+  ~
+  ~ This file is part of AndBible: Bible Study (http://github.com/AndBible/and-bible).
+  ~
+  ~ AndBible 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.
+  ~
+  ~ AndBible 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 AndBible.
+  ~ If not, see http://www.gnu.org/licenses/.
+  -->
+
+<vector android:height="24dp"
+    android:viewportHeight="100" android:viewportWidth="100"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/darker_gray" android:pathData="M65 .4C65 16.9 65 33.5 65 50c10.4-.1 20.8.1 31.1-.1 4.2-.6 5-4.9 4.7-8.4 0-11.9 0-23.8 0-35.7 0-4.4-4.7-5.9-8.4-5.4-9.1 0-18.3 0-27.4 0zm16.4 10c1.9.1 5.4-.8 5.3 2.2.2 1.5-.8 4.3 1.7 3.5 2.2-.3 5.2.2 4.4 3 .7 2.7-1.6 4-4 3.4-2.5-.8-2.2 1.3-2.1 3.1-.1 2.9.2 5.8-.1 8.6-1.6 1.5-5.2 1.5-6.7 0-.3-3.9-.1-7.8-.1-11.7-2-.3-4.6.8-6-1-.1-2-.9-5.8 2.2-5.5 1.4-.3 4.5 1 3.8-1.4.1-1.5-.7-4.2 1.8-4.3zM20 5.8c7.7-.2 14.5 6.9 14.3 14.6 1.9 0 3.8 0 5.7 0C40.4 8.9 29.5-1.4 18 .1 7.9 1-.2 10.4 0 20.4c1.9 0 3.8 0 5.7 0C5.6 12.6 12.2 5.7 20 5.8ZM0 67.1c-.3 15.2 11.5 29.7 26.6 31.8 14.3 2.5 29.1-6.5 34-20 3.1-7.7 2-16.2 2.1-24.3C62.5 49.1 56.2 45.1 51.1 47.4 50 42.6 44.3 39.5 39.7 41.6 38.6 36.9 33.1 33.8 28.6 35.6 28.5 30 28.8 24.3 28.4 18.6 27.5 12.4 19.2 9.4 14.6 13.6c-4.4 3.6-2.8 9.5-3.1 14.4 0 4.5 0 9 0 13.4C5.6 39.1-.9 44.7 0 50.8 0 56.2 0 61.7 0 67.1ZM5.7 49.7c.7-5.4 7.2-2.1 5.7 2 0 6.1 0 12.3 0 18.4 1.9 0 3.8 0 5.7 0 0-16.8-.1-33.5.1-50.3 1.7-4.9 7-.9 5.7 2.9 0 11.9 0 23.8 0 35.8 1.9 0 3.8 0 5.7 0 0-5-.1-10.1.1-15.1 1.7-4.9 7-.9 5.7 2.9 0 4.1 0 8.2 0 12.3 1.9 0 3.8 0 5.7 0 .1-3.3-.3-6.6.2-9.9 2.5-4.3 6.6.2 5.5 3.7 0 2.1 0 4.1 0 6.2 1.9 0 3.8 0 5.7 0-.4-2.6.4-6.9 4-5.6 2.8 1.6 1.4 5.1 1.7 7.8.1 6.7.2 13.8-3.4 19.7C48 91.1 34 96.5 22.6 91.9 11.8 88 4.9 76.5 5.7 65.2c0-5.2 0-10.3 0-15.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_one_tap_other_24.xml b/app/src/main/res/drawable/ic_one_tap_other_24.xml
new file mode 100644
index 0000000000..b5423c9e23
--- /dev/null
+++ b/app/src/main/res/drawable/ic_one_tap_other_24.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) 2021-2022 Martin Denham, Tuomas Airaksinen and the AndBible contributors.
+  ~
+  ~ This file is part of AndBible: Bible Study (http://github.com/AndBible/and-bible).
+  ~
+  ~ AndBible 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.
+  ~
+  ~ AndBible 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 AndBible.
+  ~ If not, see http://www.gnu.org/licenses/.
+  -->
+
+<vector android:height="24dp"
+    android:viewportHeight="100" android:viewportWidth="100"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/darker_gray" android:pathData="m74 11c6.7 0 13.3 0 20 0 0 2 0 4 0 6-6.7 0-13.3 0-20 0 0-2 0-4 0-6zM65 .4C65 16.9 65 33.5 65 50c10.2 0 20.4 0 30.6 0 3-.2 5.6-3 5.2-6 0-12.8 0-25.6 0-38.5-.1-3.2-3.5-5.5-6.6-5.1-9.7 0-19.5 0-29.2 0zM20 5.8c7.9 0 14.3 6.5 14.3 14.6H40C40 9.1 31 0 20 0 9 0 0 9.1 0 20.4H5.7C5.7 12.3 12.1 5.8 20 5.8ZM0 67.1c0 17.8 14.1 32.2 31.4 32.2 17.3 0 31.4-14.4 31.4-32.2V55.5c0-4.8-3.8-8.7-8.6-8.7-1.1 0-2.2.2-3.2.6-1-3.7-4.3-6.4-8.3-6.4-1.1 0-2.2.2-3.2.6-1-3.7-4.3-6.4-8.3-6.4-1 0-2 .2-2.9.5V20.4c0-4.8-3.8-8.7-8.6-8.7-4.7 0-8.6 3.9-8.6 8.7V41.4C10.5 41.1 9.6 40.9 8.6 40.9 3.8 40.9 0 44.9 0 49.7ZM5.7 49.7c0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9v20.4h5.7c0-6.7 0-48 0-49.7 0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9v38h5.7V43.9c0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9V58.4H40v-8.7c0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9v8.7h5.7v-2.9c0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9V67.1c0 14.6-11.5 26.4-25.7 26.4-14.2 0-25.7-11.8-25.7-26.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_one_tap_plain_24.xml b/app/src/main/res/drawable/ic_one_tap_plain_24.xml
new file mode 100644
index 0000000000..c7edb27ec9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_one_tap_plain_24.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (c) 2021-2022 Martin Denham, Tuomas Airaksinen and the AndBible contributors.
+  ~
+  ~ This file is part of AndBible: Bible Study (http://github.com/AndBible/and-bible).
+  ~
+  ~ AndBible 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.
+  ~
+  ~ AndBible 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 AndBible.
+  ~ If not, see http://www.gnu.org/licenses/.
+  -->
+
+<vector android:height="24dp"
+    android:viewportHeight="100" android:viewportWidth="100"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/darker_gray" android:pathData="M20 5.8C27.7 5.6 34.5 12.7 34.3 20.4H40C40.4 8.9 29.5-1.4 18 .1 7.9 1-.2 10.4 0 20.4H5.7C5.6 12.6 12.2 5.7 20 5.8ZM0 67.1C-.3 82.3 11.5 96.8 26.6 98.9 40.9 101.4 55.7 92.4 60.6 78.9 63.7 71.2 62.6 62.7 62.7 54.6 62.5 49.1 56.2 45.1 51.1 47.4 50 42.6 44.3 39.5 39.7 41.6 38.6 36.9 33.1 33.8 28.6 35.6 28.5 30 28.8 24.3 28.4 18.6 27.5 12.4 19.2 9.4 14.6 13.6 10.2 17.2 11.7 23.1 11.4 28V41.4C5.6 39.1-.9 44.7 0 50.8ZM5.7 49.7C6.4 44.3 12.9 47.6 11.4 51.7V70H17.1C17.2 53.3 17.1 36.5 17.2 19.8 18.9 14.9 24.2 18.9 22.9 22.7V58.4H28.6C28.6 53.4 28.5 48.3 28.7 43.3 30.4 38.4 35.7 42.4 34.4 46.2V58.4H40.1C40.2 55.1 39.8 51.8 40.3 48.5 42.8 44.2 46.9 48.7 45.8 52.2V58.4H51.5C51.1 55.8 51.9 51.5 55.5 52.8 58.3 54.4 56.9 57.9 57.2 60.6 57.3 67.3 57.4 74.4 53.8 80.3 48 91.1 34 96.5 22.6 91.9 11.8 88 4.9 76.5 5.7 65.2Z"/>
+</vector>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index f2777d4ead..07cd3f82e2 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -133,7 +133,7 @@
 		<MultiSelectListPreference android:key="bible_bookmark_modal_buttons"
 			android:title="@string/prefs_in_window_bible_bookmark_modal_buttons_title"
 			android:summary="@string/prefs_in_window_bookmark_modal_buttons_description"
-			android:icon="@drawable/ic_bookmark_24dp"
+			android:icon="@drawable/ic_one_tap_bible_24"
 			android:entries="@array/prefs_bible_bookmark_modal_action_names"
 			android:entryValues="@array/prefs_bible_bookmark_modal_action_ids"
 			android:defaultValue="@array/pref_bible_bookmark_modal_action_defaults"
@@ -141,7 +141,7 @@
 		<MultiSelectListPreference android:key="gen_bookmark_modal_buttons"
 			android:title="@string/prefs_in_window_gen_bookmark_modal_buttons_title"
 			android:summary="@string/prefs_in_window_bookmark_modal_buttons_description"
-			android:icon="@drawable/ic_bookmark_24dp"
+			android:icon="@drawable/ic_one_tap_other_24"
 			android:entries="@array/prefs_gen_bookmark_modal_action_names"
 			android:entryValues="@array/prefs_gen_bookmark_modal_action_ids"
 			android:defaultValue="@array/pref_gen_bookmark_modal_action_defaults"

From 9a05145d7bf7f6f993b6de9cff6b6fcf8b68a774 Mon Sep 17 00:00:00 2001
From: Andrew Rogers <rogers.ag@gmail.com>
Date: Sat, 28 Oct 2023 21:12:16 +0630
Subject: [PATCH 3/3] Revert "Added icons for one-tap actions"

This reverts commit 8dfadb02b611d70f05cde2e97aa00db2c4fedf84.
---
 .../main/res/drawable/ic_one_tap_bible_24.xml | 22 -------------------
 .../main/res/drawable/ic_one_tap_other_24.xml | 22 -------------------
 .../main/res/drawable/ic_one_tap_plain_24.xml | 22 -------------------
 app/src/main/res/xml/settings.xml             |  4 ++--
 4 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_one_tap_bible_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_one_tap_other_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_one_tap_plain_24.xml

diff --git a/app/src/main/res/drawable/ic_one_tap_bible_24.xml b/app/src/main/res/drawable/ic_one_tap_bible_24.xml
deleted file mode 100644
index 2a6c9ba8f8..0000000000
--- a/app/src/main/res/drawable/ic_one_tap_bible_24.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  ~ Copyright (c) 2021-2022 Martin Denham, Tuomas Airaksinen and the AndBible contributors.
-  ~
-  ~ This file is part of AndBible: Bible Study (http://github.com/AndBible/and-bible).
-  ~
-  ~ AndBible 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.
-  ~
-  ~ AndBible 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 AndBible.
-  ~ If not, see http://www.gnu.org/licenses/.
-  -->
-
-<vector android:height="24dp"
-    android:viewportHeight="100" android:viewportWidth="100"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/darker_gray" android:pathData="M65 .4C65 16.9 65 33.5 65 50c10.4-.1 20.8.1 31.1-.1 4.2-.6 5-4.9 4.7-8.4 0-11.9 0-23.8 0-35.7 0-4.4-4.7-5.9-8.4-5.4-9.1 0-18.3 0-27.4 0zm16.4 10c1.9.1 5.4-.8 5.3 2.2.2 1.5-.8 4.3 1.7 3.5 2.2-.3 5.2.2 4.4 3 .7 2.7-1.6 4-4 3.4-2.5-.8-2.2 1.3-2.1 3.1-.1 2.9.2 5.8-.1 8.6-1.6 1.5-5.2 1.5-6.7 0-.3-3.9-.1-7.8-.1-11.7-2-.3-4.6.8-6-1-.1-2-.9-5.8 2.2-5.5 1.4-.3 4.5 1 3.8-1.4.1-1.5-.7-4.2 1.8-4.3zM20 5.8c7.7-.2 14.5 6.9 14.3 14.6 1.9 0 3.8 0 5.7 0C40.4 8.9 29.5-1.4 18 .1 7.9 1-.2 10.4 0 20.4c1.9 0 3.8 0 5.7 0C5.6 12.6 12.2 5.7 20 5.8ZM0 67.1c-.3 15.2 11.5 29.7 26.6 31.8 14.3 2.5 29.1-6.5 34-20 3.1-7.7 2-16.2 2.1-24.3C62.5 49.1 56.2 45.1 51.1 47.4 50 42.6 44.3 39.5 39.7 41.6 38.6 36.9 33.1 33.8 28.6 35.6 28.5 30 28.8 24.3 28.4 18.6 27.5 12.4 19.2 9.4 14.6 13.6c-4.4 3.6-2.8 9.5-3.1 14.4 0 4.5 0 9 0 13.4C5.6 39.1-.9 44.7 0 50.8 0 56.2 0 61.7 0 67.1ZM5.7 49.7c.7-5.4 7.2-2.1 5.7 2 0 6.1 0 12.3 0 18.4 1.9 0 3.8 0 5.7 0 0-16.8-.1-33.5.1-50.3 1.7-4.9 7-.9 5.7 2.9 0 11.9 0 23.8 0 35.8 1.9 0 3.8 0 5.7 0 0-5-.1-10.1.1-15.1 1.7-4.9 7-.9 5.7 2.9 0 4.1 0 8.2 0 12.3 1.9 0 3.8 0 5.7 0 .1-3.3-.3-6.6.2-9.9 2.5-4.3 6.6.2 5.5 3.7 0 2.1 0 4.1 0 6.2 1.9 0 3.8 0 5.7 0-.4-2.6.4-6.9 4-5.6 2.8 1.6 1.4 5.1 1.7 7.8.1 6.7.2 13.8-3.4 19.7C48 91.1 34 96.5 22.6 91.9 11.8 88 4.9 76.5 5.7 65.2c0-5.2 0-10.3 0-15.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_one_tap_other_24.xml b/app/src/main/res/drawable/ic_one_tap_other_24.xml
deleted file mode 100644
index b5423c9e23..0000000000
--- a/app/src/main/res/drawable/ic_one_tap_other_24.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  ~ Copyright (c) 2021-2022 Martin Denham, Tuomas Airaksinen and the AndBible contributors.
-  ~
-  ~ This file is part of AndBible: Bible Study (http://github.com/AndBible/and-bible).
-  ~
-  ~ AndBible 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.
-  ~
-  ~ AndBible 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 AndBible.
-  ~ If not, see http://www.gnu.org/licenses/.
-  -->
-
-<vector android:height="24dp"
-    android:viewportHeight="100" android:viewportWidth="100"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/darker_gray" android:pathData="m74 11c6.7 0 13.3 0 20 0 0 2 0 4 0 6-6.7 0-13.3 0-20 0 0-2 0-4 0-6zM65 .4C65 16.9 65 33.5 65 50c10.2 0 20.4 0 30.6 0 3-.2 5.6-3 5.2-6 0-12.8 0-25.6 0-38.5-.1-3.2-3.5-5.5-6.6-5.1-9.7 0-19.5 0-29.2 0zM20 5.8c7.9 0 14.3 6.5 14.3 14.6H40C40 9.1 31 0 20 0 9 0 0 9.1 0 20.4H5.7C5.7 12.3 12.1 5.8 20 5.8ZM0 67.1c0 17.8 14.1 32.2 31.4 32.2 17.3 0 31.4-14.4 31.4-32.2V55.5c0-4.8-3.8-8.7-8.6-8.7-1.1 0-2.2.2-3.2.6-1-3.7-4.3-6.4-8.3-6.4-1.1 0-2.2.2-3.2.6-1-3.7-4.3-6.4-8.3-6.4-1 0-2 .2-2.9.5V20.4c0-4.8-3.8-8.7-8.6-8.7-4.7 0-8.6 3.9-8.6 8.7V41.4C10.5 41.1 9.6 40.9 8.6 40.9 3.8 40.9 0 44.9 0 49.7ZM5.7 49.7c0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9v20.4h5.7c0-6.7 0-48 0-49.7 0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9v38h5.7V43.9c0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9V58.4H40v-8.7c0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9v8.7h5.7v-2.9c0-1.6 1.3-2.9 2.9-2.9 1.6 0 2.9 1.3 2.9 2.9V67.1c0 14.6-11.5 26.4-25.7 26.4-14.2 0-25.7-11.8-25.7-26.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_one_tap_plain_24.xml b/app/src/main/res/drawable/ic_one_tap_plain_24.xml
deleted file mode 100644
index c7edb27ec9..0000000000
--- a/app/src/main/res/drawable/ic_one_tap_plain_24.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  ~ Copyright (c) 2021-2022 Martin Denham, Tuomas Airaksinen and the AndBible contributors.
-  ~
-  ~ This file is part of AndBible: Bible Study (http://github.com/AndBible/and-bible).
-  ~
-  ~ AndBible 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.
-  ~
-  ~ AndBible 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 AndBible.
-  ~ If not, see http://www.gnu.org/licenses/.
-  -->
-
-<vector android:height="24dp"
-    android:viewportHeight="100" android:viewportWidth="100"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/darker_gray" android:pathData="M20 5.8C27.7 5.6 34.5 12.7 34.3 20.4H40C40.4 8.9 29.5-1.4 18 .1 7.9 1-.2 10.4 0 20.4H5.7C5.6 12.6 12.2 5.7 20 5.8ZM0 67.1C-.3 82.3 11.5 96.8 26.6 98.9 40.9 101.4 55.7 92.4 60.6 78.9 63.7 71.2 62.6 62.7 62.7 54.6 62.5 49.1 56.2 45.1 51.1 47.4 50 42.6 44.3 39.5 39.7 41.6 38.6 36.9 33.1 33.8 28.6 35.6 28.5 30 28.8 24.3 28.4 18.6 27.5 12.4 19.2 9.4 14.6 13.6 10.2 17.2 11.7 23.1 11.4 28V41.4C5.6 39.1-.9 44.7 0 50.8ZM5.7 49.7C6.4 44.3 12.9 47.6 11.4 51.7V70H17.1C17.2 53.3 17.1 36.5 17.2 19.8 18.9 14.9 24.2 18.9 22.9 22.7V58.4H28.6C28.6 53.4 28.5 48.3 28.7 43.3 30.4 38.4 35.7 42.4 34.4 46.2V58.4H40.1C40.2 55.1 39.8 51.8 40.3 48.5 42.8 44.2 46.9 48.7 45.8 52.2V58.4H51.5C51.1 55.8 51.9 51.5 55.5 52.8 58.3 54.4 56.9 57.9 57.2 60.6 57.3 67.3 57.4 74.4 53.8 80.3 48 91.1 34 96.5 22.6 91.9 11.8 88 4.9 76.5 5.7 65.2Z"/>
-</vector>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 07cd3f82e2..f2777d4ead 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -133,7 +133,7 @@
 		<MultiSelectListPreference android:key="bible_bookmark_modal_buttons"
 			android:title="@string/prefs_in_window_bible_bookmark_modal_buttons_title"
 			android:summary="@string/prefs_in_window_bookmark_modal_buttons_description"
-			android:icon="@drawable/ic_one_tap_bible_24"
+			android:icon="@drawable/ic_bookmark_24dp"
 			android:entries="@array/prefs_bible_bookmark_modal_action_names"
 			android:entryValues="@array/prefs_bible_bookmark_modal_action_ids"
 			android:defaultValue="@array/pref_bible_bookmark_modal_action_defaults"
@@ -141,7 +141,7 @@
 		<MultiSelectListPreference android:key="gen_bookmark_modal_buttons"
 			android:title="@string/prefs_in_window_gen_bookmark_modal_buttons_title"
 			android:summary="@string/prefs_in_window_bookmark_modal_buttons_description"
-			android:icon="@drawable/ic_one_tap_other_24"
+			android:icon="@drawable/ic_bookmark_24dp"
 			android:entries="@array/prefs_gen_bookmark_modal_action_names"
 			android:entryValues="@array/prefs_gen_bookmark_modal_action_ids"
 			android:defaultValue="@array/pref_gen_bookmark_modal_action_defaults"