From 5d1d0fb12a254a6eb0a19dba4418e0eec79e8df9 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 19 Oct 2022 16:04:11 -0300
Subject: [PATCH] Replace illustration for adding contacts nearby

---
 briar-android/artwork/il_qr_code_dark.svg     |  20 ++
 briar-android/artwork/il_qr_code_light.svg    |  20 ++
 .../artwork/il_qr_code_nearby_dark.svg        |  49 +++++
 .../artwork/il_qr_code_nearby_light.svg       |  49 +++++
 briar-android/artwork/qr_code.svg             |  67 -------
 .../nearby/AddNearbyContactIntroFragment.java |   9 -
 .../main/res/drawable-night/il_qr_code.xml    |  70 +++++++
 .../res/drawable-night/il_qr_code_nearby.xml  | 176 ++++++++++++++++++
 .../drawable-night/qr_code_explanation.xml    |  28 ---
 .../main/res/drawable/border_explanation.xml  |  13 --
 .../src/main/res/drawable/il_qr_code.xml      |  70 +++++++
 .../main/res/drawable/il_qr_code_nearby.xml   | 176 ++++++++++++++++++
 .../main/res/drawable/qr_code_explanation.xml |  29 ---
 .../src/main/res/drawable/qr_code_intro.xml   |  24 ---
 .../layout-land/fragment_keyagreement_id.xml  | 154 ++++++++-------
 .../res/layout/fragment_keyagreement_id.xml   | 141 +++++++-------
 .../src/main/res/values-night/color.xml       |   2 +-
 briar-android/src/main/res/values/color.xml   |   3 +-
 briar-android/src/main/res/values/strings.xml |   1 +
 19 files changed, 778 insertions(+), 323 deletions(-)
 create mode 100644 briar-android/artwork/il_qr_code_dark.svg
 create mode 100644 briar-android/artwork/il_qr_code_light.svg
 create mode 100644 briar-android/artwork/il_qr_code_nearby_dark.svg
 create mode 100644 briar-android/artwork/il_qr_code_nearby_light.svg
 delete mode 100644 briar-android/artwork/qr_code.svg
 create mode 100644 briar-android/src/main/res/drawable-night/il_qr_code.xml
 create mode 100644 briar-android/src/main/res/drawable-night/il_qr_code_nearby.xml
 delete mode 100644 briar-android/src/main/res/drawable-night/qr_code_explanation.xml
 delete mode 100644 briar-android/src/main/res/drawable/border_explanation.xml
 create mode 100644 briar-android/src/main/res/drawable/il_qr_code.xml
 create mode 100644 briar-android/src/main/res/drawable/il_qr_code_nearby.xml
 delete mode 100644 briar-android/src/main/res/drawable/qr_code_explanation.xml
 delete mode 100644 briar-android/src/main/res/drawable/qr_code_intro.xml

diff --git a/briar-android/artwork/il_qr_code_dark.svg b/briar-android/artwork/il_qr_code_dark.svg
new file mode 100644
index 000000000..3ca2dafb9
--- /dev/null
+++ b/briar-android/artwork/il_qr_code_dark.svg
@@ -0,0 +1,20 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M101.813 89.0796L92.5043 83.8145L92.5043 94.3447L101.813 89.0796Z" fill="#A3E635"/>
+<path d="M92.9893 102.92L102.298 108.185L102.298 97.6553L92.9893 102.92Z" fill="#52ADF9"/>
+<path d="M6.40137 36.0312C6.40137 29.4038 11.774 24.0312 18.4014 24.0312H72.4014C79.0288 24.0312 84.4014 29.4038 84.4014 36.0312V157.031C84.4014 163.659 79.0288 169.031 72.4014 169.031H18.4014C11.7739 169.031 6.40137 163.659 6.40137 157.031V36.0312Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.4014 25.5312H18.4014C12.6024 25.5312 7.90137 30.2323 7.90137 36.0312V157.031C7.90137 162.83 12.6024 167.531 18.4014 167.531H72.4014C78.2004 167.531 82.9014 162.83 82.9014 157.031V36.0312C82.9014 30.2323 78.2004 25.5312 72.4014 25.5312ZM18.4014 24.0312C11.774 24.0312 6.40137 29.4038 6.40137 36.0312V157.031C6.40137 163.659 11.7739 169.031 18.4014 169.031H72.4014C79.0288 169.031 84.4014 163.659 84.4014 157.031V36.0312C84.4014 29.4038 79.0288 24.0312 72.4014 24.0312H18.4014Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.4014 36.4092C44.5729 36.4092 43.9014 35.7376 43.9014 34.9092C43.9014 34.0808 44.5729 33.4092 45.4014 33.4092C46.2298 33.4092 46.9014 34.0808 46.9014 34.9092C46.9014 35.7376 46.2298 36.4092 45.4014 36.4092ZM45.4014 37.9092C43.7445 37.9092 42.4014 36.566 42.4014 34.9092C42.4014 33.2523 43.7445 31.9092 45.4014 31.9092C47.0582 31.9092 48.4014 33.2523 48.4014 34.9092C48.4014 36.566 47.0582 37.9092 45.4014 37.9092Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.6514 34.5923C26.6514 34.1781 26.9872 33.8423 27.4014 33.8423H37.4014C37.8156 33.8423 38.1514 34.1781 38.1514 34.5923C38.1514 35.0065 37.8156 35.3423 37.4014 35.3423H27.4014C26.9872 35.3423 26.6514 35.0065 26.6514 34.5923Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M52.6514 34.5923C52.6514 34.1781 52.9872 33.8423 53.4014 33.8423L63.4014 33.8423C63.8156 33.8423 64.1514 34.1781 64.1514 34.5923C64.1514 35.0065 63.8156 35.3423 63.4014 35.3423L53.4014 35.3423C52.9872 35.3423 52.6514 35.0065 52.6514 34.5923Z" fill="#A3E635"/>
+<path d="M77.4014 51.6338C77.4014 47.2155 73.8196 43.6338 69.4014 43.6338H21.4014C16.9831 43.6338 13.4014 47.2155 13.4014 51.6338V147.634C13.4014 152.052 16.9831 155.634 21.4014 155.634H69.4014C73.8196 155.634 77.4014 152.052 77.4014 147.634V51.6338Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4014 45.1338H69.4014C72.9912 45.1338 75.9014 48.0439 75.9014 51.6338V147.634C75.9014 151.224 72.9912 154.134 69.4014 154.134H21.4014C17.8115 154.134 14.9014 151.224 14.9014 147.634V51.6338C14.9014 48.0439 17.8115 45.1338 21.4014 45.1338ZM69.4014 43.6338C73.8196 43.6338 77.4014 47.2155 77.4014 51.6338V147.634C77.4014 152.052 73.8196 155.634 69.4014 155.634H21.4014C16.9831 155.634 13.4014 152.052 13.4014 147.634V51.6338C13.4014 47.2155 16.9831 43.6338 21.4014 43.6338H69.4014Z" fill="#A3E635"/>
+<path d="M51.068 114H47.2902V110.222H51.068V114ZM47.2902 100.778H43.5125V110.222H47.2902V100.778ZM62.4014 97H58.6236V104.556H62.4014V97ZM58.6236 93.2222H54.8458V97H58.6236V93.2222ZM35.9569 97H32.1791V100.778H35.9569V97ZM32.1791 93.2222H28.4014V97H32.1791V93.2222ZM45.4014 83.7778H49.1791V80H45.4014V83.7778ZM31.2347 82.8333V88.5H36.9014V82.8333H31.2347ZM39.7347 91.3333H28.4014V80H39.7347V91.3333ZM31.2347 105.5V111.167H36.9014V105.5H31.2347ZM39.7347 114H28.4014V102.667H39.7347V114ZM53.9014 82.8333V88.5H59.568V82.8333H53.9014ZM62.4014 91.3333H51.068V80H56.7347H62.4014V91.3333ZM58.6236 110.222V104.556H51.068V108.333H54.8458V114H62.4014V110.222H58.6236ZM54.8458 97H47.2902V100.778H54.8458V97ZM47.2902 93.2222H35.9569V97H39.7347V100.778H43.5125V97H47.2902V93.2222ZM49.1791 91.3333V87.5556H45.4014V83.7778H41.6236V91.3333H49.1791ZM35.4847 84.25H32.6513V87.0833H35.4847V84.25ZM35.4847 106.917H32.6513V109.75H35.4847V106.917ZM58.1514 84.25H55.318V87.0833H58.1514V84.25Z" fill="#A3E635"/>
+<path d="M109.401 35.9502C109.401 29.3228 114.774 23.9502 121.401 23.9502H175.401C182.029 23.9502 187.401 29.3228 187.401 35.9502V156.95C187.401 163.578 182.029 168.95 175.401 168.95H121.401C114.774 168.95 109.401 163.578 109.401 156.95V35.9502Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M175.401 25.4502H121.401C115.602 25.4502 110.901 30.1512 110.901 35.9502V156.95C110.901 162.749 115.602 167.45 121.401 167.45H175.401C181.2 167.45 185.901 162.749 185.901 156.95V35.9502C185.901 30.1512 181.2 25.4502 175.401 25.4502ZM121.401 23.9502C114.774 23.9502 109.401 29.3228 109.401 35.9502V156.95C109.401 163.578 114.774 168.95 121.401 168.95H175.401C182.029 168.95 187.401 163.578 187.401 156.95V35.9502C187.401 29.3228 182.029 23.9502 175.401 23.9502H121.401Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148.401 36.4092C147.573 36.4092 146.901 35.7376 146.901 34.9092C146.901 34.0808 147.573 33.4092 148.401 33.4092C149.23 33.4092 149.901 34.0808 149.901 34.9092C149.901 35.7376 149.23 36.4092 148.401 36.4092ZM148.401 37.9092C146.745 37.9092 145.401 36.566 145.401 34.9092C145.401 33.2523 146.745 31.9092 148.401 31.9092C150.058 31.9092 151.401 33.2523 151.401 34.9092C151.401 36.566 150.058 37.9092 148.401 37.9092Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M129.651 34.5923C129.651 34.1781 129.987 33.8423 130.401 33.8423H140.401C140.816 33.8423 141.151 34.1781 141.151 34.5923C141.151 35.0065 140.816 35.3423 140.401 35.3423H130.401C129.987 35.3423 129.651 35.0065 129.651 34.5923Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M155.651 34.5923C155.651 34.1781 155.987 33.8423 156.401 33.8423L166.401 33.8423C166.816 33.8423 167.151 34.1781 167.151 34.5923C167.151 35.0065 166.816 35.3423 166.401 35.3423L156.401 35.3423C155.987 35.3423 155.651 35.0065 155.651 34.5923Z" fill="#52ADF9"/>
+<path d="M180.401 51.6338C180.401 47.2155 176.82 43.6338 172.401 43.6338H124.401C119.983 43.6338 116.401 47.2155 116.401 51.6338V147.634C116.401 152.052 119.983 155.634 124.401 155.634H172.401C176.82 155.634 180.401 152.052 180.401 147.634V51.6338Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.401 45.1338H172.401C175.991 45.1338 178.901 48.0439 178.901 51.6338V147.634C178.901 151.224 175.991 154.134 172.401 154.134H124.401C120.812 154.134 117.901 151.224 117.901 147.634V51.6338C117.901 48.0439 120.812 45.1338 124.401 45.1338ZM172.401 43.6338C176.82 43.6338 180.401 47.2155 180.401 51.6338V147.634C180.401 152.052 176.82 155.634 172.401 155.634H124.401C119.983 155.634 116.401 152.052 116.401 147.634V51.6338C116.401 47.2155 119.983 43.6338 124.401 43.6338H172.401Z" fill="#52ADF9"/>
+<path d="M154.068 114H150.29V110.222H154.068V114ZM150.29 100.778H146.512V110.222H150.29V100.778ZM165.401 97H161.624V104.556H165.401V97ZM161.624 93.2222H157.846V97H161.624V93.2222ZM138.957 97H135.179V100.778H138.957V97ZM135.179 93.2222H131.401V97H135.179V93.2222ZM148.401 83.7778H152.179V80H148.401V83.7778ZM134.235 82.8333V88.5H139.901V82.8333H134.235ZM142.735 91.3333H131.401V80H142.735V91.3333ZM134.235 105.5V111.167H139.901V105.5H134.235ZM142.735 114H131.401V102.667H142.735V114ZM156.901 82.8333V88.5H162.568V82.8333H156.901ZM165.401 91.3333H154.068V80H159.735H165.401V91.3333ZM161.624 110.222V104.556H154.068V108.333H157.846V114H165.401V110.222H161.624ZM157.846 97H150.29V100.778H157.846V97ZM150.29 93.2222H138.957V97H142.735V100.778H146.512V97H150.29V93.2222ZM152.179 91.3333V87.5556H148.401V83.7778H144.624V91.3333H152.179ZM138.485 84.25H135.651V87.0833H138.485V84.25ZM138.485 106.917H135.651V109.75H138.485V106.917ZM161.151 84.25H158.318V87.0833H161.151V84.25Z" fill="#52ADF9"/>
+</svg>
diff --git a/briar-android/artwork/il_qr_code_light.svg b/briar-android/artwork/il_qr_code_light.svg
new file mode 100644
index 000000000..9862f9a42
--- /dev/null
+++ b/briar-android/artwork/il_qr_code_light.svg
@@ -0,0 +1,20 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M102.266 89.0796L92.9564 83.8145L92.9564 94.3447L102.266 89.0796Z" fill="#82C91E"/>
+<path d="M93.4409 102.92L102.75 108.185L102.75 97.6553L93.4409 102.92Z" fill="#2B8EF1"/>
+<path d="M6.85352 36.0312C6.85352 29.4038 12.2261 24.0312 18.8535 24.0312H72.8535C79.4809 24.0312 84.8535 29.4038 84.8535 36.0312V157.031C84.8535 163.659 79.4809 169.031 72.8535 169.031H18.8535C12.2261 169.031 6.85352 163.659 6.85352 157.031V36.0312Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.8535 25.5312H18.8535C13.0545 25.5312 8.35352 30.2323 8.35352 36.0312V157.031C8.35352 162.83 13.0545 167.531 18.8535 167.531H72.8535C78.6525 167.531 83.3535 162.83 83.3535 157.031V36.0312C83.3535 30.2323 78.6525 25.5312 72.8535 25.5312ZM18.8535 24.0312C12.2261 24.0312 6.85352 29.4038 6.85352 36.0312V157.031C6.85352 163.659 12.2261 169.031 18.8535 169.031H72.8535C79.4809 169.031 84.8535 163.659 84.8535 157.031V36.0312C84.8535 29.4038 79.4809 24.0312 72.8535 24.0312H18.8535Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.8535 36.4092C45.0251 36.4092 44.3535 35.7376 44.3535 34.9092C44.3535 34.0808 45.0251 33.4092 45.8535 33.4092C46.6819 33.4092 47.3535 34.0808 47.3535 34.9092C47.3535 35.7376 46.6819 36.4092 45.8535 36.4092ZM45.8535 37.9092C44.1967 37.9092 42.8535 36.566 42.8535 34.9092C42.8535 33.2523 44.1967 31.9092 45.8535 31.9092C47.5104 31.9092 48.8535 33.2523 48.8535 34.9092C48.8535 36.566 47.5104 37.9092 45.8535 37.9092Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.1035 34.5923C27.1035 34.1781 27.4393 33.8423 27.8535 33.8423H37.8535C38.2677 33.8423 38.6035 34.1781 38.6035 34.5923C38.6035 35.0065 38.2677 35.3423 37.8535 35.3423H27.8535C27.4393 35.3423 27.1035 35.0065 27.1035 34.5923Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M53.1035 34.5923C53.1035 34.1781 53.4393 33.8423 53.8535 33.8423L63.8535 33.8423C64.2677 33.8423 64.6035 34.1781 64.6035 34.5923C64.6035 35.0065 64.2677 35.3423 63.8535 35.3423L53.8535 35.3423C53.4393 35.3423 53.1035 35.0065 53.1035 34.5923Z" fill="#65A30D"/>
+<path d="M77.8535 51.6338C77.8535 47.2155 74.2718 43.6338 69.8535 43.6338H21.8535C17.4352 43.6338 13.8535 47.2155 13.8535 51.6338V147.634C13.8535 152.052 17.4352 155.634 21.8535 155.634H69.8535C74.2718 155.634 77.8535 152.052 77.8535 147.634V51.6338Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.8535 45.1338H69.8535C73.4434 45.1338 76.3535 48.0439 76.3535 51.6338V147.634C76.3535 151.224 73.4434 154.134 69.8535 154.134H21.8535C18.2637 154.134 15.3535 151.224 15.3535 147.634V51.6338C15.3535 48.0439 18.2637 45.1338 21.8535 45.1338ZM69.8535 43.6338C74.2718 43.6338 77.8535 47.2155 77.8535 51.6338V147.634C77.8535 152.052 74.2718 155.634 69.8535 155.634H21.8535C17.4352 155.634 13.8535 152.052 13.8535 147.634V51.6338C13.8535 47.2155 17.4352 43.6338 21.8535 43.6338H69.8535Z" fill="#65A30D"/>
+<path d="M51.5202 114H47.7424V110.222H51.5202V114ZM47.7424 100.778H43.9646V110.222H47.7424V100.778ZM62.8535 97H59.0757V104.556H62.8535V97ZM59.0757 93.2222H55.298V97H59.0757V93.2222ZM36.4091 97H32.6313V100.778H36.4091V97ZM32.6313 93.2222H28.8535V97H32.6313V93.2222ZM45.8535 83.7778H49.6313V80H45.8535V83.7778ZM31.6868 82.8333V88.5H37.3535V82.8333H31.6868ZM40.1868 91.3333H28.8535V80H40.1868V91.3333ZM31.6868 105.5V111.167H37.3535V105.5H31.6868ZM40.1868 114H28.8535V102.667H40.1868V114ZM54.3535 82.8333V88.5H60.0202V82.8333H54.3535ZM62.8535 91.3333H51.5202V80H57.1868H62.8535V91.3333ZM59.0757 110.222V104.556H51.5202V108.333H55.298V114H62.8535V110.222H59.0757ZM55.298 97H47.7424V100.778H55.298V97ZM47.7424 93.2222H36.4091V97H40.1868V100.778H43.9646V97H47.7424V93.2222ZM49.6313 91.3333V87.5556H45.8535V83.7778H42.0757V91.3333H49.6313ZM35.9368 84.25H33.1035V87.0833H35.9368V84.25ZM35.9368 106.917H33.1035V109.75H35.9368V106.917ZM58.6035 84.25H55.7702V87.0833H58.6035V84.25Z" fill="#82C91E"/>
+<path d="M109.854 36.0312C109.854 29.4038 115.226 24.0312 121.854 24.0312H175.854C182.481 24.0312 187.854 29.4038 187.854 36.0312V157.031C187.854 163.659 182.481 169.031 175.854 169.031H121.854C115.226 169.031 109.854 163.659 109.854 157.031V36.0312Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M175.854 25.5312H121.854C116.055 25.5312 111.354 30.2323 111.354 36.0312V157.031C111.354 162.83 116.055 167.531 121.854 167.531H175.854C181.653 167.531 186.354 162.83 186.354 157.031V36.0312C186.354 30.2323 181.653 25.5312 175.854 25.5312ZM121.854 24.0312C115.226 24.0312 109.854 29.4038 109.854 36.0312V157.031C109.854 163.659 115.226 169.031 121.854 169.031H175.854C182.481 169.031 187.854 163.659 187.854 157.031V36.0312C187.854 29.4038 182.481 24.0312 175.854 24.0312H121.854Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148.854 36.4092C148.025 36.4092 147.354 35.7376 147.354 34.9092C147.354 34.0808 148.025 33.4092 148.854 33.4092C149.682 33.4092 150.354 34.0808 150.354 34.9092C150.354 35.7376 149.682 36.4092 148.854 36.4092ZM148.854 37.9092C147.197 37.9092 145.854 36.566 145.854 34.9092C145.854 33.2523 147.197 31.9092 148.854 31.9092C150.51 31.9092 151.854 33.2523 151.854 34.9092C151.854 36.566 150.51 37.9092 148.854 37.9092Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M130.104 34.5923C130.104 34.1781 130.439 33.8423 130.854 33.8423H140.854C141.268 33.8423 141.604 34.1781 141.604 34.5923C141.604 35.0065 141.268 35.3423 140.854 35.3423H130.854C130.439 35.3423 130.104 35.0065 130.104 34.5923Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M156.104 34.5923C156.104 34.1781 156.439 33.8423 156.854 33.8423L166.854 33.8423C167.268 33.8423 167.604 34.1781 167.604 34.5923C167.604 35.0065 167.268 35.3423 166.854 35.3423L156.854 35.3423C156.439 35.3423 156.104 35.0065 156.104 34.5923Z" fill="#196FDE"/>
+<path d="M180.854 51.6338C180.854 47.2155 177.272 43.6338 172.854 43.6338H124.854C120.435 43.6338 116.854 47.2155 116.854 51.6338V147.634C116.854 152.052 120.435 155.634 124.854 155.634H172.854C177.272 155.634 180.854 152.052 180.854 147.634V51.6338Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.854 45.1338H172.854C176.443 45.1338 179.354 48.0439 179.354 51.6338V147.634C179.354 151.224 176.443 154.134 172.854 154.134H124.854C121.264 154.134 118.354 151.224 118.354 147.634V51.6338C118.354 48.0439 121.264 45.1338 124.854 45.1338ZM172.854 43.6338C177.272 43.6338 180.854 47.2155 180.854 51.6338V147.634C180.854 152.052 177.272 155.634 172.854 155.634H124.854C120.435 155.634 116.854 152.052 116.854 147.634V51.6338C116.854 47.2155 120.435 43.6338 124.854 43.6338H172.854Z" fill="#196FDE"/>
+<path d="M154.52 114H150.742V110.222H154.52V114ZM150.742 100.778H146.965V110.222H150.742V100.778ZM165.854 97H162.076V104.556H165.854V97ZM162.076 93.2222H158.298V97H162.076V93.2222ZM139.409 97H135.631V100.778H139.409V97ZM135.631 93.2222H131.854V97H135.631V93.2222ZM148.854 83.7778H152.631V80H148.854V83.7778ZM134.687 82.8333V88.5H140.354V82.8333H134.687ZM143.187 91.3333H131.854V80H143.187V91.3333ZM134.687 105.5V111.167H140.354V105.5H134.687ZM143.187 114H131.854V102.667H143.187V114ZM157.354 82.8333V88.5H163.02V82.8333H157.354ZM165.854 91.3333H154.52V80H160.187H165.854V91.3333ZM162.076 110.222V104.556H154.52V108.333H158.298V114H165.854V110.222H162.076ZM158.298 97H150.742V100.778H158.298V97ZM150.742 93.2222H139.409V97H143.187V100.778H146.965V97H150.742V93.2222ZM152.631 91.3333V87.5556H148.854V83.7778H145.076V91.3333H152.631ZM138.937 84.25H136.103V87.0833H138.937V84.25ZM138.937 106.917H136.103V109.75H138.937V106.917ZM161.604 84.25H158.77V87.0833H161.604V84.25Z" fill="#2B8EF1"/>
+</svg>
diff --git a/briar-android/artwork/il_qr_code_nearby_dark.svg b/briar-android/artwork/il_qr_code_nearby_dark.svg
new file mode 100644
index 000000000..c629c1b04
--- /dev/null
+++ b/briar-android/artwork/il_qr_code_nearby_dark.svg
@@ -0,0 +1,49 @@
+<svg width="289" height="144" viewBox="0 0 289 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M72.4014 56C72.4014 51.5817 68.8196 48 64.4014 48H38.4014C33.9831 48 30.4014 51.5817 30.4014 56V118C30.4014 122.418 33.9831 126 38.4014 126H64.4014C68.8196 126 72.4014 122.418 72.4014 118V56Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4014 49.5H64.4014C67.9912 49.5 70.9014 52.4101 70.9014 56V118C70.9014 121.59 67.9912 124.5 64.4014 124.5H38.4014C34.8115 124.5 31.9014 121.59 31.9014 118V56C31.9014 52.4101 34.8115 49.5 38.4014 49.5ZM64.4014 48C68.8196 48 72.4014 51.5817 72.4014 56V118C72.4014 122.418 68.8196 126 64.4014 126H38.4014C33.9831 126 30.4014 122.418 30.4014 118V56C30.4014 51.5817 33.9831 48 38.4014 48H64.4014Z" fill="#64748B"/>
+<path d="M72.4014 62.2476H30.4015V116.248H72.4014V62.2476Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.9015 63.7476H70.9014V114.748H31.9015V63.7476ZM72.4014 62.2476V116.248H30.4015V62.2476H72.4014Z" fill="#64748B"/>
+<path d="M50.4014 56.0012C50.4014 56.5541 50.8491 57.0024 51.4014 57.0024C51.9537 57.0024 52.4014 56.5541 52.4014 56.0012C52.4014 55.4482 51.9537 55 51.4014 55C50.8491 55 50.4014 55.4482 50.4014 56.0012Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.6514 56.0244C42.6514 55.6102 42.9872 55.2744 43.4014 55.2744H47.4014C47.8156 55.2744 48.1514 55.6102 48.1514 56.0244C48.1514 56.4386 47.8156 56.7744 47.4014 56.7744H43.4014C42.9872 56.7744 42.6514 56.4386 42.6514 56.0244Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.6514 56.0244C54.6514 55.6102 54.9872 55.2744 55.4014 55.2744H59.4014C59.8156 55.2744 60.1514 55.6102 60.1514 56.0244C60.1514 56.4386 59.8156 56.7744 59.4014 56.7744H55.4014C54.9872 56.7744 54.6514 56.4386 54.6514 56.0244Z" fill="#64748B"/>
+<path d="M50.4014 51C50.4014 46.5817 46.8196 43 42.4014 43H16.4014C11.9831 43 8.40137 46.5817 8.40137 51V113C8.40137 117.418 11.9831 121 16.4014 121H42.4014C46.8196 121 50.4014 117.418 50.4014 113V51Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.4014 44.5H42.4014C45.9912 44.5 48.9014 47.4101 48.9014 51V113C48.9014 116.59 45.9912 119.5 42.4014 119.5H16.4014C12.8115 119.5 9.90137 116.59 9.90137 113V51C9.90137 47.4101 12.8115 44.5 16.4014 44.5ZM42.4014 43C46.8196 43 50.4014 46.5817 50.4014 51V113C50.4014 117.418 46.8196 121 42.4014 121H16.4014C11.9831 121 8.40137 117.418 8.40137 113V51C8.40137 46.5817 11.9831 43 16.4014 43H42.4014Z" fill="#64748B"/>
+<path d="M50.4014 57.2476H8.40155V111.248H50.4014V57.2476Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.90155 58.7476H48.9014V109.748H9.90155V58.7476ZM50.4014 57.2476V111.248H8.40155V57.2476H50.4014Z" fill="#64748B"/>
+<path d="M28.4014 51.0012C28.4014 51.5541 28.8491 52.0024 29.4014 52.0024C29.9537 52.0024 30.4014 51.5541 30.4014 51.0012C30.4014 50.4482 29.9537 50 29.4014 50C28.8491 50 28.4014 50.4482 28.4014 51.0012Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.6514 51.0244C20.6514 50.6102 20.9872 50.2744 21.4014 50.2744H25.4014C25.8156 50.2744 26.1514 50.6102 26.1514 51.0244C26.1514 51.4386 25.8156 51.7744 25.4014 51.7744H21.4014C20.9872 51.7744 20.6514 51.4386 20.6514 51.0244Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.6514 51.0244C32.6514 50.6102 32.9872 50.2744 33.4014 50.2744H37.4014C37.8156 50.2744 38.1514 50.6102 38.1514 51.0244C38.1514 51.4386 37.8156 51.7744 37.4014 51.7744H33.4014C32.9872 51.7744 32.6514 51.4386 32.6514 51.0244Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M61.4014 38.5C66.6481 38.5 70.9014 34.2467 70.9014 29C70.9014 23.7533 66.6481 19.5 61.4014 19.5C56.1547 19.5 51.9014 23.7533 51.9014 29C51.9014 34.2467 56.1547 38.5 61.4014 38.5ZM61.4014 40C67.4765 40 72.4014 35.0751 72.4014 29C72.4014 22.9249 67.4765 18 61.4014 18C55.3262 18 50.4014 22.9249 50.4014 29C50.4014 35.0751 55.3262 40 61.4014 40Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M65.9549 25.994C66.2344 26.2997 66.2131 26.7741 65.9074 27.0536L59.932 32.5162L56.8953 29.7402C56.5896 29.4608 56.5683 28.9864 56.8478 28.6806C57.1273 28.3749 57.6017 28.3536 57.9074 28.6331L59.9319 30.4838L64.8953 25.9465C65.201 25.667 65.6754 25.6882 65.9549 25.994Z" fill="#A3E635"/>
+<path d="M176.401 56C176.401 51.5817 172.82 48 168.401 48H142.401C137.983 48 134.401 51.5817 134.401 56V118C134.401 122.418 137.983 126 142.401 126H168.401C172.82 126 176.401 122.418 176.401 118V56Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M142.401 49.5H168.401C171.991 49.5 174.901 52.4101 174.901 56V118C174.901 121.59 171.991 124.5 168.401 124.5H142.401C138.812 124.5 135.901 121.59 135.901 118V56C135.901 52.4101 138.812 49.5 142.401 49.5ZM168.401 48C172.82 48 176.401 51.5817 176.401 56V118C176.401 122.418 172.82 126 168.401 126H142.401C137.983 126 134.401 122.418 134.401 118V56C134.401 51.5817 137.983 48 142.401 48H168.401Z" fill="#64748B"/>
+<path d="M176.401 62.2476H134.402V116.248H176.401V62.2476Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M135.902 63.7476H174.901V114.748H135.902V63.7476ZM176.401 62.2476V116.248H134.402V62.2476H176.401Z" fill="#64748B"/>
+<path d="M154.401 56.0012C154.401 56.5541 154.849 57.0024 155.401 57.0024C155.954 57.0024 156.401 56.5541 156.401 56.0012C156.401 55.4482 155.954 55 155.401 55C154.849 55 154.401 55.4482 154.401 56.0012Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M146.651 56.0244C146.651 55.6102 146.987 55.2744 147.401 55.2744H151.401C151.816 55.2744 152.151 55.6102 152.151 56.0244C152.151 56.4386 151.816 56.7744 151.401 56.7744H147.401C146.987 56.7744 146.651 56.4386 146.651 56.0244Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M158.651 56.0244C158.651 55.6102 158.987 55.2744 159.401 55.2744H163.401C163.816 55.2744 164.151 55.6102 164.151 56.0244C164.151 56.4386 163.816 56.7744 163.401 56.7744H159.401C158.987 56.7744 158.651 56.4386 158.651 56.0244Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M161.871 25.4697C162.164 25.1768 162.639 25.1768 162.932 25.4697L165.401 27.9393L167.871 25.4697C168.164 25.1768 168.639 25.1768 168.932 25.4697C169.225 25.7626 169.225 26.2374 168.932 26.5303L166.462 29L168.932 31.4697C169.225 31.7626 169.225 32.2374 168.932 32.5303C168.639 32.8232 168.164 32.8232 167.871 32.5303L165.401 30.0607L162.932 32.5303C162.639 32.8232 162.164 32.8232 161.871 32.5303C161.578 32.2374 161.578 31.7626 161.871 31.4697L164.341 29L161.871 26.5303C161.578 26.2374 161.578 25.7626 161.871 25.4697Z" fill="#EF4444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M165.401 38.5C170.648 38.5 174.901 34.2467 174.901 29C174.901 23.7533 170.648 19.5 165.401 19.5C160.155 19.5 155.901 23.7533 155.901 29C155.901 34.2467 160.155 38.5 165.401 38.5ZM165.401 40C171.476 40 176.401 35.0751 176.401 29C176.401 22.9249 171.476 18 165.401 18C159.326 18 154.401 22.9249 154.401 29C154.401 35.0751 159.326 40 165.401 40Z" fill="#EF4444"/>
+<path d="M125.561 78.4772C126.157 76.9365 127.639 75.9209 129.291 75.9209H145.617C147.269 75.9209 148.751 76.9365 149.347 78.4772L151.454 83.9209H123.454L125.561 78.4772Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.862 78.2065C125.57 76.3769 127.33 75.1709 129.291 75.1709H145.617C147.579 75.1709 149.339 76.3769 150.047 78.2065L152.549 84.6709H122.36L124.862 78.2065ZM129.291 76.6709C127.949 76.6709 126.745 77.4961 126.261 78.7479L124.549 83.1709H150.36L148.648 78.7479C148.164 77.4961 146.959 76.6709 145.617 76.6709H129.291Z" fill="#64748B"/>
+<path d="M113.401 91.9209C113.401 87.5026 116.983 83.9209 121.401 83.9209H153.401C157.82 83.9209 161.401 87.5026 161.401 91.9209V111.921C161.401 116.339 157.82 119.921 153.401 119.921H121.401C116.983 119.921 113.401 116.339 113.401 111.921V91.9209Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.651 91.9209C112.651 87.0884 116.569 83.1709 121.401 83.1709H153.401C158.234 83.1709 162.151 87.0884 162.151 91.9209V111.921C162.151 116.753 158.234 120.671 153.401 120.671H121.401C116.569 120.671 112.651 116.753 112.651 111.921V91.9209ZM121.401 84.6709C117.397 84.6709 114.151 87.9168 114.151 91.9209V111.921C114.151 115.925 117.397 119.171 121.401 119.171H153.401C157.405 119.171 160.651 115.925 160.651 111.921V91.9209C160.651 87.9168 157.405 84.6709 153.401 84.6709H121.401Z" fill="#64748B"/>
+<path d="M150.401 101.921C150.401 109.101 144.581 114.921 137.401 114.921C130.222 114.921 124.401 109.101 124.401 101.921C124.401 94.7412 130.222 88.9209 137.401 88.9209C144.581 88.9209 150.401 94.7412 150.401 101.921Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.401 113.421C143.753 113.421 148.901 108.272 148.901 101.921C148.901 95.5696 143.753 90.4209 137.401 90.4209C131.05 90.4209 125.901 95.5696 125.901 101.921C125.901 108.272 131.05 113.421 137.401 113.421ZM137.401 114.921C144.581 114.921 150.401 109.101 150.401 101.921C150.401 94.7412 144.581 88.9209 137.401 88.9209C130.222 88.9209 124.401 94.7412 124.401 101.921C124.401 109.101 130.222 114.921 137.401 114.921Z" fill="#64748B"/>
+<path d="M144.401 101.921C144.401 105.787 141.267 108.921 137.401 108.921C133.535 108.921 130.401 105.787 130.401 101.921C130.401 98.0549 133.535 94.9209 137.401 94.9209C141.267 94.9209 144.401 98.0549 144.401 101.921Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.401 107.421C140.439 107.421 142.901 104.958 142.901 101.921C142.901 98.8833 140.439 96.4209 137.401 96.4209C134.364 96.4209 131.901 98.8833 131.901 101.921C131.901 104.958 134.364 107.421 137.401 107.421ZM137.401 108.921C141.267 108.921 144.401 105.787 144.401 101.921C144.401 98.0549 141.267 94.9209 137.401 94.9209C133.535 94.9209 130.401 98.0549 130.401 101.921C130.401 105.787 133.535 108.921 137.401 108.921Z" fill="#64748B"/>
+<path d="M280.401 56C280.401 51.5817 276.82 48 272.401 48H246.401C241.983 48 238.401 51.5817 238.401 56V118C238.401 122.418 241.983 126 246.401 126H272.401C276.82 126 280.401 122.418 280.401 118V56Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M246.401 49.5H272.401C275.991 49.5 278.901 52.4101 278.901 56V118C278.901 121.59 275.991 124.5 272.401 124.5H246.401C242.812 124.5 239.901 121.59 239.901 118V56C239.901 52.4101 242.812 49.5 246.401 49.5ZM272.401 48C276.82 48 280.401 51.5817 280.401 56V118C280.401 122.418 276.82 126 272.401 126H246.401C241.983 126 238.401 122.418 238.401 118V56C238.401 51.5817 241.983 48 246.401 48H272.401Z" fill="#64748B"/>
+<path d="M280.401 62.2476H238.402V116.248H280.401V62.2476Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M239.902 63.7476H278.901V114.748H239.902V63.7476ZM280.401 62.2476V116.248H238.402V62.2476H280.401Z" fill="#64748B"/>
+<path d="M258.401 56.0012C258.401 56.5541 258.849 57.0024 259.401 57.0024C259.954 57.0024 260.401 56.5541 260.401 56.0012C260.401 55.4482 259.954 55 259.401 55C258.849 55 258.401 55.4482 258.401 56.0012Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M250.651 56.0244C250.651 55.6102 250.987 55.2744 251.401 55.2744H255.401C255.816 55.2744 256.151 55.6102 256.151 56.0244C256.151 56.4386 255.816 56.7744 255.401 56.7744H251.401C250.987 56.7744 250.651 56.4386 250.651 56.0244Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.651 56.0244C262.651 55.6102 262.987 55.2744 263.401 55.2744H267.401C267.816 55.2744 268.151 55.6102 268.151 56.0244C268.151 56.4386 267.816 56.7744 267.401 56.7744H263.401C262.987 56.7744 262.651 56.4386 262.651 56.0244Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M269.401 38.5C274.648 38.5 278.901 34.2467 278.901 29C278.901 23.7533 274.648 19.5 269.401 19.5C264.155 19.5 259.901 23.7533 259.901 29C259.901 34.2467 264.155 38.5 269.401 38.5ZM269.401 40C275.476 40 280.401 35.0751 280.401 29C280.401 22.9249 275.476 18 269.401 18C263.326 18 258.401 22.9249 258.401 29C258.401 35.0751 263.326 40 269.401 40Z" fill="#EF4444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M265.871 25.4697C266.164 25.1768 266.639 25.1768 266.932 25.4697L269.401 27.9393L271.871 25.4697C272.164 25.1768 272.639 25.1768 272.932 25.4697C273.225 25.7626 273.225 26.2374 272.932 26.5303L270.462 29L272.932 31.4697C273.225 31.7626 273.225 32.2374 272.932 32.5303C272.639 32.8232 272.164 32.8232 271.871 32.5303L269.401 30.0607L266.932 32.5303C266.639 32.8232 266.164 32.8232 265.871 32.5303C265.578 32.2374 265.578 31.7626 265.871 31.4697L268.341 29L265.871 26.5303C265.578 26.2374 265.578 25.7626 265.871 25.4697Z" fill="#EF4444"/>
+<path d="M259.32 85.2935C263.739 85.2935 267.32 88.8752 267.32 93.2935L267.32 113.293C267.32 117.712 263.739 121.293 259.32 121.293L225.32 121.293C220.902 121.293 217.32 117.712 217.32 113.293L217.32 93.2935C217.32 88.8752 220.902 85.2935 225.32 85.2935L259.32 85.2935Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M259.32 84.5435C264.153 84.5435 268.07 88.461 268.07 93.2935L268.07 113.293C268.07 118.126 264.153 122.043 259.32 122.043L225.32 122.043C220.488 122.043 216.57 118.126 216.57 113.293L216.57 93.2935C216.57 88.461 220.488 84.5435 225.32 84.5435L259.32 84.5435ZM266.57 93.2935C266.57 89.2894 263.324 86.0435 259.32 86.0435L225.32 86.0435C221.316 86.0435 218.07 89.2894 218.07 93.2935L218.07 113.293C218.07 117.298 221.316 120.543 225.32 120.543L259.32 120.543C263.324 120.543 266.57 117.298 266.57 113.293L266.57 93.2935Z" fill="#64748B"/>
+<path d="M264.149 91.5839C265.472 90.6285 267.32 91.5736 267.32 93.2052L267.32 113.293C267.32 117.712 263.739 121.293 259.32 121.293L225.32 121.293C220.902 121.293 217.32 117.712 217.32 113.293L217.32 93.2053C217.32 91.5737 219.169 90.6286 220.491 91.584L242.32 107.352L264.149 91.5839Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M235.039 103.293L217.881 90.9016L218.759 89.6855L242.32 106.702L265.881 89.6855L266.759 90.9016L249.601 103.293L266.759 115.685L265.881 116.901L248.32 104.219L242.32 108.552L236.32 104.219L218.759 116.902L217.881 115.686L235.039 103.293Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M259.32 84.5435C264.153 84.5435 268.07 88.461 268.07 93.2935L268.07 113.293C268.07 118.126 264.153 122.043 259.32 122.043L225.32 122.043C220.488 122.043 216.57 118.126 216.57 113.293L216.57 93.2935C216.57 88.461 220.488 84.5435 225.32 84.5435L259.32 84.5435ZM266.57 93.2935C266.57 89.2894 263.324 86.0435 259.32 86.0435L225.32 86.0435C221.316 86.0435 218.07 89.2894 218.07 93.2935L218.07 113.293C218.07 117.298 221.316 120.543 225.32 120.543L259.32 120.543C263.324 120.543 266.57 117.298 266.57 113.293L266.57 93.2935Z" fill="#64748B"/>
+</svg>
diff --git a/briar-android/artwork/il_qr_code_nearby_light.svg b/briar-android/artwork/il_qr_code_nearby_light.svg
new file mode 100644
index 000000000..042e0d0db
--- /dev/null
+++ b/briar-android/artwork/il_qr_code_nearby_light.svg
@@ -0,0 +1,49 @@
+<svg width="289" height="144" viewBox="0 0 289 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M72.4014 56C72.4014 51.5817 68.8196 48 64.4014 48H38.4014C33.9831 48 30.4014 51.5817 30.4014 56V118C30.4014 122.418 33.9831 126 38.4014 126H64.4014C68.8196 126 72.4014 122.418 72.4014 118V56Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4014 49.5H64.4014C67.9912 49.5 70.9014 52.4101 70.9014 56V118C70.9014 121.59 67.9912 124.5 64.4014 124.5H38.4014C34.8115 124.5 31.9014 121.59 31.9014 118V56C31.9014 52.4101 34.8115 49.5 38.4014 49.5ZM64.4014 48C68.8196 48 72.4014 51.5817 72.4014 56V118C72.4014 122.418 68.8196 126 64.4014 126H38.4014C33.9831 126 30.4014 122.418 30.4014 118V56C30.4014 51.5817 33.9831 48 38.4014 48H64.4014Z" fill="#9CA3AF"/>
+<path d="M72.4014 62.2476H30.4015V116.248H72.4014V62.2476Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.9015 63.7476H70.9014V114.748H31.9015V63.7476ZM72.4014 62.2476V116.248H30.4015V62.2476H72.4014Z" fill="#9CA3AF"/>
+<path d="M50.4014 56.0012C50.4014 56.5541 50.8491 57.0024 51.4014 57.0024C51.9537 57.0024 52.4014 56.5541 52.4014 56.0012C52.4014 55.4482 51.9537 55 51.4014 55C50.8491 55 50.4014 55.4482 50.4014 56.0012Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.6514 56.0244C42.6514 55.6102 42.9872 55.2744 43.4014 55.2744H47.4014C47.8156 55.2744 48.1514 55.6102 48.1514 56.0244C48.1514 56.4386 47.8156 56.7744 47.4014 56.7744H43.4014C42.9872 56.7744 42.6514 56.4386 42.6514 56.0244Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.6514 56.0244C54.6514 55.6102 54.9872 55.2744 55.4014 55.2744H59.4014C59.8156 55.2744 60.1514 55.6102 60.1514 56.0244C60.1514 56.4386 59.8156 56.7744 59.4014 56.7744H55.4014C54.9872 56.7744 54.6514 56.4386 54.6514 56.0244Z" fill="#9CA3AF"/>
+<path d="M50.4014 51C50.4014 46.5817 46.8196 43 42.4014 43H16.4014C11.9831 43 8.40137 46.5817 8.40137 51V113C8.40137 117.418 11.9831 121 16.4014 121H42.4014C46.8196 121 50.4014 117.418 50.4014 113V51Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.4014 44.5H42.4014C45.9912 44.5 48.9014 47.4101 48.9014 51V113C48.9014 116.59 45.9912 119.5 42.4014 119.5H16.4014C12.8115 119.5 9.90137 116.59 9.90137 113V51C9.90137 47.4101 12.8115 44.5 16.4014 44.5ZM42.4014 43C46.8196 43 50.4014 46.5817 50.4014 51V113C50.4014 117.418 46.8196 121 42.4014 121H16.4014C11.9831 121 8.40137 117.418 8.40137 113V51C8.40137 46.5817 11.9831 43 16.4014 43H42.4014Z" fill="#9CA3AF"/>
+<path d="M50.4014 57.2476H8.40155V111.248H50.4014V57.2476Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.90155 58.7476H48.9014V109.748H9.90155V58.7476ZM50.4014 57.2476V111.248H8.40155V57.2476H50.4014Z" fill="#9CA3AF"/>
+<path d="M28.4014 51.0012C28.4014 51.5541 28.8491 52.0024 29.4014 52.0024C29.9537 52.0024 30.4014 51.5541 30.4014 51.0012C30.4014 50.4482 29.9537 50 29.4014 50C28.8491 50 28.4014 50.4482 28.4014 51.0012Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.6514 51.0244C20.6514 50.6102 20.9872 50.2744 21.4014 50.2744H25.4014C25.8156 50.2744 26.1514 50.6102 26.1514 51.0244C26.1514 51.4386 25.8156 51.7744 25.4014 51.7744H21.4014C20.9872 51.7744 20.6514 51.4386 20.6514 51.0244Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.6514 51.0244C32.6514 50.6102 32.9872 50.2744 33.4014 50.2744H37.4014C37.8156 50.2744 38.1514 50.6102 38.1514 51.0244C38.1514 51.4386 37.8156 51.7744 37.4014 51.7744H33.4014C32.9872 51.7744 32.6514 51.4386 32.6514 51.0244Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M61.4014 38.5C66.6481 38.5 70.9014 34.2467 70.9014 29C70.9014 23.7533 66.6481 19.5 61.4014 19.5C56.1547 19.5 51.9014 23.7533 51.9014 29C51.9014 34.2467 56.1547 38.5 61.4014 38.5ZM61.4014 40C67.4765 40 72.4014 35.0751 72.4014 29C72.4014 22.9249 67.4765 18 61.4014 18C55.3262 18 50.4014 22.9249 50.4014 29C50.4014 35.0751 55.3262 40 61.4014 40Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M65.9549 25.994C66.2344 26.2997 66.2131 26.7741 65.9074 27.0536L59.932 32.5162L56.8953 29.7402C56.5896 29.4608 56.5683 28.9864 56.8478 28.6806C57.1273 28.3749 57.6017 28.3536 57.9074 28.6331L59.9319 30.4838L64.8953 25.9465C65.201 25.667 65.6754 25.6882 65.9549 25.994Z" fill="#65A30D"/>
+<path d="M176.401 56C176.401 51.5817 172.82 48 168.401 48H142.401C137.983 48 134.401 51.5817 134.401 56V118C134.401 122.418 137.983 126 142.401 126H168.401C172.82 126 176.401 122.418 176.401 118V56Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M142.401 49.5H168.401C171.991 49.5 174.901 52.4101 174.901 56V118C174.901 121.59 171.991 124.5 168.401 124.5H142.401C138.812 124.5 135.901 121.59 135.901 118V56C135.901 52.4101 138.812 49.5 142.401 49.5ZM168.401 48C172.82 48 176.401 51.5817 176.401 56V118C176.401 122.418 172.82 126 168.401 126H142.401C137.983 126 134.401 122.418 134.401 118V56C134.401 51.5817 137.983 48 142.401 48H168.401Z" fill="#9CA3AF"/>
+<path d="M176.401 62.2476H134.402V116.248H176.401V62.2476Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M135.902 63.7476H174.901V114.748H135.902V63.7476ZM176.401 62.2476V116.248H134.402V62.2476H176.401Z" fill="#9CA3AF"/>
+<path d="M154.401 56.0012C154.401 56.5541 154.849 57.0024 155.401 57.0024C155.954 57.0024 156.401 56.5541 156.401 56.0012C156.401 55.4482 155.954 55 155.401 55C154.849 55 154.401 55.4482 154.401 56.0012Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M146.651 56.0244C146.651 55.6102 146.987 55.2744 147.401 55.2744H151.401C151.816 55.2744 152.151 55.6102 152.151 56.0244C152.151 56.4386 151.816 56.7744 151.401 56.7744H147.401C146.987 56.7744 146.651 56.4386 146.651 56.0244Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M158.651 56.0244C158.651 55.6102 158.987 55.2744 159.401 55.2744H163.401C163.816 55.2744 164.151 55.6102 164.151 56.0244C164.151 56.4386 163.816 56.7744 163.401 56.7744H159.401C158.987 56.7744 158.651 56.4386 158.651 56.0244Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M165.401 38.5C170.648 38.5 174.901 34.2467 174.901 29C174.901 23.7533 170.648 19.5 165.401 19.5C160.155 19.5 155.901 23.7533 155.901 29C155.901 34.2467 160.155 38.5 165.401 38.5ZM165.401 40C171.476 40 176.401 35.0751 176.401 29C176.401 22.9249 171.476 18 165.401 18C159.326 18 154.401 22.9249 154.401 29C154.401 35.0751 159.326 40 165.401 40Z" fill="#DC2626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M161.871 25.4697C162.164 25.1768 162.639 25.1768 162.932 25.4697L165.401 27.9393L167.871 25.4697C168.164 25.1768 168.639 25.1768 168.932 25.4697C169.225 25.7626 169.225 26.2374 168.932 26.5303L166.462 29L168.932 31.4697C169.225 31.7626 169.225 32.2374 168.932 32.5303C168.639 32.8232 168.164 32.8232 167.871 32.5303L165.401 30.0607L162.932 32.5303C162.639 32.8232 162.164 32.8232 161.871 32.5303C161.578 32.2374 161.578 31.7626 161.871 31.4697L164.341 29L161.871 26.5303C161.578 26.2374 161.578 25.7626 161.871 25.4697Z" fill="#DC2626"/>
+<path d="M125.561 78.4772C126.157 76.9365 127.639 75.9209 129.291 75.9209H145.617C147.269 75.9209 148.751 76.9365 149.347 78.4772L151.454 83.9209H123.454L125.561 78.4772Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M124.862 78.2065C125.57 76.3769 127.33 75.1709 129.291 75.1709H145.617C147.579 75.1709 149.339 76.3769 150.047 78.2065L152.549 84.6709H122.36L124.862 78.2065ZM129.291 76.6709C127.949 76.6709 126.745 77.4961 126.261 78.7479L124.549 83.1709H150.36L148.648 78.7479C148.164 77.4961 146.959 76.6709 145.617 76.6709H129.291Z" fill="#9CA3AF"/>
+<path d="M113.401 91.9209C113.401 87.5026 116.983 83.9209 121.401 83.9209H153.401C157.82 83.9209 161.401 87.5026 161.401 91.9209V111.921C161.401 116.339 157.82 119.921 153.401 119.921H121.401C116.983 119.921 113.401 116.339 113.401 111.921V91.9209Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.651 91.9209C112.651 87.0884 116.569 83.1709 121.401 83.1709H153.401C158.234 83.1709 162.151 87.0884 162.151 91.9209V111.921C162.151 116.753 158.234 120.671 153.401 120.671H121.401C116.569 120.671 112.651 116.753 112.651 111.921V91.9209ZM121.401 84.6709C117.397 84.6709 114.151 87.9168 114.151 91.9209V111.921C114.151 115.925 117.397 119.171 121.401 119.171H153.401C157.405 119.171 160.651 115.925 160.651 111.921V91.9209C160.651 87.9168 157.405 84.6709 153.401 84.6709H121.401Z" fill="#9CA3AF"/>
+<path d="M150.401 101.921C150.401 109.101 144.581 114.921 137.401 114.921C130.222 114.921 124.401 109.101 124.401 101.921C124.401 94.7412 130.222 88.9209 137.401 88.9209C144.581 88.9209 150.401 94.7412 150.401 101.921Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.401 113.421C143.753 113.421 148.901 108.272 148.901 101.921C148.901 95.5696 143.753 90.4209 137.401 90.4209C131.05 90.4209 125.901 95.5696 125.901 101.921C125.901 108.272 131.05 113.421 137.401 113.421ZM137.401 114.921C144.581 114.921 150.401 109.101 150.401 101.921C150.401 94.7412 144.581 88.9209 137.401 88.9209C130.222 88.9209 124.401 94.7412 124.401 101.921C124.401 109.101 130.222 114.921 137.401 114.921Z" fill="#9CA3AF"/>
+<path d="M144.401 101.921C144.401 105.787 141.267 108.921 137.401 108.921C133.535 108.921 130.401 105.787 130.401 101.921C130.401 98.0549 133.535 94.9209 137.401 94.9209C141.267 94.9209 144.401 98.0549 144.401 101.921Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M137.401 107.421C140.439 107.421 142.901 104.958 142.901 101.921C142.901 98.8833 140.439 96.4209 137.401 96.4209C134.364 96.4209 131.901 98.8833 131.901 101.921C131.901 104.958 134.364 107.421 137.401 107.421ZM137.401 108.921C141.267 108.921 144.401 105.787 144.401 101.921C144.401 98.0549 141.267 94.9209 137.401 94.9209C133.535 94.9209 130.401 98.0549 130.401 101.921C130.401 105.787 133.535 108.921 137.401 108.921Z" fill="#9CA3AF"/>
+<path d="M280.401 56C280.401 51.5817 276.82 48 272.401 48H246.401C241.983 48 238.401 51.5817 238.401 56V118C238.401 122.418 241.983 126 246.401 126H272.401C276.82 126 280.401 122.418 280.401 118V56Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M246.401 49.5H272.401C275.991 49.5 278.901 52.4101 278.901 56V118C278.901 121.59 275.991 124.5 272.401 124.5H246.401C242.812 124.5 239.901 121.59 239.901 118V56C239.901 52.4101 242.812 49.5 246.401 49.5ZM272.401 48C276.82 48 280.401 51.5817 280.401 56V118C280.401 122.418 276.82 126 272.401 126H246.401C241.983 126 238.401 122.418 238.401 118V56C238.401 51.5817 241.983 48 246.401 48H272.401Z" fill="#9CA3AF"/>
+<path d="M280.401 62.2476H238.402V116.248H280.401V62.2476Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M239.902 63.7476H278.901V114.748H239.902V63.7476ZM280.401 62.2476V116.248H238.402V62.2476H280.401Z" fill="#9CA3AF"/>
+<path d="M258.401 56.0012C258.401 56.5541 258.849 57.0024 259.401 57.0024C259.954 57.0024 260.401 56.5541 260.401 56.0012C260.401 55.4482 259.954 55 259.401 55C258.849 55 258.401 55.4482 258.401 56.0012Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M250.651 56.0244C250.651 55.6102 250.987 55.2744 251.401 55.2744H255.401C255.816 55.2744 256.151 55.6102 256.151 56.0244C256.151 56.4386 255.816 56.7744 255.401 56.7744H251.401C250.987 56.7744 250.651 56.4386 250.651 56.0244Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M262.651 56.0244C262.651 55.6102 262.987 55.2744 263.401 55.2744H267.401C267.816 55.2744 268.151 55.6102 268.151 56.0244C268.151 56.4386 267.816 56.7744 267.401 56.7744H263.401C262.987 56.7744 262.651 56.4386 262.651 56.0244Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M269.401 38.5C274.648 38.5 278.901 34.2467 278.901 29C278.901 23.7533 274.648 19.5 269.401 19.5C264.155 19.5 259.901 23.7533 259.901 29C259.901 34.2467 264.155 38.5 269.401 38.5ZM269.401 40C275.476 40 280.401 35.0751 280.401 29C280.401 22.9249 275.476 18 269.401 18C263.326 18 258.401 22.9249 258.401 29C258.401 35.0751 263.326 40 269.401 40Z" fill="#DC2626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M265.871 25.4697C266.164 25.1768 266.639 25.1768 266.932 25.4697L269.401 27.9393L271.871 25.4697C272.164 25.1768 272.639 25.1768 272.932 25.4697C273.225 25.7626 273.225 26.2374 272.932 26.5303L270.462 29L272.932 31.4697C273.225 31.7626 273.225 32.2374 272.932 32.5303C272.639 32.8232 272.164 32.8232 271.871 32.5303L269.401 30.0607L266.932 32.5303C266.639 32.8232 266.164 32.8232 265.871 32.5303C265.578 32.2374 265.578 31.7626 265.871 31.4697L268.341 29L265.871 26.5303C265.578 26.2374 265.578 25.7626 265.871 25.4697Z" fill="#DC2626"/>
+<path d="M259.32 85C263.739 85 267.32 88.5817 267.32 93L267.32 113C267.32 117.418 263.739 121 259.32 121L225.32 121C220.902 121 217.32 117.418 217.32 113L217.32 93C217.32 88.5817 220.902 85 225.32 85L259.32 85Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M259.32 84.25C264.153 84.25 268.07 88.1675 268.07 93L268.07 113C268.07 117.832 264.153 121.75 259.32 121.75L225.32 121.75C220.488 121.75 216.57 117.832 216.57 113L216.57 93C216.57 88.1675 220.488 84.25 225.32 84.25L259.32 84.25ZM266.57 93C266.57 88.9959 263.324 85.75 259.32 85.75L225.32 85.75C221.316 85.75 218.07 88.9959 218.07 93L218.07 113C218.07 117.004 221.316 120.25 225.32 120.25L259.32 120.25C263.324 120.25 266.57 117.004 266.57 113L266.57 93Z" fill="#9CA3AF"/>
+<path d="M264.149 91.2915C265.472 90.3361 267.32 91.2811 267.32 92.9127L267.32 113.001C267.32 117.419 263.739 121.001 259.32 121.001L225.32 121.001C220.902 121.001 217.32 117.419 217.32 113.001L217.32 92.9128C217.32 91.2812 219.169 90.3361 220.491 91.2915L242.32 107.059L264.149 91.2915Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M235.039 102.718L217.881 90.3259L218.759 89.1099L242.32 106.126L265.881 89.1099L266.759 90.3259L249.601 102.718L266.759 115.11L265.881 116.326L248.32 103.643L242.32 107.976L236.32 103.643L218.759 116.326L217.881 115.11L235.039 102.718Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M259.32 84.25C264.153 84.25 268.07 88.1675 268.07 93L268.07 113C268.07 117.832 264.153 121.75 259.32 121.75L225.32 121.75C220.488 121.75 216.57 117.832 216.57 113L216.57 93C216.57 88.1675 220.488 84.25 225.32 84.25L259.32 84.25ZM266.57 93C266.57 88.9959 263.324 85.75 259.32 85.75L225.32 85.75C221.316 85.75 218.07 88.9959 218.07 93L218.07 113C218.07 117.004 221.316 120.25 225.32 120.25L259.32 120.25C263.324 120.25 266.57 117.004 266.57 113L266.57 93Z" fill="#9CA3AF"/>
+</svg>
diff --git a/briar-android/artwork/qr_code.svg b/briar-android/artwork/qr_code.svg
deleted file mode 100644
index 07930f849..000000000
--- a/briar-android/artwork/qr_code.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="svg2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-47 347.2 409.2 161.7" style="enable-background:new -47 347.2 409.2 161.7;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;fill:none;stroke:#FFFFFF;stroke-width:4.3281;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#020202;}
-</style>
-<path id="path4201" d="M322.8,504.6l-4.3-4.3l-7.1-2.4c-3.9-1.3-8.7-3-10.7-3.7l-3.7-1.3l3.5-0.2c8.2-0.4,13-4,14.3-10.9
-	c0.8-4.1,1.1-17.3,0.8-33c-0.2-8.1-0.2-15.4,0-16.3c0.1-0.9,0.5-2.4,0.9-3.4c1.2-3.5,0.3-11.9-1.9-17.6c-0.3-0.9-1.9-4.2-3.5-7.4
-	c-4.2-8.2-4.5-8.9-4.9-10.5c-0.5-1.8-0.2-5.4,0.5-6.8c0.7-1.3,2.2-2.9,3.2-3.5c1.3-0.7,2.6,0.1,4.7,2.9c3.4,4.5,14,19.4,15.7,22.2
-	c3.7,6,6,11.2,8,18.8c0.7,2.5,1.9,7,2.7,10.1c0.8,3.1,2.7,10.2,4.1,15.8l2.6,10.2l4.6,5.2c2.6,2.9,5.8,6.5,7.2,8
-	c1.4,1.6,2.5,3,2.5,3.2c0,0.3-34.5,29.3-34.9,29.3C327.2,508.9,325.2,506.9,322.8,504.6z M228.9,488.2c-1.3-0.6-2.2-1.4-2.9-2.3
-	c-2.1-2.7-2,2.4-1.9-68.5l0.1-64l0.7-1.2c1-1.9,2-2.9,3.7-3.9l1.6-0.9l37.8-0.1c42.5-0.1,39.4-0.2,42.1,2.2c0.9,0.8,1.8,2,2.2,2.9
-	c0.7,1.6,0.7,1.6,0.8,14.2l0.1,12.6l-1.8-0.1c-1.4-0.1-2.1,0-3.2,0.5c-2,1-3.9,2.9-5.1,5.1l-1,2l0-12.8l0-12.8h-33.6h-33.6v51.3
-	v51.3h33.6h33.6l0.1-34.4c0.1-33,0.1-34.4,0.6-32.9c0.3,0.8,1.8,4,3.4,7c5.5,10.6,5.4,9.9,5.4,47.2c0,27.6-0.1,30-1.7,33.1
-	c-1.1,2.2-2.7,3.7-5.1,4.7l-1.7,0.7L267,489l-36.2,0.1L228.9,488.2L228.9,488.2z M271.3,483.1c2.9-1.3,4.5-3.7,4.4-6.6
-	c0-4.1-3.1-7.2-7.1-7.2c-2.1,0-3.6,0.6-5.2,2.2c-2.2,2.2-2.8,5.4-1.3,8.3c0.7,1.4,2.5,3,4,3.5C267.6,483.8,270,483.8,271.3,483.1z"
-	/>
-<path id="path4201-1" d="M-7.6,504.6l4.3-4.3l7.1-2.4c3.9-1.3,8.7-3,10.7-3.7l3.7-1.3l-3.5-0.2c-8.2-0.4-13-4-14.3-10.9
-	c-0.8-4.1-1.1-17.3-0.8-33c0.2-8.1,0.2-15.4,0-16.3c-0.1-0.9-0.5-2.4-0.9-3.4c-1.2-3.5-0.3-11.9,1.9-17.6c0.3-0.9,1.9-4.2,3.5-7.4
-	c4.2-8.2,4.5-8.9,4.9-10.5c0.5-1.8,0.2-5.4-0.5-6.8c-0.7-1.3-2.2-2.9-3.2-3.5c-1.3-0.7-2.6,0.1-4.7,2.9c-3.4,4.5-14,19.4-15.7,22.2
-	c-3.7,6-6,11.2-8,18.8c-0.7,2.5-1.9,7-2.7,10.1c-0.8,3.1-2.7,10.2-4.1,15.8l-2.6,10.2l-4.6,5.2c-2.6,2.9-5.8,6.5-7.2,8
-	s-2.5,3-2.5,3.2c0,0.3,34.5,29.3,34.9,29.3C-12,508.9-9.9,506.9-7.6,504.6z M86.3,488.2c1.3-0.6,2.2-1.4,2.9-2.3
-	c2.1-2.7,2,2.4,1.9-68.5l-0.1-64l-0.7-1.2c-1-1.9-2-2.9-3.7-3.9l-1.6-0.9l-37.8-0.1c-42.5-0.1-39.4-0.2-42.1,2.2
-	c-0.9,0.8-1.8,2-2.2,2.9c-0.7,1.6-0.7,1.6-0.8,14.2L2,379.2l1.8-0.1c1.4-0.1,2.1,0,3.2,0.5c2,1,3.9,2.9,5.1,5.1l1,2l0-12.8l0-12.8
-	h33.6h33.6v51.3v51.3H46.8H13.2l-0.1-34.4c-0.1-33-0.1-34.4-0.6-32.9c-0.3,0.8-1.8,4-3.4,7c-5.5,10.6-5.4,9.9-5.4,47.2
-	c0,27.6,0.1,30,1.7,33.1c1.1,2.2,2.7,3.7,5.1,4.7l1.7,0.7l36.2,0.1l36.2,0.1L86.3,488.2L86.3,488.2z M43.9,483.1
-	c-2.9-1.3-4.5-3.7-4.4-6.6c0-4.1,3.1-7.2,7.1-7.2c2.1,0,3.6,0.6,5.2,2.2c2.2,2.2,2.8,5.4,1.3,8.3c-0.7,1.4-2.5,3-4,3.5
-	C47.6,483.8,45.3,483.8,43.9,483.1z"/>
-<g>
-	<path d="M33.5,410.2h2.3v2.3h2.3v2.3H26.6v-2.3h2.3v-4.6h4.6L33.5,410.2L33.5,410.2z M63.5,431h2.3v-2.3h-2.3V431z M35.8,410.2h2.3
-		v-2.3h-2.3V410.2z M68.1,431h2.3v-2.3h-2.3V431z M40.4,433.3H45V431h-4.6V433.3z M61.2,433.3V431h-2.3v2.3H61.2z M52,433.3h2.3
-		v-4.6H52V433.3z M33.5,403.3v2.3h6.9v-2.3H33.5z M31.2,405.6v-2.3h-4.6v4.6h2.3v-2.3H31.2z M38.1,401H22v-16.1h16.1V401z
-		 M35.8,387.2H24.3v11.5h11.5V387.2z M26.6,428.7h6.9v-6.9h-6.9V428.7z M49.6,426.3v2.3H52v-2.3H49.6z M33.5,389.5h-6.9v6.9h6.9
-		V389.5z M70.4,384.9V401H54.3v-16.1H70.4z M68.1,387.2H56.6v11.5h11.5V387.2z M22,417.1h16.1v16.1H22V417.1z M24.3,431h11.5v-11.5
-		H24.3V431z M24.3,403.3H22v11.5h2.3V403.3z M54.3,414.8v2.3h2.3v-2.3H54.3z M47.3,424.1v-2.3H45v2.3h-4.6v4.6H45v2.3h2.3v-4.6h2.3
-		v-2.3H47.3z M40.4,394.1H45v-2.3h-4.6V394.1z M58.9,412.5h4.6v2.3h2.3v-6.9h-2.3v-4.6h-2.3v6.9h-6.9v2.3h2.3v2.3h2.3V412.5z
-		 M61.2,419.4h-2.3v-2.3h-2.3v4.6h-6.9v2.3h4.6v4.6h2.3v2.3h2.3v-4.6h9.2v-2.3h-6.9V419.4z M61.2,419.4h2.3v-4.6h-2.3V419.4z
-		 M42.7,419.4v-2.3H45v-2.3h2.3v-2.3h2.3v-4.6h6.9v-4.6h-2.3v2.3H52v-9.2h-2.3v-4.6H52v-6.9h-2.3v4.6h-2.3v-4.6h-6.9v4.6h2.3v-2.3
-		H45v4.6h2.3v6.9h2.3v2.3h-2.3v4.6H45V401h-2.3v-2.3h-2.3v4.6h2.3v2.3h-2.3v6.9h2.3v-4.6H45v4.6h-2.3v2.3h-2.3v6.9H45v-2.3H42.7z
-		 M68.1,421.7v-2.3h-4.6v2.3H68.1z M65.8,389.5h-6.9v6.9h6.9V389.5z M47.3,419.4H52v-2.3h-2.3v-2.3h-2.3V419.4z M52,414.8v-2.3h-2.3
-		v2.3H52z M65.8,405.6h4.6v-2.3h-4.6V405.6z M68.1,424.1h2.3v-2.3h-2.3V424.1z M68.1,410.2h2.3v-2.3h-2.3V410.2z M47.3,398.7H45v2.3
-		h2.3V398.7z M47.3,398.7"/>
-</g>
-<g>
-	<path d="M256.5,410.2h2.3v2.3h2.3v2.3h-11.5v-2.3h2.3v-4.6h4.6L256.5,410.2L256.5,410.2z M286.5,431h2.3v-2.3h-2.3V431z
-		 M258.8,410.2h2.3v-2.3h-2.3V410.2z M291.1,431h2.3v-2.3h-2.3V431z M263.4,433.3h4.6V431h-4.6V433.3z M284.2,433.3V431h-2.3v2.3
-		H284.2z M275,433.3h2.3v-4.6H275V433.3z M256.5,403.3v2.3h6.9v-2.3H256.5z M254.2,405.6v-2.3h-4.6v4.6h2.3v-2.3H254.2z M261.1,401
-		H245v-16.1h16.1V401z M258.8,387.2h-11.5v11.5h11.5V387.2z M249.6,428.7h6.9v-6.9h-6.9V428.7z M272.6,426.3v2.3h2.3v-2.3H272.6z
-		 M256.5,389.5h-6.9v6.9h6.9V389.5z M293.4,384.9V401h-16.1v-16.1H293.4z M291.1,387.2h-11.5v11.5h11.5V387.2z M245,417.1h16.1v16.1
-		H245V417.1z M247.3,431h11.5v-11.5h-11.5V431z M247.3,403.3H245v11.5h2.3V403.3z M277.3,414.8v2.3h2.3v-2.3H277.3z M270.3,424.1
-		v-2.3H268v2.3h-4.6v4.6h4.6v2.3h2.3v-4.6h2.3v-2.3H270.3z M263.4,394.1h4.6v-2.3h-4.6V394.1z M281.9,412.5h4.6v2.3h2.3v-6.9h-2.3
-		v-4.6h-2.3v6.9h-6.9v2.3h2.3v2.3h2.3V412.5z M284.2,419.4h-2.3v-2.3h-2.3v4.6h-6.9v2.3h4.6v4.6h2.3v2.3h2.3v-4.6h9.2v-2.3h-6.9
-		V419.4z M284.2,419.4h2.3v-4.6h-2.3V419.4z M265.7,419.4v-2.3h2.3v-2.3h2.3v-2.3h2.3v-4.6h6.9v-4.6h-2.3v2.3H275v-9.2h-2.3v-4.6
-		h2.3v-6.9h-2.3v4.6h-2.3v-4.6h-6.9v4.6h2.3v-2.3h2.3v4.6h2.3v6.9h2.3v2.3h-2.3v4.6H268V401h-2.3v-2.3h-2.3v4.6h2.3v2.3h-2.3v6.9
-		h2.3v-4.6h2.3v4.6h-2.3v2.3h-2.3v6.9h4.6v-2.3H265.7z M291.1,421.7v-2.3h-4.6v2.3H291.1z M288.8,389.5h-6.9v6.9h6.9V389.5z
-		 M270.3,419.4h4.6v-2.3h-2.3v-2.3h-2.3V419.4z M275,414.8v-2.3h-2.3v2.3H275z M288.8,405.6h4.6v-2.3h-4.6V405.6z M291.1,424.1h2.3
-		v-2.3h-2.3V424.1z M291.1,410.2h2.3v-2.3h-2.3V410.2z M270.3,398.7H268v2.3h2.3V398.7z M270.3,398.7"/>
-</g>
-<polygon class="st0" points="152,392 152,411.8 110,411.8 126,383.1 126,392 "/>
-<polygon class="st0" points="152,392 152,411.8 110,411.8 126,383.1 126,392 "/>
-<g>
-	<path class="st1" d="M132.6,396.1l-20.6,18l20.6,16.7v-5.2H152v-24.3h-19.3V396.1z"/>
-	<path class="st1" d="M182.4,430.9l20.6-18l-20.6-16.7v5.2H163v24.3h19.3V430.9z"/>
-</g>
-</svg>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java
index 7136b497e..7f60b4d8b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactIntroFragment.java
@@ -4,7 +4,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ScrollView;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
@@ -19,8 +18,6 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions;
 import androidx.lifecycle.ViewModelProvider;
 
-import static android.view.View.FOCUS_DOWN;
-
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class AddNearbyContactIntroFragment extends BaseFragment {
@@ -34,8 +31,6 @@ public class AddNearbyContactIntroFragment extends BaseFragment {
 	private AddNearbyContactViewModel viewModel;
 	private AddNearbyContactPermissionManager permissionManager;
 
-	private ScrollView scrollView;
-
 	private final ActivityResultLauncher<String[]> permissionLauncher =
 			registerForActivityResult(new RequestMultiplePermissions(), r -> {
 				permissionManager.onRequestPermissionResult(r);
@@ -67,10 +62,8 @@ public class AddNearbyContactIntroFragment extends BaseFragment {
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-
 		View v = inflater.inflate(R.layout.fragment_keyagreement_id, container,
 				false);
-		scrollView = v.findViewById(R.id.scrollView);
 		View button = v.findViewById(R.id.continueButton);
 		button.setOnClickListener(view -> {
 			viewModel.stopDiscovery();
@@ -98,8 +91,6 @@ public class AddNearbyContactIntroFragment extends BaseFragment {
 		permissionManager.resetPermissions();
 		// Reset plugins in case they were assigned when we weren't signed-in
 		viewModel.resetPlugins();
-		// Scroll down in case the screen is small, so the button is visible
-		scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
 	}
 
 	@Override
diff --git a/briar-android/src/main/res/drawable-night/il_qr_code.xml b/briar-android/src/main/res/drawable-night/il_qr_code.xml
new file mode 100644
index 000000000..510019bad
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_qr_code.xml
@@ -0,0 +1,70 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="192dp"
+	android:height="192dp"
+	android:viewportWidth="192"
+	android:viewportHeight="192">
+	<path
+		android:fillColor="#A3E635"
+		android:pathData="M101.81,89.08L92.5,83.81L92.5,94.34L101.81,89.08Z" />
+	<path
+		android:fillColor="#52ADF9"
+		android:pathData="M92.99,102.92L102.3,108.18L102.3,97.66L92.99,102.92Z" />
+	<path
+		android:fillColor="#1E293B"
+		android:pathData="M6.4,36.03C6.4,29.4 11.77,24.03 18.4,24.03H72.4C79.03,24.03 84.4,29.4 84.4,36.03V157.03C84.4,163.66 79.03,169.03 72.4,169.03H18.4C11.77,169.03 6.4,163.66 6.4,157.03V36.03Z" />
+	<path
+		android:fillColor="#A3E635"
+		android:fillType="evenOdd"
+		android:pathData="M72.4,25.53H18.4C12.6,25.53 7.9,30.23 7.9,36.03V157.03C7.9,162.83 12.6,167.53 18.4,167.53H72.4C78.2,167.53 82.9,162.83 82.9,157.03V36.03C82.9,30.23 78.2,25.53 72.4,25.53ZM18.4,24.03C11.77,24.03 6.4,29.4 6.4,36.03V157.03C6.4,163.66 11.77,169.03 18.4,169.03H72.4C79.03,169.03 84.4,163.66 84.4,157.03V36.03C84.4,29.4 79.03,24.03 72.4,24.03H18.4Z" />
+	<path
+		android:fillColor="#A3E635"
+		android:fillType="evenOdd"
+		android:pathData="M45.4,36.41C44.57,36.41 43.9,35.74 43.9,34.91C43.9,34.08 44.57,33.41 45.4,33.41C46.23,33.41 46.9,34.08 46.9,34.91C46.9,35.74 46.23,36.41 45.4,36.41ZM45.4,37.91C43.74,37.91 42.4,36.57 42.4,34.91C42.4,33.25 43.74,31.91 45.4,31.91C47.06,31.91 48.4,33.25 48.4,34.91C48.4,36.57 47.06,37.91 45.4,37.91Z" />
+	<path
+		android:fillColor="#A3E635"
+		android:fillType="evenOdd"
+		android:pathData="M26.65,34.59C26.65,34.18 26.99,33.84 27.4,33.84H37.4C37.82,33.84 38.15,34.18 38.15,34.59C38.15,35.01 37.82,35.34 37.4,35.34H27.4C26.99,35.34 26.65,35.01 26.65,34.59Z" />
+	<path
+		android:fillColor="#A3E635"
+		android:fillType="evenOdd"
+		android:pathData="M52.65,34.59C52.65,34.18 52.99,33.84 53.4,33.84L63.4,33.84C63.82,33.84 64.15,34.18 64.15,34.59C64.15,35.01 63.82,35.34 63.4,35.34L53.4,35.34C52.99,35.34 52.65,35.01 52.65,34.59Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M77.4,51.63C77.4,47.22 73.82,43.63 69.4,43.63H21.4C16.98,43.63 13.4,47.22 13.4,51.63V147.63C13.4,152.05 16.98,155.63 21.4,155.63H69.4C73.82,155.63 77.4,152.05 77.4,147.63V51.63Z" />
+	<path
+		android:fillColor="#A3E635"
+		android:fillType="evenOdd"
+		android:pathData="M21.4,45.13H69.4C72.99,45.13 75.9,48.04 75.9,51.63V147.63C75.9,151.22 72.99,154.13 69.4,154.13H21.4C17.81,154.13 14.9,151.22 14.9,147.63V51.63C14.9,48.04 17.81,45.13 21.4,45.13ZM69.4,43.63C73.82,43.63 77.4,47.22 77.4,51.63V147.63C77.4,152.05 73.82,155.63 69.4,155.63H21.4C16.98,155.63 13.4,152.05 13.4,147.63V51.63C13.4,47.22 16.98,43.63 21.4,43.63H69.4Z" />
+	<path
+		android:fillColor="#A3E635"
+		android:pathData="M51.07,114H47.29V110.22H51.07V114ZM47.29,100.78H43.51V110.22H47.29V100.78ZM62.4,97H58.62V104.56H62.4V97ZM58.62,93.22H54.85V97H58.62V93.22ZM35.96,97H32.18V100.78H35.96V97ZM32.18,93.22H28.4V97H32.18V93.22ZM45.4,83.78H49.18V80H45.4V83.78ZM31.23,82.83V88.5H36.9V82.83H31.23ZM39.73,91.33H28.4V80H39.73V91.33ZM31.23,105.5V111.17H36.9V105.5H31.23ZM39.73,114H28.4V102.67H39.73V114ZM53.9,82.83V88.5H59.57V82.83H53.9ZM62.4,91.33H51.07V80H56.73H62.4V91.33ZM58.62,110.22V104.56H51.07V108.33H54.85V114H62.4V110.22H58.62ZM54.85,97H47.29V100.78H54.85V97ZM47.29,93.22H35.96V97H39.73V100.78H43.51V97H47.29V93.22ZM49.18,91.33V87.56H45.4V83.78H41.62V91.33H49.18ZM35.48,84.25H32.65V87.08H35.48V84.25ZM35.48,106.92H32.65V109.75H35.48V106.92ZM58.15,84.25H55.32V87.08H58.15V84.25Z" />
+	<path
+		android:fillColor="#1E293B"
+		android:pathData="M109.4,35.95C109.4,29.32 114.77,23.95 121.4,23.95H175.4C182.03,23.95 187.4,29.32 187.4,35.95V156.95C187.4,163.58 182.03,168.95 175.4,168.95H121.4C114.77,168.95 109.4,163.58 109.4,156.95V35.95Z" />
+	<path
+		android:fillColor="#52ADF9"
+		android:fillType="evenOdd"
+		android:pathData="M175.4,25.45H121.4C115.6,25.45 110.9,30.15 110.9,35.95V156.95C110.9,162.75 115.6,167.45 121.4,167.45H175.4C181.2,167.45 185.9,162.75 185.9,156.95V35.95C185.9,30.15 181.2,25.45 175.4,25.45ZM121.4,23.95C114.77,23.95 109.4,29.32 109.4,35.95V156.95C109.4,163.58 114.77,168.95 121.4,168.95H175.4C182.03,168.95 187.4,163.58 187.4,156.95V35.95C187.4,29.32 182.03,23.95 175.4,23.95H121.4Z" />
+	<path
+		android:fillColor="#52ADF9"
+		android:fillType="evenOdd"
+		android:pathData="M148.4,36.41C147.57,36.41 146.9,35.74 146.9,34.91C146.9,34.08 147.57,33.41 148.4,33.41C149.23,33.41 149.9,34.08 149.9,34.91C149.9,35.74 149.23,36.41 148.4,36.41ZM148.4,37.91C146.74,37.91 145.4,36.57 145.4,34.91C145.4,33.25 146.74,31.91 148.4,31.91C150.06,31.91 151.4,33.25 151.4,34.91C151.4,36.57 150.06,37.91 148.4,37.91Z" />
+	<path
+		android:fillColor="#52ADF9"
+		android:fillType="evenOdd"
+		android:pathData="M129.65,34.59C129.65,34.18 129.99,33.84 130.4,33.84H140.4C140.82,33.84 141.15,34.18 141.15,34.59C141.15,35.01 140.82,35.34 140.4,35.34H130.4C129.99,35.34 129.65,35.01 129.65,34.59Z" />
+	<path
+		android:fillColor="#52ADF9"
+		android:fillType="evenOdd"
+		android:pathData="M155.65,34.59C155.65,34.18 155.99,33.84 156.4,33.84L166.4,33.84C166.82,33.84 167.15,34.18 167.15,34.59C167.15,35.01 166.82,35.34 166.4,35.34L156.4,35.34C155.99,35.34 155.65,35.01 155.65,34.59Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M180.4,51.63C180.4,47.22 176.82,43.63 172.4,43.63H124.4C119.98,43.63 116.4,47.22 116.4,51.63V147.63C116.4,152.05 119.98,155.63 124.4,155.63H172.4C176.82,155.63 180.4,152.05 180.4,147.63V51.63Z" />
+	<path
+		android:fillColor="#52ADF9"
+		android:fillType="evenOdd"
+		android:pathData="M124.4,45.13H172.4C175.99,45.13 178.9,48.04 178.9,51.63V147.63C178.9,151.22 175.99,154.13 172.4,154.13H124.4C120.81,154.13 117.9,151.22 117.9,147.63V51.63C117.9,48.04 120.81,45.13 124.4,45.13ZM172.4,43.63C176.82,43.63 180.4,47.22 180.4,51.63V147.63C180.4,152.05 176.82,155.63 172.4,155.63H124.4C119.98,155.63 116.4,152.05 116.4,147.63V51.63C116.4,47.22 119.98,43.63 124.4,43.63H172.4Z" />
+	<path
+		android:fillColor="#52ADF9"
+		android:pathData="M154.07,114H150.29V110.22H154.07V114ZM150.29,100.78H146.51V110.22H150.29V100.78ZM165.4,97H161.62V104.56H165.4V97ZM161.62,93.22H157.85V97H161.62V93.22ZM138.96,97H135.18V100.78H138.96V97ZM135.18,93.22H131.4V97H135.18V93.22ZM148.4,83.78H152.18V80H148.4V83.78ZM134.24,82.83V88.5H139.9V82.83H134.24ZM142.74,91.33H131.4V80H142.74V91.33ZM134.24,105.5V111.17H139.9V105.5H134.24ZM142.74,114H131.4V102.67H142.74V114ZM156.9,82.83V88.5H162.57V82.83H156.9ZM165.4,91.33H154.07V80H159.74H165.4V91.33ZM161.62,110.22V104.56H154.07V108.33H157.85V114H165.4V110.22H161.62ZM157.85,97H150.29V100.78H157.85V97ZM150.29,93.22H138.96V97H142.74V100.78H146.51V97H150.29V93.22ZM152.18,91.33V87.56H148.4V83.78H144.62V91.33H152.18ZM138.49,84.25H135.65V87.08H138.49V84.25ZM138.49,106.92H135.65V109.75H138.49V106.92ZM161.15,84.25H158.32V87.08H161.15V84.25Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_qr_code_nearby.xml b/briar-android/src/main/res/drawable-night/il_qr_code_nearby.xml
new file mode 100644
index 000000000..dc005356d
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_qr_code_nearby.xml
@@ -0,0 +1,176 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="200dp"
+	android:height="100dp"
+	android:viewportWidth="289"
+	android:viewportHeight="144">
+	<path
+		android:fillColor="#334155"
+		android:pathData="M72.4,56C72.4,51.58 68.82,48 64.4,48H38.4C33.98,48 30.4,51.58 30.4,56V118C30.4,122.42 33.98,126 38.4,126H64.4C68.82,126 72.4,122.42 72.4,118V56Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M38.4,49.5H64.4C67.99,49.5 70.9,52.41 70.9,56V118C70.9,121.59 67.99,124.5 64.4,124.5H38.4C34.81,124.5 31.9,121.59 31.9,118V56C31.9,52.41 34.81,49.5 38.4,49.5ZM64.4,48C68.82,48 72.4,51.58 72.4,56V118C72.4,122.42 68.82,126 64.4,126H38.4C33.98,126 30.4,122.42 30.4,118V56C30.4,51.58 33.98,48 38.4,48H64.4Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M72.4,62.25H30.4V116.25H72.4V62.25Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M31.9,63.75H70.9V114.75H31.9V63.75ZM72.4,62.25V116.25H30.4V62.25H72.4Z" />
+	<path
+		android:fillColor="#64748B"
+		android:pathData="M50.4,56C50.4,56.55 50.85,57 51.4,57C51.95,57 52.4,56.55 52.4,56C52.4,55.45 51.95,55 51.4,55C50.85,55 50.4,55.45 50.4,56Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M42.65,56.02C42.65,55.61 42.99,55.27 43.4,55.27H47.4C47.82,55.27 48.15,55.61 48.15,56.02C48.15,56.44 47.82,56.77 47.4,56.77H43.4C42.99,56.77 42.65,56.44 42.65,56.02Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M54.65,56.02C54.65,55.61 54.99,55.27 55.4,55.27H59.4C59.82,55.27 60.15,55.61 60.15,56.02C60.15,56.44 59.82,56.77 59.4,56.77H55.4C54.99,56.77 54.65,56.44 54.65,56.02Z" />
+	<path
+		android:fillColor="#334155"
+		android:pathData="M50.4,51C50.4,46.58 46.82,43 42.4,43H16.4C11.98,43 8.4,46.58 8.4,51V113C8.4,117.42 11.98,121 16.4,121H42.4C46.82,121 50.4,117.42 50.4,113V51Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M16.4,44.5H42.4C45.99,44.5 48.9,47.41 48.9,51V113C48.9,116.59 45.99,119.5 42.4,119.5H16.4C12.81,119.5 9.9,116.59 9.9,113V51C9.9,47.41 12.81,44.5 16.4,44.5ZM42.4,43C46.82,43 50.4,46.58 50.4,51V113C50.4,117.42 46.82,121 42.4,121H16.4C11.98,121 8.4,117.42 8.4,113V51C8.4,46.58 11.98,43 16.4,43H42.4Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M50.4,57.25H8.4V111.25H50.4V57.25Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M9.9,58.75H48.9V109.75H9.9V58.75ZM50.4,57.25V111.25H8.4V57.25H50.4Z" />
+	<path
+		android:fillColor="#64748B"
+		android:pathData="M28.4,51C28.4,51.55 28.85,52 29.4,52C29.95,52 30.4,51.55 30.4,51C30.4,50.45 29.95,50 29.4,50C28.85,50 28.4,50.45 28.4,51Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M20.65,51.02C20.65,50.61 20.99,50.27 21.4,50.27H25.4C25.82,50.27 26.15,50.61 26.15,51.02C26.15,51.44 25.82,51.77 25.4,51.77H21.4C20.99,51.77 20.65,51.44 20.65,51.02Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M32.65,51.02C32.65,50.61 32.99,50.27 33.4,50.27H37.4C37.82,50.27 38.15,50.61 38.15,51.02C38.15,51.44 37.82,51.77 37.4,51.77H33.4C32.99,51.77 32.65,51.44 32.65,51.02Z" />
+	<path
+		android:fillColor="#A3E635"
+		android:fillType="evenOdd"
+		android:pathData="M61.4,38.5C66.65,38.5 70.9,34.25 70.9,29C70.9,23.75 66.65,19.5 61.4,19.5C56.15,19.5 51.9,23.75 51.9,29C51.9,34.25 56.15,38.5 61.4,38.5ZM61.4,40C67.48,40 72.4,35.08 72.4,29C72.4,22.92 67.48,18 61.4,18C55.33,18 50.4,22.92 50.4,29C50.4,35.08 55.33,40 61.4,40Z" />
+	<path
+		android:fillColor="#A3E635"
+		android:fillType="evenOdd"
+		android:pathData="M65.95,25.99C66.23,26.3 66.21,26.77 65.91,27.05L59.93,32.52L56.9,29.74C56.59,29.46 56.57,28.99 56.85,28.68C57.13,28.37 57.6,28.35 57.91,28.63L59.93,30.48L64.9,25.95C65.2,25.67 65.68,25.69 65.95,25.99Z" />
+	<path
+		android:fillColor="#334155"
+		android:pathData="M176.4,56C176.4,51.58 172.82,48 168.4,48H142.4C137.98,48 134.4,51.58 134.4,56V118C134.4,122.42 137.98,126 142.4,126H168.4C172.82,126 176.4,122.42 176.4,118V56Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M142.4,49.5H168.4C171.99,49.5 174.9,52.41 174.9,56V118C174.9,121.59 171.99,124.5 168.4,124.5H142.4C138.81,124.5 135.9,121.59 135.9,118V56C135.9,52.41 138.81,49.5 142.4,49.5ZM168.4,48C172.82,48 176.4,51.58 176.4,56V118C176.4,122.42 172.82,126 168.4,126H142.4C137.98,126 134.4,122.42 134.4,118V56C134.4,51.58 137.98,48 142.4,48H168.4Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M176.4,62.25H134.4V116.25H176.4V62.25Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M135.9,63.75H174.9V114.75H135.9V63.75ZM176.4,62.25V116.25H134.4V62.25H176.4Z" />
+	<path
+		android:fillColor="#64748B"
+		android:pathData="M154.4,56C154.4,56.55 154.85,57 155.4,57C155.95,57 156.4,56.55 156.4,56C156.4,55.45 155.95,55 155.4,55C154.85,55 154.4,55.45 154.4,56Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M146.65,56.02C146.65,55.61 146.99,55.27 147.4,55.27H151.4C151.82,55.27 152.15,55.61 152.15,56.02C152.15,56.44 151.82,56.77 151.4,56.77H147.4C146.99,56.77 146.65,56.44 146.65,56.02Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M158.65,56.02C158.65,55.61 158.99,55.27 159.4,55.27H163.4C163.82,55.27 164.15,55.61 164.15,56.02C164.15,56.44 163.82,56.77 163.4,56.77H159.4C158.99,56.77 158.65,56.44 158.65,56.02Z" />
+	<path
+		android:fillColor="#EF4444"
+		android:fillType="evenOdd"
+		android:pathData="M161.87,25.47C162.16,25.18 162.64,25.18 162.93,25.47L165.4,27.94L167.87,25.47C168.16,25.18 168.64,25.18 168.93,25.47C169.23,25.76 169.23,26.24 168.93,26.53L166.46,29L168.93,31.47C169.23,31.76 169.23,32.24 168.93,32.53C168.64,32.82 168.16,32.82 167.87,32.53L165.4,30.06L162.93,32.53C162.64,32.82 162.16,32.82 161.87,32.53C161.58,32.24 161.58,31.76 161.87,31.47L164.34,29L161.87,26.53C161.58,26.24 161.58,25.76 161.87,25.47Z" />
+	<path
+		android:fillColor="#EF4444"
+		android:fillType="evenOdd"
+		android:pathData="M165.4,38.5C170.65,38.5 174.9,34.25 174.9,29C174.9,23.75 170.65,19.5 165.4,19.5C160.15,19.5 155.9,23.75 155.9,29C155.9,34.25 160.15,38.5 165.4,38.5ZM165.4,40C171.48,40 176.4,35.08 176.4,29C176.4,22.92 171.48,18 165.4,18C159.33,18 154.4,22.92 154.4,29C154.4,35.08 159.33,40 165.4,40Z" />
+	<path
+		android:fillColor="#334155"
+		android:pathData="M125.56,78.48C126.16,76.94 127.64,75.92 129.29,75.92H145.62C147.27,75.92 148.75,76.94 149.35,78.48L151.45,83.92H123.45L125.56,78.48Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M124.86,78.21C125.57,76.38 127.33,75.17 129.29,75.17H145.62C147.58,75.17 149.34,76.38 150.05,78.21L152.55,84.67H122.36L124.86,78.21ZM129.29,76.67C127.95,76.67 126.75,77.5 126.26,78.75L124.55,83.17H150.36L148.65,78.75C148.16,77.5 146.96,76.67 145.62,76.67H129.29Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M113.4,91.92C113.4,87.5 116.98,83.92 121.4,83.92H153.4C157.82,83.92 161.4,87.5 161.4,91.92V111.92C161.4,116.34 157.82,119.92 153.4,119.92H121.4C116.98,119.92 113.4,116.34 113.4,111.92V91.92Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M112.65,91.92C112.65,87.09 116.57,83.17 121.4,83.17H153.4C158.23,83.17 162.15,87.09 162.15,91.92V111.92C162.15,116.75 158.23,120.67 153.4,120.67H121.4C116.57,120.67 112.65,116.75 112.65,111.92V91.92ZM121.4,84.67C117.4,84.67 114.15,87.92 114.15,91.92V111.92C114.15,115.93 117.4,119.17 121.4,119.17H153.4C157.4,119.17 160.65,115.93 160.65,111.92V91.92C160.65,87.92 157.4,84.67 153.4,84.67H121.4Z" />
+	<path
+		android:fillColor="#334155"
+		android:pathData="M150.4,101.92C150.4,109.1 144.58,114.92 137.4,114.92C130.22,114.92 124.4,109.1 124.4,101.92C124.4,94.74 130.22,88.92 137.4,88.92C144.58,88.92 150.4,94.74 150.4,101.92Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M137.4,113.42C143.75,113.42 148.9,108.27 148.9,101.92C148.9,95.57 143.75,90.42 137.4,90.42C131.05,90.42 125.9,95.57 125.9,101.92C125.9,108.27 131.05,113.42 137.4,113.42ZM137.4,114.92C144.58,114.92 150.4,109.1 150.4,101.92C150.4,94.74 144.58,88.92 137.4,88.92C130.22,88.92 124.4,94.74 124.4,101.92C124.4,109.1 130.22,114.92 137.4,114.92Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M144.4,101.92C144.4,105.79 141.27,108.92 137.4,108.92C133.54,108.92 130.4,105.79 130.4,101.92C130.4,98.05 133.54,94.92 137.4,94.92C141.27,94.92 144.4,98.05 144.4,101.92Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M137.4,107.42C140.44,107.42 142.9,104.96 142.9,101.92C142.9,98.88 140.44,96.42 137.4,96.42C134.36,96.42 131.9,98.88 131.9,101.92C131.9,104.96 134.36,107.42 137.4,107.42ZM137.4,108.92C141.27,108.92 144.4,105.79 144.4,101.92C144.4,98.05 141.27,94.92 137.4,94.92C133.54,94.92 130.4,98.05 130.4,101.92C130.4,105.79 133.54,108.92 137.4,108.92Z" />
+	<path
+		android:fillColor="#334155"
+		android:pathData="M280.4,56C280.4,51.58 276.82,48 272.4,48H246.4C241.98,48 238.4,51.58 238.4,56V118C238.4,122.42 241.98,126 246.4,126H272.4C276.82,126 280.4,122.42 280.4,118V56Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M246.4,49.5H272.4C275.99,49.5 278.9,52.41 278.9,56V118C278.9,121.59 275.99,124.5 272.4,124.5H246.4C242.81,124.5 239.9,121.59 239.9,118V56C239.9,52.41 242.81,49.5 246.4,49.5ZM272.4,48C276.82,48 280.4,51.58 280.4,56V118C280.4,122.42 276.82,126 272.4,126H246.4C241.98,126 238.4,122.42 238.4,118V56C238.4,51.58 241.98,48 246.4,48H272.4Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M280.4,62.25H238.4V116.25H280.4V62.25Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M239.9,63.75H278.9V114.75H239.9V63.75ZM280.4,62.25V116.25H238.4V62.25H280.4Z" />
+	<path
+		android:fillColor="#64748B"
+		android:pathData="M258.4,56C258.4,56.55 258.85,57 259.4,57C259.95,57 260.4,56.55 260.4,56C260.4,55.45 259.95,55 259.4,55C258.85,55 258.4,55.45 258.4,56Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M250.65,56.02C250.65,55.61 250.99,55.27 251.4,55.27H255.4C255.82,55.27 256.15,55.61 256.15,56.02C256.15,56.44 255.82,56.77 255.4,56.77H251.4C250.99,56.77 250.65,56.44 250.65,56.02Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M262.65,56.02C262.65,55.61 262.99,55.27 263.4,55.27H267.4C267.82,55.27 268.15,55.61 268.15,56.02C268.15,56.44 267.82,56.77 267.4,56.77H263.4C262.99,56.77 262.65,56.44 262.65,56.02Z" />
+	<path
+		android:fillColor="#EF4444"
+		android:fillType="evenOdd"
+		android:pathData="M269.4,38.5C274.65,38.5 278.9,34.25 278.9,29C278.9,23.75 274.65,19.5 269.4,19.5C264.15,19.5 259.9,23.75 259.9,29C259.9,34.25 264.15,38.5 269.4,38.5ZM269.4,40C275.48,40 280.4,35.08 280.4,29C280.4,22.92 275.48,18 269.4,18C263.33,18 258.4,22.92 258.4,29C258.4,35.08 263.33,40 269.4,40Z" />
+	<path
+		android:fillColor="#EF4444"
+		android:fillType="evenOdd"
+		android:pathData="M265.87,25.47C266.16,25.18 266.64,25.18 266.93,25.47L269.4,27.94L271.87,25.47C272.16,25.18 272.64,25.18 272.93,25.47C273.23,25.76 273.23,26.24 272.93,26.53L270.46,29L272.93,31.47C273.23,31.76 273.23,32.24 272.93,32.53C272.64,32.82 272.16,32.82 271.87,32.53L269.4,30.06L266.93,32.53C266.64,32.82 266.16,32.82 265.87,32.53C265.58,32.24 265.58,31.76 265.87,31.47L268.34,29L265.87,26.53C265.58,26.24 265.58,25.76 265.87,25.47Z" />
+	<path
+		android:fillColor="#0B1120"
+		android:pathData="M259.32,85.29C263.74,85.29 267.32,88.88 267.32,93.29L267.32,113.29C267.32,117.71 263.74,121.29 259.32,121.29L225.32,121.29C220.9,121.29 217.32,117.71 217.32,113.29L217.32,93.29C217.32,88.88 220.9,85.29 225.32,85.29L259.32,85.29Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M259.32,84.54C264.15,84.54 268.07,88.46 268.07,93.29L268.07,113.29C268.07,118.13 264.15,122.04 259.32,122.04L225.32,122.04C220.49,122.04 216.57,118.13 216.57,113.29L216.57,93.29C216.57,88.46 220.49,84.54 225.32,84.54L259.32,84.54ZM266.57,93.29C266.57,89.29 263.32,86.04 259.32,86.04L225.32,86.04C221.32,86.04 218.07,89.29 218.07,93.29L218.07,113.29C218.07,117.3 221.32,120.54 225.32,120.54L259.32,120.54C263.32,120.54 266.57,117.3 266.57,113.29L266.57,93.29Z" />
+	<path
+		android:fillColor="#334155"
+		android:pathData="M264.15,91.58C265.47,90.63 267.32,91.57 267.32,93.21L267.32,113.29C267.32,117.71 263.74,121.29 259.32,121.29L225.32,121.29C220.9,121.29 217.32,117.71 217.32,113.29L217.32,93.21C217.32,91.57 219.17,90.63 220.49,91.58L242.32,107.35L264.15,91.58Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M235.04,103.29L217.88,90.9L218.76,89.69L242.32,106.7L265.88,89.69L266.76,90.9L249.6,103.29L266.76,115.68L265.88,116.9L248.32,104.22L242.32,108.55L236.32,104.22L218.76,116.9L217.88,115.69L235.04,103.29Z" />
+	<path
+		android:fillColor="#64748B"
+		android:fillType="evenOdd"
+		android:pathData="M259.32,84.54C264.15,84.54 268.07,88.46 268.07,93.29L268.07,113.29C268.07,118.13 264.15,122.04 259.32,122.04L225.32,122.04C220.49,122.04 216.57,118.13 216.57,113.29L216.57,93.29C216.57,88.46 220.49,84.54 225.32,84.54L259.32,84.54ZM266.57,93.29C266.57,89.29 263.32,86.04 259.32,86.04L225.32,86.04C221.32,86.04 218.07,89.29 218.07,93.29L218.07,113.29C218.07,117.3 221.32,120.54 225.32,120.54L259.32,120.54C263.32,120.54 266.57,117.3 266.57,113.29L266.57,93.29Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/qr_code_explanation.xml b/briar-android/src/main/res/drawable-night/qr_code_explanation.xml
deleted file mode 100644
index 5a4866585..000000000
--- a/briar-android/src/main/res/drawable-night/qr_code_explanation.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="400dp"
-        android:height="100dp"
-        android:viewportHeight="49.5"
-        android:viewportWidth="194.8">
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M30.1 16.5l-9 0 0 -5c0 -2.4 -2 -4.4 -4.4 -4.4L4.4 7.1C2 7.1 0 9.1 0 11.5l0 24.2c0 2.4 2 4.4 4.4 4.4l9 0 0 5c0 2.4 2 4.4 4.4 4.4l12.2 0c2.4 0 4.4 -2 4.4 -4.4l0 -24.2c0.1 -2.4 -1.9 -4.4 -4.3 -4.4zm-27.4 16.1l0 -20.9 15.8 0 0 20.9 -15.8 0zm10.7 4.6l-5.8 0 0 -1.5 5.8 0 0 1.5zm13.5 9.4l-5.8 0 0 -1.5 5.8 0 0 1.5zm5 -4.6l-15.8 0 0 -1.9 0.5 0c2.4 0 4.4 -2 4.4 -4.4l0 -14.6 10.8 0 0 20.9z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M101.2 16.5l-8.3 0 0 -4.4c0 -1.4 -1.2 -2.6 -2.6 -2.6l-3.9 0 -2.1 -2.5 -6.9 0 -2.2 2.5 -3.8 0c-1.4 0 -2.6 1.2 -2.6 2.6l0 13.3c0 1.4 1.2 2.6 2.6 2.6l13.1 0 0 17.2c0 2.4 2 4.4 4.4 4.4l12.2 0c2.4 0 4.4 -2 4.4 -4.4l0 -24.3c0.2 -2.4 -1.8 -4.4 -4.3 -4.4zm-26.4 2.4c0 -3.3 2.7 -6 6 -6 3.3 0 6 2.7 6 6 0 3.3 -2.7 6 -6 6 -3.3 0 -6 -2.7 -6 -6zm23.2 27.7l-5.8 0 0 -1.5 5.8 0 0 1.5zm5 -4.6l-15.8 0 0 -14.1 3.1 0c1.4 0 2.6 -1.2 2.6 -2.6l0 -4.2 10.1 0 0 20.9z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M84.600003 18.9a3.8 3.8 0 0 1 -3.8 3.8 3.8 3.8 0 0 1 -3.8 -3.8 3.8 3.8 0 0 1 3.8 -3.8 3.8 3.8 0 0 1 3.8 3.8z"/>
-	<path
-		android:fillColor="#ffffff"
-		android:pathData="M175.3 16.5l-9.8 0 0 -5.7c0 -1.4 -1.2 -2.6 -2.6 -2.6l-19.3 0c-1.4 0 -2.6 1.2 -2.6 2.6l0 14.4c0 1.4 1.2 2.6 2.6 2.6l15.1 0 0 17.3c0 2.4 2 4.4 4.4 4.4l12.2 0c2.4 0 4.4 -2 4.4 -4.4l0 -24.2c0.1 -2.4 -1.9 -4.4 -4.4 -4.4zm-12.4 -5.9l-9.6 6 -9.6 -6 19.2 0zm-19.4 14.8l0 -12.3 9.8 6.1 9.8 -6.1 0 12.3 -19.6 0zm28.6 21.2l-5.8 0 0 -1.5 5.8 0 0 1.5zm5 -4.6l-15.8 0 0 -14.2 1.6 0c1.4 0 2.6 -1.2 2.6 -2.6l0 -4.1 11.6 0 0 20.9z"/>
-	<path
-		android:fillColor="#db3b21"
-		android:pathData="M101.4 17.8l2 2 7.4 -7.3 7.3 7.3 2.1 -2 -7.4 -7.4 7.4 -7.3 -2.1 -2.1 -7.3 7.4 -7.4 -7.4 -2 2.1 7.3 7.3z"/>
-	<path
-		android:fillColor="#db3b21"
-		android:pathData="M176 17.8l2.1 2 7.3 -7.3 7.4 7.3 2 -2 -7.3 -7.4 7.3 -7.3 -2 -2.1 -7.4 7.4 -7.3 -7.4 -2.1 2.1 7.3 7.3z"/>
-	<path
-		android:fillColor="#67a60f"
-		android:pathData="M35.8 18.8l0 0L52.5 2.1 50.5 0 35.6 14.8 28.5 7.7l-2.1 2.1 9.2 9.1z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/border_explanation.xml b/briar-android/src/main/res/drawable/border_explanation.xml
deleted file mode 100644
index f54513376..000000000
--- a/briar-android/src/main/res/drawable/border_explanation.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-
-	<solid
-		android:color="@android:color/transparent"/>
-
-	<stroke
-		android:width="2dp"
-		android:color="@color/color_primary"/>
-
-</shape>
\ No newline at end of file
diff --git a/briar-android/src/main/res/drawable/il_qr_code.xml b/briar-android/src/main/res/drawable/il_qr_code.xml
new file mode 100644
index 000000000..8971fba28
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_qr_code.xml
@@ -0,0 +1,70 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="192dp"
+	android:height="192dp"
+	android:viewportWidth="192"
+	android:viewportHeight="192">
+	<path
+		android:fillColor="#82C91E"
+		android:pathData="M102.27,89.08L92.96,83.81L92.96,94.34L102.27,89.08Z" />
+	<path
+		android:fillColor="#2B8EF1"
+		android:pathData="M93.44,102.92L102.75,108.18L102.75,97.66L93.44,102.92Z" />
+	<path
+		android:fillColor="#ECFCCB"
+		android:pathData="M6.85,36.03C6.85,29.4 12.23,24.03 18.85,24.03H72.85C79.48,24.03 84.85,29.4 84.85,36.03V157.03C84.85,163.66 79.48,169.03 72.85,169.03H18.85C12.23,169.03 6.85,163.66 6.85,157.03V36.03Z" />
+	<path
+		android:fillColor="#65A30D"
+		android:fillType="evenOdd"
+		android:pathData="M72.85,25.53H18.85C13.05,25.53 8.35,30.23 8.35,36.03V157.03C8.35,162.83 13.05,167.53 18.85,167.53H72.85C78.65,167.53 83.35,162.83 83.35,157.03V36.03C83.35,30.23 78.65,25.53 72.85,25.53ZM18.85,24.03C12.23,24.03 6.85,29.4 6.85,36.03V157.03C6.85,163.66 12.23,169.03 18.85,169.03H72.85C79.48,169.03 84.85,163.66 84.85,157.03V36.03C84.85,29.4 79.48,24.03 72.85,24.03H18.85Z" />
+	<path
+		android:fillColor="#65A30D"
+		android:fillType="evenOdd"
+		android:pathData="M45.85,36.41C45.03,36.41 44.35,35.74 44.35,34.91C44.35,34.08 45.03,33.41 45.85,33.41C46.68,33.41 47.35,34.08 47.35,34.91C47.35,35.74 46.68,36.41 45.85,36.41ZM45.85,37.91C44.2,37.91 42.85,36.57 42.85,34.91C42.85,33.25 44.2,31.91 45.85,31.91C47.51,31.91 48.85,33.25 48.85,34.91C48.85,36.57 47.51,37.91 45.85,37.91Z" />
+	<path
+		android:fillColor="#65A30D"
+		android:fillType="evenOdd"
+		android:pathData="M27.1,34.59C27.1,34.18 27.44,33.84 27.85,33.84H37.85C38.27,33.84 38.6,34.18 38.6,34.59C38.6,35.01 38.27,35.34 37.85,35.34H27.85C27.44,35.34 27.1,35.01 27.1,34.59Z" />
+	<path
+		android:fillColor="#65A30D"
+		android:fillType="evenOdd"
+		android:pathData="M53.1,34.59C53.1,34.18 53.44,33.84 53.85,33.84L63.85,33.84C64.27,33.84 64.6,34.18 64.6,34.59C64.6,35.01 64.27,35.34 63.85,35.34L53.85,35.34C53.44,35.34 53.1,35.01 53.1,34.59Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M77.85,51.63C77.85,47.22 74.27,43.63 69.85,43.63H21.85C17.44,43.63 13.85,47.22 13.85,51.63V147.63C13.85,152.05 17.44,155.63 21.85,155.63H69.85C74.27,155.63 77.85,152.05 77.85,147.63V51.63Z" />
+	<path
+		android:fillColor="#65A30D"
+		android:fillType="evenOdd"
+		android:pathData="M21.85,45.13H69.85C73.44,45.13 76.35,48.04 76.35,51.63V147.63C76.35,151.22 73.44,154.13 69.85,154.13H21.85C18.26,154.13 15.35,151.22 15.35,147.63V51.63C15.35,48.04 18.26,45.13 21.85,45.13ZM69.85,43.63C74.27,43.63 77.85,47.22 77.85,51.63V147.63C77.85,152.05 74.27,155.63 69.85,155.63H21.85C17.44,155.63 13.85,152.05 13.85,147.63V51.63C13.85,47.22 17.44,43.63 21.85,43.63H69.85Z" />
+	<path
+		android:fillColor="#82C91E"
+		android:pathData="M51.52,114H47.74V110.22H51.52V114ZM47.74,100.78H43.96V110.22H47.74V100.78ZM62.85,97H59.08V104.56H62.85V97ZM59.08,93.22H55.3V97H59.08V93.22ZM36.41,97H32.63V100.78H36.41V97ZM32.63,93.22H28.85V97H32.63V93.22ZM45.85,83.78H49.63V80H45.85V83.78ZM31.69,82.83V88.5H37.35V82.83H31.69ZM40.19,91.33H28.85V80H40.19V91.33ZM31.69,105.5V111.17H37.35V105.5H31.69ZM40.19,114H28.85V102.67H40.19V114ZM54.35,82.83V88.5H60.02V82.83H54.35ZM62.85,91.33H51.52V80H57.19H62.85V91.33ZM59.08,110.22V104.56H51.52V108.33H55.3V114H62.85V110.22H59.08ZM55.3,97H47.74V100.78H55.3V97ZM47.74,93.22H36.41V97H40.19V100.78H43.96V97H47.74V93.22ZM49.63,91.33V87.56H45.85V83.78H42.08V91.33H49.63ZM35.94,84.25H33.1V87.08H35.94V84.25ZM35.94,106.92H33.1V109.75H35.94V106.92ZM58.6,84.25H55.77V87.08H58.6V84.25Z" />
+	<path
+		android:fillColor="#DDEDFE"
+		android:pathData="M109.85,36.03C109.85,29.4 115.23,24.03 121.85,24.03H175.85C182.48,24.03 187.85,29.4 187.85,36.03V157.03C187.85,163.66 182.48,169.03 175.85,169.03H121.85C115.23,169.03 109.85,163.66 109.85,157.03V36.03Z" />
+	<path
+		android:fillColor="#196FDE"
+		android:fillType="evenOdd"
+		android:pathData="M175.85,25.53H121.85C116.06,25.53 111.35,30.23 111.35,36.03V157.03C111.35,162.83 116.06,167.53 121.85,167.53H175.85C181.65,167.53 186.35,162.83 186.35,157.03V36.03C186.35,30.23 181.65,25.53 175.85,25.53ZM121.85,24.03C115.23,24.03 109.85,29.4 109.85,36.03V157.03C109.85,163.66 115.23,169.03 121.85,169.03H175.85C182.48,169.03 187.85,163.66 187.85,157.03V36.03C187.85,29.4 182.48,24.03 175.85,24.03H121.85Z" />
+	<path
+		android:fillColor="#196FDE"
+		android:fillType="evenOdd"
+		android:pathData="M148.85,36.41C148.02,36.41 147.35,35.74 147.35,34.91C147.35,34.08 148.02,33.41 148.85,33.41C149.68,33.41 150.35,34.08 150.35,34.91C150.35,35.74 149.68,36.41 148.85,36.41ZM148.85,37.91C147.2,37.91 145.85,36.57 145.85,34.91C145.85,33.25 147.2,31.91 148.85,31.91C150.51,31.91 151.85,33.25 151.85,34.91C151.85,36.57 150.51,37.91 148.85,37.91Z" />
+	<path
+		android:fillColor="#196FDE"
+		android:fillType="evenOdd"
+		android:pathData="M130.1,34.59C130.1,34.18 130.44,33.84 130.85,33.84H140.85C141.27,33.84 141.6,34.18 141.6,34.59C141.6,35.01 141.27,35.34 140.85,35.34H130.85C130.44,35.34 130.1,35.01 130.1,34.59Z" />
+	<path
+		android:fillColor="#196FDE"
+		android:fillType="evenOdd"
+		android:pathData="M156.1,34.59C156.1,34.18 156.44,33.84 156.85,33.84L166.85,33.84C167.27,33.84 167.6,34.18 167.6,34.59C167.6,35.01 167.27,35.34 166.85,35.34L156.85,35.34C156.44,35.34 156.1,35.01 156.1,34.59Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M180.85,51.63C180.85,47.22 177.27,43.63 172.85,43.63H124.85C120.43,43.63 116.85,47.22 116.85,51.63V147.63C116.85,152.05 120.43,155.63 124.85,155.63H172.85C177.27,155.63 180.85,152.05 180.85,147.63V51.63Z" />
+	<path
+		android:fillColor="#196FDE"
+		android:fillType="evenOdd"
+		android:pathData="M124.85,45.13H172.85C176.44,45.13 179.35,48.04 179.35,51.63V147.63C179.35,151.22 176.44,154.13 172.85,154.13H124.85C121.26,154.13 118.35,151.22 118.35,147.63V51.63C118.35,48.04 121.26,45.13 124.85,45.13ZM172.85,43.63C177.27,43.63 180.85,47.22 180.85,51.63V147.63C180.85,152.05 177.27,155.63 172.85,155.63H124.85C120.43,155.63 116.85,152.05 116.85,147.63V51.63C116.85,47.22 120.43,43.63 124.85,43.63H172.85Z" />
+	<path
+		android:fillColor="#2B8EF1"
+		android:pathData="M154.52,114H150.74V110.22H154.52V114ZM150.74,100.78H146.96V110.22H150.74V100.78ZM165.85,97H162.08V104.56H165.85V97ZM162.08,93.22H158.3V97H162.08V93.22ZM139.41,97H135.63V100.78H139.41V97ZM135.63,93.22H131.85V97H135.63V93.22ZM148.85,83.78H152.63V80H148.85V83.78ZM134.69,82.83V88.5H140.35V82.83H134.69ZM143.19,91.33H131.85V80H143.19V91.33ZM134.69,105.5V111.17H140.35V105.5H134.69ZM143.19,114H131.85V102.67H143.19V114ZM157.35,82.83V88.5H163.02V82.83H157.35ZM165.85,91.33H154.52V80H160.19H165.85V91.33ZM162.08,110.22V104.56H154.52V108.33H158.3V114H165.85V110.22H162.08ZM158.3,97H150.74V100.78H158.3V97ZM150.74,93.22H139.41V97H143.19V100.78H146.96V97H150.74V93.22ZM152.63,91.33V87.56H148.85V83.78H145.08V91.33H152.63ZM138.94,84.25H136.1V87.08H138.94V84.25ZM138.94,106.92H136.1V109.75H138.94V106.92ZM161.6,84.25H158.77V87.08H161.6V84.25Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_qr_code_nearby.xml b/briar-android/src/main/res/drawable/il_qr_code_nearby.xml
new file mode 100644
index 000000000..52fc5e4b6
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_qr_code_nearby.xml
@@ -0,0 +1,176 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="200dp"
+	android:height="100dp"
+	android:viewportWidth="289"
+	android:viewportHeight="144">
+	<path
+		android:fillColor="#E5E7EB"
+		android:pathData="M72.4,56C72.4,51.58 68.82,48 64.4,48H38.4C33.98,48 30.4,51.58 30.4,56V118C30.4,122.42 33.98,126 38.4,126H64.4C68.82,126 72.4,122.42 72.4,118V56Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M38.4,49.5H64.4C67.99,49.5 70.9,52.41 70.9,56V118C70.9,121.59 67.99,124.5 64.4,124.5H38.4C34.81,124.5 31.9,121.59 31.9,118V56C31.9,52.41 34.81,49.5 38.4,49.5ZM64.4,48C68.82,48 72.4,51.58 72.4,56V118C72.4,122.42 68.82,126 64.4,126H38.4C33.98,126 30.4,122.42 30.4,118V56C30.4,51.58 33.98,48 38.4,48H64.4Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M72.4,62.25H30.4V116.25H72.4V62.25Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M31.9,63.75H70.9V114.75H31.9V63.75ZM72.4,62.25V116.25H30.4V62.25H72.4Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:pathData="M50.4,56C50.4,56.55 50.85,57 51.4,57C51.95,57 52.4,56.55 52.4,56C52.4,55.45 51.95,55 51.4,55C50.85,55 50.4,55.45 50.4,56Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M42.65,56.02C42.65,55.61 42.99,55.27 43.4,55.27H47.4C47.82,55.27 48.15,55.61 48.15,56.02C48.15,56.44 47.82,56.77 47.4,56.77H43.4C42.99,56.77 42.65,56.44 42.65,56.02Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M54.65,56.02C54.65,55.61 54.99,55.27 55.4,55.27H59.4C59.82,55.27 60.15,55.61 60.15,56.02C60.15,56.44 59.82,56.77 59.4,56.77H55.4C54.99,56.77 54.65,56.44 54.65,56.02Z" />
+	<path
+		android:fillColor="#E5E7EB"
+		android:pathData="M50.4,51C50.4,46.58 46.82,43 42.4,43H16.4C11.98,43 8.4,46.58 8.4,51V113C8.4,117.42 11.98,121 16.4,121H42.4C46.82,121 50.4,117.42 50.4,113V51Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M16.4,44.5H42.4C45.99,44.5 48.9,47.41 48.9,51V113C48.9,116.59 45.99,119.5 42.4,119.5H16.4C12.81,119.5 9.9,116.59 9.9,113V51C9.9,47.41 12.81,44.5 16.4,44.5ZM42.4,43C46.82,43 50.4,46.58 50.4,51V113C50.4,117.42 46.82,121 42.4,121H16.4C11.98,121 8.4,117.42 8.4,113V51C8.4,46.58 11.98,43 16.4,43H42.4Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M50.4,57.25H8.4V111.25H50.4V57.25Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M9.9,58.75H48.9V109.75H9.9V58.75ZM50.4,57.25V111.25H8.4V57.25H50.4Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:pathData="M28.4,51C28.4,51.55 28.85,52 29.4,52C29.95,52 30.4,51.55 30.4,51C30.4,50.45 29.95,50 29.4,50C28.85,50 28.4,50.45 28.4,51Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M20.65,51.02C20.65,50.61 20.99,50.27 21.4,50.27H25.4C25.82,50.27 26.15,50.61 26.15,51.02C26.15,51.44 25.82,51.77 25.4,51.77H21.4C20.99,51.77 20.65,51.44 20.65,51.02Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M32.65,51.02C32.65,50.61 32.99,50.27 33.4,50.27H37.4C37.82,50.27 38.15,50.61 38.15,51.02C38.15,51.44 37.82,51.77 37.4,51.77H33.4C32.99,51.77 32.65,51.44 32.65,51.02Z" />
+	<path
+		android:fillColor="#65A30D"
+		android:fillType="evenOdd"
+		android:pathData="M61.4,38.5C66.65,38.5 70.9,34.25 70.9,29C70.9,23.75 66.65,19.5 61.4,19.5C56.15,19.5 51.9,23.75 51.9,29C51.9,34.25 56.15,38.5 61.4,38.5ZM61.4,40C67.48,40 72.4,35.08 72.4,29C72.4,22.92 67.48,18 61.4,18C55.33,18 50.4,22.92 50.4,29C50.4,35.08 55.33,40 61.4,40Z" />
+	<path
+		android:fillColor="#65A30D"
+		android:fillType="evenOdd"
+		android:pathData="M65.95,25.99C66.23,26.3 66.21,26.77 65.91,27.05L59.93,32.52L56.9,29.74C56.59,29.46 56.57,28.99 56.85,28.68C57.13,28.37 57.6,28.35 57.91,28.63L59.93,30.48L64.9,25.95C65.2,25.67 65.68,25.69 65.95,25.99Z" />
+	<path
+		android:fillColor="#E5E7EB"
+		android:pathData="M176.4,56C176.4,51.58 172.82,48 168.4,48H142.4C137.98,48 134.4,51.58 134.4,56V118C134.4,122.42 137.98,126 142.4,126H168.4C172.82,126 176.4,122.42 176.4,118V56Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M142.4,49.5H168.4C171.99,49.5 174.9,52.41 174.9,56V118C174.9,121.59 171.99,124.5 168.4,124.5H142.4C138.81,124.5 135.9,121.59 135.9,118V56C135.9,52.41 138.81,49.5 142.4,49.5ZM168.4,48C172.82,48 176.4,51.58 176.4,56V118C176.4,122.42 172.82,126 168.4,126H142.4C137.98,126 134.4,122.42 134.4,118V56C134.4,51.58 137.98,48 142.4,48H168.4Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M176.4,62.25H134.4V116.25H176.4V62.25Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M135.9,63.75H174.9V114.75H135.9V63.75ZM176.4,62.25V116.25H134.4V62.25H176.4Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:pathData="M154.4,56C154.4,56.55 154.85,57 155.4,57C155.95,57 156.4,56.55 156.4,56C156.4,55.45 155.95,55 155.4,55C154.85,55 154.4,55.45 154.4,56Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M146.65,56.02C146.65,55.61 146.99,55.27 147.4,55.27H151.4C151.82,55.27 152.15,55.61 152.15,56.02C152.15,56.44 151.82,56.77 151.4,56.77H147.4C146.99,56.77 146.65,56.44 146.65,56.02Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M158.65,56.02C158.65,55.61 158.99,55.27 159.4,55.27H163.4C163.82,55.27 164.15,55.61 164.15,56.02C164.15,56.44 163.82,56.77 163.4,56.77H159.4C158.99,56.77 158.65,56.44 158.65,56.02Z" />
+	<path
+		android:fillColor="#DC2626"
+		android:fillType="evenOdd"
+		android:pathData="M165.4,38.5C170.65,38.5 174.9,34.25 174.9,29C174.9,23.75 170.65,19.5 165.4,19.5C160.15,19.5 155.9,23.75 155.9,29C155.9,34.25 160.15,38.5 165.4,38.5ZM165.4,40C171.48,40 176.4,35.08 176.4,29C176.4,22.92 171.48,18 165.4,18C159.33,18 154.4,22.92 154.4,29C154.4,35.08 159.33,40 165.4,40Z" />
+	<path
+		android:fillColor="#DC2626"
+		android:fillType="evenOdd"
+		android:pathData="M161.87,25.47C162.16,25.18 162.64,25.18 162.93,25.47L165.4,27.94L167.87,25.47C168.16,25.18 168.64,25.18 168.93,25.47C169.23,25.76 169.23,26.24 168.93,26.53L166.46,29L168.93,31.47C169.23,31.76 169.23,32.24 168.93,32.53C168.64,32.82 168.16,32.82 167.87,32.53L165.4,30.06L162.93,32.53C162.64,32.82 162.16,32.82 161.87,32.53C161.58,32.24 161.58,31.76 161.87,31.47L164.34,29L161.87,26.53C161.58,26.24 161.58,25.76 161.87,25.47Z" />
+	<path
+		android:fillColor="#E5E7EB"
+		android:pathData="M125.56,78.48C126.16,76.94 127.64,75.92 129.29,75.92H145.62C147.27,75.92 148.75,76.94 149.35,78.48L151.45,83.92H123.45L125.56,78.48Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M124.86,78.21C125.57,76.38 127.33,75.17 129.29,75.17H145.62C147.58,75.17 149.34,76.38 150.05,78.21L152.55,84.67H122.36L124.86,78.21ZM129.29,76.67C127.95,76.67 126.75,77.5 126.26,78.75L124.55,83.17H150.36L148.65,78.75C148.16,77.5 146.96,76.67 145.62,76.67H129.29Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M113.4,91.92C113.4,87.5 116.98,83.92 121.4,83.92H153.4C157.82,83.92 161.4,87.5 161.4,91.92V111.92C161.4,116.34 157.82,119.92 153.4,119.92H121.4C116.98,119.92 113.4,116.34 113.4,111.92V91.92Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M112.65,91.92C112.65,87.09 116.57,83.17 121.4,83.17H153.4C158.23,83.17 162.15,87.09 162.15,91.92V111.92C162.15,116.75 158.23,120.67 153.4,120.67H121.4C116.57,120.67 112.65,116.75 112.65,111.92V91.92ZM121.4,84.67C117.4,84.67 114.15,87.92 114.15,91.92V111.92C114.15,115.93 117.4,119.17 121.4,119.17H153.4C157.4,119.17 160.65,115.93 160.65,111.92V91.92C160.65,87.92 157.4,84.67 153.4,84.67H121.4Z" />
+	<path
+		android:fillColor="#E5E7EB"
+		android:pathData="M150.4,101.92C150.4,109.1 144.58,114.92 137.4,114.92C130.22,114.92 124.4,109.1 124.4,101.92C124.4,94.74 130.22,88.92 137.4,88.92C144.58,88.92 150.4,94.74 150.4,101.92Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M137.4,113.42C143.75,113.42 148.9,108.27 148.9,101.92C148.9,95.57 143.75,90.42 137.4,90.42C131.05,90.42 125.9,95.57 125.9,101.92C125.9,108.27 131.05,113.42 137.4,113.42ZM137.4,114.92C144.58,114.92 150.4,109.1 150.4,101.92C150.4,94.74 144.58,88.92 137.4,88.92C130.22,88.92 124.4,94.74 124.4,101.92C124.4,109.1 130.22,114.92 137.4,114.92Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M144.4,101.92C144.4,105.79 141.27,108.92 137.4,108.92C133.54,108.92 130.4,105.79 130.4,101.92C130.4,98.05 133.54,94.92 137.4,94.92C141.27,94.92 144.4,98.05 144.4,101.92Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M137.4,107.42C140.44,107.42 142.9,104.96 142.9,101.92C142.9,98.88 140.44,96.42 137.4,96.42C134.36,96.42 131.9,98.88 131.9,101.92C131.9,104.96 134.36,107.42 137.4,107.42ZM137.4,108.92C141.27,108.92 144.4,105.79 144.4,101.92C144.4,98.05 141.27,94.92 137.4,94.92C133.54,94.92 130.4,98.05 130.4,101.92C130.4,105.79 133.54,108.92 137.4,108.92Z" />
+	<path
+		android:fillColor="#E5E7EB"
+		android:pathData="M280.4,56C280.4,51.58 276.82,48 272.4,48H246.4C241.98,48 238.4,51.58 238.4,56V118C238.4,122.42 241.98,126 246.4,126H272.4C276.82,126 280.4,122.42 280.4,118V56Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M246.4,49.5H272.4C275.99,49.5 278.9,52.41 278.9,56V118C278.9,121.59 275.99,124.5 272.4,124.5H246.4C242.81,124.5 239.9,121.59 239.9,118V56C239.9,52.41 242.81,49.5 246.4,49.5ZM272.4,48C276.82,48 280.4,51.58 280.4,56V118C280.4,122.42 276.82,126 272.4,126H246.4C241.98,126 238.4,122.42 238.4,118V56C238.4,51.58 241.98,48 246.4,48H272.4Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M280.4,62.25H238.4V116.25H280.4V62.25Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M239.9,63.75H278.9V114.75H239.9V63.75ZM280.4,62.25V116.25H238.4V62.25H280.4Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:pathData="M258.4,56C258.4,56.55 258.85,57 259.4,57C259.95,57 260.4,56.55 260.4,56C260.4,55.45 259.95,55 259.4,55C258.85,55 258.4,55.45 258.4,56Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M250.65,56.02C250.65,55.61 250.99,55.27 251.4,55.27H255.4C255.82,55.27 256.15,55.61 256.15,56.02C256.15,56.44 255.82,56.77 255.4,56.77H251.4C250.99,56.77 250.65,56.44 250.65,56.02Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M262.65,56.02C262.65,55.61 262.99,55.27 263.4,55.27H267.4C267.82,55.27 268.15,55.61 268.15,56.02C268.15,56.44 267.82,56.77 267.4,56.77H263.4C262.99,56.77 262.65,56.44 262.65,56.02Z" />
+	<path
+		android:fillColor="#DC2626"
+		android:fillType="evenOdd"
+		android:pathData="M269.4,38.5C274.65,38.5 278.9,34.25 278.9,29C278.9,23.75 274.65,19.5 269.4,19.5C264.15,19.5 259.9,23.75 259.9,29C259.9,34.25 264.15,38.5 269.4,38.5ZM269.4,40C275.48,40 280.4,35.08 280.4,29C280.4,22.92 275.48,18 269.4,18C263.33,18 258.4,22.92 258.4,29C258.4,35.08 263.33,40 269.4,40Z" />
+	<path
+		android:fillColor="#DC2626"
+		android:fillType="evenOdd"
+		android:pathData="M265.87,25.47C266.16,25.18 266.64,25.18 266.93,25.47L269.4,27.94L271.87,25.47C272.16,25.18 272.64,25.18 272.93,25.47C273.23,25.76 273.23,26.24 272.93,26.53L270.46,29L272.93,31.47C273.23,31.76 273.23,32.24 272.93,32.53C272.64,32.82 272.16,32.82 271.87,32.53L269.4,30.06L266.93,32.53C266.64,32.82 266.16,32.82 265.87,32.53C265.58,32.24 265.58,31.76 265.87,31.47L268.34,29L265.87,26.53C265.58,26.24 265.58,25.76 265.87,25.47Z" />
+	<path
+		android:fillColor="#F9FAFB"
+		android:pathData="M259.32,85C263.74,85 267.32,88.58 267.32,93L267.32,113C267.32,117.42 263.74,121 259.32,121L225.32,121C220.9,121 217.32,117.42 217.32,113L217.32,93C217.32,88.58 220.9,85 225.32,85L259.32,85Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M259.32,84.25C264.15,84.25 268.07,88.17 268.07,93L268.07,113C268.07,117.83 264.15,121.75 259.32,121.75L225.32,121.75C220.49,121.75 216.57,117.83 216.57,113L216.57,93C216.57,88.17 220.49,84.25 225.32,84.25L259.32,84.25ZM266.57,93C266.57,89 263.32,85.75 259.32,85.75L225.32,85.75C221.32,85.75 218.07,89 218.07,93L218.07,113C218.07,117 221.32,120.25 225.32,120.25L259.32,120.25C263.32,120.25 266.57,117 266.57,113L266.57,93Z" />
+	<path
+		android:fillColor="#E5E7EB"
+		android:pathData="M264.15,91.29C265.47,90.34 267.32,91.28 267.32,92.91L267.32,113C267.32,117.42 263.74,121 259.32,121L225.32,121C220.9,121 217.32,117.42 217.32,113L217.32,92.91C217.32,91.28 219.17,90.34 220.49,91.29L242.32,107.06L264.15,91.29Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M235.04,102.72L217.88,90.33L218.76,89.11L242.32,106.13L265.88,89.11L266.76,90.33L249.6,102.72L266.76,115.11L265.88,116.33L248.32,103.64L242.32,107.98L236.32,103.64L218.76,116.33L217.88,115.11L235.04,102.72Z" />
+	<path
+		android:fillColor="#9CA3AF"
+		android:fillType="evenOdd"
+		android:pathData="M259.32,84.25C264.15,84.25 268.07,88.17 268.07,93L268.07,113C268.07,117.83 264.15,121.75 259.32,121.75L225.32,121.75C220.49,121.75 216.57,117.83 216.57,113L216.57,93C216.57,88.17 220.49,84.25 225.32,84.25L259.32,84.25ZM266.57,93C266.57,89 263.32,85.75 259.32,85.75L225.32,85.75C221.32,85.75 218.07,89 218.07,93L218.07,113C218.07,117 221.32,120.25 225.32,120.25L259.32,120.25C263.32,120.25 266.57,117 266.57,113L266.57,93Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/qr_code_explanation.xml b/briar-android/src/main/res/drawable/qr_code_explanation.xml
deleted file mode 100644
index 557b7cd85..000000000
--- a/briar-android/src/main/res/drawable/qr_code_explanation.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="400dp"
-        android:height="100dp"
-        android:autoMirrored="true"
-        android:viewportHeight="49.5"
-        android:viewportWidth="194.8">
-	<path
-		android:fillColor="#000000"
-		android:pathData="M30.1 16.5l-9 0 0 -5c0 -2.4 -2 -4.4 -4.4 -4.4L4.4 7.1C2 7.1 0 9.1 0 11.5l0 24.2c0 2.4 2 4.4 4.4 4.4l9 0 0 5c0 2.4 2 4.4 4.4 4.4l12.2 0c2.4 0 4.4 -2 4.4 -4.4l0 -24.2c0.1 -2.4 -1.9 -4.4 -4.3 -4.4zm-27.4 16.1l0 -20.9 15.8 0 0 20.9 -15.8 0zm10.7 4.6l-5.8 0 0 -1.5 5.8 0 0 1.5zm13.5 9.4l-5.8 0 0 -1.5 5.8 0 0 1.5zm5 -4.6l-15.8 0 0 -1.9 0.5 0c2.4 0 4.4 -2 4.4 -4.4l0 -14.6 10.8 0 0 20.9z"/>
-	<path
-		android:fillColor="#000000"
-		android:pathData="M101.2 16.5l-8.3 0 0 -4.4c0 -1.4 -1.2 -2.6 -2.6 -2.6l-3.9 0 -2.1 -2.5 -6.9 0 -2.2 2.5 -3.8 0c-1.4 0 -2.6 1.2 -2.6 2.6l0 13.3c0 1.4 1.2 2.6 2.6 2.6l13.1 0 0 17.2c0 2.4 2 4.4 4.4 4.4l12.2 0c2.4 0 4.4 -2 4.4 -4.4l0 -24.3c0.2 -2.4 -1.8 -4.4 -4.3 -4.4zm-26.4 2.4c0 -3.3 2.7 -6 6 -6 3.3 0 6 2.7 6 6 0 3.3 -2.7 6 -6 6 -3.3 0 -6 -2.7 -6 -6zm23.2 27.7l-5.8 0 0 -1.5 5.8 0 0 1.5zm5 -4.6l-15.8 0 0 -14.1 3.1 0c1.4 0 2.6 -1.2 2.6 -2.6l0 -4.2 10.1 0 0 20.9z"/>
-	<path
-		android:fillColor="#000000"
-		android:pathData="M84.600003 18.9a3.8 3.8 0 0 1 -3.8 3.8 3.8 3.8 0 0 1 -3.8 -3.8 3.8 3.8 0 0 1 3.8 -3.8 3.8 3.8 0 0 1 3.8 3.8z"/>
-	<path
-		android:fillColor="#000000"
-		android:pathData="M175.3 16.5l-9.8 0 0 -5.7c0 -1.4 -1.2 -2.6 -2.6 -2.6l-19.3 0c-1.4 0 -2.6 1.2 -2.6 2.6l0 14.4c0 1.4 1.2 2.6 2.6 2.6l15.1 0 0 17.3c0 2.4 2 4.4 4.4 4.4l12.2 0c2.4 0 4.4 -2 4.4 -4.4l0 -24.2c0.1 -2.4 -1.9 -4.4 -4.4 -4.4zm-12.4 -5.9l-9.6 6 -9.6 -6 19.2 0zm-19.4 14.8l0 -12.3 9.8 6.1 9.8 -6.1 0 12.3 -19.6 0zm28.6 21.2l-5.8 0 0 -1.5 5.8 0 0 1.5zm5 -4.6l-15.8 0 0 -14.2 1.6 0c1.4 0 2.6 -1.2 2.6 -2.6l0 -4.1 11.6 0 0 20.9z"/>
-	<path
-		android:fillColor="#db3b21"
-		android:pathData="M101.4 17.8l2 2 7.4 -7.3 7.3 7.3 2.1 -2 -7.4 -7.4 7.4 -7.3 -2.1 -2.1 -7.3 7.4 -7.4 -7.4 -2 2.1 7.3 7.3z"/>
-	<path
-		android:fillColor="#db3b21"
-		android:pathData="M176 17.8l2.1 2 7.3 -7.3 7.4 7.3 2 -2 -7.3 -7.4 7.3 -7.3 -2 -2.1 -7.4 7.4 -7.3 -7.4 -2.1 2.1 7.3 7.3z"/>
-	<path
-		android:fillColor="#67a60f"
-		android:pathData="M35.8 18.8l0 0L52.5 2.1 50.5 0 35.6 14.8 28.5 7.7l-2.1 2.1 9.2 9.1z"/>
-</vector>
\ No newline at end of file
diff --git a/briar-android/src/main/res/drawable/qr_code_intro.xml b/briar-android/src/main/res/drawable/qr_code_intro.xml
deleted file mode 100644
index 6b09db32d..000000000
--- a/briar-android/src/main/res/drawable/qr_code_intro.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="409dp"
-        android:height="162dp"
-        android:viewportHeight="161.7"
-        android:viewportWidth="409.2">
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M369.8,157.4l-4.3,-4.3l-7.1,-2.4c-3.9,-1.3 -8.7,-3 -10.7,-3.7l-3.7,-1.3l3.5,-0.2c8.2,-0.4 13,-4 14.3,-10.9c0.8,-4.1 1.1,-17.3 0.8,-33c-0.2,-8.1 -0.2,-15.4 0,-16.3c0.1,-0.9 0.5,-2.4 0.9,-3.4c1.2,-3.5 0.3,-11.9 -1.9,-17.6c-0.3,-0.9 -1.9,-4.2 -3.5,-7.4c-4.2,-8.2 -4.5,-8.9 -4.9,-10.5c-0.5,-1.8 -0.2,-5.4 0.5,-6.8c0.7,-1.3 2.2,-2.9 3.2,-3.5c1.3,-0.7 2.6,0.1 4.7,2.9c3.4,4.5 14,19.4 15.7,22.2c3.7,6 6,11.2 8,18.8c0.7,2.5 1.9,7 2.7,10.1c0.8,3.1 2.7,10.2 4.1,15.8l2.6,10.2l4.6,5.2c2.6,2.9 5.8,6.5 7.2,8c1.4,1.6 2.5,3 2.5,3.2c0,0.3 -34.5,29.3 -34.9,29.3C374.2,161.7 372.2,159.7 369.8,157.4zM275.9,141c-1.3,-0.6 -2.2,-1.4 -2.9,-2.3c-2.1,-2.7 -2,2.4 -1.9,-68.5l0.1,-64l0.7,-1.2c1,-1.9 2,-2.9 3.7,-3.9l1.6,-0.9l37.8,-0.1c42.5,-0.1 39.4,-0.2 42.1,2.2c0.9,0.8 1.8,2 2.2,2.9c0.7,1.6 0.7,1.6 0.8,14.2l0.1,12.6l-1.8,-0.1c-1.4,-0.1 -2.1,0 -3.2,0.5c-2,1 -3.9,2.9 -5.1,5.1l-1,2l0,-12.8l0,-12.8h-33.6h-33.6v51.3v51.3h33.6h33.6l0.1,-34.4c0.1,-33 0.1,-34.4 0.6,-32.9c0.3,0.8 1.8,4 3.4,7c5.5,10.6 5.4,9.9 5.4,47.2c0,27.6 -0.1,30 -1.7,33.1c-1.1,2.2 -2.7,3.7 -5.1,4.7l-1.7,0.7L314,141.8l-36.2,0.1L275.9,141L275.9,141zM318.3,135.9c2.9,-1.3 4.5,-3.7 4.4,-6.6c0,-4.1 -3.1,-7.2 -7.1,-7.2c-2.1,0 -3.6,0.6 -5.2,2.2c-2.2,2.2 -2.8,5.4 -1.3,8.3c0.7,1.4 2.5,3 4,3.5C314.6,136.6 317,136.6 318.3,135.9z"/>
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M39.4,157.4l4.3,-4.3l7.1,-2.4c3.9,-1.3 8.7,-3 10.7,-3.7l3.7,-1.3l-3.5,-0.2c-8.2,-0.4 -13,-4 -14.3,-10.9c-0.8,-4.1 -1.1,-17.3 -0.8,-33c0.2,-8.1 0.2,-15.4 0,-16.3c-0.1,-0.9 -0.5,-2.4 -0.9,-3.4c-1.2,-3.5 -0.3,-11.9 1.9,-17.6c0.3,-0.9 1.9,-4.2 3.5,-7.4c4.2,-8.2 4.5,-8.9 4.9,-10.5c0.5,-1.8 0.2,-5.4 -0.5,-6.8c-0.7,-1.3 -2.2,-2.9 -3.2,-3.5c-1.3,-0.7 -2.6,0.1 -4.7,2.9c-3.4,4.5 -14,19.4 -15.7,22.2c-3.7,6 -6,11.2 -8,18.8c-0.7,2.5 -1.9,7 -2.7,10.1c-0.8,3.1 -2.7,10.2 -4.1,15.8l-2.6,10.2l-4.6,5.2c-2.6,2.9 -5.8,6.5 -7.2,8s-2.5,3 -2.5,3.2c0,0.3 34.5,29.3 34.9,29.3C35,161.7 37.1,159.7 39.4,157.4zM133.3,141c1.3,-0.6 2.2,-1.4 2.9,-2.3c2.1,-2.7 2,2.4 1.9,-68.5l-0.1,-64l-0.7,-1.2c-1,-1.9 -2,-2.9 -3.7,-3.9l-1.6,-0.9l-37.8,-0.1c-42.5,-0.1 -39.4,-0.2 -42.1,2.2c-0.9,0.8 -1.8,2 -2.2,2.9c-0.7,1.6 -0.7,1.6 -0.8,14.2L49,32l1.8,-0.1c1.4,-0.1 2.1,0 3.2,0.5c2,1 3.9,2.9 5.1,5.1l1,2l0,-12.8l0,-12.8h33.6h33.6v51.3v51.3L93.8,116.5L60.2,116.5l-0.1,-34.4c-0.1,-33 -0.1,-34.4 -0.6,-32.9c-0.3,0.8 -1.8,4 -3.4,7c-5.5,10.6 -5.4,9.9 -5.4,47.2c0,27.6 0.1,30 1.7,33.1c1.1,2.2 2.7,3.7 5.1,4.7l1.7,0.7l36.2,0.1l36.2,0.1L133.3,141L133.3,141zM90.9,135.9c-2.9,-1.3 -4.5,-3.7 -4.4,-6.6c0,-4.1 3.1,-7.2 7.1,-7.2c2.1,0 3.6,0.6 5.2,2.2c2.2,2.2 2.8,5.4 1.3,8.3c-0.7,1.4 -2.5,3 -4,3.5C94.6,136.6 92.3,136.6 90.9,135.9z"/>
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M80.5,63h2.3v2.3h2.3v2.3L73.6,67.6v-2.3h2.3v-4.6h4.6L80.5,63L80.5,63zM110.5,83.8h2.3v-2.3h-2.3L110.5,83.8zM82.8,63h2.3v-2.3h-2.3L82.8,63zM115.1,83.8h2.3v-2.3h-2.3L115.1,83.8zM87.4,86.1L92,86.1L92,83.8h-4.6L87.4,86.1zM108.2,86.1L108.2,83.8h-2.3v2.3L108.2,86.1zM99,86.1h2.3v-4.6L99,81.5L99,86.1zM80.5,56.1v2.3h6.9v-2.3L80.5,56.1zM78.2,58.4v-2.3h-4.6v4.6h2.3v-2.3L78.2,58.4zM85.1,53.8L69,53.8v-16.1h16.1L85.1,53.8zM82.8,40L71.3,40v11.5h11.5L82.8,40zM73.6,81.5h6.9v-6.9h-6.9L73.6,81.5zM96.6,79.1v2.3L99,81.4v-2.3L96.6,79.1zM80.5,42.3h-6.9v6.9h6.9L80.5,42.3zM117.4,37.7L117.4,53.8L101.3,53.8v-16.1L117.4,37.7zM115.1,40L103.6,40v11.5h11.5L115.1,40zM69,69.9h16.1v16.1L69,86L69,69.9zM71.3,83.8h11.5v-11.5L71.3,72.3L71.3,83.8zM71.3,56.1L69,56.1v11.5h2.3L71.3,56.1zM101.3,67.6v2.3h2.3v-2.3L101.3,67.6zM94.3,76.9v-2.3L92,74.6v2.3h-4.6v4.6L92,81.5v2.3h2.3v-4.6h2.3v-2.3L94.3,76.9zM87.4,46.9L92,46.9v-2.3h-4.6L87.4,46.9zM105.9,65.3h4.6v2.3h2.3v-6.9h-2.3v-4.6h-2.3v6.9h-6.9v2.3h2.3v2.3h2.3L105.9,65.3zM108.2,72.2h-2.3v-2.3h-2.3v4.6h-6.9v2.3h4.6v4.6h2.3v2.3h2.3v-4.6h9.2v-2.3h-6.9L108.2,72.2zM108.2,72.2h2.3v-4.6h-2.3L108.2,72.2zM89.7,72.2v-2.3L92,69.9v-2.3h2.3v-2.3h2.3v-4.6h6.9v-4.6h-2.3v2.3L99,58.4v-9.2h-2.3v-4.6L99,44.6v-6.9h-2.3v4.6h-2.3v-4.6h-6.9v4.6h2.3v-2.3L92,40v4.6h2.3v6.9h2.3v2.3h-2.3v4.6L92,58.4L92,53.8h-2.3v-2.3h-2.3v4.6h2.3v2.3h-2.3v6.9h2.3v-4.6L92,60.7v4.6h-2.3v2.3h-2.3v6.9L92,74.5v-2.3L89.7,72.2zM115.1,74.5v-2.3h-4.6v2.3L115.1,74.5zM112.8,42.3h-6.9v6.9h6.9L112.8,42.3zM94.3,72.2L99,72.2v-2.3h-2.3v-2.3h-2.3L94.4,72.2zM99,67.6v-2.3h-2.3v2.3L99,67.6zM112.8,58.4h4.6v-2.3h-4.6L112.8,58.4zM115.1,76.9h2.3v-2.3h-2.3L115.1,76.9zM115.1,63h2.3v-2.3h-2.3L115.1,63zM94.3,51.5L92,51.5v2.3h2.3L94.3,51.5zM94.3,51.5"/>
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M303.5,63h2.3v2.3h2.3v2.3h-11.5v-2.3h2.3v-4.6h4.6L303.5,63L303.5,63zM333.5,83.8h2.3v-2.3h-2.3L333.5,83.8zM305.8,63h2.3v-2.3h-2.3L305.8,63zM338.1,83.8h2.3v-2.3h-2.3L338.1,83.8zM310.4,86.1h4.6L315,83.8h-4.6L310.4,86.1zM331.2,86.1L331.2,83.8h-2.3v2.3L331.2,86.1zM322,86.1h2.3v-4.6L322,81.5L322,86.1zM303.5,56.1v2.3h6.9v-2.3L303.5,56.1zM301.2,58.4v-2.3h-4.6v4.6h2.3v-2.3L301.2,58.4zM308.1,53.8L292,53.8v-16.1h16.1L308.1,53.8zM305.8,40h-11.5v11.5h11.5L305.8,40zM296.6,81.5h6.9v-6.9h-6.9L296.6,81.5zM319.6,79.1v2.3h2.3v-2.3L319.6,79.1zM303.5,42.3h-6.9v6.9h6.9L303.5,42.3zM340.4,37.7L340.4,53.8h-16.1v-16.1L340.4,37.7zM338.1,40h-11.5v11.5h11.5L338.1,40zM292,69.9h16.1v16.1L292,86L292,69.9zM294.3,83.8h11.5v-11.5h-11.5L294.3,83.8zM294.3,56.1L292,56.1v11.5h2.3L294.3,56.1zM324.3,67.6v2.3h2.3v-2.3L324.3,67.6zM317.3,76.9v-2.3L315,74.6v2.3h-4.6v4.6h4.6v2.3h2.3v-4.6h2.3v-2.3L317.3,76.9zM310.4,46.9h4.6v-2.3h-4.6L310.4,46.9zM328.9,65.3h4.6v2.3h2.3v-6.9h-2.3v-4.6h-2.3v6.9h-6.9v2.3h2.3v2.3h2.3L328.9,65.3zM331.2,72.2h-2.3v-2.3h-2.3v4.6h-6.9v2.3h4.6v4.6h2.3v2.3h2.3v-4.6h9.2v-2.3h-6.9L331.2,72.2zM331.2,72.2h2.3v-4.6h-2.3L331.2,72.2zM312.7,72.2v-2.3h2.3v-2.3h2.3v-2.3h2.3v-4.6h6.9v-4.6h-2.3v2.3L322,58.4v-9.2h-2.3v-4.6h2.3v-6.9h-2.3v4.6h-2.3v-4.6h-6.9v4.6h2.3v-2.3h2.3v4.6h2.3v6.9h2.3v2.3h-2.3v4.6L315,58.4L315,53.8h-2.3v-2.3h-2.3v4.6h2.3v2.3h-2.3v6.9h2.3v-4.6h2.3v4.6h-2.3v2.3h-2.3v6.9h4.6v-2.3L312.7,72.2zM338.1,74.5v-2.3h-4.6v2.3L338.1,74.5zM335.8,42.3h-6.9v6.9h6.9L335.8,42.3zM317.3,72.2h4.6v-2.3h-2.3v-2.3h-2.3L317.3,72.2zM322,67.6v-2.3h-2.3v2.3L322,67.6zM335.8,58.4h4.6v-2.3h-4.6L335.8,58.4zM338.1,76.9h2.3v-2.3h-2.3L338.1,76.9zM338.1,63h2.3v-2.3h-2.3L338.1,63zM317.3,51.5L315,51.5v2.3h2.3L317.3,51.5zM317.3,51.5"/>
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M179.6,48.9l-20.6,18l20.6,16.7v-5.2L199,78.4v-24.3h-19.3L179.7,48.9z"/>
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M229.4,83.7l20.6,-18l-20.6,-16.7v5.2L210,54.2v24.3h19.3L229.3,83.7z"/>
-</vector>
diff --git a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
index fb2fe2c21..9fd9ff420 100644
--- a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
@@ -1,89 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/scrollView"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<androidx.constraintlayout.widget.ConstraintLayout
+	<ScrollView
+		android:id="@+id/scrollView"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<androidx.constraintlayout.widget.ConstraintLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<ImageView
+				android:id="@+id/diagram"
+				android:layout_width="@dimen/hero_square"
+				android:layout_height="@dimen/hero_square"
+				android:layout_margin="16dp"
+				app:layout_constraintEnd_toStartOf="@id/guideline"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				app:srcCompat="@drawable/il_qr_code"
+				tools:ignore="ContentDescription" />
+
+			<TextView
+				android:id="@+id/introTwoWay"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="16dp"
+				android:text="@string/add_contact_intro_two_way"
+				app:layout_constraintEnd_toStartOf="@+id/guideline"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/diagram" />
+
+			<androidx.constraintlayout.widget.Guideline
+				android:id="@+id/guideline"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:orientation="vertical"
+				app:layout_constraintGuide_percent="0.5" />
+
+			<ImageView
+				android:id="@+id/explanationImage"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="16dp"
+				android:scaleType="fitCenter"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="@+id/guideline"
+				app:layout_constraintTop_toTopOf="parent"
+				app:srcCompat="@drawable/il_qr_code_nearby"
+				tools:ignore="ContentDescription" />
+
+			<TextView
+				android:id="@+id/explanationText"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_margin="16dp"
+				android:text="@string/face_to_face"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toEndOf="@+id/guideline"
+				app:layout_constraintTop_toBottomOf="@+id/explanationImage" />
+
+		</androidx.constraintlayout.widget.ConstraintLayout>
+
+	</ScrollView>
+
+	<Button
+		android:id="@+id/continueButton"
+		style="@style/BriarButton"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:padding="@dimen/margin_large">
+		android:layout_gravity="center_horizontal"
+		android:layout_marginHorizontal="16dp"
+		android:text="@string/continue_button"
+		app:layout_constraintBottom_toBottomOf="parent" />
 
-		<ImageView
-			android:id="@+id/diagram"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:adjustViewBounds="true"
-			android:padding="@dimen/margin_medium"
-			android:scaleType="fitCenter"
-			app:layout_constraintBottom_toBottomOf="@id/explanationText"
-			app:layout_constraintEnd_toStartOf="@id/explanationText"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:srcCompat="@drawable/qr_code_intro"
-			app:tint="@color/color_primary"
-			tools:ignore="ContentDescription" />
-
-		<ImageView
-			android:id="@+id/explanationImage"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:adjustViewBounds="true"
-			android:paddingStart="@dimen/margin_large"
-			android:paddingTop="@dimen/margin_large"
-			android:paddingEnd="@dimen/margin_large"
-			android:scaleType="fitCenter"
-			app:layout_constraintBottom_toTopOf="@id/explanationText"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/diagram"
-			app:layout_constraintTop_toTopOf="parent"
-			app:srcCompat="@drawable/qr_code_explanation"
-			tools:ignore="ContentDescription" />
-
-		<TextView
-			android:id="@+id/explanationText"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:padding="@dimen/margin_large"
-			android:text="@string/face_to_face"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/diagram"
-			app:layout_constraintTop_toBottomOf="@id/explanationImage" />
-
-		<View
-			android:id="@+id/explanationBorder"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:background="@drawable/border_explanation"
-			app:layout_constraintBottom_toBottomOf="@id/explanationText"
-			app:layout_constraintEnd_toEndOf="@id/explanationImage"
-			app:layout_constraintStart_toStartOf="@id/explanationImage"
-			app:layout_constraintTop_toTopOf="@id/explanationImage" />
-
-		<androidx.constraintlayout.widget.Barrier
-			android:id="@+id/barrier"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			app:barrierDirection="bottom"
-			app:constraint_referenced_ids="diagram,explanationBorder" />
-
-		<Button
-			android:id="@+id/continueButton"
-			style="@style/BriarButton"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
-			android:layout_marginTop="@dimen/margin_medium"
-			android:text="@string/continue_button"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/barrier" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
index eb29e78fc..53d058c28 100644
--- a/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
+++ b/briar-android/src/main/res/layout/fragment_keyagreement_id.xml
@@ -1,80 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/scrollView"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
+	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<androidx.constraintlayout.widget.ConstraintLayout
+	<ScrollView
+		android:id="@+id/scrollView"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1">
+
+		<androidx.constraintlayout.widget.ConstraintLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:padding="@dimen/margin_large">
+
+			<ImageView
+				android:id="@+id/diagram"
+				android:layout_width="@dimen/hero_square"
+				android:layout_height="@dimen/hero_square"
+				android:adjustViewBounds="true"
+				android:importantForAccessibility="no"
+				android:scaleType="fitCenter"
+				app:layout_constraintBottom_toTopOf="@id/introTwoWay"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				app:srcCompat="@drawable/il_qr_code" />
+
+			<TextView
+				android:id="@+id/introTwoWay"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/add_contact_intro_two_way"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@+id/diagram" />
+
+			<ImageView
+				android:id="@+id/explanationImage"
+				android:layout_width="@dimen/hero_rect_width"
+				android:layout_height="@dimen/hero_rect_height"
+				android:layout_marginTop="16dp"
+				android:scaleType="fitCenter"
+				app:layout_constraintBottom_toTopOf="@id/explanationText"
+				app:layout_constraintEnd_toEndOf="@id/diagram"
+				app:layout_constraintStart_toStartOf="@id/diagram"
+				app:layout_constraintTop_toBottomOf="@id/introTwoWay"
+				app:srcCompat="@drawable/il_qr_code_nearby"
+				tools:ignore="ContentDescription" />
+
+			<TextView
+				android:id="@+id/explanationText"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="16dp"
+				android:text="@string/face_to_face"
+				app:layout_constrainedWidth="true"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toBottomOf="@id/explanationImage" />
+
+		</androidx.constraintlayout.widget.ConstraintLayout>
+
+	</ScrollView>
+
+	<Button
+		android:id="@+id/continueButton"
+		style="@style/BriarButton"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:padding="@dimen/margin_large">
+		android:layout_marginHorizontal="16dp"
+		android:layout_marginTop="@dimen/margin_medium"
+		android:text="@string/continue_button" />
 
-		<ImageView
-			android:id="@+id/diagram"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true"
-			android:paddingBottom="@dimen/margin_large"
-			android:scaleType="fitCenter"
-			app:layout_constraintBottom_toTopOf="@id/explanationImage"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:srcCompat="@drawable/qr_code_intro"
-			app:tint="@color/color_primary" />
-
-		<ImageView
-			android:id="@+id/explanationImage"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:adjustViewBounds="true"
-			android:paddingLeft="@dimen/margin_large"
-			android:paddingTop="@dimen/margin_large"
-			android:paddingRight="@dimen/margin_large"
-			android:scaleType="fitCenter"
-			app:layout_constraintBottom_toTopOf="@id/explanationText"
-			app:layout_constraintEnd_toEndOf="@id/diagram"
-			app:layout_constraintStart_toStartOf="@id/diagram"
-			app:layout_constraintTop_toBottomOf="@id/diagram"
-			app:srcCompat="@drawable/qr_code_explanation"
-			tools:ignore="ContentDescription" />
-
-		<TextView
-			android:id="@+id/explanationText"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:padding="@dimen/margin_large"
-			android:text="@string/face_to_face"
-			app:layout_constrainedWidth="true"
-			app:layout_constraintEnd_toEndOf="@id/explanationImage"
-			app:layout_constraintStart_toStartOf="@id/explanationImage"
-			app:layout_constraintTop_toBottomOf="@id/explanationImage" />
-
-		<View
-			android:id="@+id/explanationBorder"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:background="@drawable/border_explanation"
-			app:layout_constraintBottom_toBottomOf="@id/explanationText"
-			app:layout_constraintEnd_toEndOf="@id/explanationImage"
-			app:layout_constraintStart_toStartOf="@id/explanationImage"
-			app:layout_constraintTop_toTopOf="@id/explanationImage" />
-
-		<Button
-			android:id="@+id/continueButton"
-			style="@style/BriarButton"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_medium"
-			android:text="@string/continue_button"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="@id/explanationImage"
-			app:layout_constraintStart_toStartOf="@id/explanationImage"
-			app:layout_constraintTop_toBottomOf="@id/explanationText" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index 6d4a0fb8f..c04f0b1b9 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -29,4 +29,4 @@
 
 	<color name="il_border">#64748B</color>
 	<color name="il_background">#334155</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 30325d9d3..5dca23033 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -15,6 +15,7 @@
 	<color name="briar_night_950">#0e171f</color>
 	<color name="briar_night_800">#212d3b</color>
 	<color name="briar_night_700">#2e3d4f</color>
+	<color name="briar_night_600">#475569</color>
 	<color name="briar_night_500">#435b77</color>
 	<color name="briar_night_50">#ebf3fa</color>
 
@@ -76,4 +77,4 @@
 	<color name="thread_item_highlight">@android:color/white</color>
 
 	<color name="divider">@color/briar_gray_200</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 3bf3edf49..d8a6c261c 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -240,6 +240,7 @@
 	<!-- Adding Contacts -->
 
 	<string name="add_contact_title">Add Contact Nearby</string>
+	<string name="add_contact_intro_two_way">Both of you need to scan each other\'s QR code.</string>
 	<string name="face_to_face">You must meet up with the person you want to add as a contact.\n\nThis will prevent anyone from impersonating you or reading your messages in future.</string>
 	<string name="continue_button">Continue</string>
 	<string name="try_again_button">Try Again</string>