diff --git a/app/bibleview-js/src/components/BookmarkButtons.vue b/app/bibleview-js/src/components/BookmarkButtons.vue
index 223c6477bd..dd0a6804b4 100644
--- a/app/bibleview-js/src/components/BookmarkButtons.vue
+++ b/app/bibleview-js/src/components/BookmarkButtons.vue
@@ -30,10 +30,14 @@
           v-if="!inBookmarkModal"
           class="bookmark-button"
           @click.stop="$emit('edit-clicked')"
-          :class="{highlighted: inBookmarkModal && bookmark.hasNote}"
-          :style="buttonColor(primaryLabel.color, bookmark.hasNote)"
+          :style="buttonColor(primaryLabel.color)"
         >
-          <FontAwesomeIcon icon="edit"/>
+          <template v-if="bookmark.hasNote">
+            <FontAwesomeIcon icon="edit"/>
+          </template>
+          <template v-else>
+            <FontAwesomeIcon icon="custom-note-false"/>
+          </template>
         </div>
         <div
           class="bookmark-button"
@@ -45,10 +49,14 @@
         <div
           class="bookmark-button"
           @click.stop="toggleWholeVerse"
-          :class="{highlighted: inBookmarkModal && bookmark.wholeVerse}"
-          :style="buttonColor(primaryLabel.color, bookmark.wholeVerse)"
+          :style="buttonColor(primaryLabel.color)"
         >
-          <FontAwesomeIcon icon="text-width"/>
+          <template v-if="bookmark.wholeVerse">
+            <FontAwesomeIcon icon="custom-whole-verse-true"/>
+          </template>
+          <template v-else>
+            <FontAwesomeIcon icon="custom-whole-verse-false"/>
+          </template>
         </div>
         <template v-if="showStudyPadButtons">
           <div
diff --git a/app/bibleview-js/src/composables/index.js b/app/bibleview-js/src/composables/index.js
index 743cd087b3..617e978c69 100644
--- a/app/bibleview-js/src/composables/index.js
+++ b/app/bibleview-js/src/composables/index.js
@@ -356,10 +356,28 @@ export function useFontAwesome() {
     const customCompress = {
         prefix: 'fas',
         iconName: 'custom-compress',
-        icon: [576, 512, [], null, "M528 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h480c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-352 96c35.3 0 64 28.7 64 64s-28.7 64-64 64-64-28.7-64-64 28.7-64 64-64zm112 236.8c0 10.6-10 19.2-22.4 19.2H86.4C74 384 64 375.4 64 364.8v-19.2c0-31.8 30.1-57.6 67.2-57.6h5c12.3 5.1 25.7 8 39.8 8s27.6-2.9 39.8-8h5c37.1 0 67.2 25.8 67.2 57.6v19.2zM512 312c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16zm0-64c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16zm0-64c0 4.4-3.6 8-8 8H360c-4.4 0-8-3.6-8-8v-16c0-4.4 3.6-8 8-8h144c4.4 0 8 3.6 8 8v16z"]
+        icon: [100, 100, [], null, "m36.6 0c-4.3 0-8 3.7-8 8.3v0.9H12.1C5.3 9.2 0 14.7 0 21.5V50 78.6c0 6.8 5.3 12.6 12.1 12.6h16.5v0.9c0 4.2 3.7 7.9 8 7.9h55.3c4.5 0 8.1-3.7 8.1-7.9V81.9c0-4.7-3.5-8.4-8.1-8.4H36.6c-4.4 0-8 3.7-8 8.4v1H12.1c-1.8 0-3.8-2-3.8-4.3V54.5H28.6v0.9c0 4.2 3.7 8 8 8h55.3c4.5 0 8.1-3.8 8.1-8V45.1c0-4.7-3.5-8.4-8.1-8.4H36.6c-4.4 0-8 3.7-8 8.4v1H8.3V21.5c0-2.2 2-4.1 3.8-4.1h16.5v1c0 4.5 3.7 8.3 8 8.3h55.3c4.5 0 8.1-3.8 8.1-8.3V8.3c0-4.5-3.6-8.3-8.1-8.3zM36.9 8.4H91.8V18.4H36.9Zm0 36.7h54.9v10H36.9Zm0 36.7h54.9c0 0.1 0 0.1 0 0.1v9.9H36.9v-9.9c0 0 0 0 0-0.1z"]
+    };
+    const customWholeVerseFalse = {
+        prefix: 'fas',
+        iconName: 'custom-whole-verse-false',
+        icon: [100, 100, [], null, "m19.6 33.7a4.3 4.3 0 0 0-4.3 4.3 4.3 4.3 0 0 0 4.3 4.3H63.2A4.3 4.3 0 0 0 67.5 38 4.3 4.3 0 0 0 63.2 33.7Zm-0.2-16a4.3 4.3 0 0 0-4.2 4.2 4.3 4.3 0 0 0 4.2 4.2h60.9a4.3 4.3 0 0 0 4.2-4.2 4.3 4.3 0 0 0-4.2-4.2zM0 0V100H100V0ZM8 8H92.2V91.9H8ZM72.7 52.8 66.3 57.5 71 65.9H29.2l4.6-8.4-6.5-4.7-10.6 17 11 17 6.3-4.9-4.6-8.1h41.5l-4.6 8.1 6.6 4.8 10.6-16.9z"]
+    };
+    const customWholeVerseTrue = {
+        prefix: 'fas',
+        iconName: 'custom-whole-verse-true',
+        icon: [100, 100, [], null, "M0 0V100H100V0ZM19.4 17.7h60.9a4.3 4.3 0 0 1 4.2 4.2 4.3 4.3 0 0 1-4.2 4.2H19.4a4.3 4.3 0 0 1-4.2-4.2 4.3 4.3 0 0 1 4.2-4.2zm0.2 16h43.6a4.3 4.3 0 0 1 4.3 4.3 4.3 4.3 0 0 1-4.3 4.3H19.6A4.3 4.3 0 0 1 15.3 38 4.3 4.3 0 0 1 19.6 33.7Zm7.7 19.1 6.5 4.7-4.6 8.4H71l-4.7-8.4 6.4-4.7 10.8 17-10.6 16.9-6.6-4.8 4.6-8.1H29.4l4.6 8.1-6.3 4.9-11-17z"]
+    };
+    const customNoteFalse = {
+        prefix: 'fas',
+        iconName: 'custom-note-false',
+        icon: [100, 90, [], null, "m69.9 65.4 5.6-5.5c0.9-0.9 2.5-0.4 2.5 1v25.2c0 4.7-3.7 8.4-8.4 8.4H8.3c-4.5 0-8.3-3.7-8.3-8.4V24.9c0-4.7 3.8-8.3 8.3-8.3H56c1.2 0 1.8 1.4 0.9 2.2l-5.6 5.7c-0.1 0.2-0.5 0.4-0.8 0.4H8.3V86.1H69.6V66.5c0-0.5 0.2-0.9 0.3-1.1zM97.3 30.3 51.5 76.1 35.8 77.8c-4.5 0.5-8.5-3.3-8-8L29.6 54.1 75.3 8.5c4-4 10.5-4 14.5 0l7.5 7.4c3.7 4 3.7 10.4 0 14.4zM80 35.7 69.9 25.6 37.6 58 36.4 69.3 47.7 68ZM91.3 21.8 83.9 14.4c-0.7-0.7-1.9-0.7-2.6 0l-5.4 5.3 10.1 10.1 5.3-5.4c0.7-0.7 0.7-1.9 0-2.6z"]
     };
 
     library.add(customCompress)
+    library.add(customWholeVerseFalse)
+    library.add(customWholeVerseTrue)
+    library.add(customNoteFalse)
     library.add(faTextWidth)
     library.add(faHeadphones)
     library.add(faEdit)
diff --git a/app/src/main/res/drawable/ic_active_window_24dp.xml b/app/src/main/res/drawable/ic_active_window_24dp.xml
new file mode 100644
index 0000000000..7f0f179add
--- /dev/null
+++ b/app/src/main/res/drawable/ic_active_window_24dp.xml
@@ -0,0 +1,6 @@
+<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="M 92.8,65.2 V 92.7 H 65.2 V 100 H 100 V 65.2 Z m -92.87,0 V 100 H 34.7 V 92.7 H 7.15 V 65.2 Z M 65.2,-0.14 V 7.08 H 92.8 V 34.6 H 100 V -0.14 Z m -65.27,0 V 34.6 H 7.15 V 7.08 H 34.7 v -7.22 z"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_application_language_24dp.xml b/app/src/main/res/drawable/ic_application_language_24dp.xml
new file mode 100644
index 0000000000..8eb86a5a8a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_application_language_24dp.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:viewportHeight="100"
+    android:viewportWidth="100" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="@color/grey_500">
+    <path android:fillColor="@android:color/darker_gray"
+        android:pathData="M91.1 17.7C77 17.7 63 17.7 48.9 17.7 48.1 13.3 48.3 8.7 46.6 4.6 44.7 0.6 40.2-0.4 36.2 0 26.7 0 17.3-0.1 7.9 0 2.6 0.4-0.7 5.8 0 10.7 0 31.9-0.1 53 0 74.2c0.4 5.3 5.7 8.6 10.8 7.9 7.5 0 15 0 22.5 0 0.8 4.4 0.7 9 2.4 13.1 2 4.1 6.6 4.8 10.7 4.6 15.2 0 30.4 0.1 45.6 0 5.3-0.4 8-5.8 7.8-10.8 0-21.1 0.1-42.3 0-63.4-0.4-4.4-4.3-8-8.7-7.9zM8.8 76.2C5.4 76.1 5.8 72.1 5.9 69.6 5.9 49.1 5.8 28.6 5.9 8.2 7 4.7 10.9 6.1 13.6 5.8c8.5 0 16.9 0 25.4 0 5 2.4 2.7 10.1 4.3 14.7 2.4 18.6 4.7 37.1 7 55.7-13.8 0-27.7 0-41.5 0zM40.4 90c-0.3-2.6-0.7-5.3-1-7.9 2.6 0 5.2 0 7.8 0-2.3 2.6-4.5 5.3-6.8 7.9zM94 91c-0.1 3.4-3.9 3.1-6.3 3-14.3 0-28.7 0-43 0 3.8-4.5 7.7-8.9 11.5-13.4 0.7-3.2-0.5-6.5-0.7-9.7-2-15.8-4-31.5-6-47.3 13.9 0 27.7 0 41.6 0 3.8 0.4 2.8 4.5 2.9 7.1 0 20.1 0 40.2 0 60.3zM85 44c-2.9 0-5.9 0-8.8 0 0.7-3-1.4-7.8-4.9-4.9-2.2 1 0.7 5.6-2.3 4.9-3 0.2-6.2-0.5-9 0.5-3.7 3 1.3 4.9 2.7 6.4 0.5 4.6 6 9.1 5.7 12.5-2.8 2.2-10.6 7.2-4.2 9.9 4.4 0.5 7.4-8.9 11-4.8 2.4 2.6 9 8.1 9.8 1.5C83.7 65.7 74 64 79.9 59.4 83 55.3 82.9 49.8 87.7 48.1 88.5 46.3 87 44 85 44ZM73.3 58.5c-1.5-2.3-5.4-7.1-4.1-8.6 3 0 6 0 9 0-1.3 3-2.8 6-4.9 8.6zM38.2 52.2c-2-9.7-3.8-19.5-5.8-29.2-1.2-3.5-5.3-2.1-8.1-2.4-5.4 0.3-3.9 7.5-5.4 11.2-1.3 7-2.9 14-4.1 21 0.7 5.2 6.9 2.4 6.3-1.6 0.4-2.4 0.9-4.8 1.3-7.2 2.7 0 5.5 0 8.2 0 0.8 3.5 1 7.1 2.3 10.5 1.9 2.6 5.8 0.8 5.3-2.3zm-14.6-14c0.8-3.9 1.5-7.8 2.3-11.7 2.1-0.5 1.3 2.6 2 3.9 0.5 2.6 1 5.2 1.5 7.8-1.9 0-3.9 0-5.8 0z"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_workspace_24.xml b/app/src/main/res/drawable/ic_baseline_workspace_24.xml
index 0b48d91347..573ef27495 100644
--- a/app/src/main/res/drawable/ic_baseline_workspace_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_workspace_24.xml
@@ -17,7 +17,9 @@
   -->
 
 <vector android:height="24dp"
-    android:viewportHeight="500" android:viewportWidth="500"
+    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="M 480.276,62.526 H 156.574 c -17.493,0 -31.725,14.231 -31.725,31.725 v 28.232 L 94.17,91.803 42.195,143.778 65.787,167.37 0,270.705 66.804,375.124 H 41.579 C 22,375.124 6.072,391.052 6.072,410.631 v 38.84 h 177.005 v -38.84 c 0,-19.579 -15.928,-35.507 -35.507,-35.507 H 102.896 L 36.066,270.665 80.143,201.43 c -1.482,21.531 5.967,43.567 22.39,59.99 l 12.616,12.617 9.7,-9.7 v 67.609 c 0,17.493 14.231,31.724 31.725,31.724 h 90.733 l -5.361,55.401 h -25.091 v 30.402 h 22.149 158.839 22.149 v -30.402 h -25.091 l -5.36,-55.401 h 90.732 c 17.493,0 31.725,-14.231 31.725,-31.724 V 94.252 C 512,76.758 497.768,62.526 480.276,62.526 Z m -332.707,343 c 2.815,0 5.105,2.29 5.105,5.105 v 8.439 h -116.2 v -8.439 c 0,-2.815 2.29,-5.105 5.105,-5.105 z m -41.57,-256.624 c -0.277,0.245 -0.556,0.485 -0.83,0.735 -0.878,0.8 -1.743,1.616 -2.587,2.46 -0.016,0.016 -0.032,0.03 -0.049,0.046 -0.017,0.016 -0.03,0.032 -0.046,0.049 -0.842,0.844 -1.658,1.708 -2.457,2.585 -0.253,0.278 -0.498,0.561 -0.746,0.842 -0.353,0.398 -0.714,0.79 -1.058,1.196 l -13.035,-13.035 8.979,-8.98 13.035,13.035 c -0.409,0.346 -0.805,0.71 -1.206,1.067 z m 10.366,80.929 c -7.548,-13.358 -8.017,-29.656 -1.423,-43.384 0.046,-0.095 0.092,-0.19 0.138,-0.284 0.231,-0.473 0.471,-0.943 0.719,-1.411 0.066,-0.125 0.135,-0.248 0.203,-0.372 0.239,-0.441 0.484,-0.88 0.74,-1.313 0.085,-0.145 0.173,-0.288 0.26,-0.433 0.247,-0.412 0.499,-0.823 0.76,-1.228 0.106,-0.164 0.217,-0.326 0.325,-0.489 0.252,-0.382 0.507,-0.763 0.772,-1.138 0.135,-0.19 0.277,-0.378 0.414,-0.566 0.25,-0.344 0.5,-0.687 0.76,-1.026 0.178,-0.231 0.365,-0.456 0.548,-0.684 0.233,-0.291 0.462,-0.584 0.703,-0.87 0.254,-0.303 0.52,-0.597 0.783,-0.894 0.183,-0.207 0.361,-0.418 0.548,-0.622 0.46,-0.502 0.931,-0.994 1.415,-1.478 0.539,-0.539 1.09,-1.06 1.65,-1.568 0.161,-0.147 0.327,-0.286 0.49,-0.431 0.408,-0.361 0.82,-0.719 1.238,-1.062 0.18,-0.149 0.365,-0.292 0.547,-0.438 0.418,-0.333 0.838,-0.662 1.265,-0.979 0.173,-0.13 0.349,-0.256 0.525,-0.383 0.455,-0.329 0.915,-0.65 1.379,-0.961 0.149,-0.1 0.298,-0.2 0.449,-0.298 0.52,-0.339 1.046,-0.667 1.576,-0.984 0.099,-0.06 0.198,-0.121 0.297,-0.179 3.916,-2.297 8.095,-3.977 12.398,-5.042 0.069,-0.017 0.138,-0.036 0.207,-0.054 0.676,-0.164 1.356,-0.311 2.038,-0.445 0.057,-0.011 0.113,-0.024 0.171,-0.036 0.696,-0.134 1.394,-0.25 2.095,-0.353 0.041,-0.006 0.082,-0.013 0.123,-0.019 0.708,-0.101 1.42,-0.186 2.131,-0.255 0.035,-0.003 0.07,-0.007 0.105,-0.011 0.709,-0.067 1.419,-0.118 2.13,-0.152 0.044,-0.002 0.086,-0.005 0.13,-0.007 0.692,-0.032 1.385,-0.048 2.078,-0.05 0.064,0 0.128,-10e-4 0.193,-10e-4 1.958,0.003 3.915,0.127 5.86,0.372 0.043,0.005 0.085,0.013 0.128,0.018 0.845,0.109 1.687,0.248 2.526,0.403 0.246,0.046 0.492,0.095 0.738,0.145 0.649,0.131 1.294,0.279 1.938,0.437 0.285,0.071 0.572,0.136 0.855,0.212 0.764,0.204 1.524,0.428 2.28,0.67 0.395,0.128 0.786,0.269 1.179,0.407 0.497,0.174 0.992,0.351 1.484,0.542 0.428,0.167 0.852,0.345 1.276,0.524 0.394,0.167 0.785,0.341 1.176,0.518 0.435,0.199 0.87,0.397 1.298,0.61 0.41,0.203 0.815,0.421 1.22,0.636 0.341,0.181 0.685,0.354 1.021,0.543 l -31.927,31.927 z m 156.126,189.239 5.361,-55.401 h 81.147 l 5.36,55.401 z m 209.107,-87.125 c 0,0.729 -0.594,1.323 -1.323,1.323 H 386.601 250.249 156.574 c -0.73,0 -1.323,-0.593 -1.323,-1.323 v -28.309 h 326.348 v 28.309 z m 0,-58.711 H 155.251 v -39.3 l 69.176,-69.176 -12.617,-12.616 c -7.677,-7.677 -16.585,-13.387 -26.091,-17.152 -0.082,-0.032 -0.165,-0.061 -0.248,-0.093 -1.079,-0.424 -2.166,-0.826 -3.26,-1.199 -0.32,-0.109 -0.646,-0.206 -0.967,-0.311 -0.85,-0.278 -1.701,-0.55 -2.56,-0.798 -0.547,-0.158 -1.099,-0.298 -1.649,-0.444 -0.63,-0.166 -1.26,-0.337 -1.893,-0.487 -0.749,-0.179 -1.502,-0.335 -2.256,-0.493 -0.434,-0.089 -0.865,-0.184 -1.3,-0.266 -0.918,-0.174 -1.841,-0.324 -2.767,-0.466 -0.269,-0.041 -0.535,-0.085 -0.804,-0.123 -1.053,-0.15 -2.11,-0.274 -3.17,-0.379 -0.14,-0.014 -0.279,-0.029 -0.418,-0.043 -1.154,-0.109 -2.312,-0.191 -3.472,-0.248 -0.045,-0.002 -0.089,-0.005 -0.134,-0.007 -1.854,-0.088 -3.711,-0.135 -5.574,-0.089 V 94.252 c 0,-0.73 0.594,-1.323 1.323,-1.323 h 323.702 c 0.73,0 1.323,0.594 1.323,1.323 v 178.982 z"/>
+    <path
+        android:fillColor="@android:color/darker_gray"
+        android:pathData="m94.1 5c-29.6 0-59.2 0-88.7 0-3.8 0.3-5.8 4.2-5.3 7.7 0 18.9 0 37.9 0 56.8 0.3 3.8 4.3 5.7 7.7 5.2 9 0 17.9 0 26.8 0 0 4.8 0 9.7 0 14.5-5.5 0-10.9-0.1-16.4 0.1-4 0.9-2.1 6.9 1.7 5.8 20.6 0 41.3 0.1 61.9-0.1 4-0.8 2.1-6.9-1.7-5.8-4.9 0-9.8 0-14.7 0 0-4.8 0-9.7 0-14.5 10-0.1 19.9 0.1 29.9-0.1 3.6-0.6 4.7-4.4 4.6-7.6 0-18.9 0-37.9 0-56.8C99.7 7.3 97 4.9 94.1 5ZM59.6 89.2c-6.4 0-12.7 0-19.1 0 0-4.8 0-9.7 0-14.5 6.4 0 12.7 0 19.1 0 0 4.8 0 9.7 0 14.5zM94.1 68.9c-29.4 0-58.8 0-88.1 0 0-19.4 0-38.7 0-58.1 29.4 0 58.8 0 88.2 0 0 19.4 0 38.7 0 58.1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_compare_24dp.xml b/app/src/main/res/drawable/ic_compare_24dp.xml
new file mode 100644
index 0000000000..66d88c456d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_compare_24dp.xml
@@ -0,0 +1,6 @@
+<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="#000000"
+        android:pathData="m36.2 24.9h56.5c4 0 7.3-3.3 7.3-7.3V7.2c0-4-3.3-7.3-7.3-7.3H36.2c-3.8 0-7.1 3.3-7.1 7.3V17.6c0 4 3.3 7.3 7.1 7.3zM92.7 6.2c0.6 0 1 0.5 1 1.1V17.6c0 0.6-0.4 1.1-1 1.1H36.2c-0.4 0-0.8-0.5-0.8-1.1V7.2c0-0.6 0.4-1 0.8-1zM36.2 62.5h56.5c4 0 7.3-3.4 7.3-7.1V45c0-4.3-3.3-7.5-7.3-7.5H36.2c-3.8 0-7.1 3.2-7.1 7.5v10.4c0 3.7 3.3 7.1 7.1 7.1zM92.7 43.7c0.6 0 1 0.4 1 1.3v10.4c0 0.4-0.4 0.8-1 0.8H36.2c-0.4 0-0.8-0.4-0.8-0.8V45c0-0.9 0.4-1.3 0.8-1.3zM2.8 53.3H31.2c1.7 0 2.9-1.7 2.9-3.3 0-1.7-1.2-3-2.9-3H2.8c-1.7 0-2.9 1.3-2.9 3 0 1.6 1.3 3.3 2.9 3.3zm8.4 37.5h20c1.7 0 2.9-1.6 2.9-3.3 0-1.7-1.2-2.9-2.9-2.9h-20C8.7 84.6 6.2 82.1 6.2 79.2V20.8c0-2.9 2.5-5.2 5-5.2h20c1.7 0 2.9-1.5 2.9-3.2 0-1.7-1.2-3.1-2.9-3.1h-20c-6.3 0-11.3 5.1-11.3 11.5v58.4c0 6.2 5 11.6 11.3 11.6zm25 9.2h56.5c4 0 7.3-3.3 7.3-7.1V82.5C100 78.3 96.7 75 92.7 75H36.2c-3.8 0-7.1 3.3-7.1 7.5v10.4c0 3.8 3.3 7.1 7.1 7.1zM92.7 81.2c0.6 0 1 0.5 1 1.3v10.4c0 0.4-0.4 0.8-1 0.8H36.2c-0.4 0-0.8-0.4-0.8-0.8V82.5c0-0.8 0.4-1.3 0.8-1.3z"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_footnotes_24dp.xml b/app/src/main/res/drawable/ic_footnotes_24dp.xml
index ea02f31ce1..6699cfd0f7 100644
--- a/app/src/main/res/drawable/ic_footnotes_24dp.xml
+++ b/app/src/main/res/drawable/ic_footnotes_24dp.xml
@@ -1,6 +1,6 @@
 <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="#000000"
-        android:pathData="m43.7 62.6c0-2-2-2-4-2l-20.8 5.9c-2 0-3 2-2 3l2 8c2 6.9 9.9 11.9 16.8 9.9 8-2 12-9.9 10-16.9zm-2-11C45.7 37.7 39.7 17.9 29.8 6.9 18.9-4.7 5-1.4 1.1 14.9-2.5 28.8 2.9 48.7 12.9 59.6c1 1 2 1 3 1l23.8-6c1-1 2-2 2-3zm38.7 25.9-20.8-6c-2 0-4 1-4 3l-2 6.9c-2 8 2 14.9 10 16.9 6.9 1 14.8-2 16.8-8.9l2-8c0-2 0-3-2-3.9zm6-65.6C68.5 7.1 51.6 40.7 57.6 63.6c0 0.9 1 1.9 2 1.9l23.8 6c1 1 2 0 3 0 12.9-17.9 22.6-54.6 0-59.6z"
+        android:pathData="M73.9 32.8V7h-0.8c-1.3 0-2.3-0.3-2.8-0.9-0.6-0.6-0.8-1.4-0.8-2.4 0-1 0.2-1.8 0.8-2.4 0.5-0.6 1.5-0.9 2.8-0.9h13.6c3.3 0 5.9 1.1 7.7 3.3 1.8 2.2 2.8 4.8 2.8 7.9 0 1.3 0 2.7 0 3.9-0.6 1.3-1.6 2.5-2.8 3.5 1.8 1.3 3.4 2.7 4.6 4.4 0.6 1.7 0.9 3.6 0.9 5.6 0 1.7-0.3 3.3-0.9 4.8-0.6 1-1.2 1.8-1.8 2.5-0.6 0.9-1.9 1.6-3.7 2.2-1.2 0.6-2.7 0.9-4.4 0.9h-16c-1.3 0-2.3-0.3-2.8-0.9-0.6-0.7-0.8-1.5-0.8-2.4 0-1 0.2-1.7 0.8-2.3 0.6-0.7 1.5-1 2.8-1zm5.5-16.2h6c2.1 0 3.9-0.6 5.3-2 0.7-0.8 1-1.9 1-3.3 0-1.1-0.3-2.1-1-3C89.9 7.5 88.4 7 86.4 7h-7zm0 16.2h9.4c1.9 0 3.5-0.4 4.7-1.2 0.6-0.6 0.9-1.5 0.9-2.6 0-1.3-0.6-2.6-1.8-3.9-1.5-1.3-3.5-1.9-6.1-1.9h-7.1zm-75.1 21c-2.3 0-4.2 1.8-4.3 4.2 0 1.1 0.4 2.2 1.2 3 0.8 0.8 1.9 1.3 3 1.3H90c1.2 0 2.3-0.4 3.1-1.2 0.9-0.8 1.3-2 1.3-3.1 0-1.2-0.5-2.3-1.3-3.1-0.8-0.7-2-1.2-3.1-1.1zm0 19c-2.3 0-4.2 1.9-4.3 4.2 0 1.1 0.4 2.2 1.2 3 0.8 0.8 1.9 1.3 3 1.3H90c1.2 0 2.3-0.4 3.1-1.2 0.9-0.8 1.3-1.9 1.3-3.1 0-1.1-0.5-2.2-1.3-3-0.8-0.8-2-1.2-3.1-1.2zm0 17.9c-1.1 0.1-2.2 0.5-3 1.3-0.8 0.8-1.2 1.9-1.2 3 0 1.2 0.4 2.3 1.2 3.1 0.8 0.8 1.9 1.2 3 1.2H55.2c1.1 0 2.2-0.4 3-1.2 0.8-0.8 1.3-1.9 1.3-3.1 0-1.1-0.5-2.2-1.3-3-0.8-0.8-1.9-1.3-3-1.3z"
         android:strokeWidth="1"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_justify_text_24dp.xml b/app/src/main/res/drawable/ic_justify_text_24dp.xml
index bf3a6c486e..694b31e4b9 100644
--- a/app/src/main/res/drawable/ic_justify_text_24dp.xml
+++ b/app/src/main/res/drawable/ic_justify_text_24dp.xml
@@ -1,6 +1,6 @@
 <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="#000000"
-        android:pathData="M7.1 14.3H92.6c3.9 0 7.2-3.2 7.2-7.1 0-3.9-3.3-7.1-7.2-7.1H7.1C3.2 0 0 3.2 0 7.2 0 11.1 3.2 14.3 7.1 14.3ZM92.6 28.6H7.1C3.2 28.6 0 31.7 0 35.7c0 4 3.2 7 7.1 7H92.6c3.9 0 7.2-3 7.2-7 0-4-3.3-7.1-7.2-7.1zm0 28.5H7.1c-3.9 0-7.1 3.1-7.1 7 0 4.1 3.2 7.2 7.1 7.2H92.6c3.9 0 7.2-3.1 7.2-7.2 0-3.9-3.3-7-7.2-7zM53.5 85.6H7.1c-3.9 0-7.1 3.1-7.1 7 0 3.9 3.2 7.2 7.1 7.2H53.5c3.9 0 7.1-3.3 7.1-7.2 0-3.9-3.2-7-7.1-7z"
+        android:pathData="M4.3 0.8A4.3 4.3 0 0 0 0 5 4.3 4.3 0 0 0 4.3 9.3H95.6A4.3 4.3 0 0 0 99.9 5 4.3 4.3 0 0 0 95.6 0.8Zm0 22.5a4.3 4.3 0 0 0-4.3 4.2 4.3 4.3 0 0 0 4.3 4.3H95.6a4.3 4.3 0 0 0 4.3-4.3 4.3 4.3 0 0 0-4.3-4.2zm0 22.5A4.3 4.3 0 0 0 0 50 4.3 4.3 0 0 0 4.3 54.3H95.6A4.3 4.3 0 0 0 99.9 50 4.3 4.3 0 0 0 95.6 45.8Zm0 22.5a4.3 4.3 0 0 0-4.3 4.2 4.3 4.3 0 0 0 4.3 4.3H95.6a4.3 4.3 0 0 0 4.3-4.3 4.3 4.3 0 0 0-4.3-4.2zm0 22.5A4.3 4.3 0 0 0 0 95 4.3 4.3 0 0 0 4.3 99.3H30A4.3 4.3 0 0 0 34.3 95 4.3 4.3 0 0 0 30 90.8Z"
         android:strokeWidth="1"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_label_circle.xml b/app/src/main/res/drawable/ic_label_circle.xml
index 3069b1851b..2ce78de1d7 100644
--- a/app/src/main/res/drawable/ic_label_circle.xml
+++ b/app/src/main/res/drawable/ic_label_circle.xml
@@ -17,12 +17,12 @@
   -->
 
 <vector android:height="24dp"
-    android:viewportHeight="660"
-    android:viewportWidth="630"
+    android:viewportHeight="100"
+    android:viewportWidth="100"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android"
     >
     <path android:fillColor="@color/grey_500"
-        android:pathData="M 358.81641,116.25977 A 270.79874,270.79874 0 0 0 96.314453,312.53711 270.79874,270.79874 0 0 0 281.52148,647.2168 270.79874,270.79874 0 0 0 616.64453,462.81055 l 0.71485,-2.49219 A 270.79874,270.79874 0 0 0 430.55078,126.52734 270.79874,270.79874 0 0 0 358.81641,116.25977 Z m -0.54493,68.56445 a 202.23274,202.23274 0 0 1 53.57032,7.66797 202.23274,202.23274 0 0 1 145.92968,215.77148 c -6.08199,-10.66221 -26.55636,-30.65554 -94.02148,-98.27148 -49.82215,-49.93356 -92.609,-92.08373 -95.08398,-93.66797 -9.716,-6.2192 -8.17357,-6.12065 -90.5918,-5.81836 l -19.89649,0.0723 a 202.23274,202.23274 0 0 1 100.09375,-25.7539 z m -117.32617,64.21875 c 9.31211,-0.18218 18.71294,3.98431 24.55274,12.80078 9.85614,14.88004 3.89715,35.31742 -12.41211,42.56641 -5.58365,2.48175 -13.91469,3.1283 -19.62891,1.52343 -16.91326,-4.75014 -25.82603,-23.97925 -18.51562,-39.94726 5.01079,-10.94502 15.45019,-16.73689 26.0039,-16.94336 z m -67.02148,51.93555 -0.0508,12.80273 c -0.2003,51.29397 0.0467,76.37205 0.78515,79.33984 2.81034,11.29414 1.25416,9.59486 95.40821,103.98633 45.00266,45.11618 84.10241,83.81749 92.74218,91.83594 a 202.23274,202.23274 0 0 1 -62.26171,-7.59961 202.23274,202.23274 0 0 1 -138.3125,-249.94141 202.23274,202.23274 0 0 1 11.68945,-30.42382 z M 548.51172,450.2793 A 202.23274,202.23274 0 0 1 420.8457,578.58203 c 10.73478,-10.3118 28.58274,-28.09252 60.80469,-60.31445 36.86697,-36.86699 56.45459,-56.26828 66.86133,-67.98828 z"
+        android:pathData="M50 0A50 50 0 0 0 0 50 50 50 0 0 0 50 100 50 50 0 0 0 100 50 50 50 0 0 0 50 0ZM31.2 18.4c8.9-0.1 19.6 0.1 20.8 1.4l35.2 31.9c2.5 2.5 0.3 8.2-1.9 10.4L63.2 86.7c-2.5 2.1-6 2.1-8.2 0L22.8 56.6C21 55 18.8 51.7 18.7 49.2 18.3 42.6 18.6 29.9 18.8 23.1c0-2.4 2.1-4.5 4.6-4.6 2.1 0 4.9-0.1 7.8-0.1zm0.3 8.5c-1.3 0-2.5 0.4-3.5 1.4-1.9 1.9-1.9 5 0 7 1.9 1.9 5.1 1.9 7 0 1.9-2 1.9-5.1 0-7-1-1-2.2-1.4-3.5-1.4z"
         />
 </vector>
diff --git a/app/src/main/res/drawable/ic_link_window_24dp.xml b/app/src/main/res/drawable/ic_link_window_24dp.xml
new file mode 100644
index 0000000000..9dcf70d986
--- /dev/null
+++ b/app/src/main/res/drawable/ic_link_window_24dp.xml
@@ -0,0 +1,6 @@
+<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="m40.4 65.6c0.7 0.6 1.4 0.9 2.2 0.9 0.8 0 1.7-0.3 2.2-0.9L59.6 50.8c1.2-1.2 1.2-3.2 0-4.4-1.2-1.2-3.2-1.2-4.4 0L40.4 61.2c-1.2 1.2-1.2 3.2 0 4.4zm11.2-1.5-9.7 9.8c-1.3 1.3-3.4 1.3-4.6 0l-5.2-5.2c-1.3-1.2-1.3-3.4 0-4.6l9.8-9.7c1.2-1.3 1.2-3.2 0-4.5-1.3-1.2-3.2-1.2-4.5 0l-9.7 9.8c-3.7 3.7-3.7 9.7 0 13.4l5.1 5.2c1.9 1.9 4.3 2.8 6.8 2.8 2.4 0 4.8-0.9 6.7-2.8l9.8-9.8c1.2-1.2 1.2-3.2 0-4.4-1.3-1.2-3.2-1.2-4.5 0zM72.3 38.8 67.1 33.7C63.4 30 57.4 30 53.7 33.7l-9.8 9.7c-1.2 1.3-1.2 3.2 0 4.5 1.3 1.2 3.2 1.2 4.5 0l9.7-9.8c1.2-1.3 3.4-1.3 4.6 0l5.2 5.2c1.3 1.2 1.3 3.3 0 4.6l-9.8 9.7c-1.2 1.3-1.2 3.2 0 4.5 0.6 0.6 1.4 0.9 2.2 0.9 0.8 0 1.7-0.3 2.2-0.9l9.8-9.8C76 48.6 76 42.5 72.3 38.8ZM87.4 4.3H12.6C5.7 4.3 0.1 9.9 0.1 16.8v66.5c0 7.1 5.7 12.4 12.5 12.4h74.8c7 0 12.5-5.3 12.5-12.4V16.8C99.9 9.9 94.4 4.3 87.4 4.3Zm0 83.2H12.6c-2.3 0-4.2-1.6-4.2-4.1V25.1H91.5v58.2c0 2.5-1.6 4.1-4.1 4.1z"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_whole_verse_false_24dp.xml b/app/src/main/res/drawable/ic_whole_verse_false_24dp.xml
new file mode 100644
index 0000000000..44157d0430
--- /dev/null
+++ b/app/src/main/res/drawable/ic_whole_verse_false_24dp.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (c) 2018 Martin Denham, Tuomas Airaksinen and the And Bible contributors.
+  ~
+  ~ This file is part of And Bible (http://github.com/AndBible/and-bible).
+  ~
+  ~ And Bible 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.
+  ~
+  ~ And Bible 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 And Bible.
+  ~ If not, see http://www.gnu.org/licenses/.
+  ~
+  -->
+
+<vector android:height="24dp" android:tint="@color/grey_500"
+    android:viewportHeight="100" android:viewportWidth="100"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M4.5 18A4.3 4.3 0 0 0 0.2 22.3 4.3 4.3 0 0 0 4.5 26.6H70A4.3 4.3 0 0 0 74.3 22.3 4.3 4.3 0 0 0 70 18ZM0 40.1V100H100V40.1ZM8 48H92.2V91.9H8Zm64.7 5.2-6.4 4.7 4.7 8.2H29.2L33.8 57.9 27.3 53.2 16.7 70 27.7 86.8 34 82.1 29.4 74h41.5l-4.6 8.1 6.6 4.7L83.5 70ZM4.3 0A4.2 4.2 0 0 0 0 4.2 4.2 4.2 0 0 0 4.3 8.5H95.4A4.2 4.2 0 0 0 99.6 4.2 4.2 4.2 0 0 0 95.4 0Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_window_maximise_24dp.xml b/app/src/main/res/drawable/ic_window_maximise_24dp.xml
index bbf5c2363a..a5e9f50da7 100644
--- a/app/src/main/res/drawable/ic_window_maximise_24dp.xml
+++ b/app/src/main/res/drawable/ic_window_maximise_24dp.xml
@@ -19,5 +19,5 @@
 <vector android:height="24dp" android:tint="@color/grey_500"
     android:viewportHeight="100" android:viewportWidth="100"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M11.6 0.1C4.7 0.7-0.7 7.6 0.1 14.4 0.1 38.9 0 63.9 0.1 88.5 0.7 95.3 7.6 101 14.4 99.8c24.5 0 49.5 0.2 74.1 0 6.8-0.4 12.5-7.2 11.3-14.4 0-24.5 0.2-49.1 0-73.8C99.4 4.7 92.6-0.7 85.4 0.1 60.9 0.1 36.3 0 11.6 0.1ZM86.9 9.3c3.8 0 4.2 3.9 3.8 6.6 0 23.8 0 48 0 71.8-1.1 4.2-5.7 2.6-8.7 3-14.7 0-29.5 0-43.8 0 0-7.9 0-15.9 0-23.4-0.9-3.8-5-6.1-8.6-5.3-6.8 0-13.5 0-20.3 0 0-16.6 0-33.2 0-49.8 1-4 5.8-2.7 8.8-2.9 23.1 0 46.2 0 68.8 0zM53.3 16.6C49.5 17 48 22.3 51 24.7c3.1 2.9 6.1 5.9 9.1 8.8-6 6.2-12.1 11.9-18.1 18.3-2.3 3 1.5 8.3 5.3 6.8 3-1.5 4.9-4.9 7.5-7.2 4.2-3.8 7.9-7.6 11.7-11.3 3.4 3 6.5 6.8 10.2 9.8 3.1 1.9 7.2-1.1 6.8-4.9 0-8.2 0-16.5 0-24.8-0.7-3.3-4.5-4.1-7.1-3.6-7.6 0-15.2 0-23.1 0z"/>
+    <path android:fillColor="#FF000000" android:pathData="M12.6-0.5C5.5-0.5-0.2 5.3-0.2 12.3v74.9c0 7 5.8 12.8 12.8 12.8h74.9c7 0 12.5-5.8 12.5-12.8V12.3C100 5.3 94.5-0.5 87.5-0.5Zm0 9h74.9c2.1 0 3.7 1.8 3.7 3.8v74.9c0 2.2-1.6 3.7-3.7 3.7H37.9V68.5c0-3.7-2.9-6.6-6.6-6.6H8.8V12.3c0-2 1.8-3.8 3.8-3.8zm41.5 7.7c-1.5 0-3.3 1-4.1 2.6-0.8 1.7-0.4 3.9 1 5.1l9.2 9.3-17.4 17.6c-1.9 1.9-1.9 4.4 0 6.2 0 0 0 0 0 0 0.8 1.2 2 1.6 3.1 1.6 1 0 2.4-0.4 3.2-1.6v0L66.6 39.7 76 48.8v0c0.7 1 2.1 1.4 3.1 1.4 0.6 0 1.2-0.2 1.7-0.4h0.1 0.1c1.4-0.8 2.8-2.5 2.8-4.1v-25c0-2.6-2.2-4.5-4.7-4.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_window_pinning_24.xml b/app/src/main/res/drawable/ic_window_pinning_24.xml
index 6f43d61995..93b276857a 100644
--- a/app/src/main/res/drawable/ic_window_pinning_24.xml
+++ b/app/src/main/res/drawable/ic_window_pinning_24.xml
@@ -19,5 +19,7 @@
 <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.9 46.6 59.8 31.3C58.5 30 55.9 30 54.5 31.3l-1.8 2C51 35 50.7 37 51.3 39c0.4 1 0 1.6-0.6 2.3l-6 6.3c-0.5 0.3-1.2 0.6-1.9 0.6h-2.6c-1.3 0-3 0.7-4 1.7l-1 1c-0.9 1-1.2 1.6-1.2 2.6 0 1.3 0.3 2 1.2 2.7l6 6.3L25.7 78c-0.9 0.7-0.9 2.3 0 3 0.3 0.3 1 0.7 1.3 0.7 0.7 0 1.4-0.4 1.7-0.7l15.5-15.6 5.8 6c1 0.7 1.7 1.3 2.7 1.3 1 0 1.8-0.6 2.5-1.3l1.3-1c1-1 1.7-2.6 1.7-4v-2.6c0-0.7 0.3-1.3 0.6-2l6.2-6c0.7-0.6 1.4-1 2.4-0.6 1.9 0.6 3.9 0.3 5.6-1.3l1.9-2c1.3-1.7 1.3-4 0-5.3zM13.7 4.2C6.3 4.2 0.3 10.2 0.3 17.5v64.9c0 7.7 6.1 13.4 13.4 13.4H87.3C95 95.8 100 90.1 100 82.4V17.5C100 10.2 95 4.2 87.3 4.2Zm-3 22.6h79.5v55.6c0 1.7-1.3 2.9-2.9 2.9H13.7c-1.7 0-3-1.2-3-2.9zm-10.7-1c0.6-17.2 0.3-8.6 0 0z"/>
+    <path
+        android:fillColor="@android:color/darker_gray"
+        android:pathData="M12.6 4.2C5.7 4.2 0 9.9 0 16.8v66.5c0 7.1 5.7 12.5 12.6 12.5h74.8c7 0 12.6-5.4 12.6-12.5V16.8C100 9.9 94.4 4.2 87.4 4.2ZM8.5 25.2H91.4v58.1c0 2.5-1.5 4-4 4H12.6c-2.3 0-4.1-1.5-4.1-4zm48.3 5c-1 0-2 0.4-2.8 1l-1.9 2c-1.7 1.8-2 3.8-1.4 5.8 0.4 1 0 1.6-0.6 2.2l-5.9 6.3c-0.6 0.3-1.3 0.6-2 0.6h-2.6c-1.3 0-3 0.7-4.1 1.7l-1 1c-1 1.1-1.3 1.7-1.3 2.7 0 1.3 0.3 2 1.4 2.8h-0.1l6 6.2L25 77.9c-1.1 0.8-1.1 2.4 0 3.2 0.3 0.3 1 0.7 1.3 0.7 0.7 0 1.4-0.4 1.8-0.7l15.5-15.6 5.9 6v0c1 0.7 1.7 1.3 2.7 1.3 1 0 1.9-0.6 2.6-1.3l1.4-1c1-1.1 1.7-2.7 1.7-4.1v-2.6c0-0.7 0.3-1.3 0.6-2l6.3-5.9c0.6-0.6 1.3-1 2.3-0.6 1.9 0.6 3.9 0.3 5.7-1.3l2-2.1v0c1.3-1.7 1.3-4 0-5.4L59.5 31.2c-0.7-0.6-1.7-1-2.7-1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_workspace_overlay_24dp.xml b/app/src/main/res/drawable/ic_workspace_overlay_24dp.xml
index 590a7b44d5..edd8044c34 100644
--- a/app/src/main/res/drawable/ic_workspace_overlay_24dp.xml
+++ b/app/src/main/res/drawable/ic_workspace_overlay_24dp.xml
@@ -1,6 +1,6 @@
 <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="#000000"
-        android:pathData="m22.8 56.2v5.4c0 2.1 2 4 4.4 4h12.7l-0.7 6.9h-3.5v3.8h3.1 22.2 3.1v-3.8h-3.5l-0.8-6.9h12.7c2.5 0 4.5-1.9 4.5-4V56.2ZM72.5 27.9H27.2c-2.4 0-4.4 1.8-4.4 4v0.8L23 52.5H77V31.9c0-2.2-2-4-4.5-4zM95.1 50C95.1 61.9 90.3 73.4 81.8 81.8 73.4 90.3 61.9 95 50 95 38.1 95 26.6 90.2 18.2 81.8 9.7 73.4 5 61.9 5 50 5 38 9.7 26.6 18.2 18.1 26.6 9.7 38.1 5 50 5 61.9 4.9 73.4 9.7 81.8 18.1 90.3 26.5 95.1 38 95.1 50Z"
+        android:pathData="M50 5A45 45 0 0 0 5 50 45 45 0 0 0 50 95 45 45 0 0 0 95 50 45 45 0 0 0 50 5ZM24.9 26.9h50.2c1.9 0 3.3 1.5 3.3 3.3v33.1c0 1.9-1.4 3.3-3.3 3.3H24.9c-1.8 0-3.3-1.4-3.3-3.3V30.2c0-1.8 1.5-3.3 3.3-3.3zm16.3 43h17.6v4.9h9c0.9 0 1.6 0.8 1.6 1.7 0 0.9-0.7 1.7-1.6 1.7H32.3c-1 0-1.7-0.8-1.7-1.7 0-0.9 0.7-1.7 1.7-1.7h8.9z"
         android:strokeWidth="1"/>
 </vector>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index d0a3c26136..676bab7dc4 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -31,6 +31,7 @@
 		<SwitchPreferenceCompat android:key="open_links_in_special_window_pref"
 			android:title="@string/prefs_open_links_in_special_window_title"
 			android:summary="@string/prefs_open_links_in_special_window_summary"
+			android:icon="@drawable/ic_link_window_24dp"/>
 			android:defaultValue="true"/>
 		<SwitchPreferenceCompat android:key="screen_keep_on_pref"
 			android:title="@string/prefs_screen_keep_on_title"
@@ -39,6 +40,7 @@
 		<SwitchPreferenceCompat android:key="double_tap_to_fullscreen"
 			android:title="@string/prefs_double_tap_to_fullscreen_title"
 			android:summary="@string/prefs_double_tap_to_fullscreen_summary"
+			android:icon="@drawable/ic_full_screen_24"/>
 			android:defaultValue="true"
 			/>
 		<SwitchPreferenceCompat android:key="auto_fullscreen_pref"
@@ -63,6 +65,7 @@
 			android:summary="@string/prefs_night_mode_summary"
 			android:entries="@array/prefs_night_mode_descriptions"
 			android:entryValues="@array/prefs_night_mode_values"
+			android:icon="@drawable/ic_night_mode_24"/>
 			android:defaultValue="@string/prefs_night_mode_manual"/>
 	</PreferenceCategory>
 	<PreferenceCategory
@@ -73,6 +76,7 @@
 			android:summary="@string/prefs_interface_locale_summary"
 			android:entries="@array/prefs_interface_locale_descriptions"
 			android:entryValues="@array/prefs_interface_locale_values"
+			android:icon="@drawable/ic_application_language_24dp"/>
 			android:defaultValue=""/>
 
 		<SwitchPreferenceCompat android:key="full_screen_hide_buttons_pref"
@@ -93,6 +97,7 @@
 		<SwitchPreferenceCompat android:key="show_active_window_indicator"
 			android:title="@string/active_window_indicator_title"
 			android:summary="@string/active_window_indicator_summary"
+			android:icon="@drawable/ic_active_window_24dp"/>
 			android:defaultValue="true"
 			/>