From 9b08ebcc1d835673c94516b7f2dd6d071f5834e9 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 3 Feb 2023 19:21:14 -0500
Subject: [PATCH] Update QR code and send symbols.

---
 .../ScheduledMessagesBottomSheet.kt           |  2 +-
 .../main/res/drawable/ic_qrcode_24_tinted.xml | 36 -------------------
 .../symbol_calendar_compact_light_16.xml      | 28 +++++++++++++++
 .../main/res/drawable/symbol_qrcode_24.xml    | 30 ++++++++++++++++
 app/src/main/res/drawable/symbol_send_24.xml  | 10 ++++++
 .../layout/group_link_share_bottom_sheet.xml  | 16 +++++----
 .../res/layout/payments_transfer_fragment.xml |  7 ++--
 7 files changed, 83 insertions(+), 46 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_qrcode_24_tinted.xml
 create mode 100644 app/src/main/res/drawable/symbol_calendar_compact_light_16.xml
 create mode 100644 app/src/main/res/drawable/symbol_qrcode_24.xml
 create mode 100644 app/src/main/res/drawable/symbol_send_24.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
index 4aebbbd35..0765671ce 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ScheduledMessagesBottomSheet.kt
@@ -163,7 +163,7 @@ class ScheduledMessagesBottomSheet : FixedRoundedCornerBottomSheetDialogFragment
     if (canCopy) {
       items.add(ActionItem(R.drawable.symbol_copy_android_24, resources.getString(R.string.conversation_selection__menu_copy), action = { handleCopyMessage(message) }))
     }
-    items.add(ActionItem(R.drawable.ic_send_outline_24, resources.getString(R.string.ScheduledMessagesBottomSheet_menu_send_now), action = { handleSendMessageNow(messageRecord) }))
+    items.add(ActionItem(R.drawable.symbol_send_24, resources.getString(R.string.ScheduledMessagesBottomSheet_menu_send_now), action = { handleSendMessageNow(messageRecord) }))
     items.add(ActionItem(R.drawable.symbol_calendar_24, resources.getString(R.string.ScheduledMessagesBottomSheet_menu_reschedule), action = { handleRescheduleMessage(messageRecord) }))
     return items
   }
diff --git a/app/src/main/res/drawable/ic_qrcode_24_tinted.xml b/app/src/main/res/drawable/ic_qrcode_24_tinted.xml
deleted file mode 100644
index 799b8c118..000000000
--- a/app/src/main/res/drawable/ic_qrcode_24_tinted.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M3,3V8.2H8.2V3ZM6.8,6.8H4.5V4.5H6.8Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M3,15.8L3,21L8.2,21L8.2,15.8ZM6.8,19.5L4.5,19.5L4.5,17.3L6.8,17.3Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M15.8,3L15.8,8.2L21,8.2L21,3ZM19.5,6.8L17.3,6.8L17.3,4.5h2.2Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M19.5,9.8v4.4H15.8v1.5H21V9.8Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M15.8,17.2V21h1.5V18.7h2.2V21H21V17.2Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M9.8,3V4.5h2.9V8.2h1.5V3Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M12.7,9.8v3H9.8v4.5h2.9V21h1.5V15.7H11.3V14.2h2.9V11.3h1.6v1.5h1.4v-3Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M11.3,18.8H9.8V21h1.5Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M8.2,12.8H6v1.4H8.2Z" />
-    <path
-        android:fillColor="@color/signal_icon_tint_primary"
-        android:pathData="M9.8,6V9.8H3v4.5H4.5v-3h6.8V6Z" />
-</vector>
diff --git a/app/src/main/res/drawable/symbol_calendar_compact_light_16.xml b/app/src/main/res/drawable/symbol_calendar_compact_light_16.xml
new file mode 100644
index 000000000..cfac69ae6
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_calendar_compact_light_16.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M4.117,8.417C4.117,7.929 4.512,7.533 5,7.533C5.488,7.533 5.883,7.929 5.883,8.417C5.883,8.905 5.488,9.3 5,9.3C4.512,9.3 4.117,8.905 4.117,8.417Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M4.117,11.417C4.117,10.929 4.512,10.533 5,10.533C5.488,10.533 5.883,10.929 5.883,11.417C5.883,11.905 5.488,12.3 5,12.3C4.512,12.3 4.117,11.905 4.117,11.417Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M10.117,8.417C10.117,7.929 10.512,7.533 11,7.533C11.488,7.533 11.883,7.929 11.883,8.417C11.883,8.905 11.488,9.3 11,9.3C10.512,9.3 10.117,8.905 10.117,8.417Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M10.117,11.417C10.117,10.929 10.512,10.533 11,10.533C11.488,10.533 11.883,10.929 11.883,11.417C11.883,11.905 11.488,12.3 11,12.3C10.512,12.3 10.117,11.905 10.117,11.417Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M7.117,8.417C7.117,7.929 7.512,7.533 8,7.533C8.488,7.533 8.883,7.929 8.883,8.417C8.883,8.905 8.488,9.3 8,9.3C7.512,9.3 7.117,8.905 7.117,8.417Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M7.117,11.417C7.117,10.929 7.512,10.533 8,10.533C8.488,10.533 8.883,10.929 8.883,11.417C8.883,11.905 8.488,12.3 8,12.3C7.512,12.3 7.117,11.905 7.117,11.417Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M5.55,1.167C5.55,0.863 5.304,0.617 5,0.617C4.696,0.617 4.45,0.863 4.45,1.167V2.488C4.012,2.526 3.632,2.604 3.282,2.782C2.708,3.075 2.241,3.541 1.949,4.115C1.767,4.473 1.689,4.862 1.652,5.313C1.617,5.753 1.617,6.296 1.617,6.976V10.024C1.617,10.704 1.617,11.247 1.652,11.687C1.689,12.138 1.767,12.527 1.949,12.885C2.241,13.459 2.708,13.925 3.282,14.218C3.64,14.4 4.029,14.477 4.48,14.514C4.919,14.55 5.463,14.55 6.143,14.55H9.857C10.537,14.55 11.081,14.55 11.52,14.514C11.971,14.477 12.36,14.4 12.718,14.218C13.292,13.925 13.758,13.459 14.051,12.885C14.233,12.527 14.311,12.138 14.347,11.687C14.383,11.247 14.383,10.704 14.383,10.024V6.976C14.383,6.296 14.383,5.753 14.347,5.313C14.311,4.862 14.233,4.473 14.051,4.115C13.758,3.541 13.292,3.075 12.718,2.782C12.368,2.604 11.988,2.526 11.55,2.488V1.167C11.55,0.863 11.304,0.617 11,0.617C10.696,0.617 10.45,0.863 10.45,1.167V2.451C10.265,2.45 10.067,2.45 9.857,2.45H6.143C5.932,2.45 5.735,2.45 5.55,2.451V1.167ZM4.569,3.582C4.187,3.614 3.958,3.672 3.781,3.763C3.414,3.95 3.116,4.248 2.929,4.615C2.849,4.772 2.793,4.971 2.76,5.283H13.24C13.207,4.971 13.151,4.772 13.071,4.615C12.884,4.248 12.585,3.95 12.219,3.763C12.042,3.672 11.813,3.614 11.431,3.582C11.041,3.55 10.542,3.55 9.833,3.55H6.167C5.457,3.55 4.959,3.55 4.569,3.582ZM2.717,7C2.717,6.774 2.717,6.57 2.718,6.383H13.282C13.283,6.57 13.283,6.774 13.283,7V10C13.283,10.709 13.283,11.208 13.251,11.597C13.22,11.98 13.161,12.208 13.071,12.385C12.884,12.752 12.585,13.05 12.219,13.238C12.042,13.328 11.813,13.387 11.431,13.418C11.041,13.45 10.542,13.45 9.833,13.45H6.167C5.457,13.45 4.959,13.45 4.569,13.418C4.187,13.387 3.958,13.328 3.781,13.238C3.414,13.05 3.116,12.752 2.929,12.385C2.839,12.208 2.78,11.98 2.749,11.597C2.717,11.208 2.717,10.709 2.717,10V7Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_qrcode_24.xml b/app/src/main/res/drawable/symbol_qrcode_24.xml
new file mode 100644
index 000000000..9a2b32753
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_qrcode_24.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.25,6A0.75,0.75 0,0 1,6 5.25h1a0.75,0.75 0,0 1,0.75 0.75v1a0.75,0.75 0,0 1,-0.75 0.75H6A0.75,0.75 0,0 1,5.25 7V6Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M5.117,1.875h2.766c0.392,0 0.737,0 1.023,0.023 0.305,0.025 0.618,0.08 0.922,0.236 0.447,0.228 0.81,0.59 1.038,1.038 0.155,0.304 0.21,0.617 0.236,0.922 0.023,0.286 0.023,0.631 0.023,1.023v2.766c0,0.392 0,0.737 -0.023,1.023 -0.025,0.305 -0.08,0.618 -0.236,0.922 -0.228,0.447 -0.59,0.81 -1.038,1.038 -0.304,0.155 -0.617,0.21 -0.922,0.236 -0.286,0.023 -0.631,0.023 -1.023,0.023L5.117,11.125c-0.392,0 -0.737,0 -1.023,-0.023 -0.305,-0.025 -0.618,-0.08 -0.922,-0.236a2.375,2.375 0,0 1,-1.038 -1.038c-0.155,-0.304 -0.21,-0.617 -0.236,-0.922a13.474,13.474 0,0 1,-0.023 -1.023L1.875,5.117c0,-0.392 0,-0.737 0.023,-1.023 0.025,-0.305 0.08,-0.618 0.236,-0.922 0.228,-0.447 0.59,-0.81 1.038,-1.038 0.304,-0.155 0.617,-0.21 0.922,-0.236 0.286,-0.023 0.631,-0.023 1.023,-0.023ZM4.237,3.643c-0.197,0.016 -0.254,0.042 -0.27,0.05a0.625,0.625 0,0 0,-0.274 0.273c-0.008,0.017 -0.034,0.074 -0.05,0.27 -0.017,0.206 -0.018,0.48 -0.018,0.914v2.7c0,0.434 0,0.708 0.018,0.914 0.016,0.196 0.042,0.253 0.05,0.27 0.06,0.117 0.156,0.213 0.273,0.273 0.017,0.008 0.074,0.034 0.27,0.05 0.206,0.017 0.48,0.018 0.914,0.018h2.7c0.434,0 0.708,0 0.914,-0.018 0.196,-0.016 0.253,-0.042 0.27,-0.05a0.625,0.625 0,0 0,0.273 -0.273c0.008,-0.017 0.034,-0.074 0.05,-0.27 0.017,-0.206 0.018,-0.48 0.018,-0.914v-2.7c0,-0.434 0,-0.708 -0.018,-0.914 -0.016,-0.196 -0.042,-0.253 -0.05,-0.27a0.625,0.625 0,0 0,-0.273 -0.273c-0.017,-0.008 -0.074,-0.034 -0.27,-0.05a12.67,12.67 0,0 0,-0.914 -0.018h-2.7c-0.434,0 -0.708,0 -0.914,0.018Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M6,16.25a0.75,0.75 0,0 0,-0.75 0.75v1c0,0.414 0.336,0.75 0.75,0.75h1a0.75,0.75 0,0 0,0.75 -0.75v-1a0.75,0.75 0,0 0,-0.75 -0.75H6Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M5.117,12.875h2.766c0.392,0 0.737,0 1.023,0.023 0.305,0.025 0.618,0.08 0.922,0.236 0.447,0.228 0.81,0.59 1.038,1.038 0.155,0.304 0.21,0.617 0.236,0.922 0.023,0.286 0.023,0.631 0.023,1.023v2.766c0,0.392 0,0.737 -0.023,1.024 -0.025,0.304 -0.08,0.617 -0.236,0.921 -0.228,0.447 -0.59,0.81 -1.038,1.038 -0.304,0.155 -0.617,0.21 -0.922,0.236 -0.286,0.023 -0.631,0.023 -1.023,0.023L5.117,22.125c-0.392,0 -0.737,0 -1.023,-0.023 -0.305,-0.025 -0.618,-0.08 -0.922,-0.236a2.375,2.375 0,0 1,-1.038 -1.038c-0.155,-0.304 -0.21,-0.617 -0.236,-0.921a13.476,13.476 0,0 1,-0.023 -1.024v-2.766c0,-0.392 0,-0.737 0.023,-1.023 0.025,-0.305 0.08,-0.618 0.236,-0.922 0.228,-0.447 0.59,-0.81 1.038,-1.038 0.304,-0.155 0.617,-0.21 0.922,-0.236 0.286,-0.023 0.631,-0.023 1.023,-0.023ZM4.237,14.643c-0.197,0.015 -0.254,0.042 -0.27,0.05a0.625,0.625 0,0 0,-0.274 0.273c-0.008,0.017 -0.034,0.074 -0.05,0.27 -0.017,0.206 -0.018,0.48 -0.018,0.914v2.7c0,0.434 0,0.708 0.018,0.914 0.016,0.196 0.042,0.253 0.05,0.27 0.06,0.117 0.156,0.213 0.273,0.273 0.017,0.008 0.074,0.035 0.27,0.05 0.206,0.017 0.48,0.018 0.914,0.018h2.7c0.434,0 0.708,0 0.914,-0.017 0.196,-0.017 0.253,-0.043 0.27,-0.051a0.625,0.625 0,0 0,0.273 -0.273c0.008,-0.017 0.034,-0.074 0.05,-0.27 0.017,-0.206 0.018,-0.48 0.018,-0.914v-2.7c0,-0.434 0,-0.708 -0.018,-0.914 -0.016,-0.196 -0.042,-0.253 -0.05,-0.27a0.625,0.625 0,0 0,-0.273 -0.273c-0.017,-0.008 -0.074,-0.034 -0.27,-0.05 -0.206,-0.017 -0.48,-0.018 -0.914,-0.018h-2.7c-0.434,0 -0.708,0 -0.914,0.018Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17,5.25a0.75,0.75 0,0 0,-0.75 0.75v1c0,0.414 0.336,0.75 0.75,0.75h1a0.75,0.75 0,0 0,0.75 -0.75V6a0.75,0.75 0,0 0,-0.75 -0.75h-1Z"
+      android:fillColor="#000"/>
+  <path
+      android:pathData="M16.117,1.875c-0.392,0 -0.737,0 -1.023,0.023 -0.305,0.025 -0.618,0.08 -0.922,0.236 -0.447,0.228 -0.81,0.59 -1.038,1.038 -0.155,0.304 -0.21,0.617 -0.236,0.922 -0.023,0.286 -0.023,0.631 -0.023,1.023v2.766c0,0.392 0,0.737 0.023,1.023 0.025,0.305 0.08,0.618 0.236,0.922 0.228,0.447 0.59,0.81 1.038,1.038 0.304,0.155 0.617,0.21 0.922,0.236 0.286,0.023 0.631,0.023 1.023,0.023h2.766c0.392,0 0.737,0 1.024,-0.023 0.304,-0.025 0.617,-0.08 0.921,-0.236 0.447,-0.228 0.81,-0.59 1.038,-1.038 0.155,-0.304 0.21,-0.617 0.236,-0.922 0.023,-0.286 0.023,-0.631 0.023,-1.023L22.125,5.117c0,-0.392 0,-0.737 -0.023,-1.023 -0.025,-0.305 -0.08,-0.618 -0.236,-0.922a2.375,2.375 0,0 0,-1.038 -1.038c-0.304,-0.155 -0.617,-0.21 -0.921,-0.236a13.476,13.476 0,0 0,-1.024 -0.023h-2.766ZM14.967,3.693c0.016,-0.008 0.073,-0.034 0.27,-0.05 0.205,-0.017 0.479,-0.018 0.913,-0.018h2.7c0.434,0 0.708,0 0.914,0.018 0.196,0.016 0.253,0.042 0.27,0.05 0.117,0.06 0.213,0.156 0.273,0.273 0.008,0.017 0.035,0.074 0.05,0.27 0.017,0.206 0.018,0.48 0.018,0.914v2.7c0,0.434 0,0.708 -0.017,0.914 -0.017,0.196 -0.043,0.253 -0.051,0.27a0.625,0.625 0,0 1,-0.273 0.273c-0.017,0.008 -0.074,0.034 -0.27,0.05 -0.206,0.017 -0.48,0.018 -0.914,0.018h-2.7c-0.434,0 -0.708,0 -0.914,-0.018 -0.196,-0.016 -0.253,-0.042 -0.27,-0.05a0.625,0.625 0,0 1,-0.273 -0.273c-0.008,-0.017 -0.034,-0.074 -0.05,-0.27 -0.017,-0.206 -0.018,-0.48 -0.018,-0.914v-2.7c0,-0.434 0,-0.708 0.018,-0.914 0.015,-0.196 0.042,-0.253 0.05,-0.27a0.625,0.625 0,0 1,0.273 -0.273Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14.25,13.5a0.75,0.75 0,0 0,-0.75 0.75v1c0,0.414 0.336,0.75 0.75,0.75h1a0.75,0.75 0,0 0,0.75 -0.75v-1a0.75,0.75 0,0 0,-0.75 -0.75h-1ZM16.25,17a0.75,0.75 0,0 1,0.75 -0.75h1a0.75,0.75 0,0 1,0.75 0.75v1a0.75,0.75 0,0 1,-0.75 0.75h-1a0.75,0.75 0,0 1,-0.75 -0.75v-1ZM19,19.75a0.75,0.75 0,0 1,0.75 -0.75h1a0.75,0.75 0,0 1,0.75 0.75v1a0.75,0.75 0,0 1,-0.75 0.75h-1a0.75,0.75 0,0 1,-0.75 -0.75v-1ZM19.75,13.5a0.75,0.75 0,0 0,-0.75 0.75v1c0,0.414 0.336,0.75 0.75,0.75h1a0.75,0.75 0,0 0,0.75 -0.75v-1a0.75,0.75 0,0 0,-0.75 -0.75h-1ZM13.5,19.75a0.75,0.75 0,0 1,0.75 -0.75h1a0.75,0.75 0,0 1,0.75 0.75v1a0.75,0.75 0,0 1,-0.75 0.75h-1a0.75,0.75 0,0 1,-0.75 -0.75v-1Z"
+      android:fillColor="#000"/>
+</vector>
diff --git a/app/src/main/res/drawable/symbol_send_24.xml b/app/src/main/res/drawable/symbol_send_24.xml
new file mode 100644
index 000000000..8eb29dac2
--- /dev/null
+++ b/app/src/main/res/drawable/symbol_send_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.16,2.807a2.125,2.125 0,0 0,-3.035 1.92v14.547a2.125,2.125 0,0 0,3.036 1.92l15.333,-7.274c1.62,-0.768 1.62,-3.072 0,-3.84L6.161,2.807ZM4.875,4.727c0,-0.276 0.287,-0.457 0.536,-0.34l15.333,7.274a0.375,0.375 0,0 1,0 0.678L5.411,19.612a0.375,0.375 0,0 1,-0.536 -0.338v-4.972l7.493,-1.816a0.5,0.5 0,0 0,0 -0.972L4.875,9.698L4.875,4.726Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/group_link_share_bottom_sheet.xml b/app/src/main/res/layout/group_link_share_bottom_sheet.xml
index 3c604ad1c..3f0da492d 100644
--- a/app/src/main/res/layout/group_link_share_bottom_sheet.xml
+++ b/app/src/main/res/layout/group_link_share_bottom_sheet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light">
+    tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light"
+    tools:viewBindingIgnore="true">
 
     <LinearLayout
         android:layout_width="0dp"
@@ -42,7 +42,8 @@
             android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_share_via_signal"
             android:textAppearance="@style/Signal.Text.BodyLarge"
-            app:drawableStartCompat="@drawable/symbol_chat_24" />
+            app:drawableStartCompat="@drawable/symbol_chat_24"
+            app:drawableTint="@color/signal_colorOnSurface" />
 
         <TextView
             android:id="@+id/group_link_bottom_sheet_copy_button"
@@ -55,7 +56,8 @@
             android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_copy"
             android:textAppearance="@style/Signal.Text.BodyLarge"
-            app:drawableStartCompat="@drawable/symbol_copy_android_24" />
+            app:drawableStartCompat="@drawable/symbol_copy_android_24"
+            app:drawableTint="@color/signal_colorOnSurface" />
 
         <TextView
             android:id="@+id/group_link_bottom_sheet_qr_code_button"
@@ -68,7 +70,8 @@
             android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_qr_code"
             android:textAppearance="@style/Signal.Text.BodyLarge"
-            app:drawableStartCompat="@drawable/ic_qrcode_24_tinted" />
+            app:drawableStartCompat="@drawable/symbol_qrcode_24"
+            app:drawableTint="@color/signal_colorOnSurface" />
 
         <TextView
             android:id="@+id/group_link_bottom_sheet_share_via_system_button"
@@ -81,7 +84,8 @@
             android:paddingEnd="@dimen/dsl_settings_gutter"
             android:text="@string/GroupLinkBottomSheet_share"
             android:textAppearance="@style/Signal.Text.BodyLarge"
-            app:drawableStartCompat="@drawable/symbol_share_android_24" />
+            app:drawableStartCompat="@drawable/symbol_share_android_24"
+            app:drawableTint="@color/signal_colorOnSurface" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/payments_transfer_fragment.xml b/app/src/main/res/layout/payments_transfer_fragment.xml
index df8f9b9cd..a4dee8b42 100644
--- a/app/src/main/res/layout/payments_transfer_fragment.xml
+++ b/app/src/main/res/layout/payments_transfer_fragment.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:viewBindingIgnore="true"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/payments_transfer_toolbar"
@@ -45,7 +45,8 @@
         app:layout_constraintBottom_toBottomOf="@+id/payments_transfer_to_address"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/payments_transfer_toolbar"
-        app:srcCompat="@drawable/ic_qrcode_24_tinted"
+        app:srcCompat="@drawable/symbol_qrcode_24"
+        app:tint="@color/signal_colorOnSurface"
         tools:ignore="RtlSymmetry" />
 
     <TextView