diff --git a/briar-android/artwork/bluetooth.svg b/briar-android/artwork/bluetooth.svg
deleted file mode 100644
index 0905e018e0424bf7a5839963ca206e7e50abe635..0000000000000000000000000000000000000000
--- a/briar-android/artwork/bluetooth.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="500" height="175" viewBox="0 0 500 175"
- id="svg2" version="1.1" sodipodi:docname="bluetooth.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="892"
- id="namedview10"
- showgrid="false"
- inkscape:zoom="0.93337848"
- inkscape:cx="-49.861215"
- inkscape:cy="137.66042"
- inkscape:window-x="0"
- inkscape:window-y="144"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <defs
- id="defs4" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <path
- id="path4201"
- d="m 459.80937,167.15983 -4.32657,-4.3343 -7.06956,-2.42737 c -3.88825,-1.33505 -8.72285,-2.99587 -10.74354,-3.6907 l -3.674,-1.26333 3.524,-0.1726 c 8.24183,-0.40367 12.98778,-4.00671 14.33634,-10.88389 0.79628,-4.06078 1.12887,-17.29805 0.83016,-33.04122 -0.15338,-8.08375 -0.16617,-15.41641 -0.0284,-16.29481 0.13775,-0.8784 0.53527,-2.42011 0.88339,-3.42602 1.22247,-3.53243 0.33996,-11.90828 -1.8577,-17.63146 -0.34848,-0.9075 -1.93434,-4.215 -3.52415,-7.35 -4.15849,-8.2003 -4.50458,-8.94188 -4.89292,-10.4841 -0.45865,-1.82145 -0.21161,-5.43531 0.4625,-6.7659 0.66625,-1.31505 2.15695,-2.91616 3.24622,-3.48662 1.29885,-0.68024 2.61568,0.12202 4.6864,2.85512 3.42153,4.51599 14.00135,19.44095 15.73191,22.19301 3.74551,5.95636 5.95558,11.16496 7.9722,18.78849 0.6547,2.475 1.88525,6.9975 2.73456,10.05 0.84931,3.0525 2.71404,10.15792 4.14385,15.78983 l 2.59964,10.23983 4.65,5.19319 c 2.5575,2.85626 5.7975,6.46371 7.2,8.01657 1.4025,1.55286 2.55,2.97543 2.55,3.16127 0,0.33546 -34.49955,29.29931 -34.89913,29.29931 -0.11475,0 -2.15559,-1.95044 -4.5352,-4.3343 z M 365.9443,150.77206 c -1.25762,-0.62844 -2.20557,-1.3788 -2.91402,-2.30663 -2.08931,-2.73629 -1.95034,2.36868 -1.86433,-68.48249 l 0.0777,-64.03881 0.66066,-1.23494 c 1.0152,-1.89767 1.99201,-2.91087 3.73952,-3.87887 l 1.59982,-0.88619 37.78387,-0.0796 c 42.45592,-0.0894 39.40239,-0.2483 42.11646,2.19188 0.87544,0.78709 1.75715,1.95946 2.18393,2.90385 0.71264,1.57698 0.71613,1.63839 0.80561,14.20405 l 0.0899,12.62022 -1.79817,-0.13007 c -1.42577,-0.10313 -2.08143,0.007 -3.16601,0.5321 -2.01294,0.97445 -3.93993,2.89871 -5.11476,5.10753 l -1.03717,1.95 -0.007,-12.825 -0.007,-12.825 h -33.6 -33.6 v 51.3 51.3 h 33.59873 33.59874 l 0.0763,-34.425 c 0.073,-32.96021 0.0982,-34.36117 0.59098,-32.925 0.28309,0.825 1.80562,3.9975 3.3834,7.05 5.49252,10.62624 5.40494,9.86009 5.39597,47.20335 -0.007,27.62122 -0.12358,29.95084 -1.66204,33.10906 -1.07144,2.19949 -2.71143,3.71042 -5.05823,4.66019 l -1.67381,0.6774 -36.1677,0.0797 -36.16769,0.0797 -1.864,-0.93145 z m 42.39939,-5.03813 c 2.87119,-1.30885 4.45771,-3.6784 4.43003,-6.61652 -0.0388,-4.11587 -3.1088,-7.22328 -7.1364,-7.22328 -2.11956,0 -3.56727,0.60889 -5.16364,2.17177 -2.24518,2.19807 -2.75398,5.43897 -1.30101,8.28704 0.71312,1.39782 2.52137,3.00905 3.96214,3.53045 1.49707,0.54176 3.84003,0.47454 5.20888,-0.14946 z"
- style="fill:#000000;stroke:none" />
- <path
- id="path4201-1"
- d="m 39.434334,167.15983 4.32657,-4.3343 7.06956,-2.42737 c 3.88825,-1.33505 8.72285,-2.99587 10.74354,-3.6907 l 3.674,-1.26333 -3.524,-0.1726 c -8.24183,-0.40367 -12.98778,-4.00671 -14.33634,-10.88389 -0.79628,-4.06078 -1.12887,-17.29805 -0.83016,-33.04122 0.15338,-8.08375 0.16617,-15.41641 0.0284,-16.29481 -0.13775,-0.8784 -0.53527,-2.42011 -0.88339,-3.42602 -1.22247,-3.53243 -0.33996,-11.90828 1.8577,-17.63146 0.34848,-0.9075 1.93434,-4.215 3.52415,-7.35 4.15849,-8.2003 4.50458,-8.94188 4.89292,-10.4841 0.45865,-1.82145 0.21161,-5.43531 -0.4625,-6.7659 -0.66625,-1.31505 -2.15695,-2.91616 -3.24622,-3.48662 -1.29885,-0.68024 -2.61568,0.12202 -4.6864,2.85512 -3.42153,4.51599 -14.00135,19.44095 -15.73191,22.19301 -3.74551,5.95636 -5.955584,11.16496 -7.972204,18.78849 -0.6547,2.475 -1.88525,6.9975 -2.73456,10.05 -0.84931,3.0525 -2.71404,10.15792 -4.14385,15.78983 L 14.4,125.82379 9.75,131.01698 c -2.5575,2.85626 -5.7975,6.46371 -7.2,8.01657 -1.4025,1.55286 -2.55,2.97543 -2.55,3.16127 0,0.33546 34.499554,29.29931 34.899134,29.29931 0.11475,0 2.15559,-1.95044 4.53519,-4.3343 z m 93.865056,-16.38777 c 1.25762,-0.62844 2.20557,-1.3788 2.91402,-2.30663 2.08931,-2.73629 1.95034,2.36868 1.86433,-68.48249 l -0.0777,-64.03881 -0.66066,-1.23494 c -1.0152,-1.89767 -1.99201,-2.91087 -3.73952,-3.87887 L 132.00004,9.94413 94.216184,9.86453 c -42.45592,-0.0894 -39.40239,-0.2483 -42.11646,2.19188 -0.87544,0.78709 -1.75715,1.95946 -2.18393,2.90385 -0.71264,1.57698 -0.71613,1.63839 -0.80561,14.20405 l -0.0899,12.62022 1.79817,-0.13007 c 1.42577,-0.10313 2.08143,0.007 3.16601,0.5321 2.01294,0.97445 3.93993,2.89871 5.11476,5.10753 l 1.03717,1.95 0.007,-12.825 0.007,-12.825 h 33.6 33.599986 v 51.3 51.3 H 93.751664 60.152924 l -0.0763,-34.425 c -0.073,-32.96021 -0.0982,-34.36117 -0.59098,-32.925 -0.28309,0.825 -1.80562,3.9975 -3.3834,7.05 -5.49252,10.62624 -5.40494,9.86009 -5.39597,47.20335 0.007,27.62122 0.12358,29.95084 1.66204,33.10906 1.07144,2.19949 2.71143,3.71042 5.05823,4.66019 l 1.67381,0.6774 36.1677,0.0797 36.167676,0.0797 1.864,-0.93145 z m -42.399376,-5.03813 c -2.87119,-1.30885 -4.45771,-3.6784 -4.43003,-6.61652 0.0388,-4.11587 3.1088,-7.22328 7.1364,-7.22328 2.11956,0 3.56727,0.60889 5.16364,2.17177 2.245176,2.19807 2.753976,5.43897 1.301006,8.28704 -0.713116,1.39782 -2.521366,3.00905 -3.962136,3.53045 -1.49707,0.54176 -3.84003,0.47454 -5.20888,-0.14946 z"
- style="fill:#000000;stroke:none" />
- <path
- id="rect4270"
- d="m 247.25369,71.97921 h 4.73637 c 13.16497,0 23.76348,10.598514 23.76348,23.763485 v 32.174615 c 0,13.16497 -10.59851,23.76348 -23.76348,23.76348 h -4.73637 c -13.16497,0 -23.76349,-10.59851 -23.76349,-23.76348 V 95.742695 c 0,-13.164971 10.59852,-23.763485 23.76349,-23.763485 z"
- style="fill:#0a3d91;stroke:none" />
- <path
- id="path4844"
- d="m 143.67921,23.5571 c -1.59043,2.623831 0.18153,5.574737 2.78461,6.642714 2.69504,1.572445 6.1706,4.987176 9.14793,2.232151 2.23313,-2.039515 0.60129,-5.727894 -2.04109,-6.67035 -3.06433,-1.676733 -6.55172,-5.514807 -9.89145,-2.204515 z M 351.7046,23.12937 c -2.76779,1.960623 -7.06819,2.694997 -8.37782,6.042717 -0.64195,2.73095 1.93572,4.99255 4.58419,4.426453 3.2021,-1.637914 7.05658,-2.8424 9.17849,-5.94769 0.56931,-2.60435 -1.49324,-5.35066 -4.26769,-4.745697 -0.41558,-0.107679 -0.76003,0.03505 -1.11717,0.224217 z m -26.76172,13.17187 c -2.93431,1.708015 -7.32039,1.922759 -8.93076,5.153004 -0.90775,2.654328 1.43202,5.159236 4.12365,4.861044 3.35587,-1.304271 7.31954,-2.112696 9.73662,-5.002268 0.81368,-2.537666 -0.97658,-5.469583 -3.79644,-5.128908 -0.4035,-0.14574 -0.75969,-0.03824 -1.13307,0.117128 z m -155.23633,2.46289 c -1.21948,2.711869 0.75683,5.460507 3.4437,6.14538 2.85847,1.080772 6.66937,4.11785 9.31224,1.23392 2.3151,-2.03652 0.33929,-5.835383 -2.40983,-6.41823 -3.32833,-1.175814 -7.38479,-4.713633 -10.34611,-0.96107 z m 127.27344,7.61719 c -3.12289,1.309174 -7.49226,0.970678 -9.49244,3.970097 -1.23184,2.518748 0.7727,5.298264 3.48037,5.339749 3.48706,-0.907308 7.56742,-1.1128 10.30314,-3.739116 1.11397,-2.422222 -0.31199,-5.546068 -3.1516,-5.551016 -0.3827,-0.195662 -0.75023,-0.126964 -1.13947,-0.01971 z m -97.49023,1.54492 c -2.22858,1.461838 -2.68005,4.865948 -0.27553,6.376909 2.5869,1.470583 5.91459,1.954941 8.83971,2.495346 2.78485,0.332188 4.74603,-2.479173 3.89118,-5.048668 -2.04264,-3.279676 -6.47206,-2.73364 -9.71704,-4.089227 -0.91277,0.08855 -1.82555,0.177093 -2.73832,0.26564 z m 68.51367,4.50782 c -3.27623,0.788856 -7.46081,-0.187875 -9.93635,2.381992 -1.64972,2.268076 -0.15709,5.353662 2.50432,5.86185 3.61172,-0.292365 7.71764,0.09072 10.84009,-2.093962 1.46245,-2.227649 0.52336,-5.531725 -2.28478,-5.959415 -0.34949,-0.249225 -0.72211,-0.239347 -1.12328,-0.190465 z m -39.44922,1.41796 c -1.93309,1.83595 -1.76537,5.266611 0.87081,6.321491 2.80857,0.988807 6.17065,0.846733 9.1444,0.861366 2.79909,-0.172766 4.22635,-3.289835 2.92376,-5.664738 -2.60365,-2.851635 -6.84699,-1.541752 -10.29251,-2.269899 -0.88215,0.250593 -1.76431,0.501187 -2.64646,0.75178 z"
- style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0a3d91;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:7.55;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:7.55, 22.65;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
- <path
- d="m 252.50083,112.08988 11.6563,-11.45156 -17.12592,-19.790888 0.0193,25.792048 -9.14185,-9.24454 -3.12531,3.09064 11.5214,11.58063 -11.49773,11.30756 c 3.03061,3.05593 0,0 3.03061,3.05593 l 9.18921,-8.97308 c 0.0443,4.73517 0.004,27.16515 0.004,27.16515 l 17.10224,-20.77257 z m -1.07721,-19.570428 6.79869,7.863838 -6.79869,6.63278 z m -0.0237,40.027828 0.0237,-15.39623 6.89338,6.9879 z"
- id="path1536"
- style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.254891"
- sodipodi:nodetypes="ccccccccccccccccccccc" />
-</svg>
diff --git a/briar-android/artwork/empty_state_blog.svg b/briar-android/artwork/empty_state_blog.svg
deleted file mode 100644
index eb1cd25c747ec817e8444810054ece25d0a638b3..0000000000000000000000000000000000000000
--- a/briar-android/artwork/empty_state_blog.svg
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="162"
- height="156"
- viewBox="0 0 162 156"
- fill="none"
- version="1.1"
- id="svg16"
- sodipodi:docname="No-Posts.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
- <metadata
- id="metadata22">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs20" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="754"
- inkscape:window-height="480"
- id="namedview18"
- showgrid="false"
- inkscape:zoom="1.5128205"
- inkscape:cx="81"
- inkscape:cy="78"
- inkscape:window-x="0"
- inkscape:window-y="20"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg16" />
- <rect
- width="80.9997"
- height="78"
- fill="black"
- fill-opacity="0"
- transform="scale(2)"
- id="rect2" />
- <rect
- width="80.9997"
- height="78"
- fill="black"
- fill-opacity="0"
- transform="scale(2)"
- id="rect4" />
- <path
- d="M140.87 53.647H91.5654V64.2352H140.87V53.647Z"
- fill="white"
- fill-opacity="0.6"
- id="path6" />
- <path
- d="M140.869 99.5292V88.9409H115.512L126.077 99.5292H140.869Z"
- fill="white"
- fill-opacity="0.6"
- id="path8" />
- <path
- d="M140.869 71.2939H97.9038L108.469 81.8822H140.869V71.2939Z"
- fill="white"
- fill-opacity="0.6"
- id="path10" />
- <path
- d="M147.912 14.8232H41.5557L84.5209 57.8821V28.9409H147.912V120.706H147.208L157.773 131.294C160.59 128.47 161.999 124.941 161.999 120.706V28.9409C161.999 21.1762 155.66 14.8232 147.912 14.8232Z"
- fill="white"
- fill-opacity="0.6"
- id="path12" />
- <path
- d="M129.6 120.706L84.5217 75.5294L23.9478 14.8235L9.15652 0L0 9.17647L10.5652 19.7647C8.45217 21.8824 7.04348 25.4118 7.04348 28.9412V120.706C7.04348 128.471 13.3826 134.824 21.1304 134.824H125.374L146.504 156L155.661 146.824L143.687 134.824L129.6 120.706ZM84.5217 120.706V93.8824L111.287 120.706H84.5217Z"
- fill="white"
- fill-opacity="0.6"
- id="path14" />
-</svg>
diff --git a/briar-android/artwork/empty_state_contact_list.svg b/briar-android/artwork/empty_state_contact_list.svg
deleted file mode 100644
index efc3f10baf1c46444b8cac0b4cd2769346fcfad5..0000000000000000000000000000000000000000
--- a/briar-android/artwork/empty_state_contact_list.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="164"
- height="164"
- viewBox="0 0 164 164"
- fill="none"
- version="1.1"
- id="svg12"
- sodipodi:docname="empty_state_contact_list.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
- <metadata
- id="metadata18">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs16" />
- <sodipodi:namedview
- pagecolor="#000000"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1020"
- id="namedview14"
- showgrid="false"
- inkscape:zoom="1.4390244"
- inkscape:cx="81.305085"
- inkscape:cy="109.79661"
- inkscape:window-x="1440"
- inkscape:window-y="24"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg12" />
- <path
- style="clip-rule:evenodd;display:inline;fill:#ffffff;fill-rule:evenodd"
- d="M 27.333984 0 L 27.333984 13.666016 L 136.66797 13.666016 L 136.66797 0 L 27.333984 0 z M 27.333984 27.333984 C 19.817284 27.333984 13.666016 33.4834 13.666016 41 L 13.666016 123 C 13.666016 130.517 19.817284 136.66797 27.333984 136.66797 L 136.66797 136.66797 C 144.18397 136.66797 150.33203 130.517 150.33203 123 L 150.33203 41 C 150.33203 33.4834 144.18397 27.333984 136.66797 27.333984 L 27.333984 27.333984 z M 82.150391 44.757812 C 89.592295 44.757812 95.348492 46.476807 99.419922 49.914062 C 103.52467 53.351338 105.57617 58.23949 105.57617 64.580078 C 105.57617 67.349967 105.0272 69.869409 103.92578 72.138672 C 102.82458 74.407935 101.05521 76.728225 98.619141 79.097656 L 92.863281 84.453125 C 91.227921 86.021639 90.093094 87.640125 89.458984 89.308594 C 88.824874 90.943745 88.475053 93.030171 88.408203 95.566406 L 74.091797 95.566406 C 74.091797 90.694273 74.640917 86.855942 75.742188 84.052734 C 76.843435 81.216209 78.63001 78.762286 81.099609 76.693359 C 83.568995 74.624218 85.436853 72.739109 86.705078 71.037109 C 88.006403 69.30179 88.658203 67.400958 88.658203 65.332031 C 88.658203 60.292857 86.488795 57.771484 82.150391 57.771484 C 80.1481 57.771484 78.529614 58.506262 77.294922 59.974609 C 76.060186 61.442955 75.40854 63.42881 75.341797 65.931641 L 58.423828 65.931641 C 58.490468 59.25736 60.592402 54.067509 64.730469 50.363281 C 68.868538 46.625672 74.675257 44.757813 82.150391 44.757812 z M 81.398438 102.32422 C 84.068159 102.32422 86.287795 103.12473 88.056641 104.72656 C 89.858601 106.29508 90.759766 108.31381 90.759766 110.7832 C 90.759766 113.2528 89.858601 115.28879 88.056641 116.89062 C 86.287795 118.45914 84.068159 119.24219 81.398438 119.24219 C 78.728717 119.24219 76.493467 118.45914 74.691406 116.89062 C 72.922705 115.28879 72.039062 113.2528 72.039062 110.7832 C 72.039062 108.31381 72.922705 106.29508 74.691406 104.72656 C 76.493467 103.12473 78.728716 102.32422 81.398438 102.32422 z M 27.333984 150.33203 L 27.333984 164 L 136.66797 164 L 136.66797 150.33203 L 27.333984 150.33203 z "
- id="path8" />
-</svg>
diff --git a/briar-android/artwork/empty_state_forum_list.svg b/briar-android/artwork/empty_state_forum_list.svg
deleted file mode 100644
index 101eca192d5d85bb09530fc12456248d1b8de966..0000000000000000000000000000000000000000
--- a/briar-android/artwork/empty_state_forum_list.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="148"
- height="148"
- viewBox="0 0 148 148"
- fill="none"
- version="1.1"
- id="svg12"
- sodipodi:docname="No-Forums.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
- <metadata
- id="metadata18">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs16" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1366"
- inkscape:window-height="720"
- id="namedview14"
- showgrid="false"
- inkscape:zoom="1.5945946"
- inkscape:cx="74"
- inkscape:cy="74"
- inkscape:window-x="0"
- inkscape:window-y="20"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg12" />
- <rect
- width="74"
- height="74"
- fill="black"
- fill-opacity="0"
- transform="scale(2)"
- id="rect2" />
- <rect
- width="74"
- height="74"
- fill="black"
- fill-opacity="0"
- transform="scale(2)"
- id="rect4" />
- <path
- d="M107.266 74.6791C111.34 74.6791 114.055 71.9635 114.055 67.8901V6.78901C114.055 2.7156 111.34 0 107.266 0H24.4404L99.1194 74.6791H107.266Z"
- fill="white"
- fill-opacity="0.6"
- id="path6" />
- <path
- d="M141.211 27.156H127.633V88.2571H112.697L148 123.56V33.945C148 29.8716 144.606 27.156 141.211 27.156Z"
- fill="white"
- fill-opacity="0.6"
- id="path8" />
- <path
- d="M8.8257 1.35742L0 10.1831L12.2202 22.4033V101.835L39.3762 74.6787H64.4955L78.0735 88.2567H39.3762V101.835C39.3762 105.908 42.0918 108.624 46.1652 108.624H98.4405L137.817 148L146.642 139.174L8.8257 1.35742Z"
- fill="white"
- fill-opacity="0.6"
- id="path10" />
-</svg>
diff --git a/briar-android/artwork/empty_state_group_list.svg b/briar-android/artwork/empty_state_group_list.svg
deleted file mode 100644
index 58e0218d74556f218eab8a1d1d0279eab7ab0050..0000000000000000000000000000000000000000
--- a/briar-android/artwork/empty_state_group_list.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="172"
- height="140"
- viewBox="0 0 172 140"
- fill="none"
- version="1.1"
- id="svg14"
- sodipodi:docname="No-Groups.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
- <metadata
- id="metadata20">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs18" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="754"
- inkscape:window-height="480"
- id="namedview16"
- showgrid="false"
- inkscape:zoom="1.6857143"
- inkscape:cx="86"
- inkscape:cy="70"
- inkscape:window-x="0"
- inkscape:window-y="20"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg14" />
- <rect
- width="85.9999"
- height="70"
- fill="black"
- fill-opacity="0"
- transform="scale(2)"
- id="rect2" />
- <rect
- width="85.9999"
- height="70"
- fill="black"
- fill-opacity="0"
- transform="scale(2)"
- id="rect4" />
- <path
- d="M125.091 103.444L71.9274 50.5556L38.3092 17.1111L21.1091 0L10.9455 10.1111L31.2728 30.3333C31.2728 31.8889 31.2728 32.6667 31.2728 34.2222C31.2728 47.4444 41.4365 57.5556 54.7274 57.5556C56.291 57.5556 57.0729 57.5556 58.6365 56.7778L78.182 76.2222C69.582 74.6667 60.982 73.1111 54.7274 73.1111C36.7455 73.1111 0 82.4444 0 100.333V119.778H109.455V107.333L142.291 140L152.455 129.889L142.291 119.778L125.091 103.444Z"
- fill="white"
- fill-opacity="0.6"
- id="path6" />
- <path
- d="M117.273 57.5549C130.227 57.5549 140.728 47.1082 140.728 34.2215C140.728 21.3349 130.227 10.8882 117.273 10.8882C104.319 10.8882 93.8184 21.3349 93.8184 34.2215C93.8184 47.1082 104.319 57.5549 117.273 57.5549Z"
- fill="white"
- fill-opacity="0.6"
- id="path8" />
- <path
- d="M78.1819 34.2215C78.1819 20.9993 68.0182 10.8882 54.7273 10.8882C53.9455 10.8882 53.1637 10.8882 52.3818 10.8882L78.1819 36.5548C78.1819 35.7771 78.1819 34.9993 78.1819 34.2215Z"
- fill="white"
- fill-opacity="0.6"
- id="path10" />
- <path
- d="M117.272 73.1104C116.49 73.1104 115.709 73.1104 114.927 73.1104L161.836 119.777H172V100.333C172 82.4437 135.254 73.1104 117.272 73.1104Z"
- fill="white"
- fill-opacity="0.6"
- id="path12" />
-</svg>
diff --git a/briar-android/artwork/ic_check_circle_dark.svg b/briar-android/artwork/ic_check_circle_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..de27d40e62cd2b5a82f63d3b4df905b57e760358
--- /dev/null
+++ b/briar-android/artwork/ic_check_circle_dark.svg
@@ -0,0 +1,4 @@
+<svg width="91" height="90" viewBox="0 0 91 90" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M62.5714 35.1634C63.214 34.5173 63.2111 33.4726 62.5649 32.83C61.9188 32.1874 60.8741 32.1903 60.2315 32.8365L39.5238 53.66L30.5714 44.6578C29.9288 44.0117 28.8841 44.0088 28.238 44.6514C27.5918 45.2939 27.5889 46.3387 28.2315 46.9848L39.5238 58.3399L62.5714 35.1634Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M89.4014 45C89.4014 69.3005 69.7019 89 45.4014 89C21.1008 89 1.40137 69.3005 1.40137 45C1.40137 20.6995 21.1008 1 45.4014 1C69.7019 1 89.4014 20.6995 89.4014 45ZM86.1014 45C86.1014 67.478 67.8794 85.7 45.4014 85.7C22.9234 85.7 4.70137 67.478 4.70137 45C4.70137 22.522 22.9234 4.3 45.4014 4.3C67.8794 4.3 86.1014 22.522 86.1014 45Z" fill="#A3E635"/>
+</svg>
diff --git a/briar-android/artwork/ic_check_circle_light.svg b/briar-android/artwork/ic_check_circle_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..75663aa42efb3cc87962493b03d961a563e1a7f6
--- /dev/null
+++ b/briar-android/artwork/ic_check_circle_light.svg
@@ -0,0 +1,4 @@
+<svg width="91" height="90" viewBox="0 0 91 90" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M62.5714 35.1634C63.214 34.5173 63.2111 33.4726 62.5649 32.83C61.9188 32.1874 60.8741 32.1903 60.2315 32.8365L39.5238 53.66L30.5714 44.6578C29.9288 44.0117 28.8841 44.0088 28.238 44.6514C27.5918 45.2939 27.5889 46.3387 28.2315 46.9848L39.5238 58.3399L62.5714 35.1634Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M89.4014 45C89.4014 69.3005 69.7019 89 45.4014 89C21.1008 89 1.40137 69.3005 1.40137 45C1.40137 20.6995 21.1008 1 45.4014 1C69.7019 1 89.4014 20.6995 89.4014 45ZM86.1014 45C86.1014 67.478 67.8794 85.7 45.4014 85.7C22.9234 85.7 4.70137 67.478 4.70137 45C4.70137 22.522 22.9234 4.3 45.4014 4.3C67.8794 4.3 86.1014 22.522 86.1014 45Z" fill="#65A30D"/>
+</svg>
diff --git a/briar-android/artwork/ic_error.svg b/briar-android/artwork/ic_error.svg
new file mode 100644
index 0000000000000000000000000000000000000000..fb585e15242f33e04a41267c77907d41cb51e7d1
--- /dev/null
+++ b/briar-android/artwork/ic_error.svg
@@ -0,0 +1,4 @@
+<svg width="91" height="90" viewBox="0 0 91 90" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M33.5682 30.8334C32.9238 30.189 31.8791 30.189 31.2347 30.8334C30.5904 31.4777 30.5904 32.5225 31.2347 33.1668L43.068 45.0001L31.2347 56.8334C30.5904 57.4777 30.5904 58.5225 31.2347 59.1668C31.8791 59.8112 32.9238 59.8112 33.5682 59.1668L45.4015 47.3335L57.2347 59.1668C57.8791 59.8112 58.9238 59.8112 59.5682 59.1668C60.2126 58.5225 60.2126 57.4777 59.5682 56.8334L47.7349 45.0001L59.5682 33.1668C60.2126 32.5225 60.2126 31.4777 59.5682 30.8334C58.9238 30.189 57.8791 30.189 57.2347 30.8334L45.4015 42.6666L33.5682 30.8334Z" fill="#EF4444"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M89.4014 45C89.4014 69.3005 69.7019 89 45.4014 89C21.1008 89 1.40137 69.3005 1.40137 45C1.40137 20.6995 21.1008 1 45.4014 1C69.7019 1 89.4014 20.6995 89.4014 45ZM86.1014 45C86.1014 67.478 67.8794 85.7 45.4014 85.7C22.9234 85.7 4.70137 67.478 4.70137 45C4.70137 22.522 22.9234 4.3 45.4014 4.3C67.8794 4.3 86.1014 22.522 86.1014 45Z" fill="#EF4444"/>
+</svg>
diff --git a/briar-android/artwork/ic_exclamation_mark.svg b/briar-android/artwork/ic_exclamation_mark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..204d21e725367507dd9c9325b760102accb42d27
--- /dev/null
+++ b/briar-android/artwork/ic_exclamation_mark.svg
@@ -0,0 +1,5 @@
+<svg width="91" height="90" viewBox="0 0 91 90" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M43.7972 23.7552C43.7972 22.844 44.5359 22.1052 45.4472 22.1052C46.3584 22.1052 47.0972 22.844 47.0972 23.7552V50.8604C47.0972 51.7717 46.3584 52.5104 45.4472 52.5104C44.5359 52.5104 43.7972 51.7717 43.7972 50.8604V23.7552Z" fill="#FBBF24"/>
+<path d="M43.7972 61.4861C43.7972 60.5749 44.5359 59.8361 45.4472 59.8361C46.3584 59.8361 47.0972 60.5749 47.0972 61.4861V61.7552C47.0972 62.6665 46.3584 63.4052 45.4472 63.4052C44.5359 63.4052 43.7972 62.6665 43.7972 61.7552V61.4861Z" fill="#FBBF24"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M89.4004 45C89.4004 69.3005 69.7009 89 45.4004 89C21.0999 89 1.40039 69.3005 1.40039 45C1.40039 20.6995 21.0999 1 45.4004 1C69.7009 1 89.4004 20.6995 89.4004 45ZM86.1004 45C86.1004 67.478 67.8784 85.7 45.4004 85.7C22.9224 85.7 4.70039 67.478 4.70039 45C4.70039 22.522 22.9224 4.3 45.4004 4.3C67.8784 4.3 86.1004 22.522 86.1004 45Z" fill="#FBBF24"/>
+</svg>
diff --git a/briar-android/artwork/il_add_contact_remote_dark.svg b/briar-android/artwork/il_add_contact_remote_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7a575dcf8b8aa7ec7540f95f21bfd03f8fbe8265
--- /dev/null
+++ b/briar-android/artwork/il_add_contact_remote_dark.svg
@@ -0,0 +1,34 @@
+<svg width="289" height="145" viewBox="0 0 289 145" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M48.8682 41C48.8682 36.5817 45.2864 33 40.8682 33H14.8682C10.4499 33 6.86816 36.5817 6.86816 41V103C6.86816 107.418 10.4499 111 14.8682 111H40.8682C45.2864 111 48.8682 107.418 48.8682 103V41Z" fill="#1E293B"/>
+<path d="M48.8682 47.248H6.86834V101.248H48.8682V47.248Z" fill="#0B1120"/>
+<path d="M11.4736 69.1006C11.4736 66.8914 13.2645 65.1006 15.4736 65.1006H40.2633C42.4724 65.1006 44.2633 66.8914 44.2633 69.1006V79.3936C44.2633 81.6028 42.4724 83.3936 40.2633 83.3936H15.4736C13.2645 83.3936 11.4736 81.6028 11.4736 79.3936V69.1006Z" fill="#184080"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2358 71.5547C17.2358 71.1405 17.5716 70.8047 17.9858 70.8047H37.8583C38.2726 70.8047 38.6083 71.1405 38.6083 71.5547C38.6083 71.9689 38.2726 72.3047 37.8583 72.3047H17.9858C17.5716 72.3047 17.2358 71.9689 17.2358 71.5547Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2358 77.6523C17.2358 77.2381 17.5716 76.9023 17.9858 76.9023H28.6658C29.08 76.9023 29.4158 77.2381 29.4158 77.6523C29.4158 78.0666 29.08 78.4023 28.6658 78.4023H17.9858C17.5716 78.4023 17.2358 78.0666 17.2358 77.6523Z" fill="#52ADF9"/>
+<path d="M27.8682 42.0024C27.3159 42.0024 26.8682 41.5541 26.8682 41.0012C26.8682 40.4482 27.3159 40 27.8682 40C28.4204 40 28.8682 40.4482 28.8682 41.0012C28.8682 41.5541 28.4204 42.0024 27.8682 42.0024Z" fill="#A3E635"/>
+<path d="M19.1182 41.0244C19.1182 40.6102 19.454 40.2744 19.8682 40.2744H23.8682C24.2824 40.2744 24.6182 40.6102 24.6182 41.0244C24.6182 41.4386 24.2824 41.7744 23.8682 41.7744H19.8682C19.454 41.7744 19.1182 41.4386 19.1182 41.0244Z" fill="#A3E635"/>
+<path d="M31.8682 40.2744C31.454 40.2744 31.1182 40.6102 31.1182 41.0244C31.1182 41.4386 31.454 41.7744 31.8682 41.7744H35.8682C36.2824 41.7744 36.6182 41.4386 36.6182 41.0244C36.6182 40.6102 36.2824 40.2744 35.8682 40.2744H31.8682Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48.8682 41V103C48.8682 107.418 45.2864 111 40.8682 111H14.8682C10.4499 111 6.86816 107.418 6.86816 103V41C6.86816 36.5817 10.4499 33 14.8682 33H40.8682C45.2864 33 48.8682 36.5817 48.8682 41ZM14.8682 34.5H40.8682C44.458 34.5 47.3682 37.4101 47.3682 41V47.248H8.36816V41C8.36816 37.4101 11.2783 34.5 14.8682 34.5ZM47.3682 48.748V99.748H8.36834V48.748H47.3682ZM47.3682 103V101.248H8.36816V103C8.36816 106.59 11.2783 109.5 14.8682 109.5H40.8682C44.458 109.5 47.3682 106.59 47.3682 103Z" fill="#A3E635"/>
+<path d="M281.868 41C281.868 36.5817 278.286 33 273.868 33H247.868C243.45 33 239.868 36.5817 239.868 41V103C239.868 107.418 243.45 111 247.868 111H273.868C278.286 111 281.868 107.418 281.868 103V41Z" fill="#1E293B"/>
+<path d="M281.868 47.248H239.868V101.248H281.868V47.248Z" fill="#0B1120"/>
+<path d="M244.473 69.1006C244.473 66.8914 246.264 65.1006 248.473 65.1006H273.263C275.472 65.1006 277.263 66.8914 277.263 69.1006V79.3936C277.263 81.6028 275.472 83.3936 273.263 83.3936H248.473C246.264 83.3936 244.473 81.6028 244.473 79.3936V69.1006Z" fill="#365314"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M250.236 71.5547C250.236 71.1405 250.572 70.8047 250.986 70.8047H270.858C271.273 70.8047 271.608 71.1405 271.608 71.5547C271.608 71.9689 271.273 72.3047 270.858 72.3047H250.986C250.572 72.3047 250.236 71.9689 250.236 71.5547Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M250.236 77.6523C250.236 77.2381 250.572 76.9023 250.986 76.9023H261.666C262.08 76.9023 262.416 77.2381 262.416 77.6523C262.416 78.0666 262.08 78.4023 261.666 78.4023H250.986C250.572 78.4023 250.236 78.0666 250.236 77.6523Z" fill="#A3E635"/>
+<path d="M260.868 42.0024C260.316 42.0024 259.868 41.5541 259.868 41.0012C259.868 40.4482 260.316 40 260.868 40C261.42 40 261.868 40.4482 261.868 41.0012C261.868 41.5541 261.42 42.0024 260.868 42.0024Z" fill="#52ADF9"/>
+<path d="M252.118 41.0244C252.118 40.6102 252.454 40.2744 252.868 40.2744H256.868C257.282 40.2744 257.618 40.6102 257.618 41.0244C257.618 41.4386 257.282 41.7744 256.868 41.7744H252.868C252.454 41.7744 252.118 41.4386 252.118 41.0244Z" fill="#52ADF9"/>
+<path d="M264.868 40.2744C264.454 40.2744 264.118 40.6102 264.118 41.0244C264.118 41.4386 264.454 41.7744 264.868 41.7744H268.868C269.282 41.7744 269.618 41.4386 269.618 41.0244C269.618 40.6102 269.282 40.2744 268.868 40.2744H264.868Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M281.868 41V103C281.868 107.418 278.286 111 273.868 111H247.868C243.45 111 239.868 107.418 239.868 103V41C239.868 36.5817 243.45 33 247.868 33H273.868C278.286 33 281.868 36.5817 281.868 41ZM247.868 34.5H273.868C277.458 34.5 280.368 37.4101 280.368 41V47.248H241.368V41C241.368 37.4101 244.278 34.5 247.868 34.5ZM280.368 48.748V99.748H241.368V48.748H280.368ZM280.368 103V101.248H241.368V103C241.368 106.59 244.278 109.5 247.868 109.5H273.868C277.458 109.5 280.368 106.59 280.368 103Z" fill="#52ADF9"/>
+<path d="M150.868 54C150.868 49.5817 147.286 46 142.868 46H126.868C122.45 46 118.868 49.5817 118.868 54V70C118.868 74.4183 122.45 78 126.868 78H142.868C147.286 78 150.868 74.4183 150.868 70V54Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M126.868 47.5H142.868C146.458 47.5 149.368 50.4101 149.368 54V70C149.368 73.5899 146.458 76.5 142.868 76.5H126.868C123.278 76.5 120.368 73.5899 120.368 70V54C120.368 50.4101 123.278 47.5 126.868 47.5ZM142.868 46C147.286 46 150.868 49.5817 150.868 54V70C150.868 74.4183 147.286 78 142.868 78H126.868C122.45 78 118.868 74.4183 118.868 70V54C118.868 49.5817 122.45 46 126.868 46H142.868Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M138.934 61.3778C139.519 62.63 139.295 64.1672 138.261 65.2012L134.282 69.1801C132.962 70.5002 130.822 70.5002 129.501 69.1801C128.181 67.8599 128.181 65.7194 129.501 64.3992L133.48 60.4203C134.515 59.386 136.052 59.162 137.305 59.7485L136.108 60.9452C135.551 60.8746 134.969 61.0533 134.541 61.481L130.562 65.4599C129.828 66.1943 129.828 67.385 130.562 68.1194C131.296 68.8538 132.487 68.8538 133.222 68.1194L137.2 64.1405C137.628 63.7132 137.806 63.1314 137.736 62.5749L138.934 61.3778Z" fill="#BEF264"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M132.432 64.25C133.684 64.8362 135.222 64.6123 136.256 63.578L140.235 59.5991C141.555 58.2789 141.555 56.1385 140.235 54.8183C138.915 53.4981 136.774 53.4981 135.454 54.8183L131.475 58.7971C130.441 59.8312 130.217 61.3686 130.803 62.6209L132 61.4239C131.93 60.8672 132.109 60.2852 132.536 59.8578L136.515 55.8789C137.249 55.1445 138.44 55.1445 139.174 55.8789C139.909 56.6133 139.909 57.8041 139.174 58.5385L135.196 62.5173C134.768 62.945 134.186 63.1236 133.629 63.0532L132.432 64.25Z" fill="#BEF264"/>
+<path d="M169.868 73C169.868 68.5817 166.286 65 161.868 65H145.868C141.45 65 137.868 68.5817 137.868 73V89C137.868 93.4183 141.45 97 145.868 97H161.868C166.286 97 169.868 93.4183 169.868 89V73Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M145.868 66.5H161.868C165.458 66.5 168.368 69.4101 168.368 73V89C168.368 92.5899 165.458 95.5 161.868 95.5H145.868C142.278 95.5 139.368 92.5899 139.368 89V73C139.368 69.4101 142.278 66.5 145.868 66.5ZM161.868 65C166.286 65 169.868 68.5817 169.868 73V89C169.868 93.4183 166.286 97 161.868 97H145.868C141.45 97 137.868 93.4183 137.868 89V73C137.868 68.5817 141.45 65 145.868 65H161.868Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M157.934 80.3778C158.519 81.63 158.295 83.1672 157.261 84.2012L153.282 88.18C151.962 89.5002 149.822 89.5002 148.501 88.18C147.181 86.8599 147.181 84.7194 148.501 83.3992L152.48 79.4203C153.515 78.386 155.052 78.162 156.305 78.7485L155.108 79.9452C154.551 79.8746 153.969 80.0532 153.541 80.481L149.562 84.4599C148.828 85.1943 148.828 86.385 149.562 87.1194C150.296 87.8538 151.487 87.8538 152.222 87.1194L156.2 83.1405C156.628 82.7132 156.806 82.1314 156.736 81.5749L157.934 80.3778Z" fill="#BEF264"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M151.432 83.25C152.684 83.8362 154.222 83.6123 155.256 82.578L159.235 78.5991C160.555 77.2789 160.555 75.1385 159.235 73.8183C157.915 72.4981 155.774 72.4981 154.454 73.8183L150.475 77.7971C149.441 78.8312 149.217 80.3686 149.803 81.6209L151 80.4239C150.93 79.8672 151.109 79.2852 151.536 78.8578L155.515 74.8789C156.249 74.1445 157.44 74.1445 158.174 74.8789C158.909 75.6133 158.909 76.8041 158.174 77.5385L154.196 81.5173C153.768 81.945 153.186 82.1236 152.629 82.0532L151.432 83.25Z" fill="#BEF264"/>
+<path d="M87.8682 62C87.8682 64.2091 86.0773 66 83.8682 66C81.659 66 79.8682 64.2091 79.8682 62C79.8682 59.7909 81.659 58 83.8682 58C86.0773 58 87.8682 59.7909 87.8682 62Z" fill="#1457C5"/>
+<path d="M103.868 62C103.868 64.2091 102.077 66 99.8682 66C97.659 66 95.8682 64.2091 95.8682 62C95.8682 59.7909 97.659 58 99.8682 58C102.077 58 103.868 59.7909 103.868 62Z" fill="#2B8EF1"/>
+<path d="M71.8682 62C71.8682 64.2091 70.0773 66 67.8682 66C65.659 66 63.8682 64.2091 63.8682 62C63.8682 59.7909 65.659 58 67.8682 58C70.0773 58 71.8682 59.7909 71.8682 62Z" fill="#184080"/>
+<path d="M200.868 81C200.868 78.7909 202.659 77 204.868 77C207.077 77 208.868 78.7909 208.868 81C208.868 83.2091 207.077 85 204.868 85C202.659 85 200.868 83.2091 200.868 81Z" fill="#4D7C0F"/>
+<path d="M184.868 81C184.868 78.7909 186.659 77 188.868 77C191.077 77 192.868 78.7909 192.868 81C192.868 83.2091 191.077 85 188.868 85C186.659 85 184.868 83.2091 184.868 81Z" fill="#82C91E"/>
+<path d="M216.868 81C216.868 78.7909 218.659 77 220.868 77C223.077 77 224.868 78.7909 224.868 81C224.868 83.2091 223.077 85 220.868 85C218.659 85 216.868 83.2091 216.868 81Z" fill="#365314"/>
+</svg>
diff --git a/briar-android/artwork/il_add_contact_remote_light.svg b/briar-android/artwork/il_add_contact_remote_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ec2d9361f6128afc29e859cc5f8869490d3db5bd
--- /dev/null
+++ b/briar-android/artwork/il_add_contact_remote_light.svg
@@ -0,0 +1,40 @@
+<svg width="289" height="145" viewBox="0 0 289 145" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M48.3203 41C48.3203 36.5817 44.7386 33 40.3203 33H14.3203C9.90203 33 6.32031 36.5817 6.32031 41V103C6.32031 107.418 9.90203 111 14.3203 111H40.3203C44.7386 111 48.3203 107.418 48.3203 103V41Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.3203 34.5H40.3203C43.9102 34.5 46.8203 37.4101 46.8203 41V103C46.8203 106.59 43.9102 109.5 40.3203 109.5H14.3203C10.7305 109.5 7.82031 106.59 7.82031 103V41C7.82031 37.4101 10.7305 34.5 14.3203 34.5ZM40.3203 33C44.7386 33 48.3203 36.5817 48.3203 41V103C48.3203 107.418 44.7386 111 40.3203 111H14.3203C9.90203 111 6.32031 107.418 6.32031 103V41C6.32031 36.5817 9.90203 33 14.3203 33H40.3203Z" fill="#65A30D"/>
+<path d="M48.3203 47.248H6.32049V101.248H48.3203V47.248Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.82049 48.748H46.8203V99.748H7.82049V48.748ZM48.3203 47.248V101.248H6.32049V47.248H48.3203Z" fill="#65A30D"/>
+<path d="M10.9258 69.1006C10.9258 66.8914 12.7166 65.1006 14.9258 65.1006H39.7154C41.9245 65.1006 43.7154 66.8914 43.7154 69.1006V79.3936C43.7154 81.6028 41.9245 83.3936 39.7154 83.3936H14.9258C12.7166 83.3936 10.9258 81.6028 10.9258 79.3936V69.1006Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6885 71.5547C16.6885 71.1405 17.0243 70.8047 17.4385 70.8047H37.311C37.7252 70.8047 38.061 71.1405 38.061 71.5547C38.061 71.9689 37.7252 72.3047 37.311 72.3047H17.4385C17.0243 72.3047 16.6885 71.9689 16.6885 71.5547Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6885 77.6523C16.6885 77.2381 17.0243 76.9023 17.4385 76.9023H28.1185C28.5327 76.9023 28.8685 77.2381 28.8685 77.6523C28.8685 78.0666 28.5327 78.4023 28.1185 78.4023H17.4385C17.0243 78.4023 16.6885 78.0666 16.6885 77.6523Z" fill="#196FDE"/>
+<path d="M26.3203 41.0012C26.3203 41.5541 26.768 42.0024 27.3203 42.0024C27.8726 42.0024 28.3203 41.5541 28.3203 41.0012C28.3203 40.4482 27.8726 40 27.3203 40C26.768 40 26.3203 40.4482 26.3203 41.0012Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.5703 41.0244C18.5703 40.6102 18.9061 40.2744 19.3203 40.2744H23.3203C23.7345 40.2744 24.0703 40.6102 24.0703 41.0244C24.0703 41.4386 23.7345 41.7744 23.3203 41.7744H19.3203C18.9061 41.7744 18.5703 41.4386 18.5703 41.0244Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.5703 41.0244C30.5703 40.6102 30.9061 40.2744 31.3203 40.2744H35.3203C35.7345 40.2744 36.0703 40.6102 36.0703 41.0244C36.0703 41.4386 35.7345 41.7744 35.3203 41.7744H31.3203C30.9061 41.7744 30.5703 41.4386 30.5703 41.0244Z" fill="#65A30D"/>
+<path d="M150.32 54C150.32 49.5817 146.739 46 142.32 46H126.32C121.902 46 118.32 49.5817 118.32 54V70C118.32 74.4183 121.902 78 126.32 78H142.32C146.739 78 150.32 74.4183 150.32 70V54Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M126.32 47.5H142.32C145.91 47.5 148.82 50.4101 148.82 54V70C148.82 73.5899 145.91 76.5 142.32 76.5H126.32C122.73 76.5 119.82 73.5899 119.82 70V54C119.82 50.4101 122.73 47.5 126.32 47.5ZM142.32 46C146.739 46 150.32 49.5817 150.32 54V70C150.32 74.4183 146.739 78 142.32 78H126.32C121.902 78 118.32 74.4183 118.32 70V54C118.32 49.5817 121.902 46 126.32 46H142.32Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M132.932 60.4207C134.253 59.1005 136.393 59.1005 137.713 60.4207C139.033 61.7409 139.033 63.8814 137.713 65.2015L133.734 69.1804C132.414 70.5006 130.274 70.5006 128.953 69.1804C127.633 67.8602 127.633 65.7197 128.953 64.3996L132.932 60.4207ZM136.653 61.4814C135.918 60.7469 134.727 60.7469 133.993 61.4814L130.014 65.4602C129.28 66.1946 129.28 67.3853 130.014 68.1197C130.749 68.8541 131.939 68.8541 132.674 68.1197L136.653 64.1409C137.387 63.4065 137.387 62.2158 136.653 61.4814Z" fill="#BEF264"/>
+<path d="M137.184 59.3223L138.813 60.9512L137.184 62.5802L135.555 60.9512L137.184 59.3223Z" fill="#D9D9D9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M135.708 63.5783C134.388 64.8985 132.248 64.8985 130.927 63.5783C129.607 62.2581 129.607 60.1177 130.927 58.7975L134.906 54.8186C136.226 53.4984 138.367 53.4984 139.687 54.8186C141.007 56.1388 141.007 58.2793 139.687 59.5995L135.708 63.5783ZM131.988 62.5177C132.723 63.2521 133.913 63.2521 134.648 62.5177L138.626 58.5388C139.361 57.8044 139.361 56.6137 138.626 55.8793C137.892 55.1449 136.701 55.1449 135.967 55.8793L131.988 59.8581C131.254 60.5925 131.254 61.7833 131.988 62.5177Z" fill="#BEF264"/>
+<path d="M131.457 64.6768L129.828 63.0478L131.457 61.4189L133.086 63.0478L131.457 64.6768Z" fill="#D9D9D9"/>
+<path d="M281.32 41C281.32 36.5817 277.739 33 273.32 33H247.32C242.902 33 239.32 36.5817 239.32 41V103C239.32 107.418 242.902 111 247.32 111H273.32C277.739 111 281.32 107.418 281.32 103V41Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M247.32 34.5H273.32C276.91 34.5 279.82 37.4101 279.82 41V103C279.82 106.59 276.91 109.5 273.32 109.5H247.32C243.73 109.5 240.82 106.59 240.82 103V41C240.82 37.4101 243.73 34.5 247.32 34.5ZM273.32 33C277.739 33 281.32 36.5817 281.32 41V103C281.32 107.418 277.739 111 273.32 111H247.32C242.902 111 239.32 107.418 239.32 103V41C239.32 36.5817 242.902 33 247.32 33H273.32Z" fill="#196FDE"/>
+<path d="M281.32 47.248H239.32V101.248H281.32V47.248Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M240.82 48.748H279.82V99.748H240.82V48.748ZM281.32 47.248V101.248H239.32V47.248H281.32Z" fill="#196FDE"/>
+<path d="M243.925 69.1006C243.925 66.8914 245.716 65.1006 247.925 65.1006H272.715C274.924 65.1006 276.715 66.8914 276.715 69.1006V79.3936C276.715 81.6028 274.924 83.3936 272.715 83.3936H247.925C245.716 83.3936 243.925 81.6028 243.925 79.3936V69.1006Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.688 71.5547C249.688 71.1405 250.023 70.8047 250.438 70.8047H270.31C270.724 70.8047 271.06 71.1405 271.06 71.5547C271.06 71.9689 270.724 72.3047 270.31 72.3047H250.438C250.023 72.3047 249.688 71.9689 249.688 71.5547Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M249.688 77.6523C249.688 77.2381 250.023 76.9023 250.438 76.9023H261.117C261.532 76.9023 261.867 77.2381 261.867 77.6523C261.867 78.0666 261.532 78.4023 261.117 78.4023H250.438C250.023 78.4023 249.688 78.0666 249.688 77.6523Z" fill="#65A30D"/>
+<path d="M259.32 41.0012C259.32 41.5541 259.768 42.0024 260.32 42.0024C260.873 42.0024 261.32 41.5541 261.32 41.0012C261.32 40.4482 260.873 40 260.32 40C259.768 40 259.32 40.4482 259.32 41.0012Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M251.57 41.0244C251.57 40.6102 251.906 40.2744 252.32 40.2744H256.32C256.735 40.2744 257.07 40.6102 257.07 41.0244C257.07 41.4386 256.735 41.7744 256.32 41.7744H252.32C251.906 41.7744 251.57 41.4386 251.57 41.0244Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M263.57 41.0244C263.57 40.6102 263.906 40.2744 264.32 40.2744H268.32C268.735 40.2744 269.07 40.6102 269.07 41.0244C269.07 41.4386 268.735 41.7744 268.32 41.7744H264.32C263.906 41.7744 263.57 41.4386 263.57 41.0244Z" fill="#196FDE"/>
+<path d="M169.32 73C169.32 68.5817 165.739 65 161.32 65H145.32C140.902 65 137.32 68.5817 137.32 73V89C137.32 93.4183 140.902 97 145.32 97H161.32C165.739 97 169.32 93.4183 169.32 89V73Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M145.32 66.5H161.32C164.91 66.5 167.82 69.4101 167.82 73V89C167.82 92.5899 164.91 95.5 161.32 95.5H145.32C141.73 95.5 138.82 92.5899 138.82 89V73C138.82 69.4101 141.73 66.5 145.32 66.5ZM161.32 65C165.739 65 169.32 68.5817 169.32 73V89C169.32 93.4183 165.739 97 161.32 97H145.32C140.902 97 137.32 93.4183 137.32 89V73C137.32 68.5817 140.902 65 145.32 65H161.32Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M151.932 79.4207C153.253 78.1005 155.393 78.1005 156.713 79.4207C158.033 80.7409 158.033 82.8814 156.713 84.2015L152.734 88.1804C151.414 89.5006 149.274 89.5006 147.953 88.1804C146.633 86.8602 146.633 84.7197 147.953 83.3996L151.932 79.4207ZM155.653 80.4814C154.918 79.7469 153.727 79.7469 152.993 80.4814L149.014 84.4602C148.28 85.1946 148.28 86.3853 149.014 87.1197C149.749 87.8541 150.939 87.8541 151.674 87.1197L155.653 83.1409C156.387 82.4065 156.387 81.2158 155.653 80.4814Z" fill="#BEF264"/>
+<path d="M156.184 78.3223L157.813 79.9512L156.184 81.5802L154.555 79.9512L156.184 78.3223Z" fill="#D9D9D9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M154.708 82.5783C153.388 83.8985 151.248 83.8985 149.927 82.5783C148.607 81.2581 148.607 79.1177 149.927 77.7975L153.906 73.8186C155.226 72.4984 157.367 72.4984 158.687 73.8186C160.007 75.1388 160.007 77.2793 158.687 78.5995L154.708 82.5783ZM150.988 81.5177C151.723 82.2521 152.913 82.2521 153.648 81.5177L157.626 77.5388C158.361 76.8044 158.361 75.6137 157.626 74.8793C156.892 74.1449 155.701 74.1449 154.967 74.8793L150.988 78.8581C150.254 79.5925 150.254 80.7833 150.988 81.5177Z" fill="#BEF264"/>
+<path d="M150.457 83.6768L148.828 82.0478L150.457 80.4189L152.086 82.0478L150.457 83.6768Z" fill="#D9D9D9"/>
+<path d="M87.3203 62C87.3203 64.2091 85.5295 66 83.3203 66C81.1112 66 79.3203 64.2091 79.3203 62C79.3203 59.7909 81.1112 58 83.3203 58C85.5295 58 87.3203 59.7909 87.3203 62Z" fill="#8BCAFD"/>
+<path d="M103.32 62C103.32 64.2091 101.529 66 99.3203 66C97.1112 66 95.3203 64.2091 95.3203 62C95.3203 59.7909 97.1112 58 99.3203 58C101.529 58 103.32 59.7909 103.32 62Z" fill="#52ADF9"/>
+<path d="M71.3203 62C71.3203 64.2091 69.5295 66 67.3203 66C65.1112 66 63.3203 64.2091 63.3203 62C63.3203 59.7909 65.1112 58 67.3203 58C69.5295 58 71.3203 59.7909 71.3203 62Z" fill="#BDDFFE"/>
+<path d="M200.32 81C200.32 78.7909 202.111 77 204.32 77C206.529 77 208.32 78.7909 208.32 81C208.32 83.2091 206.529 85 204.32 85C202.111 85 200.32 83.2091 200.32 81Z" fill="#BEF264"/>
+<path d="M184.32 81C184.32 78.7909 186.111 77 188.32 77C190.529 77 192.32 78.7909 192.32 81C192.32 83.2091 190.529 85 188.32 85C186.111 85 184.32 83.2091 184.32 81Z" fill="#A3E635"/>
+<path d="M216.32 81C216.32 78.7909 218.111 77 220.32 77C222.529 77 224.32 78.7909 224.32 81C224.32 83.2091 222.529 85 220.32 85C218.111 85 216.32 83.2091 216.32 81Z" fill="#D9F99D"/>
+</svg>
diff --git a/briar-android/artwork/il_add_contact_remote_nickname_dark.svg b/briar-android/artwork/il_add_contact_remote_nickname_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..402a1fa629be15cb7d35d756cb51c3d375cf2eb3
--- /dev/null
+++ b/briar-android/artwork/il_add_contact_remote_nickname_dark.svg
@@ -0,0 +1,45 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M41.8016 13.7002H95.8016C102.002 13.7002 107.002 18.7002 107.002 24.9002V145.9C107.002 152.1 102.002 157.1 95.8016 157.1H41.8016C35.6016 157.1 30.6016 152.1 30.6016 145.9V25.0002C30.6016 18.7002 35.6016 13.7002 41.8016 13.7002Z" fill="#1E293B"/>
+<path d="M100.101 40.5999C100.101 36.5999 96.9012 33.3999 92.9012 33.3999H44.9012C40.9012 33.3999 37.7012 36.5999 37.7012 40.5999V136.6C37.7012 140.6 40.9012 143.8 44.9012 143.8H92.9012C96.9012 143.8 100.101 140.6 100.101 136.6V40.5999Z" fill="#0B1120"/>
+<path d="M95.8013 13H41.8013C35.2013 13 29.8013 18.4 29.8013 25V146C29.8013 152.6 35.2013 158 41.8013 158H95.8013C102.401 158 107.801 152.6 107.801 146V25C107.801 18.3 102.501 13 95.8013 13ZM106.301 146C106.301 151.8 101.601 156.5 95.8013 156.5H41.8013C36.0013 156.5 31.3013 151.8 31.3013 146V25C31.3013 19.2 36.0013 14.5 41.8013 14.5H95.8013C101.601 14.5 106.301 19.2 106.301 25V146Z" fill="#52ADF9"/>
+<path d="M68.8013 26.8999C70.5013 26.8999 71.8013 25.5999 71.8013 23.8999C71.8013 22.1999 70.5013 20.8999 68.8013 20.8999C67.1013 20.8999 65.8013 22.1999 65.8013 23.8999C65.8013 25.5999 67.2013 26.8999 68.8013 26.8999ZM68.8013 22.3999C69.6013 22.3999 70.3013 23.0999 70.3013 23.8999C70.3013 24.6999 69.6013 25.3999 68.8013 25.3999C68.0013 25.3999 67.3013 24.6999 67.3013 23.8999C67.3013 23.0999 68.0013 22.3999 68.8013 22.3999Z" fill="#52ADF9"/>
+<path d="M50.8015 24.3998H60.8015C61.2015 24.3998 61.6015 24.0998 61.6015 23.5998C61.6015 23.0998 61.3015 22.7998 60.8015 22.7998H50.8015C50.4015 22.7998 50.0015 23.0998 50.0015 23.5998C50.0015 24.0998 50.4015 24.3998 50.8015 24.3998Z" fill="#52ADF9"/>
+<path d="M76.8015 24.3998H86.8015C87.2015 24.3998 87.6015 24.0998 87.6015 23.5998C87.6015 23.0998 87.3015 22.7998 86.8015 22.7998H76.8015C76.4015 22.7998 76.0015 23.0998 76.0015 23.5998C76.0015 24.0998 76.4015 24.3998 76.8015 24.3998Z" fill="#52ADF9"/>
+<path d="M92.8013 32.6001H44.8013C40.4013 32.6001 36.8013 36.2001 36.8013 40.6001V136.6C36.8013 141 40.4013 144.6 44.8013 144.6H92.8013C97.2013 144.6 100.801 141 100.801 136.6V40.6001C100.801 36.2001 97.2013 32.6001 92.8013 32.6001ZM99.3013 136.6C99.3013 140.2 96.4013 143.1 92.8013 143.1H44.8013C41.2013 143.1 38.3013 140.2 38.3013 136.6V40.6001C38.3013 37.0001 41.2013 34.1001 44.8013 34.1001H92.8013C96.4013 34.1001 99.3013 37.0001 99.3013 40.6001V136.6Z" fill="#52ADF9"/>
+<path d="M90.8016 45.8002H61.4016C61.0016 45.8002 60.6016 45.5002 60.6016 45.0002C60.6016 44.5002 60.9016 44.2002 61.4016 44.2002H90.9016C91.3016 44.2002 91.7016 44.5002 91.7016 45.0002C91.7016 45.5002 91.2016 45.8002 90.8016 45.8002Z" fill="#184080"/>
+<path d="M77.2016 51.7001H61.4016C61.0016 51.7001 60.6016 51.4001 60.6016 50.9001C60.6016 50.4001 60.9016 50.1001 61.4016 50.1001H77.2016C77.6016 50.1001 78.0016 50.4001 78.0016 50.9001C78.0016 51.4001 77.6016 51.7001 77.2016 51.7001Z" fill="#184080"/>
+<path d="M90.8016 87.8002H61.4016C61.0016 87.8002 60.6016 87.5002 60.6016 87.0002C60.6016 86.5002 60.9016 86.2002 61.4016 86.2002H90.9016C91.3016 86.2002 91.7016 86.5002 91.7016 87.0002C91.7016 87.5002 91.2016 87.8002 90.8016 87.8002Z" fill="#184080"/>
+<path d="M77.2016 93.7001H61.4016C61.0016 93.7001 60.6016 93.4001 60.6016 92.9001C60.6016 92.4001 60.9016 92.1001 61.4016 92.1001H77.2016C77.6016 92.1001 78.0016 92.4001 78.0016 92.9001C78.0016 93.4001 77.6016 93.7001 77.2016 93.7001Z" fill="#184080"/>
+<path d="M90.8016 66.8002H61.4016C61.0016 66.8002 60.6016 66.5002 60.6016 66.0002C60.6016 65.5002 60.9016 65.2002 61.4016 65.2002H90.9016C91.3016 65.2002 91.7016 65.5002 91.7016 66.0002C91.7016 66.5002 91.2016 66.8002 90.8016 66.8002Z" fill="#184080"/>
+<path d="M77.2016 72.7001H61.4016C61.0016 72.7001 60.6016 72.4001 60.6016 71.9001C60.6016 71.4001 60.9016 71.1001 61.4016 71.1001H77.2016C77.6016 71.1001 78.0016 71.4001 78.0016 71.9001C78.0016 72.4001 77.6016 72.7001 77.2016 72.7001Z" fill="#184080"/>
+<path d="M90.8016 129.8H61.4016C61.0016 129.8 60.6016 129.5 60.6016 129C60.6016 128.5 60.9016 128.2 61.4016 128.2H90.9016C91.3016 128.2 91.7016 128.5 91.7016 129C91.7016 129.5 91.2016 129.8 90.8016 129.8Z" fill="#184080"/>
+<path d="M77.2016 135.7H61.4016C61.0016 135.7 60.6016 135.4 60.6016 134.9C60.6016 134.4 60.9016 134.1 61.4016 134.1H77.2016C77.6016 134.1 78.0016 134.4 78.0016 134.9C78.0016 135.4 77.6016 135.7 77.2016 135.7Z" fill="#184080"/>
+<path d="M90.8016 108.8H61.4016C61.0016 108.8 60.6016 108.5 60.6016 108C60.6016 107.5 60.9016 107.2 61.4016 107.2H90.9016C91.3016 107.2 91.7016 107.5 91.7016 108C91.7016 108.5 91.2016 108.8 90.8016 108.8Z" fill="#184080"/>
+<path d="M77.2016 114.7H61.4016C61.0016 114.7 60.6016 114.4 60.6016 113.9C60.6016 113.4 60.9016 113.1 61.4016 113.1H77.2016C77.6016 113.1 78.0016 113.4 78.0016 113.9C78.0016 114.4 77.6016 114.7 77.2016 114.7Z" fill="#184080"/>
+<path d="M96.8016 34.7998H150.802C157.002 34.7998 162.002 39.7998 162.002 45.9998V167C162.002 173.2 157.002 178.2 150.802 178.2H96.8016C90.6016 178.2 85.6016 173.2 85.6016 167V45.9998C85.6016 39.7998 90.6016 34.7998 96.8016 34.7998Z" fill="#1E293B"/>
+<path d="M155.101 61.5999C155.101 57.5999 151.901 54.3999 147.901 54.3999H99.9012C95.9012 54.3999 92.7012 57.5999 92.7012 61.5999V157.6C92.7012 161.6 95.9012 164.8 99.9012 164.8H147.901C151.901 164.8 155.101 161.6 155.101 157.6V61.5999Z" fill="#0B1120"/>
+<path d="M150.801 34H96.8013C90.2013 34 84.8013 39.4 84.8013 46V167C84.8013 173.6 90.2013 179 96.8013 179H150.801C157.401 179 162.801 173.6 162.801 167V46C162.801 39.4 157.501 34 150.801 34ZM161.301 167C161.301 172.8 156.601 177.5 150.801 177.5H96.8013C91.0013 177.5 86.3013 172.8 86.3013 167V46C86.3013 40.2 91.0013 35.5 96.8013 35.5H150.801C156.601 35.5 161.301 40.2 161.301 46V167Z" fill="#A3E635"/>
+<path d="M123.801 47.8999C125.501 47.8999 126.801 46.5999 126.801 44.8999C126.801 43.1999 125.501 41.8999 123.801 41.8999C122.101 41.8999 120.801 43.1999 120.801 44.8999C120.801 46.5999 122.201 47.8999 123.801 47.8999ZM123.801 43.3999C124.601 43.3999 125.301 44.0999 125.301 44.8999C125.301 45.6999 124.601 46.3999 123.801 46.3999C123.001 46.3999 122.301 45.6999 122.301 44.8999C122.301 44.0999 123.001 43.3999 123.801 43.3999Z" fill="#A3E635"/>
+<path d="M105.801 45.3998H115.801C116.201 45.3998 116.601 45.0998 116.601 44.5998C116.601 44.0998 116.301 43.7998 115.801 43.7998H105.801C105.401 43.7998 105.001 44.0998 105.001 44.5998C105.001 45.0998 105.401 45.3998 105.801 45.3998Z" fill="#A3E635"/>
+<path d="M131.801 45.3998H141.801C142.201 45.3998 142.601 45.0998 142.601 44.5998C142.601 44.0998 142.301 43.7998 141.801 43.7998H131.801C131.401 43.7998 131.001 44.0998 131.001 44.5998C131.001 45.0998 131.401 45.3998 131.801 45.3998Z" fill="#A3E635"/>
+<path d="M147.801 53.6001H99.8013C95.4013 53.6001 91.8013 57.2001 91.8013 61.6001V157.6C91.8013 162 95.4013 165.6 99.8013 165.6H147.801C152.201 165.6 155.801 162 155.801 157.6V61.6001C155.801 57.2001 152.201 53.6001 147.801 53.6001ZM154.301 157.6C154.301 161.2 151.401 164.1 147.801 164.1H99.8013C96.2013 164.1 93.3013 161.2 93.3013 157.6V61.6001C93.3013 58.0001 96.2013 55.1001 99.8013 55.1001H147.801C151.401 55.1001 154.301 58.0001 154.301 61.6001V157.6Z" fill="#A3E635"/>
+<path d="M49.8014 54C53.0598 54 55.7014 51.3137 55.7014 48C55.7014 44.6863 53.0598 42 49.8014 42C46.5429 42 43.9014 44.6863 43.9014 48C43.9014 51.3137 46.5429 54 49.8014 54Z" fill="#1E293B"/>
+<path d="M49.8014 96C53.0598 96 55.7014 93.3137 55.7014 90C55.7014 86.6863 53.0598 84 49.8014 84C46.5429 84 43.9014 86.6863 43.9014 90C43.9014 93.3137 46.5429 96 49.8014 96Z" fill="#1E293B"/>
+<path d="M49.8014 75C53.0598 75 55.7014 72.3137 55.7014 69C55.7014 65.6863 53.0598 63 49.8014 63C46.5429 63 43.9014 65.6863 43.9014 69C43.9014 72.3137 46.5429 75 49.8014 75Z" fill="#1E293B"/>
+<path d="M49.8014 138C53.0598 138 55.7014 135.314 55.7014 132C55.7014 128.686 53.0598 126 49.8014 126C46.5429 126 43.9014 128.686 43.9014 132C43.9014 135.314 46.5429 138 49.8014 138Z" fill="#1E293B"/>
+<path d="M49.8014 117C53.0598 117 55.7014 114.314 55.7014 111C55.7014 107.686 53.0598 105 49.8014 105C46.5429 105 43.9014 107.686 43.9014 111C43.9014 114.314 46.5429 117 49.8014 117Z" fill="#1E293B"/>
+<path d="M104.801 75C108.06 75 110.701 72.3137 110.701 69C110.701 65.6863 108.06 63 104.801 63C101.543 63 98.9014 65.6863 98.9014 69C98.9014 72.3137 101.543 75 104.801 75Z" fill="#1E293B"/>
+<path d="M104.801 159C108.06 159 110.701 156.314 110.701 153C110.701 149.686 108.06 147 104.801 147C101.543 147 98.9014 149.686 98.9014 153C98.9014 156.314 101.543 159 104.801 159Z" fill="#1E293B"/>
+<path d="M104.801 138C108.06 138 110.701 135.314 110.701 132C110.701 128.686 108.06 126 104.801 126C101.543 126 98.9014 128.686 98.9014 132C98.9014 135.314 101.543 138 104.801 138Z" fill="#1E293B"/>
+<path d="M116.402 66.8002H145.902C146.302 66.8002 146.702 66.5002 146.702 66.0002C146.702 65.5002 146.402 65.2002 145.902 65.2002H116.402C116.002 65.2002 115.602 65.5002 115.602 66.0002C115.602 66.5002 116.002 66.8002 116.402 66.8002Z" fill="#365314"/>
+<path d="M116.402 72.7001H132.202C132.602 72.7001 133.002 72.4001 133.002 71.9001C133.002 71.4001 132.702 71.1001 132.202 71.1001H116.402C116.002 71.1001 115.602 71.4001 115.602 71.9001C115.602 72.4001 116.002 72.7001 116.402 72.7001Z" fill="#365314"/>
+<path d="M145.802 149.3H116.402C116.002 149.3 115.602 149.6 115.602 150.1C115.602 150.6 115.902 150.9 116.402 150.9H145.902C146.302 150.9 146.702 150.6 146.702 150.1C146.702 149.6 146.202 149.3 145.802 149.3Z" fill="#365314"/>
+<path d="M132.202 155.2H116.402C116.002 155.2 115.602 155.5 115.602 156C115.602 156.5 115.902 156.8 116.402 156.8H132.202C132.602 156.8 133.002 156.5 133.002 156C133.002 155.5 132.602 155.2 132.202 155.2Z" fill="#365314"/>
+<path d="M145.802 128.3H116.402C116.002 128.3 115.602 128.6 115.602 129.1C115.602 129.6 115.902 129.9 116.402 129.9H145.902C146.302 129.9 146.702 129.6 146.702 129.1C146.702 128.6 146.202 128.3 145.802 128.3Z" fill="#365314"/>
+<path d="M116.402 135.7H132.202C132.602 135.7 133.002 135.4 133.002 134.9C133.002 134.4 132.702 134.1 132.202 134.1H116.402C116.002 134.1 115.602 134.4 115.602 134.9C115.602 135.4 116.002 135.7 116.402 135.7Z" fill="#365314"/>
+<path d="M74.8013 83H172.801C175.001 83 176.801 84.8 176.801 87V114C176.801 116.2 175.001 118 172.801 118H74.8013C72.6013 118 70.8013 116.2 70.8013 114V87C70.8013 84.8 72.6013 83 74.8013 83Z" fill="#1649A0"/>
+<path d="M164.801 95.2998H112.801C112.401 95.2998 112.001 95.5998 112.001 96.0998C112.001 96.5998 112.301 96.8998 112.801 96.8998H164.801C165.201 96.8998 165.601 96.5998 165.601 96.0998C165.601 95.5998 165.201 95.2998 164.801 95.2998Z" fill="#52ADF9"/>
+<path d="M140.801 104.1H112.801C112.401 104.1 112.001 104.4 112.001 104.9C112.001 105.4 112.301 105.7 112.801 105.7H140.801C141.201 105.7 141.601 105.4 141.601 104.9C141.601 104.4 141.201 104.1 140.801 104.1Z" fill="#52ADF9"/>
+<path d="M92.3015 102.2H90.8015C86.0015 102.2 82.0015 106.1 82.0015 111V111.1C82.0015 111.5 82.3015 111.8 82.8015 111.8C83.3015 111.8 83.6015 111.4 83.6015 111C83.6015 107 86.9015 103.8 90.8015 103.8H92.3015C96.3015 103.8 99.5015 107.1 99.5015 111.1C99.5015 111.5 99.8015 111.8 100.301 111.8C100.801 111.8 101.101 111.4 101.101 111C101.001 106.1 97.1015 102.2 92.3015 102.2Z" fill="#E2E8F0"/>
+<path d="M91.6012 99.5002C94.3012 99.5002 96.5012 97.3002 96.5012 94.6002C96.5012 91.9002 94.3012 89.7002 91.6012 89.7002C88.9012 89.7002 86.7012 91.9002 86.7012 94.6002C86.7012 97.4002 88.9012 99.5002 91.6012 99.5002ZM91.6012 91.3002C93.5012 91.3002 95.0012 92.8002 95.0012 94.7002C95.0012 96.6002 93.4012 98.0002 91.6012 98.0002C89.8012 98.0002 88.2012 96.5002 88.2012 94.6002C88.2012 92.7002 89.7012 91.3002 91.6012 91.3002Z" fill="#E2E8F0"/>
+</svg>
diff --git a/briar-android/artwork/il_add_contact_remote_nickname_light.svg b/briar-android/artwork/il_add_contact_remote_nickname_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b67573b36391409f32352e890211e7d52d5e8928
--- /dev/null
+++ b/briar-android/artwork/il_add_contact_remote_nickname_light.svg
@@ -0,0 +1,45 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M41.3016 13.7002H95.3016C101.502 13.7002 106.502 18.7002 106.502 24.9002V145.9C106.502 152.1 101.502 157.1 95.3016 157.1H41.3016C35.1016 157.1 30.1016 152.1 30.1016 145.9V25.0002C30.1016 18.7002 35.1016 13.7002 41.3016 13.7002Z" fill="#DDEDFE"/>
+<path d="M99.6012 40.5999C99.6012 36.5999 96.4012 33.3999 92.4012 33.3999H44.4012C40.4012 33.3999 37.2012 36.5999 37.2012 40.5999V136.6C37.2012 140.6 40.4012 143.8 44.4012 143.8H92.4012C96.4012 143.8 99.6012 140.6 99.6012 136.6V40.5999Z" fill="#F9FAFB"/>
+<path d="M95.3013 13H41.3013C34.7013 13 29.3013 18.4 29.3013 25V146C29.3013 152.6 34.7013 158 41.3013 158H95.3013C101.901 158 107.301 152.6 107.301 146V25C107.301 18.3 102.001 13 95.3013 13ZM105.801 146C105.801 151.8 101.101 156.5 95.3013 156.5H41.3013C35.5013 156.5 30.8013 151.8 30.8013 146V25C30.8013 19.2 35.5013 14.5 41.3013 14.5H95.3013C101.101 14.5 105.801 19.2 105.801 25V146Z" fill="#196FDE"/>
+<path d="M68.3013 26.8999C70.0013 26.8999 71.3013 25.5999 71.3013 23.8999C71.3013 22.1999 70.0013 20.8999 68.3013 20.8999C66.6013 20.8999 65.3013 22.1999 65.3013 23.8999C65.3013 25.5999 66.7013 26.8999 68.3013 26.8999ZM68.3013 22.3999C69.1013 22.3999 69.8013 23.0999 69.8013 23.8999C69.8013 24.6999 69.1013 25.3999 68.3013 25.3999C67.5013 25.3999 66.8013 24.6999 66.8013 23.8999C66.8013 23.0999 67.5013 22.3999 68.3013 22.3999Z" fill="#196FDE"/>
+<path d="M50.3015 24.3998H60.3015C60.7015 24.3998 61.1015 24.0998 61.1015 23.5998C61.1015 23.0998 60.8015 22.7998 60.3015 22.7998H50.3015C49.9015 22.7998 49.5015 23.0998 49.5015 23.5998C49.5015 24.0998 49.9015 24.3998 50.3015 24.3998Z" fill="#196FDE"/>
+<path d="M76.3015 24.3998H86.3015C86.7015 24.3998 87.1015 24.0998 87.1015 23.5998C87.1015 23.0998 86.8015 22.7998 86.3015 22.7998H76.3015C75.9015 22.7998 75.5015 23.0998 75.5015 23.5998C75.5015 24.0998 75.9015 24.3998 76.3015 24.3998Z" fill="#196FDE"/>
+<path d="M92.3013 32.6001H44.3013C39.9013 32.6001 36.3013 36.2001 36.3013 40.6001V136.6C36.3013 141 39.9013 144.6 44.3013 144.6H92.3013C96.7013 144.6 100.301 141 100.301 136.6V40.6001C100.301 36.2001 96.7013 32.6001 92.3013 32.6001ZM98.8013 136.6C98.8013 140.2 95.9013 143.1 92.3013 143.1H44.3013C40.7013 143.1 37.8013 140.2 37.8013 136.6V40.6001C37.8013 37.0001 40.7013 34.1001 44.3013 34.1001H92.3013C95.9013 34.1001 98.8013 37.0001 98.8013 40.6001V136.6Z" fill="#196FDE"/>
+<path d="M90.3016 45.8002H60.9016C60.5016 45.8002 60.1016 45.5002 60.1016 45.0002C60.1016 44.5002 60.4016 44.2002 60.9016 44.2002H90.4016C90.8016 44.2002 91.2016 44.5002 91.2016 45.0002C91.2016 45.5002 90.7016 45.8002 90.3016 45.8002Z" fill="#BDDFFE"/>
+<path d="M76.7016 51.7001H60.9016C60.5016 51.7001 60.1016 51.4001 60.1016 50.9001C60.1016 50.4001 60.4016 50.1001 60.9016 50.1001H76.7016C77.1016 50.1001 77.5016 50.4001 77.5016 50.9001C77.5016 51.4001 77.1016 51.7001 76.7016 51.7001Z" fill="#BDDFFE"/>
+<path d="M90.3016 87.8002H60.9016C60.5016 87.8002 60.1016 87.5002 60.1016 87.0002C60.1016 86.5002 60.4016 86.2002 60.9016 86.2002H90.4016C90.8016 86.2002 91.2016 86.5002 91.2016 87.0002C91.2016 87.5002 90.7016 87.8002 90.3016 87.8002Z" fill="#BDDFFE"/>
+<path d="M76.7016 93.7001H60.9016C60.5016 93.7001 60.1016 93.4001 60.1016 92.9001C60.1016 92.4001 60.4016 92.1001 60.9016 92.1001H76.7016C77.1016 92.1001 77.5016 92.4001 77.5016 92.9001C77.5016 93.4001 77.1016 93.7001 76.7016 93.7001Z" fill="#BDDFFE"/>
+<path d="M90.3016 66.8002H60.9016C60.5016 66.8002 60.1016 66.5002 60.1016 66.0002C60.1016 65.5002 60.4016 65.2002 60.9016 65.2002H90.4016C90.8016 65.2002 91.2016 65.5002 91.2016 66.0002C91.2016 66.5002 90.7016 66.8002 90.3016 66.8002Z" fill="#BDDFFE"/>
+<path d="M76.7016 72.7001H60.9016C60.5016 72.7001 60.1016 72.4001 60.1016 71.9001C60.1016 71.4001 60.4016 71.1001 60.9016 71.1001H76.7016C77.1016 71.1001 77.5016 71.4001 77.5016 71.9001C77.5016 72.4001 77.1016 72.7001 76.7016 72.7001Z" fill="#BDDFFE"/>
+<path d="M90.3016 129.8H60.9016C60.5016 129.8 60.1016 129.5 60.1016 129C60.1016 128.5 60.4016 128.2 60.9016 128.2H90.4016C90.8016 128.2 91.2016 128.5 91.2016 129C91.2016 129.5 90.7016 129.8 90.3016 129.8Z" fill="#BDDFFE"/>
+<path d="M76.7016 135.7H60.9016C60.5016 135.7 60.1016 135.4 60.1016 134.9C60.1016 134.4 60.4016 134.1 60.9016 134.1H76.7016C77.1016 134.1 77.5016 134.4 77.5016 134.9C77.5016 135.4 77.1016 135.7 76.7016 135.7Z" fill="#BDDFFE"/>
+<path d="M90.3016 108.8H60.9016C60.5016 108.8 60.1016 108.5 60.1016 108C60.1016 107.5 60.4016 107.2 60.9016 107.2H90.4016C90.8016 107.2 91.2016 107.5 91.2016 108C91.2016 108.5 90.7016 108.8 90.3016 108.8Z" fill="#BDDFFE"/>
+<path d="M76.7016 114.7H60.9016C60.5016 114.7 60.1016 114.4 60.1016 113.9C60.1016 113.4 60.4016 113.1 60.9016 113.1H76.7016C77.1016 113.1 77.5016 113.4 77.5016 113.9C77.5016 114.4 77.1016 114.7 76.7016 114.7Z" fill="#BDDFFE"/>
+<path d="M96.3016 34.7998H150.302C156.502 34.7998 161.502 39.7998 161.502 45.9998V167C161.502 173.2 156.502 178.2 150.302 178.2H96.3016C90.1016 178.2 85.1016 173.2 85.1016 167V45.9998C85.1016 39.7998 90.1016 34.7998 96.3016 34.7998Z" fill="#ECFCCB"/>
+<path d="M154.601 61.5999C154.601 57.5999 151.401 54.3999 147.401 54.3999H99.4012C95.4012 54.3999 92.2012 57.5999 92.2012 61.5999V157.6C92.2012 161.6 95.4012 164.8 99.4012 164.8H147.401C151.401 164.8 154.601 161.6 154.601 157.6V61.5999Z" fill="#F9FAFB"/>
+<path d="M150.301 34H96.3013C89.7013 34 84.3013 39.4 84.3013 46V167C84.3013 173.6 89.7013 179 96.3013 179H150.301C156.901 179 162.301 173.6 162.301 167V46C162.301 39.4 157.001 34 150.301 34ZM160.801 167C160.801 172.8 156.101 177.5 150.301 177.5H96.3013C90.5013 177.5 85.8013 172.8 85.8013 167V46C85.8013 40.2 90.5013 35.5 96.3013 35.5H150.301C156.101 35.5 160.801 40.2 160.801 46V167Z" fill="#65A30D"/>
+<path d="M123.301 47.8999C125.001 47.8999 126.301 46.5999 126.301 44.8999C126.301 43.1999 125.001 41.8999 123.301 41.8999C121.601 41.8999 120.301 43.1999 120.301 44.8999C120.301 46.5999 121.701 47.8999 123.301 47.8999ZM123.301 43.3999C124.101 43.3999 124.801 44.0999 124.801 44.8999C124.801 45.6999 124.101 46.3999 123.301 46.3999C122.501 46.3999 121.801 45.6999 121.801 44.8999C121.801 44.0999 122.501 43.3999 123.301 43.3999Z" fill="#65A30D"/>
+<path d="M105.301 45.3998H115.301C115.701 45.3998 116.101 45.0998 116.101 44.5998C116.101 44.0998 115.801 43.7998 115.301 43.7998H105.301C104.901 43.7998 104.501 44.0998 104.501 44.5998C104.501 45.0998 104.901 45.3998 105.301 45.3998Z" fill="#65A30D"/>
+<path d="M131.301 45.3998H141.301C141.701 45.3998 142.101 45.0998 142.101 44.5998C142.101 44.0998 141.801 43.7998 141.301 43.7998H131.301C130.901 43.7998 130.501 44.0998 130.501 44.5998C130.501 45.0998 130.901 45.3998 131.301 45.3998Z" fill="#65A30D"/>
+<path d="M147.301 53.6001H99.3013C94.9013 53.6001 91.3013 57.2001 91.3013 61.6001V157.6C91.3013 162 94.9013 165.6 99.3013 165.6H147.301C151.701 165.6 155.301 162 155.301 157.6V61.6001C155.301 57.2001 151.701 53.6001 147.301 53.6001ZM153.801 157.6C153.801 161.2 150.901 164.1 147.301 164.1H99.3013C95.7013 164.1 92.8013 161.2 92.8013 157.6V61.6001C92.8013 58.0001 95.7013 55.1001 99.3013 55.1001H147.301C150.901 55.1001 153.801 58.0001 153.801 61.6001V157.6Z" fill="#65A30D"/>
+<path d="M49.3014 54C52.5598 54 55.2014 51.3137 55.2014 48C55.2014 44.6863 52.5598 42 49.3014 42C46.0429 42 43.4014 44.6863 43.4014 48C43.4014 51.3137 46.0429 54 49.3014 54Z" fill="#E5E7EB"/>
+<path d="M49.3014 96C52.5598 96 55.2014 93.3137 55.2014 90C55.2014 86.6863 52.5598 84 49.3014 84C46.0429 84 43.4014 86.6863 43.4014 90C43.4014 93.3137 46.0429 96 49.3014 96Z" fill="#E5E7EB"/>
+<path d="M49.3014 75C52.5598 75 55.2014 72.3137 55.2014 69C55.2014 65.6863 52.5598 63 49.3014 63C46.0429 63 43.4014 65.6863 43.4014 69C43.4014 72.3137 46.0429 75 49.3014 75Z" fill="#E5E7EB"/>
+<path d="M49.3014 138C52.5598 138 55.2014 135.314 55.2014 132C55.2014 128.686 52.5598 126 49.3014 126C46.0429 126 43.4014 128.686 43.4014 132C43.4014 135.314 46.0429 138 49.3014 138Z" fill="#E5E7EB"/>
+<path d="M49.3014 117C52.5598 117 55.2014 114.314 55.2014 111C55.2014 107.686 52.5598 105 49.3014 105C46.0429 105 43.4014 107.686 43.4014 111C43.4014 114.314 46.0429 117 49.3014 117Z" fill="#E5E7EB"/>
+<path d="M104.301 75C107.56 75 110.201 72.3137 110.201 69C110.201 65.6863 107.56 63 104.301 63C101.043 63 98.4014 65.6863 98.4014 69C98.4014 72.3137 101.043 75 104.301 75Z" fill="#E5E7EB"/>
+<path d="M104.301 159C107.56 159 110.201 156.314 110.201 153C110.201 149.686 107.56 147 104.301 147C101.043 147 98.4014 149.686 98.4014 153C98.4014 156.314 101.043 159 104.301 159Z" fill="#E5E7EB"/>
+<path d="M104.301 138C107.56 138 110.201 135.314 110.201 132C110.201 128.686 107.56 126 104.301 126C101.043 126 98.4014 128.686 98.4014 132C98.4014 135.314 101.043 138 104.301 138Z" fill="#E5E7EB"/>
+<path d="M115.902 66.8002H145.402C145.802 66.8002 146.202 66.5002 146.202 66.0002C146.202 65.5002 145.902 65.2002 145.402 65.2002H115.902C115.502 65.2002 115.102 65.5002 115.102 66.0002C115.102 66.5002 115.502 66.8002 115.902 66.8002Z" fill="#D9F99D"/>
+<path d="M115.902 72.7001H131.702C132.102 72.7001 132.502 72.4001 132.502 71.9001C132.502 71.4001 132.202 71.1001 131.702 71.1001H115.902C115.502 71.1001 115.102 71.4001 115.102 71.9001C115.102 72.4001 115.502 72.7001 115.902 72.7001Z" fill="#D9F99D"/>
+<path d="M145.301 149.3H115.801C115.401 149.3 115.001 149.6 115.001 150.1C115.001 150.6 115.301 150.9 115.801 150.9H145.301C145.701 150.9 146.101 150.6 146.101 150.1C146.101 149.6 145.701 149.3 145.301 149.3Z" fill="#D9F99D"/>
+<path d="M131.702 155.2H115.902C115.502 155.2 115.102 155.5 115.102 156C115.102 156.5 115.402 156.8 115.902 156.8H131.702C132.102 156.8 132.502 156.5 132.502 156C132.502 155.5 132.102 155.2 131.702 155.2Z" fill="#D9F99D"/>
+<path d="M145.301 128.3H115.801C115.401 128.3 115.001 128.6 115.001 129.1C115.001 129.6 115.301 129.9 115.801 129.9H145.301C145.701 129.9 146.101 129.6 146.101 129.1C146.101 128.6 145.701 128.3 145.301 128.3Z" fill="#D9F99D"/>
+<path d="M115.902 135.7H131.702C132.102 135.7 132.502 135.4 132.502 134.9C132.502 134.4 132.202 134.1 131.702 134.1H115.902C115.502 134.1 115.102 134.4 115.102 134.9C115.102 135.4 115.502 135.7 115.902 135.7Z" fill="#D9F99D"/>
+<path d="M74.3013 83H172.301C174.501 83 176.301 84.8 176.301 87V114C176.301 116.2 174.501 118 172.301 118H74.3013C72.1013 118 70.3013 116.2 70.3013 114V87C70.3013 84.8 72.1013 83 74.3013 83Z" fill="#52ADF9"/>
+<path d="M164.301 95.2998H112.301C111.901 95.2998 111.501 95.5998 111.501 96.0998C111.501 96.5998 111.801 96.8998 112.301 96.8998H164.301C164.701 96.8998 165.101 96.5998 165.101 96.0998C165.101 95.5998 164.701 95.2998 164.301 95.2998Z" fill="#F9FAFB"/>
+<path d="M140.301 104.1H112.301C111.901 104.1 111.501 104.4 111.501 104.9C111.501 105.4 111.801 105.7 112.301 105.7H140.301C140.701 105.7 141.101 105.4 141.101 104.9C141.101 104.4 140.701 104.1 140.301 104.1Z" fill="#F9FAFB"/>
+<path d="M91.8015 102.2H90.3015C85.5015 102.2 81.5015 106.1 81.5015 111V111.1C81.5015 111.5 81.8015 111.8 82.3015 111.8C82.8015 111.8 83.1015 111.4 83.1015 111C83.1015 107 86.4015 103.8 90.3015 103.8H91.8015C95.8015 103.8 99.0015 107.1 99.0015 111.1C99.0015 111.5 99.3015 111.8 99.8015 111.8C100.301 111.8 100.601 111.4 100.601 111C100.501 106.1 96.6015 102.2 91.8015 102.2Z" fill="#F9FAFB"/>
+<path d="M91.1012 99.5002C93.8012 99.5002 96.0012 97.3002 96.0012 94.6002C96.0012 91.9002 93.8012 89.7002 91.1012 89.7002C88.4012 89.7002 86.2012 91.9002 86.2012 94.6002C86.2012 97.4002 88.4012 99.5002 91.1012 99.5002ZM91.1012 91.3002C93.0012 91.3002 94.5012 92.8002 94.5012 94.7002C94.5012 96.6002 92.9012 98.0002 91.1012 98.0002C89.3012 98.0002 87.7012 96.5002 87.7012 94.6002C87.7012 92.7002 89.2012 91.3002 91.1012 91.3002Z" fill="#F9FAFB"/>
+</svg>
diff --git a/briar-android/artwork/il_bluetooth_connect_dark.svg b/briar-android/artwork/il_bluetooth_connect_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2eb7d20d24a1dc28f114a3e879eea0db45d18d24
--- /dev/null
+++ b/briar-android/artwork/il_bluetooth_connect_dark.svg
@@ -0,0 +1,25 @@
+<svg width="289" height="145" viewBox="0 0 289 145" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M268.901 41.8047C268.901 37.3864 265.32 33.8047 260.901 33.8047H234.901C230.483 33.8047 226.901 37.3864 226.901 41.8047V103.805C226.901 108.223 230.483 111.805 234.901 111.805H260.901C265.32 111.805 268.901 108.223 268.901 103.805V41.8047Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M234.901 35.3047H260.901C264.491 35.3047 267.401 38.2148 267.401 41.8047V103.805C267.401 107.395 264.491 110.305 260.901 110.305H234.901C231.312 110.305 228.401 107.395 228.401 103.805V41.8047C228.401 38.2148 231.312 35.3047 234.901 35.3047ZM260.901 33.8047C265.32 33.8047 268.901 37.3864 268.901 41.8047V103.805C268.901 108.223 265.32 111.805 260.901 111.805H234.901C230.483 111.805 226.901 108.223 226.901 103.805V41.8047C226.901 37.3864 230.483 33.8047 234.901 33.8047H260.901Z" fill="#52ADF9"/>
+<path d="M246.901 41.8059C246.901 42.3588 247.349 42.8071 247.901 42.8071C248.454 42.8071 248.901 42.3588 248.901 41.8059C248.901 41.2529 248.454 40.8047 247.901 40.8047C247.349 40.8047 246.901 41.2529 246.901 41.8059Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M239.151 41.8291C239.151 41.4149 239.487 41.0791 239.901 41.0791H243.901C244.316 41.0791 244.651 41.4149 244.651 41.8291C244.651 42.2433 244.316 42.5791 243.901 42.5791H239.901C239.487 42.5791 239.151 42.2433 239.151 41.8291Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M251.151 41.8291C251.151 41.4149 251.487 41.0791 251.901 41.0791H255.901C256.316 41.0791 256.651 41.4149 256.651 41.8291C256.651 42.2433 256.316 42.5791 255.901 42.5791H251.901C251.487 42.5791 251.151 42.2433 251.151 41.8291Z" fill="#52ADF9"/>
+<path d="M268.901 48.0527H226.902V102.053H268.901V48.0527Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M228.402 49.5527H267.401V100.553H228.402V49.5527ZM268.901 48.0527V102.053H226.902V48.0527H268.901Z" fill="#52ADF9"/>
+<path d="M61.9014 41.8047C61.9014 37.3864 58.3196 33.8047 53.9014 33.8047H27.9014C23.4831 33.8047 19.9014 37.3864 19.9014 41.8047V103.805C19.9014 108.223 23.4831 111.805 27.9014 111.805H53.9014C58.3196 111.805 61.9014 108.223 61.9014 103.805V41.8047Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.9014 35.3047H53.9014C57.4912 35.3047 60.4014 38.2148 60.4014 41.8047V103.805C60.4014 107.395 57.4912 110.305 53.9014 110.305H27.9014C24.3115 110.305 21.4014 107.395 21.4014 103.805V41.8047C21.4014 38.2148 24.3115 35.3047 27.9014 35.3047ZM53.9014 33.8047C58.3196 33.8047 61.9014 37.3864 61.9014 41.8047V103.805C61.9014 108.223 58.3196 111.805 53.9014 111.805H27.9014C23.4831 111.805 19.9014 108.223 19.9014 103.805V41.8047C19.9014 37.3864 23.4831 33.8047 27.9014 33.8047H53.9014Z" fill="#A3E635"/>
+<path d="M39.9014 41.8059C39.9014 42.3588 40.3491 42.8071 40.9014 42.8071C41.4537 42.8071 41.9014 42.3588 41.9014 41.8059C41.9014 41.2529 41.4537 40.8047 40.9014 40.8047C40.3491 40.8047 39.9014 41.2529 39.9014 41.8059Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.1514 41.8291C32.1514 41.4149 32.4872 41.0791 32.9014 41.0791H36.9014C37.3156 41.0791 37.6514 41.4149 37.6514 41.8291C37.6514 42.2433 37.3156 42.5791 36.9014 42.5791H32.9014C32.4872 42.5791 32.1514 42.2433 32.1514 41.8291Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M44.1514 41.8291C44.1514 41.4149 44.4872 41.0791 44.9014 41.0791H48.9014C49.3156 41.0791 49.6514 41.4149 49.6514 41.8291C49.6514 42.2433 49.3156 42.5791 48.9014 42.5791H44.9014C44.4872 42.5791 44.1514 42.2433 44.1514 41.8291Z" fill="#A3E635"/>
+<path d="M61.9014 48.0527H19.9015V102.053H61.9014V48.0527Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4015 49.5527H60.4014V100.553H21.4015V49.5527ZM61.9014 48.0527V102.053H19.9015V48.0527H61.9014Z" fill="#A3E635"/>
+<path d="M96.1514 72.8047C96.1514 75.0138 94.3605 76.8047 92.1514 76.8047C89.9422 76.8047 88.1514 75.0138 88.1514 72.8047C88.1514 70.5955 89.9422 68.8047 92.1514 68.8047C94.3605 68.8047 96.1514 70.5955 96.1514 72.8047Z" fill="#4D7C0F"/>
+<path d="M112.151 72.8047C112.151 75.0138 110.361 76.8047 108.151 76.8047C105.942 76.8047 104.151 75.0138 104.151 72.8047C104.151 70.5955 105.942 68.8047 108.151 68.8047C110.361 68.8047 112.151 70.5955 112.151 72.8047Z" fill="#82C91E"/>
+<path d="M80.1514 72.8047C80.1514 75.0138 78.3605 76.8047 76.1514 76.8047C73.9422 76.8047 72.1514 75.0138 72.1514 72.8047C72.1514 70.5955 73.9422 68.8047 76.1514 68.8047C78.3605 68.8047 80.1514 70.5955 80.1514 72.8047Z" fill="#365314"/>
+<path d="M192.651 72.8047C192.651 70.5955 194.442 68.8047 196.651 68.8047C198.861 68.8047 200.651 70.5955 200.651 72.8047C200.651 75.0138 198.861 76.8047 196.651 76.8047C194.442 76.8047 192.651 75.0138 192.651 72.8047Z" fill="#1457C5"/>
+<path d="M176.651 72.8047C176.651 70.5955 178.442 68.8047 180.651 68.8047C182.861 68.8047 184.651 70.5955 184.651 72.8047C184.651 75.0138 182.861 76.8047 180.651 76.8047C178.442 76.8047 176.651 75.0138 176.651 72.8047Z" fill="#2B8EF1"/>
+<path d="M208.651 72.8047C208.651 70.5955 210.442 68.8047 212.651 68.8047C214.861 68.8047 216.651 70.5955 216.651 72.8047C216.651 75.0138 214.861 76.8047 212.651 76.8047C210.442 76.8047 208.651 75.0138 208.651 72.8047Z" fill="#184080"/>
+<path d="M166.271 62.8047C166.271 56.1773 160.899 50.8047 154.271 50.8047H134.271C127.644 50.8047 122.271 56.1773 122.271 62.8047V82.8047C122.271 89.4321 127.644 94.8047 134.271 94.8047H154.271C160.899 94.8047 166.271 89.4321 166.271 82.8047V62.8047Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M134.271 52.3047H154.271C160.07 52.3047 164.771 57.0057 164.771 62.8047V82.8047C164.771 88.6037 160.07 93.3047 154.271 93.3047H134.271C128.472 93.3047 123.771 88.6037 123.771 82.8047V62.8047C123.771 57.0057 128.472 52.3047 134.271 52.3047ZM154.271 50.8047C160.899 50.8047 166.271 56.1773 166.271 62.8047V82.8047C166.271 89.4321 160.899 94.8047 154.271 94.8047H134.271C127.644 94.8047 122.271 89.4321 122.271 82.8047V62.8047C122.271 56.1773 127.644 50.8047 134.271 50.8047H154.271Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M144.082 62.349C144.344 62.2252 144.655 62.264 144.879 62.4488L150.582 67.1538C150.753 67.2942 150.852 67.5025 150.855 67.7232C150.858 67.9439 150.763 68.1546 150.596 68.2991L145.547 72.6754L150.596 77.0516C150.761 77.1939 150.855 77.4004 150.855 77.6176C150.855 77.8348 150.761 78.0415 150.598 78.1841L144.894 83.1486C144.672 83.3416 144.358 83.3873 144.091 83.2655C143.823 83.1437 143.651 82.8768 143.651 82.5829V74.3178L139.189 78.1852C138.876 78.4564 138.402 78.4226 138.131 78.1096C137.86 77.7966 137.894 77.3229 138.207 77.0516L143.256 72.6754L138.207 68.2991C137.894 68.0278 137.86 67.5542 138.131 67.2411C138.402 66.9281 138.876 66.8943 139.189 67.1655L143.651 71.0329V63.0274C143.651 62.737 143.819 62.4728 144.082 62.349ZM145.151 74.3178L148.961 77.6196L145.151 80.9358V74.3178ZM145.151 71.0329V64.6183L148.944 67.7465L145.151 71.0329Z" fill="#52ADF9"/>
+</svg>
diff --git a/briar-android/artwork/il_bluetooth_connect_light.svg b/briar-android/artwork/il_bluetooth_connect_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e4778593e7b1ac0ecc22688176396d9703db26ce
--- /dev/null
+++ b/briar-android/artwork/il_bluetooth_connect_light.svg
@@ -0,0 +1,25 @@
+<svg width="289" height="145" viewBox="0 0 289 145" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M268.901 40.8047C268.901 36.3864 265.32 32.8047 260.901 32.8047H234.901C230.483 32.8047 226.901 36.3864 226.901 40.8047V102.805C226.901 107.223 230.483 110.805 234.901 110.805H260.901C265.32 110.805 268.901 107.223 268.901 102.805V40.8047Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M234.901 34.3047H260.901C264.491 34.3047 267.401 37.2148 267.401 40.8047V102.805C267.401 106.395 264.491 109.305 260.901 109.305H234.901C231.312 109.305 228.401 106.395 228.401 102.805V40.8047C228.401 37.2148 231.312 34.3047 234.901 34.3047ZM260.901 32.8047C265.32 32.8047 268.901 36.3864 268.901 40.8047V102.805C268.901 107.223 265.32 110.805 260.901 110.805H234.901C230.483 110.805 226.901 107.223 226.901 102.805V40.8047C226.901 36.3864 230.483 32.8047 234.901 32.8047H260.901Z" fill="#196FDE"/>
+<path d="M246.901 40.8059C246.901 41.3588 247.349 41.8071 247.901 41.8071C248.454 41.8071 248.901 41.3588 248.901 40.8059C248.901 40.2529 248.454 39.8047 247.901 39.8047C247.349 39.8047 246.901 40.2529 246.901 40.8059Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M239.151 40.8291C239.151 40.4149 239.487 40.0791 239.901 40.0791H243.901C244.316 40.0791 244.651 40.4149 244.651 40.8291C244.651 41.2433 244.316 41.5791 243.901 41.5791H239.901C239.487 41.5791 239.151 41.2433 239.151 40.8291Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M251.151 40.8291C251.151 40.4149 251.487 40.0791 251.901 40.0791H255.901C256.316 40.0791 256.651 40.4149 256.651 40.8291C256.651 41.2433 256.316 41.5791 255.901 41.5791H251.901C251.487 41.5791 251.151 41.2433 251.151 40.8291Z" fill="#196FDE"/>
+<path d="M268.901 47.0527H226.902V101.053H268.901V47.0527Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M228.402 48.5527H267.401V99.5527H228.402V48.5527ZM268.901 47.0527V101.053H226.902V47.0527H268.901Z" fill="#196FDE"/>
+<path d="M61.9014 40.8047C61.9014 36.3864 58.3196 32.8047 53.9014 32.8047H27.9014C23.4831 32.8047 19.9014 36.3864 19.9014 40.8047V102.805C19.9014 107.223 23.4831 110.805 27.9014 110.805H53.9014C58.3196 110.805 61.9014 107.223 61.9014 102.805V40.8047Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.9014 34.3047H53.9014C57.4912 34.3047 60.4014 37.2148 60.4014 40.8047V102.805C60.4014 106.395 57.4912 109.305 53.9014 109.305H27.9014C24.3115 109.305 21.4014 106.395 21.4014 102.805V40.8047C21.4014 37.2148 24.3115 34.3047 27.9014 34.3047ZM53.9014 32.8047C58.3196 32.8047 61.9014 36.3864 61.9014 40.8047V102.805C61.9014 107.223 58.3196 110.805 53.9014 110.805H27.9014C23.4831 110.805 19.9014 107.223 19.9014 102.805V40.8047C19.9014 36.3864 23.4831 32.8047 27.9014 32.8047H53.9014Z" fill="#65A30D"/>
+<path d="M39.9014 40.8059C39.9014 41.3588 40.3491 41.8071 40.9014 41.8071C41.4537 41.8071 41.9014 41.3588 41.9014 40.8059C41.9014 40.2529 41.4537 39.8047 40.9014 39.8047C40.3491 39.8047 39.9014 40.2529 39.9014 40.8059Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.1514 40.8291C32.1514 40.4149 32.4872 40.0791 32.9014 40.0791H36.9014C37.3156 40.0791 37.6514 40.4149 37.6514 40.8291C37.6514 41.2433 37.3156 41.5791 36.9014 41.5791H32.9014C32.4872 41.5791 32.1514 41.2433 32.1514 40.8291Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M44.1514 40.8291C44.1514 40.4149 44.4872 40.0791 44.9014 40.0791H48.9014C49.3156 40.0791 49.6514 40.4149 49.6514 40.8291C49.6514 41.2433 49.3156 41.5791 48.9014 41.5791H44.9014C44.4872 41.5791 44.1514 41.2433 44.1514 40.8291Z" fill="#65A30D"/>
+<path d="M61.9014 47.0527H19.9015V101.053H61.9014V47.0527Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4015 48.5527H60.4014V99.5527H21.4015V48.5527ZM61.9014 47.0527V101.053H19.9015V47.0527H61.9014Z" fill="#65A30D"/>
+<path d="M96.1514 71.8047C96.1514 74.0138 94.3605 75.8047 92.1514 75.8047C89.9422 75.8047 88.1514 74.0138 88.1514 71.8047C88.1514 69.5955 89.9422 67.8047 92.1514 67.8047C94.3605 67.8047 96.1514 69.5955 96.1514 71.8047Z" fill="#BEF264"/>
+<path d="M112.151 71.8047C112.151 74.0138 110.361 75.8047 108.151 75.8047C105.942 75.8047 104.151 74.0138 104.151 71.8047C104.151 69.5955 105.942 67.8047 108.151 67.8047C110.361 67.8047 112.151 69.5955 112.151 71.8047Z" fill="#A3E635"/>
+<path d="M80.1514 71.8047C80.1514 74.0138 78.3605 75.8047 76.1514 75.8047C73.9422 75.8047 72.1514 74.0138 72.1514 71.8047C72.1514 69.5955 73.9422 67.8047 76.1514 67.8047C78.3605 67.8047 80.1514 69.5955 80.1514 71.8047Z" fill="#D9F99D"/>
+<path d="M192.651 71.8047C192.651 69.5955 194.442 67.8047 196.651 67.8047C198.861 67.8047 200.651 69.5955 200.651 71.8047C200.651 74.0138 198.861 75.8047 196.651 75.8047C194.442 75.8047 192.651 74.0138 192.651 71.8047Z" fill="#8BCAFD"/>
+<path d="M176.651 71.8047C176.651 69.5955 178.442 67.8047 180.651 67.8047C182.861 67.8047 184.651 69.5955 184.651 71.8047C184.651 74.0138 182.861 75.8047 180.651 75.8047C178.442 75.8047 176.651 74.0138 176.651 71.8047Z" fill="#52ADF9"/>
+<path d="M208.651 71.8047C208.651 69.5955 210.442 67.8047 212.651 67.8047C214.861 67.8047 216.651 69.5955 216.651 71.8047C216.651 74.0138 214.861 75.8047 212.651 75.8047C210.442 75.8047 208.651 74.0138 208.651 71.8047Z" fill="#BDDFFE"/>
+<path d="M166.271 61.8047C166.271 55.1773 160.899 49.8047 154.271 49.8047H134.271C127.644 49.8047 122.271 55.1773 122.271 61.8047V81.8047C122.271 88.4321 127.644 93.8047 134.271 93.8047H154.271C160.899 93.8047 166.271 88.4321 166.271 81.8047V61.8047Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M134.271 51.3047H154.271C160.07 51.3047 164.771 56.0057 164.771 61.8047V81.8047C164.771 87.6037 160.07 92.3047 154.271 92.3047H134.271C128.472 92.3047 123.771 87.6037 123.771 81.8047V61.8047C123.771 56.0057 128.472 51.3047 134.271 51.3047ZM154.271 49.8047C160.899 49.8047 166.271 55.1773 166.271 61.8047V81.8047C166.271 88.4321 160.899 93.8047 154.271 93.8047H134.271C127.644 93.8047 122.271 88.4321 122.271 81.8047V61.8047C122.271 55.1773 127.644 49.8047 134.271 49.8047H154.271Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M144.082 61.349C144.344 61.2252 144.655 61.264 144.879 61.4488L150.582 66.1538C150.753 66.2942 150.852 66.5025 150.855 66.7232C150.858 66.9439 150.763 67.1546 150.596 67.2991L145.547 71.6754L150.596 76.0516C150.761 76.1939 150.855 76.4004 150.855 76.6176C150.855 76.8348 150.761 77.0415 150.598 77.1841L144.894 82.1486C144.672 82.3416 144.358 82.3873 144.091 82.2655C143.823 82.1437 143.651 81.8768 143.651 81.5829V73.3178L139.189 77.1852C138.876 77.4564 138.402 77.4226 138.131 77.1096C137.86 76.7966 137.894 76.3229 138.207 76.0516L143.256 71.6754L138.207 67.2991C137.894 67.0278 137.86 66.5542 138.131 66.2411C138.402 65.9281 138.876 65.8943 139.189 66.1655L143.651 70.0329V62.0274C143.651 61.737 143.819 61.4728 144.082 61.349ZM145.151 73.3178L148.961 76.6196L145.151 79.9358V73.3178ZM145.151 70.0329V63.6183L148.944 66.7465L145.151 70.0329Z" fill="#196FDE"/>
+</svg>
diff --git a/briar-android/artwork/il_crash_dark.svg b/briar-android/artwork/il_crash_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..631be6878beb4b946a4756f7712ff5814673ba2e
--- /dev/null
+++ b/briar-android/artwork/il_crash_dark.svg
@@ -0,0 +1,7 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.4014 76.8438C60.5598 76.8438 76.9014 60.5021 76.9014 40.3438C76.9014 20.1854 60.5598 3.84375 40.4014 3.84375C20.243 3.84375 3.90137 20.1854 3.90137 40.3438C3.90137 60.5021 20.243 76.8438 40.4014 76.8438ZM40.4014 78.3438C61.3882 78.3438 78.4014 61.3306 78.4014 40.3438C78.4014 19.3569 61.3882 2.34375 40.4014 2.34375C19.4145 2.34375 2.40137 19.3569 2.40137 40.3438C2.40137 61.3306 19.4145 78.3438 40.4014 78.3438Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8334 26.9951C16.1263 26.7022 16.6012 26.7022 16.8941 26.9951L24.3638 34.4647L31.8334 26.9951C32.1263 26.7022 32.6012 26.7022 32.8941 26.9951C33.187 27.288 33.187 27.7628 32.8941 28.0557L25.4244 35.5254L32.8941 42.9951C33.187 43.288 33.187 43.7628 32.8941 44.0557C32.6012 44.3486 32.1263 44.3486 31.8334 44.0557L24.3638 36.5861L16.8941 44.0557C16.6012 44.3486 16.1263 44.3486 15.8334 44.0557C15.5405 43.7628 15.5405 43.288 15.8334 42.9951L23.3031 35.5254L15.8334 28.0557C15.5405 27.7628 15.5405 27.288 15.8334 26.9951Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.9091 26.9951C48.202 26.7022 48.6769 26.7022 48.9698 26.9951L56.4395 34.4647L63.9091 26.9951C64.202 26.7022 64.6769 26.7022 64.9698 26.9951C65.2627 27.288 65.2627 27.7628 64.9698 28.0557L57.5001 35.5254L64.9698 42.9951C65.2627 43.288 65.2627 43.7628 64.9698 44.0557C64.6769 44.3486 64.202 44.3486 63.9091 44.0557L56.4395 36.5861L48.9698 44.0557C48.6769 44.3486 48.202 44.3486 47.9091 44.0557C47.6162 43.7628 47.6162 43.288 47.9091 42.9951L55.3788 35.5254L47.9091 28.0557C47.6162 27.7628 47.6162 27.288 47.9091 26.9951Z" fill="#64748B"/>
+<path d="M53.4633 63.7465C53.4633 60.2823 52.0871 56.9599 49.6375 54.5103C47.1879 52.0607 43.8656 50.6846 40.4013 50.6846C36.9371 50.6846 33.6147 52.0607 31.1651 54.5103C28.7155 56.9599 27.3394 60.2823 27.3394 63.7465L40.4013 63.7465L53.4633 63.7465Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M51.8656 62.2465C51.5368 59.7336 50.3885 57.3826 48.5768 55.571C46.4086 53.4027 43.4677 52.1846 40.4013 52.1846C37.3349 52.1846 34.3941 53.4027 32.2258 55.571C30.4141 57.3826 29.2658 59.7336 28.937 62.2465L51.8656 62.2465ZM53.3769 62.2465C53.0403 59.3345 51.7309 56.6037 49.6375 54.5103C47.1879 52.0607 43.8656 50.6846 40.4013 50.6846C36.9371 50.6846 33.6147 52.0607 31.1651 54.5103C29.0717 56.6037 27.7623 59.3345 27.4257 62.2465C27.3685 62.742 27.3394 63.2428 27.3394 63.7465L53.4633 63.7465C53.4633 63.2428 53.4342 62.742 53.3769 62.2465Z" fill="#64748B"/>
+</svg>
diff --git a/briar-android/artwork/il_crash_light.svg b/briar-android/artwork/il_crash_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9790eef8e375378cd66c37e67a72c79a0051d15c
--- /dev/null
+++ b/briar-android/artwork/il_crash_light.svg
@@ -0,0 +1,7 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.6514 76.5C60.8098 76.5 77.1514 60.1584 77.1514 40C77.1514 19.8416 60.8098 3.5 40.6514 3.5C20.493 3.5 4.15137 19.8416 4.15137 40C4.15137 60.1584 20.493 76.5 40.6514 76.5ZM40.6514 78C61.6382 78 78.6514 60.9868 78.6514 40C78.6514 19.0132 61.6382 2 40.6514 2C19.6645 2 2.65137 19.0132 2.65137 40C2.65137 60.9868 19.6645 78 40.6514 78Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0834 26.6513C16.3763 26.3584 16.8512 26.3584 17.1441 26.6513L24.6138 34.121L32.0834 26.6513C32.3763 26.3584 32.8512 26.3584 33.1441 26.6513C33.437 26.9442 33.437 27.4191 33.1441 27.712L25.6744 35.1816L33.1441 42.6513C33.437 42.9442 33.437 43.4191 33.1441 43.712C32.8512 44.0049 32.3763 44.0049 32.0834 43.712L24.6138 36.2423L17.1441 43.712C16.8512 44.0049 16.3763 44.0049 16.0834 43.712C15.7905 43.4191 15.7905 42.9442 16.0834 42.6513L23.5531 35.1816L16.0834 27.712C15.7905 27.4191 15.7905 26.9442 16.0834 26.6513Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48.1591 26.6513C48.452 26.3584 48.9269 26.3584 49.2198 26.6513L56.6895 34.121L64.1591 26.6513C64.452 26.3584 64.9269 26.3584 65.2198 26.6513C65.5127 26.9442 65.5127 27.4191 65.2198 27.712L57.7501 35.1816L65.2198 42.6513C65.5127 42.9442 65.5127 43.4191 65.2198 43.712C64.9269 44.0049 64.452 44.0049 64.1591 43.712L56.6895 36.2423L49.2198 43.712C48.9269 44.0049 48.452 44.0049 48.1591 43.712C47.8662 43.4191 47.8662 42.9442 48.1591 42.6513L55.6288 35.1816L48.1591 27.712C47.8662 27.4191 47.8662 26.9442 48.1591 26.6513Z" fill="#9CA3AF"/>
+<path d="M53.7133 63.4028C53.7133 59.9385 52.3371 56.6162 49.8875 54.1666C47.4379 51.717 44.1156 50.3408 40.6513 50.3408C37.1871 50.3408 33.8647 51.717 31.4151 54.1666C28.9655 56.6162 27.5894 59.9385 27.5894 63.4028L40.6513 63.4028L53.7133 63.4028Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M52.1156 61.9028C51.7868 59.3899 50.6385 57.0389 48.8268 55.2272C46.6586 53.059 43.7177 51.8408 40.6513 51.8408C37.5849 51.8408 34.6441 53.059 32.4758 55.2272C30.6641 57.0389 29.5158 59.3898 29.187 61.9028L52.1156 61.9028ZM53.6269 61.9028C53.2903 58.9907 51.9809 56.26 49.8875 54.1666C47.4379 51.717 44.1156 50.3408 40.6513 50.3408C37.1871 50.3408 33.8647 51.717 31.4151 54.1666C29.3217 56.26 28.0123 58.9907 27.6757 61.9028C27.6185 62.3983 27.5894 62.899 27.5894 63.4028L53.7133 63.4028C53.7133 62.899 53.6842 62.3983 53.6269 61.9028Z" fill="#9CA3AF"/>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_blogs_dark.svg b/briar-android/artwork/il_empty_state_blogs_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9813dc9f7ed8ab3d3f5a2cf1b08b032309361040
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_blogs_dark.svg
@@ -0,0 +1,17 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9184)">
+<path d="M14.4937 62.0026C13.3891 62.0026 12.4937 61.1071 12.4937 60.0026L12.4937 30.003C12.4936 28.8984 13.3891 28.003 14.4937 28.003L34.4936 28.003C35.5982 28.003 36.4936 28.8984 36.4936 30.003L36.4936 60.0029C36.4936 61.1075 35.5982 62.0029 34.4936 62.0029L14.4937 62.0026Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.4936 29.503L14.4937 29.503C14.2175 29.503 13.9937 29.7268 13.9937 30.003L13.9937 60.0026C13.9937 60.2787 14.2176 60.5026 14.4937 60.5026L34.4936 60.5029C34.7698 60.5029 34.9936 60.2791 34.9936 60.0029L34.9936 30.003C34.9936 29.7268 34.7698 29.503 34.4936 29.503ZM12.4937 60.0026C12.4937 61.1071 13.3891 62.0026 14.4937 62.0026L34.4936 62.0029C35.5982 62.0029 36.4936 61.1075 36.4936 60.0029L36.4936 30.003C36.4936 28.8984 35.5982 28.003 34.4936 28.003L14.4937 28.003C13.3891 28.003 12.4936 28.8984 12.4937 30.003L12.4937 60.0026Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.1289 40.6699C45.1289 40.2557 45.4647 39.9199 45.8789 39.9199L67.8786 39.9199C68.2928 39.9199 68.6286 40.2557 68.6286 40.6699C68.6286 41.0841 68.2928 41.4199 67.8786 41.4199L45.8789 41.4199C45.4647 41.4199 45.1289 41.0841 45.1289 40.6699Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.1289 32.0039C45.1289 31.5897 45.4647 31.2539 45.8789 31.2539L67.8786 31.2539C68.2928 31.2539 68.6286 31.5897 68.6286 32.0039C68.6286 32.4181 68.2928 32.7539 67.8786 32.7539L45.8789 32.7539C45.4647 32.7539 45.1289 32.4181 45.1289 32.0039Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.1289 49.3369C45.1289 48.9227 45.4647 48.5869 45.8789 48.5869L67.8789 48.5869C68.2931 48.5869 68.6289 48.9227 68.6289 49.3369C68.6289 49.7511 68.2931 50.0869 67.8789 50.0869L45.8789 50.0869C45.4647 50.0869 45.1289 49.7511 45.1289 49.3369Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.1289 58.0029C45.1289 57.5887 45.4647 57.2529 45.8789 57.2529L56.879 57.2529C57.2932 57.2529 57.629 57.5887 57.629 58.0029C57.629 58.4171 57.2932 58.7529 56.879 58.7529L45.8789 58.7529C45.4647 58.7529 45.1289 58.4171 45.1289 58.0029Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M79.4013 24.9019C79.3854 20.4972 75.8098 16.9314 71.4014 16.9314L9.40142 16.9314C4.98314 16.9314 1.40142 20.5131 1.40142 24.9314L1.40137 16.874C1.40137 12.4557 4.98309 8.87403 9.40137 8.87403L71.4013 8.87402C75.8196 8.87402 79.4013 12.4557 79.4013 16.874V24.9019Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.651422 16.874C0.651429 12.0415 4.56894 8.12403 9.40142 8.12403L71.4014 8.12402C76.2339 8.12402 80.1514 12.0415 80.1514 16.874V64.874C80.1514 69.7065 76.2338 73.6241 71.4013 73.624L9.40129 73.6235C4.56882 73.6234 0.651361 69.7059 0.651367 64.8735L0.651378 56.8491L0.651367 56.8435L0.651422 16.874ZM9.40142 9.62403L71.4014 9.62402C75.4054 9.62402 78.6514 12.87 78.6514 16.874V19.954C77.0782 17.6312 74.4181 16.1046 71.4014 16.1046L9.40142 16.1046C6.38472 16.1046 3.72458 17.6312 2.15142 19.954L2.15142 16.874C2.15143 12.87 5.39736 9.62403 9.40142 9.62403ZM2.15137 64.8735C2.15136 68.8775 5.39726 72.1234 9.4013 72.1235L71.4013 72.124C75.4054 72.1241 78.6514 68.8781 78.6514 64.874L78.6514 24.9046L78.6514 24.9026C78.6358 20.9118 75.3959 17.6814 71.4014 17.6814L9.40147 17.6814C5.39741 17.6814 2.15148 20.9273 2.15147 24.9314L2.15137 64.8735Z" fill="#64748B"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9184">
+<rect width="80" height="80" fill="white" transform="translate(0.401367 0.78125)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_blogs_light.svg b/briar-android/artwork/il_empty_state_blogs_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..882a66a33a68ab37206eb193ea3e5d5187283a3a
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_blogs_light.svg
@@ -0,0 +1,17 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9186)">
+<path d="M14.9605 62.0026C13.8559 62.0026 12.9605 61.1071 12.9605 60.0026L12.9604 30.003C12.9604 28.8984 13.8559 28.003 14.9604 28.003L34.9604 28.003C36.065 28.003 36.9604 28.8984 36.9604 30.003L36.9604 60.0029C36.9604 61.1075 36.065 62.0029 34.9604 62.0029L14.9605 62.0026Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.9604 29.503L14.9604 29.503C14.6843 29.503 14.4604 29.7268 14.4604 30.003L14.4605 60.0026C14.4605 60.2787 14.6844 60.5026 14.9605 60.5026L34.9604 60.5029C35.2366 60.5029 35.4604 60.2791 35.4604 60.0029L35.4604 30.003C35.4604 29.7268 35.2366 29.503 34.9604 29.503ZM12.9605 60.0026C12.9605 61.1071 13.8559 62.0026 14.9605 62.0026L34.9604 62.0029C36.065 62.0029 36.9604 61.1075 36.9604 60.0029L36.9604 30.003C36.9604 28.8984 36.065 28.003 34.9604 28.003L14.9604 28.003C13.8559 28.003 12.9604 28.8984 12.9604 30.003L12.9605 60.0026Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.5957 40.6699C45.5957 40.2557 45.9315 39.9199 46.3457 39.9199L68.3454 39.9199C68.7596 39.9199 69.0954 40.2557 69.0954 40.6699C69.0954 41.0841 68.7596 41.4199 68.3454 41.4199L46.3457 41.4199C45.9315 41.4199 45.5957 41.0841 45.5957 40.6699Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.5957 32.0039C45.5957 31.5897 45.9315 31.2539 46.3457 31.2539L68.3454 31.2539C68.7596 31.2539 69.0954 31.5897 69.0954 32.0039C69.0954 32.4181 68.7596 32.7539 68.3454 32.7539L46.3457 32.7539C45.9315 32.7539 45.5957 32.4181 45.5957 32.0039Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.5957 49.3369C45.5957 48.9227 45.9315 48.5869 46.3457 48.5869L68.3457 48.5869C68.7599 48.5869 69.0957 48.9227 69.0957 49.3369C69.0957 49.7511 68.7599 50.0869 68.3457 50.0869L46.3457 50.0869C45.9315 50.0869 45.5957 49.7511 45.5957 49.3369Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M45.5957 58.0029C45.5957 57.5887 45.9315 57.2529 46.3457 57.2529L57.3458 57.2529C57.76 57.2529 58.0958 57.5887 58.0958 58.0029C58.0958 58.4171 57.76 58.7529 57.3458 58.7529L46.3457 58.7529C45.9315 58.7529 45.5957 58.4171 45.5957 58.0029Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M79.8681 24.9019C79.8522 20.4972 76.2766 16.9314 71.8682 16.9314L9.86821 16.9314C5.44994 16.9314 1.86822 20.5131 1.86822 24.9314L1.86816 16.874C1.86817 12.4557 5.44989 8.87403 9.86816 8.87403L71.8681 8.87402C76.2864 8.87402 79.8681 12.4557 79.8681 16.874V24.9019Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.11822 16.874C1.11823 12.0415 5.03573 8.12403 9.86822 8.12403L71.8682 8.12402C76.7007 8.12402 80.6182 12.0415 80.6182 16.874V64.874C80.6182 69.7065 76.7006 73.6241 71.8681 73.624L9.86809 73.6235C5.03562 73.6234 1.11816 69.7059 1.11816 64.8735L1.11818 56.8491L1.11816 56.8435L1.11822 16.874ZM9.86822 9.62403L71.8682 9.62402C75.8722 9.62402 79.1182 12.87 79.1182 16.874V19.954C77.545 17.6312 74.8849 16.1046 71.8682 16.1046L9.86822 16.1046C6.85152 16.1046 4.19138 17.6312 2.61822 19.954L2.61822 16.874C2.61822 12.87 5.86416 9.62403 9.86822 9.62403ZM2.61816 64.8735C2.61816 68.8775 5.86406 72.1234 9.8681 72.1235L71.8681 72.124C75.8722 72.1241 79.1182 68.8781 79.1182 64.874L79.1182 24.9046L79.1182 24.9026C79.1026 20.9118 75.8627 17.6814 71.8682 17.6814L9.86827 17.6814C5.86421 17.6814 2.61828 20.9273 2.61827 24.9314L2.61816 64.8735Z" fill="#9CA3AF"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9186">
+<rect width="80" height="80" fill="white" transform="translate(0.868164 0.78125)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_contact_list_dark.svg b/briar-android/artwork/il_empty_state_contact_list_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a0c70d4e096dd8519e9f824c2c78f9cdb718f513
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_contact_list_dark.svg
@@ -0,0 +1,7 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.8771 3.19912L71.2942 5.82176C76.4078 6.69164 79.8553 11.4996 79.0387 16.6225L70.73 68.746C69.7481 74.9062 63.0013 78.3146 57.4761 75.4418L58.1751 74.1118C62.7908 76.5117 68.4271 73.6643 69.2474 68.5181L77.5561 16.3946C78.2438 12.0806 75.3406 8.03176 71.0344 7.29922L57.3985 4.9796L58.1751 74.1118L56.6739 74.1365L55.8771 3.19912Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6021 74.9992L10.6021 4H58.6021C63.0203 4 66.6021 7.58172 66.6021 12V67C66.6021 71.4183 63.0202 75.0001 58.6019 75L10.6021 74.9992ZM22.8896 49.1657V53.0394C22.8896 57.4577 26.4714 61.0394 30.8896 61.0394H46.8472C51.2655 61.0394 54.8472 57.4577 54.8472 53.0394V49.1657C54.8472 44.7474 51.2655 41.1657 46.8472 41.1657H30.8896C26.4714 41.1657 22.8896 44.7474 22.8896 49.1657ZM38.8685 34.8533C43.5566 34.8533 47.3572 31.0717 47.3572 26.4069C47.3572 21.7421 43.5566 17.9606 38.8685 17.9606C34.1803 17.9606 30.3797 21.7421 30.3797 26.4069C30.3797 31.0717 34.1803 34.8533 38.8685 34.8533Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.8896 49.1657V53.0394C22.8896 57.4577 26.4714 61.0394 30.8896 61.0394H46.8472C51.2655 61.0394 54.8472 57.4577 54.8472 53.0394V49.1657C54.8472 44.7474 51.2655 41.1657 46.8472 41.1657H30.8896C26.4714 41.1657 22.8896 44.7474 22.8896 49.1657ZM24.3896 53.0394V49.1657C24.3896 45.5758 27.2998 42.6657 30.8896 42.6657H46.8472C50.437 42.6657 53.3472 45.5758 53.3472 49.1657V53.0394C53.3472 56.6293 50.437 59.5394 46.8472 59.5394H30.8896C27.2998 59.5394 24.3896 56.6293 24.3896 53.0394Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.8685 34.8532C43.5566 34.8532 47.3572 31.0717 47.3572 26.4069C47.3572 21.7421 43.5566 17.9606 38.8685 17.9606C34.1803 17.9606 30.3797 21.7421 30.3797 26.4069C30.3797 31.0717 34.1803 34.8532 38.8685 34.8532ZM45.8572 26.4069C45.8572 30.2362 42.7353 33.3533 38.8685 33.3533C35.0016 33.3533 31.8797 30.2362 31.8797 26.4069C31.8797 22.5776 35.0016 19.4606 38.8685 19.4606C42.7353 19.4606 45.8572 22.5776 45.8572 26.4069Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M58.6021 2.5H9.10205L9.10205 17.7334H3.85059C3.43637 17.7334 3.10059 18.0692 3.10059 18.4834C3.10059 18.8976 3.43637 19.2334 3.85059 19.2334H9.10205L9.10205 38.8779H3.85059C3.43637 38.8779 3.10059 39.2137 3.10059 39.6279C3.10059 40.0421 3.43637 40.3779 3.85059 40.3779H9.10205L9.10205 60.752H3.85059C3.43637 60.752 3.10059 61.0877 3.10059 61.502C3.10059 61.9162 3.43637 62.252 3.85059 62.252H9.10205L9.10205 76.4992L58.6019 76.5C63.8487 76.5001 68.1021 72.2468 68.1021 67V12C68.1021 6.75329 63.8488 2.5 58.6021 2.5ZM10.6021 62.252L10.6021 74.9992L58.6019 75C63.0202 75.0001 66.6021 71.4183 66.6021 67V12C66.6021 7.58172 63.0203 4 58.6021 4H10.6021L10.6021 17.7334H15.6148C16.029 17.7334 16.3648 18.0692 16.3648 18.4834C16.3648 18.8976 16.029 19.2334 15.6148 19.2334H10.6021L10.6021 38.8779H15.6148C16.029 38.8779 16.3648 39.2137 16.3648 39.6279C16.3648 40.0421 16.029 40.3779 15.6148 40.3779H10.6021L10.6021 60.752H15.6148C16.029 60.752 16.3648 61.0877 16.3648 61.502C16.3648 61.9162 16.029 62.252 15.6148 62.252H10.6021Z" fill="#64748B"/>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_contact_list_light.svg b/briar-android/artwork/il_empty_state_contact_list_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cac7f4550036a7e94b4b9edb9377ad2eb214ce62
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_contact_list_light.svg
@@ -0,0 +1,7 @@
+<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.8771 3.19912L70.2942 5.82176C75.4078 6.69164 78.8553 11.4996 78.0387 16.6225L69.73 68.746C68.7481 74.9062 62.0013 78.3146 56.4761 75.4418L57.1751 74.1118C61.7908 76.5117 67.4271 73.6643 68.2474 68.5181L76.5561 16.3946C77.2438 12.0806 74.3406 8.03176 70.0344 7.29922L56.3985 4.9796L57.1751 74.1118L55.6739 74.1365L54.8771 3.19912Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.60205 74.9992L9.60205 4H57.6021C62.0203 4 65.6021 7.58172 65.6021 12V67C65.6021 71.4183 62.0202 75.0001 57.6019 75L9.60205 74.9992ZM21.8896 49.1657V53.0394C21.8896 57.4577 25.4714 61.0394 29.8896 61.0394H45.8472C50.2655 61.0394 53.8472 57.4577 53.8472 53.0394V49.1657C53.8472 44.7474 50.2655 41.1657 45.8472 41.1657H29.8896C25.4714 41.1657 21.8896 44.7474 21.8896 49.1657ZM37.8685 34.8533C42.5566 34.8533 46.3572 31.0717 46.3572 26.4069C46.3572 21.7421 42.5566 17.9606 37.8685 17.9606C33.1803 17.9606 29.3797 21.7421 29.3797 26.4069C29.3797 31.0717 33.1803 34.8533 37.8685 34.8533Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.8896 49.1657V53.0394C21.8896 57.4577 25.4714 61.0394 29.8896 61.0394H45.8472C50.2655 61.0394 53.8472 57.4577 53.8472 53.0394V49.1657C53.8472 44.7474 50.2655 41.1657 45.8472 41.1657H29.8896C25.4714 41.1657 21.8896 44.7474 21.8896 49.1657ZM23.3896 53.0394V49.1657C23.3896 45.5758 26.2998 42.6657 29.8896 42.6657H45.8472C49.437 42.6657 52.3472 45.5758 52.3472 49.1657V53.0394C52.3472 56.6293 49.437 59.5394 45.8472 59.5394H29.8896C26.2998 59.5394 23.3896 56.6293 23.3896 53.0394Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37.8685 34.8532C42.5566 34.8532 46.3572 31.0717 46.3572 26.4069C46.3572 21.7421 42.5566 17.9606 37.8685 17.9606C33.1803 17.9606 29.3797 21.7421 29.3797 26.4069C29.3797 31.0717 33.1803 34.8532 37.8685 34.8532ZM44.8572 26.4069C44.8572 30.2362 41.7353 33.3533 37.8685 33.3533C34.0016 33.3533 30.8797 30.2362 30.8797 26.4069C30.8797 22.5776 34.0016 19.4606 37.8685 19.4606C41.7353 19.4606 44.8572 22.5776 44.8572 26.4069Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M57.6021 2.5H8.10205L8.10205 17.7334H2.85059C2.43637 17.7334 2.10059 18.0692 2.10059 18.4834C2.10059 18.8976 2.43637 19.2334 2.85059 19.2334H8.10205L8.10205 38.8779H2.85059C2.43637 38.8779 2.10059 39.2137 2.10059 39.6279C2.10059 40.0421 2.43637 40.3779 2.85059 40.3779H8.10205L8.10205 60.752H2.85059C2.43637 60.752 2.10059 61.0877 2.10059 61.502C2.10059 61.9162 2.43637 62.252 2.85059 62.252H8.10205L8.10205 76.4992L57.6019 76.5C62.8487 76.5001 67.1021 72.2468 67.1021 67V12C67.1021 6.75329 62.8488 2.5 57.6021 2.5ZM9.60205 62.252L9.60205 74.9992L57.6019 75C62.0202 75.0001 65.6021 71.4183 65.6021 67V12C65.6021 7.58172 62.0203 4 57.6021 4H9.60205L9.60205 17.7334H14.6148C15.029 17.7334 15.3648 18.0692 15.3648 18.4834C15.3648 18.8976 15.029 19.2334 14.6148 19.2334H9.60205L9.60205 38.8779H14.6148C15.029 38.8779 15.3648 39.2137 15.3648 39.6279C15.3648 40.0421 15.029 40.3779 14.6148 40.3779H9.60205L9.60205 60.752H14.6148C15.029 60.752 15.3648 61.0877 15.3648 61.502C15.3648 61.9162 15.029 62.252 14.6148 62.252H9.60205Z" fill="#9CA3AF"/>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_forum_list_dark.svg b/briar-android/artwork/il_empty_state_forum_list_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0e821f497fda569586252c7d3e0a903e4643681c
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_forum_list_dark.svg
@@ -0,0 +1,11 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9249)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.3936 48.6422V58.2131C20.3936 62.6314 23.9753 66.2131 28.3936 66.2131H63.0813L79.4015 75.3286V30.9092C79.4015 26.4909 75.8198 22.9092 71.4015 22.9092H60.4067V40.6422C60.4067 45.0605 56.825 48.6422 52.4067 48.6422H20.3936Z" fill="#334155"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.40137 4.5791C4.56888 4.5791 0.651367 8.4966 0.651367 13.3291V59.0201L17.9148 49.3778H19.6436V58.2131C19.6436 63.0456 23.5611 66.9631 28.3936 66.9631H62.8861L80.1515 76.6065V30.9092C80.1515 26.0767 76.234 22.1592 71.4015 22.1592H61.1522V13.3291C61.1522 8.49661 57.2347 4.5791 52.4022 4.5791H9.40137ZM2.15137 13.3291C2.15137 9.32503 5.3973 6.0791 9.40137 6.0791H52.4022C56.4062 6.0791 59.6522 9.32504 59.6522 13.3291V40.6278C59.6522 44.6319 56.4062 47.8778 52.4022 47.8778H17.5243L2.15137 56.4642V13.3291ZM61.1567 40.6422V23.6592H71.4015C75.4055 23.6592 78.6515 26.9051 78.6515 30.9092V74.0506L63.2766 65.4631H28.3936C24.3895 65.4631 21.1436 62.2172 21.1436 58.2131V49.3922H52.4067C57.2392 49.3922 61.1567 45.4747 61.1567 40.6422Z" fill="#64748B"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9249">
+<rect width="80" height="80" fill="white" transform="translate(0.401367 0.0859375)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_forum_list_light.svg b/briar-android/artwork/il_empty_state_forum_list_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3747cdd1c3b140c08761a24df9a904bb1ec263bf
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_forum_list_light.svg
@@ -0,0 +1,11 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9251)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.3936 48.6422V58.2131C20.3936 62.6314 23.9753 66.2131 28.3936 66.2131H63.0813L79.4015 75.3286V30.9092C79.4015 26.4909 75.8198 22.9092 71.4015 22.9092H60.4067V40.6422C60.4067 45.0605 56.825 48.6422 52.4067 48.6422H20.3936Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.40137 4.5791C4.56888 4.5791 0.651367 8.4966 0.651367 13.3291V59.0201L17.9148 49.3778H19.6436V58.2131C19.6436 63.0456 23.5611 66.9631 28.3936 66.9631H62.8861L80.1515 76.6065V30.9092C80.1515 26.0767 76.234 22.1592 71.4015 22.1592H61.1522V13.3291C61.1522 8.49661 57.2347 4.5791 52.4022 4.5791H9.40137ZM2.15137 13.3291C2.15137 9.32503 5.3973 6.0791 9.40137 6.0791H52.4022C56.4062 6.0791 59.6522 9.32504 59.6522 13.3291V40.6278C59.6522 44.6319 56.4062 47.8778 52.4022 47.8778H17.5243L2.15137 56.4642V13.3291ZM61.1567 40.6422V23.6592H71.4015C75.4055 23.6592 78.6515 26.9051 78.6515 30.9092V74.0506L63.2766 65.4631H28.3936C24.3895 65.4631 21.1436 62.2172 21.1436 58.2131V49.3922H52.4067C57.2392 49.3922 61.1567 45.4747 61.1567 40.6422Z" fill="#9CA3AF"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9251">
+<rect width="80" height="80" fill="white" transform="translate(0.868164 0.0859375)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_group_list_dark.svg b/briar-android/artwork/il_empty_state_group_list_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3d0f91c7bc31e9b450438fc1e19c08c3f36d475a
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_group_list_dark.svg
@@ -0,0 +1,13 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9298)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M48.6662 16.6539C48.6662 21.2186 44.9657 24.9191 40.401 24.9191C35.8362 24.9191 32.1357 21.2186 32.1357 16.6539C32.1357 12.0891 35.8362 8.38867 40.401 8.38867C44.9657 8.38867 48.6662 12.0891 48.6662 16.6539ZM47.1662 16.6539C47.1662 20.3902 44.1373 23.4191 40.401 23.4191C36.6646 23.4191 33.6357 20.3902 33.6357 16.6539C33.6357 12.9176 36.6646 9.88867 40.401 9.88867C44.1373 9.88867 47.1662 12.9176 47.1662 16.6539Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.2785 25.9195C25.2785 30.4843 21.578 34.1847 17.0133 34.1847C12.4485 34.1847 8.74805 30.4843 8.74805 25.9195C8.74805 21.3548 12.4485 17.6543 17.0133 17.6543C21.578 17.6543 25.2785 21.3548 25.2785 25.9195ZM23.7785 25.9195C23.7785 29.6558 20.7496 32.6847 17.0133 32.6847C13.2769 32.6847 10.248 29.6558 10.248 25.9195C10.248 22.1832 13.2769 19.1543 17.0133 19.1543C20.7496 19.1543 23.7785 22.1832 23.7785 25.9195Z" fill="#64748B"/>
+<path d="M2.15137 49.1689C2.15137 45.1649 5.3973 41.9189 9.40137 41.9189H24.0391V61.1648C24.0391 61.579 24.3748 61.9148 24.7891 61.9148C25.2033 61.9148 25.5391 61.579 25.5391 61.1648V41.976C29.1119 42.4252 31.8755 45.4743 31.8755 49.1689V72.3931C31.8755 72.8073 32.2113 73.1431 32.6255 73.1431C33.0397 73.1431 33.3755 72.8073 33.3755 72.3931V49.1689C33.3755 44.645 29.9422 40.9229 25.5391 40.4661V39.7774C25.5391 35.7733 28.785 32.5273 32.7891 32.5273H48.0132C52.0173 32.5273 55.2632 35.7733 55.2632 39.7773V40.4661C50.8603 40.9231 47.4272 44.6451 47.4272 49.169V70.5564C47.4272 70.9706 47.763 71.3064 48.1772 71.3064C48.5915 71.3064 48.9272 70.9706 48.9272 70.5564V49.169C48.9272 45.4745 51.6906 42.4254 55.2632 41.976V61.1648C55.2632 61.579 55.599 61.9148 56.0132 61.9148C56.4274 61.9148 56.7632 61.579 56.7632 61.1648V41.9189H71.4014C75.4054 41.9189 78.6514 45.1649 78.6514 49.1689V70.5564C78.6514 70.9706 78.9872 71.3064 79.4014 71.3064C79.8156 71.3064 80.1514 70.9706 80.1514 70.5564V49.1689C80.1514 44.3365 76.2339 40.4189 71.4014 40.4189H56.7632V39.7773C56.7632 34.9449 52.8457 31.0273 48.0132 31.0273H32.7891C27.9566 31.0273 24.0391 34.9449 24.0391 39.7774V40.4189H9.40137C4.56888 40.4189 0.651367 44.3365 0.651367 49.1689V72.3931C0.651367 72.8073 0.987154 73.1431 1.40137 73.1431C1.81558 73.1431 2.15137 72.8073 2.15137 72.3931V49.1689Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.0543 25.9195C72.0543 30.4843 68.3539 34.1847 63.7891 34.1847C59.2244 34.1847 55.5239 30.4843 55.5239 25.9195C55.5239 21.3548 59.2244 17.6543 63.7891 17.6543C68.3539 17.6543 72.0543 21.3548 72.0543 25.9195ZM70.5543 25.9195C70.5543 29.6558 67.5255 32.6847 63.7891 32.6847C60.0528 32.6847 57.0239 29.6558 57.0239 25.9195C57.0239 22.1832 60.0528 19.1543 63.7891 19.1543C67.5255 19.1543 70.5543 22.1832 70.5543 25.9195Z" fill="#64748B"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9298">
+<rect width="80" height="80" fill="white" transform="translate(0.401367 0.390625)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_empty_state_group_list_light.svg b/briar-android/artwork/il_empty_state_group_list_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ac8c311e8b70ea82d87b168d764731ddb3d9f279
--- /dev/null
+++ b/briar-android/artwork/il_empty_state_group_list_light.svg
@@ -0,0 +1,13 @@
+<svg width="81" height="81" viewBox="0 0 81 81" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_142_9300)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M49.1334 16.6539C49.1334 21.2186 45.4329 24.919 40.8682 24.919C36.3035 24.919 32.603 21.2186 32.603 16.6539C32.603 12.0891 36.3035 8.38867 40.8682 8.38867C45.4329 8.38867 49.1334 12.0891 49.1334 16.6539ZM47.6334 16.6539C47.6334 20.3902 44.6045 23.419 40.8682 23.419C37.1319 23.419 34.103 20.3902 34.103 16.6539C34.103 12.9175 37.1319 9.88867 40.8682 9.88867C44.6045 9.88867 47.6334 12.9175 47.6334 16.6539Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7452 25.9195C25.7452 30.4842 22.0448 34.1847 17.48 34.1847C12.9153 34.1847 9.21484 30.4842 9.21484 25.9195C9.21484 21.3547 12.9153 17.6543 17.48 17.6543C22.0448 17.6543 25.7452 21.3547 25.7452 25.9195ZM24.2452 25.9195C24.2452 29.6558 21.2163 32.6847 17.48 32.6847C13.7437 32.6847 10.7148 29.6558 10.7148 25.9195C10.7148 22.1832 13.7437 19.1543 17.48 19.1543C21.2163 19.1543 24.2452 22.1832 24.2452 25.9195Z" fill="#9CA3AF"/>
+<path d="M2.61816 49.168C2.61816 45.1639 5.8641 41.918 9.86816 41.918H24.5063V61.1647C24.5063 61.5789 24.8421 61.9147 25.2563 61.9147C25.6706 61.9147 26.0063 61.5789 26.0063 61.1647V41.975C29.5789 42.4245 32.3422 45.4735 32.3422 49.168V72.392C32.3422 72.8062 32.678 73.142 33.0922 73.142C33.5064 73.142 33.8422 72.8062 33.8422 72.392V49.168C33.8422 44.6442 30.4092 40.9222 26.0063 40.4651V39.7773C26.0063 35.7733 29.2523 32.5273 33.2563 32.5273H48.4804C52.4845 32.5273 55.7304 35.7733 55.7304 39.7773V40.4651C51.3273 40.9219 47.894 44.644 47.894 49.168V70.5553C47.894 70.9695 48.2298 71.3053 48.644 71.3053C49.0583 71.3053 49.394 70.9695 49.394 70.5553V49.168C49.394 45.4734 52.1576 42.4242 55.7304 41.975V61.1647C55.7304 61.5789 56.0662 61.9147 56.4804 61.9147C56.8946 61.9147 57.2304 61.5789 57.2304 61.1647V41.918H71.8681C75.8721 41.918 79.1181 45.1639 79.1181 49.168V70.5553C79.1181 70.9695 79.4539 71.3053 79.8681 71.3053C80.2823 71.3053 80.6181 70.9695 80.6181 70.5553V49.168C80.6181 44.3355 76.7006 40.418 71.8681 40.418H57.2304V39.7773C57.2304 34.9449 53.3129 31.0273 48.4804 31.0273H33.2563C28.4239 31.0273 24.5063 34.9449 24.5063 39.7773V40.418H9.86816C5.03567 40.418 1.11816 44.3355 1.11816 49.168V72.392C1.11816 72.8062 1.45395 73.142 1.86816 73.142C2.28238 73.142 2.61816 72.8062 2.61816 72.392V49.168Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.5216 25.9195C72.5216 30.4842 68.8211 34.1847 64.2564 34.1847C59.6917 34.1847 55.9912 30.4842 55.9912 25.9195C55.9912 21.3547 59.6917 17.6543 64.2564 17.6543C68.8211 17.6543 72.5216 21.3547 72.5216 25.9195ZM71.0216 25.9195C71.0216 29.6558 67.9927 32.6847 64.2564 32.6847C60.5201 32.6847 57.4912 29.6558 57.4912 25.9195C57.4912 22.1832 60.5201 19.1543 64.2564 19.1543C67.9927 19.1543 71.0216 22.1832 71.0216 25.9195Z" fill="#9CA3AF"/>
+</g>
+<defs>
+<clipPath id="clip0_142_9300">
+<rect width="80" height="80" fill="white" transform="translate(0.868164 0.390625)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/briar-android/artwork/il_mailbox_dark.svg b/briar-android/artwork/il_mailbox_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..eda21fc5ac2c83ba0914259a2b9118df0beac713
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_dark.svg
@@ -0,0 +1,37 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M112.401 21C112.401 16.5817 108.82 13 104.401 13H88.4014C83.9831 13 80.4014 16.5817 80.4014 21V37C80.4014 41.4183 83.9831 45 88.4014 45H104.401C108.82 45 112.401 41.4183 112.401 37V21Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.4014 14.5H104.401C107.991 14.5 110.901 17.4101 110.901 21V37C110.901 40.5899 107.991 43.5 104.401 43.5H88.4014C84.8115 43.5 81.9014 40.5899 81.9014 37V21C81.9014 17.4101 84.8115 14.5 88.4014 14.5ZM104.401 13C108.82 13 112.401 16.5817 112.401 21V37C112.401 41.4183 108.82 45 104.401 45H88.4014C83.9831 45 80.4014 41.4183 80.4014 37V21C80.4014 16.5817 83.9831 13 88.4014 13H104.401Z" fill="#52ADF9"/>
+<path d="M60.4014 127C60.4014 122.582 56.8196 119 52.4014 119H36.4014C31.9831 119 28.4014 122.582 28.4014 127V143C28.4014 147.418 31.9831 151 36.4014 151H52.4014C56.8196 151 60.4014 147.418 60.4014 143V127Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.4014 120.5H52.4014C55.9912 120.5 58.9014 123.41 58.9014 127V143C58.9014 146.59 55.9912 149.5 52.4014 149.5H36.4014C32.8115 149.5 29.9014 146.59 29.9014 143V127C29.9014 123.41 32.8115 120.5 36.4014 120.5ZM52.4014 119C56.8196 119 60.4014 122.582 60.4014 127V143C60.4014 147.418 56.8196 151 52.4014 151H36.4014C31.9831 151 28.4014 147.418 28.4014 143V127C28.4014 122.582 31.9831 119 36.4014 119H52.4014Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6514 116L43.6514 100L45.1514 100L45.1514 116L43.6514 116Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95.6514 66L95.6514 48L97.1514 48L97.1514 66L95.6514 66Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95.6514 155L95.6514 126L97.1514 126L97.1514 155L95.6514 155Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M150.151 67V92H148.651V67H150.151Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.171 96.4512H126.401V94.9512H149.171C153.579 94.9512 157.151 98.524 157.151 102.931L157.151 121.701L155.651 121.701L155.651 102.931C155.651 99.3524 152.75 96.4512 149.171 96.4512Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6314 95.25L66.4014 95.25L66.4014 96.75L43.6314 96.75C39.2241 96.75 35.6514 93.1772 35.6515 88.77L35.6518 70L37.1518 70L37.1515 88.77C37.1514 92.3488 40.0526 95.25 43.6314 95.25Z" fill="#A3E635"/>
+<path d="M157.401 52C157.401 49.7909 155.611 48 153.401 48H145.401C143.192 48 141.401 49.7909 141.401 52V60C141.401 62.2091 143.192 64 145.401 64H153.401C155.611 64 157.401 62.2091 157.401 60V52Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M145.401 49.5H153.401C154.782 49.5 155.901 50.6193 155.901 52V60C155.901 61.3807 154.782 62.5 153.401 62.5H145.401C144.021 62.5 142.901 61.3807 142.901 60V52C142.901 50.6193 144.021 49.5 145.401 49.5ZM153.401 48C155.611 48 157.401 49.7909 157.401 52V60C157.401 62.2091 155.611 64 153.401 64H145.401C143.192 64 141.401 62.2091 141.401 60V52C141.401 49.7909 143.192 48 145.401 48H153.401Z" fill="#64748B"/>
+<path d="M104.401 162C104.401 159.791 102.611 158 100.401 158H92.4014C90.1922 158 88.4014 159.791 88.4014 162V170C88.4014 172.209 90.1922 174 92.4014 174H100.401C102.611 174 104.401 172.209 104.401 170V162Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M92.4014 159.5H100.401C101.782 159.5 102.901 160.619 102.901 162V170C102.901 171.381 101.782 172.5 100.401 172.5H92.4014C91.0207 172.5 89.9014 171.381 89.9014 170V162C89.9014 160.619 91.0207 159.5 92.4014 159.5ZM100.401 158C102.611 158 104.401 159.791 104.401 162V170C104.401 172.209 102.611 174 100.401 174H92.4014C90.1922 174 88.4014 172.209 88.4014 170V162C88.4014 159.791 90.1922 158 92.4014 158H100.401Z" fill="#64748B"/>
+<path d="M123.242 81C123.242 74.3726 117.87 69 111.242 69H81.2422C74.6148 69 69.2422 74.3726 69.2422 81V111C69.2422 117.627 74.6148 123 81.2422 123H111.242C117.87 123 123.242 117.627 123.242 111V81Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.2422 70.5H111.242C117.041 70.5 121.742 75.201 121.742 81V111C121.742 116.799 117.041 121.5 111.242 121.5H81.2422C75.4432 121.5 70.7422 116.799 70.7422 111V81C70.7422 75.201 75.4432 70.5 81.2422 70.5ZM111.242 69C117.87 69 123.242 74.3726 123.242 81V111C123.242 117.627 117.87 123 111.242 123H81.2422C74.6148 123 69.2422 117.627 69.2422 111V81C69.2422 74.3726 74.6148 69 81.2422 69H111.242Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M86.1254 83.5728H105.57C106.307 83.5728 107.013 83.8671 107.534 84.3911C108.055 84.9151 108.348 85.6257 108.348 86.3667L108.348 110.313C108.348 111.38 107.11 111.962 106.296 111.278L101.256 107.573H86.1254C85.3887 107.573 84.6822 107.278 84.1613 106.754C83.6403 106.23 83.3477 105.52 83.3477 104.779V86.3667C83.3477 85.6257 83.6403 84.9151 84.1613 84.3911C84.6822 83.8671 85.3887 83.5728 86.1254 83.5728ZM93.5152 95.9531H87.7921V88.0431H103.903V95.9531H98.2747V98.6887H100.333C100.705 98.6887 100.891 99.1402 100.628 99.4042L96.1896 103.869C96.0269 104.032 95.7631 104.032 95.6004 103.869L91.1619 99.4042C90.8994 99.1402 91.0853 98.6887 91.4566 98.6887H93.5152V95.9531Z" fill="#A3E635"/>
+<path d="M172.401 132C172.401 127.582 168.82 124 164.401 124H148.401C143.983 124 140.401 127.582 140.401 132V148C140.401 152.418 143.983 156 148.401 156H164.401C168.82 156 172.401 152.418 172.401 148V132Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148.401 125.5H164.401C167.991 125.5 170.901 128.41 170.901 132V148C170.901 151.59 167.991 154.5 164.401 154.5H148.401C144.812 154.5 141.901 151.59 141.901 148V132C141.901 128.41 144.812 125.5 148.401 125.5ZM164.401 124C168.82 124 172.401 127.582 172.401 132V148C172.401 152.418 168.82 156 164.401 156H148.401C143.983 156 140.401 152.418 140.401 148V132C140.401 127.582 143.983 124 148.401 124H164.401Z" fill="#A3E635"/>
+<path d="M152 138.541V145.66C152 146.238 152.471 146.714 153.054 146.714H153.549C154.127 146.714 154.603 146.238 154.603 145.66V138.541H152Z" fill="#82C91E"/>
+<path d="M154.597 135.109V133.769C154.597 133.191 154.127 132.714 153.549 132.714H153.054C152.477 132.714 152 133.191 152 133.769V135.109H154.597Z" fill="#82C91E"/>
+<path d="M160.376 140.888V133.769C160.376 133.191 159.906 132.714 159.328 132.714H158.833C158.255 132.714 157.779 133.191 157.779 133.769V140.888H160.376Z" fill="#82C91E"/>
+<path d="M157.779 144.319V145.66C157.779 146.238 158.255 146.714 158.833 146.714H159.328C159.906 146.714 160.382 146.238 160.382 145.66V144.319H157.779Z" fill="#82C91E"/>
+<path d="M151.583 141.305H150.243C149.665 141.305 149.188 141.775 149.188 142.359V142.854C149.188 143.431 149.659 143.908 150.243 143.908H151.583V141.305Z" fill="#A3E635"/>
+<path d="M162.134 141.305H155.015V143.908H162.134C162.712 143.908 163.188 143.431 163.188 142.854V142.359C163.188 141.775 162.712 141.305 162.134 141.305Z" fill="#A3E635"/>
+<path d="M157.362 135.526H150.243C149.665 135.526 149.188 135.997 149.188 136.58V137.075C149.188 137.653 149.659 138.129 150.243 138.129H157.362V135.526Z" fill="#A3E635"/>
+<path d="M162.134 135.526H160.794V138.129H162.134C162.712 138.129 163.188 137.659 163.188 137.075V136.58C163.188 135.997 162.712 135.526 162.134 135.526Z" fill="#A3E635"/>
+<path d="M28.0254 50.6526V64.891C28.0254 66.0468 28.9667 67 30.1343 67H31.1233C32.279 67 33.2322 66.0468 33.2322 64.891V50.6526H28.0254Z" fill="#82C91E"/>
+<path d="M33.2203 43.7899V41.109C33.2203 39.9532 32.279 39 31.1233 39H30.1343C28.9786 39 28.0254 39.9532 28.0254 41.109V43.7899H33.2203Z" fill="#82C91E"/>
+<path d="M44.7777 55.3474V41.109C44.7777 39.9532 43.8364 39 42.6807 39H41.6917C40.536 39 39.5828 39.9532 39.5828 41.109V55.3474H44.7777Z" fill="#82C91E"/>
+<path d="M39.5828 62.2099V64.8908C39.5828 66.0466 40.536 66.9998 41.6917 66.9998H42.6807C43.8364 66.9998 44.7896 66.0466 44.7896 64.8908V62.2099H39.5828Z" fill="#82C91E"/>
+<path d="M27.1912 56.1805H24.5103C23.3546 56.1805 22.4014 57.1218 22.4014 58.2894V59.2784C22.4014 60.4341 23.3426 61.3873 24.5103 61.3873H27.1912V56.1805Z" fill="#A3E635"/>
+<path d="M48.2924 56.1805H34.054V61.3873H48.2924C49.4481 61.3873 50.4013 60.4341 50.4013 59.2784V58.2894C50.4013 57.1218 49.4481 56.1805 48.2924 56.1805Z" fill="#A3E635"/>
+<path d="M38.7486 44.6231H24.5103C23.3546 44.6231 22.4014 45.5644 22.4014 46.7321V47.721C22.4014 48.8768 23.3426 49.83 24.5103 49.83H38.7486V44.6231Z" fill="#A3E635"/>
+<path d="M48.2924 44.623H45.6116V49.8299H48.2924C49.4482 49.8299 50.4014 48.8886 50.4014 47.721V46.732C50.4014 45.5643 49.4482 44.623 48.2924 44.623Z" fill="#A3E635"/>
+</svg>
diff --git a/briar-android/artwork/il_mailbox_light.svg b/briar-android/artwork/il_mailbox_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0f9c331bf802c3978eed5f134e2aca641ec7264f
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_light.svg
@@ -0,0 +1,37 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M112.401 21C112.401 16.5817 108.82 13 104.401 13H88.4014C83.9831 13 80.4014 16.5817 80.4014 21V37C80.4014 41.4183 83.9831 45 88.4014 45H104.401C108.82 45 112.401 41.4183 112.401 37V21Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.4014 14.5H104.401C107.991 14.5 110.901 17.4101 110.901 21V37C110.901 40.5899 107.991 43.5 104.401 43.5H88.4014C84.8115 43.5 81.9014 40.5899 81.9014 37V21C81.9014 17.4101 84.8115 14.5 88.4014 14.5ZM104.401 13C108.82 13 112.401 16.5817 112.401 21V37C112.401 41.4183 108.82 45 104.401 45H88.4014C83.9831 45 80.4014 41.4183 80.4014 37V21C80.4014 16.5817 83.9831 13 88.4014 13H104.401Z" fill="#196FDE"/>
+<path d="M60.4014 127C60.4014 122.582 56.8196 119 52.4014 119H36.4014C31.9831 119 28.4014 122.582 28.4014 127V143C28.4014 147.418 31.9831 151 36.4014 151H52.4014C56.8196 151 60.4014 147.418 60.4014 143V127Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.4014 120.5H52.4014C55.9912 120.5 58.9014 123.41 58.9014 127V143C58.9014 146.59 55.9912 149.5 52.4014 149.5H36.4014C32.8115 149.5 29.9014 146.59 29.9014 143V127C29.9014 123.41 32.8115 120.5 36.4014 120.5ZM52.4014 119C56.8196 119 60.4014 122.582 60.4014 127V143C60.4014 147.418 56.8196 151 52.4014 151H36.4014C31.9831 151 28.4014 147.418 28.4014 143V127C28.4014 122.582 31.9831 119 36.4014 119H52.4014Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6514 116L43.6514 100L45.1514 100L45.1514 116L43.6514 116Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95.6514 66L95.6514 48L97.1514 48L97.1514 66L95.6514 66Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95.6514 155L95.6514 126L97.1514 126L97.1514 155L95.6514 155Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M150.151 67V92H148.651V67H150.151Z" fill="#9CA3AF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.171 96.4512H126.401V94.9512H149.171C153.579 94.9512 157.151 98.524 157.151 102.931L157.151 121.701L155.651 121.701L155.651 102.931C155.651 99.3524 152.75 96.4512 149.171 96.4512Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6314 95.25L66.4014 95.25L66.4014 96.75L43.6314 96.75C39.2241 96.75 35.6514 93.1772 35.6515 88.77L35.6518 70L37.1518 70L37.1515 88.77C37.1514 92.3488 40.0526 95.25 43.6314 95.25Z" fill="#65A30D"/>
+<path d="M157.401 52C157.401 49.7909 155.611 48 153.401 48H145.401C143.192 48 141.401 49.7909 141.401 52V60C141.401 62.2091 143.192 64 145.401 64H153.401C155.611 64 157.401 62.2091 157.401 60V52Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M145.401 49.5H153.401C154.782 49.5 155.901 50.6193 155.901 52V60C155.901 61.3807 154.782 62.5 153.401 62.5H145.401C144.021 62.5 142.901 61.3807 142.901 60V52C142.901 50.6193 144.021 49.5 145.401 49.5ZM153.401 48C155.611 48 157.401 49.7909 157.401 52V60C157.401 62.2091 155.611 64 153.401 64H145.401C143.192 64 141.401 62.2091 141.401 60V52C141.401 49.7909 143.192 48 145.401 48H153.401Z" fill="#9CA3AF"/>
+<path d="M104.401 162C104.401 159.791 102.611 158 100.401 158H92.4014C90.1922 158 88.4014 159.791 88.4014 162V170C88.4014 172.209 90.1922 174 92.4014 174H100.401C102.611 174 104.401 172.209 104.401 170V162Z" fill="#E5E7EB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M92.4014 159.5H100.401C101.782 159.5 102.901 160.619 102.901 162V170C102.901 171.381 101.782 172.5 100.401 172.5H92.4014C91.0207 172.5 89.9014 171.381 89.9014 170V162C89.9014 160.619 91.0207 159.5 92.4014 159.5ZM100.401 158C102.611 158 104.401 159.791 104.401 162V170C104.401 172.209 102.611 174 100.401 174H92.4014C90.1922 174 88.4014 172.209 88.4014 170V162C88.4014 159.791 90.1922 158 92.4014 158H100.401Z" fill="#9CA3AF"/>
+<path d="M123.242 81C123.242 74.3726 117.87 69 111.242 69H81.2422C74.6148 69 69.2422 74.3726 69.2422 81V111C69.2422 117.627 74.6148 123 81.2422 123H111.242C117.87 123 123.242 117.627 123.242 111V81Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.2422 70.5H111.242C117.041 70.5 121.742 75.201 121.742 81V111C121.742 116.799 117.041 121.5 111.242 121.5H81.2422C75.4432 121.5 70.7422 116.799 70.7422 111V81C70.7422 75.201 75.4432 70.5 81.2422 70.5ZM111.242 69C117.87 69 123.242 74.3726 123.242 81V111C123.242 117.627 117.87 123 111.242 123H81.2422C74.6148 123 69.2422 117.627 69.2422 111V81C69.2422 74.3726 74.6148 69 81.2422 69H111.242Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M86.9663 83.5728H106.411C107.147 83.5728 107.854 83.8671 108.375 84.3911C108.896 84.9151 109.188 85.6257 109.188 86.3667L109.188 110.313C109.188 111.38 107.951 111.962 107.137 111.278L102.097 107.573H86.9663C86.2295 107.573 85.523 107.278 85.0021 106.754C84.4811 106.23 84.1885 105.52 84.1885 104.779V86.3667C84.1885 85.6257 84.4811 84.9151 85.0021 84.3911C85.523 83.8671 86.2295 83.5728 86.9663 83.5728ZM94.356 95.9531H88.6329V88.0431H104.744V95.9531H99.1156V98.6887H101.174C101.545 98.6887 101.731 99.1402 101.469 99.4042L97.0304 103.869C96.8677 104.032 96.6039 104.032 96.4412 103.869L92.0027 99.4042C91.7403 99.1402 91.9262 98.6887 92.2974 98.6887H94.356V95.9531Z" fill="#82C91E"/>
+<path d="M172.401 132C172.401 127.582 168.82 124 164.401 124H148.401C143.983 124 140.401 127.582 140.401 132V148C140.401 152.418 143.983 156 148.401 156H164.401C168.82 156 172.401 152.418 172.401 148V132Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148.401 125.5H164.401C167.991 125.5 170.901 128.41 170.901 132V148C170.901 151.59 167.991 154.5 164.401 154.5H148.401C144.812 154.5 141.901 151.59 141.901 148V132C141.901 128.41 144.812 125.5 148.401 125.5ZM164.401 124C168.82 124 172.401 127.582 172.401 132V148C172.401 152.418 168.82 156 164.401 156H148.401C143.983 156 140.401 152.418 140.401 148V132C140.401 127.582 143.983 124 148.401 124H164.401Z" fill="#65A30D"/>
+<path d="M152 138.541V145.66C152 146.238 152.471 146.714 153.055 146.714H153.549C154.127 146.714 154.604 146.238 154.604 145.66V138.541H152Z" fill="#82C91E"/>
+<path d="M154.598 135.109V133.769C154.598 133.191 154.127 132.714 153.549 132.714H153.055C152.477 132.714 152 133.191 152 133.769V135.109H154.598Z" fill="#82C91E"/>
+<path d="M160.377 140.888V133.769C160.377 133.191 159.906 132.714 159.328 132.714H158.834C158.256 132.714 157.779 133.191 157.779 133.769V140.888H160.377Z" fill="#82C91E"/>
+<path d="M157.779 144.319V145.66C157.779 146.238 158.256 146.714 158.834 146.714H159.328C159.906 146.714 160.383 146.238 160.383 145.66V144.319H157.779Z" fill="#82C91E"/>
+<path d="M151.583 141.305H150.243C149.665 141.305 149.188 141.775 149.188 142.359V142.854C149.188 143.431 149.659 143.908 150.243 143.908H151.583V141.305Z" fill="#A3E635"/>
+<path d="M162.134 141.305H155.015V143.908H162.134C162.712 143.908 163.188 143.431 163.188 142.854V142.359C163.188 141.775 162.712 141.305 162.134 141.305Z" fill="#A3E635"/>
+<path d="M157.362 135.526H150.243C149.665 135.526 149.188 135.997 149.188 136.58V137.075C149.188 137.653 149.659 138.129 150.243 138.129H157.362V135.526Z" fill="#A3E635"/>
+<path d="M162.134 135.526H160.794V138.129H162.134C162.712 138.129 163.188 137.659 163.188 137.075V136.58C163.188 135.997 162.712 135.526 162.134 135.526Z" fill="#A3E635"/>
+<path d="M28.0254 50.6526V64.891C28.0254 66.0468 28.9667 67 30.1343 67H31.1233C32.279 67 33.2322 66.0468 33.2322 64.891V50.6526H28.0254Z" fill="#82C91E"/>
+<path d="M33.2203 43.7899V41.109C33.2203 39.9532 32.279 39 31.1233 39H30.1343C28.9786 39 28.0254 39.9532 28.0254 41.109V43.7899H33.2203Z" fill="#82C91E"/>
+<path d="M44.7777 55.3474V41.109C44.7777 39.9532 43.8364 39 42.6807 39H41.6917C40.536 39 39.5828 39.9532 39.5828 41.109V55.3474H44.7777Z" fill="#82C91E"/>
+<path d="M39.5828 62.2099V64.8908C39.5828 66.0466 40.536 66.9998 41.6917 66.9998H42.6807C43.8364 66.9998 44.7896 66.0466 44.7896 64.8908V62.2099H39.5828Z" fill="#82C91E"/>
+<path d="M27.1912 56.1805H24.5103C23.3546 56.1805 22.4014 57.1218 22.4014 58.2894V59.2784C22.4014 60.4341 23.3426 61.3873 24.5103 61.3873H27.1912V56.1805Z" fill="#A3E635"/>
+<path d="M48.2924 56.1805H34.054V61.3873H48.2924C49.4481 61.3873 50.4013 60.4341 50.4013 59.2784V58.2894C50.4013 57.1218 49.4481 56.1805 48.2924 56.1805Z" fill="#A3E635"/>
+<path d="M38.7486 44.6231H24.5103C23.3546 44.6231 22.4014 45.5644 22.4014 46.7321V47.721C22.4014 48.8768 23.3426 49.83 24.5103 49.83H38.7486V44.6231Z" fill="#A3E635"/>
+<path d="M48.2924 44.623H45.6116V49.8299H48.2924C49.4482 49.8299 50.4014 48.8886 50.4014 47.721V46.732C50.4014 45.5643 49.4482 44.623 48.2924 44.623Z" fill="#A3E635"/>
+</svg>
diff --git a/briar-android/artwork/il_mailbox_setup_dark.svg b/briar-android/artwork/il_mailbox_setup_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4f352393584f64738ecc380332264e771442b98b
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_setup_dark.svg
@@ -0,0 +1,31 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M189.401 29C189.401 22.3726 184.029 17 177.401 17H86.4014C79.7739 17 74.4014 22.3726 74.4014 29V163C74.4014 169.627 79.7739 175 86.4014 175H177.401C184.029 175 189.401 169.627 189.401 163V29Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M86.4014 18.5H177.401C183.2 18.5 187.901 23.201 187.901 29V163C187.901 168.799 183.2 173.5 177.401 173.5H86.4014C80.6024 173.5 75.9014 168.799 75.9014 163V29C75.9014 23.201 80.6024 18.5 86.4014 18.5ZM177.401 17C184.029 17 189.401 22.3726 189.401 29V163C189.401 169.627 184.029 175 177.401 175H86.4014C79.7739 175 74.4014 169.627 74.4014 163V29C74.4014 22.3726 79.7739 17 86.4014 17H177.401Z" fill="#52ADF9"/>
+<path d="M183.401 35C183.401 30.5817 179.82 27 175.401 27H88.4014C83.9831 27 80.4014 30.5817 80.4014 35V157C80.4014 161.418 83.9831 165 88.4014 165H175.401C179.82 165 183.401 161.418 183.401 157V35Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.4014 28.5H175.401C178.991 28.5 181.901 31.4101 181.901 35V157C181.901 160.59 178.991 163.5 175.401 163.5H88.4014C84.8115 163.5 81.9014 160.59 81.9014 157V35C81.9014 31.4102 84.8115 28.5 88.4014 28.5ZM175.401 27C179.82 27 183.401 30.5817 183.401 35V157C183.401 161.418 179.82 165 175.401 165H88.4014C83.9831 165 80.4014 161.418 80.4014 157V35C80.4014 30.5817 83.9831 27 88.4014 27H175.401Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M131.901 38.2559C131.073 38.2559 130.401 37.5843 130.401 36.7559C130.401 35.9274 131.073 35.2559 131.901 35.2559C132.73 35.2559 133.401 35.9274 133.401 36.7559C133.401 37.5843 132.73 38.2559 131.901 38.2559ZM131.901 39.7559C130.245 39.7559 128.901 38.4127 128.901 36.7559C128.901 35.099 130.245 33.7559 131.901 33.7559C133.558 33.7559 134.901 35.099 134.901 36.7559C134.901 38.4127 133.558 39.7559 131.901 39.7559Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M115.846 74H146.957C148.136 74 149.266 74.4731 150.1 75.3152C150.933 76.1573 151.401 77.2994 151.401 78.4903L151.401 116.975C151.401 118.69 149.421 119.625 148.119 118.526L140.055 112.571H115.846C114.667 112.571 113.537 112.098 112.703 111.256C111.87 110.414 111.401 109.272 111.401 108.081V78.4903C111.401 77.2994 111.87 76.1573 112.703 75.3152C113.537 74.4731 114.667 74 115.846 74ZM127.669 93.897H118.512V81.1845H144.29V93.897H135.285V98.2936H138.579C139.173 98.2936 139.47 99.0191 139.05 99.4434L131.948 106.618C131.688 106.881 131.266 106.881 131.006 106.618L123.904 99.4434C123.484 99.0191 123.782 98.2936 124.376 98.2936H127.669V93.897Z" fill="#A3E635"/>
+<path d="M3.40137 29.0259C3.40137 22.3985 8.77395 17.0259 15.4014 17.0259H55.4014C62.0288 17.0259 67.4014 22.3985 67.4014 29.0259V125.026C67.4014 131.653 62.0288 137.026 55.4014 137.026H15.4014C8.77395 137.026 3.40137 131.653 3.40137 125.026V29.0259Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.4014 18.5259H15.4014C9.60238 18.5259 4.90137 23.2269 4.90137 29.0259V125.026C4.90137 130.825 9.60238 135.526 15.4014 135.526H55.4014C61.2004 135.526 65.9014 130.825 65.9014 125.026V29.0259C65.9014 23.2269 61.2004 18.5259 55.4014 18.5259ZM15.4014 17.0259C8.77395 17.0259 3.40137 22.3985 3.40137 29.0259V125.026C3.40137 131.653 8.77395 137.026 15.4014 137.026H55.4014C62.0288 137.026 67.4014 131.653 67.4014 125.026V29.0259C67.4014 22.3985 62.0288 17.0259 55.4014 17.0259H15.4014Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.4013 27.0109C34.8823 27.0109 34.4397 26.5831 34.4397 26.0282C34.4397 25.4732 34.8823 25.0454 35.4013 25.0454C35.9202 25.0454 36.3628 25.4732 36.3628 26.0282C36.3628 26.5831 35.9202 27.0109 35.4013 27.0109ZM35.4013 28.5109C34.0418 28.5109 32.9397 27.3994 32.9397 26.0282C32.9397 24.657 34.0418 23.5454 35.4013 23.5454C36.7607 23.5454 37.8628 24.657 37.8628 26.0282C37.8628 27.3994 36.7607 28.5109 35.4013 28.5109Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.8823 25.7661C19.8823 25.3519 20.2181 25.0161 20.6323 25.0161H28.8375C29.2517 25.0161 29.5875 25.3519 29.5875 25.7661C29.5875 26.1803 29.2517 26.5161 28.8375 26.5161H20.6323C20.2181 26.5161 19.8823 26.1803 19.8823 25.7661Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M41.2153 25.7661C41.2153 25.3519 41.5511 25.0161 41.9653 25.0161L50.1705 25.0161C50.5847 25.0161 50.9205 25.3519 50.9205 25.7661C50.9205 26.1803 50.5847 26.5161 50.1705 26.5161L41.9653 26.5161C41.5511 26.5161 41.2153 26.1803 41.2153 25.7661Z" fill="#A3E635"/>
+<path d="M61.6577 41.2485C61.6577 36.8303 58.076 33.2485 53.6577 33.2485H17.1449C12.7266 33.2485 9.1449 36.8303 9.1449 41.2485V117.938C9.1449 122.356 12.7266 125.938 17.1449 125.938H53.6577C58.076 125.938 61.6577 122.356 61.6577 117.938V41.2485Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.1449 34.7485H53.6577C57.2476 34.7485 60.1577 37.6587 60.1577 41.2485V117.938C60.1577 121.528 57.2476 124.438 53.6577 124.438H17.1449C13.555 124.438 10.6449 121.528 10.6449 117.938V41.2485C10.6449 37.6587 13.555 34.7485 17.1449 34.7485ZM53.6577 33.2485C58.076 33.2485 61.6577 36.8303 61.6577 41.2485V117.938C61.6577 122.356 58.076 125.938 53.6577 125.938H17.1449C12.7266 125.938 9.1449 122.356 9.1449 117.938V41.2485C9.1449 36.8303 12.7266 33.2485 17.1449 33.2485H53.6577Z" fill="#A3E635"/>
+<path d="M27.5469 74.9572V88.4241C27.5469 89.5172 28.4295 90.4188 29.5245 90.4188H30.4518C31.5356 90.4188 32.4295 89.5172 32.4295 88.4241V74.9572H27.5469Z" fill="#82C91E"/>
+<path d="M32.4183 68.4663V65.9307C32.4183 64.8376 31.5356 63.936 30.4518 63.936H29.5245C28.4407 63.936 27.5469 64.8376 27.5469 65.9307V68.4663H32.4183Z" fill="#82C91E"/>
+<path d="M43.256 79.3977V65.9307C43.256 64.8376 42.3733 63.936 41.2895 63.936H40.3622C39.2784 63.936 38.3846 64.8376 38.3846 65.9307V79.3977H43.256Z" fill="#82C91E"/>
+<path d="M38.3846 85.8883V88.4239C38.3846 89.517 39.2784 90.4186 40.3622 90.4186H41.2895C42.3733 90.4186 43.2672 89.517 43.2672 88.4239V85.8883H38.3846Z" fill="#82C91E"/>
+<path d="M26.7645 80.1855H24.2506C23.1668 80.1855 22.2729 81.0758 22.2729 82.1802V83.1156C22.2729 84.2087 23.1556 85.1103 24.2506 85.1103H26.7645V80.1855Z" fill="#A3E635"/>
+<path d="M46.5517 80.1855H33.2V85.1103H46.5517C47.6355 85.1103 48.5293 84.2087 48.5293 83.1156V82.1802C48.5293 81.0758 47.6355 80.1855 46.5517 80.1855Z" fill="#A3E635"/>
+<path d="M37.6023 69.2544H24.2506C23.1668 69.2544 22.2729 70.1447 22.2729 71.2491V72.1845C22.2729 73.2776 23.1556 74.1792 24.2506 74.1792H37.6023V69.2544Z" fill="#A3E635"/>
+<path d="M46.5517 69.2544H44.0378V74.1791H46.5517C47.6355 74.1791 48.5294 73.2888 48.5294 72.1844V71.2491C48.5294 70.1447 47.6355 69.2544 46.5517 69.2544Z" fill="#A3E635"/>
+<path d="M67.4014 155C67.4014 150.582 63.8196 147 59.4014 147H47.4014C42.9831 147 39.4014 150.582 39.4014 155V167C39.4014 171.418 42.9831 175 47.4014 175H59.4014C63.8196 175 67.4014 171.418 67.4014 167V155Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.4014 148.5H59.4014C62.9912 148.5 65.9014 151.41 65.9014 155V167C65.9014 170.59 62.9912 173.5 59.4014 173.5H47.4014C43.8115 173.5 40.9014 170.59 40.9014 167V155C40.9014 151.41 43.8115 148.5 47.4014 148.5ZM59.4014 147C63.8196 147 67.4014 150.582 67.4014 155V167C67.4014 171.418 63.8196 175 59.4014 175H47.4014C42.9831 175 39.4014 171.418 39.4014 167V155C39.4014 150.582 42.9831 147 47.4014 147H59.4014Z" fill="#52ADF9"/>
+<path d="M56.3172 155.31H52.9994L48.7515 162.624H52.9994L51.7425 167.727L58.0515 159.633H53.8791L56.3172 155.31Z" fill="#52ADF9"/>
+<path d="M31.4014 155C31.4014 150.582 27.8196 147 23.4014 147H11.4014C6.98309 147 3.40137 150.582 3.40137 155V167C3.40137 171.418 6.98309 175 11.4014 175H23.4014C27.8196 175 31.4014 171.418 31.4014 167V155Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4014 148.5H23.4014C26.9912 148.5 29.9014 151.41 29.9014 155V167C29.9014 170.59 26.9912 173.5 23.4014 173.5H11.4014C7.81152 173.5 4.90137 170.59 4.90137 167V155C4.90137 151.41 7.81152 148.5 11.4014 148.5ZM23.4014 147C27.8196 147 31.4014 150.582 31.4014 155V167C31.4014 171.418 27.8196 175 23.4014 175H11.4014C6.98309 175 3.40137 171.418 3.40137 167V155C3.40137 150.582 6.98309 147 11.4014 147H23.4014Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1787 158.864C11.9957 158.047 12.9655 157.399 14.0329 156.957C15.1003 156.515 16.2444 156.287 17.3997 156.287C18.5551 156.287 19.6991 156.515 20.7665 156.957C21.8339 157.399 22.8038 158.047 23.6207 158.864L22.56 159.924C21.8824 159.247 21.0779 158.709 20.1925 158.343C19.3071 157.976 18.3581 157.787 17.3997 157.787C16.4414 157.787 15.4924 157.976 14.607 158.343C13.7216 158.709 12.9171 159.247 12.2394 159.924L11.1787 158.864Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5059 161.187C14.0174 160.676 14.6246 160.27 15.2929 159.993C15.9613 159.716 16.6776 159.574 17.4009 159.574C18.1243 159.574 18.8406 159.716 19.5089 159.993C20.1773 160.27 20.7845 160.676 21.296 161.187L20.2353 162.248C19.8631 161.875 19.4212 161.58 18.9349 161.379C18.4486 161.177 17.9273 161.074 17.4009 161.074C16.8745 161.074 16.3533 161.177 15.867 161.379C15.3807 161.58 14.9388 161.875 14.5666 162.248L13.5059 161.187Z" fill="#A3E635"/>
+<path d="M18.3581 164.126C18.3581 164.654 17.9296 165.083 17.401 165.083C16.8724 165.083 16.4438 164.654 16.4438 164.126C16.4438 163.597 16.8724 163.168 17.401 163.168C17.9296 163.168 18.3581 163.597 18.3581 164.126Z" fill="#A3E635"/>
+</svg>
diff --git a/briar-android/artwork/il_mailbox_setup_light.svg b/briar-android/artwork/il_mailbox_setup_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6aefc130ff06b169d845a4b732759d2151b609fe
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_setup_light.svg
@@ -0,0 +1,31 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M189.854 29C189.854 22.3726 184.481 17 177.854 17H86.8535C80.2261 17 74.8535 22.3726 74.8535 29V163C74.8535 169.627 80.2261 175 86.8535 175H177.854C184.481 175 189.854 169.627 189.854 163V29Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M86.8535 18.5H177.854C183.653 18.5 188.354 23.201 188.354 29V163C188.354 168.799 183.653 173.5 177.854 173.5H86.8535C81.0545 173.5 76.3535 168.799 76.3535 163V29C76.3535 23.201 81.0545 18.5 86.8535 18.5ZM177.854 17C184.481 17 189.854 22.3726 189.854 29V163C189.854 169.627 184.481 175 177.854 175H86.8535C80.2261 175 74.8535 169.627 74.8535 163V29C74.8535 22.3726 80.2261 17 86.8535 17H177.854Z" fill="#196FDE"/>
+<path d="M183.854 35C183.854 30.5817 180.272 27 175.854 27H88.8535C84.4352 27 80.8535 30.5817 80.8535 35V157C80.8535 161.418 84.4352 165 88.8535 165H175.854C180.272 165 183.854 161.418 183.854 157V35Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.8535 28.5H175.854C179.443 28.5 182.354 31.4101 182.354 35V157C182.354 160.59 179.443 163.5 175.854 163.5H88.8535C85.2637 163.5 82.3535 160.59 82.3535 157V35C82.3535 31.4102 85.2637 28.5 88.8535 28.5ZM175.854 27C180.272 27 183.854 30.5817 183.854 35V157C183.854 161.418 180.272 165 175.854 165H88.8535C84.4352 165 80.8535 161.418 80.8535 157V35C80.8535 30.5817 84.4352 27 88.8535 27H175.854Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M132.354 38.2559C131.525 38.2559 130.854 37.5843 130.854 36.7559C130.854 35.9274 131.525 35.2559 132.354 35.2559C133.182 35.2559 133.854 35.9274 133.854 36.7559C133.854 37.5843 133.182 38.2559 132.354 38.2559ZM132.354 39.7559C130.697 39.7559 129.354 38.4127 129.354 36.7559C129.354 35.099 130.697 33.7559 132.354 33.7559C134.01 33.7559 135.354 35.099 135.354 36.7559C135.354 38.4127 134.01 39.7559 132.354 39.7559Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M116.298 74H147.409C148.588 74 149.718 74.4731 150.552 75.3152C151.385 76.1573 151.854 77.2994 151.854 78.4903L151.854 116.975C151.854 118.69 149.873 119.625 148.571 118.526L140.508 112.571H116.298C115.119 112.571 113.989 112.098 113.155 111.256C112.322 110.414 111.854 109.272 111.854 108.081V78.4903C111.854 77.2994 112.322 76.1573 113.155 75.3152C113.989 74.4731 115.119 74 116.298 74ZM128.122 93.897H118.965V81.1845H144.742V93.897H135.737V98.2936H139.031C139.625 98.2936 139.922 99.0191 139.502 99.4434L132.401 106.618C132.14 106.881 131.718 106.881 131.458 106.618L124.356 99.4434C123.936 99.0191 124.234 98.2936 124.828 98.2936H128.122V93.897Z" fill="#82C91E"/>
+<path d="M3.85352 29.0259C3.85352 22.3985 9.2261 17.0259 15.8535 17.0259H55.8535C62.4809 17.0259 67.8535 22.3985 67.8535 29.0259V125.026C67.8535 131.653 62.4809 137.026 55.8535 137.026H15.8535C9.2261 137.026 3.85352 131.653 3.85352 125.026V29.0259Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.8535 18.5259H15.8535C10.0545 18.5259 5.35352 23.2269 5.35352 29.0259V125.026C5.35352 130.825 10.0545 135.526 15.8535 135.526H55.8535C61.6525 135.526 66.3535 130.825 66.3535 125.026V29.0259C66.3535 23.2269 61.6525 18.5259 55.8535 18.5259ZM15.8535 17.0259C9.2261 17.0259 3.85352 22.3985 3.85352 29.0259V125.026C3.85352 131.653 9.2261 137.026 15.8535 137.026H55.8535C62.4809 137.026 67.8535 131.653 67.8535 125.026V29.0259C67.8535 22.3985 62.4809 17.0259 55.8535 17.0259H15.8535Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.8534 27.0109C35.3345 27.0109 34.8919 26.5831 34.8919 26.0282C34.8919 25.4732 35.3345 25.0454 35.8534 25.0454C36.3723 25.0454 36.8149 25.4732 36.8149 26.0282C36.8149 26.5831 36.3723 27.0109 35.8534 27.0109ZM35.8534 28.5109C34.4939 28.5109 33.3919 27.3994 33.3919 26.0282C33.3919 24.657 34.4939 23.5454 35.8534 23.5454C37.2129 23.5454 38.3149 24.657 38.3149 26.0282C38.3149 27.3994 37.2129 28.5109 35.8534 28.5109Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.334 25.7661C20.334 25.3519 20.6698 25.0161 21.084 25.0161H29.2891C29.7033 25.0161 30.0391 25.3519 30.0391 25.7661C30.0391 26.1803 29.7033 26.5161 29.2891 26.5161H21.084C20.6698 26.5161 20.334 26.1803 20.334 25.7661Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M41.6675 25.7661C41.6675 25.3519 42.0033 25.0161 42.4175 25.0161L50.6226 25.0161C51.0368 25.0161 51.3726 25.3519 51.3726 25.7661C51.3726 26.1803 51.0368 26.5161 50.6226 26.5161L42.4175 26.5161C42.0033 26.5161 41.6675 26.1803 41.6675 25.7661Z" fill="#65A30D"/>
+<path d="M62.1099 41.2485C62.1099 36.8303 58.5281 33.2485 54.1099 33.2485H17.597C13.1788 33.2485 9.59705 36.8303 9.59705 41.2485V117.938C9.59705 122.356 13.1788 125.938 17.597 125.938H54.1099C58.5281 125.938 62.1099 122.356 62.1099 117.938V41.2485Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.597 34.7485H54.1099C57.6997 34.7485 60.6099 37.6587 60.6099 41.2485V117.938C60.6099 121.528 57.6997 124.438 54.1099 124.438H17.597C14.0072 124.438 11.097 121.528 11.097 117.938V41.2485C11.097 37.6587 14.0072 34.7485 17.597 34.7485ZM54.1099 33.2485C58.5281 33.2485 62.1099 36.8303 62.1099 41.2485V117.938C62.1099 122.356 58.5281 125.938 54.1099 125.938H17.597C13.1788 125.938 9.59705 122.356 9.59705 117.938V41.2485C9.59705 36.8303 13.1788 33.2485 17.597 33.2485H54.1099Z" fill="#65A30D"/>
+<path d="M27.9985 74.9572V88.4241C27.9985 89.5172 28.8812 90.4188 29.9761 90.4188H30.9035C31.9873 90.4188 32.8811 89.5172 32.8811 88.4241V74.9572H27.9985Z" fill="#82C91E"/>
+<path d="M32.8699 68.4663V65.9307C32.8699 64.8376 31.9873 63.936 30.9035 63.936H29.9761C28.8924 63.936 27.9985 64.8376 27.9985 65.9307V68.4663H32.8699Z" fill="#82C91E"/>
+<path d="M43.7076 79.3977V65.9307C43.7076 64.8376 42.825 63.936 41.7412 63.936H40.8138C39.7301 63.936 38.8362 64.8376 38.8362 65.9307V79.3977H43.7076Z" fill="#82C91E"/>
+<path d="M38.8362 85.8883V88.4239C38.8362 89.517 39.7301 90.4186 40.8138 90.4186H41.7412C42.825 90.4186 43.7188 89.517 43.7188 88.4239V85.8883H38.8362Z" fill="#82C91E"/>
+<path d="M27.2166 80.1855H24.7027C23.6189 80.1855 22.7251 81.0758 22.7251 82.1802V83.1156C22.7251 84.2087 23.6078 85.1103 24.7027 85.1103H27.2166V80.1855Z" fill="#A3E635"/>
+<path d="M47.0038 80.1855H33.6521V85.1103H47.0038C48.0876 85.1103 48.9814 84.2087 48.9814 83.1156V82.1802C48.9814 81.0758 48.0876 80.1855 47.0038 80.1855Z" fill="#A3E635"/>
+<path d="M38.0544 69.2544H24.7027C23.6189 69.2544 22.7251 70.1447 22.7251 71.2491V72.1845C22.7251 73.2776 23.6078 74.1792 24.7027 74.1792H38.0544V69.2544Z" fill="#A3E635"/>
+<path d="M47.0039 69.2544H44.49V74.1791H47.0039C48.0877 74.1791 48.9815 73.2888 48.9815 72.1844V71.2491C48.9815 70.1447 48.0877 69.2544 47.0039 69.2544Z" fill="#A3E635"/>
+<path d="M67.8535 155C67.8535 150.582 64.2718 147 59.8535 147H47.8535C43.4352 147 39.8535 150.582 39.8535 155V167C39.8535 171.418 43.4352 175 47.8535 175H59.8535C64.2718 175 67.8535 171.418 67.8535 167V155Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.8535 148.5H59.8535C63.4434 148.5 66.3535 151.41 66.3535 155V167C66.3535 170.59 63.4434 173.5 59.8535 173.5H47.8535C44.2637 173.5 41.3535 170.59 41.3535 167V155C41.3535 151.41 44.2637 148.5 47.8535 148.5ZM59.8535 147C64.2718 147 67.8535 150.582 67.8535 155V167C67.8535 171.418 64.2718 175 59.8535 175H47.8535C43.4352 175 39.8535 171.418 39.8535 167V155C39.8535 150.582 43.4352 147 47.8535 147H59.8535Z" fill="#196FDE"/>
+<path d="M56.7688 155.31H53.4511L49.2031 162.624H53.4511L52.1942 167.727L58.5032 159.633H54.3307L56.7688 155.31Z" fill="#196FDE"/>
+<path d="M31.8535 155C31.8535 150.582 28.2718 147 23.8535 147H11.8535C7.43524 147 3.85351 150.582 3.85351 155V167C3.85351 171.418 7.43524 175 11.8535 175H23.8535C28.2718 175 31.8535 171.418 31.8535 167V155Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.8535 148.5H23.8535C27.4434 148.5 30.3535 151.41 30.3535 155V167C30.3535 170.59 27.4434 173.5 23.8535 173.5H11.8535C8.26366 173.5 5.35351 170.59 5.35351 167V155C5.35351 151.41 8.26366 148.5 11.8535 148.5ZM23.8535 147C28.2718 147 31.8535 150.582 31.8535 155V167C31.8535 171.418 28.2718 175 23.8535 175H11.8535C7.43524 175 3.85351 171.418 3.85351 167V155C3.85351 150.582 7.43524 147 11.8535 147H23.8535Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6309 158.864C12.4478 158.047 13.4177 157.399 14.4851 156.957C15.5525 156.515 16.6965 156.287 17.8519 156.287C19.0072 156.287 20.1513 156.515 21.2187 156.957C22.2861 157.399 23.2559 158.047 24.0729 158.864L23.0122 159.924C22.3345 159.247 21.53 158.709 20.6446 158.343C19.7592 157.976 18.8102 157.787 17.8519 157.787C16.8935 157.787 15.9445 157.976 15.0591 158.343C14.1737 158.709 13.3692 159.247 12.6916 159.924L11.6309 158.864Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.958 161.187C14.4695 160.676 15.0768 160.27 15.7451 159.993C16.4134 159.716 17.1297 159.574 17.8531 159.574C18.5765 159.574 19.2928 159.716 19.9611 159.993C20.6294 160.27 21.2367 160.676 21.7482 161.187L20.6875 162.248C20.3153 161.875 19.8734 161.58 19.387 161.379C18.9007 161.177 18.3795 161.074 17.8531 161.074C17.3267 161.074 16.8055 161.177 16.3191 161.379C15.8328 161.58 15.3909 161.875 15.0187 162.248L13.958 161.187Z" fill="#65A30D"/>
+<path d="M18.8098 164.126C18.8098 164.654 18.3813 165.083 17.8527 165.083C17.324 165.083 16.8955 164.654 16.8955 164.126C16.8955 163.597 17.324 163.168 17.8527 163.168C18.3813 163.168 18.8098 163.597 18.8098 164.126Z" fill="#65A30D"/>
+</svg>
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 0000000000000000000000000000000000000000..3ca2dafb92d2e02db4fa3b89048a52bcd549e2c1
--- /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_error_dark.svg b/briar-android/artwork/il_qr_code_error_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1d14a6e0df15d10a705a9c0fd97be5bf679ee3d1
--- /dev/null
+++ b/briar-android/artwork/il_qr_code_error_dark.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ width="192"
+ height="96"
+ viewBox="0 0 192 96"
+ fill="none"
+ version="1.1"
+ id="svg38"
+ sodipodi:docname="29.dark-export(288x144)1.5x.svg"
+ inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+ id="defs42" />
+ <sodipodi:namedview
+ id="namedview40"
+ pagecolor="#505050"
+ bordercolor="#ffffff"
+ borderopacity="1"
+ inkscape:showpageshadow="0"
+ inkscape:pageopacity="0"
+ inkscape:pagecheckerboard="1"
+ inkscape:deskcolor="#505050"
+ showgrid="false"
+ inkscape:zoom="2.3477509"
+ inkscape:cx="199.12675"
+ inkscape:cy="119.90199"
+ inkscape:window-width="1920"
+ inkscape:window-height="892"
+ inkscape:window-x="1920"
+ inkscape:window-y="144"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg38" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 95.999995,42.073872 c -0.57705,0 -1.04539,0.468057 -1.04539,1.045393 v 12.593501 c 0,0.577336 0.46834,1.045393 1.04539,1.045393 0.57845,0 1.0454,-0.468057 1.0454,-1.045393 V 43.119265 c 0,-0.577336 -0.46695,-1.045393 -1.0454,-1.045393 z m 0,17.530404 c -0.57705,0 -1.04539,0.468058 -1.04539,1.045393 v 0.125029 c 0,0.577336 0.46834,1.045393 1.04539,1.045393 0.57845,0 1.0454,-0.468057 1.0454,-1.045393 v -0.125029 c 0,-0.577335 -0.46695,-1.045393 -1.0454,-1.045393 z"
+ fill="#fbbf24"
+ id="path2"
+ style="stroke-width:1.39386" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M 114.71631,64.456712 96.690957,33.857222 c -0.29968,-0.507504 -1.08303,-0.507504 -1.38132,0 l -18.026758,30.59949 c -0.248107,0.423175 0.01951,1.078567 0.691353,1.078567 h 36.052118 c 0.67184,0 0.93946,-0.655392 0.68996,-1.078567 z M 98.491807,32.795939 c -1.10671,-1.880174 -3.87631,-1.880174 -4.98443,0 L 75.482015,63.395568 c -1.108116,1.880175 0.277378,4.230497 2.492217,4.230497 h 36.052118 c 2.21484,0 3.59894,-2.350322 2.49222,-4.230497 z"
+ fill="#fbbf24"
+ id="path4"
+ style="stroke-width:1.39386" />
+ <path
+ d="m 180.901,17 c 0,-4.4183 -3.581,-8 -8,-8 h -26 c -4.418,0 -8,3.5817 -8,8 v 62 c 0,4.418 3.582,8 8,8 h 26 c 4.419,0 8,-3.582 8,-8 z"
+ fill="#334155"
+ id="path6" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 146.901,10.5 h 26 c 3.59,0 6.5,2.9101 6.5,6.5 v 62 c 0,3.59 -2.91,6.5 -6.5,6.5 h -26 c -3.589,0 -6.5,-2.91 -6.5,-6.5 V 17 c 0,-3.5899 2.911,-6.5 6.5,-6.5 z m 26,-1.5 c 4.419,0 8,3.5817 8,8 v 62 c 0,4.418 -3.581,8 -8,8 h -26 c -4.418,0 -8,-3.582 -8,-8 V 17 c 0,-4.4183 3.582,-8 8,-8 z"
+ fill="#64748b"
+ id="path8" />
+ <path
+ d="m 180.901,23.248 h -41.999 v 54 h 41.999 z"
+ fill="#0b1120"
+ id="path10" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 140.402,24.748 h 38.999 v 51 h -38.999 z m 40.499,-1.5 v 54 h -41.999 v -54 z"
+ fill="#64748b"
+ id="path12" />
+ <path
+ d="m 163.235,60.248 h -2.223 v -2.2222 h 2.223 z m -2.223,-7.7777 h -2.222 v 5.5555 h 2.222 z m 8.889,-2.2223 h -2.222 v 4.4445 h 2.222 z m -2.222,-2.2222 h -2.222 v 2.2222 h 2.222 z m -13.333,2.2222 h -2.222 v 2.2223 h 2.222 z m -2.222,-2.2222 h -2.223 v 2.2222 h 2.223 z m 7.777,-5.5555 h 2.223 V 40.248 h -2.223 z m -8.333,-0.5556 v 3.3333 h 3.333 v -3.3333 z m 5,5 h -6.667 V 40.248 h 6.667 z m -5,8.3333 v 3.3334 h 3.333 V 55.248 Z m 5,5 h -6.667 v -6.6666 h 6.667 z m 8.333,-18.3333 v 3.3333 h 3.334 v -3.3333 z m 5,5 h -6.666 V 40.248 h 3.333 3.333 z m -2.222,11.1111 v -3.3333 h -4.444 v 2.2222 h 2.222 v 3.3333 h 4.444 v -2.2222 z m -2.222,-7.7778 h -4.445 v 2.2223 h 4.445 z m -4.445,-2.2222 h -6.666 v 2.2222 h 2.222 v 2.2223 h 2.222 V 50.248 h 2.222 z m 1.112,-1.1111 v -2.2222 h -2.223 v -2.2222 h -2.222 v 4.4444 z m -8.056,-4.1667 h -1.667 v 1.6667 h 1.667 z m 0,13.3334 h -1.667 v 1.6666 h 1.667 z M 167.401,42.748 h -1.666 v 1.6667 h 1.666 z"
+ fill="#64748b"
+ id="path14" />
+ <path
+ d="m 158.901,17.0012 c 0,0.5529 0.448,1.0012 1,1.0012 0.553,0 1,-0.4483 1,-1.0012 0,-0.553 -0.447,-1.0012 -1,-1.0012 -0.552,0 -1,0.4482 -1,1.0012 z"
+ fill="#64748b"
+ id="path16" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 151.151,17.0244 c 0,-0.4142 0.336,-0.75 0.75,-0.75 h 4 c 0.415,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.335,0.75 -0.75,0.75 h -4 c -0.414,0 -0.75,-0.3358 -0.75,-0.75 z"
+ fill="#64748b"
+ id="path18" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 163.151,17.0244 c 0,-0.4142 0.336,-0.75 0.75,-0.75 h 4 c 0.415,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.335,0.75 -0.75,0.75 h -4 c -0.414,0 -0.75,-0.3358 -0.75,-0.75 z"
+ fill="#64748b"
+ id="path20" />
+ <path
+ d="m 55.901,17 c 0,-4.4183 -3.581,-8 -8,-8 H 21.9014 c -4.4183,0 -8,3.5817 -8,8 v 62 c 0,4.418 3.5817,8 8,8 H 47.901 c 4.419,0 8,-3.582 8,-8 z"
+ fill="#334155"
+ id="path22" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M 21.9014,10.5 H 47.901 c 3.59,0 6.5,2.9101 6.5,6.5 v 62 c 0,3.59 -2.91,6.5 -6.5,6.5 H 21.9014 c -3.5899,0 -6.5,-2.91 -6.5,-6.5 V 17 c 0,-3.5899 2.9101,-6.5 6.5,-6.5 z M 47.901,9 c 4.419,0 8,3.5817 8,8 v 62 c 0,4.418 -3.581,8 -8,8 H 21.9014 c -4.4183,0 -8,-3.582 -8,-8 V 17 c 0,-4.4183 3.5817,-8 8,-8 z"
+ fill="#64748b"
+ id="path24" />
+ <path
+ d="M 55.901,23.248 H 13.9015 v 54 H 55.901 Z"
+ fill="#0b1120"
+ id="path26" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M 15.4015,24.748 H 54.401 v 51 H 15.4015 Z m 40.4995,-1.5 v 54 H 13.9015 v -54 z"
+ fill="#64748b"
+ id="path28" />
+ <path
+ d="m 38.2347,60.248 h -2.2222 v -2.2222 h 2.2222 z m -2.2222,-7.7777 h -2.2223 v 5.5555 h 2.2223 z M 44.901,50.248 h -2.2219 v 4.4445 h 2.2219 z m -2.2219,-2.2222 h -2.2222 v 2.2222 h 2.2222 z M 29.3458,50.248 h -2.2222 v 2.2223 h 2.2222 z m -2.2222,-2.2222 h -2.2222 v 2.2222 h 2.2222 z m 7.7778,-5.5555 h 2.2222 V 40.248 H 34.9014 Z M 26.568,41.9147 v 3.3333 h 3.3334 v -3.3333 z m 5,5 H 24.9014 V 40.248 h 6.6666 z m -5,8.3333 v 3.3334 h 3.3334 V 55.248 Z m 5,5 h -6.6666 v -6.6666 h 6.6666 z m 8.3334,-18.3333 v 3.3333 h 3.3333 v -3.3333 z m 4.9996,5 H 38.2347 V 40.248 h 3.3333 3.333 z m -2.2219,11.1111 v -3.3333 h -4.4444 v 2.2222 h 2.2222 V 60.248 H 44.901 V 58.0258 Z M 40.4569,50.248 h -4.4444 v 2.2223 h 4.4444 z m -4.4444,-2.2222 h -6.6667 v 2.2222 h 2.2222 v 2.2223 h 2.2222 V 50.248 h 2.2223 z m 1.1111,-1.1111 v -2.2222 h -2.2222 v -2.2222 h -2.2223 v 4.4444 z M 29.068,42.748 h -1.6666 v 1.6667 h 1.6666 z m 0,13.3334 H 27.4014 V 57.748 H 29.068 Z M 42.4014,42.748 h -1.6667 v 1.6667 h 1.6667 z"
+ fill="#64748b"
+ id="path30" />
+ <path
+ d="m 33.9014,17.0012 c 0,0.5529 0.4477,1.0012 1,1.0012 0.5523,0 1,-0.4483 1,-1.0012 0,-0.553 -0.4477,-1.0012 -1,-1.0012 -0.5523,0 -1,0.4482 -1,1.0012 z"
+ fill="#64748b"
+ id="path32" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 26.1514,17.0244 c 0,-0.4142 0.3358,-0.75 0.75,-0.75 h 4 c 0.4142,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.3358,0.75 -0.75,0.75 h -4 c -0.4142,0 -0.75,-0.3358 -0.75,-0.75 z"
+ fill="#64748b"
+ id="path34" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 38.1514,17.0244 c 0,-0.4142 0.3358,-0.75 0.75,-0.75 h 4 c 0.4142,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.3358,0.75 -0.75,0.75 h -4 c -0.4142,0 -0.75,-0.3358 -0.75,-0.75 z"
+ fill="#64748b"
+ id="path36" />
+</svg>
diff --git a/briar-android/artwork/il_qr_code_error_light.svg b/briar-android/artwork/il_qr_code_error_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..470361a40c45485ce9945bf435ea0f2d8e4823e3
--- /dev/null
+++ b/briar-android/artwork/il_qr_code_error_light.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ width="192"
+ height="96"
+ viewBox="0 0 192 96"
+ fill="none"
+ version="1.1"
+ id="svg38"
+ sodipodi:docname="29.light-export(288x144)1.5x.svg"
+ inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+ id="defs42" />
+ <sodipodi:namedview
+ id="namedview40"
+ pagecolor="#505050"
+ bordercolor="#ffffff"
+ borderopacity="1"
+ inkscape:showpageshadow="0"
+ inkscape:pageopacity="0"
+ inkscape:pagecheckerboard="1"
+ inkscape:deskcolor="#505050"
+ showgrid="false"
+ inkscape:zoom="3.3202211"
+ inkscape:cx="140.80388"
+ inkscape:cy="54.062664"
+ inkscape:window-width="1920"
+ inkscape:window-height="892"
+ inkscape:window-x="1920"
+ inkscape:window-y="144"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg38" />
+ <path
+ d="m 180.901,17 c 0,-4.4183 -3.581,-8 -8,-8 h -26 c -4.418,0 -8,3.5817 -8,8 v 62 c 0,4.418 3.582,8 8,8 h 26 c 4.419,0 8,-3.582 8,-8 z"
+ fill="#e5e7eb"
+ id="path2" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 146.901,10.5 h 26 c 3.59,0 6.5,2.9101 6.5,6.5 v 62 c 0,3.59 -2.91,6.5 -6.5,6.5 h -26 c -3.589,0 -6.5,-2.91 -6.5,-6.5 V 17 c 0,-3.5899 2.911,-6.5 6.5,-6.5 z m 26,-1.5 c 4.419,0 8,3.5817 8,8 v 62 c 0,4.418 -3.581,8 -8,8 h -26 c -4.418,0 -8,-3.582 -8,-8 V 17 c 0,-4.4183 3.582,-8 8,-8 z"
+ fill="#9ca3af"
+ id="path4" />
+ <path
+ d="m 180.901,23.248 h -41.999 v 54 h 41.999 z"
+ fill="#f9fafb"
+ id="path6" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 140.402,24.748 h 38.999 v 51 h -38.999 z m 40.499,-1.5 v 54 h -41.999 v -54 z"
+ fill="#9ca3af"
+ id="path8" />
+ <path
+ d="m 163.235,60.248 h -2.223 v -2.2222 h 2.223 z m -2.223,-7.7777 h -2.222 v 5.5555 h 2.222 z m 8.889,-2.2223 h -2.222 v 4.4445 h 2.222 z m -2.222,-2.2222 h -2.222 v 2.2222 h 2.222 z m -13.333,2.2222 h -2.222 v 2.2223 h 2.222 z m -2.222,-2.2222 h -2.223 v 2.2222 h 2.223 z m 7.777,-5.5555 h 2.223 V 40.248 h -2.223 z m -8.333,-0.5556 v 3.3333 h 3.333 v -3.3333 z m 5,5 h -6.667 V 40.248 h 6.667 z m -5,8.3333 v 3.3334 h 3.333 V 55.248 Z m 5,5 h -6.667 v -6.6666 h 6.667 z m 8.333,-18.3333 v 3.3333 h 3.334 v -3.3333 z m 5,5 h -6.666 V 40.248 h 3.333 3.333 z m -2.222,11.1111 v -3.3333 h -4.444 v 2.2222 h 2.222 v 3.3333 h 4.444 v -2.2222 z m -2.222,-7.7778 h -4.445 v 2.2223 h 4.445 z m -4.445,-2.2222 h -6.666 v 2.2222 h 2.222 v 2.2223 h 2.222 V 50.248 h 2.222 z m 1.112,-1.1111 v -2.2222 h -2.223 v -2.2222 h -2.222 v 4.4444 z m -8.056,-4.1667 h -1.667 v 1.6667 h 1.667 z m 0,13.3334 h -1.667 v 1.6666 h 1.667 z M 167.401,42.748 h -1.666 v 1.6667 h 1.666 z"
+ fill="#9ca3af"
+ id="path10" />
+ <path
+ d="m 158.901,17.0012 c 0,0.5529 0.448,1.0012 1,1.0012 0.553,0 1,-0.4483 1,-1.0012 0,-0.553 -0.447,-1.0012 -1,-1.0012 -0.552,0 -1,0.4482 -1,1.0012 z"
+ fill="#9ca3af"
+ id="path12" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 151.151,17.0244 c 0,-0.4142 0.336,-0.75 0.75,-0.75 h 4 c 0.415,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.335,0.75 -0.75,0.75 h -4 c -0.414,0 -0.75,-0.3358 -0.75,-0.75 z"
+ fill="#9ca3af"
+ id="path14" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 163.151,17.0244 c 0,-0.4142 0.336,-0.75 0.75,-0.75 h 4 c 0.415,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.335,0.75 -0.75,0.75 h -4 c -0.414,0 -0.75,-0.3358 -0.75,-0.75 z"
+ fill="#9ca3af"
+ id="path16" />
+ <path
+ d="m 53.901,17 c 0,-4.4183 -3.581,-8 -8,-8 H 19.9014 c -4.4183,0 -8,3.5817 -8,8 v 62 c 0,4.418 3.5817,8 8,8 H 45.901 c 4.419,0 8,-3.582 8,-8 z"
+ fill="#e5e7eb"
+ id="path18" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M 19.9014,10.5 H 45.901 c 3.59,0 6.5,2.9101 6.5,6.5 v 62 c 0,3.59 -2.91,6.5 -6.5,6.5 H 19.9014 c -3.5899,0 -6.5,-2.91 -6.5,-6.5 V 17 c 0,-3.5899 2.9101,-6.5 6.5,-6.5 z M 45.901,9 c 4.419,0 8,3.5817 8,8 v 62 c 0,4.418 -3.581,8 -8,8 H 19.9014 c -4.4183,0 -8,-3.582 -8,-8 V 17 c 0,-4.4183 3.5817,-8 8,-8 z"
+ fill="#9ca3af"
+ id="path20" />
+ <path
+ d="M 53.901,23.248 H 11.9015 v 54 H 53.901 Z"
+ fill="#f9fafb"
+ id="path22" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M 13.4015,24.748 H 52.401 v 51 H 13.4015 Z m 40.4995,-1.5 v 54 H 11.9015 v -54 z"
+ fill="#9ca3af"
+ id="path24" />
+ <path
+ d="m 36.2347,60.248 h -2.2222 v -2.2222 h 2.2222 z m -2.2222,-7.7777 h -2.2223 v 5.5555 h 2.2223 z M 42.901,50.248 h -2.2219 v 4.4445 h 2.2219 z m -2.2219,-2.2222 h -2.2222 v 2.2222 h 2.2222 z M 27.3458,50.248 h -2.2222 v 2.2223 h 2.2222 z m -2.2222,-2.2222 h -2.2222 v 2.2222 h 2.2222 z m 7.7778,-5.5555 h 2.2222 V 40.248 H 32.9014 Z M 24.568,41.9147 v 3.3333 h 3.3334 v -3.3333 z m 5,5 H 22.9014 V 40.248 h 6.6666 z m -5,8.3333 v 3.3334 h 3.3334 V 55.248 Z m 5,5 h -6.6666 v -6.6666 h 6.6666 z m 8.3334,-18.3333 v 3.3333 h 3.3333 v -3.3333 z m 4.9996,5 H 36.2347 V 40.248 h 3.3333 3.333 z m -2.2219,11.1111 v -3.3333 h -4.4444 v 2.2222 h 2.2222 V 60.248 H 42.901 V 58.0258 Z M 38.4569,50.248 h -4.4444 v 2.2223 h 4.4444 z m -4.4444,-2.2222 h -6.6667 v 2.2222 h 2.2222 v 2.2223 h 2.2222 V 50.248 h 2.2223 z m 1.1111,-1.1111 v -2.2222 h -2.2222 v -2.2222 h -2.2223 v 4.4444 z M 27.068,42.748 h -1.6666 v 1.6667 h 1.6666 z m 0,13.3334 H 25.4014 V 57.748 H 27.068 Z M 40.4014,42.748 h -1.6667 v 1.6667 h 1.6667 z"
+ fill="#9ca3af"
+ id="path26" />
+ <path
+ d="m 31.9014,17.0012 c 0,0.5529 0.4477,1.0012 1,1.0012 0.5523,0 1,-0.4483 1,-1.0012 0,-0.553 -0.4477,-1.0012 -1,-1.0012 -0.5523,0 -1,0.4482 -1,1.0012 z"
+ fill="#9ca3af"
+ id="path28" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 24.1514,17.0244 c 0,-0.4142 0.3358,-0.75 0.75,-0.75 h 4 c 0.4142,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.3358,0.75 -0.75,0.75 h -4 c -0.4142,0 -0.75,-0.3358 -0.75,-0.75 z"
+ fill="#9ca3af"
+ id="path30" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 36.1514,17.0244 c 0,-0.4142 0.3358,-0.75 0.75,-0.75 h 4 c 0.4142,0 0.75,0.3358 0.75,0.75 0,0.4142 -0.3358,0.75 -0.75,0.75 h -4 c -0.4142,0 -0.75,-0.3358 -0.75,-0.75 z"
+ fill="#9ca3af"
+ id="path32" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="m 96.000005,42.488311 c -0.576779,0 -1.044887,0.467828 -1.044887,1.044881 v 12.58734 c 0,0.577053 0.468108,1.044882 1.044887,1.044882 0.578163,0 1.044877,-0.467829 1.044877,-1.044882 v -12.58734 c 0,-0.577053 -0.466714,-1.044881 -1.044877,-1.044881 z m 0,17.521827 c -0.576779,0 -1.044887,0.467829 -1.044887,1.044882 v 0.124968 c 0,0.577053 0.468108,1.044881 1.044887,1.044881 0.578163,0 1.044877,-0.467828 1.044877,-1.044881 V 61.05502 c 0,-0.577053 -0.466714,-1.044882 -1.044877,-1.044882 z"
+ fill="#f59e0b"
+ id="path34"
+ style="stroke-width:1.39318" />
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M 114.70715,64.8602 96.690601,34.275682 c -0.29953,-0.507256 -1.082495,-0.507256 -1.38063,0 L 77.292031,64.8602 c -0.247986,0.422968 0.0195,1.078039 0.691015,1.078039 h 36.034484 c 0.67151,0 0.939,-0.655071 0.68962,-1.078039 z M 98.490584,33.214918 c -1.106178,-1.879254 -3.874418,-1.879254 -4.981991,0 L 75.492048,63.799575 c -1.107574,1.879255 0.277243,4.228427 2.490998,4.228427 h 36.034484 c 2.21376,0 3.59718,-2.349172 2.491,-4.228427 z"
+ fill="#f59e0b"
+ id="path36"
+ style="stroke-width:1.39318" />
+</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 0000000000000000000000000000000000000000..9862f9a4286ec34de477a5bfafd3e38c7999e3d5
--- /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 0000000000000000000000000000000000000000..c629c1b04cc1ce5321766e6452d3b63d8c25f44f
--- /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 0000000000000000000000000000000000000000..042e0d0dbfe484695ee89d6085039eaf737e54b0
--- /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/il_share_app_dark.svg b/briar-android/artwork/il_share_app_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b3c73c3a73697a8a0d0ffaf311d901055f190ef3
--- /dev/null
+++ b/briar-android/artwork/il_share_app_dark.svg
@@ -0,0 +1,30 @@
+<svg width="193" height="193" viewBox="0 0 193 193" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M112.401 21.8828C112.401 17.4645 108.82 13.8828 104.401 13.8828H88.4014C83.9831 13.8828 80.4014 17.4645 80.4014 21.8828V37.8828C80.4014 42.3011 83.9831 45.8828 88.4014 45.8828H104.401C108.82 45.8828 112.401 42.3011 112.401 37.8828V21.8828Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.4014 15.3828H104.401C107.991 15.3828 110.901 18.293 110.901 21.8828V37.8828C110.901 41.4727 107.991 44.3828 104.401 44.3828H88.4014C84.8115 44.3828 81.9014 41.4727 81.9014 37.8828V21.8828C81.9014 18.293 84.8115 15.3828 88.4014 15.3828ZM104.401 13.8828C108.82 13.8828 112.401 17.4645 112.401 21.8828V37.8828C112.401 42.3011 108.82 45.8828 104.401 45.8828H88.4014C83.9831 45.8828 80.4014 42.3011 80.4014 37.8828V21.8828C80.4014 17.4645 83.9831 13.8828 88.4014 13.8828H104.401Z" fill="#64748B"/>
+<path d="M60.4014 127.883C60.4014 123.465 56.8196 119.883 52.4014 119.883H36.4014C31.9831 119.883 28.4014 123.465 28.4014 127.883V143.883C28.4014 148.301 31.9831 151.883 36.4014 151.883H52.4014C56.8196 151.883 60.4014 148.301 60.4014 143.883V127.883Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.4014 121.383H52.4014C55.9912 121.383 58.9014 124.293 58.9014 127.883V143.883C58.9014 147.473 55.9912 150.383 52.4014 150.383H36.4014C32.8115 150.383 29.9014 147.473 29.9014 143.883V127.883C29.9014 124.293 32.8115 121.383 36.4014 121.383ZM52.4014 119.883C56.8196 119.883 60.4014 123.465 60.4014 127.883V143.883C60.4014 148.301 56.8196 151.883 52.4014 151.883H36.4014C31.9831 151.883 28.4014 148.301 28.4014 143.883V127.883C28.4014 123.465 31.9831 119.883 36.4014 119.883H52.4014Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6514 116.883L43.6514 100.883L45.1514 100.883L45.1514 116.883L43.6514 116.883Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95.6514 66.8828L95.6514 48.8828L97.1514 48.8828L97.1514 66.8828L95.6514 66.8828Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95.6514 155.883L95.6514 126.883L97.1514 126.883L97.1514 155.883L95.6514 155.883Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M150.151 67.8828V92.8828H148.651V67.8828H150.151Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.171 97.334H126.401V95.834H149.171C153.579 95.834 157.151 99.4068 157.151 103.814L157.151 122.584L155.651 122.584L155.651 103.814C155.651 100.235 152.75 97.334 149.171 97.334Z" fill="#64748B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6314 96.1328L66.4014 96.1328L66.4014 97.6328L43.6314 97.6328C39.2241 97.6328 35.6514 94.06 35.6515 89.6528L35.6518 70.8828L37.1518 70.8828L37.1515 89.6528C37.1514 93.2316 40.0526 96.1328 43.6314 96.1328Z" fill="#64748B"/>
+<path d="M157.401 52.8828C157.401 50.6737 155.611 48.8828 153.401 48.8828H145.401C143.192 48.8828 141.401 50.6737 141.401 52.8828V60.8828C141.401 63.092 143.192 64.8828 145.401 64.8828H153.401C155.611 64.8828 157.401 63.092 157.401 60.8828V52.8828Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M145.401 50.3828H153.401C154.782 50.3828 155.901 51.5021 155.901 52.8828V60.8828C155.901 62.2635 154.782 63.3828 153.401 63.3828H145.401C144.021 63.3828 142.901 62.2635 142.901 60.8828V52.8828C142.901 51.5021 144.021 50.3828 145.401 50.3828ZM153.401 48.8828C155.611 48.8828 157.401 50.6737 157.401 52.8828V60.8828C157.401 63.092 155.611 64.8828 153.401 64.8828H145.401C143.192 64.8828 141.401 63.092 141.401 60.8828V52.8828C141.401 50.6737 143.192 48.8828 145.401 48.8828H153.401Z" fill="#64748B"/>
+<path d="M104.401 162.883C104.401 160.674 102.611 158.883 100.401 158.883H92.4014C90.1922 158.883 88.4014 160.674 88.4014 162.883V170.883C88.4014 173.092 90.1922 174.883 92.4014 174.883H100.401C102.611 174.883 104.401 173.092 104.401 170.883V162.883Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M92.4014 160.383H100.401C101.782 160.383 102.901 161.502 102.901 162.883V170.883C102.901 172.264 101.782 173.383 100.401 173.383H92.4014C91.0207 173.383 89.9014 172.264 89.9014 170.883V162.883C89.9014 161.502 91.0207 160.383 92.4014 160.383ZM100.401 158.883C102.611 158.883 104.401 160.674 104.401 162.883V170.883C104.401 173.092 102.611 174.883 100.401 174.883H92.4014C90.1922 174.883 88.4014 173.092 88.4014 170.883V162.883C88.4014 160.674 90.1922 158.883 92.4014 158.883H100.401Z" fill="#64748B"/>
+<path d="M123.524 81.8828C123.524 75.2554 118.152 69.8828 111.524 69.8828H81.5244C74.897 69.8828 69.5244 75.2554 69.5244 81.8828V111.883C69.5244 118.51 74.897 123.883 81.5244 123.883H111.524C118.152 123.883 123.524 118.51 123.524 111.883V81.8828Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81.5244 71.3828H111.524C117.323 71.3828 122.024 76.0838 122.024 81.8828V111.883C122.024 117.682 117.323 122.383 111.524 122.383H81.5244C75.7254 122.383 71.0244 117.682 71.0244 111.883V81.8828C71.0244 76.0838 75.7254 71.3828 81.5244 71.3828ZM111.524 69.8828C118.152 69.8828 123.524 75.2554 123.524 81.8828V111.883C123.524 118.51 118.152 123.883 111.524 123.883H81.5244C74.897 123.883 69.5244 118.51 69.5244 111.883V81.8828C69.5244 75.2554 74.897 69.8828 81.5244 69.8828H111.524Z" fill="#A3E635"/>
+<path d="M89.4512 94.443V106.647C89.4512 107.638 90.258 108.455 91.2588 108.455H92.1065C93.0971 108.455 93.9142 107.638 93.9142 106.647V94.443H89.4512Z" fill="#82C91E"/>
+<path d="M93.9039 88.5607V86.2628C93.9039 85.2721 93.0971 84.4551 92.1065 84.4551H91.2588C90.2682 84.4551 89.4512 85.2721 89.4512 86.2628V88.5607H93.9039Z" fill="#82C91E"/>
+<path d="M103.81 98.4672V86.2628C103.81 85.2721 103.003 84.4551 102.013 84.4551H101.165C100.175 84.4551 99.3575 85.2721 99.3575 86.2628V98.4672H103.81Z" fill="#82C91E"/>
+<path d="M99.3575 104.349V106.647C99.3575 107.638 100.175 108.455 101.165 108.455H102.013C103.003 108.455 103.82 107.638 103.82 106.647V104.349H99.3575Z" fill="#82C91E"/>
+<path d="M88.7359 99.1817H86.438C85.4474 99.1817 84.6304 99.9886 84.6304 100.989V101.837C84.6304 102.828 85.4372 103.645 86.438 103.645H88.7359V99.1817Z" fill="#A3E635"/>
+<path d="M106.823 99.1817H94.6184V103.645H106.823C107.813 103.645 108.63 102.828 108.63 101.837V100.989C108.63 99.9886 107.813 99.1817 106.823 99.1817Z" fill="#A3E635"/>
+<path d="M98.6423 89.2754H86.438C85.4474 89.2754 84.6304 90.0822 84.6304 91.0831V91.9308C84.6304 92.9214 85.4372 93.7385 86.438 93.7385H98.6423V89.2754Z" fill="#A3E635"/>
+<path d="M106.823 89.2754H104.525V93.7384H106.823C107.813 93.7384 108.63 92.9316 108.63 91.9307V91.0831C108.63 90.0822 107.813 89.2754 106.823 89.2754Z" fill="#A3E635"/>
+<path d="M172.401 132.883C172.401 128.465 168.82 124.883 164.401 124.883H148.401C143.983 124.883 140.401 128.465 140.401 132.883V148.883C140.401 153.301 143.983 156.883 148.401 156.883H164.401C168.82 156.883 172.401 153.301 172.401 148.883V132.883Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148.401 126.383H164.401C167.991 126.383 170.901 129.293 170.901 132.883V148.883C170.901 152.473 167.991 155.383 164.401 155.383H148.401C144.812 155.383 141.901 152.473 141.901 148.883V132.883C141.901 129.293 144.812 126.383 148.401 126.383ZM164.401 124.883C168.82 124.883 172.401 128.465 172.401 132.883V148.883C172.401 153.301 168.82 156.883 164.401 156.883H148.401C143.983 156.883 140.401 153.301 140.401 148.883V132.883C140.401 128.465 143.983 124.883 148.401 124.883H164.401Z" fill="#64748B"/>
+<path d="M52.4014 45C52.4014 40.5817 48.8196 37 44.4014 37H28.4014C23.9831 37 20.4014 40.5817 20.4014 45V61C20.4014 65.4183 23.9831 69 28.4014 69H44.4014C48.8196 69 52.4014 65.4183 52.4014 61V45Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.4014 38.5H44.4014C47.9912 38.5 50.9014 41.4101 50.9014 45V61C50.9014 64.5899 47.9912 67.5 44.4014 67.5H28.4014C24.8115 67.5 21.9014 64.5899 21.9014 61V45C21.9014 41.4101 24.8115 38.5 28.4014 38.5ZM44.4014 37C48.8196 37 52.4014 40.5817 52.4014 45V61C52.4014 65.4183 48.8196 69 44.4014 69H28.4014C23.9831 69 20.4014 65.4183 20.4014 61V45C20.4014 40.5817 23.9831 37 28.4014 37H44.4014Z" fill="#64748B"/>
+</svg>
diff --git a/briar-android/artwork/il_share_app_light.svg b/briar-android/artwork/il_share_app_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4ec2c0adb485674cb7690b56d27af708e1b1d34f
--- /dev/null
+++ b/briar-android/artwork/il_share_app_light.svg
@@ -0,0 +1,30 @@
+<svg width="193" height="193" viewBox="0 0 193 193" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M112.401 21.8828C112.401 17.4645 108.82 13.8828 104.401 13.8828H88.4014C83.9831 13.8828 80.4014 17.4645 80.4014 21.8828V37.8828C80.4014 42.3011 83.9831 45.8828 88.4014 45.8828H104.401C108.82 45.8828 112.401 42.3011 112.401 37.8828V21.8828Z" fill="#E2E8F0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M88.4014 15.3828H104.401C107.991 15.3828 110.901 18.293 110.901 21.8828V37.8828C110.901 41.4727 107.991 44.3828 104.401 44.3828H88.4014C84.8115 44.3828 81.9014 41.4727 81.9014 37.8828V21.8828C81.9014 18.293 84.8115 15.3828 88.4014 15.3828ZM104.401 13.8828C108.82 13.8828 112.401 17.4645 112.401 21.8828V37.8828C112.401 42.3011 108.82 45.8828 104.401 45.8828H88.4014C83.9831 45.8828 80.4014 42.3011 80.4014 37.8828V21.8828C80.4014 17.4645 83.9831 13.8828 88.4014 13.8828H104.401Z" fill="#94A3B8"/>
+<path d="M60.4014 127.883C60.4014 123.465 56.8196 119.883 52.4014 119.883H36.4014C31.9831 119.883 28.4014 123.465 28.4014 127.883V143.883C28.4014 148.301 31.9831 151.883 36.4014 151.883H52.4014C56.8196 151.883 60.4014 148.301 60.4014 143.883V127.883Z" fill="#E2E8F0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.4014 121.383H52.4014C55.9912 121.383 58.9014 124.293 58.9014 127.883V143.883C58.9014 147.473 55.9912 150.383 52.4014 150.383H36.4014C32.8115 150.383 29.9014 147.473 29.9014 143.883V127.883C29.9014 124.293 32.8115 121.383 36.4014 121.383ZM52.4014 119.883C56.8196 119.883 60.4014 123.465 60.4014 127.883V143.883C60.4014 148.301 56.8196 151.883 52.4014 151.883H36.4014C31.9831 151.883 28.4014 148.301 28.4014 143.883V127.883C28.4014 123.465 31.9831 119.883 36.4014 119.883H52.4014Z" fill="#94A3B8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6514 116.883L43.6514 100.883L45.1514 100.883L45.1514 116.883L43.6514 116.883Z" fill="#94A3B8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95.6514 66.8828L95.6514 48.8828L97.1514 48.8828L97.1514 66.8828L95.6514 66.8828Z" fill="#94A3B8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M95.6514 155.883L95.6514 126.883L97.1514 126.883L97.1514 155.883L95.6514 155.883Z" fill="#94A3B8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M150.151 67.8828V92.8828H148.651V67.8828H150.151Z" fill="#94A3B8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M149.171 97.334H126.401V95.834H149.171C153.579 95.834 157.151 99.4068 157.151 103.814L157.151 122.584L155.651 122.584L155.651 103.814C155.651 100.235 152.75 97.334 149.171 97.334Z" fill="#94A3B8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M43.6314 96.1328L66.4014 96.1328L66.4014 97.6328L43.6314 97.6328C39.2241 97.6328 35.6514 94.06 35.6515 89.6528L35.6518 70.8828L37.1518 70.8828L37.1515 89.6528C37.1514 93.2316 40.0526 96.1328 43.6314 96.1328Z" fill="#94A3B8"/>
+<path d="M157.401 52.8828C157.401 50.6737 155.611 48.8828 153.401 48.8828H145.401C143.192 48.8828 141.401 50.6737 141.401 52.8828V60.8828C141.401 63.092 143.192 64.8828 145.401 64.8828H153.401C155.611 64.8828 157.401 63.092 157.401 60.8828V52.8828Z" fill="#E2E8F0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M145.401 50.3828H153.401C154.782 50.3828 155.901 51.5021 155.901 52.8828V60.8828C155.901 62.2635 154.782 63.3828 153.401 63.3828H145.401C144.021 63.3828 142.901 62.2635 142.901 60.8828V52.8828C142.901 51.5021 144.021 50.3828 145.401 50.3828ZM153.401 48.8828C155.611 48.8828 157.401 50.6737 157.401 52.8828V60.8828C157.401 63.092 155.611 64.8828 153.401 64.8828H145.401C143.192 64.8828 141.401 63.092 141.401 60.8828V52.8828C141.401 50.6737 143.192 48.8828 145.401 48.8828H153.401Z" fill="#94A3B8"/>
+<path d="M104.401 162.883C104.401 160.674 102.611 158.883 100.401 158.883H92.4014C90.1922 158.883 88.4014 160.674 88.4014 162.883V170.883C88.4014 173.092 90.1922 174.883 92.4014 174.883H100.401C102.611 174.883 104.401 173.092 104.401 170.883V162.883Z" fill="#E2E8F0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M92.4014 160.383H100.401C101.782 160.383 102.901 161.502 102.901 162.883V170.883C102.901 172.264 101.782 173.383 100.401 173.383H92.4014C91.0207 173.383 89.9014 172.264 89.9014 170.883V162.883C89.9014 161.502 91.0207 160.383 92.4014 160.383ZM100.401 158.883C102.611 158.883 104.401 160.674 104.401 162.883V170.883C104.401 173.092 102.611 174.883 100.401 174.883H92.4014C90.1922 174.883 88.4014 173.092 88.4014 170.883V162.883C88.4014 160.674 90.1922 158.883 92.4014 158.883H100.401Z" fill="#94A3B8"/>
+<path d="M123 81.8828C123 75.2554 117.627 69.8828 111 69.8828H81C74.3726 69.8828 69 75.2554 69 81.8828V111.883C69 118.51 74.3726 123.883 81 123.883H111C117.627 123.883 123 118.51 123 111.883V81.8828Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M81 71.3828H111C116.799 71.3828 121.5 76.0838 121.5 81.8828V111.883C121.5 117.682 116.799 122.383 111 122.383H81C75.201 122.383 70.5 117.682 70.5 111.883V81.8828C70.5 76.0838 75.201 71.3828 81 71.3828ZM111 69.8828C117.627 69.8828 123 75.2554 123 81.8828V111.883C123 118.51 117.627 123.883 111 123.883H81C74.3726 123.883 69 118.51 69 111.883V81.8828C69 75.2554 74.3726 69.8828 81 69.8828H111Z" fill="#65A30D"/>
+<path d="M88.9268 94.443V106.647C88.9268 107.638 89.7336 108.455 90.7344 108.455H91.5821C92.5727 108.455 93.3897 107.638 93.3897 106.647V94.443H88.9268Z" fill="#82C91E"/>
+<path d="M93.3795 88.5607V86.2628C93.3795 85.2721 92.5727 84.4551 91.5821 84.4551H90.7344C89.7438 84.4551 88.9268 85.2721 88.9268 86.2628V88.5607H93.3795Z" fill="#82C91E"/>
+<path d="M103.286 98.4672V86.2628C103.286 85.2721 102.479 84.4551 101.488 84.4551H100.641C99.6501 84.4551 98.8331 85.2721 98.8331 86.2628V98.4672H103.286Z" fill="#82C91E"/>
+<path d="M98.8331 104.349V106.647C98.8331 107.638 99.6501 108.455 100.641 108.455H101.488C102.479 108.455 103.296 107.638 103.296 106.647V104.349H98.8331Z" fill="#82C91E"/>
+<path d="M88.2115 99.1817H85.9136C84.923 99.1817 84.106 99.9886 84.106 100.989V101.837C84.106 102.828 84.9128 103.645 85.9136 103.645H88.2115V99.1817Z" fill="#A3E635"/>
+<path d="M106.298 99.1817H94.094V103.645H106.298C107.289 103.645 108.106 102.828 108.106 101.837V100.989C108.106 99.9886 107.289 99.1817 106.298 99.1817Z" fill="#A3E635"/>
+<path d="M98.1179 89.2754H85.9136C84.923 89.2754 84.106 90.0822 84.106 91.0831V91.9308C84.106 92.9214 84.9128 93.7385 85.9136 93.7385H98.1179V89.2754Z" fill="#A3E635"/>
+<path d="M106.298 89.2754H104V93.7384H106.298C107.289 93.7384 108.106 92.9316 108.106 91.9307V91.0831C108.106 90.0822 107.289 89.2754 106.298 89.2754Z" fill="#A3E635"/>
+<path d="M172.401 132.883C172.401 128.465 168.82 124.883 164.401 124.883H148.401C143.983 124.883 140.401 128.465 140.401 132.883V148.883C140.401 153.301 143.983 156.883 148.401 156.883H164.401C168.82 156.883 172.401 153.301 172.401 148.883V132.883Z" fill="#E2E8F0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M148.401 126.383H164.401C167.991 126.383 170.901 129.293 170.901 132.883V148.883C170.901 152.473 167.991 155.383 164.401 155.383H148.401C144.812 155.383 141.901 152.473 141.901 148.883V132.883C141.901 129.293 144.812 126.383 148.401 126.383ZM164.401 124.883C168.82 124.883 172.401 128.465 172.401 132.883V148.883C172.401 153.301 168.82 156.883 164.401 156.883H148.401C143.983 156.883 140.401 153.301 140.401 148.883V132.883C140.401 128.465 143.983 124.883 148.401 124.883H164.401Z" fill="#94A3B8"/>
+<path d="M52.4014 45C52.4014 40.5817 48.8196 37 44.4014 37H28.4014C23.9831 37 20.4014 40.5817 20.4014 45V61C20.4014 65.4183 23.9831 69 28.4014 69H44.4014C48.8196 69 52.4014 65.4183 52.4014 61V45Z" fill="#E2E8F0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.4014 38.5H44.4014C47.9912 38.5 50.9014 41.4101 50.9014 45V61C50.9014 64.5899 47.9912 67.5 44.4014 67.5H28.4014C24.8115 67.5 21.9014 64.5899 21.9014 61V45C21.9014 41.4101 24.8115 38.5 28.4014 38.5ZM44.4014 37C48.8196 37 52.4014 40.5817 52.4014 45V61C52.4014 65.4183 48.8196 69 44.4014 69H28.4014C23.9831 69 20.4014 65.4183 20.4014 61V45C20.4014 40.5817 23.9831 37 28.4014 37H44.4014Z" fill="#94A3B8"/>
+</svg>
diff --git a/briar-android/artwork/il_transfer_data_dark.svg b/briar-android/artwork/il_transfer_data_dark.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4a35f3a9c7e290fb7529c527a442b3d0c505249d
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_dark.svg
@@ -0,0 +1,30 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M41.8301 84C41.8301 85.1046 40.9346 86 39.8301 86L20.9721 86C19.8676 86 18.9721 85.1046 18.9721 84L18.9721 65.6136L41.8301 65.6136L41.8301 84Z" fill="#123060"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.5801 84C42.5801 85.5188 41.3489 86.75 39.8301 86.75L20.9721 86.75C19.4533 86.75 18.2221 85.5188 18.2221 84L18.2221 64.8636L42.5801 64.8636L42.5801 84ZM39.8301 85.25C40.5204 85.25 41.0801 84.6904 41.0801 84L41.0801 66.3636L19.7221 66.3636L19.7221 84C19.7221 84.6904 20.2818 85.25 20.9721 85.25L39.8301 85.25Z" fill="#52ADF9"/>
+<path d="M46.4014 61.6211C46.4014 63.8302 44.6105 65.6211 42.4014 65.6211L18.4014 65.6211C16.1922 65.6211 14.4014 63.8302 14.4014 61.6211L14.4014 27C14.4014 24.7909 16.1922 23 18.4014 23L42.4014 23C44.6105 23 46.4014 24.7909 46.4014 27L46.4014 61.6211Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.1514 61.6211C47.1514 64.2445 45.0247 66.3711 42.4014 66.3711L18.4014 66.3711C15.778 66.3711 13.6514 64.2444 13.6514 61.6211L13.6514 27C13.6514 24.3767 15.778 22.25 18.4014 22.25L42.4014 22.25C45.0247 22.25 47.1514 24.3767 47.1514 27L47.1514 61.6211ZM42.4014 64.8711C44.1963 64.8711 45.6514 63.416 45.6514 61.6211L45.6514 27C45.6514 25.2051 44.1963 23.75 42.4014 23.75L18.4014 23.75C16.6064 23.75 15.1514 25.2051 15.1514 27L15.1514 61.6211C15.1514 63.416 16.6064 64.8711 18.4014 64.8711L42.4014 64.8711Z" fill="#52ADF9"/>
+<path d="M37.7783 77.5859L33.2226 77.5859L33.2226 74.4576L37.7783 74.4576L37.7783 77.5859Z" fill="#52ADF9"/>
+<path d="M27.5796 77.5859L23.0238 77.5859L23.0238 74.4576L27.5796 74.4576L27.5796 77.5859Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M152.001 121C152.001 118.791 153.792 117 156.001 117H180.402C182.611 117 184.402 118.791 184.402 121V164C184.402 166.209 182.611 168 180.402 168H152.001V167.996H149.401C147.192 167.996 145.401 166.205 145.401 163.996V152.676C145.401 152.129 145.626 151.605 146.022 151.228L146.665 150.615C147.062 150.238 147.286 149.714 147.286 149.167V147.094C147.286 146.567 147.078 146.061 146.707 145.687L145.98 144.952C145.609 144.578 145.401 144.072 145.401 143.545V141.437C145.401 140.788 145.716 140.179 146.246 139.804L152.001 135.732V121ZM156.964 123.659C156.964 122.554 157.86 121.659 158.964 121.659H160.258C161.363 121.659 162.258 122.554 162.258 123.659V132.074C162.258 133.179 161.363 134.074 160.258 134.074H158.964C157.86 134.074 156.964 133.179 156.964 132.074V123.659ZM167.555 121.659C166.45 121.659 165.555 122.554 165.555 123.659V132.074C165.555 133.179 166.45 134.074 167.555 134.074H168.849C169.953 134.074 170.849 133.179 170.849 132.074V123.659C170.849 122.554 169.953 121.659 168.849 121.659H167.555ZM174.145 123.659C174.145 122.554 175.041 121.659 176.145 121.659H177.439C178.544 121.659 179.439 122.554 179.439 123.659V132.074C179.439 133.179 178.544 134.074 177.439 134.074H176.145C175.041 134.074 174.145 133.179 174.145 132.074V123.659Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M151.251 121C151.251 118.377 153.378 116.25 156.001 116.25H180.402C183.025 116.25 185.152 118.377 185.152 121V164C185.152 166.623 183.025 168.75 180.402 168.75H151.251V168.746H149.401C146.778 168.746 144.651 166.62 144.651 163.996V152.676C144.651 151.923 144.96 151.204 145.505 150.685L146.148 150.072C146.396 149.836 146.536 149.509 146.536 149.167V147.094C146.536 146.764 146.406 146.448 146.174 146.214L145.447 145.48C144.937 144.965 144.651 144.27 144.651 143.545V141.437C144.651 140.544 145.084 139.707 145.813 139.192L151.251 135.343V121ZM152.751 167.25H180.402C182.196 167.25 183.652 165.795 183.652 164V121C183.652 119.205 182.196 117.75 180.402 117.75H156.001C154.206 117.75 152.751 119.205 152.751 121V136.12L146.679 140.416C146.348 140.651 146.151 141.031 146.151 141.437V143.545C146.151 143.874 146.281 144.19 146.513 144.424L147.24 145.159C147.75 145.674 148.036 146.369 148.036 147.094V149.167C148.036 149.919 147.728 150.639 147.183 151.158L146.539 151.771C146.292 152.007 146.151 152.334 146.151 152.676V163.996C146.151 165.791 147.606 167.246 149.401 167.246H152.751V167.25ZM156.214 123.659C156.214 122.14 157.446 120.909 158.964 120.909H160.258C161.777 120.909 163.008 122.14 163.008 123.659V132.074C163.008 133.593 161.777 134.824 160.258 134.824H158.964C157.446 134.824 156.214 133.593 156.214 132.074V123.659ZM158.964 122.409C158.274 122.409 157.714 122.968 157.714 123.659V132.074C157.714 132.764 158.274 133.324 158.964 133.324H160.258C160.949 133.324 161.508 132.765 161.508 132.074V123.659C161.508 122.968 160.949 122.409 160.258 122.409H158.964ZM167.555 122.409C166.864 122.409 166.305 122.968 166.305 123.659V132.074C166.305 132.764 166.864 133.324 167.555 133.324H168.849C169.539 133.324 170.099 132.764 170.099 132.074V123.659C170.099 122.968 169.539 122.409 168.849 122.409H167.555ZM164.805 123.659C164.805 122.14 166.036 120.909 167.555 120.909H168.849C170.367 120.909 171.599 122.14 171.599 123.659V132.074C171.599 133.593 170.367 134.824 168.849 134.824H167.555C166.036 134.824 164.805 133.593 164.805 132.074V123.659ZM173.395 123.659C173.395 122.14 174.627 120.909 176.145 120.909H177.439C178.958 120.909 180.189 122.14 180.189 123.659V132.074C180.189 133.593 178.958 134.824 177.439 134.824H176.145C174.627 134.824 173.395 133.593 173.395 132.074V123.659ZM176.145 122.409C175.455 122.409 174.895 122.968 174.895 123.659V132.074C174.895 132.764 175.455 133.324 176.145 133.324H177.439C178.13 133.324 178.689 132.765 178.689 132.074V123.659C178.689 122.968 178.13 122.409 177.439 122.409H176.145Z" fill="#52ADF9"/>
+<path d="M30.4014 111C32.6105 111 34.4014 112.791 34.4014 115C34.4014 117.209 32.6105 119 30.4014 119C28.1922 119 26.4014 117.209 26.4014 115C26.4014 112.791 28.1922 111 30.4014 111Z" fill="#1457C5"/>
+<path d="M30.4014 95C32.6105 95 34.4014 96.7909 34.4014 99C34.4014 101.209 32.6105 103 30.4014 103C28.1922 103 26.4014 101.209 26.4014 99C26.4014 96.7909 28.1922 95 30.4014 95Z" fill="#2B8EF1"/>
+<path d="M30.4014 127C32.6105 127 34.4014 128.791 34.4014 131C34.4014 133.209 32.6105 135 30.4014 135C28.1922 135 26.4014 133.209 26.4014 131C26.4014 128.791 28.1922 127 30.4014 127Z" fill="#184080"/>
+<path d="M168.401 92C166.192 92 164.401 90.2091 164.401 88C164.401 85.7909 166.192 84 168.401 84C170.611 84 172.401 85.7909 172.401 88C172.401 90.2091 170.611 92 168.401 92Z" fill="#1457C5"/>
+<path d="M168.401 108C166.192 108 164.401 106.209 164.401 104C164.401 101.791 166.192 100 168.401 100C170.611 100 172.401 101.791 172.401 104C172.401 106.209 170.611 108 168.401 108Z" fill="#2B8EF1"/>
+<path d="M168.401 76C166.192 76 164.401 74.2091 164.401 72C164.401 69.7909 166.192 68 168.401 68C170.611 68 172.401 69.7909 172.401 72C172.401 74.2091 170.611 76 168.401 76Z" fill="#184080"/>
+<path d="M57.4014 35.0312C57.4014 28.4038 62.774 23.0312 69.4014 23.0312H123.401C130.029 23.0312 135.401 28.4038 135.401 35.0312V156.031C135.401 162.659 130.029 168.031 123.401 168.031H69.4014C62.7739 168.031 57.4014 162.659 57.4014 156.031V35.0312Z" fill="#1E293B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M123.401 24.5312H69.4014C63.6024 24.5312 58.9014 29.2323 58.9014 35.0312V156.031C58.9014 161.83 63.6024 166.531 69.4014 166.531H123.401C129.2 166.531 133.901 161.83 133.901 156.031V35.0312C133.901 29.2323 129.2 24.5312 123.401 24.5312ZM69.4014 23.0312C62.774 23.0312 57.4014 28.4038 57.4014 35.0312V156.031C57.4014 162.659 62.7739 168.031 69.4014 168.031H123.401C130.029 168.031 135.401 162.659 135.401 156.031V35.0312C135.401 28.4038 130.029 23.0312 123.401 23.0312H69.4014Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M96.4014 35.4092C95.5729 35.4092 94.9014 34.7376 94.9014 33.9092C94.9014 33.0808 95.5729 32.4092 96.4014 32.4092C97.2298 32.4092 97.9014 33.0808 97.9014 33.9092C97.9014 34.7376 97.2298 35.4092 96.4014 35.4092ZM96.4014 36.9092C94.7445 36.9092 93.4014 35.566 93.4014 33.9092C93.4014 32.2523 94.7445 30.9092 96.4014 30.9092C98.0582 30.9092 99.4014 32.2523 99.4014 33.9092C99.4014 35.566 98.0582 36.9092 96.4014 36.9092Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M77.6514 33.5923C77.6514 33.1781 77.9872 32.8423 78.4014 32.8423H88.4014C88.8156 32.8423 89.1514 33.1781 89.1514 33.5923C89.1514 34.0065 88.8156 34.3423 88.4014 34.3423H78.4014C77.9872 34.3423 77.6514 34.0065 77.6514 33.5923Z" fill="#A3E635"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M103.651 33.5923C103.651 33.1781 103.987 32.8423 104.401 32.8423L114.401 32.8423C114.816 32.8423 115.151 33.1781 115.151 33.5923C115.151 34.0065 114.816 34.3423 114.401 34.3423L104.401 34.3423C103.987 34.3423 103.651 34.0065 103.651 33.5923Z" fill="#A3E635"/>
+<path d="M128.401 50.6338C128.401 46.2155 124.82 42.6338 120.401 42.6338H72.4014C67.9831 42.6338 64.4014 46.2155 64.4014 50.6338V146.634C64.4014 151.052 67.9831 154.634 72.4014 154.634H120.401C124.82 154.634 128.401 151.052 128.401 146.634V50.6338Z" fill="#0B1120"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.4014 44.1338H120.401C123.991 44.1338 126.901 47.0439 126.901 50.6338V146.634C126.901 150.224 123.991 153.134 120.401 153.134H72.4014C68.8115 153.134 65.9014 150.224 65.9014 146.634V50.6338C65.9014 47.0439 68.8115 44.1338 72.4014 44.1338ZM120.401 42.6338C124.82 42.6338 128.401 46.2155 128.401 50.6338V146.634C128.401 151.052 124.82 154.634 120.401 154.634H72.4014C67.9831 154.634 64.4014 151.052 64.4014 146.634V50.6338C64.4014 46.2155 67.9831 42.6338 72.4014 42.6338H120.401Z" fill="#A3E635"/>
+<path d="M71.4014 104C71.4014 95.1634 78.5648 88 87.4014 88H105.401C114.238 88 121.401 95.1634 121.401 104V148H87.4014C78.5648 148 71.4014 140.837 71.4014 132V104Z" fill="#184080"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M105.401 89.5H87.4014C79.3932 89.5 72.9014 95.9919 72.9014 104V132C72.9014 140.008 79.3932 146.5 87.4014 146.5H119.901V104C119.901 95.9919 113.409 89.5 105.401 89.5ZM87.4014 88C78.5648 88 71.4014 95.1634 71.4014 104V132C71.4014 140.837 78.5648 148 87.4014 148H121.401V104C121.401 95.1634 114.238 88 105.401 88H87.4014Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 109.911C83.957 109.496 84.2928 109.161 84.707 109.161H108.031C108.445 109.161 108.781 109.496 108.781 109.911C108.781 110.325 108.445 110.661 108.031 110.661H84.707C84.2928 110.661 83.957 110.325 83.957 109.911Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 118.004C83.957 117.59 84.2928 117.254 84.707 117.254H108.031C108.445 117.254 108.781 117.59 108.781 118.004C108.781 118.418 108.445 118.754 108.031 118.754H84.707C84.2928 118.754 83.957 118.418 83.957 118.004Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 134.179C83.957 133.764 84.2928 133.429 84.707 133.429H96.3689C96.7831 133.429 97.1189 133.764 97.1189 134.179C97.1189 134.593 96.7831 134.929 96.3689 134.929H84.707C84.2928 134.929 83.957 134.593 83.957 134.179Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 101.825C83.957 101.411 84.2928 101.075 84.707 101.075H108.031C108.445 101.075 108.781 101.411 108.781 101.825C108.781 102.239 108.445 102.575 108.031 102.575H84.707C84.2928 102.575 83.957 102.239 83.957 101.825Z" fill="#52ADF9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 126.093C83.957 125.679 84.2928 125.343 84.707 125.343H108.1C108.514 125.343 108.85 125.679 108.85 126.093C108.85 126.507 108.514 126.843 108.1 126.843H84.707C84.2928 126.843 83.957 126.507 83.957 126.093Z" fill="#52ADF9"/>
+</svg>
diff --git a/briar-android/artwork/il_transfer_data_light.svg b/briar-android/artwork/il_transfer_data_light.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c9c704d2699c4c87be0cc32463c44d2d4451a6f1
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_light.svg
@@ -0,0 +1,30 @@
+<svg width="193" height="192" viewBox="0 0 193 192" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M41.8301 84C41.8301 85.1046 40.9346 86 39.8301 86L20.9721 86C19.8676 86 18.9721 85.1046 18.9721 84L18.9721 65.6136L41.8301 65.6136L41.8301 84Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.5801 84C42.5801 85.5188 41.3489 86.75 39.8301 86.75L20.9721 86.75C19.4533 86.75 18.2221 85.5188 18.2221 84L18.2221 64.8636L42.5801 64.8636L42.5801 84ZM39.8301 85.25C40.5204 85.25 41.0801 84.6904 41.0801 84L41.0801 66.3636L19.7221 66.3636L19.7221 84C19.7221 84.6904 20.2818 85.25 20.9721 85.25L39.8301 85.25Z" fill="#196FDE"/>
+<path d="M46.4014 61.6211C46.4014 63.8302 44.6105 65.6211 42.4014 65.6211L18.4014 65.6211C16.1922 65.6211 14.4014 63.8302 14.4014 61.6211L14.4014 27C14.4014 24.7909 16.1922 23 18.4014 23L42.4014 23C44.6105 23 46.4014 24.7909 46.4014 27L46.4014 61.6211Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.1514 61.6211C47.1514 64.2445 45.0247 66.3711 42.4014 66.3711L18.4014 66.3711C15.778 66.3711 13.6514 64.2444 13.6514 61.6211L13.6514 27C13.6514 24.3767 15.778 22.25 18.4014 22.25L42.4014 22.25C45.0247 22.25 47.1514 24.3767 47.1514 27L47.1514 61.6211ZM42.4014 64.8711C44.1963 64.8711 45.6514 63.416 45.6514 61.6211L45.6514 27C45.6514 25.2051 44.1963 23.75 42.4014 23.75L18.4014 23.75C16.6064 23.75 15.1514 25.2051 15.1514 27L15.1514 61.6211C15.1514 63.416 16.6064 64.8711 18.4014 64.8711L42.4014 64.8711Z" fill="#196FDE"/>
+<path d="M37.7783 77.5859L33.2226 77.5859L33.2226 74.4576L37.7783 74.4576L37.7783 77.5859Z" fill="#196FDE"/>
+<path d="M27.5796 77.5859L23.0238 77.5859L23.0238 74.4576L27.5796 74.4576L27.5796 77.5859Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M152.001 121C152.001 118.791 153.792 117 156.001 117H180.402C182.611 117 184.402 118.791 184.402 121V164C184.402 166.209 182.611 168 180.402 168H152.001V167.996H149.401C147.192 167.996 145.401 166.205 145.401 163.996V152.676C145.401 152.129 145.626 151.605 146.022 151.228L146.665 150.615C147.062 150.238 147.286 149.714 147.286 149.167V147.094C147.286 146.567 147.078 146.061 146.707 145.687L145.98 144.952C145.609 144.578 145.401 144.072 145.401 143.545V141.437C145.401 140.788 145.716 140.179 146.246 139.804L152.001 135.732V121ZM156.964 123.659C156.964 122.554 157.86 121.659 158.964 121.659H160.258C161.363 121.659 162.258 122.554 162.258 123.659V132.074C162.258 133.179 161.363 134.074 160.258 134.074H158.964C157.86 134.074 156.964 133.179 156.964 132.074V123.659ZM167.555 121.659C166.45 121.659 165.555 122.554 165.555 123.659V132.074C165.555 133.179 166.45 134.074 167.555 134.074H168.849C169.953 134.074 170.849 133.179 170.849 132.074V123.659C170.849 122.554 169.953 121.659 168.849 121.659H167.555ZM174.145 123.659C174.145 122.554 175.041 121.659 176.145 121.659H177.439C178.544 121.659 179.439 122.554 179.439 123.659V132.074C179.439 133.179 178.544 134.074 177.439 134.074H176.145C175.041 134.074 174.145 133.179 174.145 132.074V123.659Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M151.251 121C151.251 118.377 153.378 116.25 156.001 116.25H180.402C183.025 116.25 185.152 118.377 185.152 121V164C185.152 166.623 183.025 168.75 180.402 168.75H151.251V168.746H149.401C146.778 168.746 144.651 166.62 144.651 163.996V152.676C144.651 151.923 144.96 151.204 145.505 150.685L146.148 150.072C146.396 149.836 146.536 149.509 146.536 149.167V147.094C146.536 146.764 146.406 146.448 146.174 146.214L145.447 145.48C144.937 144.965 144.651 144.27 144.651 143.545V141.437C144.651 140.544 145.084 139.707 145.813 139.192L151.251 135.343V121ZM152.751 167.25H180.402C182.196 167.25 183.652 165.795 183.652 164V121C183.652 119.205 182.196 117.75 180.402 117.75H156.001C154.206 117.75 152.751 119.205 152.751 121V136.12L146.679 140.416C146.348 140.651 146.151 141.031 146.151 141.437V143.545C146.151 143.874 146.281 144.19 146.513 144.424L147.24 145.159C147.75 145.674 148.036 146.369 148.036 147.094V149.167C148.036 149.919 147.728 150.639 147.183 151.158L146.539 151.771C146.292 152.007 146.151 152.334 146.151 152.676V163.996C146.151 165.791 147.606 167.246 149.401 167.246H152.751V167.25ZM156.214 123.659C156.214 122.14 157.446 120.909 158.964 120.909H160.258C161.777 120.909 163.008 122.14 163.008 123.659V132.074C163.008 133.593 161.777 134.824 160.258 134.824H158.964C157.446 134.824 156.214 133.593 156.214 132.074V123.659ZM158.964 122.409C158.274 122.409 157.714 122.968 157.714 123.659V132.074C157.714 132.764 158.274 133.324 158.964 133.324H160.258C160.949 133.324 161.508 132.765 161.508 132.074V123.659C161.508 122.968 160.949 122.409 160.258 122.409H158.964ZM167.555 122.409C166.864 122.409 166.305 122.968 166.305 123.659V132.074C166.305 132.764 166.864 133.324 167.555 133.324H168.849C169.539 133.324 170.099 132.764 170.099 132.074V123.659C170.099 122.968 169.539 122.409 168.849 122.409H167.555ZM164.805 123.659C164.805 122.14 166.036 120.909 167.555 120.909H168.849C170.367 120.909 171.599 122.14 171.599 123.659V132.074C171.599 133.593 170.367 134.824 168.849 134.824H167.555C166.036 134.824 164.805 133.593 164.805 132.074V123.659ZM173.395 123.659C173.395 122.14 174.627 120.909 176.145 120.909H177.439C178.958 120.909 180.189 122.14 180.189 123.659V132.074C180.189 133.593 178.958 134.824 177.439 134.824H176.145C174.627 134.824 173.395 133.593 173.395 132.074V123.659ZM176.145 122.409C175.455 122.409 174.895 122.968 174.895 123.659V132.074C174.895 132.764 175.455 133.324 176.145 133.324H177.439C178.13 133.324 178.689 132.765 178.689 132.074V123.659C178.689 122.968 178.13 122.409 177.439 122.409H176.145Z" fill="#196FDE"/>
+<path d="M30.4014 111C32.6105 111 34.4014 112.791 34.4014 115C34.4014 117.209 32.6105 119 30.4014 119C28.1922 119 26.4014 117.209 26.4014 115C26.4014 112.791 28.1922 111 30.4014 111Z" fill="#8BCAFD"/>
+<path d="M30.4014 95C32.6105 95 34.4014 96.7909 34.4014 99C34.4014 101.209 32.6105 103 30.4014 103C28.1922 103 26.4014 101.209 26.4014 99C26.4014 96.7909 28.1922 95 30.4014 95Z" fill="#52ADF9"/>
+<path d="M30.4014 127C32.6105 127 34.4014 128.791 34.4014 131C34.4014 133.209 32.6105 135 30.4014 135C28.1922 135 26.4014 133.209 26.4014 131C26.4014 128.791 28.1922 127 30.4014 127Z" fill="#BDDFFE"/>
+<path d="M168.401 92C166.192 92 164.401 90.2091 164.401 88C164.401 85.7909 166.192 84 168.401 84C170.611 84 172.401 85.7909 172.401 88C172.401 90.2091 170.611 92 168.401 92Z" fill="#8BCAFD"/>
+<path d="M168.401 108C166.192 108 164.401 106.209 164.401 104C164.401 101.791 166.192 100 168.401 100C170.611 100 172.401 101.791 172.401 104C172.401 106.209 170.611 108 168.401 108Z" fill="#52ADF9"/>
+<path d="M168.401 76C166.192 76 164.401 74.2091 164.401 72C164.401 69.7909 166.192 68 168.401 68C170.611 68 172.401 69.7909 172.401 72C172.401 74.2091 170.611 76 168.401 76Z" fill="#BDDFFE"/>
+<path d="M57.4014 35.0312C57.4014 28.4038 62.774 23.0312 69.4014 23.0312H123.401C130.029 23.0312 135.401 28.4038 135.401 35.0312V156.031C135.401 162.659 130.029 168.031 123.401 168.031H69.4014C62.7739 168.031 57.4014 162.659 57.4014 156.031V35.0312Z" fill="#ECFCCB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M123.401 24.5312H69.4014C63.6024 24.5312 58.9014 29.2323 58.9014 35.0312V156.031C58.9014 161.83 63.6024 166.531 69.4014 166.531H123.401C129.2 166.531 133.901 161.83 133.901 156.031V35.0312C133.901 29.2323 129.2 24.5312 123.401 24.5312ZM69.4014 23.0312C62.774 23.0312 57.4014 28.4038 57.4014 35.0312V156.031C57.4014 162.659 62.7739 168.031 69.4014 168.031H123.401C130.029 168.031 135.401 162.659 135.401 156.031V35.0312C135.401 28.4038 130.029 23.0312 123.401 23.0312H69.4014Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M96.4014 35.4092C95.5729 35.4092 94.9014 34.7376 94.9014 33.9092C94.9014 33.0808 95.5729 32.4092 96.4014 32.4092C97.2298 32.4092 97.9014 33.0808 97.9014 33.9092C97.9014 34.7376 97.2298 35.4092 96.4014 35.4092ZM96.4014 36.9092C94.7445 36.9092 93.4014 35.566 93.4014 33.9092C93.4014 32.2523 94.7445 30.9092 96.4014 30.9092C98.0582 30.9092 99.4014 32.2523 99.4014 33.9092C99.4014 35.566 98.0582 36.9092 96.4014 36.9092Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M77.6514 33.5923C77.6514 33.1781 77.9872 32.8423 78.4014 32.8423H88.4014C88.8156 32.8423 89.1514 33.1781 89.1514 33.5923C89.1514 34.0065 88.8156 34.3423 88.4014 34.3423H78.4014C77.9872 34.3423 77.6514 34.0065 77.6514 33.5923Z" fill="#65A30D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M103.651 33.5923C103.651 33.1781 103.987 32.8423 104.401 32.8423L114.401 32.8423C114.816 32.8423 115.151 33.1781 115.151 33.5923C115.151 34.0065 114.816 34.3423 114.401 34.3423L104.401 34.3423C103.987 34.3423 103.651 34.0065 103.651 33.5923Z" fill="#65A30D"/>
+<path d="M128.401 50.6338C128.401 46.2155 124.82 42.6338 120.401 42.6338H72.4014C67.9831 42.6338 64.4014 46.2155 64.4014 50.6338V146.634C64.4014 151.052 67.9831 154.634 72.4014 154.634H120.401C124.82 154.634 128.401 151.052 128.401 146.634V50.6338Z" fill="#F9FAFB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.4014 44.1338H120.401C123.991 44.1338 126.901 47.0439 126.901 50.6338V146.634C126.901 150.224 123.991 153.134 120.401 153.134H72.4014C68.8115 153.134 65.9014 150.224 65.9014 146.634V50.6338C65.9014 47.0439 68.8115 44.1338 72.4014 44.1338ZM120.401 42.6338C124.82 42.6338 128.401 46.2155 128.401 50.6338V146.634C128.401 151.052 124.82 154.634 120.401 154.634H72.4014C67.9831 154.634 64.4014 151.052 64.4014 146.634V50.6338C64.4014 46.2155 67.9831 42.6338 72.4014 42.6338H120.401Z" fill="#65A30D"/>
+<path d="M71.4014 104C71.4014 95.1634 78.5648 88 87.4014 88H105.401C114.238 88 121.401 95.1634 121.401 104V148H87.4014C78.5648 148 71.4014 140.837 71.4014 132V104Z" fill="#DDEDFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M105.401 89.5H87.4014C79.3932 89.5 72.9014 95.9919 72.9014 104V132C72.9014 140.008 79.3932 146.5 87.4014 146.5H119.901V104C119.901 95.9919 113.409 89.5 105.401 89.5ZM87.4014 88C78.5648 88 71.4014 95.1634 71.4014 104V132C71.4014 140.837 78.5648 148 87.4014 148H121.401V104C121.401 95.1634 114.238 88 105.401 88H87.4014Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 109.911C83.957 109.496 84.2928 109.161 84.707 109.161H108.031C108.445 109.161 108.781 109.496 108.781 109.911C108.781 110.325 108.445 110.661 108.031 110.661H84.707C84.2928 110.661 83.957 110.325 83.957 109.911Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 118.004C83.957 117.59 84.2928 117.254 84.707 117.254H108.031C108.445 117.254 108.781 117.59 108.781 118.004C108.781 118.418 108.445 118.754 108.031 118.754H84.707C84.2928 118.754 83.957 118.418 83.957 118.004Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 134.179C83.957 133.764 84.2928 133.429 84.707 133.429H96.3689C96.7831 133.429 97.1189 133.764 97.1189 134.179C97.1189 134.593 96.7831 134.929 96.3689 134.929H84.707C84.2928 134.929 83.957 134.593 83.957 134.179Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 101.825C83.957 101.411 84.2928 101.075 84.707 101.075H108.031C108.445 101.075 108.781 101.411 108.781 101.825C108.781 102.239 108.445 102.575 108.031 102.575H84.707C84.2928 102.575 83.957 102.239 83.957 101.825Z" fill="#196FDE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.957 126.093C83.957 125.679 84.2928 125.343 84.707 125.343H108.1C108.514 125.343 108.85 125.679 108.85 126.093C108.85 126.507 108.514 126.843 108.1 126.843H84.707C84.2928 126.843 83.957 126.507 83.957 126.093Z" fill="#196FDE"/>
+</svg>
diff --git a/briar-android/artwork/il_transfer_data_receive.svg b/briar-android/artwork/il_transfer_data_receive.svg
new file mode 100644
index 0000000000000000000000000000000000000000..38a7251528a1b93e6ab3faad7a9b5ca77c1531d6
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_receive.svg
@@ -0,0 +1,47 @@
+<svg width="289" height="144" viewBox="0 0 289 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <rect x="-0.75" y="0.75" width="40.5" height="76.5" rx="7.25"
+ transform="matrix(-1 0 0 1 271.967 33)" fill="#DDEDFE" stroke="#196FDE"
+ stroke-width="1.5" />
+ <path d="M272.717 47.9976H232.217V100.498H272.717V47.9976Z" fill="#F9FAFB" stroke="#196FDE"
+ stroke-width="1.5" />
+ <rect x="236.072" y="65.1011" width="32.7896" height="18.293" rx="4" fill="#ECFCCB" />
+ <path d="M242.584 71.5542H262.457" stroke="#65A30D" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M242.584 77.6519H253.264" stroke="#65A30D" stroke-width="1.5" stroke-linecap="round" />
+ <ellipse rx="1" ry="1.00118" transform="matrix(-1 0 0 1 252.467 41.0012)" fill="#196FDE" />
+ <path
+ d="M244.467 40.2744C244.053 40.2744 243.717 40.6102 243.717 41.0244C243.717 41.4386 244.053 41.7744 244.467 41.7744V40.2744ZM248.467 41.7744C248.881 41.7744 249.217 41.4386 249.217 41.0244C249.217 40.6102 248.881 40.2744 248.467 40.2744V41.7744ZM244.467 41.7744H248.467V40.2744H244.467V41.7744Z"
+ fill="#196FDE" />
+ <path
+ d="M256.467 40.2744C256.053 40.2744 255.717 40.6102 255.717 41.0244C255.717 41.4386 256.053 41.7744 256.467 41.7744V40.2744ZM260.467 41.7744C260.881 41.7744 261.217 41.4386 261.217 41.0244C261.217 40.6102 260.881 40.2744 260.467 40.2744V41.7744ZM256.467 41.7744H260.467V40.2744H256.467V41.7744Z"
+ fill="#196FDE" />
+ <circle cx="89.467" cy="72" r="4" fill="#BEF264" />
+ <circle cx="105.467" cy="72" r="4" fill="#A3E635" />
+ <circle cx="73.467" cy="72" r="4" fill="#D9F99D" />
+ <circle cx="198.467" cy="72" r="4" fill="#BEF264" />
+ <circle cx="214.467" cy="72" r="4" fill="#A3E635" />
+ <circle cx="182.467" cy="72" r="4" fill="#D9F99D" />
+ <path
+ d="M29.0383 43C29.0383 41.8954 29.9338 41 31.0383 41H49.8963C51.0008 41 51.8963 41.8954 51.8963 43V61.3864H29.0383L29.0383 43Z"
+ fill="#F9FAFB" stroke="#196FDE" stroke-width="1.5" />
+ <path
+ d="M24.4673 65.3789C24.4673 63.1698 26.2581 61.3789 28.4673 61.3789H52.4673C54.6764 61.3789 56.4673 63.1698 56.4673 65.3789L56.4673 100C56.4673 102.209 54.6764 104 52.4673 104H28.4673C26.2581 104 24.4673 102.209 24.4673 100L24.4673 65.3789Z"
+ fill="#DDEDFE" stroke="#196FDE" stroke-width="1.5" />
+ <rect x="33.0901" y="49.4141" width="4.55576" height="3.12838" fill="#196FDE" />
+ <rect x="43.2888" y="49.4141" width="4.55576" height="3.12838" fill="#196FDE" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M151.865 42L143.967 42H126.467C124.258 42 122.467 43.7909 122.467 46L122.467 98C122.467 100.209 124.258 102 126.467 102L161.467 102C163.676 102 165.467 100.209 165.467 98L165.467 55.9695L151.865 42Z"
+ fill="#ECFCCB" />
+ <path
+ d="M143.967 42L143.967 41.25H143.967V42ZM151.865 42L152.402 41.4768L152.181 41.25L151.865 41.25L151.865 42ZM122.467 46H123.217H122.467ZM122.467 98H121.717H122.467ZM126.467 102V101.25V102ZM161.467 102V102.75V102ZM165.467 98H164.717H165.467ZM165.467 55.9695H166.217V55.6646L166.004 55.4462L165.467 55.9695ZM143.967 42.75L151.865 42.75L151.865 41.25L143.967 41.25L143.967 42.75ZM126.467 42.75H143.967V41.25H126.467V42.75ZM123.217 46C123.217 44.2051 124.672 42.75 126.467 42.75V41.25C123.844 41.25 121.717 43.3766 121.717 46H123.217ZM123.217 98L123.217 46H121.717L121.717 98H123.217ZM126.467 101.25C124.672 101.25 123.217 99.7949 123.217 98H121.717C121.717 100.623 123.844 102.75 126.467 102.75V101.25ZM161.467 101.25L126.467 101.25V102.75L161.467 102.75V101.25ZM164.717 98C164.717 99.7949 163.262 101.25 161.467 101.25V102.75C164.09 102.75 166.217 100.623 166.217 98H164.717ZM164.717 55.9695L164.717 98H166.217L166.217 55.9695H164.717ZM166.004 55.4462L152.402 41.4768L151.327 42.5232L164.93 56.4927L166.004 55.4462Z"
+ fill="#65A30D" />
+ <path
+ d="M165.197 55.6787L156.162 55.6787C153.952 55.6787 152.162 53.8878 152.162 51.6787L152.162 42.2911L165.197 55.6787Z"
+ fill="#F7FEE7" stroke="#65A30D" stroke-width="1.5" stroke-linejoin="round" />
+ <path d="M134.07 63.4902H153.911" stroke="#65A30D" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M134.07 69.0361H144.733" stroke="#65A30D" stroke-width="1.5" stroke-linecap="round" />
+ <path
+ d="M143.164 80.7328C143.164 78.654 141.479 76.9688 139.4 76.9688C137.321 76.9688 135.636 78.654 135.636 80.7328V87.4129C135.636 89.4917 137.321 91.1769 139.4 91.1769C141.479 91.1769 143.164 89.4917 143.164 87.4129V80.7328Z"
+ stroke="#65A30D" stroke-width="1.5" />
+ <rect x="133.066" y="84.52" width="12.671" height="9.44635" rx="1.25" fill="#A3E635"
+ stroke="#65A30D" stroke-width="1.5" />
+</svg>
diff --git a/briar-android/artwork/il_transfer_data_receive_night.svg b/briar-android/artwork/il_transfer_data_receive_night.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4686c69eaa3ef5c667dc73559052df84bc668a21
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_receive_night.svg
@@ -0,0 +1,47 @@
+<svg width="289" height="144" viewBox="0 0 289 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <rect x="-0.75" y="0.75" width="40.5" height="76.5" rx="7.25"
+ transform="matrix(-1 0 0 1 271.967 33)" fill="#1E293B" stroke="#52ADF9"
+ stroke-width="1.5" />
+ <path d="M272.717 47.9976H232.217V100.498H272.717V47.9976Z" fill="#0B1120" stroke="#52ADF9"
+ stroke-width="1.5" />
+ <rect x="236.072" y="65.1011" width="32.7896" height="18.293" rx="4" fill="#365314" />
+ <path d="M242.584 71.5542H262.457" stroke="#A3E635" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M242.584 77.6519H253.264" stroke="#A3E635" stroke-width="1.5" stroke-linecap="round" />
+ <ellipse rx="1" ry="1.00118" transform="matrix(-1 0 0 1 252.467 41.0012)" fill="#52ADF9" />
+ <path
+ d="M244.467 40.2744C244.053 40.2744 243.717 40.6102 243.717 41.0244C243.717 41.4386 244.053 41.7744 244.467 41.7744V40.2744ZM248.467 41.7744C248.881 41.7744 249.217 41.4386 249.217 41.0244C249.217 40.6102 248.881 40.2744 248.467 40.2744V41.7744ZM244.467 41.7744H248.467V40.2744H244.467V41.7744Z"
+ fill="#52ADF9" />
+ <path
+ d="M256.467 40.2744C256.053 40.2744 255.717 40.6102 255.717 41.0244C255.717 41.4386 256.053 41.7744 256.467 41.7744V40.2744ZM260.467 41.7744C260.881 41.7744 261.217 41.4386 261.217 41.0244C261.217 40.6102 260.881 40.2744 260.467 40.2744V41.7744ZM256.467 41.7744H260.467V40.2744H256.467V41.7744Z"
+ fill="#52ADF9" />
+ <circle cx="89.467" cy="72" r="4" fill="#4D7C0F" />
+ <circle cx="105.467" cy="72" r="4" fill="#82C91E" />
+ <circle cx="73.467" cy="72" r="4" fill="#365314" />
+ <circle cx="198.467" cy="72" r="4" fill="#4D7C0F" />
+ <circle cx="214.467" cy="72" r="4" fill="#82C91E" />
+ <circle cx="182.467" cy="72" r="4" fill="#365314" />
+ <path
+ d="M29.0383 43C29.0383 41.8954 29.9338 41 31.0383 41H49.8963C51.0008 41 51.8963 41.8954 51.8963 43V61.3864H29.0383L29.0383 43Z"
+ fill="#123060" stroke="#52ADF9" stroke-width="1.5" />
+ <path
+ d="M24.4673 65.3789C24.4673 63.1698 26.2581 61.3789 28.4673 61.3789H52.4673C54.6764 61.3789 56.4673 63.1698 56.4673 65.3789L56.4673 100C56.4673 102.209 54.6764 104 52.4673 104H28.4673C26.2581 104 24.4673 102.209 24.4673 100L24.4673 65.3789Z"
+ fill="#1E293B" stroke="#52ADF9" stroke-width="1.5" />
+ <rect x="33.0901" y="49.4141" width="4.55576" height="3.12838" fill="#52ADF9" />
+ <rect x="43.2888" y="49.4141" width="4.55576" height="3.12838" fill="#52ADF9" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M151.865 42L143.967 42H126.467C124.258 42 122.467 43.7909 122.467 46L122.467 98C122.467 100.209 124.258 102 126.467 102L161.467 102C163.676 102 165.467 100.209 165.467 98L165.467 55.9695L151.865 42Z"
+ fill="#365314" />
+ <path
+ d="M143.967 42L143.967 41.25H143.967V42ZM151.865 42L152.402 41.4768L152.181 41.25L151.865 41.25L151.865 42ZM122.467 46H123.217H122.467ZM122.467 98H121.717H122.467ZM126.467 102V101.25V102ZM161.467 102V102.75V102ZM165.467 98H164.717H165.467ZM165.467 55.9695H166.217V55.6646L166.004 55.4462L165.467 55.9695ZM143.967 42.75L151.865 42.75L151.865 41.25L143.967 41.25L143.967 42.75ZM126.467 42.75H143.967V41.25H126.467V42.75ZM123.217 46C123.217 44.2051 124.672 42.75 126.467 42.75V41.25C123.844 41.25 121.717 43.3766 121.717 46H123.217ZM123.217 98L123.217 46H121.717L121.717 98H123.217ZM126.467 101.25C124.672 101.25 123.217 99.7949 123.217 98H121.717C121.717 100.623 123.844 102.75 126.467 102.75V101.25ZM161.467 101.25L126.467 101.25V102.75L161.467 102.75V101.25ZM164.717 98C164.717 99.7949 163.262 101.25 161.467 101.25V102.75C164.09 102.75 166.217 100.623 166.217 98H164.717ZM164.717 55.9695L164.717 98H166.217L166.217 55.9695H164.717ZM166.004 55.4462L152.402 41.4768L151.327 42.5232L164.93 56.4927L166.004 55.4462Z"
+ fill="#A3E635" />
+ <path
+ d="M165.197 55.6787L156.162 55.6787C153.952 55.6787 152.162 53.8878 152.162 51.6787L152.162 42.2911L165.197 55.6787Z"
+ fill="#65A30D" stroke="#A3E635" stroke-width="1.5" stroke-linejoin="round" />
+ <path d="M134.07 63.4902H153.911" stroke="#A3E635" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M134.07 69.0361H144.733" stroke="#A3E635" stroke-width="1.5" stroke-linecap="round" />
+ <path
+ d="M135.636 80.7328V87.4129C135.636 89.4917 137.321 91.1769 139.4 91.1769C141.479 91.1769 143.164 89.4917 143.164 87.4129V80.7328C143.164 78.654 141.479 76.9688 139.4 76.9688C137.321 76.9688 135.636 78.654 135.636 80.7328Z"
+ stroke="#A3E635" stroke-width="1.5" />
+ <rect x="133.066" y="84.52" width="12.671" height="9.44635" rx="1.25" fill="#65A30D"
+ stroke="#A3E635" stroke-width="1.5" />
+</svg>
diff --git a/briar-android/artwork/il_transfer_data_send.svg b/briar-android/artwork/il_transfer_data_send.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2c8e6e16ece48950951f949a2453e45fcc4a7d12
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_send.svg
@@ -0,0 +1,47 @@
+<svg width="289" height="144" viewBox="0 0 289 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <rect x="-0.75" y="0.75" width="40.5" height="76.5" rx="7.25"
+ transform="matrix(-1 0 0 1 55.4341 33)" fill="#ECFCCB" stroke="#65A30D"
+ stroke-width="1.5" />
+ <path d="M56.1841 47.9976H15.6843V100.498H56.1841V47.9976Z" fill="#F9FAFB" stroke="#65A30D"
+ stroke-width="1.5" />
+ <rect x="19.5396" y="65.1011" width="32.7896" height="18.293" rx="4" fill="#DDEDFE" />
+ <path d="M26.0518 71.5542H45.9243" stroke="#196FDE" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M26.0518 77.6519H36.7318" stroke="#196FDE" stroke-width="1.5" stroke-linecap="round" />
+ <ellipse rx="1" ry="1.00118" transform="matrix(-1 0 0 1 35.9341 41.0012)" fill="#65A30D" />
+ <path
+ d="M27.9341 40.2744C27.5199 40.2744 27.1841 40.6102 27.1841 41.0244C27.1841 41.4386 27.5199 41.7744 27.9341 41.7744V40.2744ZM31.9341 41.7744C32.3483 41.7744 32.6841 41.4386 32.6841 41.0244C32.6841 40.6102 32.3483 40.2744 31.9341 40.2744V41.7744ZM27.9341 41.7744H31.9341V40.2744H27.9341V41.7744Z"
+ fill="#65A30D" />
+ <path
+ d="M39.9341 40.2744C39.5199 40.2744 39.1841 40.6102 39.1841 41.0244C39.1841 41.4386 39.5199 41.7744 39.9341 41.7744V40.2744ZM43.9341 41.7744C44.3483 41.7744 44.6841 41.4386 44.6841 41.0244C44.6841 40.6102 44.3483 40.2744 43.9341 40.2744V41.7744ZM39.9341 41.7744H43.9341V40.2744H39.9341V41.7744Z"
+ fill="#65A30D" />
+ <circle cx="89.9341" cy="72" r="4" fill="#8BCAFD" />
+ <circle cx="105.934" cy="72" r="4" fill="#52ADF9" />
+ <circle cx="73.9341" cy="72" r="4" fill="#BDDFFE" />
+ <circle cx="198.934" cy="72" r="4" fill="#8BCAFD" />
+ <circle cx="214.934" cy="72" r="4" fill="#52ADF9" />
+ <circle cx="182.934" cy="72" r="4" fill="#BDDFFE" />
+ <path
+ d="M236.505 43C236.505 41.8954 237.401 41 238.505 41H257.363C258.468 41 259.363 41.8954 259.363 43V61.3864H236.505V43Z"
+ fill="#F9FAFB" stroke="#65A30D" stroke-width="1.5" />
+ <path
+ d="M231.934 65.3789C231.934 63.1698 233.725 61.3789 235.934 61.3789H259.934C262.143 61.3789 263.934 63.1698 263.934 65.3789V100C263.934 102.209 262.143 104 259.934 104H235.934C233.725 104 231.934 102.209 231.934 100V65.3789Z"
+ fill="#ECFCCB" stroke="#65A30D" stroke-width="1.5" />
+ <rect x="240.557" y="49.4141" width="4.55576" height="3.12838" fill="#65A30D" />
+ <rect x="250.756" y="49.4141" width="4.55576" height="3.12838" fill="#65A30D" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M152.332 42L144.434 42H126.934C124.725 42 122.934 43.7909 122.934 46L122.934 98C122.934 100.209 124.725 102 126.934 102L161.934 102C164.143 102 165.934 100.209 165.934 98L165.934 55.9695L152.332 42Z"
+ fill="#DDEDFE" />
+ <path
+ d="M144.434 42L144.434 41.25H144.434V42ZM152.332 42L152.869 41.4768L152.648 41.25L152.332 41.25L152.332 42ZM122.934 46H123.684H122.934ZM122.934 98H122.184H122.934ZM126.934 102V101.25V102ZM161.934 102V102.75V102ZM165.934 98H165.184H165.934ZM165.934 55.9695H166.684V55.6646L166.471 55.4462L165.934 55.9695ZM144.434 42.75L152.332 42.75L152.332 41.25L144.434 41.25L144.434 42.75ZM126.934 42.75H144.434V41.25H126.934V42.75ZM123.684 46C123.684 44.2051 125.139 42.75 126.934 42.75V41.25C124.311 41.25 122.184 43.3766 122.184 46H123.684ZM123.684 98L123.684 46H122.184L122.184 98H123.684ZM126.934 101.25C125.139 101.25 123.684 99.7949 123.684 98H122.184C122.184 100.623 124.311 102.75 126.934 102.75V101.25ZM161.934 101.25L126.934 101.25V102.75L161.934 102.75V101.25ZM165.184 98C165.184 99.7949 163.729 101.25 161.934 101.25V102.75C164.557 102.75 166.684 100.623 166.684 98H165.184ZM165.184 55.9695L165.184 98H166.684L166.684 55.9695H165.184ZM166.471 55.4462L152.869 41.4768L151.795 42.5232L165.397 56.4927L166.471 55.4462Z"
+ fill="#196FDE" />
+ <path
+ d="M165.665 55.6787L156.629 55.6787C154.42 55.6787 152.629 53.8878 152.629 51.6787L152.629 42.2911L165.665 55.6787Z"
+ fill="#EFF7FF" stroke="#196FDE" stroke-width="1.5" stroke-linejoin="round" />
+ <path d="M134.537 63.4902H154.378" stroke="#196FDE" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M134.537 69.0361H145.2" stroke="#196FDE" stroke-width="1.5" stroke-linecap="round" />
+ <path
+ d="M143.631 80.7328C143.631 78.654 141.946 76.9688 139.867 76.9688C137.789 76.9688 136.103 78.654 136.103 80.7328V87.4129C136.103 89.4917 137.789 91.1769 139.867 91.1769C141.946 91.1769 143.631 89.4917 143.631 87.4129V80.7328Z"
+ stroke="#196FDE" stroke-width="1.5" />
+ <rect x="133.533" y="84.52" width="12.671" height="9.44635" rx="1.25" fill="#52ADF9"
+ stroke="#196FDE" stroke-width="1.5" />
+</svg>
diff --git a/briar-android/artwork/il_transfer_data_send_night.svg b/briar-android/artwork/il_transfer_data_send_night.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c53d8b800163fad2d53d3bbccaaec56b3c6e986e
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_send_night.svg
@@ -0,0 +1,47 @@
+<svg width="289" height="144" viewBox="0 0 289 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <rect x="-0.75" y="0.75" width="40.5" height="76.5" rx="7.25"
+ transform="matrix(-1 0 0 1 55.4341 33)" fill="#1E293B" stroke="#A3E635"
+ stroke-width="1.5" />
+ <path d="M56.1841 47.9976H15.6843V100.498H56.1841V47.9976Z" fill="#0B1120" stroke="#A3E635"
+ stroke-width="1.5" />
+ <rect x="19.5393" y="65.1011" width="32.7896" height="18.293" rx="4" fill="#184080" />
+ <path d="M26.0515 71.5542H45.924" stroke="#52ADF9" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M26.0515 77.6519H36.7315" stroke="#52ADF9" stroke-width="1.5" stroke-linecap="round" />
+ <ellipse rx="1" ry="1.00118" transform="matrix(-1 0 0 1 35.9341 41.0012)" fill="#A3E635" />
+ <path
+ d="M27.9341 40.2744C27.5199 40.2744 27.1841 40.6102 27.1841 41.0244C27.1841 41.4386 27.5199 41.7744 27.9341 41.7744V40.2744ZM31.9341 41.7744C32.3483 41.7744 32.6841 41.4386 32.6841 41.0244C32.6841 40.6102 32.3483 40.2744 31.9341 40.2744V41.7744ZM27.9341 41.7744H31.9341V40.2744H27.9341V41.7744Z"
+ fill="#A3E635" />
+ <path
+ d="M39.9341 40.2744C39.5199 40.2744 39.1841 40.6102 39.1841 41.0244C39.1841 41.4386 39.5199 41.7744 39.9341 41.7744V40.2744ZM43.9341 41.7744C44.3483 41.7744 44.6841 41.4386 44.6841 41.0244C44.6841 40.6102 44.3483 40.2744 43.9341 40.2744V41.7744ZM39.9341 41.7744H43.9341V40.2744H39.9341V41.7744Z"
+ fill="#A3E635" />
+ <circle cx="89.9341" cy="72" r="4" fill="#1457C5" />
+ <circle cx="105.934" cy="72" r="4" fill="#2B8EF1" />
+ <circle cx="73.9341" cy="72" r="4" fill="#184080" />
+ <circle cx="198.934" cy="72" r="4" fill="#1457C5" />
+ <circle cx="214.934" cy="72" r="4" fill="#2B8EF1" />
+ <circle cx="182.934" cy="72" r="4" fill="#184080" />
+ <path
+ d="M236.505 43C236.505 41.8954 237.401 41 238.505 41H257.363C258.468 41 259.363 41.8954 259.363 43V61.3864H236.505V43Z"
+ fill="#123060" stroke="#A3E635" stroke-width="1.5" />
+ <path
+ d="M231.934 65.3789C231.934 63.1698 233.725 61.3789 235.934 61.3789H259.934C262.143 61.3789 263.934 63.1698 263.934 65.3789V100C263.934 102.209 262.143 104 259.934 104H235.934C233.725 104 231.934 102.209 231.934 100V65.3789Z"
+ fill="#1E293B" stroke="#A3E635" stroke-width="1.5" />
+ <rect x="240.557" y="49.4141" width="4.55576" height="3.12838" fill="#A3E635" />
+ <rect x="250.756" y="49.4141" width="4.55576" height="3.12838" fill="#A3E635" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M152.332 42L144.434 42H126.934C124.725 42 122.934 43.7909 122.934 46L122.934 98C122.934 100.209 124.725 102 126.934 102L161.934 102C164.143 102 165.934 100.209 165.934 98L165.934 55.9695L152.332 42Z"
+ fill="#184080" />
+ <path
+ d="M144.434 42L144.434 41.25H144.434V42ZM152.332 42L152.869 41.4768L152.648 41.25L152.332 41.25L152.332 42ZM122.934 46H123.684H122.934ZM122.934 98H122.184H122.934ZM126.934 102V101.25V102ZM161.934 102V102.75V102ZM165.934 98H165.184H165.934ZM165.934 55.9695H166.684V55.6646L166.471 55.4462L165.934 55.9695ZM144.434 42.75L152.332 42.75L152.332 41.25L144.434 41.25L144.434 42.75ZM126.934 42.75H144.434V41.25H126.934V42.75ZM123.684 46C123.684 44.2051 125.139 42.75 126.934 42.75V41.25C124.311 41.25 122.184 43.3766 122.184 46H123.684ZM123.684 98L123.684 46H122.184L122.184 98H123.684ZM126.934 101.25C125.139 101.25 123.684 99.7949 123.684 98H122.184C122.184 100.623 124.311 102.75 126.934 102.75V101.25ZM161.934 101.25L126.934 101.25V102.75L161.934 102.75V101.25ZM165.184 98C165.184 99.7949 163.729 101.25 161.934 101.25V102.75C164.557 102.75 166.684 100.623 166.684 98H165.184ZM165.184 55.9695L165.184 98H166.684L166.684 55.9695H165.184ZM166.471 55.4462L152.869 41.4768L151.795 42.5232L165.397 56.4927L166.471 55.4462Z"
+ fill="#52ADF9" />
+ <path
+ d="M165.664 55.6787L156.629 55.6787C154.419 55.6787 152.629 53.8878 152.629 51.6787L152.629 42.2911L165.664 55.6787Z"
+ fill="#196FDE" stroke="#52ADF9" stroke-width="1.5" stroke-linejoin="round" />
+ <path d="M134.537 63.4902H154.378" stroke="#52ADF9" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M134.537 69.0361H145.2" stroke="#52ADF9" stroke-width="1.5" stroke-linecap="round" />
+ <path
+ d="M143.631 80.7328C143.631 78.654 141.946 76.9688 139.867 76.9688C137.788 76.9688 136.103 78.654 136.103 80.7328V87.4129C136.103 89.4917 137.788 91.1769 139.867 91.1769C141.946 91.1769 143.631 89.4917 143.631 87.4129V80.7328Z"
+ stroke="#52ADF9" stroke-width="1.5" />
+ <rect x="133.533" y="84.52" width="12.671" height="9.44635" rx="1.25" fill="#196FDE"
+ stroke="#52ADF9" stroke-width="1.5" />
+</svg>
diff --git a/briar-android/artwork/mailbox_onboarding_dark.svg b/briar-android/artwork/mailbox_onboarding_dark.svg
deleted file mode 100644
index ea1a197574ce543d9a3dc088d46f4f49506356c0..0000000000000000000000000000000000000000
--- a/briar-android/artwork/mailbox_onboarding_dark.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<svg width="250" height="199" viewBox="0 0 250 199" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M95.4363 100.233C95.4363 93.5233 100.876 88.084 107.585 88.084H130.365C137.074 88.084 142.514 93.5233 142.514 100.233V123.012C142.514 129.722 137.074 135.161 130.365 135.161H107.585C100.876 135.161 95.4363 129.722 95.4363 123.012V100.233Z"
- fill="#15212D" />
- <path
- d="M102.336 10.2609C102.336 4.59395 106.93 0 112.597 0H131.836C137.503 0 142.097 4.59395 142.097 10.2609V29.5C142.097 35.1669 137.503 39.7609 131.836 39.7609H112.597C106.93 39.7609 102.336 35.1669 102.336 29.5V10.2609Z"
- fill="#15212D" />
- <path
- d="M34.8184 148.09C34.8184 143.427 38.5986 139.646 43.2618 139.646H59.0933C63.7565 139.646 67.5368 143.427 67.5368 148.09V163.921C67.5368 168.585 63.7565 172.365 59.0933 172.365H43.2618C38.5986 172.365 34.8184 168.585 34.8184 163.921V148.09Z"
- fill="#15212D" />
- <path
- d="M110.024 186.044C110.024 183.557 112.04 181.541 114.527 181.541H122.971C125.458 181.541 127.475 183.557 127.475 186.044V194.488C127.475 196.976 125.458 198.992 122.971 198.992H114.527C112.04 198.992 110.024 196.976 110.024 194.488V186.044Z"
- fill="#15212D" />
- <path
- d="M173.713 141.6C173.713 134.89 179.152 129.451 185.862 129.451H208.641C215.351 129.451 220.79 134.89 220.79 141.6V164.38C220.79 171.089 215.351 176.528 208.641 176.528H185.862C179.152 176.528 173.713 171.089 173.713 164.38V141.6Z"
- fill="#15212D" />
- <path
- d="M232.049 95.4156C232.049 92.9284 234.065 90.9121 236.553 90.9121H244.997C247.484 90.9121 249.5 92.9284 249.5 95.4156V103.86C249.5 106.347 247.484 108.363 244.997 108.363H236.553C234.065 108.363 232.049 106.347 232.049 103.86V95.4156Z"
- fill="#15212D" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M120.481 84.2273V45.2676H122.481V84.2273H120.481Z" fill="#657D99" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M117.685 176.101L117.685 139.646H119.685L119.685 176.101H117.685Z" fill="#657D99" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M3.27959 108.445L4.0457 106.598C4.3381 106.719 4.66032 106.787 5.00345 106.787H7.11444V108.787H5.00345C4.39282 108.787 3.81058 108.665 3.27959 108.445ZM11.3364 108.787V106.787H13.4474C13.7905 106.787 14.1128 106.719 14.4052 106.598L15.1713 108.445C14.6403 108.665 14.058 108.787 13.4474 108.787H11.3364ZM17.9509 97.9504H15.9509V95.8394C15.9509 95.4963 15.8829 95.174 15.7617 94.8816L17.6091 94.1155C17.8293 94.6465 17.9509 95.2288 17.9509 95.8394V97.9504ZM7.11444 91.3359H5.00345C4.39282 91.3359 3.81058 91.4575 3.27959 91.6777L4.0457 93.5251C4.3381 93.4039 4.66032 93.3359 5.00345 93.3359H7.11444V91.3359ZM0.500008 102.172H2.50001V104.283C2.50001 104.626 2.56793 104.949 2.68918 105.241L0.841732 106.007C0.621538 105.476 0.500008 104.894 0.500008 104.283V102.172ZM0.500008 97.9504H2.50001V95.8394C2.50001 95.4963 2.56793 95.174 2.68918 94.8816L0.841731 94.1155C0.621538 94.6465 0.500008 95.2288 0.500008 95.8394V97.9504ZM11.3364 91.3359V93.3359H13.4474C13.7905 93.3359 14.1128 93.4039 14.4052 93.5251L15.1713 91.6777C14.6403 91.4575 14.058 91.3359 13.4474 91.3359H11.3364ZM17.9509 102.172H15.9509V104.283C15.9509 104.626 15.8829 104.949 15.7617 105.241L17.6091 106.007C17.8293 105.476 17.9509 104.894 17.9509 104.283V102.172Z"
- fill="#657D99" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M41.1771 64.5169V62.6484H43.1771V64.5169H41.1771ZM41.1771 71.9908V68.2538H43.1771V71.9908H41.1771ZM41.1771 79.4647V75.7277H43.1771V79.4647H41.1771ZM41.1771 86.9385V83.2016H43.1771V86.9385H41.1771ZM41.1771 94.4124V90.6755H43.1771V94.4124H41.1771ZM41.1771 99.0178V98.1493H43.1771V99.0178H44.9095V101.018H39.681V99.0178H41.1771ZM24.7048 101.018H22.2087V99.0178H24.7048V101.018ZM34.6889 101.018H29.6969V99.0178H34.6889V101.018ZM52.1068 101.018H50.3744V99.0178H54.8543V101.018H54.1068V102.148H52.1068V101.018ZM61.8442 101.018H58.3493V99.0178H61.8442V101.018ZM67.0867 101.018H65.3392V99.0178H67.0867C68.0476 99.0178 68.9663 99.2092 69.8048 99.557L69.0387 101.404C68.4388 101.156 67.7801 101.018 67.0867 101.018ZM72.187 106.118C72.187 105.425 72.0492 104.766 71.8004 104.166L73.6478 103.4C73.9955 104.239 74.187 105.157 74.187 106.118C74.187 106.812 74.3248 107.47 74.5736 108.07L72.7261 108.836C72.3784 107.998 72.187 107.079 72.187 106.118ZM52.1068 110.668V106.408H54.1068V110.668H52.1068ZM79.2873 113.218C78.3264 113.218 77.4077 113.027 76.5691 112.679L77.3352 110.832C77.9352 111.081 78.5939 111.218 79.2873 111.218H81.5905V113.218H79.2873ZM88.5 113.218H86.1968V111.218H88.5V113.218ZM52.1068 119.188V114.928H54.1068V119.188H52.1068ZM52.1068 127.709V123.449H54.1068V127.709H52.1068ZM52.1068 134.099V131.969H54.1068V134.099H52.1068Z"
- fill="#74B816" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M105.214 134.93L105.602 132.968C106.242 133.095 106.905 133.161 107.585 133.161H109.484V135.161H107.585C106.774 135.161 105.981 135.082 105.214 134.93ZM128.466 135.161V133.161H130.365C131.045 133.161 131.708 133.095 132.347 132.968L132.736 134.93C131.969 135.082 131.176 135.161 130.365 135.161H128.466ZM137.115 133.115L136.002 131.453C137.11 130.712 138.064 129.757 138.805 128.65L140.467 129.762C139.58 131.087 138.44 132.228 137.115 133.115ZM142.514 102.131H140.514V100.233C140.514 99.5526 140.447 98.8898 140.32 98.2501L142.282 97.8619C142.434 98.6288 142.514 99.4216 142.514 100.233V102.131ZM140.467 93.4828L138.805 94.5954C138.064 93.4878 137.11 92.5338 136.002 91.7922L137.115 90.1303C138.44 91.0173 139.58 92.1579 140.467 93.4828ZM109.484 88.084H107.585C106.774 88.084 105.981 88.1635 105.214 88.3152L105.602 90.2772C106.242 90.1507 106.905 90.084 107.585 90.084H109.484V88.084ZM100.835 90.1303L101.948 91.7922C100.84 92.5338 99.8861 93.4878 99.1445 94.5954L97.4826 93.4828C98.3696 92.1579 99.5102 91.0173 100.835 90.1303ZM95.4363 121.114H97.4363V123.012C97.4363 123.693 97.503 124.355 97.6295 124.995L95.6675 125.383C95.5158 124.616 95.4363 123.824 95.4363 123.012V121.114ZM97.4826 129.762L99.1445 128.65C99.8861 129.757 100.84 130.712 101.948 131.453L100.835 133.115C99.5102 132.228 98.3696 131.087 97.4826 129.762ZM95.4363 117.317H97.4363V113.521H95.4363V117.317ZM95.4363 109.724H97.4363V105.928H95.4363V109.724ZM95.4363 102.131H97.4363V100.233C97.4363 99.5526 97.503 98.8898 97.6295 98.2501L95.6675 97.8619C95.5158 98.6288 95.4363 99.4216 95.4363 100.233V102.131ZM113.28 88.084V90.084H117.077V88.084H113.28ZM120.873 88.084V90.084H124.67V88.084H120.873ZM128.466 88.084V90.084H130.365C131.045 90.084 131.708 90.1507 132.347 90.2772L132.736 88.3152C131.969 88.1635 131.176 88.084 130.365 88.084H128.466ZM142.514 105.928H140.514V109.724H142.514V105.928ZM142.514 113.521H140.514V117.317H142.514V113.521ZM142.514 121.114H140.514V123.012C140.514 123.693 140.447 124.355 140.32 124.995L142.282 125.383C142.434 124.616 142.514 123.824 142.514 123.012V121.114ZM124.67 135.161V133.161H120.873V135.161H124.67ZM117.077 135.161V133.161H113.28V135.161H117.077Z"
- fill="#74B816" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M188.618 86.5389V84.6738H190.618V86.5389H188.618ZM188.618 93.9991V90.269H190.618V93.9991H188.618ZM188.618 97.7293H190.618V98.5943H191.517V100.594H190.618V101.183H188.618V97.7293ZM199.112 100.594H195.315V98.5943H199.112V100.594ZM206.707 100.594H202.91V98.5943H206.707V100.594ZM214.303 100.594H210.505V98.5943H214.303V100.594ZM221.898 100.594H218.1V98.5943H221.898V100.594ZM227.595 100.594H225.696V98.5943H227.595V100.594ZM188.618 107.537V104.36H190.618V107.537H188.618ZM188.618 111.303V110.715H190.618V111.359C190.865 111.387 191.109 111.425 191.35 111.472L190.962 113.434C190.528 113.349 190.079 113.303 189.618 113.303H187.737V111.303H188.618ZM153.881 113.303H152V111.303H153.881V113.303ZM161.405 113.303H157.643V111.303H161.405V113.303ZM168.928 113.303H165.166V111.303H168.928V113.303ZM176.452 113.303H172.69V111.303H176.452V113.303ZM183.975 113.303H180.214V111.303H183.975V113.303ZM195.34 116.361C194.837 115.611 194.19 114.964 193.44 114.462L194.552 112.8C195.52 113.448 196.353 114.281 197.001 115.249L195.34 116.361ZM196.498 120.183C196.498 119.722 196.453 119.273 196.367 118.839L198.329 118.451C198.44 119.012 198.498 119.591 198.498 120.183V121.203H196.498V120.183ZM196.498 124.261V123.242H198.498V124.261H196.498Z"
- fill="#74B816" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M183.491 176.297L183.879 174.335C184.519 174.462 185.182 174.528 185.862 174.528H187.76V176.528H185.862C185.051 176.528 184.258 176.449 183.491 176.297ZM206.743 176.528V174.528H208.641C209.322 174.528 209.985 174.462 210.624 174.335L211.012 176.297C210.246 176.449 209.453 176.528 208.641 176.528H206.743ZM215.392 174.482L214.279 172.82C215.387 172.079 216.341 171.125 217.082 170.017L218.744 171.13C217.857 172.455 216.717 173.595 215.392 174.482ZM220.79 143.498H218.79V141.6C218.79 140.92 218.724 140.257 218.597 139.617L220.559 139.229C220.711 139.996 220.79 140.789 220.79 141.6V143.498ZM218.744 134.85L217.082 135.963C216.341 134.855 215.387 133.901 214.279 133.159L215.392 131.497C216.717 132.384 217.857 133.525 218.744 134.85ZM187.76 129.451H185.862C185.051 129.451 184.258 129.531 183.491 129.682L183.879 131.644C184.519 131.518 185.182 131.451 185.862 131.451H187.76V129.451ZM179.112 131.497L180.225 133.159C179.117 133.901 178.163 134.855 177.421 135.963L175.759 134.85C176.646 133.525 177.787 132.384 179.112 131.497ZM173.713 162.481H175.713V164.38C175.713 165.06 175.78 165.723 175.906 166.362L173.944 166.751C173.793 165.984 173.713 165.191 173.713 164.38V162.481ZM175.759 171.13L177.421 170.017C178.163 171.125 179.117 172.079 180.225 172.82L179.112 174.482C177.787 173.595 176.646 172.455 175.759 171.13ZM173.713 158.685H175.713V154.888H173.713V158.685ZM173.713 151.092H175.713V147.295H173.713V151.092ZM173.713 143.498H175.713V141.6C175.713 140.92 175.78 140.257 175.906 139.617L173.944 139.229C173.793 139.996 173.713 140.789 173.713 141.6V143.498ZM191.557 129.451V131.451H195.354V129.451H191.557ZM199.15 129.451V131.451H202.947V129.451H199.15ZM206.743 129.451V131.451H208.641C209.322 131.451 209.985 131.518 210.624 131.644L211.012 129.682C210.246 129.531 209.453 129.451 208.641 129.451H206.743ZM220.79 147.295H218.79V151.092H220.79V147.295ZM220.79 154.888H218.79V158.685H220.79V154.888ZM220.79 162.481H218.79V164.38C218.79 165.06 218.724 165.723 218.597 166.362L220.559 166.751C220.711 165.984 220.79 165.191 220.79 164.38V162.481ZM202.947 176.528V174.528H199.15V176.528H202.947ZM195.354 176.528V174.528H191.557V176.528H195.354Z"
- fill="#74B816" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M110.594 39.5656L110.982 37.6036C111.503 37.7066 112.042 37.7609 112.597 37.7609H115.001V39.7609H112.597C111.911 39.7609 111.242 39.6937 110.594 39.5656ZM129.431 39.7609V37.7609H131.836C132.39 37.7609 132.93 37.7066 133.45 37.6036L133.838 39.5656C133.191 39.6937 132.521 39.7609 131.836 39.7609H129.431ZM137.537 38.0326L136.424 36.3706C137.326 35.767 138.103 34.9902 138.706 34.0885L140.368 35.2011C139.619 36.3201 138.656 37.2835 137.537 38.0326ZM142.097 12.6658H140.097V10.2609C140.097 9.7066 140.042 9.167 139.939 8.64647L141.901 8.25834C142.029 8.90601 142.097 9.57559 142.097 10.2609V12.6658ZM140.368 4.55977L138.706 5.67241C138.103 4.77069 137.326 3.99391 136.424 3.39022L137.537 1.72828C138.656 2.47741 139.619 3.44081 140.368 4.55977ZM115.001 0H112.597C111.911 0 111.242 0.0671774 110.594 0.195306L110.982 2.15728C111.503 2.05431 112.042 2 112.597 2H115.001V0ZM106.895 1.72829L108.008 3.39022C107.106 3.99391 106.33 4.77069 105.726 5.67241L104.064 4.55977C104.813 3.44081 105.777 2.47741 106.895 1.72829ZM102.336 27.0951H104.336V29.5C104.336 30.0543 104.39 30.5939 104.493 31.1144L102.531 31.5025C102.403 30.8549 102.336 30.1853 102.336 29.5V27.0951ZM104.064 35.2011L105.726 34.0885C106.33 34.9902 107.106 35.767 108.008 36.3706L106.895 38.0326C105.777 37.2835 104.813 36.3201 104.064 35.2011ZM102.336 22.2853H104.336V17.4755H102.336V22.2853ZM102.336 12.6658H104.336V10.2609C104.336 9.7066 104.39 9.167 104.493 8.64647L102.531 8.25834C102.403 8.90601 102.336 9.57559 102.336 10.2609V12.6658ZM119.811 0V2H124.621V0H119.811ZM129.431 0V2H131.836C132.39 2 132.93 2.05431 133.45 2.15728L133.838 0.195306C133.191 0.0671773 132.521 0 131.836 0H129.431ZM142.097 17.4755H140.097V22.2853H142.097V17.4755ZM142.097 27.0951H140.097V29.5C140.097 30.0543 140.042 30.5939 139.939 31.1144L141.901 31.5025C142.029 30.8549 142.097 30.1853 142.097 29.5V27.0951ZM124.621 39.7609V37.7609H119.811V39.7609H124.621Z"
- fill="#435B77" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M40.0298 171.724L40.7959 169.877C41.5528 170.191 42.3845 170.365 43.2618 170.365H45.2408V172.365H43.2618C42.117 172.365 41.0253 172.137 40.0298 171.724ZM57.1144 172.365V170.365H59.0933C59.9707 170.365 60.8023 170.191 61.5593 169.877L62.3254 171.724C61.3298 172.137 60.2382 172.365 59.0933 172.365H57.1144ZM67.5368 150.069H65.5368V148.09C65.5368 147.213 65.3625 146.381 65.0486 145.624L66.8961 144.858C67.3089 145.853 67.5368 146.945 67.5368 148.09V150.069ZM45.2408 139.646H43.2618C42.117 139.646 41.0253 139.874 40.0298 140.287L40.7959 142.135C41.5528 141.821 42.3845 141.646 43.2618 141.646H45.2408V139.646ZM34.8184 161.943H36.8184V163.921C36.8184 164.799 36.9926 165.63 37.3065 166.387L35.4591 167.153C35.0462 166.158 34.8184 165.066 34.8184 163.921V161.943ZM34.8184 157.985H36.8184V154.027H34.8184V157.985ZM34.8184 150.069H36.8184V148.09C36.8184 147.213 36.9926 146.381 37.3065 145.624L35.4591 144.858C35.0462 145.853 34.8184 146.945 34.8184 148.09V150.069ZM49.1986 139.646V141.646H53.1565V139.646H49.1986ZM57.1144 139.646V141.646H59.0933C59.9707 141.646 60.8023 141.821 61.5593 142.135L62.3254 140.287C61.3298 139.874 60.2382 139.646 59.0933 139.646H57.1144ZM67.5368 154.027H65.5368V157.985H67.5368V154.027ZM67.5368 161.943H65.5368V163.921C65.5368 164.799 65.3625 165.63 65.0486 166.387L66.8961 167.154C67.3089 166.158 67.5368 165.066 67.5368 163.921V161.943ZM53.1565 172.365V170.365H49.1986V172.365H53.1565Z"
- fill="#435B77" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M112.803 198.65L113.569 196.803C113.862 196.924 114.184 196.992 114.527 196.992H116.638V198.992H114.527C113.917 198.992 113.334 198.87 112.803 198.65ZM120.86 198.992V196.992H122.971C123.314 196.992 123.636 196.924 123.929 196.803L124.695 198.65C124.164 198.87 123.582 198.992 122.971 198.992H120.86ZM127.475 188.155H125.475V186.044C125.475 185.701 125.407 185.379 125.285 185.087L127.133 184.321C127.353 184.852 127.475 185.434 127.475 186.044V188.155ZM116.638 181.541H114.527C113.917 181.541 113.334 181.663 112.803 181.883L113.569 183.73C113.862 183.609 114.184 183.541 114.527 183.541H116.638V181.541ZM110.024 192.377H112.024V194.488C112.024 194.832 112.092 195.154 112.213 195.446L110.365 196.212C110.145 195.681 110.024 195.099 110.024 194.488V192.377ZM110.024 188.155H112.024V186.044C112.024 185.701 112.092 185.379 112.213 185.087L110.365 184.321C110.145 184.852 110.024 185.434 110.024 186.044V188.155ZM120.86 181.541V183.541H122.971C123.314 183.541 123.636 183.609 123.929 183.73L124.695 181.883C124.164 181.663 123.582 181.541 122.971 181.541H120.86ZM127.475 192.377H125.475V194.488C125.475 194.832 125.407 195.154 125.285 195.446L127.133 196.212C127.353 195.681 127.475 195.099 127.475 194.488V192.377Z"
- fill="#435B77" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M178.996 79.8234L179.762 77.976C180.48 78.2737 181.269 78.4391 182.101 78.4391H184.003V80.4391H182.101C181.001 80.4391 179.952 80.2201 178.996 79.8234ZM195.412 80.4391V78.4391H197.314C198.146 78.4391 198.935 78.2737 199.653 77.976L200.419 79.8234C199.463 80.2201 198.414 80.4391 197.314 80.4391H195.412ZM205.427 59.0149H203.427V57.1133C203.427 56.2807 203.262 55.4918 202.964 54.7737L204.811 54.0076C205.208 54.9643 205.427 56.0132 205.427 57.1133V59.0149ZM184.003 49H182.101C181.001 49 179.952 49.2189 178.996 49.6156L179.762 51.4631C180.48 51.1653 181.269 51 182.101 51H184.003V49ZM173.988 70.4242H175.988V72.3258C175.988 73.1584 176.153 73.9473 176.451 74.6653L174.604 75.4315C174.207 74.4748 173.988 73.4259 173.988 72.3258V70.4242ZM173.988 66.6211H175.988V62.818H173.988V66.6211ZM173.988 59.0149H175.988V57.1133C175.988 56.2807 176.153 55.4918 176.451 54.7737L174.604 54.0076C174.207 54.9643 173.988 56.0132 173.988 57.1133V59.0149ZM187.806 49V51H191.609V49H187.806ZM195.412 49V51H197.314C198.146 51 198.935 51.1653 199.653 51.4631L200.419 49.6156C199.463 49.2189 198.414 49 197.314 49H195.412ZM205.427 62.818H203.427V66.6211H205.427V62.818ZM205.427 70.4242H203.427V72.3258C203.427 73.1584 203.262 73.9473 202.964 74.6653L204.811 75.4315C205.208 74.4748 205.427 73.4259 205.427 72.3258V70.4242ZM191.609 80.4391V78.4391H187.806V80.4391H191.609Z"
- fill="#657D99" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M234.829 108.021L235.595 106.174C235.887 106.295 236.209 106.363 236.553 106.363H238.664V108.363H236.553C235.942 108.363 235.36 108.241 234.829 108.021ZM242.886 108.363V106.363H244.997C245.34 106.363 245.662 106.295 245.954 106.174L246.72 108.021C246.189 108.241 245.607 108.363 244.997 108.363H242.886ZM249.5 97.5265H247.5V95.4156C247.5 95.0724 247.432 94.7502 247.311 94.4578L249.158 93.6917C249.378 94.2227 249.5 94.8049 249.5 95.4156V97.5265ZM238.664 90.9121H236.553C235.942 90.9121 235.36 91.0336 234.829 91.2538L235.595 93.1013C235.887 92.98 236.209 92.9121 236.553 92.9121H238.664V90.9121ZM232.049 101.749H234.049V103.86C234.049 104.203 234.117 104.525 234.238 104.817L232.391 105.583C232.171 105.052 232.049 104.47 232.049 103.86V101.749ZM232.049 97.5265H234.049V95.4156C234.049 95.0724 234.117 94.7502 234.238 94.4578L232.391 93.6917C232.171 94.2227 232.049 94.8049 232.049 95.4156V97.5265ZM242.886 90.9121V92.9121H244.997C245.34 92.9121 245.662 92.98 245.954 93.1013L246.72 91.2538C246.189 91.0336 245.607 90.9121 244.997 90.9121H242.886ZM249.5 101.749H247.5V103.86C247.5 104.203 247.432 104.525 247.311 104.817L249.158 105.583C249.378 105.052 249.5 104.47 249.5 103.86V101.749Z"
- fill="#435B77" />
- <path
- d="M29.8254 34.377V53.6604C29.8254 55.2256 31.1003 56.5166 32.6817 56.5166H34.021C35.5863 56.5166 36.8772 55.2256 36.8772 53.6604V34.377H29.8254Z"
- fill="#82C91E" />
- <path
- d="M36.8611 25.0827V21.4519C36.8611 19.8866 35.5863 18.5957 34.021 18.5957H32.6817C31.1164 18.5957 29.8254 19.8866 29.8254 21.4519V25.0827H36.8611Z"
- fill="#82C91E" />
- <path
- d="M52.5136 40.7353V21.4519C52.5136 19.8866 51.2388 18.5957 49.6735 18.5957H48.3342C46.7689 18.5957 45.478 19.8866 45.478 21.4519V40.7353H52.5136Z"
- fill="#82C91E" />
- <path
- d="M45.478 50.0293V53.6601C45.478 55.2253 46.7689 56.5163 48.3342 56.5163H49.6735C51.2388 56.5163 52.5298 55.2253 52.5298 53.6601V50.0293H45.478Z"
- fill="#82C91E" />
- <path
- d="M28.6957 41.8652H25.065C23.4997 41.8652 22.2087 43.14 22.2087 44.7214V46.0608C22.2087 47.6261 23.4836 48.917 25.065 48.917H28.6957V41.8652Z"
- fill="#95DE2D" />
- <path
- d="M57.2738 41.8652H37.9903V48.917H57.2738C58.839 48.917 60.13 47.6261 60.13 46.0608V44.7214C60.13 43.14 58.839 41.8652 57.2738 41.8652Z"
- fill="#95DE2D" />
- <path
- d="M44.3484 26.2129H25.065C23.4997 26.2129 22.2087 27.4877 22.2087 29.0691V30.4084C22.2087 31.9737 23.4836 33.2647 25.065 33.2647H44.3484V26.2129Z"
- fill="#95DE2D" />
- <path
- d="M57.2738 26.2128H53.6431V33.2646H57.2738C58.8391 33.2646 60.1301 31.9898 60.1301 30.4084V29.069C60.1301 27.4876 58.8391 26.2128 57.2738 26.2128Z"
- fill="#95DE2D" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M108.864 99.4959H129.086C129.852 99.4959 130.587 99.8008 131.129 100.343C131.671 100.886 131.975 101.622 131.975 102.39L131.975 127.191C131.975 128.296 130.688 128.899 129.841 128.191L124.6 123.804H108.864C108.098 123.804 107.363 123.499 106.821 122.956C106.279 122.413 105.975 121.677 105.975 120.91V102.39C105.975 101.622 106.279 100.886 106.821 100.343C107.363 99.8008 108.098 99.4959 108.864 99.4959ZM116.549 112.318H110.597V104.126H127.353V112.318H121.499V115.152H123.64C124.026 115.152 124.22 115.619 123.947 115.893L119.331 120.517C119.161 120.686 118.887 120.686 118.718 120.517L114.102 115.893C113.829 115.619 114.022 115.152 114.408 115.152H116.549V112.318Z"
- fill="#95DE2D" />
- <path
- d="M190.408 151.152V162.299C190.408 163.204 191.145 163.95 192.059 163.95H192.833C193.738 163.95 194.484 163.204 194.484 162.299V151.152H190.408Z"
- fill="#82C91E" />
- <path
- d="M194.475 145.779V143.68C194.475 142.775 193.738 142.029 192.833 142.029H192.059C191.154 142.029 190.408 142.775 190.408 143.68V145.779H194.475Z"
- fill="#82C91E" />
- <path
- d="M203.523 154.827V143.68C203.523 142.775 202.786 142.029 201.881 142.029H201.107C200.202 142.029 199.456 142.775 199.456 143.68V154.827H203.523Z"
- fill="#82C91E" />
- <path
- d="M199.456 160.201V162.3C199.456 163.204 200.202 163.951 201.107 163.951H201.881C202.786 163.951 203.533 163.204 203.533 162.3V160.201H199.456Z"
- fill="#82C91E" />
- <path
- d="M189.755 155.48H187.656C186.751 155.48 186.005 156.217 186.005 157.131V157.905C186.005 158.81 186.742 159.556 187.656 159.556H189.755V155.48Z"
- fill="#95DE2D" />
- <path
- d="M206.275 155.48H195.128V159.556H206.275C207.18 159.556 207.926 158.81 207.926 157.905V157.131C207.926 156.217 207.18 155.48 206.275 155.48Z"
- fill="#95DE2D" />
- <path
- d="M198.803 146.433H187.656C186.751 146.433 186.005 147.17 186.005 148.084V148.859C186.005 149.763 186.742 150.51 187.656 150.51H198.803V146.433Z"
- fill="#95DE2D" />
- <path
- d="M206.275 146.433H204.176V150.51H206.275C207.18 150.51 207.926 149.773 207.926 148.859V148.084C207.926 147.17 207.18 146.433 206.275 146.433Z"
- fill="#95DE2D" />
-</svg>
diff --git a/briar-android/artwork/mailbox_onboarding_light.svg b/briar-android/artwork/mailbox_onboarding_light.svg
deleted file mode 100644
index 988d2438d8aea51ab48454cd81980d1f226909c4..0000000000000000000000000000000000000000
--- a/briar-android/artwork/mailbox_onboarding_light.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<svg width="250" height="200" viewBox="0 0 250 200" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path
- d="M95.4363 100.737C95.4363 94.0273 100.876 88.588 107.585 88.588H130.365C137.074 88.588 142.514 94.0273 142.514 100.737V123.516C142.514 130.226 137.074 135.665 130.365 135.665H107.585C100.876 135.665 95.4363 130.226 95.4363 123.516V100.737Z"
- fill="#F6FAFE" />
- <path
- d="M102.336 10.7649C102.336 5.09801 106.93 0.504059 112.597 0.504059H131.836C137.503 0.504059 142.097 5.09801 142.097 10.7649V30.0041C142.097 35.671 137.503 40.2649 131.836 40.2649H112.597C106.93 40.2649 102.336 35.671 102.336 30.0041V10.7649Z"
- fill="#F6FAFE" />
- <path
- d="M34.8184 148.594C34.8184 143.931 38.5986 140.151 43.2618 140.151H59.0933C63.7565 140.151 67.5368 143.931 67.5368 148.594V164.426C67.5368 169.089 63.7565 172.869 59.0933 172.869H43.2618C38.5986 172.869 34.8184 169.089 34.8184 164.426V148.594Z"
- fill="#F6FAFE" />
- <path
- d="M110.024 186.549C110.024 184.061 112.04 182.045 114.527 182.045H122.971C125.458 182.045 127.475 184.061 127.475 186.549V194.992C127.475 197.48 125.458 199.496 122.971 199.496H114.527C112.04 199.496 110.024 197.48 110.024 194.992V186.549Z"
- fill="#F6FAFE" />
- <path
- d="M173.713 142.104C173.713 135.395 179.152 129.955 185.862 129.955H208.641C215.351 129.955 220.79 135.395 220.79 142.104V164.884C220.79 171.593 215.351 177.033 208.641 177.033H185.862C179.152 177.033 173.713 171.593 173.713 164.884V142.104Z"
- fill="#F6FAFE" />
- <path
- d="M232.049 95.9196C232.049 93.4324 234.065 91.4162 236.553 91.4162H244.997C247.484 91.4162 249.5 93.4324 249.5 95.9196V104.364C249.5 106.851 247.484 108.867 244.997 108.867H236.553C234.065 108.867 232.049 106.851 232.049 104.364V95.9196Z"
- fill="#F6FAFE" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M120.481 84.7314V45.7716H122.481V84.7314H120.481Z" fill="#657D99" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M117.685 176.605L117.685 140.151H119.685L119.685 176.605H117.685Z" fill="#657D99" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M3.27959 108.949L4.0457 107.102C4.3381 107.223 4.66032 107.291 5.00345 107.291H7.11444V109.291H5.00345C4.39282 109.291 3.81058 109.169 3.27959 108.949ZM11.3364 109.291V107.291H13.4474C13.7905 107.291 14.1128 107.223 14.4052 107.102L15.1713 108.949C14.6403 109.169 14.058 109.291 13.4474 109.291H11.3364ZM17.9509 98.4544H15.9509V96.3434C15.9509 96.0003 15.8829 95.6781 15.7617 95.3857L17.6091 94.6196C17.8293 95.1506 17.9509 95.7328 17.9509 96.3434V98.4544ZM7.11444 91.84H5.00345C4.39282 91.84 3.81058 91.9615 3.27959 92.1817L4.0457 94.0292C4.3381 93.9079 4.66032 93.84 5.00345 93.84H7.11444V91.84ZM0.500008 102.676H2.50001V104.787C2.50001 105.131 2.56793 105.453 2.68918 105.745L0.841732 106.511C0.621538 105.98 0.500008 105.398 0.500008 104.787V102.676ZM0.500008 98.4544H2.50001V96.3434C2.50001 96.0003 2.56793 95.6781 2.68918 95.3857L0.841731 94.6196C0.621538 95.1506 0.500008 95.7328 0.500008 96.3434V98.4544ZM11.3364 91.84V93.84H13.4474C13.7905 93.84 14.1128 93.9079 14.4052 94.0292L15.1713 92.1817C14.6403 91.9615 14.058 91.84 13.4474 91.84H11.3364ZM17.9509 102.676H15.9509V104.787C15.9509 105.131 15.8829 105.453 15.7617 105.745L17.6091 106.511C17.8293 105.98 17.9509 105.398 17.9509 104.787V102.676Z"
- fill="#657D99" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M41.1771 65.021V63.1525H43.1771V65.021H41.1771ZM41.1771 72.4948V68.7579H43.1771V72.4948H41.1771ZM41.1771 79.9687V76.2318H43.1771V79.9687H41.1771ZM41.1771 87.4426V83.7057H43.1771V87.4426H41.1771ZM41.1771 94.9165V91.1795H43.1771V94.9165H41.1771ZM41.1771 99.5219V98.6534H43.1771V99.5219H44.9095V101.522H39.681V99.5219H41.1771ZM24.7048 101.522H22.2087V99.5219H24.7048V101.522ZM34.6889 101.522H29.6969V99.5219H34.6889V101.522ZM52.1068 101.522H50.3744V99.5219H54.8543V101.522H54.1068V102.652H52.1068V101.522ZM61.8442 101.522H58.3493V99.5219H61.8442V101.522ZM67.0867 101.522H65.3392V99.5219H67.0867C68.0476 99.5219 68.9663 99.7133 69.8048 100.061L69.0387 101.908C68.4388 101.66 67.7801 101.522 67.0867 101.522ZM72.187 106.622C72.187 105.929 72.0492 105.27 71.8004 104.67L73.6478 103.904C73.9955 104.743 74.187 105.661 74.187 106.622C74.187 107.316 74.3248 107.974 74.5736 108.574L72.7261 109.34C72.3784 108.502 72.187 107.583 72.187 106.622ZM52.1068 111.172V106.912H54.1068V111.172H52.1068ZM79.2873 113.722C78.3264 113.722 77.4077 113.531 76.5691 113.183L77.3352 111.336C77.9352 111.585 78.5939 111.722 79.2873 111.722H81.5905V113.722H79.2873ZM88.5 113.722H86.1968V111.722H88.5V113.722ZM52.1068 119.692V115.432H54.1068V119.692H52.1068ZM52.1068 128.213V123.953H54.1068V128.213H52.1068ZM52.1068 134.603V132.473H54.1068V134.603H52.1068Z"
- fill="#74B816" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M105.214 135.434L105.602 133.472C106.242 133.599 106.905 133.665 107.585 133.665H109.484V135.665H107.585C106.774 135.665 105.981 135.586 105.214 135.434ZM128.466 135.665V133.665H130.365C131.045 133.665 131.708 133.599 132.347 133.472L132.736 135.434C131.969 135.586 131.176 135.665 130.365 135.665H128.466ZM137.115 133.619L136.002 131.957C137.11 131.216 138.064 130.262 138.805 129.154L140.467 130.267C139.58 131.591 138.44 132.732 137.115 133.619ZM142.514 102.635H140.514V100.737C140.514 100.057 140.447 99.3939 140.32 98.7541L142.282 98.366C142.434 99.1329 142.514 99.9257 142.514 100.737V102.635ZM140.467 93.9869L138.805 95.0995C138.064 93.9919 137.11 93.0378 136.002 92.2963L137.115 90.6344C138.44 91.5213 139.58 92.662 140.467 93.9869ZM109.484 88.588H107.585C106.774 88.588 105.981 88.6676 105.214 88.8193L105.602 90.7813C106.242 90.6547 106.905 90.588 107.585 90.588H109.484V88.588ZM100.835 90.6344L101.948 92.2963C100.84 93.0378 99.8861 93.9919 99.1445 95.0995L97.4826 93.9869C98.3696 92.662 99.5102 91.5213 100.835 90.6344ZM95.4363 121.618H97.4363V123.516C97.4363 124.197 97.503 124.86 97.6295 125.499L95.6675 125.887C95.5158 125.121 95.4363 124.328 95.4363 123.516V121.618ZM97.4826 130.267L99.1445 129.154C99.8861 130.262 100.84 131.216 101.948 131.957L100.835 133.619C99.5102 132.732 98.3696 131.591 97.4826 130.267ZM95.4363 117.822H97.4363V114.025H95.4363V117.822ZM95.4363 110.228H97.4363V106.432H95.4363V110.228ZM95.4363 102.635H97.4363V100.737C97.4363 100.057 97.503 99.3939 97.6295 98.7541L95.6675 98.366C95.5158 99.1329 95.4363 99.9257 95.4363 100.737V102.635ZM113.28 88.588V90.588H117.077V88.588H113.28ZM120.873 88.588V90.588H124.67V88.588H120.873ZM128.466 88.588V90.588H130.365C131.045 90.588 131.708 90.6547 132.347 90.7813L132.736 88.8193C131.969 88.6676 131.176 88.588 130.365 88.588H128.466ZM142.514 106.432H140.514V110.228H142.514V106.432ZM142.514 114.025H140.514V117.822H142.514V114.025ZM142.514 121.618H140.514V123.516C140.514 124.197 140.447 124.86 140.32 125.499L142.282 125.887C142.434 125.121 142.514 124.328 142.514 123.516V121.618ZM124.67 135.665V133.665H120.873V135.665H124.67ZM117.077 135.665V133.665H113.28V135.665H117.077Z"
- fill="#74B816" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M188.618 87.0429V85.1779H190.618V87.0429H188.618ZM188.618 94.5032V90.7731H190.618V94.5032H188.618ZM188.618 98.2333H190.618V99.0984H191.517V101.098H190.618V101.687H188.618V98.2333ZM199.112 101.098H195.315V99.0984H199.112V101.098ZM206.707 101.098H202.91V99.0984H206.707V101.098ZM214.303 101.098H210.505V99.0984H214.303V101.098ZM221.898 101.098H218.1V99.0984H221.898V101.098ZM227.595 101.098H225.696V99.0984H227.595V101.098ZM188.618 108.042V104.864H190.618V108.042H188.618ZM188.618 111.807V111.219H190.618V111.863C190.865 111.891 191.109 111.929 191.35 111.976L190.962 113.938C190.528 113.853 190.079 113.807 189.618 113.807H187.737V111.807H188.618ZM153.881 113.807H152V111.807H153.881V113.807ZM161.405 113.807H157.643V111.807H161.405V113.807ZM168.928 113.807H165.166V111.807H168.928V113.807ZM176.452 113.807H172.69V111.807H176.452V113.807ZM183.975 113.807H180.214V111.807H183.975V113.807ZM195.34 116.865C194.837 116.115 194.19 115.468 193.44 114.966L194.552 113.304C195.52 113.952 196.353 114.785 197.001 115.753L195.34 116.865ZM196.498 120.687C196.498 120.226 196.453 119.777 196.367 119.343L198.329 118.955C198.44 119.516 198.498 120.095 198.498 120.687V121.707H196.498V120.687ZM196.498 124.765V123.746H198.498V124.765H196.498Z"
- fill="#74B816" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M183.491 176.801L183.879 174.839C184.519 174.966 185.182 175.033 185.862 175.033H187.76V177.033H185.862C185.051 177.033 184.258 176.953 183.491 176.801ZM206.743 177.033V175.033H208.641C209.322 175.033 209.985 174.966 210.624 174.839L211.012 176.801C210.246 176.953 209.453 177.033 208.641 177.033H206.743ZM215.392 174.986L214.279 173.324C215.387 172.583 216.341 171.629 217.082 170.521L218.744 171.634C217.857 172.959 216.717 174.099 215.392 174.986ZM220.79 144.002H218.79V142.104C218.79 141.424 218.724 140.761 218.597 140.121L220.559 139.733C220.711 140.5 220.79 141.293 220.79 142.104V144.002ZM218.744 135.354L217.082 136.467C216.341 135.359 215.387 134.405 214.279 133.663L215.392 132.002C216.717 132.889 217.857 134.029 218.744 135.354ZM187.76 129.955H185.862C185.051 129.955 184.258 130.035 183.491 130.186L183.879 132.148C184.519 132.022 185.182 131.955 185.862 131.955H187.76V129.955ZM179.112 132.002L180.225 133.663C179.117 134.405 178.163 135.359 177.421 136.467L175.759 135.354C176.646 134.029 177.787 132.889 179.112 132.002ZM173.713 162.985H175.713V164.884C175.713 165.564 175.78 166.227 175.906 166.866L173.944 167.255C173.793 166.488 173.713 165.695 173.713 164.884V162.985ZM175.759 171.634L177.421 170.521C178.163 171.629 179.117 172.583 180.225 173.324L179.112 174.986C177.787 174.099 176.646 172.959 175.759 171.634ZM173.713 159.189H175.713V155.392H173.713V159.189ZM173.713 151.596H175.713V147.799H173.713V151.596ZM173.713 144.002H175.713V142.104C175.713 141.424 175.78 140.761 175.906 140.121L173.944 139.733C173.793 140.5 173.713 141.293 173.713 142.104V144.002ZM191.557 129.955V131.955H195.354V129.955H191.557ZM199.15 129.955V131.955H202.947V129.955H199.15ZM206.743 129.955V131.955H208.641C209.322 131.955 209.985 132.022 210.624 132.148L211.012 130.186C210.246 130.035 209.453 129.955 208.641 129.955H206.743ZM220.79 147.799H218.79V151.596H220.79V147.799ZM220.79 155.392H218.79V159.189H220.79V155.392ZM220.79 162.985H218.79V164.884C218.79 165.564 218.724 166.227 218.597 166.866L220.559 167.255C220.711 166.488 220.79 165.695 220.79 164.884V162.985ZM202.947 177.033V175.033H199.15V177.033H202.947ZM195.354 177.033V175.033H191.557V177.033H195.354Z"
- fill="#74B816" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M110.594 40.0696L110.982 38.1076C111.503 38.2106 112.042 38.2649 112.597 38.2649H115.001V40.2649H112.597C111.911 40.2649 111.242 40.1978 110.594 40.0696ZM129.431 40.2649V38.2649H131.836C132.39 38.2649 132.93 38.2106 133.45 38.1076L133.838 40.0696C133.191 40.1978 132.521 40.2649 131.836 40.2649H129.431ZM137.537 38.5366L136.424 36.8747C137.326 36.271 138.103 35.4942 138.706 34.5925L140.368 35.7052C139.619 36.8241 138.656 37.7875 137.537 38.5366ZM142.097 13.1698H140.097V10.7649C140.097 10.2107 140.042 9.67106 139.939 9.15053L141.901 8.76239C142.029 9.41006 142.097 10.0797 142.097 10.7649V13.1698ZM140.368 5.06383L138.706 6.17647C138.103 5.27474 137.326 4.49797 136.424 3.89428L137.537 2.23234C138.656 2.98147 139.619 3.94486 140.368 5.06383ZM115.001 0.504059H112.597C111.911 0.504059 111.242 0.571236 110.594 0.699365L110.982 2.66134C111.503 2.55836 112.042 2.50406 112.597 2.50406H115.001V0.504059ZM106.895 2.23235L108.008 3.89428C107.106 4.49797 106.33 5.27475 105.726 6.17647L104.064 5.06383C104.813 3.94487 105.777 2.98147 106.895 2.23235ZM102.336 27.5992H104.336V30.0041C104.336 30.5583 104.39 31.0979 104.493 31.6185L102.531 32.0066C102.403 31.3589 102.336 30.6893 102.336 30.0041V27.5992ZM104.064 35.7052L105.726 34.5925C106.33 35.4942 107.106 36.271 108.008 36.8747L106.895 38.5366C105.777 37.7875 104.813 36.8241 104.064 35.7052ZM102.336 22.7894H104.336V17.9796H102.336V22.7894ZM102.336 13.1698H104.336V10.7649C104.336 10.2107 104.39 9.67106 104.493 9.15053L102.531 8.7624C102.403 9.41007 102.336 10.0797 102.336 10.7649V13.1698ZM119.811 0.504059V2.50406H124.621V0.504059H119.811ZM129.431 0.504059V2.50406H131.836C132.39 2.50406 132.93 2.55836 133.45 2.66134L133.838 0.699365C133.191 0.571236 132.521 0.504059 131.836 0.504059H129.431ZM142.097 17.9796H140.097V22.7894H142.097V17.9796ZM142.097 27.5992H140.097V30.0041C140.097 30.5583 140.042 31.0979 139.939 31.6185L141.901 32.0066C142.029 31.3589 142.097 30.6893 142.097 30.0041V27.5992ZM124.621 40.2649V38.2649H119.811V40.2649H124.621Z"
- fill="#435B77" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M40.0298 172.228L40.7959 170.381C41.5528 170.695 42.3845 170.869 43.2618 170.869H45.2408V172.869H43.2618C42.117 172.869 41.0253 172.641 40.0298 172.228ZM57.1144 172.869V170.869H59.0933C59.9707 170.869 60.8023 170.695 61.5593 170.381L62.3254 172.228C61.3298 172.641 60.2382 172.869 59.0933 172.869H57.1144ZM67.5368 150.573H65.5368V148.594C65.5368 147.717 65.3625 146.885 65.0486 146.128L66.8961 145.362C67.3089 146.358 67.5368 147.449 67.5368 148.594V150.573ZM45.2408 140.151H43.2618C42.117 140.151 41.0253 140.378 40.0298 140.791L40.7959 142.639C41.5528 142.325 42.3845 142.151 43.2618 142.151H45.2408V140.151ZM34.8184 162.447H36.8184V164.426C36.8184 165.303 36.9926 166.134 37.3065 166.891L35.4591 167.658C35.0462 166.662 34.8184 165.57 34.8184 164.426V162.447ZM34.8184 158.489H36.8184V154.531H34.8184V158.489ZM34.8184 150.573H36.8184V148.594C36.8184 147.717 36.9926 146.885 37.3065 146.128L35.4591 145.362C35.0462 146.358 34.8184 147.449 34.8184 148.594V150.573ZM49.1986 140.151V142.151H53.1565V140.151H49.1986ZM57.1144 140.151V142.151H59.0933C59.9707 142.151 60.8023 142.325 61.5593 142.639L62.3254 140.791C61.3298 140.378 60.2382 140.151 59.0933 140.151H57.1144ZM67.5368 154.531H65.5368V158.489H67.5368V154.531ZM67.5368 162.447H65.5368V164.426C65.5368 165.303 65.3625 166.134 65.0486 166.891L66.8961 167.658C67.3089 166.662 67.5368 165.57 67.5368 164.426V162.447ZM53.1565 172.869V170.869H49.1986V172.869H53.1565Z"
- fill="#435B77" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M112.803 199.154L113.569 197.307C113.862 197.428 114.184 197.496 114.527 197.496H116.638V199.496H114.527C113.917 199.496 113.334 199.374 112.803 199.154ZM120.86 199.496V197.496H122.971C123.314 197.496 123.636 197.428 123.929 197.307L124.695 199.154C124.164 199.374 123.582 199.496 122.971 199.496H120.86ZM127.475 188.66H125.475V186.549C125.475 186.205 125.407 185.883 125.285 185.591L127.133 184.825C127.353 185.356 127.475 185.938 127.475 186.549V188.66ZM116.638 182.045H114.527C113.917 182.045 113.334 182.167 112.803 182.387L113.569 184.234C113.862 184.113 114.184 184.045 114.527 184.045H116.638V182.045ZM110.024 192.881H112.024V194.992C112.024 195.336 112.092 195.658 112.213 195.95L110.365 196.716C110.145 196.185 110.024 195.603 110.024 194.992V192.881ZM110.024 188.66H112.024V186.549C112.024 186.205 112.092 185.883 112.213 185.591L110.365 184.825C110.145 185.356 110.024 185.938 110.024 186.549V188.66ZM120.86 182.045V184.045H122.971C123.314 184.045 123.636 184.113 123.929 184.234L124.695 182.387C124.164 182.167 123.582 182.045 122.971 182.045H120.86ZM127.475 192.881H125.475V194.992C125.475 195.336 125.407 195.658 125.285 195.95L127.133 196.716C127.353 196.185 127.475 195.603 127.475 194.992V192.881Z"
- fill="#435B77" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M178.996 80.3275L179.762 78.4801C180.48 78.7778 181.269 78.9431 182.101 78.9431H184.003V80.9431H182.101C181.001 80.9431 179.952 80.7242 178.996 80.3275ZM195.412 80.9431V78.9431H197.314C198.146 78.9431 198.935 78.7778 199.653 78.4801L200.419 80.3275C199.463 80.7242 198.414 80.9431 197.314 80.9431H195.412ZM205.427 59.5189H203.427V57.6174C203.427 56.7848 203.262 55.9958 202.964 55.2778L204.811 54.5117C205.208 55.4683 205.427 56.5173 205.427 57.6174V59.5189ZM184.003 49.5041H182.101C181.001 49.5041 179.952 49.723 178.996 50.1197L179.762 51.9672C180.48 51.6694 181.269 51.5041 182.101 51.5041H184.003V49.5041ZM173.988 70.9283H175.988V72.8298C175.988 73.6624 176.153 74.4514 176.451 75.1694L174.604 75.9355C174.207 74.9789 173.988 73.9299 173.988 72.8298V70.9283ZM173.988 67.1252H175.988V63.322H173.988V67.1252ZM173.988 59.5189H175.988V57.6174C175.988 56.7848 176.153 55.9958 176.451 55.2778L174.604 54.5117C174.207 55.4683 173.988 56.5173 173.988 57.6174V59.5189ZM187.806 49.5041V51.5041H191.609V49.5041H187.806ZM195.412 49.5041V51.5041H197.314C198.146 51.5041 198.935 51.6694 199.653 51.9672L200.419 50.1197C199.463 49.723 198.414 49.5041 197.314 49.5041H195.412ZM205.427 63.322H203.427V67.1252H205.427V63.322ZM205.427 70.9283H203.427V72.8298C203.427 73.6624 203.262 74.4514 202.964 75.1694L204.811 75.9355C205.208 74.9789 205.427 73.9299 205.427 72.8298V70.9283ZM191.609 80.9431V78.9431H187.806V80.9431H191.609Z"
- fill="#657D99" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M234.829 108.525L235.595 106.678C235.887 106.799 236.209 106.867 236.553 106.867H238.664V108.867H236.553C235.942 108.867 235.36 108.745 234.829 108.525ZM242.886 108.867V106.867H244.997C245.34 106.867 245.662 106.799 245.954 106.678L246.72 108.525C246.189 108.745 245.607 108.867 244.997 108.867H242.886ZM249.5 98.0306H247.5V95.9196C247.5 95.5765 247.432 95.2543 247.311 94.9619L249.158 94.1957C249.378 94.7267 249.5 95.309 249.5 95.9196V98.0306ZM238.664 91.4162H236.553C235.942 91.4162 235.36 91.5377 234.829 91.7579L235.595 93.6053C235.887 93.4841 236.209 93.4162 236.553 93.4162H238.664V91.4162ZM232.049 102.253H234.049V104.364C234.049 104.707 234.117 105.029 234.238 105.321L232.391 106.087C232.171 105.556 232.049 104.974 232.049 104.364V102.253ZM232.049 98.0306H234.049V95.9196C234.049 95.5765 234.117 95.2543 234.238 94.9619L232.391 94.1957C232.171 94.7267 232.049 95.309 232.049 95.9196V98.0306ZM242.886 91.4162V93.4162H244.997C245.34 93.4162 245.662 93.4841 245.954 93.6053L246.72 91.7579C246.189 91.5377 245.607 91.4162 244.997 91.4162H242.886ZM249.5 102.253H247.5V104.364C247.5 104.707 247.432 105.029 247.311 105.321L249.158 106.087C249.378 105.556 249.5 104.974 249.5 104.364V102.253Z"
- fill="#435B77" />
- <path
- d="M29.8254 34.881V54.1644C29.8254 55.7297 31.1003 57.0206 32.6817 57.0206H34.021C35.5863 57.0206 36.8772 55.7297 36.8772 54.1644V34.881H29.8254Z"
- fill="#82C91E" />
- <path
- d="M36.8611 25.5867V21.956C36.8611 20.3907 35.5863 19.0998 34.021 19.0998H32.6817C31.1164 19.0998 29.8254 20.3907 29.8254 21.956V25.5867H36.8611Z"
- fill="#82C91E" />
- <path
- d="M52.5136 41.2394V21.956C52.5136 20.3907 51.2388 19.0998 49.6735 19.0998H48.3342C46.7689 19.0998 45.478 20.3907 45.478 21.956V41.2394H52.5136Z"
- fill="#82C91E" />
- <path
- d="M45.478 50.5334V54.1641C45.478 55.7294 46.7689 57.0203 48.3342 57.0203H49.6735C51.2388 57.0203 52.5298 55.7294 52.5298 54.1641V50.5334H45.478Z"
- fill="#82C91E" />
- <path
- d="M28.6957 42.3693H25.065C23.4997 42.3693 22.2087 43.6441 22.2087 45.2255V46.5648C22.2087 48.1301 23.4836 49.4211 25.065 49.4211H28.6957V42.3693Z"
- fill="#95DE2D" />
- <path
- d="M57.2738 42.3693H37.9903V49.4211H57.2738C58.839 49.4211 60.13 48.1301 60.13 46.5648V45.2255C60.13 43.6441 58.839 42.3693 57.2738 42.3693Z"
- fill="#95DE2D" />
- <path
- d="M44.3484 26.7169H25.065C23.4997 26.7169 22.2087 27.9918 22.2087 29.5732V30.9125C22.2087 32.4778 23.4836 33.7687 25.065 33.7687H44.3484V26.7169Z"
- fill="#95DE2D" />
- <path
- d="M57.2738 26.7169H53.6431V33.7687H57.2738C58.8391 33.7687 60.1301 32.4938 60.1301 30.9124V29.5731C60.1301 27.9917 58.8391 26.7169 57.2738 26.7169Z"
- fill="#95DE2D" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M108.864 100H129.086C129.852 100 130.587 100.305 131.129 100.848C131.671 101.39 131.975 102.126 131.975 102.894L131.975 127.695C131.975 128.8 130.688 129.403 129.841 128.695L124.6 124.308H108.864C108.098 124.308 107.363 124.003 106.821 123.46C106.279 122.917 105.975 122.181 105.975 121.414V102.894C105.975 102.126 106.279 101.39 106.821 100.848C107.363 100.305 108.098 100 108.864 100ZM116.549 112.823H110.597V104.63H127.353V112.823H121.499V115.656H123.64C124.026 115.656 124.22 116.123 123.947 116.397L119.331 121.021C119.161 121.19 118.887 121.19 118.718 121.021L114.102 116.397C113.829 116.123 114.022 115.656 114.408 115.656H116.549V112.823Z"
- fill="#95DE2D" />
- <path
- d="M190.408 151.656V162.803C190.408 163.708 191.145 164.454 192.059 164.454H192.833C193.738 164.454 194.484 163.708 194.484 162.803V151.656H190.408Z"
- fill="#82C91E" />
- <path
- d="M194.475 146.283V144.184C194.475 143.279 193.738 142.533 192.833 142.533H192.059C191.154 142.533 190.408 143.279 190.408 144.184V146.283H194.475Z"
- fill="#82C91E" />
- <path
- d="M203.523 155.331V144.184C203.523 143.279 202.786 142.533 201.881 142.533H201.107C200.202 142.533 199.456 143.279 199.456 144.184V155.331H203.523Z"
- fill="#82C91E" />
- <path
- d="M199.456 160.705V162.804C199.456 163.709 200.202 164.455 201.107 164.455H201.881C202.786 164.455 203.533 163.709 203.533 162.804V160.705H199.456Z"
- fill="#82C91E" />
- <path
- d="M189.755 155.984H187.656C186.751 155.984 186.005 156.721 186.005 157.635V158.409C186.005 159.314 186.742 160.061 187.656 160.061H189.755V155.984Z"
- fill="#95DE2D" />
- <path
- d="M206.275 155.984H195.128V160.061H206.275C207.18 160.061 207.926 159.314 207.926 158.409V157.635C207.926 156.721 207.18 155.984 206.275 155.984Z"
- fill="#95DE2D" />
- <path
- d="M198.803 146.937H187.656C186.751 146.937 186.005 147.674 186.005 148.588V149.363C186.005 150.267 186.742 151.014 187.656 151.014H198.803V146.937Z"
- fill="#95DE2D" />
- <path
- d="M206.275 146.937H204.176V151.014H206.275C207.18 151.014 207.926 150.277 207.926 149.363V148.588C207.926 147.674 207.18 146.937 206.275 146.937Z"
- fill="#95DE2D" />
-</svg>
diff --git a/briar-android/artwork/nickname.svg b/briar-android/artwork/nickname.svg
deleted file mode 100644
index 7daecca04da0a2167748f8d997d41f55aedc48fb..0000000000000000000000000000000000000000
--- a/briar-android/artwork/nickname.svg
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="150"
- height="178"
- viewBox="0 0 150 178"
- fill="none"
- version="1.1"
- id="svg129"
- sodipodi:docname="nickname.svg"
- inkscape:version="0.92.3 (2405546, 2018-03-11)">
- <metadata
- id="metadata133">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1020"
- id="namedview131"
- showgrid="false"
- inkscape:zoom="3.7500494"
- inkscape:cx="84.461975"
- inkscape:cy="96.344913"
- inkscape:window-x="1440"
- inkscape:window-y="24"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg129" />
- <path
- d="M 85.1905,0.127869 3.35693,0.328805 C 2.46521,0.330621 1.6107,0.690255 0.981217,1.32866 0.351735,1.96706 -0.0011965,2.83198 3.04782e-6,3.73331 L 0.372743,156.201 c 0.001185,0.446 0.089367,0.888 0.259505,1.3 0.170138,0.412 0.418902,0.786 0.732092,1.101 0.31319,0.315 0.68466,0.564 1.09322,0.734 0.40856,0.17 0.84619,0.257 1.28792,0.256 l 81.83362,-0.201 c 0.8917,-0.003 1.746,-0.363 2.375,-1.002 0.6291,-0.639 0.9814,-1.504 0.9796,-2.405 L 88.5542,3.51639 C 88.5512,2.61665 88.1955,1.75479 87.565,1.11965 86.9345,0.484503 86.0807,0.127864 85.1905,0.127869 Z"
- id="path2"
- inkscape:connector-curvature="0"
- style="display:inline;opacity:0.25;fill:url(#paint0_linear)" />
- <path
- d="M 84.2815,-0.0019907 4.27572,0.195606 C 2.57395,0.199809 1.19777,1.59763 1.20193,3.31772 L 1.56691,154.298 c 0.00416,1.72 1.38709,3.111 3.08885,3.107 l 80.00584,-0.198 c 1.7017,-0.004 3.0779,-1.402 3.0737,-3.122 L 87.3704,3.1049 C 87.3662,1.38481 85.9833,-0.0061937 84.2815,-0.0019907 Z"
- id="path4"
- inkscape:connector-curvature="0"
- style="display:inline;opacity:0.25;fill:#6d6d6d;fill-opacity:0.7" />
- <path
- style="display:inline;opacity:0.25;fill:#646464"
- d="M 81.939453 3.9570312 L 65.933594 3.9960938 C 65.688694 5.6638138 64.861562 7.1881588 63.601562 8.2929688 C 62.341563 9.3977688 60.732453 10.010031 59.064453 10.019531 L 29.302734 10.091797 C 27.634734 10.090597 26.021259 9.4871919 24.755859 8.3886719 C 23.490459 7.2901519 22.655444 5.7700256 22.402344 4.1035156 L 6.6367188 4.1425781 C 5.7689587 4.1449981 4.9382819 4.4954875 4.3261719 5.1171875 C 3.7140519 5.7388975 3.3712469 6.5799313 3.3730469 7.4570312 L 3.4609375 44.068359 L 3.7167969 150.16797 C 3.7209769 151.04497 4.0691969 151.88495 4.6855469 152.50195 C 5.3018969 153.11895 6.1361462 153.46394 7.0039062 153.46094 L 82.306641 153.27539 C 83.171641 153.27039 83.999475 152.92078 84.609375 152.30078 C 85.219375 151.68078 85.560547 150.8408 85.560547 149.9668 L 85.306641 43.5625 L 85.220703 7.2558594 C 85.218303 6.3787594 84.870959 5.5386319 84.255859 4.9199219 C 83.640859 4.3012219 82.807253 3.9552112 81.939453 3.9570312 z M 52.652344 5.7910156 L 34.357422 6.0683594 C 34.107922 6.0721494 33.908409 6.27906 33.912109 6.53125 L 33.916016 6.8300781 C 33.919716 7.0822681 34.1255 7.28504 34.375 7.28125 L 52.671875 7.0019531 C 52.921375 6.9981731 53.118934 6.7912525 53.115234 6.5390625 L 53.111328 6.2402344 C 53.107628 5.9880444 52.901844 5.7872256 52.652344 5.7910156 z "
- id="path6" />
- <path
- d="M 57.2036,6.934 C 57.6016,6.92797 57.9193,6.59699 57.9133,6.19476 57.9074,5.79252 57.5799,5.47134 57.182,5.47738 c -0.398,0.00604 -0.7157,0.33701 -0.7098,0.73924 0.006,0.40224 0.3335,0.72342 0.7314,0.71738 z"
- id="path10"
- inkscape:connector-curvature="0"
- style="opacity:0.25;fill:#dbdbdb" />
- <path
- style="display:inline;opacity:0.25;fill:#e0e0e0"
- d="m 17.640625,19.458984 c -4.1846,0 -7.576172,3.445513 -7.576172,7.695313 0,4.2498 3.391572,7.695312 7.576172,7.695312 4.1845,0 7.576172,-3.445512 7.576172,-7.695312 0,-4.2498 -3.391672,-7.695313 -7.576172,-7.695313 z m 19.882813,4.177735 v 3.234375 h 40.117187 v -3.234375 z m 0,6.466797 v 3.234375 H 77.640625 V 30.103516 Z M 17.640625,44.087891 c -4.1846,0 -7.576172,3.443559 -7.576172,7.693359 0,4.2498 3.391572,7.695313 7.576172,7.695312 4.1845,0 7.576172,-3.445512 7.576172,-7.695312 0,-4.2498 -3.391672,-7.693359 -7.576172,-7.693359 z m 19.882813,4.177734 V 51.5 h 40.117187 v -3.234375 z m 0,6.466797 v 3.232422 H 77.640625 V 54.732422 Z M 17.640625,68.714844 c -4.1846,0 -7.576172,3.445512 -7.576172,7.695312 0,4.2498 3.391572,7.695313 7.576172,7.695313 4.1845,0 7.576172,-3.445513 7.576172,-7.695313 0,-4.2498 -3.391672,-7.695312 -7.576172,-7.695312 z m 19.882813,4.179687 v 3.232422 h 40.117187 v -3.232422 z m 0,6.466797 V 82.59375 H 77.640625 V 79.361328 Z M 17.640625,93.34375 c -4.1846,0 -7.576172,3.445613 -7.576172,7.69531 0,4.25 3.391572,7.69532 7.576172,7.69532 4.1845,0 7.576172,-3.44532 7.576172,-7.69532 0,-4.249698 -3.391672,-7.69531 -7.576172,-7.69531 z m 19.882813,4.179688 v 3.232422 h 40.117187 v -3.232422 z m 0,6.464842 v 3.23438 h 40.117187 v -3.23438 z m -19.882813,13.98438 c -4.1846,0 -7.576172,3.44631 -7.576172,7.69531 0,4.25 3.391572,7.69336 7.576172,7.69336 4.1845,0 7.576172,-3.44336 7.576172,-7.69336 0,-4.249 -3.391672,-7.69531 -7.576172,-7.69531 z m 19.882813,4.17773 v 3.23438 h 40.117187 v -3.23438 z m 0,6.4668 v 3.23437 h 40.117187 v -3.23437 z"
- id="path12"
- inkscape:connector-curvature="0" />
- <path
- style="display:inline;fill:#313131"
- inkscape:connector-curvature="0"
- id="path44"
- d="m 136.95,18.4066 -80.0056,0.1976 c -1.7018,0.0042 -3.078,1.402 -3.0738,3.1221 l 0.365,150.9807 c 0.0041,1.72 1.3871,3.111 3.0888,3.107 l 80.0056,-0.198 c 1.702,-0.004 3.078,-1.402 3.074,-3.122 L 140.039,21.5135 c -0.004,-1.7201 -1.387,-3.1111 -3.089,-3.1069 z" />
- <path
- style="display:inline;fill:#3e3e3e"
- d="M 134.60938 22.357422 L 118.59961 22.394531 C 118.35561 24.062231 117.52758 25.586606 116.26758 26.691406 C 115.00758 27.796206 113.39847 28.408469 111.73047 28.417969 L 81.96875 28.492188 C 80.30065 28.490987 78.689228 27.885609 77.423828 26.787109 C 76.158428 25.688609 75.323313 24.168453 75.070312 22.501953 L 59.304688 22.541016 C 58.436887 22.543416 57.604288 22.893925 56.992188 23.515625 C 56.380088 24.137325 56.037262 24.980322 56.039062 25.857422 L 56.128906 62.46875 L 56.748047 62.466797 L 56.128906 62.470703 L 56.382812 168.57031 C 56.385213 169.44731 56.732656 170.28725 57.347656 170.90625 C 57.962756 171.52425 58.796362 171.87114 59.664062 171.86914 L 134.9668 171.68359 C 135.8348 171.68159 136.66534 171.33098 137.27734 170.70898 C 137.88934 170.08798 138.23247 169.24614 138.23047 168.36914 L 137.97266 62.21875 L 137.97461 62.21875 L 137.88867 25.65625 C 137.88667 24.77915 137.54078 23.939012 136.92578 23.320312 C 136.31078 22.701612 135.47738 22.355522 134.60938 22.357422 z "
- id="path46" />
- <path
- style="display:inline;fill:#e0e0e0"
- d="M 109.84961 23.890625 C 109.45161 23.896725 109.13462 24.228559 109.14062 24.630859 C 109.14663 25.033059 109.47309 25.353756 109.87109 25.347656 C 110.26909 25.341656 110.58608 25.009622 110.58008 24.607422 C 110.57408 24.205222 110.24761 23.884625 109.84961 23.890625 z M 105.32031 24.201172 L 87.025391 24.478516 C 86.775891 24.482316 86.576378 24.691159 86.580078 24.943359 L 86.583984 25.242188 C 86.587684 25.494387 86.793469 25.695206 87.042969 25.691406 L 105.33984 25.414062 C 105.58884 25.410363 105.7872 25.203372 105.7832 24.951172 L 105.7793 24.650391 C 105.7753 24.398191 105.56931 24.197372 105.32031 24.201172 z M 63.365234 37.568359 L 63.365234 53.738281 L 79.365234 53.738281 L 79.365234 37.568359 L 63.365234 37.568359 z M 86.748047 37.568359 L 86.748047 40.800781 L 126.86523 40.800781 L 126.86523 37.568359 L 86.748047 37.568359 z M 86.748047 44.037109 L 86.748047 47.269531 L 126.86523 47.269531 L 126.86523 44.037109 L 86.748047 44.037109 z M 71.787109 112.99609 C 67.602609 112.99609 64.210937 116.44141 64.210938 120.69141 C 64.210938 124.94141 67.602609 128.38672 71.787109 128.38672 C 75.971709 128.38672 79.365234 124.94141 79.365234 120.69141 C 79.365234 116.44141 75.971709 112.99609 71.787109 112.99609 z M 86.748047 116.92773 L 86.748047 120.16016 L 126.86523 120.16016 L 126.86523 116.92773 L 86.748047 116.92773 z M 86.748047 123.39258 L 86.748047 126.62695 L 126.86523 126.62695 L 126.86523 123.39258 L 86.748047 123.39258 z M 71.787109 142.60156 C 67.602609 142.60156 64.210937 146.04687 64.210938 150.29688 C 64.210938 154.54688 67.602609 157.99023 71.787109 157.99023 C 75.971709 157.99023 79.365234 154.54688 79.365234 150.29688 C 79.365234 146.04688 75.971709 142.60156 71.787109 142.60156 z M 86.748047 145.53516 L 86.748047 148.76758 L 126.86523 148.76758 L 126.86523 145.53516 L 86.748047 145.53516 z M 86.748047 152.00195 L 86.748047 155.23438 L 126.86523 155.23438 L 126.86523 152.00195 L 86.748047 152.00195 z "
- id="path50" />
- <path
- style="display:inline;fill:#d5d6d7"
- inkscape:connector-curvature="0"
- id="path56"
- d="M 148.744,68.6655 H 45.619 v 33.5835 h 103.125 z" />
- <path
- style="display:inline;fill:#87c214"
- d="m 97.822266,50.503906 v 5.722656 h 17.966794 v -5.722656 z m -11.074219,30.59961 v 3.232422 h 40.117183 v -3.232422 z m 0,6.46875 v 3.232422 h 40.117183 v -3.232422 z"
- id="path58"
- inkscape:connector-curvature="0" />
- <path
- style="display:inline;fill:#f5f5f5"
- inkscape:connector-curvature="0"
- id="path68"
- d="m 66.8652,92.3143 c 4.1846,0 7.5768,-3.4451 7.5768,-7.695 0,-4.2498 -3.3922,-7.6949 -7.5768,-7.6949 -4.1846,0 -7.5768,3.4451 -7.5768,7.6949 0,4.2499 3.3922,7.695 7.5768,7.695 z" />
- <path
- style="display:inline;fill:#87c214"
- inkscape:connector-curvature="0"
- id="path70"
- d="m 70.1296,90.0058 h -6.5738 c -0.3153,0.0024 -0.6253,0.0818 -0.9038,0.2312 -0.2784,0.1495 -0.5171,0.3647 -0.6956,0.6274 1.4766,0.8563 3.1474,1.3114 4.8498,1.321 1.7023,0.0096 3.3781,-0.4266 4.864,-1.2662 -0.1666,-0.265 -0.3932,-0.486 -0.6612,-0.6448 -0.2679,-0.1588 -0.5693,-0.2509 -0.8794,-0.2686 z" />
- <path
- style="display:inline;fill:#333333"
- d="m 66.861328,80.746094 c -2.0798,0 -3.765625,1.70444 -3.765625,3.80664 0,0.393506 0.07586,0.766 0.185547,1.123047 -0.327549,0.812667 -0.821888,1.878261 -1.158203,1.708985 0,0 5.069822,4.4252 9.544922,0 -0.355198,-0.613452 -0.773279,-1.18389 -1.21875,-1.732422 0.10502,-0.350063 0.177734,-0.714879 0.177734,-1.09961 0,-2.1022 -1.685825,-3.80664 -3.765625,-3.80664 z"
- id="path72"
- inkscape:connector-curvature="0" />
- <path
- style="display:inline;fill:#fda57d"
- d="m 66.861328,81.570312 c -1.800651,0 -3.302121,1.279176 -3.673828,2.986329 -0.0049,-3.79e-4 -0.0088,-0.0059 -0.01367,-0.0059 -0.1933,0 -0.349609,0.297063 -0.349609,0.664063 0,0.347156 0.141531,0.622551 0.320312,0.652344 0.180942,1.407599 1.108928,2.5691 2.38086,3.058593 v 0.732422 c 0,0.3234 0.127315,0.634681 0.353515,0.863281 0.2263,0.2287 0.533616,0.357422 0.853516,0.357422 h 0.224609 c 0.1588,3e-4 0.316091,-0.03245 0.462891,-0.09375 0.1467,-0.0613 0.280278,-0.150172 0.392578,-0.263672 0.1123,-0.1135 0.201119,-0.248084 0.261719,-0.396484 0.0606,-0.1483 0.0921,-0.30825 0.0918,-0.46875 v -0.720703 c 1.288752,-0.483775 2.232282,-1.654559 2.412109,-3.076172 0.168226,-0.0485 0.298828,-0.311757 0.298828,-0.644531 0,-0.363137 -0.153161,-0.655938 -0.34375,-0.66211 -0.373249,-1.705035 -1.87271,-2.982422 -3.671875,-2.982422 z"
- id="path78"
- inkscape:connector-curvature="0" />
- <path
- style="display:inline;fill:#333333"
- inkscape:connector-curvature="0"
- id="path84"
- d="m 63.2529,83.9344 h 7.1792 c 0,0 -0.6122,-2.9296 -3.3275,-2.7401 -2.7154,0.1895 -3.8517,2.7401 -3.8517,2.7401 z" />
- <defs
- id="defs127">
- <linearGradient
- id="paint0_linear"
- x1="10.0511"
- y1="162.566"
- x2="80.1467"
- y2="-2.31086"
- gradientUnits="userSpaceOnUse">
- <stop
- stop-color="#808080"
- stop-opacity="0.25"
- id="stop110" />
- <stop
- offset="0.54"
- stop-color="#808080"
- stop-opacity="0.12"
- id="stop112" />
- <stop
- offset="1"
- stop-color="#808080"
- stop-opacity="0.1"
- id="stop114" />
- </linearGradient>
- <linearGradient
- id="paint1_linear"
- x1="45488.3"
- y1="16529.6"
- x2="45488.3"
- y2="10752.2"
- gradientUnits="userSpaceOnUse">
- <stop
- stop-color="#808080"
- stop-opacity="0.25"
- id="stop117" />
- <stop
- offset="0.54"
- stop-color="#808080"
- stop-opacity="0.12"
- id="stop119" />
- <stop
- offset="1"
- stop-color="#808080"
- stop-opacity="0.1"
- id="stop121" />
- </linearGradient>
- <clipPath
- id="clip0">
- <rect
- width="150"
- height="178"
- fill="white"
- id="rect124" />
- </clipPath>
- </defs>
-</svg>
diff --git a/briar-android/artwork/qr_code.svg b/briar-android/artwork/qr_code.svg
deleted file mode 100644
index 07930f849b6ac18afb8bad78edd76d3d2a531fc3..0000000000000000000000000000000000000000
--- 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/artwork/qr_code_error.svg b/briar-android/artwork/qr_code_error.svg
deleted file mode 100644
index cfd12461e56e60b0579d4a0bdfa7724e610fbb5b..0000000000000000000000000000000000000000
--- a/briar-android/artwork/qr_code_error.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- height="161.7"
- width="409.20001"
- version="1.1"
- id="svg2"
- x="0px"
- y="0px"
- viewBox="0 0 409.2 161.7"
- xml:space="preserve"><metadata
- id="metadata853"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
- id="defs851" />
-<style
- type="text/css"
- id="style826">
- .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="m 369.6,157.3 -4.3,-4.3 -7.1,-2.4 c -3.9,-1.3 -8.7,-3 -10.7,-3.7 l -3.7,-1.3 3.5,-0.2 c 8.2,-0.4 13,-4 14.3,-10.9 0.8,-4.1 1.1,-17.3 0.8,-33 -0.2,-8.100003 -0.2,-15.400003 0,-16.300003 0.1,-0.9 0.5,-2.4 0.9,-3.4 1.2,-3.5 0.3,-11.9 -1.9,-17.6 -0.3,-0.9 -1.9,-4.2 -3.5,-7.4 -4.2,-8.2 -4.5,-8.9 -4.9,-10.5 -0.5,-1.8 -0.2,-5.4 0.5,-6.8 0.7,-1.3 2.2,-2.9 3.2,-3.5 1.3,-0.7 2.6,0.1 4.7,2.9 3.4,4.5 14,19.4 15.7,22.2 3.7,6 6,11.2 8,18.8 0.7,2.5 1.9,7 2.7,10.1 0.8,3.1 2.7,10.200003 4.1,15.800003 l 2.6,10.2 4.6,5.2 c 2.6,2.9 5.8,6.5 7.2,8 1.4,1.6 2.5,3 2.5,3.2 0,0.3 -34.5,29.3 -34.9,29.3 0.1,-0.1 -1.9,-2.1 -4.3,-4.4 z m -93.9,-16.4 c -1.3,-0.6 -2.2,-1.4 -2.9,-2.3 -2.1,-2.7 -2,2.4 -1.9,-68.500003 l 0.1,-64.0000001 0.7,-1.2 c 1,-1.9 2,-2.9 3.7,-3.89999995 l 1.6,-0.9 L 314.8,-3.0517578e-6 C 357.3,-0.10000305 354.2,-0.20000305 356.9,2.1999969 c 0.9,0.8 1.8,2 2.2,2.9 0.7,1.6 0.7,1.6 0.8,14.2000001 l 0.1,12.6 -1.8,-0.1 c -1.4,-0.1 -2.1,0 -3.2,0.5 -2,1 -3.9,2.9 -5.1,5.1 l -1,2 v -12.8 -12.8 h -33.6 -33.6 v 51.3 V 116.4 h 33.6 33.6 L 349,81.999997 c 0.1,-33 0.1,-34.4 0.6,-32.9 0.3,0.8 1.8,4 3.4,7 5.5,10.6 5.4,9.9 5.4,47.200003 0,27.6 -0.1,30 -1.7,33.1 -1.1,2.2 -2.7,3.7 -5.1,4.7 l -1.7,0.7 -36.1,-0.1 -36.2,0.1 z m 42.4,-5.1 c 2.9,-1.3 4.5,-3.7 4.4,-6.6 0,-4.1 -3.1,-7.2 -7.1,-7.2 -2.1,0 -3.6,0.6 -5.2,2.2 -2.2,2.2 -2.8,5.4 -1.3,8.3 0.7,1.4 2.5,3 4,3.5 1.5,0.5 3.9,0.5 5.2,-0.2 z" />
-<path
- id="path4201-1"
- d="m 39.2,157.3 4.3,-4.3 7.1,-2.4 c 3.9,-1.3 8.7,-3 10.7,-3.7 l 3.7,-1.3 -3.5,-0.2 c -8.2,-0.4 -13,-4 -14.3,-10.9 -0.8,-4.1 -1.1,-17.3 -0.8,-33 0.2,-8.100003 0.2,-15.400003 0,-16.300003 -0.1,-0.9 -0.5,-2.4 -0.9,-3.4 -1.2,-3.5 -0.3,-11.9 1.9,-17.6 0.3,-0.9 1.9,-4.2 3.5,-7.4 4.2,-8.2 4.5,-8.9 4.9,-10.5 0.5,-1.8 0.2,-5.4 -0.5,-6.8 -0.7,-1.3 -2.2,-2.9 -3.2,-3.5 -1.3,-0.7 -2.6,0.1 -4.7,2.9 -3.4,4.5 -14,19.4 -15.7,22.2 -3.7,6 -6,11.2 -8,18.8 -0.7,2.5 -1.9,7 -2.7,10.1 -0.8,3.1 -2.7,10.200003 -4.1,15.800003 l -2.6,10.2 -4.6,5.2 c -2.6,2.9 -5.8,6.5 -7.2,8 -1.4,1.5 -2.5,3 -2.5,3.2 0,0.3 34.5,29.3 34.9,29.3 -0.1,-0.1 2,-2.1 4.3,-4.4 z m 93.9,-16.4 c 1.3,-0.6 2.2,-1.4 2.9,-2.3 2.1,-2.7 2,2.4 1.9,-68.500003 l -0.1,-64.0000001 -0.7,-1.2 c -1,-1.9 -2,-2.9 -3.7,-3.89999995 l -1.6,-0.9 L 94,-3.0517578e-6 C 51.5,-0.10000305 54.6,-0.20000305 51.9,2.1999969 c -0.9,0.8 -1.8,2 -2.2,2.9 -0.7,1.6 -0.7,1.6 -0.8,14.2000001 l -0.1,12.6 1.8,-0.1 c 1.4,-0.1 2.1,0 3.2,0.5 2,1 3.9,2.9 5.1,5.1 l 1,2 v -12.8 -12.8 h 33.6 33.6 v 51.3 V 116.4 H 93.6 60 L 59.9,81.999997 c -0.1,-33 -0.1,-34.4 -0.6,-32.9 -0.3,0.8 -1.8,4 -3.4,7 -5.5,10.6 -5.4,9.9 -5.4,47.200003 0,27.6 0.1,30 1.7,33.1 1.1,2.2 2.7,3.7 5.1,4.7 l 1.7,0.7 36.2,0.1 36.2,0.1 z m -42.4,-5.1 c -2.9,-1.3 -4.5,-3.7 -4.4,-6.6 0,-4.1 3.1,-7.2 7.1,-7.2 2.1,0 3.6,0.6 5.2,2.2 2.2,2.2 2.8,5.4 1.3,8.3 -0.7,1.4 -2.5,3 -4,3.5 -1.5,0.5 -3.8,0.5 -5.2,-0.2 z" />
-<g
- transform="translate(46.8,-347.3)"
- id="g832">
- <path
- d="m 33.5,410.2 h 2.3 v 2.3 h 2.3 v 2.3 H 26.6 v -2.3 h 2.3 v -4.6 h 4.6 z m 30,20.8 h 2.3 v -2.3 H 63.5 Z M 35.8,410.2 h 2.3 v -2.3 H 35.8 Z M 68.1,431 h 2.3 v -2.3 h -2.3 z m -27.7,2.3 H 45 V 431 h -4.6 z m 20.8,0 V 431 h -2.3 v 2.3 z m -9.2,0 h 2.3 v -4.6 H 52 Z m -18.5,-30 v 2.3 h 6.9 v -2.3 z m -2.3,2.3 v -2.3 h -4.6 v 4.6 h 2.3 v -2.3 z M 38.1,401 H 22 V 384.9 H 38.1 Z M 35.8,387.2 H 24.3 v 11.5 h 11.5 z m -9.2,41.5 h 6.9 v -6.9 h -6.9 z m 23,-2.4 v 2.3 H 52 v -2.3 z M 33.5,389.5 h -6.9 v 6.9 h 6.9 z m 36.9,-4.6 V 401 H 54.3 v -16.1 z m -2.3,2.3 H 56.6 v 11.5 H 68.1 Z M 22,417.1 h 16.1 v 16.1 H 22 Z M 24.3,431 H 35.8 V 419.5 H 24.3 Z m 0,-27.7 H 22 v 11.5 h 2.3 z m 30,11.5 v 2.3 h 2.3 v -2.3 z m -7,9.3 v -2.3 H 45 v 2.3 h -4.6 v 4.6 H 45 v 2.3 h 2.3 v -4.6 h 2.3 v -2.3 z m -6.9,-30 H 45 v -2.3 h -4.6 z m 18.5,18.4 h 4.6 v 2.3 h 2.3 v -6.9 h -2.3 v -4.6 h -2.3 v 6.9 h -6.9 v 2.3 h 2.3 v 2.3 h 2.3 z m 2.3,6.9 h -2.3 v -2.3 h -2.3 v 4.6 h -6.9 v 2.3 h 4.6 v 4.6 h 2.3 v 2.3 h 2.3 v -4.6 h 9.2 V 424 h -6.9 z m 0,0 h 2.3 v -4.6 h -2.3 z m -18.5,0 v -2.3 H 45 v -2.3 h 2.3 v -2.3 h 2.3 v -4.6 h 6.9 v -4.6 h -2.3 v 2.3 H 52 v -9.2 h -2.3 v -4.6 H 52 v -6.9 h -2.3 v 4.6 h -2.3 v -4.6 h -6.9 v 4.6 h 2.3 v -2.3 H 45 v 4.6 h 2.3 v 6.9 h 2.3 v 2.3 h -2.3 v 4.6 H 45 V 401 h -2.3 v -2.3 h -2.3 v 4.6 h 2.3 v 2.3 h -2.3 v 6.9 h 2.3 v -4.6 H 45 v 4.6 h -2.3 v 2.3 h -2.3 v 6.9 H 45 v -2.3 z m 25.4,2.3 v -2.3 h -4.6 v 2.3 z m -2.3,-32.2 h -6.9 v 6.9 h 6.9 z M 47.3,419.4 H 52 v -2.3 h -2.3 v -2.3 h -2.3 v 4.6 z m 4.7,-4.6 v -2.3 h -2.3 v 2.3 z m 13.8,-9.2 h 4.6 v -2.3 h -4.6 z m 2.3,18.5 h 2.3 v -2.3 h -2.3 z m 0,-13.9 h 2.3 v -2.3 H 68.1 Z M 47.3,398.7 H 45 v 2.3 h 2.3 z m 0,0"
- id="path830" />
-</g>
-<g
- transform="translate(46.8,-347.3)"
- id="g836">
- <path
- d="m 256.5,410.2 h 2.3 v 2.3 h 2.3 v 2.3 h -11.5 v -2.3 h 2.3 v -4.6 h 4.6 z m 30,20.8 h 2.3 v -2.3 h -2.3 z m -27.7,-20.8 h 2.3 v -2.3 h -2.3 z m 32.3,20.8 h 2.3 v -2.3 h -2.3 z m -27.7,2.3 H 268 V 431 h -4.6 z m 20.8,0 V 431 h -2.3 v 2.3 z m -9.2,0 h 2.3 v -4.6 H 275 Z m -18.5,-30 v 2.3 h 6.9 v -2.3 z m -2.3,2.3 v -2.3 h -4.6 v 4.6 h 2.3 v -2.3 z m 6.9,-4.6 H 245 v -16.1 h 16.1 z m -2.3,-13.8 h -11.5 v 11.5 h 11.5 z m -9.2,41.5 h 6.9 v -6.9 h -6.9 z m 23,-2.4 v 2.3 h 2.3 v -2.3 z m -16.1,-36.8 h -6.9 v 6.9 h 6.9 z m 36.9,-4.6 V 401 h -16.1 v -16.1 z m -2.3,2.3 h -11.5 v 11.5 h 11.5 z M 245,417.1 h 16.1 v 16.1 H 245 Z m 2.3,13.9 h 11.5 v -11.5 h -11.5 z m 0,-27.7 H 245 v 11.5 h 2.3 z m 30,11.5 v 2.3 h 2.3 v -2.3 z m -7,9.3 v -2.3 H 268 v 2.3 h -4.6 v 4.6 h 4.6 v 2.3 h 2.3 v -4.6 h 2.3 v -2.3 z m -6.9,-30 h 4.6 v -2.3 h -4.6 z m 18.5,18.4 h 4.6 v 2.3 h 2.3 v -6.9 h -2.3 v -4.6 h -2.3 v 6.9 h -6.9 v 2.3 h 2.3 v 2.3 h 2.3 z m 2.3,6.9 h -2.3 v -2.3 h -2.3 v 4.6 h -6.9 v 2.3 h 4.6 v 4.6 h 2.3 v 2.3 h 2.3 v -4.6 h 9.2 V 424 h -6.9 z m 0,0 h 2.3 v -4.6 h -2.3 z m -18.5,0 v -2.3 h 2.3 v -2.3 h 2.3 v -2.3 h 2.3 v -4.6 h 6.9 v -4.6 h -2.3 v 2.3 H 275 v -9.2 h -2.3 v -4.6 h 2.3 v -6.9 h -2.3 v 4.6 h -2.3 v -4.6 h -6.9 v 4.6 h 2.3 v -2.3 h 2.3 v 4.6 h 2.3 v 6.9 h 2.3 v 2.3 h -2.3 v 4.6 H 268 V 401 h -2.3 v -2.3 h -2.3 v 4.6 h 2.3 v 2.3 h -2.3 v 6.9 h 2.3 v -4.6 h 2.3 v 4.6 h -2.3 v 2.3 h -2.3 v 6.9 h 4.6 v -2.3 z m 25.4,2.3 v -2.3 h -4.6 v 2.3 z m -2.3,-32.2 h -6.9 v 6.9 h 6.9 z m -18.5,29.9 h 4.6 v -2.3 h -2.3 v -2.3 h -2.3 z m 4.7,-4.6 v -2.3 h -2.3 v 2.3 z m 13.8,-9.2 h 4.6 v -2.3 h -4.6 z m 2.3,18.5 h 2.3 v -2.3 h -2.3 z m 0,-13.9 h 2.3 v -2.3 h -2.3 z M 270.3,398.7 H 268 v 2.3 h 2.3 z m 0,0"
- id="path834" />
-</g>
-
-
-
-<path
- style="opacity:1;fill:#000000;stroke-width:3.21294165"
- d="m 207.61295,88.782357 h -6.42588 v -12.85177 h 6.42588 m 0,25.703533 h -6.42588 v -6.425883 h 6.42588 m -38.5553,16.064713 h 70.68472 L 204.40001,50.227047 Z"
- id="path2" /></svg>
\ No newline at end of file
diff --git a/briar-android/artwork/share_app.svg b/briar-android/artwork/share_app.svg
deleted file mode 100644
index 024783b1cbd0446d2d273967183e6d5ac1ed1ea5..0000000000000000000000000000000000000000
--- a/briar-android/artwork/share_app.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="256" height="204"
- viewBox="0 0 256 204" fill="none" version="1.1" id="svg42" sodipodi:docname="share_app.svg"
- inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
- <metadata id="metadata48">
- <rdf:RDF>
- <cc:Work rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs id="defs46" />
- <sodipodi:namedview pagecolor="#000000" bordercolor="#666666" borderopacity="1"
- objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0"
- inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="964"
- id="namedview44" showgrid="false" inkscape:zoom="2.4705882" inkscape:cx="123.34752"
- inkscape:cy="83.759737" inkscape:window-x="1920" inkscape:window-y="72"
- inkscape:window-maximized="0" inkscape:current-layer="svg42" />
- <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
- d="M41.583 100.841H22.1807V102.841H52.7503V136.663H54.7503V102.841H68.0341C70.9241 102.841 73.267 105.184 73.267 108.074C73.267 112.068 76.5053 115.307 80.4999 115.307H92.727V113.307H80.4999C77.6098 113.307 75.267 110.964 75.267 108.074C75.267 104.079 72.0287 100.841 68.0341 100.841H43.583V63.6593H41.583V100.841Z"
- fill="#657D99" id="path2" />
- <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
- d="M122.611 86.0596V46.2531H124.611V86.0596H122.611Z" fill="#657D99" id="path4" />
- <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
- d="M119.754 179.928L119.754 142.682L121.754 142.682L121.754 179.928L119.754 179.928Z"
- fill="#657D99" id="path6" />
- <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
- d="M195.251 100.841V86.5962H193.251V113.826H148.362V115.826H194.251C198.125 115.826 201.301 118.969 201.301 122.826V127.044H203.301V122.826C203.301 118.186 199.75 114.378 195.251 113.881V102.841H233.052V100.841H195.251Z"
- fill="#657D99" id="path8" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M32.1213 57.4112L32.8875 55.5637C33.5961 55.8576 34.3747 56.0208 35.1966 56.0208H37.0795V58.0208H35.1966C34.1072 58.0208 33.0686 57.804 32.1213 57.4112ZM48.3769 58.0208V56.0208H50.2598C51.0816 56.0208 51.8602 55.8576 52.5689 55.5637L53.335 57.4112C52.3877 57.804 51.3491 58.0208 50.2598 58.0208H48.3769ZM58.2935 36.8067H56.2935V34.9238C56.2935 34.102 56.1303 33.3234 55.8364 32.6147L57.6839 31.8486C58.0767 32.7959 58.2935 33.8345 58.2935 34.9238V36.8067ZM37.0795 26.8901H35.1966C34.1072 26.8901 33.0686 27.1069 32.1213 27.4997L32.8875 29.3472C33.5961 29.0533 34.3747 28.8901 35.1966 28.8901H37.0795V26.8901ZM27.1628 48.1042H29.1628V49.9871C29.1628 50.8089 29.326 51.5875 29.6199 52.2962L27.7724 53.0623C27.3796 52.115 27.1628 51.0764 27.1628 49.9871V48.1042ZM27.1628 44.3384H29.1628V40.5725H27.1628V44.3384ZM27.1628 36.8067H29.1628V34.9238C29.1628 34.102 29.326 33.3234 29.6199 32.6147L27.7724 31.8486C27.3796 32.7959 27.1628 33.8345 27.1628 34.9238V36.8067ZM40.8453 26.8901V28.8901H44.6111V26.8901H40.8453ZM48.3769 26.8901V28.8901H50.2598C51.0816 28.8901 51.8602 29.0533 52.5689 29.3472L53.335 27.4997C52.3877 27.1069 51.3491 26.8901 50.2598 26.8901H48.3769ZM58.2935 40.5725H56.2935V44.3383H58.2935V40.5725ZM58.2935 48.1042H56.2935V49.9871C56.2935 50.8089 56.1303 51.5875 55.8364 52.2962L57.6839 53.0623C58.0767 52.115 58.2935 51.0764 58.2935 49.9871V48.1042ZM44.6111 58.0208V56.0208H40.8453V58.0208H44.6111Z"
- fill="#657D99" id="path10" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M112.487 40.4256L112.875 38.4636C113.41 38.5694 113.964 38.6251 114.533 38.6251H116.99V40.6251H114.533C113.833 40.6251 113.149 40.5565 112.487 40.4256ZM131.733 40.6251V38.6251H134.191C134.76 38.6251 135.314 38.5694 135.848 38.4636L136.237 40.4256C135.575 40.5565 134.891 40.6251 134.191 40.6251H131.733ZM140.016 38.8593L138.903 37.1973C139.829 36.5774 140.627 35.7797 141.247 34.8536L142.909 35.9663C142.143 37.1095 141.159 38.0939 140.016 38.8593ZM144.674 12.9411H142.674V10.4839C142.674 9.91475 142.619 9.36059 142.513 8.82599L144.475 8.43785C144.606 9.0996 144.674 9.78374 144.674 10.4839V12.9411ZM142.909 4.65889L141.247 5.77152C140.627 4.84548 139.829 4.04776 138.903 3.42779L140.016 1.76585C141.159 2.53126 142.143 3.5156 142.909 4.65889ZM116.99 0H114.533C113.833 0 113.149 0.0686375 112.487 0.199551L112.875 2.16153C113.41 2.05577 113.964 2 114.533 2H116.99V0ZM108.708 1.76585L109.821 3.42779C108.895 4.04776 108.097 4.84548 107.477 5.77152L105.815 4.65888C106.581 3.5156 107.565 2.53126 108.708 1.76585ZM104.049 27.6841H106.049V30.1412C106.049 30.7104 106.105 31.2645 106.211 31.7992L104.249 32.1873C104.118 31.5255 104.049 30.8414 104.049 30.1412V27.6841ZM105.815 35.9663L107.477 34.8536C108.097 35.7797 108.895 36.5774 109.821 37.1973L108.708 38.8593C107.565 38.0939 106.581 37.1095 105.815 35.9663ZM104.049 22.7697H106.049V17.8554H104.049V22.7697ZM104.049 12.9411H106.049V10.4839C106.049 9.91475 106.105 9.36059 106.211 8.82598L104.249 8.43785C104.118 9.09959 104.049 9.78374 104.049 10.4839V12.9411ZM121.905 0V2H126.819V0H121.905ZM131.733 0V2H134.191C134.76 2 135.314 2.05577 135.848 2.16153L136.237 0.199552C135.575 0.0686377 134.891 0 134.191 0H131.733ZM144.674 17.8554H142.674V22.7697H144.674V17.8554ZM144.674 27.6841H142.674V30.1412C142.674 30.7104 142.619 31.2645 142.513 31.7992L144.475 32.1873C144.606 31.5255 144.674 30.8414 144.674 30.1412V27.6841ZM126.819 40.6251V38.6251H121.905V40.6251H126.819Z"
- fill="#657D99" id="path12" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M183.397 81.9904L184.163 80.1429C184.902 80.4493 185.714 80.6194 186.57 80.6194H188.513V82.6194H186.57C185.446 82.6194 184.375 82.3957 183.397 81.9904ZM200.171 82.6194V80.6194H202.114C202.97 80.6194 203.782 80.4493 204.521 80.1429L205.287 81.9904C204.309 82.3957 203.238 82.6194 202.114 82.6194H200.171ZM210.403 60.7295H208.403V58.7866C208.403 57.9301 208.233 57.1184 207.927 56.3795L209.774 55.6134C210.18 56.5908 210.403 57.6626 210.403 58.7866V60.7295ZM188.513 50.4969H186.57C185.446 50.4969 184.375 50.7207 183.397 51.126L184.163 52.9734C184.902 52.667 185.714 52.4969 186.57 52.4969H188.513V50.4969ZM178.281 72.3869H180.281V74.3297C180.281 75.1863 180.451 75.998 180.757 76.7368L178.91 77.5029C178.504 76.5255 178.281 75.4538 178.281 74.3297V72.3869ZM178.281 68.5011H180.281V64.6153H178.281V68.5011ZM178.281 60.7295H180.281V58.7866C180.281 57.9301 180.451 57.1184 180.757 56.3795L178.91 55.6134C178.504 56.5908 178.281 57.6626 178.281 58.7866V60.7295ZM192.399 50.4969V52.4969H196.285V50.4969H192.399ZM200.171 50.4969V52.4969H202.114C202.97 52.4969 203.782 52.667 204.521 52.9734L205.287 51.126C204.309 50.7207 203.238 50.4969 202.114 50.4969H200.171ZM210.403 64.6153H208.403V68.5011H210.403V64.6153ZM210.403 72.3869H208.403V74.3297C208.403 75.1863 208.233 75.998 207.927 76.7368L209.774 77.5029C210.18 76.5255 210.403 75.4538 210.403 74.3297V72.3869ZM196.285 82.6194V80.6194H192.399V82.6194H196.285Z"
- fill="#657D99" id="path14" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M188.271 180.562L188.659 178.6C189.316 178.73 189.996 178.798 190.694 178.798H192.633V180.798H190.694C189.865 180.798 189.055 180.717 188.271 180.562ZM212.029 180.798V178.798H213.968C214.666 178.798 215.346 178.73 216.003 178.6L216.391 180.562C215.607 180.717 214.797 180.798 213.968 180.798H212.029ZM220.865 178.708L219.753 177.046C220.889 176.285 221.868 175.306 222.629 174.17L224.291 175.282C223.384 176.636 222.219 177.801 220.865 178.708ZM226.381 147.05H224.381V145.111C224.381 144.413 224.313 143.733 224.183 143.077L226.145 142.688C226.3 143.472 226.381 144.282 226.381 145.111V147.05ZM224.291 138.214L222.629 139.327C221.868 138.19 220.889 137.211 219.753 136.451L220.865 134.789C222.219 135.695 223.384 136.86 224.291 138.214ZM192.633 132.698H190.694C189.865 132.698 189.055 132.779 188.271 132.934L188.659 134.896C189.316 134.766 189.996 134.698 190.694 134.698H192.633V132.698ZM183.797 134.789L184.91 136.451C183.773 137.211 182.794 138.19 182.033 139.327L180.372 138.214C181.278 136.86 182.443 135.695 183.797 134.789ZM178.281 166.446H180.281V168.385C180.281 169.083 180.349 169.763 180.479 170.42L178.517 170.808C178.362 170.024 178.281 169.214 178.281 168.385V166.446ZM180.372 175.282L182.033 174.17C182.794 175.306 183.773 176.285 184.91 177.046L183.797 178.708C182.443 177.801 181.278 176.636 180.372 175.282ZM178.281 162.567H180.281V158.688H178.281V162.567ZM178.281 154.809H180.281V150.93H178.281V154.809ZM178.281 147.05H180.281V145.111C180.281 144.413 180.349 143.733 180.479 143.077L178.517 142.688C178.362 143.472 178.281 144.282 178.281 145.111V147.05ZM196.512 132.698V134.698H200.392V132.698H196.512ZM204.271 132.698V134.698H208.15V132.698H204.271ZM212.029 132.698V134.698H213.968C214.666 134.698 215.346 134.766 216.003 134.896L216.391 132.934C215.607 132.779 214.797 132.698 213.968 132.698H212.029ZM226.381 150.93H224.381V154.809H226.381V150.93ZM226.381 158.688H224.381V162.567H226.381V158.688ZM226.381 166.446H224.381V168.385C224.381 169.083 224.313 169.763 224.183 170.42L226.145 170.808C226.3 170.024 226.381 169.214 226.381 168.385V166.446ZM208.15 180.798V178.798H204.271V180.798H208.15ZM200.392 180.798V178.798H196.512V180.798H200.392Z"
- fill="#657D99" id="path16" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M40.3891 175.457L41.1552 173.609C41.9338 173.932 42.7892 174.111 43.6915 174.111H45.7134V176.111H43.6915C42.5217 176.111 41.4063 175.878 40.3891 175.457ZM57.8451 176.111V174.111H59.8671C60.7693 174.111 61.6247 173.932 62.4033 173.609L63.1694 175.457C62.1522 175.878 61.0368 176.111 59.8671 176.111H57.8451ZM68.4941 153.33H66.4941V151.309C66.4941 150.406 66.3149 149.551 65.992 148.772L67.8395 148.006C68.2613 149.023 68.4941 150.139 68.4941 151.309V153.33ZM45.7134 142.682H43.6915C42.5217 142.682 41.4063 142.914 40.3891 143.336L41.1552 145.184C41.9338 144.861 42.7892 144.682 43.6915 144.682H45.7134V142.682ZM35.0645 165.462H37.0645V167.484C37.0645 168.386 37.2437 169.242 37.5665 170.02L35.7191 170.786C35.2973 169.769 35.0645 168.654 35.0645 167.484V165.462ZM35.0645 161.418H37.0645V157.374H35.0645V161.418ZM35.0645 153.33H37.0645V151.309C37.0645 150.406 37.2437 149.551 37.5665 148.772L35.7191 148.006C35.2973 149.023 35.0645 150.139 35.0645 151.309V153.33ZM49.7573 142.682V144.682H53.8012V142.682H49.7573ZM57.8451 142.682V144.682H59.8671C60.7693 144.682 61.6247 144.861 62.4033 145.184L63.1694 143.336C62.1522 142.914 61.0368 142.682 59.8671 142.682H57.8451ZM68.4941 157.374H66.4941V161.418H68.4941V157.374ZM68.4941 165.462H66.4941V167.484C66.4941 168.386 66.3149 169.242 65.992 170.02L67.8395 170.786C68.2613 169.769 68.4941 168.654 68.4941 167.484V165.462ZM53.8012 176.111V174.111H49.7573V176.111H53.8012Z"
- fill="#657D99" id="path18" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M2.84 110.802L3.60611 108.954C3.91005 109.081 4.24493 109.151 4.60133 109.151H6.75821V111.151H4.60133C3.97743 111.151 3.38253 111.027 2.84 110.802ZM11.072 111.151V109.151H13.2288C13.5852 109.151 13.9201 109.081 14.2241 108.954L14.9902 110.802C14.4476 111.027 13.8527 111.151 13.2288 111.151H11.072ZM17.8302 100.079H15.8302V97.9223C15.8302 97.5659 15.7596 97.231 15.6336 96.927L17.481 96.1609C17.706 96.7035 17.8302 97.2984 17.8302 97.9223V100.079ZM6.75821 93.3209H4.60133C3.97743 93.3209 3.38253 93.4451 2.84 93.6701L3.60611 95.5175C3.91005 95.3915 4.24493 95.3209 4.60133 95.3209H6.75821V93.3209ZM0 104.393H2V106.55C2 106.906 2.07056 107.241 2.1966 107.545L0.349152 108.311C0.124172 107.769 0 107.174 0 106.55V104.393ZM0 100.079H2V97.9223C2 97.5659 2.07056 97.231 2.1966 96.927L0.349152 96.1609C0.124172 96.7035 0 97.2984 0 97.9223V100.079ZM11.072 93.3209V95.3209H13.2288C13.5852 95.3209 13.9201 95.3915 14.2241 95.5175L14.9902 93.6701C14.4476 93.4451 13.8527 93.3209 13.2288 93.3209H11.072ZM17.8302 104.393H15.8302V106.55C15.8302 106.906 15.7596 107.241 15.6336 107.545L17.481 108.311C17.706 107.769 17.8302 107.174 17.8302 106.55V104.393Z"
- fill="#657D99" id="path20" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M114.745 202.969L115.511 201.122C115.815 201.248 116.149 201.318 116.506 201.318H118.663V203.318H116.506C115.882 203.318 115.287 203.194 114.745 202.969ZM122.977 203.318V201.318H125.133C125.49 201.318 125.825 201.248 126.129 201.122L126.895 202.969C126.352 203.194 125.757 203.318 125.133 203.318H122.977ZM129.735 192.246H127.735V190.09C127.735 189.733 127.664 189.398 127.538 189.094L129.386 188.328C129.611 188.871 129.735 189.466 129.735 190.09V192.246ZM118.663 185.488H116.506C115.882 185.488 115.287 185.612 114.745 185.837L115.511 187.685C115.815 187.559 116.149 187.488 116.506 187.488H118.663V185.488ZM111.905 196.56H113.905V198.717C113.905 199.074 113.975 199.408 114.101 199.712L112.254 200.478C112.029 199.936 111.905 199.341 111.905 198.717V196.56ZM111.905 192.246H113.905V190.09C113.905 189.733 113.975 189.398 114.101 189.094L112.254 188.328C112.029 188.871 111.905 189.466 111.905 190.09V192.246ZM122.977 185.488V187.488H125.133C125.49 187.488 125.825 187.559 126.129 187.685L126.895 185.837C126.352 185.612 125.757 185.488 125.133 185.488H122.977ZM129.735 196.56H127.735V198.717C127.735 199.074 127.664 199.408 127.538 199.712L129.386 200.478C129.611 199.936 129.735 199.341 129.735 198.717V196.56Z"
- fill="#657D99" id="path22" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M240.444 110.802L241.21 108.954C241.514 109.081 241.849 109.151 242.205 109.151H244.362V111.151H242.205C241.581 111.151 240.987 111.027 240.444 110.802ZM248.676 111.151V109.151H250.833C251.189 109.151 251.524 109.081 251.828 108.954L252.594 110.802C252.052 111.027 251.457 111.151 250.833 111.151H248.676ZM255.434 100.079H253.434V97.9223C253.434 97.5659 253.364 97.231 253.238 96.927L255.085 96.1609C255.31 96.7035 255.434 97.2984 255.434 97.9223V100.079ZM244.362 93.3209H242.205C241.581 93.3209 240.987 93.4451 240.444 93.6701L241.21 95.5175C241.514 95.3915 241.849 95.3209 242.205 95.3209H244.362V93.3209ZM237.604 104.393H239.604V106.55C239.604 106.906 239.675 107.241 239.801 107.545L237.953 108.311C237.728 107.769 237.604 107.174 237.604 106.55V104.393ZM237.604 100.079H239.604V97.9223C239.604 97.5659 239.675 97.231 239.801 96.927L237.953 96.1609C237.728 96.7035 237.604 97.2984 237.604 97.9223V100.079ZM248.676 93.3209V95.3209H250.833C251.189 95.3209 251.524 95.3915 251.828 95.5175L252.594 93.6701C252.052 93.4451 251.457 93.3209 250.833 93.3209H248.676ZM255.434 104.393H253.434V106.55C253.434 106.906 253.364 107.241 253.238 107.545L255.085 108.311C255.31 107.769 255.434 107.174 255.434 106.55V104.393Z"
- fill="#657D99" id="path24" />
- <path
- d="M108.75 109.808V129.511C108.75 131.11 110.052 132.429 111.668 132.429H113.036C114.636 132.429 115.955 131.11 115.955 129.511V109.808H108.75V109.808Z"
- fill="#87C214" id="path26" />
- <path
- d="M115.938 100.312V96.6023C115.938 95.003 114.636 93.684 113.036 93.684H111.668C110.069 93.684 108.75 95.003 108.75 96.6023V100.312H115.938V100.312Z"
- fill="#87C214" id="path28" />
- <path
- d="M131.931 116.305V96.6023C131.931 95.003 130.628 93.684 129.029 93.684H127.66C126.061 93.684 124.742 95.003 124.742 96.6023V116.305H131.931V116.305Z"
- fill="#87C214" id="path30" />
- <path
- d="M124.742 125.801V129.511C124.742 131.11 126.061 132.429 127.66 132.429H129.029C130.628 132.429 131.947 131.11 131.947 129.511V125.801H124.742Z"
- fill="#87C214" id="path32" />
- <path
- d="M107.595 117.459H103.886C102.286 117.459 100.967 118.761 100.967 120.377V121.746C100.967 123.345 102.27 124.664 103.886 124.664H107.595V117.459Z"
- fill="#95D220" id="path34" />
- <path
- d="M136.795 117.459H117.092V124.664H136.795C138.394 124.664 139.713 123.345 139.713 121.746V120.377C139.713 118.761 138.394 117.459 136.795 117.459Z"
- fill="#95D220" id="path36" />
- <path
- d="M123.588 101.466H103.886C102.286 101.466 100.967 102.769 100.967 104.385V105.753C100.967 107.352 102.27 108.671 103.886 108.671H123.588V101.466Z"
- fill="#95D220" id="path38" />
- <path
- d="M136.795 101.466H133.085V108.671H136.795C138.394 108.671 139.713 107.369 139.713 105.753V104.384C139.713 102.769 138.394 101.466 136.795 101.466Z"
- fill="#95D220" id="path40" />
-</svg>
diff --git a/briar-android/artwork/transfer_data.svg b/briar-android/artwork/transfer_data.svg
deleted file mode 100644
index af653ac7e8af46c94e4857a3943ce2b976c75ee5..0000000000000000000000000000000000000000
--- a/briar-android/artwork/transfer_data.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="155" height="155"
- viewBox="0 0 155 158.05972" fill="none" version="1.1" id="svg24"
- sodipodi:docname="transfer_data.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
- <defs id="defs11" />
- <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1"
- objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0"
- inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="982"
- id="namedview9" showgrid="false" inkscape:zoom="1.4523073" inkscape:cx="8.2820655"
- inkscape:cy="-28.56208" inkscape:window-x="1920" inkscape:window-y="72"
- inkscape:window-maximized="0" inkscape:current-layer="svg24" />
- <metadata id="metadata30">
- <rdf:RDF>
- <cc:Work rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g id="g844" transform="translate(0,3.0301033)">
- <path id="path2" style="fill:#82c91e"
- d="m 34.888672,24.835938 c -0.929975,-0.02143 -1.778628,0.612487 -1.994141,1.554687 -0.2463,1.0768 0.427106,2.148231 1.503907,2.394531 l 5.339843,1.222656 c -6.856612,4.77068 -12.781629,10.788147 -17.445312,17.767579 -5.4771,8.1968 -9.072016,17.49215 -10.541016,27.21875 -0.217,1.4367 0.827383,2.738037 2.271485,2.898437 1.4442,0.1604 2.74109,-0.880406 2.96289,-2.316406 1.3729,-8.8885 4.672941,-17.381253 9.681641,-24.876953 4.280712,-6.40624 9.717062,-11.928555 16.003906,-16.316407 l -1.271484,5.558594 c -0.2463,1.0768 0.427106,2.150185 1.503906,2.396485 1.0767,0.2463 2.150184,-0.427207 2.396484,-1.503907 l 2.076172,-9.080078 c 0.167435,-0.732007 0.107609,-1.457562 -0.109375,-2.123047 -0.03323,-0.347577 -0.135561,-0.692647 -0.314453,-1.017578 -0.353538,-0.6421 -0.935043,-1.078378 -1.585937,-1.257812 -0.310286,-0.16723 -0.63775,-0.310162 -0.998047,-0.392578 l -9.078125,-2.076172 c -0.134588,-0.03079 -0.269491,-0.04772 -0.402344,-0.05078 z m 76.982418,2.876953 c -0.836,0.0548 -1.63328,0.526718 -2.08203,1.316406 -0.717,1.2635 -0.27106,2.863965 0.96094,3.634765 8.143,5.095901 14.99795,12.028813 20.00195,20.257813 4.93587,8.11686 7.91993,17.252829 8.7461,26.689453 l -4.25,-3.394531 c -0.863,-0.6893 -2.12055,-0.548547 -2.81055,0.314453 -0.689,0.8631 -0.54855,2.121147 0.31445,2.810547 l 7.27735,5.8125 c 1.726,1.3788 4.24209,1.097194 5.62109,-0.628906 l 5.8125,-7.277344 c 0.69,-0.863 0.54855,-2.121147 -0.31445,-2.810547 -0.863,-0.6894 -2.12155,-0.548647 -2.81055,0.314453 l -3.58984,4.494141 c -0.8855,-10.27436 -4.12841,-20.220841 -9.50196,-29.056641 -5.469,-8.9943 -12.97353,-16.564369 -21.89453,-22.105469 -0.46312,-0.287512 -0.97886,-0.40397 -1.48047,-0.371093 z M 45.191406,137.83008 c -0.851573,0.0281 -1.670687,0.44648 -2.164062,1.20898 -0.7895,1.219 -0.44326,2.85471 0.80664,3.59571 9.034,5.356 19.211344,8.51779 29.714844,9.21679 10.5035,0.699 21.011881,-1.08626 30.675782,-5.19726 1.337,-0.569 1.89734,-2.14303 1.27734,-3.45703 -0.621,-1.313 -2.18834,-1.86969 -3.52734,-1.30469 -8.852401,3.73 -18.466473,5.34798 -28.076172,4.70898 -9.609701,-0.64 -18.922925,-3.51767 -27.203126,-8.38867 -0.469612,-0.27637 -0.992962,-0.39966 -1.503906,-0.38281 z" />
- <path id="path8" style="fill:#8a9cb3"
- d="M 68.474609,0 C 66.724209,0 65.046294,0.6958487 63.808594,1.9335938 62.570894,3.1713338 61.875,4.8491794 61.875,6.5996094 V 46.199219 c 0,1.7504 0.695894,3.430267 1.933594,4.667969 1.2377,1.237698 2.915615,1.933593 4.666015,1.933593 h 19.800782 c 1.7504,0 3.428315,-0.695895 4.666015,-1.933593 1.2377,-1.237702 1.933594,-2.917569 1.933594,-4.667969 V 6.5996094 c 0,-1.75043 -0.695894,-3.4282757 -1.933594,-4.6660156 C 91.703706,0.6958487 90.025791,0 88.275391,0 Z m 0,3.3007812 h 19.800782 c 0.8752,0 1.715084,0.3459738 2.333984,0.9648438 0.6188,0.61887 0.964844,1.4587744 0.964844,2.3339844 V 46.199219 c 0,0.8752 -0.346044,1.715084 -0.964844,2.333984 C 89.990475,49.152003 89.150591,49.5 88.275391,49.5 H 68.474609 c -0.8752,0 -1.715084,-0.347997 -2.333984,-0.966797 -0.6188,-0.6189 -0.964844,-1.458784 -0.964844,-2.333984 V 6.5996094 c 0,-0.87521 0.346044,-1.7151144 0.964844,-2.3339844 0.6189,-0.61887 1.458784,-0.9648437 2.333984,-0.9648438 z M 11.25,97 0,108.40039 v 22.79883 C 0,133.28922 1.6875,135 3.75,135 h 22.5 c 2.0625,0 3.75,-1.71078 3.75,-3.80078 V 100.80078 C 30,98.710782 28.3125,97 26.25,97 Z M 131,100.59961 c -0.796,0 -1.55909,0.31591 -2.12109,0.87891 -0.563,0.562 -0.87891,1.32509 -0.87891,2.12109 v 13.5 c -0.796,0 -1.55909,0.31591 -2.12109,0.87891 -0.563,0.562 -0.87891,1.32509 -0.87891,2.12109 v 16.5 h 3 v -16.5 h 24 v 16.5 h 3 v -16.5 c 0,-0.796 -0.31591,-1.55909 -0.87891,-2.12109 -0.562,-0.563 -1.32509,-0.87891 -2.12109,-0.87891 v -13.5 c 0,-0.796 -0.31591,-1.55909 -0.87891,-2.12109 -0.562,-0.563 -1.32509,-0.87891 -2.12109,-0.87891 z M 12.806641,100.80078 H 26.25 v 30.39844 H 3.75 V 109.97656 Z M 131,103.59961 h 18 v 13.5 H 131 Z M 9.375,106.5 v 7.59961 h 3.75 V 106.5 Z m 5.625,0 v 7.59961 h 3.75 V 106.5 Z m 5.625,0 v 7.59961 h 3.75 V 106.5 Z" />
- </g>
- <path
- d="m 78.375,46.2 c 0.8752,0 1.7146,-0.3477 2.3335,-0.9666 0.6188,-0.6188 0.9665,-1.4582 0.9665,-2.3334 0,-0.8752 -0.3477,-1.7146 -0.9665,-2.3335 C 80.0896,39.9477 79.2502,39.6 78.375,39.6 c -0.8752,0 -1.7146,0.3477 -2.3334,0.9665 -0.6189,0.6189 -0.9666,1.4583 -0.9666,2.3335 0,0.8752 0.3477,1.7146 0.9666,2.3334 0.6188,0.6189 1.4582,0.9666 2.3334,0.9666 z"
- fill="#8a9cb3" id="path10" />
- <path d="m 134,109.6 h 4.5 v 3 H 134 Z" fill="#8a9cb3" id="path14" />
- <path d="m 141.5,109.6 h 4.5 v 3 h -4.5 z" fill="#8a9cb3" id="path16" />
-</svg>
diff --git a/briar-android/artwork/transfer_data_receive.svg b/briar-android/artwork/transfer_data_receive.svg
deleted file mode 100644
index 2280b745345ce4cd595e6202f759d17ad1171c9b..0000000000000000000000000000000000000000
--- a/briar-android/artwork/transfer_data_receive.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="120" height="52"
- viewBox="0 0 120 52" fill="none" version="1.1" id="svg24"
- sodipodi:docname="transfer_data_receive.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
- <defs id="defs11" />
- <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1"
- objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0"
- inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="982"
- id="namedview9" showgrid="false" inkscape:zoom="4.1077454" inkscape:cx="81.48675"
- inkscape:cy="18.42645" inkscape:window-x="1920" inkscape:window-y="72"
- inkscape:window-maximized="0" inkscape:current-layer="svg24" inkscape:document-rotation="0"
- fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" />
- <metadata id="metadata30">
- <rdf:RDF>
- <cc:Work rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <path id="path8"
- style="fill:#8a9cb3;stroke:none;stroke-width:0.749281;stroke-miterlimit:4;stroke-dasharray:none"
- d="m 15.97512,14.267003 c -0.596207,0 -1.167798,0.237677 -1.588736,0.659365 -0.421693,0.42094 -0.659371,0.992537 -0.659371,1.588743 v 10.111264 c -0.596207,0 -1.16631,0.236178 -1.58725,0.657875 -0.421682,0.420938 -0.659361,0.992529 -0.659361,1.588736 v 12.35937 h 2.246611 v -12.35937 h 17.977398 v 12.359369 h 2.24662 V 28.872986 c 0,-0.596207 -0.23619,-1.167798 -0.65788,-1.588737 -0.42094,-0.421697 -0.99253,-0.657875 -1.58874,-0.657875 V 16.515111 c 0,-0.596206 -0.23768,-1.167804 -0.65937,-1.588743 -0.42094,-0.421688 -0.99252,-0.659365 -1.58873,-0.659365 z m 0,2.248108 H 29.456311 V 26.626375 H 15.97512 Z m 2.24662,2.224241 v 2.246609 h 3.369915 v -2.246609 z m 5.618031,0 v 2.246609 h 3.36993 v -2.246609 z"
- sodipodi:nodetypes="scsccsccccccsccscssccccccccccccccc" />
- <path
- d="m 47.827564,24.463076 v 3.073847 h 18.443085 l -8.45308,8.453081 2.182432,2.182432 12.172435,-12.172438 -12.172435,-12.172434 -2.182432,2.182431 8.45308,8.45308 z"
- id="path895" style="fill:#82c91e;fill-opacity:1;stroke:none;stroke-width:1.53692" />
- <path id="path8-3"
- style="fill:#8a9cb3;stroke:none;stroke-width:0.985186;stroke-miterlimit:4;stroke-dasharray:none"
- d="M 93.999021,5.9999999e-8 C 92.275189,5.9999999e-8 90.624219,0.68560941 89.405306,1.9045678 88.186391,3.1235212 87.500737,4.7763832 87.500737,6.5002454 V 45.497793 c 0,1.723833 0.685654,3.378723 1.904569,4.597639 C 90.624219,51.314343 92.275189,52 93.999021,52 h 19.500739 c 1.72383,0 3.37676,-0.685657 4.59567,-1.904568 C 119.31435,48.876515 120,47.221626 120,45.497793 V 6.5002454 C 120,4.7763832 119.31435,3.1235212 118.09543,1.9045678 116.87652,0.68560941 115.22359,5.9999999e-8 113.49976,5.9999999e-8 Z m 0,3.252084740000001 h 19.500739 c 0.86192,0 1.68931,0.339865 2.29881,0.9493417 0.60941,0.6094767 0.95131,1.4368929 0.95131,2.2988189 V 45.497793 c 0,0.861917 -0.3419,1.689315 -0.95131,2.29882 -0.6095,0.609408 -1.43689,0.953264 -2.29881,0.953264 H 93.999021 c -0.861916,0 -1.687352,-0.343856 -2.296858,-0.953264 -0.609407,-0.609505 -0.951304,-1.436903 -0.951304,-2.29882 V 6.5002454 c 0,-0.861926 0.341897,-1.6893422 0.951304,-2.2988189 0.609506,-0.6094767 1.434942,-0.9493417 2.296858,-0.9493417 z m 9.750369,32.7640582 c -0.86191,0 -1.68745,0.341895 -2.29686,0.951303 -0.6095,0.609506 -0.95326,1.436904 -0.95326,2.298819 0,0.861916 0.34376,1.687452 0.95326,2.29686 0.60941,0.609507 1.43495,0.951302 2.29686,0.951302 0.86192,0 1.68931,-0.341797 2.29882,-0.951302 0.6094,-0.609408 0.9513,-1.434942 0.9513,-2.29686 0,-0.861915 -0.3419,-1.689311 -0.9513,-2.298819 -0.60951,-0.609408 -1.4369,-0.951303 -2.29882,-0.951303 z"
- sodipodi:nodetypes="sssssssscsssssscsscsscsscsssscssscs" />
-</svg>
diff --git a/briar-android/artwork/transfer_data_send.svg b/briar-android/artwork/transfer_data_send.svg
deleted file mode 100644
index 4cbdb88f9fb73ad642c3d4187c4bad00e1724c59..0000000000000000000000000000000000000000
--- a/briar-android/artwork/transfer_data_send.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="120" height="52"
- viewBox="0 0 120 52" fill="none" version="1.1" id="svg24"
- sodipodi:docname="transfer_data_send.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
- <defs id="defs11" />
- <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1"
- objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0"
- inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="982"
- id="namedview9" showgrid="false" inkscape:zoom="4.1077454" inkscape:cx="35.020218"
- inkscape:cy="26.319497" inkscape:window-x="1920" inkscape:window-y="72"
- inkscape:window-maximized="1" inkscape:current-layer="svg24" inkscape:document-rotation="0"
- fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"
- lock-margins="true" />
- <metadata id="metadata30">
- <rdf:RDF>
- <cc:Work rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <path id="path8"
- style="fill:#8a9cb3;stroke:none;stroke-width:0.749281;stroke-miterlimit:4;stroke-dasharray:none"
- d="m 91.223138,12.30985 c -0.596207,0 -1.167798,0.237677 -1.588736,0.659365 -0.421693,0.42094 -0.659371,0.992537 -0.659371,1.588743 v 10.111264 c -0.596207,0 -1.16631,0.236178 -1.58725,0.657875 -0.421682,0.420938 -0.659361,0.992529 -0.659361,1.588736 v 12.35937 h 2.246611 v -12.35937 h 17.977399 v 12.359369 h 2.24662 V 26.915833 c 0,-0.596207 -0.23619,-1.167798 -0.65788,-1.588737 -0.42094,-0.421697 -0.99253,-0.657875 -1.58874,-0.657875 V 14.557958 c 0,-0.596206 -0.23768,-1.167804 -0.65937,-1.588743 -0.42094,-0.421688 -0.99252,-0.659365 -1.58873,-0.659365 z m 0,2.248108 H 104.70433 V 24.669222 H 91.223138 Z m 2.24662,2.224241 v 2.246609 h 3.369915 v -2.246609 z m 5.618031,0 v 2.246609 h 3.369931 v -2.246609 z"
- sodipodi:nodetypes="scsccsccccccsccscssccccccccccccccc" />
- <path
- d="m 47.827564,24.463076 v 3.073847 h 18.443085 l -8.45308,8.453081 2.182432,2.182432 12.172435,-12.172438 -12.172435,-12.172434 -2.182432,2.182431 8.45308,8.45308 z"
- id="path895" style="fill:#82c91e;fill-opacity:1;stroke:none;stroke-width:1.53692" />
- <path id="path8-3"
- style="fill:#8a9cb3;stroke:none;stroke-width:0.985186;stroke-miterlimit:4;stroke-dasharray:none"
- d="M 6.4982841,0 C 4.7744519,0 3.1234817,0.68560936 1.9045686,1.9045677 0.68565358,3.1235212 0,4.7763832 0,6.5002454 V 45.497793 c 0,1.723832 0.68565358,3.378724 1.9045686,4.597639 C 3.1234817,51.314343 4.7744519,52 6.4982841,52 H 25.999019 c 1.723832,0 3.376764,-0.685657 4.595677,-1.904568 1.218914,-1.218917 1.904569,-2.873807 1.904568,-4.597639 V 6.5002454 c 0,-1.7238622 -0.685654,-3.3767242 -1.904568,-4.5956777 C 29.375783,0.68560936 27.722851,0 25.999019,0 Z m 0,3.2520847 H 25.999019 c 0.861916,0 1.689313,0.339865 2.29882,0.9493418 0.609407,0.6094767 0.951302,1.4368929 0.951302,2.2988189 V 45.497793 c 0,0.861916 -0.341895,1.689315 -0.951302,2.29882 -0.609507,0.609408 -1.436904,0.953264 -2.29882,0.953264 H 6.4982841 c -0.8619161,0 -1.6873525,-0.343856 -2.2968577,-0.953264 C 3.5920186,47.187108 3.2501219,46.359709 3.2501219,45.497793 V 6.5002454 c 0,-0.861926 0.3418967,-1.6893422 0.9513045,-2.2988189 C 4.8109316,3.5919497 5.636368,3.2520847 6.4982841,3.2520847 Z M 16.248652,36.016144 c -0.861916,0 -1.68745,0.341895 -2.296859,0.951302 -0.609506,0.609506 -0.953264,1.436905 -0.953264,2.29882 0,0.861916 0.343758,1.687452 0.953264,2.29686 0.609409,0.609507 1.434943,0.951302 2.296859,0.951302 0.861916,0 1.689312,-0.341797 2.298819,-0.951302 0.609408,-0.609408 0.951303,-1.434942 0.951303,-2.29686 0,-0.861915 -0.341895,-1.689311 -0.951303,-2.29882 -0.609507,-0.609407 -1.436903,-0.951302 -2.298819,-0.951302 z"
- sodipodi:nodetypes="sssssssscsssssscsscsscsscsssscssscs" />
-</svg>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java
index 85f8c797435d377f957eb2e84adf794f6ae9f97d..eef893e7bb69bc9d74e3bba36f939778ac484c67 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java
@@ -76,7 +76,7 @@ public class FeedFragment extends BaseFragment
list = v.findViewById(R.id.postList);
list.setLayoutManager(layoutManager);
list.setAdapter(adapter);
- list.setEmptyImage(R.drawable.ic_empty_state_blog);
+ list.setEmptyImage(R.drawable.il_empty_state_blogs);
list.setEmptyText(R.string.blogs_feed_empty_state);
list.setEmptyAction(R.string.blogs_feed_empty_state_action);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
index 7ee423ab0fd9e6a1e1e63acf1ffde4b889dd73ce..836cf0ca64a2af68f19b5db6056b8093b5c1406d 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
@@ -93,7 +93,7 @@ public class ContactListFragment extends BaseFragment
list = contentView.findViewById(R.id.list);
list.setLayoutManager(new LinearLayoutManager(requireContext()));
list.setAdapter(adapter);
- list.setEmptyImage(R.drawable.ic_empty_state_contact_list);
+ list.setEmptyImage(R.drawable.il_empty_state_contact_list);
list.setEmptyText(getString(R.string.no_contacts));
list.setEmptyAction(getString(R.string.no_contacts_action));
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java
index 34f985a1f1d208a1389a5a3f17f45e78ab45b09b..408fab4ec6809336a40a22f1a51ade5279940834 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactErrorFragment.java
@@ -22,7 +22,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
-import static android.view.View.GONE;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
import static org.briarproject.briar.android.util.UiUtils.onSingleLinkClick;
@MethodsNotNullByDefault
@@ -70,8 +70,11 @@ public class AddNearbyContactErrorFragment extends BaseFragment {
TextView explanation = v.findViewById(R.id.errorMessage);
Bundle args = getArguments();
String errorMessage = args == null ? null : args.getString(ERROR_MSG);
- if (errorMessage == null) explanation.setVisibility(GONE);
- else explanation.setText(args.getString(ERROR_MSG));
+ if (errorMessage == null) {
+ explanation.setText(getString(R.string.add_contact_error_two_way));
+ } else {
+ explanation.setText(args.getString(ERROR_MSG));
+ }
// make feedback link clickable
TextView sendFeedback = v.findViewById(R.id.sendFeedback);
@@ -100,6 +103,12 @@ public class AddNearbyContactErrorFragment extends BaseFragment {
viewModel.stopListening();
}
+ @Override
+ public void onStart() {
+ super.onStart();
+ hideViewOnSmallScreen(requireView().findViewById(R.id.errorIcon));
+ }
+
private void triggerFeedback() {
UiUtils.triggerFeedback(requireContext());
finish();
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 7136b497ee944198ebb635c6607b0d13e73f5443..7f60b4d8be45bf3238edc43302c8f3c438c01a8a 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/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
index 38f46b4f43f4603ebdba5f81ed6d358180b6e652..42097e32ad86582a5ce3c19ca08d77d62216f723 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
@@ -1,15 +1,12 @@
package org.briarproject.briar.android.contact.add.remote;
-import android.animation.ObjectAnimator;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.widget.Button;
-import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
@@ -33,12 +30,12 @@ import androidx.lifecycle.ViewModelProvider;
import static android.content.Context.CLIPBOARD_SERVICE;
import static android.widget.Toast.LENGTH_SHORT;
import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.LINK_REGEX;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
import static org.briarproject.briar.android.util.UiUtils.observeOnce;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
-public class LinkExchangeFragment extends BaseFragment
- implements OnGlobalLayoutListener {
+public class LinkExchangeFragment extends BaseFragment {
private static final String TAG = LinkExchangeFragment.class.getName();
@@ -92,29 +89,13 @@ public class LinkExchangeFragment extends BaseFragment
observeOnce(viewModel.getHandshakeLink(), this,
this::onHandshakeLinkLoaded);
-
- if (savedInstanceState == null) {
- ScrollView scrollView = (ScrollView) v;
- // we need to wait for views to be laid out to get the heights
- scrollView.getViewTreeObserver().addOnGlobalLayoutListener(this);
- }
-
return v;
}
@Override
- public void onGlobalLayout() {
- ScrollView scrollView = (ScrollView) requireView();
- View layout = scrollView.getChildAt(0);
- int scrollBy = layout.getHeight() - scrollView.getHeight();
- if (scrollBy > 0) {
- // smoothScrollTo() is too fast due to the transition animation
- ObjectAnimator animator = ObjectAnimator
- .ofInt(scrollView, "scrollY", scrollBy);
- animator.setDuration(1000);
- animator.start();
- }
- layout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+ public void onStart() {
+ super.onStart();
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
}
private void onHandshakeLinkLoaded(String link) {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
index f273af2854d8714492d9788682e9edcb063ae318..d2edbc98d2fb471442a5dd44f25e08309dbf8bb3 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
@@ -8,8 +8,6 @@ import android.text.Editable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ProgressBar;
import android.widget.Toast;
import com.google.android.material.textfield.TextInputEditText;
@@ -23,6 +21,7 @@ import org.briarproject.bramble.api.identity.Author;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.view.BriarButton;
import org.briarproject.nullsafety.MethodsNotNullByDefault;
import org.briarproject.nullsafety.ParametersNotNullByDefault;
@@ -35,13 +34,12 @@ import androidx.appcompat.app.AlertDialog.Builder;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProvider;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.Objects.requireNonNull;
import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -57,8 +55,6 @@ public class NicknameFragment extends BaseFragment {
private TextInputLayout contactNameLayout;
private TextInputEditText contactNameInput;
- private Button addButton;
- private ProgressBar progressBar;
@Override
public String getUniqueTag() {
@@ -95,14 +91,18 @@ public class NicknameFragment extends BaseFragment {
contactNameLayout = v.findViewById(R.id.contactNameLayout);
contactNameInput = v.findViewById(R.id.contactNameInput);
- addButton = v.findViewById(R.id.addButton);
+ BriarButton addButton = v.findViewById(R.id.addButton);
addButton.setOnClickListener(view -> onAddButtonClicked());
- progressBar = v.findViewById(R.id.progressBar);
-
return v;
}
+ @Override
+ public void onStart() {
+ super.onStart();
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
+ }
+
@Override
public void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
@@ -131,9 +131,6 @@ public class NicknameFragment extends BaseFragment {
String name = getNicknameOrNull();
if (name == null) return; // invalid nickname
- addButton.setVisibility(INVISIBLE);
- progressBar.setVisibility(VISIBLE);
-
LifecycleOwner owner = getViewLifecycleOwner();
viewModel.getAddContactResult().observe(owner, result -> {
if (result == null) return;
@@ -214,7 +211,7 @@ public class NicknameFragment extends BaseFragment {
private void showWarningDialog(String name1, String name2) {
Context ctx = requireContext();
Builder b = new Builder(ctx, R.style.BriarDialogTheme);
- b.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
+ b.setIcon(getDialogIcon(ctx, R.drawable.ic_error));
b.setTitle(getString(R.string.duplicate_link_dialog_title));
b.setMessage(
getString(R.string.duplicate_link_dialog_text_3, name1, name2));
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java
index 2e2413f5182a68466fc4df76b5992c3e9db2a25c..b773fd726ea07184ab77c9921be9ce1f3d4b85d5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java
@@ -26,6 +26,7 @@ import androidx.lifecycle.ViewModelProvider;
import static android.widget.Toast.LENGTH_LONG;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -72,6 +73,7 @@ public class BluetoothIntroFragment extends Fragment {
@Override
public void onStart() {
super.onStart();
+ hideViewOnSmallScreen(requireView().findViewById(R.id.introImageView));
conditionManager.reset();
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
index 858e0154a0b4277cccc66180548bd44310b0fe03..dcfb52c196f00a0df98fa1dc154365ec1486da20 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
@@ -70,7 +70,7 @@ public abstract class BaseContactSelectorFragment<I extends SelectableContactIte
list = contentView.findViewById(R.id.list);
list.setLayoutManager(new LinearLayoutManager(getActivity()));
- list.setEmptyImage(R.drawable.ic_empty_state_contact_list);
+ list.setEmptyImage(R.drawable.il_empty_state_contact_list);
list.setEmptyText(getString(R.string.no_contacts_selector));
list.setEmptyAction(getString(R.string.no_contacts_selector_action));
adapter = getAdapter(requireContext(), this);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java
index d6cacf4f8fd3d6a65ed4d02a2fcb3549956b9825..e7ce4af130ef2b15d9c11199355676ed31cf91ea 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/fragment/FinalFragment.java
@@ -22,12 +22,11 @@ import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.widget.ImageViewCompat;
-import androidx.core.widget.NestedScrollView;
import androidx.fragment.app.Fragment;
-import static android.view.View.FOCUS_DOWN;
import static android.view.View.GONE;
+import static androidx.core.widget.ImageViewCompat.setImageTintList;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
/**
* A fragment to be used at the end of a user flow
@@ -61,7 +60,6 @@ public class FinalFragment extends Fragment {
return f;
}
- private NestedScrollView scrollView;
protected Button buttonView;
protected final OnBackPressedCallback onBackPressedCallback =
new OnBackPressedCallback(true) {
@@ -79,7 +77,6 @@ public class FinalFragment extends Fragment {
View v = inflater
.inflate(R.layout.fragment_final, container, false);
- scrollView = (NestedScrollView) v;
ImageView iconView = v.findViewById(R.id.iconView);
TextView titleView = v.findViewById(R.id.titleView);
TextView textView = v.findViewById(R.id.textView);
@@ -88,9 +85,12 @@ public class FinalFragment extends Fragment {
Bundle args = requireArguments();
titleView.setText(args.getInt(ARG_TITLE));
iconView.setImageResource(args.getInt(ARG_ICON));
- int color = getResources().getColor(args.getInt(ARG_ICON_TINT));
- ColorStateList tint = ColorStateList.valueOf(color);
- ImageViewCompat.setImageTintList(iconView, tint);
+ int tintRes = args.getInt(ARG_ICON_TINT);
+ if (tintRes != 0) {
+ int color = getResources().getColor(tintRes);
+ ColorStateList tint = ColorStateList.valueOf(color);
+ setImageTintList(iconView, tint);
+ }
int textRes = args.getInt(ARG_TEXT);
if (textRes == 0) {
textView.setVisibility(GONE);
@@ -122,8 +122,7 @@ public class FinalFragment extends Fragment {
@Override
public void onStart() {
super.onStart();
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.iconView));
}
@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java
index 1a8223e6762b9ea794914a90e134426dfbf49501..c7e9bcd305f61d484e9962cae5c1ca3c0305fa17 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java
@@ -9,7 +9,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ProgressBar;
-import android.widget.ScrollView;
import android.widget.TextView;
import com.google.android.material.snackbar.Snackbar;
@@ -27,12 +26,12 @@ import androidx.lifecycle.ViewModelProvider;
import static android.content.pm.ApplicationInfo.FLAG_TEST_ONLY;
import static android.os.Build.VERSION.SDK_INT;
-import static android.view.View.FOCUS_DOWN;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
import static androidx.transition.TransitionManager.beginDelayedTransition;
import static com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -48,7 +47,6 @@ public class HotspotIntroFragment extends Fragment {
private Button startButton;
private ProgressBar progressBar;
private TextView progressTextView;
- private ScrollView scrollView;
private final AbstractConditionManager conditionManager = SDK_INT < 29 ?
new ConditionManager(this, this::onPermissionUpdate) :
@@ -73,7 +71,6 @@ public class HotspotIntroFragment extends Fragment {
startButton = v.findViewById(R.id.startButton);
progressBar = v.findViewById(R.id.progressBar);
progressTextView = v.findViewById(R.id.progressTextView);
- scrollView = v.findViewById(R.id.scrollView);
startButton.setOnClickListener(this::onButtonClick);
@@ -86,8 +83,7 @@ public class HotspotIntroFragment extends Fragment {
public void onStart() {
super.onStart();
conditionManager.onStart();
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
}
private void onButtonClick(View view) {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
index fe706bc845bf5ef210c6759e08b037141ce72baa..2e1e3bb19c3be6211eb60d87f747b0dffd662f44 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
@@ -15,7 +15,7 @@ class LoginUtils {
static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) {
AlertDialog.Builder builder =
new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
- builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
+ builder.setIcon(getDialogIcon(ctx, R.drawable.ic_error));
builder.setTitle(R.string.dialog_title_cannot_check_password);
builder.setMessage(R.string.dialog_message_cannot_check_password);
builder.setPositiveButton(R.string.ok, null);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
index 47468e98a4e2081bc94365eebfbd604d4ab18c5c..6f713ab565e522b247b1bef028bfb9192bbf3036 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
@@ -29,8 +29,7 @@ public class ErrorFragment extends FinalFragment {
ErrorFragment f = new ErrorFragment();
Bundle args = new Bundle();
args.putInt(ARG_TITLE, title);
- args.putInt(ARG_ICON, R.drawable.alerts_and_states_error);
- args.putInt(ARG_ICON_TINT, R.color.briar_red_500);
+ args.putInt(ARG_ICON, R.drawable.ic_error);
args.putInt(ARG_TEXT, text);
f.setArguments(args);
return f;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
index c72993776c94520bb84d9d24f25a8bc40b1f068c..48fdeb8649d7f72a05c4baac41fe7247a4206a85 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
@@ -186,8 +186,7 @@ public class MailboxActivity extends BriarActivity {
tag = ErrorFragment.TAG;
} else if (s instanceof MailboxPairingState.Paired) {
f = FinalFragment.newInstance(R.string.mailbox_setup_paired_title,
- R.drawable.ic_check_circle_outline,
- R.color.briar_brand_green,
+ R.drawable.ic_check_circle, 0,
R.string.mailbox_setup_paired_description);
tag = FinalFragment.TAG;
} else {
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
index 6f3db3e582903a898ac353754d0c3473c4b8baaa..dcaf1730456304018600acb309e743ef47f14717 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
@@ -1,7 +1,6 @@
package org.briarproject.briar.android.mailbox;
import android.content.Context;
-import android.content.res.ColorStateList;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -21,7 +20,6 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
import javax.inject.Inject;
-import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
@@ -33,8 +31,6 @@ import androidx.lifecycle.ViewModelProvider;
import static android.view.View.GONE;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
-import static androidx.core.content.ContextCompat.getColor;
-import static androidx.core.widget.ImageViewCompat.setImageTintList;
import static androidx.transition.TransitionManager.beginDelayedTransition;
import static org.briarproject.bramble.api.mailbox.MailboxConstants.API_CLIENT_TOO_OLD;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
@@ -141,24 +137,20 @@ public class MailboxStatusFragment extends Fragment {
}
private void onMailboxStateChanged(MailboxStatus status) {
- @ColorRes int tintRes;
@DrawableRes int iconRes;
String title;
String message = null;
if (status.hasProblem(System.currentTimeMillis())) {
- tintRes = R.color.briar_red_500;
title = getString(R.string.mailbox_status_failure_title);
- iconRes = R.drawable.alerts_and_states_error;
+ iconRes = R.drawable.ic_error;
showUnlinkWarning = false;
wizardButton.setVisibility(VISIBLE);
} else if (status.getAttemptsSinceSuccess() > 0) {
- iconRes = R.drawable.ic_help_outline_white;
+ iconRes = R.drawable.ic_exclamation_mark;
title = getString(R.string.mailbox_status_problem_title);
- tintRes = R.color.briar_orange_500;
showUnlinkWarning = false;
wizardButton.setVisibility(VISIBLE);
} else if (status.getMailboxCompatibility() < 0) {
- tintRes = R.color.briar_red_500;
if (status.getMailboxCompatibility() == API_CLIENT_TOO_OLD) {
title = getString(R.string.mailbox_status_app_too_old_title);
message =
@@ -169,19 +161,16 @@ public class MailboxStatusFragment extends Fragment {
message = getString(
R.string.mailbox_status_mailbox_too_old_message);
}
- iconRes = R.drawable.alerts_and_states_error;
+ iconRes = R.drawable.ic_error;
showUnlinkWarning = true;
wizardButton.setVisibility(GONE);
} else {
- iconRes = R.drawable.ic_check_circle_outline;
+ iconRes = R.drawable.ic_check_circle;
title = getString(R.string.mailbox_status_connected_title);
- tintRes = R.color.briar_brand_green;
showUnlinkWarning = true;
wizardButton.setVisibility(GONE);
}
imageView.setImageResource(iconRes);
- int color = getColor(requireContext(), tintRes);
- setImageTintList(imageView, ColorStateList.valueOf(color));
statusTitleView.setText(title);
if (message == null) {
statusMessageView.setVisibility(GONE);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
index 74595a0152ab2b36b77fcd0b4646a4628276c406..bf76492b7434e458fe25f4825146a3c1188b349e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.ScrollView;
import org.briarproject.briar.R;
import org.briarproject.nullsafety.MethodsNotNullByDefault;
@@ -21,8 +20,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
-import static android.view.View.FOCUS_DOWN;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -36,7 +35,6 @@ public class SetupDownloadFragment extends Fragment {
private MailboxViewModel viewModel;
private CameraPermissionManager permissionManager;
- private ScrollView scrollView;
private final ActivityResultLauncher<String[]> permissionLauncher =
registerForActivityResult(new RequestMultiplePermissions(), r -> {
@@ -62,7 +60,6 @@ public class SetupDownloadFragment extends Fragment {
@Nullable Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_mailbox_setup_download,
container, false);
- scrollView = v.findViewById(R.id.scrollView);
permissionManager = new CameraPermissionManager(requireActivity(),
permissionLauncher::launch);
@@ -80,8 +77,7 @@ public class SetupDownloadFragment extends Fragment {
public void onStart() {
super.onStart();
requireActivity().setTitle(R.string.mailbox_setup_title);
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
// Permissions may have been granted manually while we were stopped
permissionManager.resetPermissions();
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java
index f3f231422517f38f615f1da73793c674cec7c1d5..cd1984c6ff07437fa394c7c1ae67de98e88fe5b0 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java
@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.ScrollView;
import org.briarproject.briar.R;
import org.briarproject.nullsafety.MethodsNotNullByDefault;
@@ -19,8 +18,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
-import static android.view.View.FOCUS_DOWN;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -33,8 +32,6 @@ public class SetupIntroFragment extends Fragment {
private MailboxViewModel viewModel;
- private ScrollView scrollView;
-
@Override
public void onAttach(Context context) {
super.onAttach(context);
@@ -51,7 +48,6 @@ public class SetupIntroFragment extends Fragment {
@Nullable Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_mailbox_setup_intro,
container, false);
- scrollView = v.findViewById(R.id.scrollView);
Button button = v.findViewById(R.id.continueButton);
button.setOnClickListener(view -> viewModel.showDownloadFragment());
return v;
@@ -61,8 +57,7 @@ public class SetupIntroFragment extends Fragment {
public void onStart() {
super.onStart();
requireActivity().setTitle(R.string.mailbox_setup_title);
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
}
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java
index 0ed8a25b3568c40f6fb855b8db98895a2f47019f..347ce6d9ed701b4bdc934c98ec653037af4c8b52 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java
@@ -70,7 +70,7 @@ public class GroupListFragment extends BaseFragment implements
adapter = new GroupListAdapter(this);
list = v.findViewById(R.id.list);
- list.setEmptyImage(R.drawable.ic_empty_state_group_list);
+ list.setEmptyImage(R.drawable.il_empty_state_group_list);
list.setEmptyText(R.string.groups_list_empty);
list.setEmptyAction(R.string.groups_list_empty_action);
list.setLayoutManager(new LinearLayoutManager(getContext()));
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java
index c6a4f9465d3db0f7fe5be85351fd8fe3b685b6ab..dacf25ed4675faca3cd38b10ec2a26d80c04c074 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java
@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.ScrollView;
import org.briarproject.briar.R;
import org.briarproject.briar.android.widget.OnboardingFullDialogFragment;
@@ -20,8 +19,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
-import static android.view.View.FOCUS_DOWN;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -33,7 +32,6 @@ public class ChooserFragment extends Fragment {
ViewModelProvider.Factory viewModelFactory;
private RemovableDriveViewModel viewModel;
- private ScrollView scrollView;
@Override
public void onAttach(Context context) {
@@ -51,8 +49,6 @@ public class ChooserFragment extends Fragment {
View v = inflater.inflate(R.layout.fragment_transfer_data_chooser,
container, false);
- scrollView = (ScrollView) v;
-
Button buttonLearnMore = v.findViewById(R.id.buttonLearnMore);
buttonLearnMore.setOnClickListener(e -> showLearnMoreDialog());
@@ -75,8 +71,7 @@ public class ChooserFragment extends Fragment {
// as we only support one per ViewModel instance
requireActivity().supportFinishAfterTransition();
} else {
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
}
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
index 7ab791b889490e05ca096963fa6925c5354215dc..f9a7787927dad26aa80c4d2757e723a3cdd52390 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
@@ -25,8 +25,7 @@ public class ErrorFragment extends FinalFragment {
ErrorFragment f = new ErrorFragment();
Bundle args = new Bundle();
args.putInt(ARG_TITLE, title);
- args.putInt(ARG_ICON, R.drawable.alerts_and_states_error);
- args.putInt(ARG_ICON_TINT, R.color.briar_red_500);
+ args.putInt(ARG_ICON, R.drawable.ic_error);
args.putInt(ARG_TEXT, text);
f.setArguments(args);
return f;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ReceiveFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ReceiveFragment.java
index c927d26abcb76cf4132daa622ad6d3173c3a1889..b5b022a41949770a42de443a7479d5a80764f058 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ReceiveFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ReceiveFragment.java
@@ -8,7 +8,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ProgressBar;
-import android.widget.ScrollView;
import android.widget.Toast;
import org.briarproject.briar.R;
@@ -26,10 +25,10 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
-import static android.view.View.FOCUS_DOWN;
import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_LONG;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
import static org.briarproject.briar.android.util.UiUtils.launchActivityToOpenFile;
@RequiresApi(19)
@@ -50,7 +49,6 @@ public class ReceiveFragment extends Fragment {
ViewModelProvider.Factory viewModelFactory;
private RemovableDriveViewModel viewModel;
- private ScrollView scrollView;
private Button button;
private ProgressBar progressBar;
@@ -72,7 +70,6 @@ public class ReceiveFragment extends Fragment {
View v = inflater.inflate(R.layout.fragment_transfer_data_receive,
container, false);
- scrollView = (ScrollView) v;
progressBar = v.findViewById(R.id.progressBar);
button = v.findViewById(R.id.fileButton);
button.setOnClickListener(view ->
@@ -93,8 +90,7 @@ public class ReceiveFragment extends Fragment {
public void onStart() {
super.onStart();
requireActivity().setTitle(R.string.removable_drive_title_receive);
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
}
@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java
index a39326bba7fb6d2457cb11c2cc6a73983721492f..06b6a0b2ba25acbab901b67015651754728b2959 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java
@@ -9,7 +9,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ProgressBar;
-import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
@@ -31,13 +30,13 @@ import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
import static android.os.Build.VERSION.SDK_INT;
-import static android.view.View.FOCUS_DOWN;
import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@RequiresApi(19)
@MethodsNotNullByDefault
@@ -55,7 +54,6 @@ public class SendFragment extends Fragment {
ViewModelProvider.Factory viewModelFactory;
private RemovableDriveViewModel viewModel;
- private ScrollView scrollView;
private TextView introTextView;
private Button button;
private ProgressBar progressBar;
@@ -78,7 +76,6 @@ public class SendFragment extends Fragment {
View v = inflater.inflate(R.layout.fragment_transfer_data_send,
container, false);
- scrollView = (ScrollView) v;
introTextView = v.findViewById(R.id.introTextView);
progressBar = v.findViewById(R.id.progressBar);
button = v.findViewById(R.id.fileButton);
@@ -107,8 +104,7 @@ public class SendFragment extends Fragment {
public void onStart() {
super.onStart();
requireActivity().setTitle(R.string.removable_drive_title_send);
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
}
@Override
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
index cad46395af69f0f913bbd8cc07b0ec0008bd29ad..75174a345e8c85abcc0835fa41521305e9df2fe4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/CrashFragment.java
@@ -16,6 +16,8 @@ import javax.inject.Inject;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
+
@MethodsNotNullByDefault
@ParametersNotNullByDefault
public class CrashFragment extends BaseFragment {
@@ -55,4 +57,9 @@ public class CrashFragment extends BaseFragment {
return TAG;
}
+ @Override
+ public void onStart() {
+ super.onStart();
+ hideViewOnSmallScreen(requireView().findViewById(R.id.errorIcon));
+ }
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
index 2a133b6478016ceb16cf454e118ba015beb4b7dd..39491f31e43cee634393fe87c79dd1844c542bd2 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
@@ -7,6 +7,7 @@ import android.app.KeyguardManager;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Debug;
@@ -84,6 +85,8 @@ import static android.text.format.DateUtils.WEEK_IN_MILLIS;
import static android.text.format.DateUtils.YEAR_IN_MILLIS;
import static android.view.KeyEvent.ACTION_DOWN;
import static android.view.KeyEvent.KEYCODE_ENTER;
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE;
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN;
@@ -499,6 +502,17 @@ public class UiUtils {
return icon;
}
+ public static void hideViewOnSmallScreen(View view) {
+ boolean small = isSmallScreenRelativeToFontSize(view.getContext());
+ view.setVisibility(small ? GONE : VISIBLE);
+ }
+
+ public static boolean isSmallScreenRelativeToFontSize(Context ctx) {
+ Configuration config = ctx.getResources().getConfiguration();
+ if (config.fontScale == 0f) return true;
+ return config.screenHeightDp / config.fontScale < 600;
+ }
+
/**
* Logs the exception and shows a Toast to the user.
* <p>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java
index 944cb85878ec0bea508cbcd515354674e18edd12..77e4c2cbc62b12ccd5aa3e4bff54307a84a70390 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/BriarButton.java
@@ -47,7 +47,8 @@ public class BriarButton extends FrameLayout {
attributes.recycle();
ContextThemeWrapper wrapper = new ContextThemeWrapper(context, style);
- button = new AppCompatButton(wrapper, null, style);
+ button = isInEditMode() ? new AppCompatButton(context) :
+ new AppCompatButton(wrapper, null, style);
button.setText(text);
addView(button);
progressBar = findViewById(R.id.briar_button_progress_bar);
diff --git a/briar-android/src/main/res/drawable-night/ic_mailbox_onboarding.xml b/briar-android/src/main/res/drawable-night/ic_mailbox_onboarding.xml
deleted file mode 100644
index 76a2beda46bbbdc061616ea791b98a7854eab3e3..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable-night/ic_mailbox_onboarding.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="200dp"
- android:height="160dp"
- android:viewportWidth="250"
- android:viewportHeight="200">
- <path
- android:fillColor="#15212D"
- android:pathData="M95.436,100.233C95.436,93.523 100.876,88.084 107.585,88.084H130.365C137.074,88.084 142.514,93.523 142.514,100.233V123.012C142.514,129.722 137.074,135.161 130.365,135.161H107.585C100.876,135.161 95.436,129.722 95.436,123.012V100.233Z" />
- <path
- android:fillColor="#15212D"
- android:pathData="M102.336,10.261C102.336,4.594 106.93,0 112.597,0H131.836C137.503,0 142.097,4.594 142.097,10.261V29.5C142.097,35.167 137.503,39.761 131.836,39.761H112.597C106.93,39.761 102.336,35.167 102.336,29.5V10.261Z" />
- <path
- android:fillColor="#15212D"
- android:pathData="M34.818,148.09C34.818,143.427 38.599,139.646 43.262,139.646H59.093C63.757,139.646 67.537,143.427 67.537,148.09V163.921C67.537,168.585 63.757,172.365 59.093,172.365H43.262C38.599,172.365 34.818,168.585 34.818,163.921V148.09Z" />
- <path
- android:fillColor="#15212D"
- android:pathData="M110.024,186.044C110.024,183.557 112.04,181.541 114.527,181.541H122.971C125.458,181.541 127.475,183.557 127.475,186.044V194.488C127.475,196.976 125.458,198.992 122.971,198.992H114.527C112.04,198.992 110.024,196.976 110.024,194.488V186.044Z" />
- <path
- android:fillColor="#15212D"
- android:pathData="M173.713,141.6C173.713,134.89 179.152,129.451 185.862,129.451H208.641C215.351,129.451 220.79,134.89 220.79,141.6V164.38C220.79,171.089 215.351,176.528 208.641,176.528H185.862C179.152,176.528 173.713,171.089 173.713,164.38V141.6Z" />
- <path
- android:fillColor="#15212D"
- android:pathData="M232.049,95.416C232.049,92.928 234.065,90.912 236.553,90.912H244.997C247.484,90.912 249.5,92.928 249.5,95.416V103.86C249.5,106.347 247.484,108.363 244.997,108.363H236.553C234.065,108.363 232.049,106.347 232.049,103.86V95.416Z" />
- <path
- android:fillColor="#657D99"
- android:fillType="evenOdd"
- android:pathData="M120.481,84.227V45.268H122.481V84.227H120.481Z" />
- <path
- android:fillColor="#657D99"
- android:fillType="evenOdd"
- android:pathData="M117.685,176.101L117.685,139.646H119.685L119.685,176.101H117.685Z" />
- <path
- android:fillColor="#657D99"
- android:fillType="evenOdd"
- android:pathData="M3.28,108.445L4.046,106.598C4.338,106.719 4.66,106.787 5.003,106.787H7.114V108.787H5.003C4.393,108.787 3.811,108.665 3.28,108.445ZM11.336,108.787V106.787H13.447C13.79,106.787 14.113,106.719 14.405,106.598L15.171,108.445C14.64,108.665 14.058,108.787 13.447,108.787H11.336ZM17.951,97.95H15.951V95.839C15.951,95.496 15.883,95.174 15.762,94.882L17.609,94.116C17.829,94.646 17.951,95.229 17.951,95.839V97.95ZM7.114,91.336H5.003C4.393,91.336 3.811,91.457 3.28,91.678L4.046,93.525C4.338,93.404 4.66,93.336 5.003,93.336H7.114V91.336ZM0.5,102.172H2.5V104.283C2.5,104.626 2.568,104.949 2.689,105.241L0.842,106.007C0.622,105.476 0.5,104.894 0.5,104.283V102.172ZM0.5,97.95H2.5V95.839C2.5,95.496 2.568,95.174 2.689,94.882L0.842,94.116C0.622,94.646 0.5,95.229 0.5,95.839V97.95ZM11.336,91.336V93.336H13.447C13.79,93.336 14.113,93.404 14.405,93.525L15.171,91.678C14.64,91.457 14.058,91.336 13.447,91.336H11.336ZM17.951,102.172H15.951V104.283C15.951,104.626 15.883,104.949 15.762,105.241L17.609,106.007C17.829,105.476 17.951,104.894 17.951,104.283V102.172Z" />
- <path
- android:fillColor="#74B816"
- android:fillType="evenOdd"
- android:pathData="M41.177,64.517V62.648H43.177V64.517H41.177ZM41.177,71.991V68.254H43.177V71.991H41.177ZM41.177,79.465V75.728H43.177V79.465H41.177ZM41.177,86.938V83.202H43.177V86.938H41.177ZM41.177,94.412V90.675H43.177V94.412H41.177ZM41.177,99.018V98.149H43.177V99.018H44.91V101.018H39.681V99.018H41.177ZM24.705,101.018H22.209V99.018H24.705V101.018ZM34.689,101.018H29.697V99.018H34.689V101.018ZM52.107,101.018H50.374V99.018H54.854V101.018H54.107V102.148H52.107V101.018ZM61.844,101.018H58.349V99.018H61.844V101.018ZM67.087,101.018H65.339V99.018H67.087C68.048,99.018 68.966,99.209 69.805,99.557L69.039,101.404C68.439,101.156 67.78,101.018 67.087,101.018ZM72.187,106.118C72.187,105.425 72.049,104.766 71.8,104.166L73.648,103.4C73.995,104.239 74.187,105.157 74.187,106.118C74.187,106.812 74.325,107.47 74.574,108.07L72.726,108.836C72.378,107.998 72.187,107.079 72.187,106.118ZM52.107,110.668V106.408H54.107V110.668H52.107ZM79.287,113.218C78.326,113.218 77.408,113.027 76.569,112.679L77.335,110.832C77.935,111.081 78.594,111.218 79.287,111.218H81.59V113.218H79.287ZM88.5,113.218H86.197V111.218H88.5V113.218ZM52.107,119.188V114.928H54.107V119.188H52.107ZM52.107,127.709V123.449H54.107V127.709H52.107ZM52.107,134.099V131.969H54.107V134.099H52.107Z" />
- <path
- android:fillColor="#74B816"
- android:fillType="evenOdd"
- android:pathData="M105.214,134.93L105.602,132.968C106.242,133.095 106.905,133.161 107.585,133.161H109.484V135.161H107.585C106.774,135.161 105.981,135.082 105.214,134.93ZM128.466,135.161V133.161H130.365C131.045,133.161 131.708,133.095 132.347,132.968L132.736,134.93C131.969,135.082 131.176,135.161 130.365,135.161H128.466ZM137.115,133.115L136.002,131.453C137.11,130.712 138.064,129.757 138.805,128.65L140.467,129.762C139.58,131.087 138.44,132.228 137.115,133.115ZM142.514,102.131H140.514V100.233C140.514,99.553 140.447,98.89 140.32,98.25L142.282,97.862C142.434,98.629 142.514,99.422 142.514,100.233V102.131ZM140.467,93.483L138.805,94.595C138.064,93.488 137.11,92.534 136.002,91.792L137.115,90.13C138.44,91.017 139.58,92.158 140.467,93.483ZM109.484,88.084H107.585C106.774,88.084 105.981,88.163 105.214,88.315L105.602,90.277C106.242,90.151 106.905,90.084 107.585,90.084H109.484V88.084ZM100.835,90.13L101.948,91.792C100.84,92.534 99.886,93.488 99.145,94.595L97.483,93.483C98.37,92.158 99.51,91.017 100.835,90.13ZM95.436,121.114H97.436V123.012C97.436,123.693 97.503,124.355 97.63,124.995L95.668,125.383C95.516,124.616 95.436,123.824 95.436,123.012V121.114ZM97.483,129.762L99.145,128.65C99.886,129.757 100.84,130.712 101.948,131.453L100.835,133.115C99.51,132.228 98.37,131.087 97.483,129.762ZM95.436,117.317H97.436V113.521H95.436V117.317ZM95.436,109.724H97.436V105.928H95.436V109.724ZM95.436,102.131H97.436V100.233C97.436,99.553 97.503,98.89 97.63,98.25L95.668,97.862C95.516,98.629 95.436,99.422 95.436,100.233V102.131ZM113.28,88.084V90.084H117.077V88.084H113.28ZM120.873,88.084V90.084H124.67V88.084H120.873ZM128.466,88.084V90.084H130.365C131.045,90.084 131.708,90.151 132.347,90.277L132.736,88.315C131.969,88.163 131.176,88.084 130.365,88.084H128.466ZM142.514,105.928H140.514V109.724H142.514V105.928ZM142.514,113.521H140.514V117.317H142.514V113.521ZM142.514,121.114H140.514V123.012C140.514,123.693 140.447,124.355 140.32,124.995L142.282,125.383C142.434,124.616 142.514,123.824 142.514,123.012V121.114ZM124.67,135.161V133.161H120.873V135.161H124.67ZM117.077,135.161V133.161H113.28V135.161H117.077Z" />
- <path
- android:fillColor="#74B816"
- android:fillType="evenOdd"
- android:pathData="M188.618,86.539V84.674H190.618V86.539H188.618ZM188.618,93.999V90.269H190.618V93.999H188.618ZM188.618,97.729H190.618V98.594H191.517V100.594H190.618V101.183H188.618V97.729ZM199.112,100.594H195.315V98.594H199.112V100.594ZM206.707,100.594H202.91V98.594H206.707V100.594ZM214.303,100.594H210.505V98.594H214.303V100.594ZM221.898,100.594H218.1V98.594H221.898V100.594ZM227.595,100.594H225.696V98.594H227.595V100.594ZM188.618,107.537V104.36H190.618V107.537H188.618ZM188.618,111.303V110.715H190.618V111.359C190.865,111.387 191.109,111.425 191.35,111.472L190.962,113.434C190.528,113.349 190.079,113.303 189.618,113.303H187.737V111.303H188.618ZM153.881,113.303H152V111.303H153.881V113.303ZM161.405,113.303H157.643V111.303H161.405V113.303ZM168.928,113.303H165.166V111.303H168.928V113.303ZM176.452,113.303H172.69V111.303H176.452V113.303ZM183.975,113.303H180.214V111.303H183.975V113.303ZM195.34,116.361C194.837,115.611 194.19,114.964 193.44,114.462L194.552,112.8C195.52,113.448 196.353,114.281 197.001,115.249L195.34,116.361ZM196.498,120.183C196.498,119.722 196.453,119.273 196.367,118.839L198.329,118.451C198.44,119.012 198.498,119.591 198.498,120.183V121.203H196.498V120.183ZM196.498,124.261V123.242H198.498V124.261H196.498Z" />
- <path
- android:fillColor="#74B816"
- android:fillType="evenOdd"
- android:pathData="M183.491,176.297L183.879,174.335C184.519,174.462 185.182,174.528 185.862,174.528H187.76V176.528H185.862C185.051,176.528 184.258,176.449 183.491,176.297ZM206.743,176.528V174.528H208.641C209.322,174.528 209.985,174.462 210.624,174.335L211.012,176.297C210.246,176.449 209.453,176.528 208.641,176.528H206.743ZM215.392,174.482L214.279,172.82C215.387,172.079 216.341,171.125 217.082,170.017L218.744,171.13C217.857,172.455 216.717,173.595 215.392,174.482ZM220.79,143.498H218.79V141.6C218.79,140.92 218.724,140.257 218.597,139.617L220.559,139.229C220.711,139.996 220.79,140.789 220.79,141.6V143.498ZM218.744,134.85L217.082,135.963C216.341,134.855 215.387,133.901 214.279,133.159L215.392,131.497C216.717,132.384 217.857,133.525 218.744,134.85ZM187.76,129.451H185.862C185.051,129.451 184.258,129.531 183.491,129.682L183.879,131.644C184.519,131.518 185.182,131.451 185.862,131.451H187.76V129.451ZM179.112,131.497L180.225,133.159C179.117,133.901 178.163,134.855 177.421,135.963L175.759,134.85C176.646,133.525 177.787,132.384 179.112,131.497ZM173.713,162.481H175.713V164.38C175.713,165.06 175.78,165.723 175.906,166.362L173.944,166.751C173.793,165.984 173.713,165.191 173.713,164.38V162.481ZM175.759,171.13L177.421,170.017C178.163,171.125 179.117,172.079 180.225,172.82L179.112,174.482C177.787,173.595 176.646,172.455 175.759,171.13ZM173.713,158.685H175.713V154.888H173.713V158.685ZM173.713,151.092H175.713V147.295H173.713V151.092ZM173.713,143.498H175.713V141.6C175.713,140.92 175.78,140.257 175.906,139.617L173.944,139.229C173.793,139.996 173.713,140.789 173.713,141.6V143.498ZM191.557,129.451V131.451H195.354V129.451H191.557ZM199.15,129.451V131.451H202.947V129.451H199.15ZM206.743,129.451V131.451H208.641C209.322,131.451 209.985,131.518 210.624,131.644L211.012,129.682C210.246,129.531 209.453,129.451 208.641,129.451H206.743ZM220.79,147.295H218.79V151.092H220.79V147.295ZM220.79,154.888H218.79V158.685H220.79V154.888ZM220.79,162.481H218.79V164.38C218.79,165.06 218.724,165.723 218.597,166.362L220.559,166.751C220.711,165.984 220.79,165.191 220.79,164.38V162.481ZM202.947,176.528V174.528H199.15V176.528H202.947ZM195.354,176.528V174.528H191.557V176.528H195.354Z" />
- <path
- android:fillColor="#435B77"
- android:fillType="evenOdd"
- android:pathData="M110.594,39.566L110.982,37.604C111.503,37.707 112.042,37.761 112.597,37.761H115.001V39.761H112.597C111.911,39.761 111.242,39.694 110.594,39.566ZM129.431,39.761V37.761H131.836C132.39,37.761 132.93,37.707 133.45,37.604L133.838,39.566C133.191,39.694 132.521,39.761 131.836,39.761H129.431ZM137.537,38.033L136.424,36.371C137.326,35.767 138.103,34.99 138.706,34.089L140.368,35.201C139.619,36.32 138.656,37.284 137.537,38.033ZM142.097,12.666H140.097V10.261C140.097,9.707 140.042,9.167 139.939,8.646L141.901,8.258C142.029,8.906 142.097,9.576 142.097,10.261V12.666ZM140.368,4.56L138.706,5.672C138.103,4.771 137.326,3.994 136.424,3.39L137.537,1.728C138.656,2.477 139.619,3.441 140.368,4.56ZM115.001,0H112.597C111.911,0 111.242,0.067 110.594,0.195L110.982,2.157C111.503,2.054 112.042,2 112.597,2H115.001V0ZM106.895,1.728L108.008,3.39C107.106,3.994 106.33,4.771 105.726,5.672L104.064,4.56C104.813,3.441 105.777,2.477 106.895,1.728ZM102.336,27.095H104.336V29.5C104.336,30.054 104.39,30.594 104.493,31.114L102.531,31.503C102.403,30.855 102.336,30.185 102.336,29.5V27.095ZM104.064,35.201L105.726,34.089C106.33,34.99 107.106,35.767 108.008,36.371L106.895,38.033C105.777,37.284 104.813,36.32 104.064,35.201ZM102.336,22.285H104.336V17.476H102.336V22.285ZM102.336,12.666H104.336V10.261C104.336,9.707 104.39,9.167 104.493,8.646L102.531,8.258C102.403,8.906 102.336,9.576 102.336,10.261V12.666ZM119.811,0V2H124.621V0H119.811ZM129.431,0V2H131.836C132.39,2 132.93,2.054 133.45,2.157L133.838,0.195C133.191,0.067 132.521,0 131.836,0H129.431ZM142.097,17.476H140.097V22.285H142.097V17.476ZM142.097,27.095H140.097V29.5C140.097,30.054 140.042,30.594 139.939,31.114L141.901,31.503C142.029,30.855 142.097,30.185 142.097,29.5V27.095ZM124.621,39.761V37.761H119.811V39.761H124.621Z" />
- <path
- android:fillColor="#435B77"
- android:fillType="evenOdd"
- android:pathData="M40.03,171.724L40.796,169.877C41.553,170.191 42.384,170.365 43.262,170.365H45.241V172.365H43.262C42.117,172.365 41.025,172.137 40.03,171.724ZM57.114,172.365V170.365H59.093C59.971,170.365 60.802,170.191 61.559,169.877L62.325,171.724C61.33,172.137 60.238,172.365 59.093,172.365H57.114ZM67.537,150.069H65.537V148.09C65.537,147.213 65.363,146.381 65.049,145.624L66.896,144.858C67.309,145.853 67.537,146.945 67.537,148.09V150.069ZM45.241,139.646H43.262C42.117,139.646 41.025,139.874 40.03,140.287L40.796,142.135C41.553,141.821 42.384,141.646 43.262,141.646H45.241V139.646ZM34.818,161.943H36.818V163.921C36.818,164.799 36.993,165.63 37.306,166.387L35.459,167.153C35.046,166.158 34.818,165.066 34.818,163.921V161.943ZM34.818,157.985H36.818V154.027H34.818V157.985ZM34.818,150.069H36.818V148.09C36.818,147.213 36.993,146.381 37.306,145.624L35.459,144.858C35.046,145.853 34.818,146.945 34.818,148.09V150.069ZM49.199,139.646V141.646H53.157V139.646H49.199ZM57.114,139.646V141.646H59.093C59.971,141.646 60.802,141.821 61.559,142.135L62.325,140.287C61.33,139.874 60.238,139.646 59.093,139.646H57.114ZM67.537,154.027H65.537V157.985H67.537V154.027ZM67.537,161.943H65.537V163.921C65.537,164.799 65.363,165.63 65.049,166.387L66.896,167.154C67.309,166.158 67.537,165.066 67.537,163.921V161.943ZM53.157,172.365V170.365H49.199V172.365H53.157Z" />
- <path
- android:fillColor="#435B77"
- android:fillType="evenOdd"
- android:pathData="M112.803,198.65L113.569,196.803C113.862,196.924 114.184,196.992 114.527,196.992H116.638V198.992H114.527C113.917,198.992 113.334,198.87 112.803,198.65ZM120.86,198.992V196.992H122.971C123.314,196.992 123.636,196.924 123.929,196.803L124.695,198.65C124.164,198.87 123.582,198.992 122.971,198.992H120.86ZM127.475,188.155H125.475V186.044C125.475,185.701 125.407,185.379 125.285,185.087L127.133,184.321C127.353,184.852 127.475,185.434 127.475,186.044V188.155ZM116.638,181.541H114.527C113.917,181.541 113.334,181.663 112.803,181.883L113.569,183.73C113.862,183.609 114.184,183.541 114.527,183.541H116.638V181.541ZM110.024,192.377H112.024V194.488C112.024,194.832 112.092,195.154 112.213,195.446L110.365,196.212C110.145,195.681 110.024,195.099 110.024,194.488V192.377ZM110.024,188.155H112.024V186.044C112.024,185.701 112.092,185.379 112.213,185.087L110.365,184.321C110.145,184.852 110.024,185.434 110.024,186.044V188.155ZM120.86,181.541V183.541H122.971C123.314,183.541 123.636,183.609 123.929,183.73L124.695,181.883C124.164,181.663 123.582,181.541 122.971,181.541H120.86ZM127.475,192.377H125.475V194.488C125.475,194.832 125.407,195.154 125.285,195.446L127.133,196.212C127.353,195.681 127.475,195.099 127.475,194.488V192.377Z" />
- <path
- android:fillColor="#657D99"
- android:fillType="evenOdd"
- android:pathData="M178.996,79.823L179.762,77.976C180.48,78.274 181.269,78.439 182.101,78.439H184.003V80.439H182.101C181.001,80.439 179.952,80.22 178.996,79.823ZM195.412,80.439V78.439H197.314C198.146,78.439 198.935,78.274 199.653,77.976L200.419,79.823C199.463,80.22 198.414,80.439 197.314,80.439H195.412ZM205.427,59.015H203.427V57.113C203.427,56.281 203.262,55.492 202.964,54.774L204.811,54.008C205.208,54.964 205.427,56.013 205.427,57.113V59.015ZM184.003,49H182.101C181.001,49 179.952,49.219 178.996,49.616L179.762,51.463C180.48,51.165 181.269,51 182.101,51H184.003V49ZM173.988,70.424H175.988V72.326C175.988,73.158 176.153,73.947 176.451,74.665L174.604,75.432C174.207,74.475 173.988,73.426 173.988,72.326V70.424ZM173.988,66.621H175.988V62.818H173.988V66.621ZM173.988,59.015H175.988V57.113C175.988,56.281 176.153,55.492 176.451,54.774L174.604,54.008C174.207,54.964 173.988,56.013 173.988,57.113V59.015ZM187.806,49V51H191.609V49H187.806ZM195.412,49V51H197.314C198.146,51 198.935,51.165 199.653,51.463L200.419,49.616C199.463,49.219 198.414,49 197.314,49H195.412ZM205.427,62.818H203.427V66.621H205.427V62.818ZM205.427,70.424H203.427V72.326C203.427,73.158 203.262,73.947 202.964,74.665L204.811,75.432C205.208,74.475 205.427,73.426 205.427,72.326V70.424ZM191.609,80.439V78.439H187.806V80.439H191.609Z" />
- <path
- android:fillColor="#435B77"
- android:fillType="evenOdd"
- android:pathData="M234.829,108.021L235.595,106.174C235.887,106.295 236.209,106.363 236.553,106.363H238.664V108.363H236.553C235.942,108.363 235.36,108.241 234.829,108.021ZM242.886,108.363V106.363H244.997C245.34,106.363 245.662,106.295 245.954,106.174L246.72,108.021C246.189,108.241 245.607,108.363 244.997,108.363H242.886ZM249.5,97.526H247.5V95.416C247.5,95.072 247.432,94.75 247.311,94.458L249.158,93.692C249.378,94.223 249.5,94.805 249.5,95.416V97.526ZM238.664,90.912H236.553C235.942,90.912 235.36,91.034 234.829,91.254L235.595,93.101C235.887,92.98 236.209,92.912 236.553,92.912H238.664V90.912ZM232.049,101.749H234.049V103.86C234.049,104.203 234.117,104.525 234.238,104.817L232.391,105.583C232.171,105.052 232.049,104.47 232.049,103.86V101.749ZM232.049,97.526H234.049V95.416C234.049,95.072 234.117,94.75 234.238,94.458L232.391,93.692C232.171,94.223 232.049,94.805 232.049,95.416V97.526ZM242.886,90.912V92.912H244.997C245.34,92.912 245.662,92.98 245.954,93.101L246.72,91.254C246.189,91.034 245.607,90.912 244.997,90.912H242.886ZM249.5,101.749H247.5V103.86C247.5,104.203 247.432,104.525 247.311,104.817L249.158,105.583C249.378,105.052 249.5,104.47 249.5,103.86V101.749Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M29.825,34.377V53.66C29.825,55.226 31.1,56.517 32.682,56.517H34.021C35.586,56.517 36.877,55.226 36.877,53.66V34.377H29.825Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M36.861,25.083V21.452C36.861,19.887 35.586,18.596 34.021,18.596H32.682C31.116,18.596 29.825,19.887 29.825,21.452V25.083H36.861Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M52.514,40.735V21.452C52.514,19.887 51.239,18.596 49.674,18.596H48.334C46.769,18.596 45.478,19.887 45.478,21.452V40.735H52.514Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M45.478,50.029V53.66C45.478,55.225 46.769,56.516 48.334,56.516H49.674C51.239,56.516 52.53,55.225 52.53,53.66V50.029H45.478Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M28.696,41.865H25.065C23.5,41.865 22.209,43.14 22.209,44.721V46.061C22.209,47.626 23.484,48.917 25.065,48.917H28.696V41.865Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M57.274,41.865H37.99V48.917H57.274C58.839,48.917 60.13,47.626 60.13,46.061V44.721C60.13,43.14 58.839,41.865 57.274,41.865Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M44.348,26.213H25.065C23.5,26.213 22.209,27.488 22.209,29.069V30.408C22.209,31.974 23.484,33.265 25.065,33.265H44.348V26.213Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M57.274,26.213H53.643V33.265H57.274C58.839,33.265 60.13,31.99 60.13,30.408V29.069C60.13,27.488 58.839,26.213 57.274,26.213Z" />
- <path
- android:fillColor="#95DE2D"
- android:fillType="evenOdd"
- android:pathData="M108.864,99.496H129.086C129.852,99.496 130.587,99.801 131.129,100.343C131.671,100.886 131.975,101.622 131.975,102.39L131.975,127.191C131.975,128.296 130.688,128.899 129.841,128.191L124.6,123.804H108.864C108.098,123.804 107.363,123.499 106.821,122.956C106.279,122.413 105.975,121.677 105.975,120.91V102.39C105.975,101.622 106.279,100.886 106.821,100.343C107.363,99.801 108.098,99.496 108.864,99.496ZM116.549,112.318H110.597V104.126H127.353V112.318H121.499V115.152H123.64C124.026,115.152 124.22,115.619 123.947,115.893L119.331,120.517C119.161,120.686 118.887,120.686 118.718,120.517L114.102,115.893C113.829,115.619 114.022,115.152 114.408,115.152H116.549V112.318Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M190.408,151.152V162.299C190.408,163.204 191.145,163.95 192.059,163.95H192.833C193.738,163.95 194.484,163.204 194.484,162.299V151.152H190.408Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M194.475,145.779V143.68C194.475,142.775 193.738,142.029 192.833,142.029H192.059C191.154,142.029 190.408,142.775 190.408,143.68V145.779H194.475Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M203.523,154.827V143.68C203.523,142.775 202.786,142.029 201.881,142.029H201.107C200.202,142.029 199.456,142.775 199.456,143.68V154.827H203.523Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M199.456,160.201V162.3C199.456,163.204 200.202,163.951 201.107,163.951H201.881C202.786,163.951 203.533,163.204 203.533,162.3V160.201H199.456Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M189.755,155.48H187.656C186.751,155.48 186.005,156.217 186.005,157.131V157.905C186.005,158.81 186.742,159.556 187.656,159.556H189.755V155.48Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M206.275,155.48H195.128V159.556H206.275C207.18,159.556 207.926,158.81 207.926,157.905V157.131C207.926,156.217 207.18,155.48 206.275,155.48Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M198.803,146.433H187.656C186.751,146.433 186.005,147.17 186.005,148.084V148.859C186.005,149.763 186.742,150.51 187.656,150.51H198.803V146.433Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M206.275,146.433H204.176V150.51H206.275C207.18,150.51 207.926,149.773 207.926,148.859V148.084C207.926,147.17 207.18,146.433 206.275,146.433Z" />
-</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml b/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c3f9245b8ed20e5377b707a2a849632aaaf5366
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml
@@ -0,0 +1,114 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="200dp"
+ android:height="100dp"
+ android:viewportWidth="289"
+ android:viewportHeight="145">
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M48.87,41C48.87,36.58 45.29,33 40.87,33H14.87C10.45,33 6.87,36.58 6.87,41V103C6.87,107.42 10.45,111 14.87,111H40.87C45.29,111 48.87,107.42 48.87,103V41Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M48.87,47.25H6.87V101.25H48.87V47.25Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M11.47,69.1C11.47,66.89 13.26,65.1 15.47,65.1H40.26C42.47,65.1 44.26,66.89 44.26,69.1V79.39C44.26,81.6 42.47,83.39 40.26,83.39H15.47C13.26,83.39 11.47,81.6 11.47,79.39V69.1Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M17.24,71.55C17.24,71.14 17.57,70.8 17.99,70.8H37.86C38.27,70.8 38.61,71.14 38.61,71.55C38.61,71.97 38.27,72.3 37.86,72.3H17.99C17.57,72.3 17.24,71.97 17.24,71.55Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M17.24,77.65C17.24,77.24 17.57,76.9 17.99,76.9H28.67C29.08,76.9 29.42,77.24 29.42,77.65C29.42,78.07 29.08,78.4 28.67,78.4H17.99C17.57,78.4 17.24,78.07 17.24,77.65Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M27.87,42C27.32,42 26.87,41.55 26.87,41C26.87,40.45 27.32,40 27.87,40C28.42,40 28.87,40.45 28.87,41C28.87,41.55 28.42,42 27.87,42Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M19.12,41.02C19.12,40.61 19.45,40.27 19.87,40.27H23.87C24.28,40.27 24.62,40.61 24.62,41.02C24.62,41.44 24.28,41.77 23.87,41.77H19.87C19.45,41.77 19.12,41.44 19.12,41.02Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M31.87,40.27C31.45,40.27 31.12,40.61 31.12,41.02C31.12,41.44 31.45,41.77 31.87,41.77H35.87C36.28,41.77 36.62,41.44 36.62,41.02C36.62,40.61 36.28,40.27 35.87,40.27H31.87Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M48.87,41V103C48.87,107.42 45.29,111 40.87,111H14.87C10.45,111 6.87,107.42 6.87,103V41C6.87,36.58 10.45,33 14.87,33H40.87C45.29,33 48.87,36.58 48.87,41ZM14.87,34.5H40.87C44.46,34.5 47.37,37.41 47.37,41V47.25H8.37V41C8.37,37.41 11.28,34.5 14.87,34.5ZM47.37,48.75V99.75H8.37V48.75H47.37ZM47.37,103V101.25H8.37V103C8.37,106.59 11.28,109.5 14.87,109.5H40.87C44.46,109.5 47.37,106.59 47.37,103Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M281.87,41C281.87,36.58 278.29,33 273.87,33H247.87C243.45,33 239.87,36.58 239.87,41V103C239.87,107.42 243.45,111 247.87,111H273.87C278.29,111 281.87,107.42 281.87,103V41Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M281.87,47.25H239.87V101.25H281.87V47.25Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M244.47,69.1C244.47,66.89 246.26,65.1 248.47,65.1H273.26C275.47,65.1 277.26,66.89 277.26,69.1V79.39C277.26,81.6 275.47,83.39 273.26,83.39H248.47C246.26,83.39 244.47,81.6 244.47,79.39V69.1Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M250.24,71.55C250.24,71.14 250.57,70.8 250.99,70.8H270.86C271.27,70.8 271.61,71.14 271.61,71.55C271.61,71.97 271.27,72.3 270.86,72.3H250.99C250.57,72.3 250.24,71.97 250.24,71.55Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M250.24,77.65C250.24,77.24 250.57,76.9 250.99,76.9H261.67C262.08,76.9 262.42,77.24 262.42,77.65C262.42,78.07 262.08,78.4 261.67,78.4H250.99C250.57,78.4 250.24,78.07 250.24,77.65Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M260.87,42C260.32,42 259.87,41.55 259.87,41C259.87,40.45 260.32,40 260.87,40C261.42,40 261.87,40.45 261.87,41C261.87,41.55 261.42,42 260.87,42Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M252.12,41.02C252.12,40.61 252.45,40.27 252.87,40.27H256.87C257.28,40.27 257.62,40.61 257.62,41.02C257.62,41.44 257.28,41.77 256.87,41.77H252.87C252.45,41.77 252.12,41.44 252.12,41.02Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M264.87,40.27C264.45,40.27 264.12,40.61 264.12,41.02C264.12,41.44 264.45,41.77 264.87,41.77H268.87C269.28,41.77 269.62,41.44 269.62,41.02C269.62,40.61 269.28,40.27 268.87,40.27H264.87Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M281.87,41V103C281.87,107.42 278.29,111 273.87,111H247.87C243.45,111 239.87,107.42 239.87,103V41C239.87,36.58 243.45,33 247.87,33H273.87C278.29,33 281.87,36.58 281.87,41ZM247.87,34.5H273.87C277.46,34.5 280.37,37.41 280.37,41V47.25H241.37V41C241.37,37.41 244.28,34.5 247.87,34.5ZM280.37,48.75V99.75H241.37V48.75H280.37ZM280.37,103V101.25H241.37V103C241.37,106.59 244.28,109.5 247.87,109.5H273.87C277.46,109.5 280.37,106.59 280.37,103Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M150.87,54C150.87,49.58 147.29,46 142.87,46H126.87C122.45,46 118.87,49.58 118.87,54V70C118.87,74.42 122.45,78 126.87,78H142.87C147.29,78 150.87,74.42 150.87,70V54Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M126.87,47.5H142.87C146.46,47.5 149.37,50.41 149.37,54V70C149.37,73.59 146.46,76.5 142.87,76.5H126.87C123.28,76.5 120.37,73.59 120.37,70V54C120.37,50.41 123.28,47.5 126.87,47.5ZM142.87,46C147.29,46 150.87,49.58 150.87,54V70C150.87,74.42 147.29,78 142.87,78H126.87C122.45,78 118.87,74.42 118.87,70V54C118.87,49.58 122.45,46 126.87,46H142.87Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M138.93,61.38C139.52,62.63 139.29,64.17 138.26,65.2L134.28,69.18C132.96,70.5 130.82,70.5 129.5,69.18C128.18,67.86 128.18,65.72 129.5,64.4L133.48,60.42C134.51,59.39 136.05,59.16 137.3,59.75L136.11,60.95C135.55,60.87 134.97,61.05 134.54,61.48L130.56,65.46C129.83,66.19 129.83,67.39 130.56,68.12C131.3,68.85 132.49,68.85 133.22,68.12L137.2,64.14C137.63,63.71 137.81,63.13 137.74,62.57L138.93,61.38Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M132.43,64.25C133.68,64.84 135.22,64.61 136.26,63.58L140.24,59.6C141.55,58.28 141.55,56.14 140.24,54.82C138.91,53.5 136.77,53.5 135.45,54.82L131.48,58.8C130.44,59.83 130.22,61.37 130.8,62.62L132,61.42C131.93,60.87 132.11,60.29 132.54,59.86L136.51,55.88C137.25,55.14 138.44,55.14 139.17,55.88C139.91,56.61 139.91,57.8 139.17,58.54L135.2,62.52C134.77,62.94 134.19,63.12 133.63,63.05L132.43,64.25Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M169.87,73C169.87,68.58 166.29,65 161.87,65H145.87C141.45,65 137.87,68.58 137.87,73V89C137.87,93.42 141.45,97 145.87,97H161.87C166.29,97 169.87,93.42 169.87,89V73Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M145.87,66.5H161.87C165.46,66.5 168.37,69.41 168.37,73V89C168.37,92.59 165.46,95.5 161.87,95.5H145.87C142.28,95.5 139.37,92.59 139.37,89V73C139.37,69.41 142.28,66.5 145.87,66.5ZM161.87,65C166.29,65 169.87,68.58 169.87,73V89C169.87,93.42 166.29,97 161.87,97H145.87C141.45,97 137.87,93.42 137.87,89V73C137.87,68.58 141.45,65 145.87,65H161.87Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M157.93,80.38C158.52,81.63 158.29,83.17 157.26,84.2L153.28,88.18C151.96,89.5 149.82,89.5 148.5,88.18C147.18,86.86 147.18,84.72 148.5,83.4L152.48,79.42C153.51,78.39 155.05,78.16 156.3,78.75L155.11,79.95C154.55,79.87 153.97,80.05 153.54,80.48L149.56,84.46C148.83,85.19 148.83,86.39 149.56,87.12C150.3,87.85 151.49,87.85 152.22,87.12L156.2,83.14C156.63,82.71 156.81,82.13 156.74,81.57L157.93,80.38Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M151.43,83.25C152.68,83.84 154.22,83.61 155.26,82.58L159.24,78.6C160.55,77.28 160.55,75.14 159.24,73.82C157.91,72.5 155.77,72.5 154.45,73.82L150.48,77.8C149.44,78.83 149.22,80.37 149.8,81.62L151,80.42C150.93,79.87 151.11,79.29 151.54,78.86L155.51,74.88C156.25,74.14 157.44,74.14 158.17,74.88C158.91,75.61 158.91,76.8 158.17,77.54L154.2,81.52C153.77,81.94 153.19,82.12 152.63,82.05L151.43,83.25Z" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M87.87,62C87.87,64.21 86.08,66 83.87,66C81.66,66 79.87,64.21 79.87,62C79.87,59.79 81.66,58 83.87,58C86.08,58 87.87,59.79 87.87,62Z" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M103.87,62C103.87,64.21 102.08,66 99.87,66C97.66,66 95.87,64.21 95.87,62C95.87,59.79 97.66,58 99.87,58C102.08,58 103.87,59.79 103.87,62Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M71.87,62C71.87,64.21 70.08,66 67.87,66C65.66,66 63.87,64.21 63.87,62C63.87,59.79 65.66,58 67.87,58C70.08,58 71.87,59.79 71.87,62Z" />
+ <path
+ android:fillColor="#4D7C0F"
+ android:pathData="M200.87,81C200.87,78.79 202.66,77 204.87,77C207.08,77 208.87,78.79 208.87,81C208.87,83.21 207.08,85 204.87,85C202.66,85 200.87,83.21 200.87,81Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M184.87,81C184.87,78.79 186.66,77 188.87,77C191.08,77 192.87,78.79 192.87,81C192.87,83.21 191.08,85 188.87,85C186.66,85 184.87,83.21 184.87,81Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M216.87,81C216.87,78.79 218.66,77 220.87,77C223.08,77 224.87,78.79 224.87,81C224.87,83.21 223.08,85 220.87,85C218.66,85 216.87,83.21 216.87,81Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_add_contact_remote_nickname.xml b/briar-android/src/main/res/drawable-night/il_add_contact_remote_nickname.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d9b87d8b633cb48492a8688371947633f0b62687
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_add_contact_remote_nickname.xml
@@ -0,0 +1,135 @@
+<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="#1E293B"
+ android:pathData="M41.8,13.7H95.8C102,13.7 107,18.7 107,24.9V145.9C107,152.1 102,157.1 95.8,157.1H41.8C35.6,157.1 30.6,152.1 30.6,145.9V25C30.6,18.7 35.6,13.7 41.8,13.7Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M100.1,40.6C100.1,36.6 96.9,33.4 92.9,33.4H44.9C40.9,33.4 37.7,36.6 37.7,40.6V136.6C37.7,140.6 40.9,143.8 44.9,143.8H92.9C96.9,143.8 100.1,140.6 100.1,136.6V40.6Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M95.8,13H41.8C35.2,13 29.8,18.4 29.8,25V146C29.8,152.6 35.2,158 41.8,158H95.8C102.4,158 107.8,152.6 107.8,146V25C107.8,18.3 102.5,13 95.8,13ZM106.3,146C106.3,151.8 101.6,156.5 95.8,156.5H41.8C36,156.5 31.3,151.8 31.3,146V25C31.3,19.2 36,14.5 41.8,14.5H95.8C101.6,14.5 106.3,19.2 106.3,25V146Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M68.8,26.9C70.5,26.9 71.8,25.6 71.8,23.9C71.8,22.2 70.5,20.9 68.8,20.9C67.1,20.9 65.8,22.2 65.8,23.9C65.8,25.6 67.2,26.9 68.8,26.9ZM68.8,22.4C69.6,22.4 70.3,23.1 70.3,23.9C70.3,24.7 69.6,25.4 68.8,25.4C68,25.4 67.3,24.7 67.3,23.9C67.3,23.1 68,22.4 68.8,22.4Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M50.8,24.4H60.8C61.2,24.4 61.6,24.1 61.6,23.6C61.6,23.1 61.3,22.8 60.8,22.8H50.8C50.4,22.8 50,23.1 50,23.6C50,24.1 50.4,24.4 50.8,24.4Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M76.8,24.4H86.8C87.2,24.4 87.6,24.1 87.6,23.6C87.6,23.1 87.3,22.8 86.8,22.8H76.8C76.4,22.8 76,23.1 76,23.6C76,24.1 76.4,24.4 76.8,24.4Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M92.8,32.6H44.8C40.4,32.6 36.8,36.2 36.8,40.6V136.6C36.8,141 40.4,144.6 44.8,144.6H92.8C97.2,144.6 100.8,141 100.8,136.6V40.6C100.8,36.2 97.2,32.6 92.8,32.6ZM99.3,136.6C99.3,140.2 96.4,143.1 92.8,143.1H44.8C41.2,143.1 38.3,140.2 38.3,136.6V40.6C38.3,37 41.2,34.1 44.8,34.1H92.8C96.4,34.1 99.3,37 99.3,40.6V136.6Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M90.8,45.8H61.4C61,45.8 60.6,45.5 60.6,45C60.6,44.5 60.9,44.2 61.4,44.2H90.9C91.3,44.2 91.7,44.5 91.7,45C91.7,45.5 91.2,45.8 90.8,45.8Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M77.2,51.7H61.4C61,51.7 60.6,51.4 60.6,50.9C60.6,50.4 60.9,50.1 61.4,50.1H77.2C77.6,50.1 78,50.4 78,50.9C78,51.4 77.6,51.7 77.2,51.7Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M90.8,87.8H61.4C61,87.8 60.6,87.5 60.6,87C60.6,86.5 60.9,86.2 61.4,86.2H90.9C91.3,86.2 91.7,86.5 91.7,87C91.7,87.5 91.2,87.8 90.8,87.8Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M77.2,93.7H61.4C61,93.7 60.6,93.4 60.6,92.9C60.6,92.4 60.9,92.1 61.4,92.1H77.2C77.6,92.1 78,92.4 78,92.9C78,93.4 77.6,93.7 77.2,93.7Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M90.8,66.8H61.4C61,66.8 60.6,66.5 60.6,66C60.6,65.5 60.9,65.2 61.4,65.2H90.9C91.3,65.2 91.7,65.5 91.7,66C91.7,66.5 91.2,66.8 90.8,66.8Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M77.2,72.7H61.4C61,72.7 60.6,72.4 60.6,71.9C60.6,71.4 60.9,71.1 61.4,71.1H77.2C77.6,71.1 78,71.4 78,71.9C78,72.4 77.6,72.7 77.2,72.7Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M90.8,129.8H61.4C61,129.8 60.6,129.5 60.6,129C60.6,128.5 60.9,128.2 61.4,128.2H90.9C91.3,128.2 91.7,128.5 91.7,129C91.7,129.5 91.2,129.8 90.8,129.8Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M77.2,135.7H61.4C61,135.7 60.6,135.4 60.6,134.9C60.6,134.4 60.9,134.1 61.4,134.1H77.2C77.6,134.1 78,134.4 78,134.9C78,135.4 77.6,135.7 77.2,135.7Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M90.8,108.8H61.4C61,108.8 60.6,108.5 60.6,108C60.6,107.5 60.9,107.2 61.4,107.2H90.9C91.3,107.2 91.7,107.5 91.7,108C91.7,108.5 91.2,108.8 90.8,108.8Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M77.2,114.7H61.4C61,114.7 60.6,114.4 60.6,113.9C60.6,113.4 60.9,113.1 61.4,113.1H77.2C77.6,113.1 78,113.4 78,113.9C78,114.4 77.6,114.7 77.2,114.7Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M96.8,34.8H150.8C157,34.8 162,39.8 162,46V167C162,173.2 157,178.2 150.8,178.2H96.8C90.6,178.2 85.6,173.2 85.6,167V46C85.6,39.8 90.6,34.8 96.8,34.8Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M155.1,61.6C155.1,57.6 151.9,54.4 147.9,54.4H99.9C95.9,54.4 92.7,57.6 92.7,61.6V157.6C92.7,161.6 95.9,164.8 99.9,164.8H147.9C151.9,164.8 155.1,161.6 155.1,157.6V61.6Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M150.8,34H96.8C90.2,34 84.8,39.4 84.8,46V167C84.8,173.6 90.2,179 96.8,179H150.8C157.4,179 162.8,173.6 162.8,167V46C162.8,39.4 157.5,34 150.8,34ZM161.3,167C161.3,172.8 156.6,177.5 150.8,177.5H96.8C91,177.5 86.3,172.8 86.3,167V46C86.3,40.2 91,35.5 96.8,35.5H150.8C156.6,35.5 161.3,40.2 161.3,46V167Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M123.8,47.9C125.5,47.9 126.8,46.6 126.8,44.9C126.8,43.2 125.5,41.9 123.8,41.9C122.1,41.9 120.8,43.2 120.8,44.9C120.8,46.6 122.2,47.9 123.8,47.9ZM123.8,43.4C124.6,43.4 125.3,44.1 125.3,44.9C125.3,45.7 124.6,46.4 123.8,46.4C123,46.4 122.3,45.7 122.3,44.9C122.3,44.1 123,43.4 123.8,43.4Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M105.8,45.4H115.8C116.2,45.4 116.6,45.1 116.6,44.6C116.6,44.1 116.3,43.8 115.8,43.8H105.8C105.4,43.8 105,44.1 105,44.6C105,45.1 105.4,45.4 105.8,45.4Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M131.8,45.4H141.8C142.2,45.4 142.6,45.1 142.6,44.6C142.6,44.1 142.3,43.8 141.8,43.8H131.8C131.4,43.8 131,44.1 131,44.6C131,45.1 131.4,45.4 131.8,45.4Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M147.8,53.6H99.8C95.4,53.6 91.8,57.2 91.8,61.6V157.6C91.8,162 95.4,165.6 99.8,165.6H147.8C152.2,165.6 155.8,162 155.8,157.6V61.6C155.8,57.2 152.2,53.6 147.8,53.6ZM154.3,157.6C154.3,161.2 151.4,164.1 147.8,164.1H99.8C96.2,164.1 93.3,161.2 93.3,157.6V61.6C93.3,58 96.2,55.1 99.8,55.1H147.8C151.4,55.1 154.3,58 154.3,61.6V157.6Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M49.8,54C53.06,54 55.7,51.31 55.7,48C55.7,44.69 53.06,42 49.8,42C46.54,42 43.9,44.69 43.9,48C43.9,51.31 46.54,54 49.8,54Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M49.8,96C53.06,96 55.7,93.31 55.7,90C55.7,86.69 53.06,84 49.8,84C46.54,84 43.9,86.69 43.9,90C43.9,93.31 46.54,96 49.8,96Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M49.8,75C53.06,75 55.7,72.31 55.7,69C55.7,65.69 53.06,63 49.8,63C46.54,63 43.9,65.69 43.9,69C43.9,72.31 46.54,75 49.8,75Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M49.8,138C53.06,138 55.7,135.31 55.7,132C55.7,128.69 53.06,126 49.8,126C46.54,126 43.9,128.69 43.9,132C43.9,135.31 46.54,138 49.8,138Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M49.8,117C53.06,117 55.7,114.31 55.7,111C55.7,107.69 53.06,105 49.8,105C46.54,105 43.9,107.69 43.9,111C43.9,114.31 46.54,117 49.8,117Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M104.8,75C108.06,75 110.7,72.31 110.7,69C110.7,65.69 108.06,63 104.8,63C101.54,63 98.9,65.69 98.9,69C98.9,72.31 101.54,75 104.8,75Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M104.8,159C108.06,159 110.7,156.31 110.7,153C110.7,149.69 108.06,147 104.8,147C101.54,147 98.9,149.69 98.9,153C98.9,156.31 101.54,159 104.8,159Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M104.8,138C108.06,138 110.7,135.31 110.7,132C110.7,128.69 108.06,126 104.8,126C101.54,126 98.9,128.69 98.9,132C98.9,135.31 101.54,138 104.8,138Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M116.4,66.8H145.9C146.3,66.8 146.7,66.5 146.7,66C146.7,65.5 146.4,65.2 145.9,65.2H116.4C116,65.2 115.6,65.5 115.6,66C115.6,66.5 116,66.8 116.4,66.8Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M116.4,72.7H132.2C132.6,72.7 133,72.4 133,71.9C133,71.4 132.7,71.1 132.2,71.1H116.4C116,71.1 115.6,71.4 115.6,71.9C115.6,72.4 116,72.7 116.4,72.7Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M145.8,149.3H116.4C116,149.3 115.6,149.6 115.6,150.1C115.6,150.6 115.9,150.9 116.4,150.9H145.9C146.3,150.9 146.7,150.6 146.7,150.1C146.7,149.6 146.2,149.3 145.8,149.3Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M132.2,155.2H116.4C116,155.2 115.6,155.5 115.6,156C115.6,156.5 115.9,156.8 116.4,156.8H132.2C132.6,156.8 133,156.5 133,156C133,155.5 132.6,155.2 132.2,155.2Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M145.8,128.3H116.4C116,128.3 115.6,128.6 115.6,129.1C115.6,129.6 115.9,129.9 116.4,129.9H145.9C146.3,129.9 146.7,129.6 146.7,129.1C146.7,128.6 146.2,128.3 145.8,128.3Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M116.4,135.7H132.2C132.6,135.7 133,135.4 133,134.9C133,134.4 132.7,134.1 132.2,134.1H116.4C116,134.1 115.6,134.4 115.6,134.9C115.6,135.4 116,135.7 116.4,135.7Z" />
+ <path
+ android:fillColor="#1649A0"
+ android:pathData="M74.8,83H172.8C175,83 176.8,84.8 176.8,87V114C176.8,116.2 175,118 172.8,118H74.8C72.6,118 70.8,116.2 70.8,114V87C70.8,84.8 72.6,83 74.8,83Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M164.8,95.3H112.8C112.4,95.3 112,95.6 112,96.1C112,96.6 112.3,96.9 112.8,96.9H164.8C165.2,96.9 165.6,96.6 165.6,96.1C165.6,95.6 165.2,95.3 164.8,95.3Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M140.8,104.1H112.8C112.4,104.1 112,104.4 112,104.9C112,105.4 112.3,105.7 112.8,105.7H140.8C141.2,105.7 141.6,105.4 141.6,104.9C141.6,104.4 141.2,104.1 140.8,104.1Z" />
+ <path
+ android:fillColor="#E2E8F0"
+ android:pathData="M92.3,102.2H90.8C86,102.2 82,106.1 82,111V111.1C82,111.5 82.3,111.8 82.8,111.8C83.3,111.8 83.6,111.4 83.6,111C83.6,107 86.9,103.8 90.8,103.8H92.3C96.3,103.8 99.5,107.1 99.5,111.1C99.5,111.5 99.8,111.8 100.3,111.8C100.8,111.8 101.1,111.4 101.1,111C101,106.1 97.1,102.2 92.3,102.2Z" />
+ <path
+ android:fillColor="#E2E8F0"
+ android:pathData="M91.6,99.5C94.3,99.5 96.5,97.3 96.5,94.6C96.5,91.9 94.3,89.7 91.6,89.7C88.9,89.7 86.7,91.9 86.7,94.6C86.7,97.4 88.9,99.5 91.6,99.5ZM91.6,91.3C93.5,91.3 95,92.8 95,94.7C95,96.6 93.4,98 91.6,98C89.8,98 88.2,96.5 88.2,94.6C88.2,92.7 89.7,91.3 91.6,91.3Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_bluetooth_connect.xml b/briar-android/src/main/res/drawable-night/il_bluetooth_connect.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c9505b66b1b8a300ce13055f46191a54a1779dcd
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_bluetooth_connect.xml
@@ -0,0 +1,85 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="200dp"
+ android:height="100dp"
+ android:viewportWidth="289"
+ android:viewportHeight="145">
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M268.9,41.8C268.9,37.39 265.32,33.8 260.9,33.8H234.9C230.48,33.8 226.9,37.39 226.9,41.8V103.81C226.9,108.22 230.48,111.81 234.9,111.81H260.9C265.32,111.81 268.9,108.22 268.9,103.81V41.8Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M234.9,35.3H260.9C264.49,35.3 267.4,38.21 267.4,41.8V103.81C267.4,107.39 264.49,110.31 260.9,110.31H234.9C231.31,110.31 228.4,107.39 228.4,103.81V41.8C228.4,38.21 231.31,35.3 234.9,35.3ZM260.9,33.8C265.32,33.8 268.9,37.39 268.9,41.8V103.81C268.9,108.22 265.32,111.81 260.9,111.81H234.9C230.48,111.81 226.9,108.22 226.9,103.81V41.8C226.9,37.39 230.48,33.8 234.9,33.8H260.9Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M246.9,41.81C246.9,42.36 247.35,42.81 247.9,42.81C248.45,42.81 248.9,42.36 248.9,41.81C248.9,41.25 248.45,40.8 247.9,40.8C247.35,40.8 246.9,41.25 246.9,41.81Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M239.15,41.83C239.15,41.41 239.49,41.08 239.9,41.08H243.9C244.32,41.08 244.65,41.41 244.65,41.83C244.65,42.24 244.32,42.58 243.9,42.58H239.9C239.49,42.58 239.15,42.24 239.15,41.83Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M251.15,41.83C251.15,41.41 251.49,41.08 251.9,41.08H255.9C256.32,41.08 256.65,41.41 256.65,41.83C256.65,42.24 256.32,42.58 255.9,42.58H251.9C251.49,42.58 251.15,42.24 251.15,41.83Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M268.9,48.05H226.9V102.05H268.9V48.05Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M228.4,49.55H267.4V100.55H228.4V49.55ZM268.9,48.05V102.05H226.9V48.05H268.9Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M61.9,41.8C61.9,37.39 58.32,33.8 53.9,33.8H27.9C23.48,33.8 19.9,37.39 19.9,41.8V103.81C19.9,108.22 23.48,111.81 27.9,111.81H53.9C58.32,111.81 61.9,108.22 61.9,103.81V41.8Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M27.9,35.3H53.9C57.49,35.3 60.4,38.21 60.4,41.8V103.81C60.4,107.39 57.49,110.31 53.9,110.31H27.9C24.31,110.31 21.4,107.39 21.4,103.81V41.8C21.4,38.21 24.31,35.3 27.9,35.3ZM53.9,33.8C58.32,33.8 61.9,37.39 61.9,41.8V103.81C61.9,108.22 58.32,111.81 53.9,111.81H27.9C23.48,111.81 19.9,108.22 19.9,103.81V41.8C19.9,37.39 23.48,33.8 27.9,33.8H53.9Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M39.9,41.81C39.9,42.36 40.35,42.81 40.9,42.81C41.45,42.81 41.9,42.36 41.9,41.81C41.9,41.25 41.45,40.8 40.9,40.8C40.35,40.8 39.9,41.25 39.9,41.81Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M32.15,41.83C32.15,41.41 32.49,41.08 32.9,41.08H36.9C37.32,41.08 37.65,41.41 37.65,41.83C37.65,42.24 37.32,42.58 36.9,42.58H32.9C32.49,42.58 32.15,42.24 32.15,41.83Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M44.15,41.83C44.15,41.41 44.49,41.08 44.9,41.08H48.9C49.32,41.08 49.65,41.41 49.65,41.83C49.65,42.24 49.32,42.58 48.9,42.58H44.9C44.49,42.58 44.15,42.24 44.15,41.83Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M61.9,48.05H19.9V102.05H61.9V48.05Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M21.4,49.55H60.4V100.55H21.4V49.55ZM61.9,48.05V102.05H19.9V48.05H61.9Z" />
+ <path
+ android:fillColor="#4D7C0F"
+ android:pathData="M96.15,72.8C96.15,75.01 94.36,76.8 92.15,76.8C89.94,76.8 88.15,75.01 88.15,72.8C88.15,70.6 89.94,68.8 92.15,68.8C94.36,68.8 96.15,70.6 96.15,72.8Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M112.15,72.8C112.15,75.01 110.36,76.8 108.15,76.8C105.94,76.8 104.15,75.01 104.15,72.8C104.15,70.6 105.94,68.8 108.15,68.8C110.36,68.8 112.15,70.6 112.15,72.8Z" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M80.15,72.8C80.15,75.01 78.36,76.8 76.15,76.8C73.94,76.8 72.15,75.01 72.15,72.8C72.15,70.6 73.94,68.8 76.15,68.8C78.36,68.8 80.15,70.6 80.15,72.8Z" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M192.65,72.8C192.65,70.6 194.44,68.8 196.65,68.8C198.86,68.8 200.65,70.6 200.65,72.8C200.65,75.01 198.86,76.8 196.65,76.8C194.44,76.8 192.65,75.01 192.65,72.8Z" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M176.65,72.8C176.65,70.6 178.44,68.8 180.65,68.8C182.86,68.8 184.65,70.6 184.65,72.8C184.65,75.01 182.86,76.8 180.65,76.8C178.44,76.8 176.65,75.01 176.65,72.8Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M208.65,72.8C208.65,70.6 210.44,68.8 212.65,68.8C214.86,68.8 216.65,70.6 216.65,72.8C216.65,75.01 214.86,76.8 212.65,76.8C210.44,76.8 208.65,75.01 208.65,72.8Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M166.27,62.8C166.27,56.18 160.9,50.8 154.27,50.8H134.27C127.64,50.8 122.27,56.18 122.27,62.8V82.8C122.27,89.43 127.64,94.8 134.27,94.8H154.27C160.9,94.8 166.27,89.43 166.27,82.8V62.8Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M134.27,52.3H154.27C160.07,52.3 164.77,57.01 164.77,62.8V82.8C164.77,88.6 160.07,93.3 154.27,93.3H134.27C128.47,93.3 123.77,88.6 123.77,82.8V62.8C123.77,57.01 128.47,52.3 134.27,52.3ZM154.27,50.8C160.9,50.8 166.27,56.18 166.27,62.8V82.8C166.27,89.43 160.9,94.8 154.27,94.8H134.27C127.64,94.8 122.27,89.43 122.27,82.8V62.8C122.27,56.18 127.64,50.8 134.27,50.8H154.27Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M144.08,62.35C144.34,62.23 144.65,62.26 144.88,62.45L150.58,67.15C150.75,67.29 150.85,67.5 150.85,67.72C150.86,67.94 150.76,68.15 150.6,68.3L145.55,72.68L150.6,77.05C150.76,77.19 150.85,77.4 150.85,77.62C150.85,77.83 150.76,78.04 150.6,78.18L144.89,83.15C144.67,83.34 144.36,83.39 144.09,83.27C143.82,83.14 143.65,82.88 143.65,82.58V74.32L139.19,78.19C138.88,78.46 138.4,78.42 138.13,78.11C137.86,77.8 137.89,77.32 138.21,77.05L143.26,72.68L138.21,68.3C137.89,68.03 137.86,67.55 138.13,67.24C138.4,66.93 138.88,66.89 139.19,67.17L143.65,71.03V63.03C143.65,62.74 143.82,62.47 144.08,62.35ZM145.15,74.32L148.96,77.62L145.15,80.94V74.32ZM145.15,71.03V64.62L148.94,67.75L145.15,71.03Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_mailbox.xml b/briar-android/src/main/res/drawable-night/il_mailbox.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2421f94342d631928f74f443125460d59b28386b
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_mailbox.xml
@@ -0,0 +1,124 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="192dp"
+ android:viewportWidth="193"
+ android:viewportHeight="192">
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M112.4,21C112.4,16.58 108.82,13 104.4,13H88.4C83.98,13 80.4,16.58 80.4,21V37C80.4,41.42 83.98,45 88.4,45H104.4C108.82,45 112.4,41.42 112.4,37V21Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M88.4,14.5H104.4C107.99,14.5 110.9,17.41 110.9,21V37C110.9,40.59 107.99,43.5 104.4,43.5H88.4C84.81,43.5 81.9,40.59 81.9,37V21C81.9,17.41 84.81,14.5 88.4,14.5ZM104.4,13C108.82,13 112.4,16.58 112.4,21V37C112.4,41.42 108.82,45 104.4,45H88.4C83.98,45 80.4,41.42 80.4,37V21C80.4,16.58 83.98,13 88.4,13H104.4Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M60.4,127C60.4,122.58 56.82,119 52.4,119H36.4C31.98,119 28.4,122.58 28.4,127V143C28.4,147.42 31.98,151 36.4,151H52.4C56.82,151 60.4,147.42 60.4,143V127Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M36.4,120.5H52.4C55.99,120.5 58.9,123.41 58.9,127V143C58.9,146.59 55.99,149.5 52.4,149.5H36.4C32.81,149.5 29.9,146.59 29.9,143V127C29.9,123.41 32.81,120.5 36.4,120.5ZM52.4,119C56.82,119 60.4,122.58 60.4,127V143C60.4,147.42 56.82,151 52.4,151H36.4C31.98,151 28.4,147.42 28.4,143V127C28.4,122.58 31.98,119 36.4,119H52.4Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M43.65,116L43.65,100L45.15,100L45.15,116L43.65,116Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M95.65,66L95.65,48L97.15,48L97.15,66L95.65,66Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M95.65,155L95.65,126L97.15,126L97.15,155L95.65,155Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M150.15,67V92H148.65V67H150.15Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M149.17,96.45H126.4V94.95H149.17C153.58,94.95 157.15,98.52 157.15,102.93L157.15,121.7L155.65,121.7L155.65,102.93C155.65,99.35 152.75,96.45 149.17,96.45Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M43.63,95.25L66.4,95.25L66.4,96.75L43.63,96.75C39.22,96.75 35.65,93.18 35.65,88.77L35.65,70L37.15,70L37.15,88.77C37.15,92.35 40.05,95.25 43.63,95.25Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M157.4,52C157.4,49.79 155.61,48 153.4,48H145.4C143.19,48 141.4,49.79 141.4,52V60C141.4,62.21 143.19,64 145.4,64H153.4C155.61,64 157.4,62.21 157.4,60V52Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M145.4,49.5H153.4C154.78,49.5 155.9,50.62 155.9,52V60C155.9,61.38 154.78,62.5 153.4,62.5H145.4C144.02,62.5 142.9,61.38 142.9,60V52C142.9,50.62 144.02,49.5 145.4,49.5ZM153.4,48C155.61,48 157.4,49.79 157.4,52V60C157.4,62.21 155.61,64 153.4,64H145.4C143.19,64 141.4,62.21 141.4,60V52C141.4,49.79 143.19,48 145.4,48H153.4Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M104.4,162C104.4,159.79 102.61,158 100.4,158H92.4C90.19,158 88.4,159.79 88.4,162V170C88.4,172.21 90.19,174 92.4,174H100.4C102.61,174 104.4,172.21 104.4,170V162Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M92.4,159.5H100.4C101.78,159.5 102.9,160.62 102.9,162V170C102.9,171.38 101.78,172.5 100.4,172.5H92.4C91.02,172.5 89.9,171.38 89.9,170V162C89.9,160.62 91.02,159.5 92.4,159.5ZM100.4,158C102.61,158 104.4,159.79 104.4,162V170C104.4,172.21 102.61,174 100.4,174H92.4C90.19,174 88.4,172.21 88.4,170V162C88.4,159.79 90.19,158 92.4,158H100.4Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M123.24,81C123.24,74.37 117.87,69 111.24,69H81.24C74.61,69 69.24,74.37 69.24,81V111C69.24,117.63 74.61,123 81.24,123H111.24C117.87,123 123.24,117.63 123.24,111V81Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M81.24,70.5H111.24C117.04,70.5 121.74,75.2 121.74,81V111C121.74,116.8 117.04,121.5 111.24,121.5H81.24C75.44,121.5 70.74,116.8 70.74,111V81C70.74,75.2 75.44,70.5 81.24,70.5ZM111.24,69C117.87,69 123.24,74.37 123.24,81V111C123.24,117.63 117.87,123 111.24,123H81.24C74.61,123 69.24,117.63 69.24,111V81C69.24,74.37 74.61,69 81.24,69H111.24Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M86.13,83.57H105.57C106.31,83.57 107.01,83.87 107.53,84.39C108.06,84.92 108.35,85.63 108.35,86.37L108.35,110.31C108.35,111.38 107.11,111.96 106.3,111.28L101.26,107.57H86.13C85.39,107.57 84.68,107.28 84.16,106.75C83.64,106.23 83.35,105.52 83.35,104.78V86.37C83.35,85.63 83.64,84.92 84.16,84.39C84.68,83.87 85.39,83.57 86.13,83.57ZM93.52,95.95H87.79V88.04H103.9V95.95H98.27V98.69H100.33C100.71,98.69 100.89,99.14 100.63,99.4L96.19,103.87C96.03,104.03 95.76,104.03 95.6,103.87L91.16,99.4C90.9,99.14 91.09,98.69 91.46,98.69H93.52V95.95Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M172.4,132C172.4,127.58 168.82,124 164.4,124H148.4C143.98,124 140.4,127.58 140.4,132V148C140.4,152.42 143.98,156 148.4,156H164.4C168.82,156 172.4,152.42 172.4,148V132Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M148.4,125.5H164.4C167.99,125.5 170.9,128.41 170.9,132V148C170.9,151.59 167.99,154.5 164.4,154.5H148.4C144.81,154.5 141.9,151.59 141.9,148V132C141.9,128.41 144.81,125.5 148.4,125.5ZM164.4,124C168.82,124 172.4,127.58 172.4,132V148C172.4,152.42 168.82,156 164.4,156H148.4C143.98,156 140.4,152.42 140.4,148V132C140.4,127.58 143.98,124 148.4,124H164.4Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M152,138.54V145.66C152,146.24 152.47,146.71 153.05,146.71H153.55C154.13,146.71 154.6,146.24 154.6,145.66V138.54H152Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M154.6,135.11V133.77C154.6,133.19 154.13,132.71 153.55,132.71H153.05C152.48,132.71 152,133.19 152,133.77V135.11H154.6Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M160.38,140.89V133.77C160.38,133.19 159.91,132.71 159.33,132.71H158.83C158.26,132.71 157.78,133.19 157.78,133.77V140.89H160.38Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M157.78,144.32V145.66C157.78,146.24 158.26,146.71 158.83,146.71H159.33C159.91,146.71 160.38,146.24 160.38,145.66V144.32H157.78Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M151.58,141.3H150.24C149.66,141.3 149.19,141.77 149.19,142.36V142.85C149.19,143.43 149.66,143.91 150.24,143.91H151.58V141.3Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M162.13,141.3H155.01V143.91H162.13C162.71,143.91 163.19,143.43 163.19,142.85V142.36C163.19,141.77 162.71,141.3 162.13,141.3Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M157.36,135.53H150.24C149.66,135.53 149.19,136 149.19,136.58V137.07C149.19,137.65 149.66,138.13 150.24,138.13H157.36V135.53Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M162.13,135.53H160.79V138.13H162.13C162.71,138.13 163.19,137.66 163.19,137.07V136.58C163.19,136 162.71,135.53 162.13,135.53Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M28.03,50.65V64.89C28.03,66.05 28.97,67 30.13,67H31.12C32.28,67 33.23,66.05 33.23,64.89V50.65H28.03Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M33.22,43.79V41.11C33.22,39.95 32.28,39 31.12,39H30.13C28.98,39 28.03,39.95 28.03,41.11V43.79H33.22Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M44.78,55.35V41.11C44.78,39.95 43.84,39 42.68,39H41.69C40.54,39 39.58,39.95 39.58,41.11V55.35H44.78Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M39.58,62.21V64.89C39.58,66.05 40.54,67 41.69,67H42.68C43.84,67 44.79,66.05 44.79,64.89V62.21H39.58Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M27.19,56.18H24.51C23.35,56.18 22.4,57.12 22.4,58.29V59.28C22.4,60.43 23.34,61.39 24.51,61.39H27.19V56.18Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M48.29,56.18H34.05V61.39H48.29C49.45,61.39 50.4,60.43 50.4,59.28V58.29C50.4,57.12 49.45,56.18 48.29,56.18Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M38.75,44.62H24.51C23.35,44.62 22.4,45.56 22.4,46.73V47.72C22.4,48.88 23.34,49.83 24.51,49.83H38.75V44.62Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M48.29,44.62H45.61V49.83H48.29C49.45,49.83 50.4,48.89 50.4,47.72V46.73C50.4,45.56 49.45,44.62 48.29,44.62Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml b/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aecec6a67e8698f5b64a3c01db69c9fe3f534958
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
@@ -0,0 +1,106 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="192dp"
+ android:viewportWidth="193"
+ android:viewportHeight="192">
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M189.4,29C189.4,22.37 184.03,17 177.4,17H86.4C79.77,17 74.4,22.37 74.4,29V163C74.4,169.63 79.77,175 86.4,175H177.4C184.03,175 189.4,169.63 189.4,163V29Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M86.4,18.5H177.4C183.2,18.5 187.9,23.2 187.9,29V163C187.9,168.8 183.2,173.5 177.4,173.5H86.4C80.6,173.5 75.9,168.8 75.9,163V29C75.9,23.2 80.6,18.5 86.4,18.5ZM177.4,17C184.03,17 189.4,22.37 189.4,29V163C189.4,169.63 184.03,175 177.4,175H86.4C79.77,175 74.4,169.63 74.4,163V29C74.4,22.37 79.77,17 86.4,17H177.4Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M183.4,35C183.4,30.58 179.82,27 175.4,27H88.4C83.98,27 80.4,30.58 80.4,35V157C80.4,161.42 83.98,165 88.4,165H175.4C179.82,165 183.4,161.42 183.4,157V35Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M88.4,28.5H175.4C178.99,28.5 181.9,31.41 181.9,35V157C181.9,160.59 178.99,163.5 175.4,163.5H88.4C84.81,163.5 81.9,160.59 81.9,157V35C81.9,31.41 84.81,28.5 88.4,28.5ZM175.4,27C179.82,27 183.4,30.58 183.4,35V157C183.4,161.42 179.82,165 175.4,165H88.4C83.98,165 80.4,161.42 80.4,157V35C80.4,30.58 83.98,27 88.4,27H175.4Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M131.9,38.26C131.07,38.26 130.4,37.58 130.4,36.76C130.4,35.93 131.07,35.26 131.9,35.26C132.73,35.26 133.4,35.93 133.4,36.76C133.4,37.58 132.73,38.26 131.9,38.26ZM131.9,39.76C130.24,39.76 128.9,38.41 128.9,36.76C128.9,35.1 130.24,33.76 131.9,33.76C133.56,33.76 134.9,35.1 134.9,36.76C134.9,38.41 133.56,39.76 131.9,39.76Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M115.85,74H146.96C148.14,74 149.27,74.47 150.1,75.32C150.93,76.16 151.4,77.3 151.4,78.49L151.4,116.97C151.4,118.69 149.42,119.63 148.12,118.53L140.05,112.57H115.85C114.67,112.57 113.54,112.1 112.7,111.26C111.87,110.41 111.4,109.27 111.4,108.08V78.49C111.4,77.3 111.87,76.16 112.7,75.32C113.54,74.47 114.67,74 115.85,74ZM127.67,93.9H118.51V81.18H144.29V93.9H135.29V98.29H138.58C139.17,98.29 139.47,99.02 139.05,99.44L131.95,106.62C131.69,106.88 131.27,106.88 131.01,106.62L123.9,99.44C123.48,99.02 123.78,98.29 124.38,98.29H127.67V93.9Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M3.4,29.03C3.4,22.4 8.77,17.03 15.4,17.03H55.4C62.03,17.03 67.4,22.4 67.4,29.03V125.03C67.4,131.65 62.03,137.03 55.4,137.03H15.4C8.77,137.03 3.4,131.65 3.4,125.03V29.03Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M55.4,18.53H15.4C9.6,18.53 4.9,23.23 4.9,29.03V125.03C4.9,130.82 9.6,135.53 15.4,135.53H55.4C61.2,135.53 65.9,130.82 65.9,125.03V29.03C65.9,23.23 61.2,18.53 55.4,18.53ZM15.4,17.03C8.77,17.03 3.4,22.4 3.4,29.03V125.03C3.4,131.65 8.77,137.03 15.4,137.03H55.4C62.03,137.03 67.4,131.65 67.4,125.03V29.03C67.4,22.4 62.03,17.03 55.4,17.03H15.4Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M35.4,27.01C34.88,27.01 34.44,26.58 34.44,26.03C34.44,25.47 34.88,25.05 35.4,25.05C35.92,25.05 36.36,25.47 36.36,26.03C36.36,26.58 35.92,27.01 35.4,27.01ZM35.4,28.51C34.04,28.51 32.94,27.4 32.94,26.03C32.94,24.66 34.04,23.55 35.4,23.55C36.76,23.55 37.86,24.66 37.86,26.03C37.86,27.4 36.76,28.51 35.4,28.51Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M19.88,25.77C19.88,25.35 20.22,25.02 20.63,25.02H28.84C29.25,25.02 29.59,25.35 29.59,25.77C29.59,26.18 29.25,26.52 28.84,26.52H20.63C20.22,26.52 19.88,26.18 19.88,25.77Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M41.22,25.77C41.22,25.35 41.55,25.02 41.97,25.02L50.17,25.02C50.58,25.02 50.92,25.35 50.92,25.77C50.92,26.18 50.58,26.52 50.17,26.52L41.97,26.52C41.55,26.52 41.22,26.18 41.22,25.77Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M61.66,41.25C61.66,36.83 58.08,33.25 53.66,33.25H17.14C12.73,33.25 9.14,36.83 9.14,41.25V117.94C9.14,122.36 12.73,125.94 17.14,125.94H53.66C58.08,125.94 61.66,122.36 61.66,117.94V41.25Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M17.14,34.75H53.66C57.25,34.75 60.16,37.66 60.16,41.25V117.94C60.16,121.53 57.25,124.44 53.66,124.44H17.14C13.56,124.44 10.64,121.53 10.64,117.94V41.25C10.64,37.66 13.56,34.75 17.14,34.75ZM53.66,33.25C58.08,33.25 61.66,36.83 61.66,41.25V117.94C61.66,122.36 58.08,125.94 53.66,125.94H17.14C12.73,125.94 9.14,122.36 9.14,117.94V41.25C9.14,36.83 12.73,33.25 17.14,33.25H53.66Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M27.55,74.96V88.42C27.55,89.52 28.43,90.42 29.52,90.42H30.45C31.54,90.42 32.43,89.52 32.43,88.42V74.96H27.55Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M32.42,68.47V65.93C32.42,64.84 31.54,63.94 30.45,63.94H29.52C28.44,63.94 27.55,64.84 27.55,65.93V68.47H32.42Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M43.26,79.4V65.93C43.26,64.84 42.37,63.94 41.29,63.94H40.36C39.28,63.94 38.38,64.84 38.38,65.93V79.4H43.26Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M38.38,85.89V88.42C38.38,89.52 39.28,90.42 40.36,90.42H41.29C42.37,90.42 43.27,89.52 43.27,88.42V85.89H38.38Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M26.76,80.19H24.25C23.17,80.19 22.27,81.08 22.27,82.18V83.12C22.27,84.21 23.16,85.11 24.25,85.11H26.76V80.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M46.55,80.19H33.2V85.11H46.55C47.64,85.11 48.53,84.21 48.53,83.12V82.18C48.53,81.08 47.64,80.19 46.55,80.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M37.6,69.25H24.25C23.17,69.25 22.27,70.14 22.27,71.25V72.18C22.27,73.28 23.16,74.18 24.25,74.18H37.6V69.25Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M46.55,69.25H44.04V74.18H46.55C47.64,74.18 48.53,73.29 48.53,72.18V71.25C48.53,70.14 47.64,69.25 46.55,69.25Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M67.4,155C67.4,150.58 63.82,147 59.4,147H47.4C42.98,147 39.4,150.58 39.4,155V167C39.4,171.42 42.98,175 47.4,175H59.4C63.82,175 67.4,171.42 67.4,167V155Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M47.4,148.5H59.4C62.99,148.5 65.9,151.41 65.9,155V167C65.9,170.59 62.99,173.5 59.4,173.5H47.4C43.81,173.5 40.9,170.59 40.9,167V155C40.9,151.41 43.81,148.5 47.4,148.5ZM59.4,147C63.82,147 67.4,150.58 67.4,155V167C67.4,171.42 63.82,175 59.4,175H47.4C42.98,175 39.4,171.42 39.4,167V155C39.4,150.58 42.98,147 47.4,147H59.4Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M56.32,155.31H53L48.75,162.62H53L51.74,167.73L58.05,159.63H53.88L56.32,155.31Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M31.4,155C31.4,150.58 27.82,147 23.4,147H11.4C6.98,147 3.4,150.58 3.4,155V167C3.4,171.42 6.98,175 11.4,175H23.4C27.82,175 31.4,171.42 31.4,167V155Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M11.4,148.5H23.4C26.99,148.5 29.9,151.41 29.9,155V167C29.9,170.59 26.99,173.5 23.4,173.5H11.4C7.81,173.5 4.9,170.59 4.9,167V155C4.9,151.41 7.81,148.5 11.4,148.5ZM23.4,147C27.82,147 31.4,150.58 31.4,155V167C31.4,171.42 27.82,175 23.4,175H11.4C6.98,175 3.4,171.42 3.4,167V155C3.4,150.58 6.98,147 11.4,147H23.4Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M11.18,158.86C12,158.05 12.97,157.4 14.03,156.96C15.1,156.51 16.24,156.29 17.4,156.29C18.56,156.29 19.7,156.51 20.77,156.96C21.83,157.4 22.8,158.05 23.62,158.86L22.56,159.92C21.88,159.25 21.08,158.71 20.19,158.34C19.31,157.98 18.36,157.79 17.4,157.79C16.44,157.79 15.49,157.98 14.61,158.34C13.72,158.71 12.92,159.25 12.24,159.92L11.18,158.86Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M13.51,161.19C14.02,160.68 14.62,160.27 15.29,159.99C15.96,159.72 16.68,159.57 17.4,159.57C18.12,159.57 18.84,159.72 19.51,159.99C20.18,160.27 20.78,160.68 21.3,161.19L20.24,162.25C19.86,161.88 19.42,161.58 18.93,161.38C18.45,161.18 17.93,161.07 17.4,161.07C16.87,161.07 16.35,161.18 15.87,161.38C15.38,161.58 14.94,161.88 14.57,162.25L13.51,161.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M18.36,164.13C18.36,164.65 17.93,165.08 17.4,165.08C16.87,165.08 16.44,164.65 16.44,164.13C16.44,163.6 16.87,163.17 17.4,163.17C17.93,163.17 18.36,163.6 18.36,164.13Z" />
+</vector>
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 0000000000000000000000000000000000000000..510019bad075e005ca8193318a99dbb480ed1e4d
--- /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_error.xml b/briar-android/src/main/res/drawable-night/il_qr_code_error.xml
new file mode 100644
index 0000000000000000000000000000000000000000..36cb7b1d69d862309cc6326a3e8f5c99098bdb99
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_qr_code_error.xml
@@ -0,0 +1,72 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="96dp"
+ android:viewportWidth="192"
+ android:viewportHeight="96">
+ <path
+ android:fillColor="#fbbf24"
+ android:fillType="evenOdd"
+ android:pathData="m96,42.07c-0.58,0 -1.05,0.47 -1.05,1.05v12.59c0,0.58 0.47,1.05 1.05,1.05 0.58,0 1.05,-0.47 1.05,-1.05L97.05,43.12c0,-0.58 -0.47,-1.05 -1.05,-1.05zM96,59.6c-0.58,0 -1.05,0.47 -1.05,1.05v0.13c0,0.58 0.47,1.05 1.05,1.05 0.58,0 1.05,-0.47 1.05,-1.05v-0.13c0,-0.58 -0.47,-1.05 -1.05,-1.05z"
+ android:strokeWidth="1.39386" />
+ <path
+ android:fillColor="#fbbf24"
+ android:fillType="evenOdd"
+ android:pathData="M114.72,64.46 L96.69,33.86c-0.3,-0.51 -1.08,-0.51 -1.38,0l-18.03,30.6c-0.25,0.42 0.02,1.08 0.69,1.08h36.05c0.67,0 0.94,-0.66 0.69,-1.08zM98.49,32.8c-1.11,-1.88 -3.88,-1.88 -4.98,0L75.48,63.4c-1.11,1.88 0.28,4.23 2.49,4.23h36.05c2.21,0 3.6,-2.35 2.49,-4.23z"
+ android:strokeWidth="1.39386" />
+ <path
+ android:fillColor="#334155"
+ android:pathData="m180.9,17c0,-4.42 -3.58,-8 -8,-8h-26c-4.42,0 -8,3.58 -8,8v62c0,4.42 3.58,8 8,8h26c4.42,0 8,-3.58 8,-8z" />
+ <path
+ android:fillColor="#64748b"
+ android:fillType="evenOdd"
+ android:pathData="m146.9,10.5h26c3.59,0 6.5,2.91 6.5,6.5v62c0,3.59 -2.91,6.5 -6.5,6.5h-26c-3.59,0 -6.5,-2.91 -6.5,-6.5L140.4,17c0,-3.59 2.91,-6.5 6.5,-6.5zM172.9,9c4.42,0 8,3.58 8,8v62c0,4.42 -3.58,8 -8,8h-26c-4.42,0 -8,-3.58 -8,-8L138.9,17c0,-4.42 3.58,-8 8,-8z" />
+ <path
+ android:fillColor="#0b1120"
+ android:pathData="m180.9,23.25h-42v54h42z" />
+ <path
+ android:fillColor="#64748b"
+ android:fillType="evenOdd"
+ android:pathData="m140.4,24.75h39v51h-39zM180.9,23.25v54h-42v-54z" />
+ <path
+ android:fillColor="#64748b"
+ android:pathData="m163.24,60.25h-2.22v-2.22h2.22zM161.01,52.47h-2.22v5.56h2.22zM169.9,50.25h-2.22v4.44h2.22zM167.68,48.03h-2.22v2.22h2.22zM154.35,50.25h-2.22v2.22h2.22zM152.12,48.03h-2.22v2.22h2.22zM159.9,42.47h2.22L162.12,40.25h-2.22zM151.57,41.91v3.33h3.33v-3.33zM156.57,46.91h-6.67L149.9,40.25h6.67zM151.57,55.25v3.33h3.33L154.9,55.25ZM156.57,60.25h-6.67v-6.67h6.67zM164.9,41.91v3.33h3.33v-3.33zM169.9,46.91h-6.67L163.24,40.25h3.33,3.33zM167.68,58.03v-3.33h-4.44v2.22h2.22v3.33h4.44v-2.22zM165.46,50.25h-4.45v2.22h4.45zM161.01,48.03h-6.67v2.22h2.22v2.22h2.22L158.79,50.25h2.22zM162.12,46.91v-2.22h-2.22v-2.22h-2.22v4.44zM154.07,42.75h-1.67v1.67h1.67zM154.07,56.08h-1.67v1.67h1.67zM167.4,42.75h-1.67v1.67h1.67z" />
+ <path
+ android:fillColor="#64748b"
+ android:pathData="m158.9,17c0,0.55 0.45,1 1,1 0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1 -0.55,0 -1,0.45 -1,1z" />
+ <path
+ android:fillColor="#64748b"
+ android:fillType="evenOdd"
+ android:pathData="m151.15,17.02c0,-0.41 0.34,-0.75 0.75,-0.75h4c0.41,0 0.75,0.34 0.75,0.75 0,0.41 -0.34,0.75 -0.75,0.75h-4c-0.41,0 -0.75,-0.34 -0.75,-0.75z" />
+ <path
+ android:fillColor="#64748b"
+ android:fillType="evenOdd"
+ android:pathData="m163.15,17.02c0,-0.41 0.34,-0.75 0.75,-0.75h4c0.41,0 0.75,0.34 0.75,0.75 0,0.41 -0.34,0.75 -0.75,0.75h-4c-0.41,0 -0.75,-0.34 -0.75,-0.75z" />
+ <path
+ android:fillColor="#334155"
+ android:pathData="m55.9,17c0,-4.42 -3.58,-8 -8,-8H21.9c-4.42,0 -8,3.58 -8,8v62c0,4.42 3.58,8 8,8H47.9c4.42,0 8,-3.58 8,-8z" />
+ <path
+ android:fillColor="#64748b"
+ android:fillType="evenOdd"
+ android:pathData="M21.9,10.5H47.9c3.59,0 6.5,2.91 6.5,6.5v62c0,3.59 -2.91,6.5 -6.5,6.5H21.9c-3.59,0 -6.5,-2.91 -6.5,-6.5V17c0,-3.59 2.91,-6.5 6.5,-6.5zM47.9,9c4.42,0 8,3.58 8,8v62c0,4.42 -3.58,8 -8,8H21.9c-4.42,0 -8,-3.58 -8,-8V17c0,-4.42 3.58,-8 8,-8z" />
+ <path
+ android:fillColor="#0b1120"
+ android:pathData="M55.9,23.25H13.9v54H55.9Z" />
+ <path
+ android:fillColor="#64748b"
+ android:fillType="evenOdd"
+ android:pathData="M15.4,24.75L54.4,24.75v51L15.4,75.75ZM55.9,23.25v54L13.9,77.25v-54z" />
+ <path
+ android:fillColor="#64748b"
+ android:pathData="m38.23,60.25h-2.22v-2.22h2.22zM36.01,52.47h-2.22v5.56h2.22zM44.9,50.25h-2.22v4.44h2.22zM42.68,48.03h-2.22v2.22h2.22zM29.35,50.25h-2.22v2.22h2.22zM27.12,48.03h-2.22v2.22h2.22zM34.9,42.47h2.22L37.12,40.25L34.9,40.25ZM26.57,41.91v3.33h3.33v-3.33zM31.57,46.91L24.9,46.91L24.9,40.25h6.67zM26.57,55.25v3.33h3.33L29.9,55.25ZM31.57,60.25h-6.67v-6.67h6.67zM39.9,41.91v3.33h3.33v-3.33zM44.9,46.91L38.23,46.91L38.23,40.25h3.33,3.33zM42.68,58.03v-3.33h-4.44v2.22h2.22L40.46,60.25L44.9,60.25L44.9,58.03ZM40.46,50.25h-4.44v2.22h4.44zM36.01,48.03h-6.67v2.22h2.22v2.22h2.22L33.79,50.25h2.22zM37.12,46.91v-2.22h-2.22v-2.22h-2.22v4.44zM29.07,42.75h-1.67v1.67h1.67zM29.07,56.08L27.4,56.08L27.4,57.75L29.07,57.75ZM42.4,42.75h-1.67v1.67h1.67z" />
+ <path
+ android:fillColor="#64748b"
+ android:pathData="m33.9,17c0,0.55 0.45,1 1,1 0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1 -0.55,0 -1,0.45 -1,1z" />
+ <path
+ android:fillColor="#64748b"
+ android:fillType="evenOdd"
+ android:pathData="m26.15,17.02c0,-0.41 0.34,-0.75 0.75,-0.75h4c0.41,0 0.75,0.34 0.75,0.75 0,0.41 -0.34,0.75 -0.75,0.75h-4c-0.41,0 -0.75,-0.34 -0.75,-0.75z" />
+ <path
+ android:fillColor="#64748b"
+ android:fillType="evenOdd"
+ android:pathData="m38.15,17.02c0,-0.41 0.34,-0.75 0.75,-0.75h4c0.41,0 0.75,0.34 0.75,0.75 0,0.41 -0.34,0.75 -0.75,0.75h-4c-0.41,0 -0.75,-0.34 -0.75,-0.75z" />
+</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 0000000000000000000000000000000000000000..dc005356d07121bfc59e1e4d54cf72c9d50a806c
--- /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/il_share_app.xml b/briar-android/src/main/res/drawable-night/il_share_app.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f092e3167981291b8966883c902dee5e119b0d69
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_share_app.xml
@@ -0,0 +1,103 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="192dp"
+ android:viewportWidth="193"
+ android:viewportHeight="193">
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M112.4,21.88C112.4,17.46 108.82,13.88 104.4,13.88H88.4C83.98,13.88 80.4,17.46 80.4,21.88V37.88C80.4,42.3 83.98,45.88 88.4,45.88H104.4C108.82,45.88 112.4,42.3 112.4,37.88V21.88Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M88.4,15.38H104.4C107.99,15.38 110.9,18.29 110.9,21.88V37.88C110.9,41.47 107.99,44.38 104.4,44.38H88.4C84.81,44.38 81.9,41.47 81.9,37.88V21.88C81.9,18.29 84.81,15.38 88.4,15.38ZM104.4,13.88C108.82,13.88 112.4,17.46 112.4,21.88V37.88C112.4,42.3 108.82,45.88 104.4,45.88H88.4C83.98,45.88 80.4,42.3 80.4,37.88V21.88C80.4,17.46 83.98,13.88 88.4,13.88H104.4Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M60.4,127.88C60.4,123.46 56.82,119.88 52.4,119.88H36.4C31.98,119.88 28.4,123.46 28.4,127.88V143.88C28.4,148.3 31.98,151.88 36.4,151.88H52.4C56.82,151.88 60.4,148.3 60.4,143.88V127.88Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M36.4,121.38H52.4C55.99,121.38 58.9,124.29 58.9,127.88V143.88C58.9,147.47 55.99,150.38 52.4,150.38H36.4C32.81,150.38 29.9,147.47 29.9,143.88V127.88C29.9,124.29 32.81,121.38 36.4,121.38ZM52.4,119.88C56.82,119.88 60.4,123.46 60.4,127.88V143.88C60.4,148.3 56.82,151.88 52.4,151.88H36.4C31.98,151.88 28.4,148.3 28.4,143.88V127.88C28.4,123.46 31.98,119.88 36.4,119.88H52.4Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M43.65,116.88L43.65,100.88L45.15,100.88L45.15,116.88L43.65,116.88Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M95.65,66.88L95.65,48.88L97.15,48.88L97.15,66.88L95.65,66.88Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M95.65,155.88L95.65,126.88L97.15,126.88L97.15,155.88L95.65,155.88Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M150.15,67.88V92.88H148.65V67.88H150.15Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M149.17,97.33H126.4V95.83H149.17C153.58,95.83 157.15,99.41 157.15,103.81L157.15,122.58L155.65,122.58L155.65,103.81C155.65,100.24 152.75,97.33 149.17,97.33Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M43.63,96.13L66.4,96.13L66.4,97.63L43.63,97.63C39.22,97.63 35.65,94.06 35.65,89.65L35.65,70.88L37.15,70.88L37.15,89.65C37.15,93.23 40.05,96.13 43.63,96.13Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M157.4,52.88C157.4,50.67 155.61,48.88 153.4,48.88H145.4C143.19,48.88 141.4,50.67 141.4,52.88V60.88C141.4,63.09 143.19,64.88 145.4,64.88H153.4C155.61,64.88 157.4,63.09 157.4,60.88V52.88Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M145.4,50.38H153.4C154.78,50.38 155.9,51.5 155.9,52.88V60.88C155.9,62.26 154.78,63.38 153.4,63.38H145.4C144.02,63.38 142.9,62.26 142.9,60.88V52.88C142.9,51.5 144.02,50.38 145.4,50.38ZM153.4,48.88C155.61,48.88 157.4,50.67 157.4,52.88V60.88C157.4,63.09 155.61,64.88 153.4,64.88H145.4C143.19,64.88 141.4,63.09 141.4,60.88V52.88C141.4,50.67 143.19,48.88 145.4,48.88H153.4Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M104.4,162.88C104.4,160.67 102.61,158.88 100.4,158.88H92.4C90.19,158.88 88.4,160.67 88.4,162.88V170.88C88.4,173.09 90.19,174.88 92.4,174.88H100.4C102.61,174.88 104.4,173.09 104.4,170.88V162.88Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M92.4,160.38H100.4C101.78,160.38 102.9,161.5 102.9,162.88V170.88C102.9,172.26 101.78,173.38 100.4,173.38H92.4C91.02,173.38 89.9,172.26 89.9,170.88V162.88C89.9,161.5 91.02,160.38 92.4,160.38ZM100.4,158.88C102.61,158.88 104.4,160.67 104.4,162.88V170.88C104.4,173.09 102.61,174.88 100.4,174.88H92.4C90.19,174.88 88.4,173.09 88.4,170.88V162.88C88.4,160.67 90.19,158.88 92.4,158.88H100.4Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M123.52,81.88C123.52,75.26 118.15,69.88 111.52,69.88H81.52C74.9,69.88 69.52,75.26 69.52,81.88V111.88C69.52,118.51 74.9,123.88 81.52,123.88H111.52C118.15,123.88 123.52,118.51 123.52,111.88V81.88Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M81.52,71.38H111.52C117.32,71.38 122.02,76.08 122.02,81.88V111.88C122.02,117.68 117.32,122.38 111.52,122.38H81.52C75.73,122.38 71.02,117.68 71.02,111.88V81.88C71.02,76.08 75.73,71.38 81.52,71.38ZM111.52,69.88C118.15,69.88 123.52,75.26 123.52,81.88V111.88C123.52,118.51 118.15,123.88 111.52,123.88H81.52C74.9,123.88 69.52,118.51 69.52,111.88V81.88C69.52,75.26 74.9,69.88 81.52,69.88H111.52Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M89.45,94.44V106.65C89.45,107.64 90.26,108.46 91.26,108.46H92.11C93.1,108.46 93.91,107.64 93.91,106.65V94.44H89.45Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M93.9,88.56V86.26C93.9,85.27 93.1,84.46 92.11,84.46H91.26C90.27,84.46 89.45,85.27 89.45,86.26V88.56H93.9Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M103.81,98.47V86.26C103.81,85.27 103,84.46 102.01,84.46H101.17C100.18,84.46 99.36,85.27 99.36,86.26V98.47H103.81Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M99.36,104.35V106.65C99.36,107.64 100.18,108.46 101.17,108.46H102.01C103,108.46 103.82,107.64 103.82,106.65V104.35H99.36Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M88.74,99.18H86.44C85.45,99.18 84.63,99.99 84.63,100.99V101.84C84.63,102.83 85.44,103.64 86.44,103.64H88.74V99.18Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M106.82,99.18H94.62V103.64H106.82C107.81,103.64 108.63,102.83 108.63,101.84V100.99C108.63,99.99 107.81,99.18 106.82,99.18Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M98.64,89.28H86.44C85.45,89.28 84.63,90.08 84.63,91.08V91.93C84.63,92.92 85.44,93.74 86.44,93.74H98.64V89.28Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M106.82,89.28H104.53V93.74H106.82C107.81,93.74 108.63,92.93 108.63,91.93V91.08C108.63,90.08 107.81,89.28 106.82,89.28Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M172.4,132.88C172.4,128.46 168.82,124.88 164.4,124.88H148.4C143.98,124.88 140.4,128.46 140.4,132.88V148.88C140.4,153.3 143.98,156.88 148.4,156.88H164.4C168.82,156.88 172.4,153.3 172.4,148.88V132.88Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M148.4,126.38H164.4C167.99,126.38 170.9,129.29 170.9,132.88V148.88C170.9,152.47 167.99,155.38 164.4,155.38H148.4C144.81,155.38 141.9,152.47 141.9,148.88V132.88C141.9,129.29 144.81,126.38 148.4,126.38ZM164.4,124.88C168.82,124.88 172.4,128.46 172.4,132.88V148.88C172.4,153.3 168.82,156.88 164.4,156.88H148.4C143.98,156.88 140.4,153.3 140.4,148.88V132.88C140.4,128.46 143.98,124.88 148.4,124.88H164.4Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M52.4,45C52.4,40.58 48.82,37 44.4,37H28.4C23.98,37 20.4,40.58 20.4,45V61C20.4,65.42 23.98,69 28.4,69H44.4C48.82,69 52.4,65.42 52.4,61V45Z" />
+ <path
+ android:fillColor="#64748B"
+ android:fillType="evenOdd"
+ android:pathData="M28.4,38.5H44.4C47.99,38.5 50.9,41.41 50.9,45V61C50.9,64.59 47.99,67.5 44.4,67.5H28.4C24.81,67.5 21.9,64.59 21.9,61V45C21.9,41.41 24.81,38.5 28.4,38.5ZM44.4,37C48.82,37 52.4,40.58 52.4,45V61C52.4,65.42 48.82,69 44.4,69H28.4C23.98,69 20.4,65.42 20.4,61V45C20.4,40.58 23.98,37 28.4,37H44.4Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_transfer_data.xml b/briar-android/src/main/res/drawable-night/il_transfer_data.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1551b6c1b0a72509bd2d56a8437a7fa98fff7d19
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_transfer_data.xml
@@ -0,0 +1,105 @@
+<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="#123060"
+ android:pathData="M41.83,84C41.83,85.1 40.93,86 39.83,86L20.97,86C19.87,86 18.97,85.1 18.97,84L18.97,65.61L41.83,65.61L41.83,84Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M42.58,84C42.58,85.52 41.35,86.75 39.83,86.75L20.97,86.75C19.45,86.75 18.22,85.52 18.22,84L18.22,64.86L42.58,64.86L42.58,84ZM39.83,85.25C40.52,85.25 41.08,84.69 41.08,84L41.08,66.36L19.72,66.36L19.72,84C19.72,84.69 20.28,85.25 20.97,85.25L39.83,85.25Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M46.4,61.62C46.4,63.83 44.61,65.62 42.4,65.62L18.4,65.62C16.19,65.62 14.4,63.83 14.4,61.62L14.4,27C14.4,24.79 16.19,23 18.4,23L42.4,23C44.61,23 46.4,24.79 46.4,27L46.4,61.62Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M47.15,61.62C47.15,64.24 45.02,66.37 42.4,66.37L18.4,66.37C15.78,66.37 13.65,64.24 13.65,61.62L13.65,27C13.65,24.38 15.78,22.25 18.4,22.25L42.4,22.25C45.02,22.25 47.15,24.38 47.15,27L47.15,61.62ZM42.4,64.87C44.2,64.87 45.65,63.42 45.65,61.62L45.65,27C45.65,25.21 44.2,23.75 42.4,23.75L18.4,23.75C16.61,23.75 15.15,25.21 15.15,27L15.15,61.62C15.15,63.42 16.61,64.87 18.4,64.87L42.4,64.87Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M37.78,77.59L33.22,77.59L33.22,74.46L37.78,74.46L37.78,77.59Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M27.58,77.59L23.02,77.59L23.02,74.46L27.58,74.46L27.58,77.59Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:fillType="evenOdd"
+ android:pathData="M152,121C152,118.79 153.79,117 156,117H180.4C182.61,117 184.4,118.79 184.4,121V164C184.4,166.21 182.61,168 180.4,168H152V168H149.4C147.19,168 145.4,166.21 145.4,164V152.68C145.4,152.13 145.63,151.6 146.02,151.23L146.66,150.62C147.06,150.24 147.29,149.71 147.29,149.17V147.09C147.29,146.57 147.08,146.06 146.71,145.69L145.98,144.95C145.61,144.58 145.4,144.07 145.4,143.54V141.44C145.4,140.79 145.72,140.18 146.25,139.8L152,135.73V121ZM156.96,123.66C156.96,122.55 157.86,121.66 158.96,121.66H160.26C161.36,121.66 162.26,122.55 162.26,123.66V132.07C162.26,133.18 161.36,134.07 160.26,134.07H158.96C157.86,134.07 156.96,133.18 156.96,132.07V123.66ZM167.55,121.66C166.45,121.66 165.55,122.55 165.55,123.66V132.07C165.55,133.18 166.45,134.07 167.55,134.07H168.85C169.95,134.07 170.85,133.18 170.85,132.07V123.66C170.85,122.55 169.95,121.66 168.85,121.66H167.55ZM174.15,123.66C174.15,122.55 175.04,121.66 176.15,121.66H177.44C178.54,121.66 179.44,122.55 179.44,123.66V132.07C179.44,133.18 178.54,134.07 177.44,134.07H176.15C175.04,134.07 174.15,133.18 174.15,132.07V123.66Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M151.25,121C151.25,118.38 153.38,116.25 156,116.25H180.4C183.02,116.25 185.15,118.38 185.15,121V164C185.15,166.62 183.02,168.75 180.4,168.75H151.25V168.75H149.4C146.78,168.75 144.65,166.62 144.65,164V152.68C144.65,151.92 144.96,151.2 145.51,150.68L146.15,150.07C146.4,149.84 146.54,149.51 146.54,149.17V147.09C146.54,146.76 146.41,146.45 146.17,146.21L145.45,145.48C144.94,144.96 144.65,144.27 144.65,143.54V141.44C144.65,140.54 145.08,139.71 145.81,139.19L151.25,135.34V121ZM152.75,167.25H180.4C182.2,167.25 183.65,165.79 183.65,164V121C183.65,119.21 182.2,117.75 180.4,117.75H156C154.21,117.75 152.75,119.21 152.75,121V136.12L146.68,140.42C146.35,140.65 146.15,141.03 146.15,141.44V143.54C146.15,143.87 146.28,144.19 146.51,144.42L147.24,145.16C147.75,145.67 148.04,146.37 148.04,147.09V149.17C148.04,149.92 147.73,150.64 147.18,151.16L146.54,151.77C146.29,152.01 146.15,152.33 146.15,152.68V164C146.15,165.79 147.61,167.25 149.4,167.25H152.75V167.25ZM156.21,123.66C156.21,122.14 157.45,120.91 158.96,120.91H160.26C161.78,120.91 163.01,122.14 163.01,123.66V132.07C163.01,133.59 161.78,134.82 160.26,134.82H158.96C157.45,134.82 156.21,133.59 156.21,132.07V123.66ZM158.96,122.41C158.27,122.41 157.71,122.97 157.71,123.66V132.07C157.71,132.76 158.27,133.32 158.96,133.32H160.26C160.95,133.32 161.51,132.76 161.51,132.07V123.66C161.51,122.97 160.95,122.41 160.26,122.41H158.96ZM167.55,122.41C166.86,122.41 166.3,122.97 166.3,123.66V132.07C166.3,132.76 166.86,133.32 167.55,133.32H168.85C169.54,133.32 170.1,132.76 170.1,132.07V123.66C170.1,122.97 169.54,122.41 168.85,122.41H167.55ZM164.8,123.66C164.8,122.14 166.04,120.91 167.55,120.91H168.85C170.37,120.91 171.6,122.14 171.6,123.66V132.07C171.6,133.59 170.37,134.82 168.85,134.82H167.55C166.04,134.82 164.8,133.59 164.8,132.07V123.66ZM173.4,123.66C173.4,122.14 174.63,120.91 176.15,120.91H177.44C178.96,120.91 180.19,122.14 180.19,123.66V132.07C180.19,133.59 178.96,134.82 177.44,134.82H176.15C174.63,134.82 173.4,133.59 173.4,132.07V123.66ZM176.15,122.41C175.46,122.41 174.9,122.97 174.9,123.66V132.07C174.9,132.76 175.46,133.32 176.15,133.32H177.44C178.13,133.32 178.69,132.76 178.69,132.07V123.66C178.69,122.97 178.13,122.41 177.44,122.41H176.15Z" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M30.4,111C32.61,111 34.4,112.79 34.4,115C34.4,117.21 32.61,119 30.4,119C28.19,119 26.4,117.21 26.4,115C26.4,112.79 28.19,111 30.4,111Z" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M30.4,95C32.61,95 34.4,96.79 34.4,99C34.4,101.21 32.61,103 30.4,103C28.19,103 26.4,101.21 26.4,99C26.4,96.79 28.19,95 30.4,95Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M30.4,127C32.61,127 34.4,128.79 34.4,131C34.4,133.21 32.61,135 30.4,135C28.19,135 26.4,133.21 26.4,131C26.4,128.79 28.19,127 30.4,127Z" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M168.4,92C166.19,92 164.4,90.21 164.4,88C164.4,85.79 166.19,84 168.4,84C170.61,84 172.4,85.79 172.4,88C172.4,90.21 170.61,92 168.4,92Z" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M168.4,108C166.19,108 164.4,106.21 164.4,104C164.4,101.79 166.19,100 168.4,100C170.61,100 172.4,101.79 172.4,104C172.4,106.21 170.61,108 168.4,108Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M168.4,76C166.19,76 164.4,74.21 164.4,72C164.4,69.79 166.19,68 168.4,68C170.61,68 172.4,69.79 172.4,72C172.4,74.21 170.61,76 168.4,76Z" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M57.4,35.03C57.4,28.4 62.77,23.03 69.4,23.03H123.4C130.03,23.03 135.4,28.4 135.4,35.03V156.03C135.4,162.66 130.03,168.03 123.4,168.03H69.4C62.77,168.03 57.4,162.66 57.4,156.03V35.03Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M123.4,24.53H69.4C63.6,24.53 58.9,29.23 58.9,35.03V156.03C58.9,161.83 63.6,166.53 69.4,166.53H123.4C129.2,166.53 133.9,161.83 133.9,156.03V35.03C133.9,29.23 129.2,24.53 123.4,24.53ZM69.4,23.03C62.77,23.03 57.4,28.4 57.4,35.03V156.03C57.4,162.66 62.77,168.03 69.4,168.03H123.4C130.03,168.03 135.4,162.66 135.4,156.03V35.03C135.4,28.4 130.03,23.03 123.4,23.03H69.4Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M96.4,35.41C95.57,35.41 94.9,34.74 94.9,33.91C94.9,33.08 95.57,32.41 96.4,32.41C97.23,32.41 97.9,33.08 97.9,33.91C97.9,34.74 97.23,35.41 96.4,35.41ZM96.4,36.91C94.74,36.91 93.4,35.57 93.4,33.91C93.4,32.25 94.74,30.91 96.4,30.91C98.06,30.91 99.4,32.25 99.4,33.91C99.4,35.57 98.06,36.91 96.4,36.91Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M77.65,33.59C77.65,33.18 77.99,32.84 78.4,32.84H88.4C88.82,32.84 89.15,33.18 89.15,33.59C89.15,34.01 88.82,34.34 88.4,34.34H78.4C77.99,34.34 77.65,34.01 77.65,33.59Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M103.65,33.59C103.65,33.18 103.99,32.84 104.4,32.84L114.4,32.84C114.82,32.84 115.15,33.18 115.15,33.59C115.15,34.01 114.82,34.34 114.4,34.34L104.4,34.34C103.99,34.34 103.65,34.01 103.65,33.59Z" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M128.4,50.63C128.4,46.22 124.82,42.63 120.4,42.63H72.4C67.98,42.63 64.4,46.22 64.4,50.63V146.63C64.4,151.05 67.98,154.63 72.4,154.63H120.4C124.82,154.63 128.4,151.05 128.4,146.63V50.63Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:fillType="evenOdd"
+ android:pathData="M72.4,44.13H120.4C123.99,44.13 126.9,47.04 126.9,50.63V146.63C126.9,150.22 123.99,153.13 120.4,153.13H72.4C68.81,153.13 65.9,150.22 65.9,146.63V50.63C65.9,47.04 68.81,44.13 72.4,44.13ZM120.4,42.63C124.82,42.63 128.4,46.22 128.4,50.63V146.63C128.4,151.05 124.82,154.63 120.4,154.63H72.4C67.98,154.63 64.4,151.05 64.4,146.63V50.63C64.4,46.22 67.98,42.63 72.4,42.63H120.4Z" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M71.4,104C71.4,95.16 78.56,88 87.4,88H105.4C114.24,88 121.4,95.16 121.4,104V148H87.4C78.56,148 71.4,140.84 71.4,132V104Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M105.4,89.5H87.4C79.39,89.5 72.9,95.99 72.9,104V132C72.9,140.01 79.39,146.5 87.4,146.5H119.9V104C119.9,95.99 113.41,89.5 105.4,89.5ZM87.4,88C78.56,88 71.4,95.16 71.4,104V132C71.4,140.84 78.56,148 87.4,148H121.4V104C121.4,95.16 114.24,88 105.4,88H87.4Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,109.91C83.96,109.5 84.29,109.16 84.71,109.16H108.03C108.44,109.16 108.78,109.5 108.78,109.91C108.78,110.32 108.44,110.66 108.03,110.66H84.71C84.29,110.66 83.96,110.32 83.96,109.91Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,118C83.96,117.59 84.29,117.25 84.71,117.25H108.03C108.44,117.25 108.78,117.59 108.78,118C108.78,118.42 108.44,118.75 108.03,118.75H84.71C84.29,118.75 83.96,118.42 83.96,118Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,134.18C83.96,133.76 84.29,133.43 84.71,133.43H96.37C96.78,133.43 97.12,133.76 97.12,134.18C97.12,134.59 96.78,134.93 96.37,134.93H84.71C84.29,134.93 83.96,134.59 83.96,134.18Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,101.82C83.96,101.41 84.29,101.07 84.71,101.07H108.03C108.44,101.07 108.78,101.41 108.78,101.82C108.78,102.24 108.44,102.57 108.03,102.57H84.71C84.29,102.57 83.96,102.24 83.96,101.82Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,126.09C83.96,125.68 84.29,125.34 84.71,125.34H108.1C108.51,125.34 108.85,125.68 108.85,126.09C108.85,126.51 108.51,126.84 108.1,126.84H84.71C84.29,126.84 83.96,126.51 83.96,126.09Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_transfer_data_receive.xml b/briar-android/src/main/res/drawable-night/il_transfer_data_receive.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ecaab1575c434f4256b30c1a64deac84820bbbfc
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_transfer_data_receive.xml
@@ -0,0 +1,109 @@
+<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="#1E293B"
+ android:pathData="M265.47,33.75L239.47,33.75A7.25,7.25 0,0 0,232.22 41L232.22,103A7.25,7.25 0,0 0,239.47 110.25L265.47,110.25A7.25,7.25 0,0 0,272.72 103L272.72,41A7.25,7.25 0,0 0,265.47 33.75z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M272.72,48H232.22V100.5H272.72V48Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M240.07,65.1L264.86,65.1A4,4 0,0 1,268.86 69.1L268.86,79.39A4,4 0,0 1,264.86 83.39L240.07,83.39A4,4 0,0 1,236.07 79.39L236.07,69.1A4,4 0,0 1,240.07 65.1z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M242.58,71.55H262.46"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M242.58,77.65H253.26"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M253.47,41a1,1 90,1 1,-2 0a1,1 90,1 1,2 0z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M244.47,40.27C244.05,40.27 243.72,40.61 243.72,41.02C243.72,41.44 244.05,41.77 244.47,41.77V40.27ZM248.47,41.77C248.88,41.77 249.22,41.44 249.22,41.02C249.22,40.61 248.88,40.27 248.47,40.27V41.77ZM244.47,41.77H248.47V40.27H244.47V41.77Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M256.47,40.27C256.05,40.27 255.72,40.61 255.72,41.02C255.72,41.44 256.05,41.77 256.47,41.77V40.27ZM260.47,41.77C260.88,41.77 261.22,41.44 261.22,41.02C261.22,40.61 260.88,40.27 260.47,40.27V41.77ZM256.47,41.77H260.47V40.27H256.47V41.77Z" />
+ <path
+ android:fillColor="#4D7C0F"
+ android:pathData="M89.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M105.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M73.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#4D7C0F"
+ android:pathData="M198.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M214.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#365314"
+ android:pathData="M182.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#123060"
+ android:pathData="M29.04,43C29.04,41.9 29.93,41 31.04,41H49.9C51,41 51.9,41.9 51.9,43V61.39H29.04L29.04,43Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M24.47,65.38C24.47,63.17 26.26,61.38 28.47,61.38H52.47C54.68,61.38 56.47,63.17 56.47,65.38L56.47,100C56.47,102.21 54.68,104 52.47,104H28.47C26.26,104 24.47,102.21 24.47,100L24.47,65.38Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M33.09,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M43.29,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#365314"
+ android:fillType="evenOdd"
+ android:pathData="M151.87,42L143.97,42H126.47C124.26,42 122.47,43.79 122.47,46L122.47,98C122.47,100.21 124.26,102 126.47,102L161.47,102C163.68,102 165.47,100.21 165.47,98L165.47,55.97L151.87,42Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M143.97,42L143.97,41.25H143.97V42ZM151.87,42L152.4,41.48L152.18,41.25L151.87,41.25L151.87,42ZM122.47,46H123.22H122.47ZM122.47,98H121.72H122.47ZM126.47,102V101.25V102ZM161.47,102V102.75V102ZM165.47,98H164.72H165.47ZM165.47,55.97H166.22V55.66L166,55.45L165.47,55.97ZM143.97,42.75L151.87,42.75L151.87,41.25L143.97,41.25L143.97,42.75ZM126.47,42.75H143.97V41.25H126.47V42.75ZM123.22,46C123.22,44.21 124.67,42.75 126.47,42.75V41.25C123.84,41.25 121.72,43.38 121.72,46H123.22ZM123.22,98L123.22,46H121.72L121.72,98H123.22ZM126.47,101.25C124.67,101.25 123.22,99.79 123.22,98H121.72C121.72,100.62 123.84,102.75 126.47,102.75V101.25ZM161.47,101.25L126.47,101.25V102.75L161.47,102.75V101.25ZM164.72,98C164.72,99.79 163.26,101.25 161.47,101.25V102.75C164.09,102.75 166.22,100.62 166.22,98H164.72ZM164.72,55.97L164.72,98H166.22L166.22,55.97H164.72ZM166,55.45L152.4,41.48L151.33,42.52L164.93,56.49L166,55.45Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M165.2,55.68L156.16,55.68C153.95,55.68 152.16,53.89 152.16,51.68L152.16,42.29L165.2,55.68Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635"
+ android:strokeLineJoin="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.07,63.49H153.91"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.07,69.04H144.73"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M135.64,80.73V87.41C135.64,89.49 137.32,91.18 139.4,91.18C141.48,91.18 143.16,89.49 143.16,87.41V80.73C143.16,78.65 141.48,76.97 139.4,76.97C137.32,76.97 135.64,78.65 135.64,80.73Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M134.32,84.52L144.49,84.52A1.25,1.25 0,0 1,145.74 85.77L145.74,92.72A1.25,1.25 0,0 1,144.49 93.97L134.32,93.97A1.25,1.25 0,0 1,133.07 92.72L133.07,85.77A1.25,1.25 0,0 1,134.32 84.52z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+</vector>
diff --git a/briar-android/src/main/res/drawable-night/il_transfer_data_send.xml b/briar-android/src/main/res/drawable-night/il_transfer_data_send.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cd05a4d9c11dae78b3846dce0c5eab06f4f61342
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_transfer_data_send.xml
@@ -0,0 +1,109 @@
+<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="#1E293B"
+ android:pathData="M48.93,33.75L22.93,33.75A7.25,7.25 0,0 0,15.68 41L15.68,103A7.25,7.25 0,0 0,22.93 110.25L48.93,110.25A7.25,7.25 0,0 0,56.18 103L56.18,41A7.25,7.25 0,0 0,48.93 33.75z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M56.18,48H15.68V100.5H56.18V48Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M23.54,65.1L48.33,65.1A4,4 0,0 1,52.33 69.1L52.33,79.39A4,4 0,0 1,48.33 83.39L23.54,83.39A4,4 0,0 1,19.54 79.39L19.54,69.1A4,4 0,0 1,23.54 65.1z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M26.05,71.55H45.92"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M26.05,77.65H36.73"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M36.93,41a1,1 90,1 1,-2 0a1,1 90,1 1,2 0z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M27.93,40.27C27.52,40.27 27.18,40.61 27.18,41.02C27.18,41.44 27.52,41.77 27.93,41.77V40.27ZM31.93,41.77C32.35,41.77 32.68,41.44 32.68,41.02C32.68,40.61 32.35,40.27 31.93,40.27V41.77ZM27.93,41.77H31.93V40.27H27.93V41.77Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M39.93,40.27C39.52,40.27 39.18,40.61 39.18,41.02C39.18,41.44 39.52,41.77 39.93,41.77V40.27ZM43.93,41.77C44.35,41.77 44.68,41.44 44.68,41.02C44.68,40.61 44.35,40.27 43.93,40.27V41.77ZM39.93,41.77H43.93V40.27H39.93V41.77Z" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M89.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M105.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M73.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M198.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M214.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M182.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#123060"
+ android:pathData="M236.51,43C236.51,41.9 237.4,41 238.51,41H257.36C258.47,41 259.36,41.9 259.36,43V61.39H236.51V43Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M231.93,65.38C231.93,63.17 233.73,61.38 235.93,61.38H259.93C262.14,61.38 263.93,63.17 263.93,65.38V100C263.93,102.21 262.14,104 259.93,104H235.93C233.73,104 231.93,102.21 231.93,100V65.38Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M240.56,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M250.76,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#184080"
+ android:fillType="evenOdd"
+ android:pathData="M152.33,42L144.43,42H126.93C124.72,42 122.93,43.79 122.93,46L122.93,98C122.93,100.21 124.72,102 126.93,102L161.93,102C164.14,102 165.93,100.21 165.93,98L165.93,55.97L152.33,42Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M144.43,42L144.43,41.25H144.43V42ZM152.33,42L152.87,41.48L152.65,41.25L152.33,41.25L152.33,42ZM122.93,46H123.68H122.93ZM122.93,98H122.18H122.93ZM126.93,102V101.25V102ZM161.93,102V102.75V102ZM165.93,98H165.18H165.93ZM165.93,55.97H166.68V55.66L166.47,55.45L165.93,55.97ZM144.43,42.75L152.33,42.75L152.33,41.25L144.43,41.25L144.43,42.75ZM126.93,42.75H144.43V41.25H126.93V42.75ZM123.68,46C123.68,44.21 125.14,42.75 126.93,42.75V41.25C124.31,41.25 122.18,43.38 122.18,46H123.68ZM123.68,98L123.68,46H122.18L122.18,98H123.68ZM126.93,101.25C125.14,101.25 123.68,99.79 123.68,98H122.18C122.18,100.62 124.31,102.75 126.93,102.75V101.25ZM161.93,101.25L126.93,101.25V102.75L161.93,102.75V101.25ZM165.18,98C165.18,99.79 163.73,101.25 161.93,101.25V102.75C164.56,102.75 166.68,100.62 166.68,98H165.18ZM165.18,55.97L165.18,98H166.68L166.68,55.97H165.18ZM166.47,55.45L152.87,41.48L151.79,42.52L165.4,56.49L166.47,55.45Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M165.66,55.68L156.63,55.68C154.42,55.68 152.63,53.89 152.63,51.68L152.63,42.29L165.66,55.68Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineJoin="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.54,63.49H154.38"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.54,69.04H145.2"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M143.63,80.73C143.63,78.65 141.95,76.97 139.87,76.97C137.79,76.97 136.1,78.65 136.1,80.73V87.41C136.1,89.49 137.79,91.18 139.87,91.18C141.95,91.18 143.63,89.49 143.63,87.41V80.73Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M134.78,84.52L144.95,84.52A1.25,1.25 0,0 1,146.2 85.77L146.2,92.72A1.25,1.25 0,0 1,144.95 93.97L134.78,93.97A1.25,1.25 0,0 1,133.53 92.72L133.53,85.77A1.25,1.25 0,0 1,134.78 84.52z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9" />
+</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 5a4866585eb8a24316c0f819bf096d841a6cd87f..0000000000000000000000000000000000000000
--- 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 f545133765c9a0f461e0bd666b372abf1a441006..0000000000000000000000000000000000000000
--- 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/ic_bluetooth.xml b/briar-android/src/main/res/drawable/ic_bluetooth.xml
deleted file mode 100644
index cd6f7cb41603521ffd7add8fdbeb879503c6b317..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_bluetooth.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="100dp"
- android:height="35dp"
- android:viewportWidth="500"
- android:viewportHeight="175">
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="m459.809,167.16 l-4.327,-4.334 -7.07,-2.427c-3.888,-1.335 -8.723,-2.996 -10.744,-3.691l-3.674,-1.263 3.524,-0.173c8.242,-0.404 12.988,-4.007 14.336,-10.884 0.796,-4.061 1.129,-17.298 0.83,-33.041 -0.153,-8.084 -0.166,-15.416 -0.028,-16.295 0.138,-0.878 0.535,-2.42 0.883,-3.426 1.222,-3.532 0.34,-11.908 -1.858,-17.631 -0.348,-0.908 -1.934,-4.215 -3.524,-7.35 -4.158,-8.2 -4.505,-8.942 -4.893,-10.484 -0.459,-1.821 -0.212,-5.435 0.463,-6.766 0.666,-1.315 2.157,-2.916 3.246,-3.487 1.299,-0.68 2.616,0.122 4.686,2.855 3.422,4.516 14.001,19.441 15.732,22.193 3.746,5.956 5.956,11.165 7.972,18.788 0.655,2.475 1.885,6.997 2.735,10.05 0.849,3.053 2.714,10.158 4.144,15.79l2.6,10.24 4.65,5.193c2.557,2.856 5.798,6.464 7.2,8.017 1.403,1.553 2.55,2.975 2.55,3.161 0,0.335 -34.5,29.299 -34.899,29.299 -0.115,0 -2.156,-1.95 -4.535,-4.334zM365.944,150.772c-1.258,-0.628 -2.206,-1.379 -2.914,-2.307 -2.089,-2.736 -1.95,2.369 -1.864,-68.482l0.078,-64.039 0.661,-1.235c1.015,-1.898 1.992,-2.911 3.74,-3.879l1.6,-0.886 37.784,-0.08c42.456,-0.089 39.402,-0.248 42.116,2.192 0.875,0.787 1.757,1.959 2.184,2.904 0.713,1.577 0.716,1.638 0.806,14.204l0.09,12.62 -1.798,-0.13c-1.426,-0.103 -2.081,0.007 -3.166,0.532 -2.013,0.974 -3.94,2.899 -5.115,5.108l-1.037,1.95 -0.007,-12.825 -0.007,-12.825h-33.6,-33.6v51.3,51.3h33.599,33.599l0.076,-34.425c0.073,-32.96 0.098,-34.361 0.591,-32.925 0.283,0.825 1.806,3.997 3.383,7.05 5.493,10.626 5.405,9.86 5.396,47.203 -0.007,27.621 -0.124,29.951 -1.662,33.109 -1.071,2.199 -2.711,3.71 -5.058,4.66l-1.674,0.677 -36.168,0.08 -36.168,0.08 -1.864,-0.931zM408.344,145.734c2.871,-1.309 4.458,-3.678 4.43,-6.617 -0.039,-4.116 -3.109,-7.223 -7.136,-7.223 -2.12,0 -3.567,0.609 -5.164,2.172 -2.245,2.198 -2.754,5.439 -1.301,8.287 0.713,1.398 2.521,3.009 3.962,3.53 1.497,0.542 3.84,0.475 5.209,-0.149z" />
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="m39.434,167.16 l4.327,-4.334 7.07,-2.427c3.888,-1.335 8.723,-2.996 10.744,-3.691l3.674,-1.263 -3.524,-0.173c-8.242,-0.404 -12.988,-4.007 -14.336,-10.884 -0.796,-4.061 -1.129,-17.298 -0.83,-33.041 0.153,-8.084 0.166,-15.416 0.028,-16.295 -0.138,-0.878 -0.535,-2.42 -0.883,-3.426 -1.222,-3.532 -0.34,-11.908 1.858,-17.631 0.348,-0.908 1.934,-4.215 3.524,-7.35 4.158,-8.2 4.505,-8.942 4.893,-10.484 0.459,-1.821 0.212,-5.435 -0.463,-6.766 -0.666,-1.315 -2.157,-2.916 -3.246,-3.487 -1.299,-0.68 -2.616,0.122 -4.686,2.855 -3.422,4.516 -14.001,19.441 -15.732,22.193 -3.746,5.956 -5.956,11.165 -7.972,18.788 -0.655,2.475 -1.885,6.997 -2.735,10.05 -0.849,3.053 -2.714,10.158 -4.144,15.79L14.4,125.824 9.75,131.017c-2.557,2.856 -5.798,6.464 -7.2,8.017 -1.403,1.553 -2.55,2.975 -2.55,3.161 0,0.335 34.5,29.299 34.899,29.299 0.115,0 2.156,-1.95 4.535,-4.334zM133.299,150.772c1.258,-0.628 2.206,-1.379 2.914,-2.307 2.089,-2.736 1.95,2.369 1.864,-68.482l-0.078,-64.039 -0.661,-1.235c-1.015,-1.898 -1.992,-2.911 -3.74,-3.879L132,9.944 94.216,9.865c-42.456,-0.089 -39.402,-0.248 -42.116,2.192 -0.875,0.787 -1.757,1.959 -2.184,2.904 -0.713,1.577 -0.716,1.638 -0.806,14.204l-0.09,12.62 1.798,-0.13c1.426,-0.103 2.081,0.007 3.166,0.532 2.013,0.974 3.94,2.899 5.115,5.108l1.037,1.95 0.007,-12.825 0.007,-12.825h33.6,33.6v51.3,51.3L93.752,126.194 60.153,126.194l-0.076,-34.425c-0.073,-32.96 -0.098,-34.361 -0.591,-32.925 -0.283,0.825 -1.806,3.997 -3.383,7.05 -5.493,10.626 -5.405,9.86 -5.396,47.203 0.007,27.621 0.124,29.951 1.662,33.109 1.071,2.199 2.711,3.71 5.058,4.66l1.674,0.677 36.168,0.08 36.168,0.08 1.864,-0.931zM90.9,145.734c-2.871,-1.309 -4.458,-3.678 -4.43,-6.617 0.039,-4.116 3.109,-7.223 7.136,-7.223 2.12,0 3.567,0.609 5.164,2.172 2.245,2.198 2.754,5.439 1.301,8.287 -0.713,1.398 -2.521,3.009 -3.962,3.53 -1.497,0.542 -3.84,0.475 -5.209,-0.149z" />
- <path
- android:fillColor="#0a3d91"
- android:pathData="m247.254,71.979h4.736c13.165,0 23.763,10.599 23.763,23.763v32.175c0,13.165 -10.599,23.763 -23.763,23.763h-4.736c-13.165,0 -23.763,-10.599 -23.763,-23.763V95.743c0,-13.165 10.599,-23.763 23.763,-23.763z" />
- <path
- android:fillColor="#0a3d91"
- android:pathData="m143.679,23.557c-1.59,2.624 0.182,5.575 2.785,6.643 2.695,1.572 6.171,4.987 9.148,2.232 2.233,-2.04 0.601,-5.728 -2.041,-6.67 -3.064,-1.677 -6.552,-5.515 -9.891,-2.205zM351.705,23.129c-2.768,1.961 -7.068,2.695 -8.378,6.043 -0.642,2.731 1.936,4.993 4.584,4.426 3.202,-1.638 7.057,-2.842 9.178,-5.948 0.569,-2.604 -1.493,-5.351 -4.268,-4.746 -0.416,-0.108 -0.76,0.035 -1.117,0.224zM324.943,36.301c-2.934,1.708 -7.32,1.923 -8.931,5.153 -0.908,2.654 1.432,5.159 4.124,4.861 3.356,-1.304 7.32,-2.113 9.737,-5.002 0.814,-2.538 -0.977,-5.47 -3.796,-5.129 -0.403,-0.146 -0.76,-0.038 -1.133,0.117zM169.707,38.764c-1.219,2.712 0.757,5.461 3.444,6.145 2.858,1.081 6.669,4.118 9.312,1.234 2.315,-2.037 0.339,-5.835 -2.41,-6.418 -3.328,-1.176 -7.385,-4.714 -10.346,-0.961zM296.98,46.381c-3.123,1.309 -7.492,0.971 -9.492,3.97 -1.232,2.519 0.773,5.298 3.48,5.34 3.487,-0.907 7.567,-1.113 10.303,-3.739 1.114,-2.422 -0.312,-5.546 -3.152,-5.551 -0.383,-0.196 -0.75,-0.127 -1.139,-0.02zM199.49,47.926c-2.229,1.462 -2.68,4.866 -0.276,6.377 2.587,1.471 5.915,1.955 8.84,2.495 2.785,0.332 4.746,-2.479 3.891,-5.049 -2.043,-3.28 -6.472,-2.734 -9.717,-4.089 -0.913,0.089 -1.826,0.177 -2.738,0.266zM268.003,52.434c-3.276,0.789 -7.461,-0.188 -9.936,2.382 -1.65,2.268 -0.157,5.354 2.504,5.862 3.612,-0.292 7.718,0.091 10.84,-2.094 1.462,-2.228 0.523,-5.532 -2.285,-5.959 -0.349,-0.249 -0.722,-0.239 -1.123,-0.19zM228.554,53.852c-1.933,1.836 -1.765,5.267 0.871,6.321 2.809,0.989 6.171,0.847 9.144,0.861 2.799,-0.173 4.226,-3.29 2.924,-5.665 -2.604,-2.852 -6.847,-1.542 -10.293,-2.27 -0.882,0.251 -1.764,0.501 -2.646,0.752z" />
- <path
- android:fillColor="#ffffff"
- android:pathData="m252.501,112.09 l11.656,-11.452 -17.126,-19.791 0.019,25.792 -9.142,-9.245 -3.125,3.091 11.521,11.581 -11.498,11.308c3.031,3.056 0,0 3.031,3.056l9.189,-8.973c0.044,4.735 0.004,27.165 0.004,27.165l17.102,-20.773zM251.424,92.519 L258.222,100.383 251.424,107.016zM251.4,132.547 L251.424,117.151 258.317,124.139z" />
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_check_circle.xml b/briar-android/src/main/res/drawable/ic_check_circle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9acf3c6707327596ac827158e553d935cc09ac65
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_check_circle.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="90dp"
+ android:height="90dp"
+ android:viewportWidth="91"
+ android:viewportHeight="90">
+ <path
+ android:fillColor="@color/il_lime"
+ android:pathData="M62.571,35.163C63.214,34.517 63.211,33.473 62.565,32.83C61.919,32.187 60.874,32.19 60.231,32.836L39.524,53.66L30.571,44.658C29.929,44.012 28.884,44.009 28.238,44.651C27.592,45.294 27.589,46.339 28.232,46.985L39.524,58.34L62.571,35.163Z" />
+ <path
+ android:fillColor="@color/il_lime"
+ android:fillType="evenOdd"
+ android:pathData="M89.401,45C89.401,69.3 69.702,89 45.401,89C21.101,89 1.401,69.3 1.401,45C1.401,20.699 21.101,1 45.401,1C69.702,1 89.401,20.699 89.401,45ZM86.101,45C86.101,67.478 67.879,85.7 45.401,85.7C22.923,85.7 4.701,67.478 4.701,45C4.701,22.522 22.923,4.3 45.401,4.3C67.879,4.3 86.101,22.522 86.101,45Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/ic_crash.xml b/briar-android/src/main/res/drawable/ic_crash.xml
deleted file mode 100644
index 9f6a33ecb79f9c612db1d48aaec034ca6b28b075..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_crash.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="128dp"
- android:height="128dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M11.99,2C6.47,2 2,6.47 2,12s4.47,10 9.99,10S22,17.53 22,12 17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM16.18,7.76l-1.06,1.06 -1.06,-1.06L13,8.82l1.06,1.06L13,10.94 14.06,12l1.06,-1.06L16.18,12l1.06,-1.06 -1.06,-1.06 1.06,-1.06zM7.82,12l1.06,-1.06L9.94,12 11,10.94 9.94,9.88 11,8.82 9.94,7.76 8.88,8.82 7.82,7.76 6.76,8.82l1.06,1.06 -1.06,1.06zM12,14c-2.33,0 -4.31,1.46 -5.11,3.5h10.22c-0.8,-2.04 -2.78,-3.5 -5.11,-3.5z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_empty_state_blog.xml b/briar-android/src/main/res/drawable/ic_empty_state_blog.xml
deleted file mode 100644
index a93f3eb1a5c1f43cee26ee01b172bb43c5f4cdfc..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_empty_state_blog.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="100dp"
- android:height="96dp"
- android:viewportHeight="156"
- android:viewportWidth="162">
- <path
- android:fillColor="#ffffff"
- android:pathData="M140.87,53.647H91.565V64.235H140.87V53.647Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M140.869,99.529V88.941H115.512L126.077,99.529H140.869Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M140.869,71.294H97.904L108.469,81.882H140.869V71.294Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M147.912,14.823H41.556L84.521,57.882V28.941H147.912V120.706H147.208L157.773,131.294C160.59,128.47 161.999,124.941 161.999,120.706V28.941C161.999,21.176 155.66,14.823 147.912,14.823Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M129.6,120.706L84.522,75.529L23.948,14.823L9.157,0L0,9.176L10.565,19.765C8.452,21.882 7.043,25.412 7.043,28.941V120.706C7.043,128.471 13.383,134.824 21.13,134.824H125.374L146.504,156L155.661,146.824L143.687,134.824L129.6,120.706ZM84.522,120.706V93.882L111.287,120.706H84.522Z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_empty_state_contact_list.xml b/briar-android/src/main/res/drawable/ic_empty_state_contact_list.xml
deleted file mode 100644
index 560b137c50b901c4f25e992cfc5b4a6fcca41e82..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_empty_state_contact_list.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="100dp"
- android:height="100dp"
- android:viewportHeight="164"
- android:viewportWidth="164">
- <path
- android:fillColor="#ffffff"
- android:pathData="M27.334,0L27.334,13.666L136.668,13.666L136.668,0L27.334,0zM27.334,27.334C19.817,27.334 13.666,33.483 13.666,41L13.666,123C13.666,130.517 19.817,136.668 27.334,136.668L136.668,136.668C144.184,136.668 150.332,130.517 150.332,123L150.332,41C150.332,33.483 144.184,27.334 136.668,27.334L27.334,27.334zM82.15,44.758C89.592,44.758 95.348,46.477 99.42,49.914C103.525,53.351 105.576,58.239 105.576,64.58C105.576,67.35 105.027,69.869 103.926,72.139C102.825,74.408 101.055,76.728 98.619,79.098L92.863,84.453C91.228,86.022 90.093,87.64 89.459,89.309C88.825,90.944 88.475,93.03 88.408,95.566L74.092,95.566C74.092,90.694 74.641,86.856 75.742,84.053C76.843,81.216 78.63,78.762 81.1,76.693C83.569,74.624 85.437,72.739 86.705,71.037C88.006,69.302 88.658,67.401 88.658,65.332C88.658,60.293 86.489,57.771 82.15,57.771C80.148,57.771 78.53,58.506 77.295,59.975C76.06,61.443 75.409,63.429 75.342,65.932L58.424,65.932C58.49,59.257 60.592,54.068 64.73,50.363C68.869,46.626 74.675,44.758 82.15,44.758zM81.398,102.324C84.068,102.324 86.288,103.125 88.057,104.727C89.859,106.295 90.76,108.314 90.76,110.783C90.76,113.253 89.859,115.289 88.057,116.891C86.288,118.459 84.068,119.242 81.398,119.242C78.729,119.242 76.493,118.459 74.691,116.891C72.923,115.289 72.039,113.253 72.039,110.783C72.039,108.314 72.923,106.295 74.691,104.727C76.493,103.125 78.729,102.324 81.398,102.324zM27.334,150.332L27.334,164L136.668,164L136.668,150.332L27.334,150.332z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_empty_state_forum_list.xml b/briar-android/src/main/res/drawable/ic_empty_state_forum_list.xml
deleted file mode 100644
index 132ec634ef1196df14e17f5d8268c86e6d33e82c..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_empty_state_forum_list.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="100dp"
- android:height="100dp"
- android:viewportHeight="148"
- android:viewportWidth="148">
- <path
- android:fillColor="#ffffff"
- android:pathData="M107.266,74.679C111.34,74.679 114.055,71.964 114.055,67.89V6.789C114.055,2.716 111.34,0 107.266,0H24.44L99.119,74.679H107.266Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M141.211,27.156H127.633V88.257H112.697L148,123.56V33.945C148,29.872 144.606,27.156 141.211,27.156Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M8.826,1.357L0,10.183L12.22,22.403V101.835L39.376,74.679H64.495L78.074,88.257H39.376V101.835C39.376,105.908 42.092,108.624 46.165,108.624H98.44L137.817,148L146.642,139.174L8.826,1.357Z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_empty_state_group_list.xml b/briar-android/src/main/res/drawable/ic_empty_state_group_list.xml
deleted file mode 100644
index 21f892221d752ea8ef9b6a4feebea93eeab2724d..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_empty_state_group_list.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="100dp"
- android:height="81dp"
- android:viewportHeight="140"
- android:viewportWidth="172">
- <path
- android:fillColor="#ffffff"
- android:pathData="M125.091,103.444L71.927,50.556L38.309,17.111L21.109,0L10.946,10.111L31.273,30.333C31.273,31.889 31.273,32.667 31.273,34.222C31.273,47.444 41.437,57.556 54.727,57.556C56.291,57.556 57.073,57.556 58.637,56.778L78.182,76.222C69.582,74.667 60.982,73.111 54.727,73.111C36.745,73.111 0,82.444 0,100.333V119.778H109.455V107.333L142.291,140L152.455,129.889L142.291,119.778L125.091,103.444Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M117.273,57.555C130.227,57.555 140.728,47.108 140.728,34.222C140.728,21.335 130.227,10.888 117.273,10.888C104.319,10.888 93.818,21.335 93.818,34.222C93.818,47.108 104.319,57.555 117.273,57.555Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M78.182,34.222C78.182,20.999 68.018,10.888 54.727,10.888C53.945,10.888 53.164,10.888 52.382,10.888L78.182,36.555C78.182,35.777 78.182,34.999 78.182,34.222Z"/>
- <path
- android:fillColor="#ffffff"
- android:pathData="M117.272,73.11C116.49,73.11 115.709,73.11 114.927,73.11L161.836,119.777H172V100.333C172,82.444 135.254,73.11 117.272,73.11Z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_error.xml b/briar-android/src/main/res/drawable/ic_error.xml
new file mode 100644
index 0000000000000000000000000000000000000000..645dcf10e9b9f3e147e6e3ea155839ee6648633d
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="90dp"
+ android:height="90dp"
+ android:viewportWidth="91"
+ android:viewportHeight="90">
+ <path
+ android:fillColor="@color/il_red"
+ android:pathData="M33.568,30.833C32.924,30.189 31.879,30.189 31.235,30.833C30.59,31.478 30.59,32.522 31.235,33.167L43.068,45L31.235,56.833C30.59,57.478 30.59,58.522 31.235,59.167C31.879,59.811 32.924,59.811 33.568,59.167L45.402,47.333L57.235,59.167C57.879,59.811 58.924,59.811 59.568,59.167C60.213,58.522 60.213,57.478 59.568,56.833L47.735,45L59.568,33.167C60.213,32.522 60.213,31.478 59.568,30.833C58.924,30.189 57.879,30.189 57.235,30.833L45.402,42.667L33.568,30.833Z" />
+ <path
+ android:fillColor="@color/il_red"
+ android:fillType="evenOdd"
+ android:pathData="M89.401,45C89.401,69.3 69.702,89 45.401,89C21.101,89 1.401,69.3 1.401,45C1.401,20.699 21.101,1 45.401,1C69.702,1 89.401,20.699 89.401,45ZM86.101,45C86.101,67.478 67.879,85.7 45.401,85.7C22.923,85.7 4.701,67.478 4.701,45C4.701,22.522 22.923,4.3 45.401,4.3C67.879,4.3 86.101,22.522 86.101,45Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/ic_exclamation_mark.xml b/briar-android/src/main/res/drawable/ic_exclamation_mark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e728cb86e776861a8976c8a0ae096e23ed9dca0
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_exclamation_mark.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="90dp"
+ android:height="90dp"
+ android:viewportWidth="91"
+ android:viewportHeight="90">
+ <path
+ android:fillColor="@color/il_orange"
+ android:pathData="M43.797,23.755C43.797,22.844 44.536,22.105 45.447,22.105C46.358,22.105 47.097,22.844 47.097,23.755V50.86C47.097,51.772 46.358,52.51 45.447,52.51C44.536,52.51 43.797,51.772 43.797,50.86V23.755Z" />
+ <path
+ android:fillColor="@color/il_orange"
+ android:pathData="M43.797,61.486C43.797,60.575 44.536,59.836 45.447,59.836C46.358,59.836 47.097,60.575 47.097,61.486V61.755C47.097,62.667 46.358,63.405 45.447,63.405C44.536,63.405 43.797,62.667 43.797,61.755V61.486Z" />
+ <path
+ android:fillColor="@color/il_orange"
+ android:fillType="evenOdd"
+ android:pathData="M89.4,45C89.4,69.3 69.701,89 45.4,89C21.1,89 1.4,69.3 1.4,45C1.4,20.699 21.1,1 45.4,1C69.701,1 89.4,20.699 89.4,45ZM86.1,45C86.1,67.478 67.878,85.7 45.4,85.7C22.922,85.7 4.7,67.478 4.7,45C4.7,22.522 22.922,4.3 45.4,4.3C67.878,4.3 86.1,22.522 86.1,45Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/ic_mailbox_onboarding.xml b/briar-android/src/main/res/drawable/ic_mailbox_onboarding.xml
deleted file mode 100644
index abd0bc87b99bc785ff9264d3ee8d85121bb39c61..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_mailbox_onboarding.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="200dp"
- android:height="160dp"
- android:viewportWidth="250"
- android:viewportHeight="200">
- <path
- android:fillColor="#F6FAFE"
- android:pathData="M95.436,100.737C95.436,94.027 100.876,88.588 107.585,88.588H130.365C137.074,88.588 142.514,94.027 142.514,100.737V123.516C142.514,130.226 137.074,135.665 130.365,135.665H107.585C100.876,135.665 95.436,130.226 95.436,123.516V100.737Z" />
- <path
- android:fillColor="#F6FAFE"
- android:pathData="M102.336,10.765C102.336,5.098 106.93,0.504 112.597,0.504H131.836C137.503,0.504 142.097,5.098 142.097,10.765V30.004C142.097,35.671 137.503,40.265 131.836,40.265H112.597C106.93,40.265 102.336,35.671 102.336,30.004V10.765Z" />
- <path
- android:fillColor="#F6FAFE"
- android:pathData="M34.818,148.594C34.818,143.931 38.599,140.151 43.262,140.151H59.093C63.757,140.151 67.537,143.931 67.537,148.594V164.426C67.537,169.089 63.757,172.869 59.093,172.869H43.262C38.599,172.869 34.818,169.089 34.818,164.426V148.594Z" />
- <path
- android:fillColor="#F6FAFE"
- android:pathData="M110.024,186.549C110.024,184.061 112.04,182.045 114.527,182.045H122.971C125.458,182.045 127.475,184.061 127.475,186.549V194.992C127.475,197.48 125.458,199.496 122.971,199.496H114.527C112.04,199.496 110.024,197.48 110.024,194.992V186.549Z" />
- <path
- android:fillColor="#F6FAFE"
- android:pathData="M173.713,142.104C173.713,135.395 179.152,129.955 185.862,129.955H208.641C215.351,129.955 220.79,135.395 220.79,142.104V164.884C220.79,171.593 215.351,177.033 208.641,177.033H185.862C179.152,177.033 173.713,171.593 173.713,164.884V142.104Z" />
- <path
- android:fillColor="#F6FAFE"
- android:pathData="M232.049,95.92C232.049,93.432 234.065,91.416 236.553,91.416H244.997C247.484,91.416 249.5,93.432 249.5,95.92V104.364C249.5,106.851 247.484,108.867 244.997,108.867H236.553C234.065,108.867 232.049,106.851 232.049,104.364V95.92Z" />
- <path
- android:fillColor="#657D99"
- android:fillType="evenOdd"
- android:pathData="M120.481,84.731V45.772H122.481V84.731H120.481Z" />
- <path
- android:fillColor="#657D99"
- android:fillType="evenOdd"
- android:pathData="M117.685,176.605L117.685,140.151H119.685L119.685,176.605H117.685Z" />
- <path
- android:fillColor="#657D99"
- android:fillType="evenOdd"
- android:pathData="M3.28,108.949L4.046,107.102C4.338,107.223 4.66,107.291 5.003,107.291H7.114V109.291H5.003C4.393,109.291 3.811,109.169 3.28,108.949ZM11.336,109.291V107.291H13.447C13.79,107.291 14.113,107.223 14.405,107.102L15.171,108.949C14.64,109.169 14.058,109.291 13.447,109.291H11.336ZM17.951,98.454H15.951V96.343C15.951,96 15.883,95.678 15.762,95.386L17.609,94.62C17.829,95.151 17.951,95.733 17.951,96.343V98.454ZM7.114,91.84H5.003C4.393,91.84 3.811,91.962 3.28,92.182L4.046,94.029C4.338,93.908 4.66,93.84 5.003,93.84H7.114V91.84ZM0.5,102.676H2.5V104.787C2.5,105.131 2.568,105.453 2.689,105.745L0.842,106.511C0.622,105.98 0.5,105.398 0.5,104.787V102.676ZM0.5,98.454H2.5V96.343C2.5,96 2.568,95.678 2.689,95.386L0.842,94.62C0.622,95.151 0.5,95.733 0.5,96.343V98.454ZM11.336,91.84V93.84H13.447C13.79,93.84 14.113,93.908 14.405,94.029L15.171,92.182C14.64,91.962 14.058,91.84 13.447,91.84H11.336ZM17.951,102.676H15.951V104.787C15.951,105.131 15.883,105.453 15.762,105.745L17.609,106.511C17.829,105.98 17.951,105.398 17.951,104.787V102.676Z" />
- <path
- android:fillColor="#74B816"
- android:fillType="evenOdd"
- android:pathData="M41.177,65.021V63.153H43.177V65.021H41.177ZM41.177,72.495V68.758H43.177V72.495H41.177ZM41.177,79.969V76.232H43.177V79.969H41.177ZM41.177,87.443V83.706H43.177V87.443H41.177ZM41.177,94.916V91.179H43.177V94.916H41.177ZM41.177,99.522V98.653H43.177V99.522H44.91V101.522H39.681V99.522H41.177ZM24.705,101.522H22.209V99.522H24.705V101.522ZM34.689,101.522H29.697V99.522H34.689V101.522ZM52.107,101.522H50.374V99.522H54.854V101.522H54.107V102.652H52.107V101.522ZM61.844,101.522H58.349V99.522H61.844V101.522ZM67.087,101.522H65.339V99.522H67.087C68.048,99.522 68.966,99.713 69.805,100.061L69.039,101.908C68.439,101.66 67.78,101.522 67.087,101.522ZM72.187,106.622C72.187,105.929 72.049,105.27 71.8,104.67L73.648,103.904C73.995,104.743 74.187,105.661 74.187,106.622C74.187,107.316 74.325,107.974 74.574,108.574L72.726,109.34C72.378,108.502 72.187,107.583 72.187,106.622ZM52.107,111.172V106.912H54.107V111.172H52.107ZM79.287,113.722C78.326,113.722 77.408,113.531 76.569,113.183L77.335,111.336C77.935,111.585 78.594,111.722 79.287,111.722H81.59V113.722H79.287ZM88.5,113.722H86.197V111.722H88.5V113.722ZM52.107,119.692V115.432H54.107V119.692H52.107ZM52.107,128.213V123.953H54.107V128.213H52.107ZM52.107,134.603V132.473H54.107V134.603H52.107Z" />
- <path
- android:fillColor="#74B816"
- android:fillType="evenOdd"
- android:pathData="M105.214,135.434L105.602,133.472C106.242,133.599 106.905,133.665 107.585,133.665H109.484V135.665H107.585C106.774,135.665 105.981,135.586 105.214,135.434ZM128.466,135.665V133.665H130.365C131.045,133.665 131.708,133.599 132.347,133.472L132.736,135.434C131.969,135.586 131.176,135.665 130.365,135.665H128.466ZM137.115,133.619L136.002,131.957C137.11,131.216 138.064,130.262 138.805,129.154L140.467,130.267C139.58,131.591 138.44,132.732 137.115,133.619ZM142.514,102.635H140.514V100.737C140.514,100.057 140.447,99.394 140.32,98.754L142.282,98.366C142.434,99.133 142.514,99.926 142.514,100.737V102.635ZM140.467,93.987L138.805,95.1C138.064,93.992 137.11,93.038 136.002,92.296L137.115,90.634C138.44,91.521 139.58,92.662 140.467,93.987ZM109.484,88.588H107.585C106.774,88.588 105.981,88.668 105.214,88.819L105.602,90.781C106.242,90.655 106.905,90.588 107.585,90.588H109.484V88.588ZM100.835,90.634L101.948,92.296C100.84,93.038 99.886,93.992 99.145,95.1L97.483,93.987C98.37,92.662 99.51,91.521 100.835,90.634ZM95.436,121.618H97.436V123.516C97.436,124.197 97.503,124.86 97.63,125.499L95.668,125.887C95.516,125.121 95.436,124.328 95.436,123.516V121.618ZM97.483,130.267L99.145,129.154C99.886,130.262 100.84,131.216 101.948,131.957L100.835,133.619C99.51,132.732 98.37,131.591 97.483,130.267ZM95.436,117.822H97.436V114.025H95.436V117.822ZM95.436,110.228H97.436V106.432H95.436V110.228ZM95.436,102.635H97.436V100.737C97.436,100.057 97.503,99.394 97.63,98.754L95.668,98.366C95.516,99.133 95.436,99.926 95.436,100.737V102.635ZM113.28,88.588V90.588H117.077V88.588H113.28ZM120.873,88.588V90.588H124.67V88.588H120.873ZM128.466,88.588V90.588H130.365C131.045,90.588 131.708,90.655 132.347,90.781L132.736,88.819C131.969,88.668 131.176,88.588 130.365,88.588H128.466ZM142.514,106.432H140.514V110.228H142.514V106.432ZM142.514,114.025H140.514V117.822H142.514V114.025ZM142.514,121.618H140.514V123.516C140.514,124.197 140.447,124.86 140.32,125.499L142.282,125.887C142.434,125.121 142.514,124.328 142.514,123.516V121.618ZM124.67,135.665V133.665H120.873V135.665H124.67ZM117.077,135.665V133.665H113.28V135.665H117.077Z" />
- <path
- android:fillColor="#74B816"
- android:fillType="evenOdd"
- android:pathData="M188.618,87.043V85.178H190.618V87.043H188.618ZM188.618,94.503V90.773H190.618V94.503H188.618ZM188.618,98.233H190.618V99.098H191.517V101.098H190.618V101.687H188.618V98.233ZM199.112,101.098H195.315V99.098H199.112V101.098ZM206.707,101.098H202.91V99.098H206.707V101.098ZM214.303,101.098H210.505V99.098H214.303V101.098ZM221.898,101.098H218.1V99.098H221.898V101.098ZM227.595,101.098H225.696V99.098H227.595V101.098ZM188.618,108.042V104.864H190.618V108.042H188.618ZM188.618,111.807V111.219H190.618V111.863C190.865,111.891 191.109,111.929 191.35,111.976L190.962,113.938C190.528,113.853 190.079,113.807 189.618,113.807H187.737V111.807H188.618ZM153.881,113.807H152V111.807H153.881V113.807ZM161.405,113.807H157.643V111.807H161.405V113.807ZM168.928,113.807H165.166V111.807H168.928V113.807ZM176.452,113.807H172.69V111.807H176.452V113.807ZM183.975,113.807H180.214V111.807H183.975V113.807ZM195.34,116.865C194.837,116.115 194.19,115.468 193.44,114.966L194.552,113.304C195.52,113.952 196.353,114.785 197.001,115.753L195.34,116.865ZM196.498,120.687C196.498,120.226 196.453,119.777 196.367,119.343L198.329,118.955C198.44,119.516 198.498,120.095 198.498,120.687V121.707H196.498V120.687ZM196.498,124.765V123.746H198.498V124.765H196.498Z" />
- <path
- android:fillColor="#74B816"
- android:fillType="evenOdd"
- android:pathData="M183.491,176.801L183.879,174.839C184.519,174.966 185.182,175.033 185.862,175.033H187.76V177.033H185.862C185.051,177.033 184.258,176.953 183.491,176.801ZM206.743,177.033V175.033H208.641C209.322,175.033 209.985,174.966 210.624,174.839L211.012,176.801C210.246,176.953 209.453,177.033 208.641,177.033H206.743ZM215.392,174.986L214.279,173.324C215.387,172.583 216.341,171.629 217.082,170.521L218.744,171.634C217.857,172.959 216.717,174.099 215.392,174.986ZM220.79,144.002H218.79V142.104C218.79,141.424 218.724,140.761 218.597,140.121L220.559,139.733C220.711,140.5 220.79,141.293 220.79,142.104V144.002ZM218.744,135.354L217.082,136.467C216.341,135.359 215.387,134.405 214.279,133.663L215.392,132.002C216.717,132.889 217.857,134.029 218.744,135.354ZM187.76,129.955H185.862C185.051,129.955 184.258,130.035 183.491,130.186L183.879,132.148C184.519,132.022 185.182,131.955 185.862,131.955H187.76V129.955ZM179.112,132.002L180.225,133.663C179.117,134.405 178.163,135.359 177.421,136.467L175.759,135.354C176.646,134.029 177.787,132.889 179.112,132.002ZM173.713,162.985H175.713V164.884C175.713,165.564 175.78,166.227 175.906,166.866L173.944,167.255C173.793,166.488 173.713,165.695 173.713,164.884V162.985ZM175.759,171.634L177.421,170.521C178.163,171.629 179.117,172.583 180.225,173.324L179.112,174.986C177.787,174.099 176.646,172.959 175.759,171.634ZM173.713,159.189H175.713V155.392H173.713V159.189ZM173.713,151.596H175.713V147.799H173.713V151.596ZM173.713,144.002H175.713V142.104C175.713,141.424 175.78,140.761 175.906,140.121L173.944,139.733C173.793,140.5 173.713,141.293 173.713,142.104V144.002ZM191.557,129.955V131.955H195.354V129.955H191.557ZM199.15,129.955V131.955H202.947V129.955H199.15ZM206.743,129.955V131.955H208.641C209.322,131.955 209.985,132.022 210.624,132.148L211.012,130.186C210.246,130.035 209.453,129.955 208.641,129.955H206.743ZM220.79,147.799H218.79V151.596H220.79V147.799ZM220.79,155.392H218.79V159.189H220.79V155.392ZM220.79,162.985H218.79V164.884C218.79,165.564 218.724,166.227 218.597,166.866L220.559,167.255C220.711,166.488 220.79,165.695 220.79,164.884V162.985ZM202.947,177.033V175.033H199.15V177.033H202.947ZM195.354,177.033V175.033H191.557V177.033H195.354Z" />
- <path
- android:fillColor="#435B77"
- android:fillType="evenOdd"
- android:pathData="M110.594,40.07L110.982,38.108C111.503,38.211 112.042,38.265 112.597,38.265H115.001V40.265H112.597C111.911,40.265 111.242,40.198 110.594,40.07ZM129.431,40.265V38.265H131.836C132.39,38.265 132.93,38.211 133.45,38.108L133.838,40.07C133.191,40.198 132.521,40.265 131.836,40.265H129.431ZM137.537,38.537L136.424,36.875C137.326,36.271 138.103,35.494 138.706,34.592L140.368,35.705C139.619,36.824 138.656,37.787 137.537,38.537ZM142.097,13.17H140.097V10.765C140.097,10.211 140.042,9.671 139.939,9.151L141.901,8.762C142.029,9.41 142.097,10.08 142.097,10.765V13.17ZM140.368,5.064L138.706,6.176C138.103,5.275 137.326,4.498 136.424,3.894L137.537,2.232C138.656,2.981 139.619,3.945 140.368,5.064ZM115.001,0.504H112.597C111.911,0.504 111.242,0.571 110.594,0.699L110.982,2.661C111.503,2.558 112.042,2.504 112.597,2.504H115.001V0.504ZM106.895,2.232L108.008,3.894C107.106,4.498 106.33,5.275 105.726,6.176L104.064,5.064C104.813,3.945 105.777,2.981 106.895,2.232ZM102.336,27.599H104.336V30.004C104.336,30.558 104.39,31.098 104.493,31.618L102.531,32.007C102.403,31.359 102.336,30.689 102.336,30.004V27.599ZM104.064,35.705L105.726,34.592C106.33,35.494 107.106,36.271 108.008,36.875L106.895,38.537C105.777,37.787 104.813,36.824 104.064,35.705ZM102.336,22.789H104.336V17.98H102.336V22.789ZM102.336,13.17H104.336V10.765C104.336,10.211 104.39,9.671 104.493,9.151L102.531,8.762C102.403,9.41 102.336,10.08 102.336,10.765V13.17ZM119.811,0.504V2.504H124.621V0.504H119.811ZM129.431,0.504V2.504H131.836C132.39,2.504 132.93,2.558 133.45,2.661L133.838,0.699C133.191,0.571 132.521,0.504 131.836,0.504H129.431ZM142.097,17.98H140.097V22.789H142.097V17.98ZM142.097,27.599H140.097V30.004C140.097,30.558 140.042,31.098 139.939,31.618L141.901,32.007C142.029,31.359 142.097,30.689 142.097,30.004V27.599ZM124.621,40.265V38.265H119.811V40.265H124.621Z" />
- <path
- android:fillColor="#435B77"
- android:fillType="evenOdd"
- android:pathData="M40.03,172.228L40.796,170.381C41.553,170.695 42.384,170.869 43.262,170.869H45.241V172.869H43.262C42.117,172.869 41.025,172.641 40.03,172.228ZM57.114,172.869V170.869H59.093C59.971,170.869 60.802,170.695 61.559,170.381L62.325,172.228C61.33,172.641 60.238,172.869 59.093,172.869H57.114ZM67.537,150.573H65.537V148.594C65.537,147.717 65.363,146.885 65.049,146.128L66.896,145.362C67.309,146.358 67.537,147.449 67.537,148.594V150.573ZM45.241,140.151H43.262C42.117,140.151 41.025,140.378 40.03,140.791L40.796,142.639C41.553,142.325 42.384,142.151 43.262,142.151H45.241V140.151ZM34.818,162.447H36.818V164.426C36.818,165.303 36.993,166.134 37.306,166.891L35.459,167.658C35.046,166.662 34.818,165.57 34.818,164.426V162.447ZM34.818,158.489H36.818V154.531H34.818V158.489ZM34.818,150.573H36.818V148.594C36.818,147.717 36.993,146.885 37.306,146.128L35.459,145.362C35.046,146.358 34.818,147.449 34.818,148.594V150.573ZM49.199,140.151V142.151H53.157V140.151H49.199ZM57.114,140.151V142.151H59.093C59.971,142.151 60.802,142.325 61.559,142.639L62.325,140.791C61.33,140.378 60.238,140.151 59.093,140.151H57.114ZM67.537,154.531H65.537V158.489H67.537V154.531ZM67.537,162.447H65.537V164.426C65.537,165.303 65.363,166.134 65.049,166.891L66.896,167.658C67.309,166.662 67.537,165.57 67.537,164.426V162.447ZM53.157,172.869V170.869H49.199V172.869H53.157Z" />
- <path
- android:fillColor="#435B77"
- android:fillType="evenOdd"
- android:pathData="M112.803,199.154L113.569,197.307C113.862,197.428 114.184,197.496 114.527,197.496H116.638V199.496H114.527C113.917,199.496 113.334,199.374 112.803,199.154ZM120.86,199.496V197.496H122.971C123.314,197.496 123.636,197.428 123.929,197.307L124.695,199.154C124.164,199.374 123.582,199.496 122.971,199.496H120.86ZM127.475,188.66H125.475V186.549C125.475,186.205 125.407,185.883 125.285,185.591L127.133,184.825C127.353,185.356 127.475,185.938 127.475,186.549V188.66ZM116.638,182.045H114.527C113.917,182.045 113.334,182.167 112.803,182.387L113.569,184.234C113.862,184.113 114.184,184.045 114.527,184.045H116.638V182.045ZM110.024,192.881H112.024V194.992C112.024,195.336 112.092,195.658 112.213,195.95L110.365,196.716C110.145,196.185 110.024,195.603 110.024,194.992V192.881ZM110.024,188.66H112.024V186.549C112.024,186.205 112.092,185.883 112.213,185.591L110.365,184.825C110.145,185.356 110.024,185.938 110.024,186.549V188.66ZM120.86,182.045V184.045H122.971C123.314,184.045 123.636,184.113 123.929,184.234L124.695,182.387C124.164,182.167 123.582,182.045 122.971,182.045H120.86ZM127.475,192.881H125.475V194.992C125.475,195.336 125.407,195.658 125.285,195.95L127.133,196.716C127.353,196.185 127.475,195.603 127.475,194.992V192.881Z" />
- <path
- android:fillColor="#657D99"
- android:fillType="evenOdd"
- android:pathData="M178.996,80.327L179.762,78.48C180.48,78.778 181.269,78.943 182.101,78.943H184.003V80.943H182.101C181.001,80.943 179.952,80.724 178.996,80.327ZM195.412,80.943V78.943H197.314C198.146,78.943 198.935,78.778 199.653,78.48L200.419,80.327C199.463,80.724 198.414,80.943 197.314,80.943H195.412ZM205.427,59.519H203.427V57.617C203.427,56.785 203.262,55.996 202.964,55.278L204.811,54.512C205.208,55.468 205.427,56.517 205.427,57.617V59.519ZM184.003,49.504H182.101C181.001,49.504 179.952,49.723 178.996,50.12L179.762,51.967C180.48,51.669 181.269,51.504 182.101,51.504H184.003V49.504ZM173.988,70.928H175.988V72.83C175.988,73.662 176.153,74.451 176.451,75.169L174.604,75.936C174.207,74.979 173.988,73.93 173.988,72.83V70.928ZM173.988,67.125H175.988V63.322H173.988V67.125ZM173.988,59.519H175.988V57.617C175.988,56.785 176.153,55.996 176.451,55.278L174.604,54.512C174.207,55.468 173.988,56.517 173.988,57.617V59.519ZM187.806,49.504V51.504H191.609V49.504H187.806ZM195.412,49.504V51.504H197.314C198.146,51.504 198.935,51.669 199.653,51.967L200.419,50.12C199.463,49.723 198.414,49.504 197.314,49.504H195.412ZM205.427,63.322H203.427V67.125H205.427V63.322ZM205.427,70.928H203.427V72.83C203.427,73.662 203.262,74.451 202.964,75.169L204.811,75.936C205.208,74.979 205.427,73.93 205.427,72.83V70.928ZM191.609,80.943V78.943H187.806V80.943H191.609Z" />
- <path
- android:fillColor="#435B77"
- android:fillType="evenOdd"
- android:pathData="M234.829,108.525L235.595,106.678C235.887,106.799 236.209,106.867 236.553,106.867H238.664V108.867H236.553C235.942,108.867 235.36,108.745 234.829,108.525ZM242.886,108.867V106.867H244.997C245.34,106.867 245.662,106.799 245.954,106.678L246.72,108.525C246.189,108.745 245.607,108.867 244.997,108.867H242.886ZM249.5,98.031H247.5V95.92C247.5,95.576 247.432,95.254 247.311,94.962L249.158,94.196C249.378,94.727 249.5,95.309 249.5,95.92V98.031ZM238.664,91.416H236.553C235.942,91.416 235.36,91.538 234.829,91.758L235.595,93.605C235.887,93.484 236.209,93.416 236.553,93.416H238.664V91.416ZM232.049,102.253H234.049V104.364C234.049,104.707 234.117,105.029 234.238,105.321L232.391,106.087C232.171,105.556 232.049,104.974 232.049,104.364V102.253ZM232.049,98.031H234.049V95.92C234.049,95.576 234.117,95.254 234.238,94.962L232.391,94.196C232.171,94.727 232.049,95.309 232.049,95.92V98.031ZM242.886,91.416V93.416H244.997C245.34,93.416 245.662,93.484 245.954,93.605L246.72,91.758C246.189,91.538 245.607,91.416 244.997,91.416H242.886ZM249.5,102.253H247.5V104.364C247.5,104.707 247.432,105.029 247.311,105.321L249.158,106.087C249.378,105.556 249.5,104.974 249.5,104.364V102.253Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M29.825,34.881V54.164C29.825,55.73 31.1,57.021 32.682,57.021H34.021C35.586,57.021 36.877,55.73 36.877,54.164V34.881H29.825Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M36.861,25.587V21.956C36.861,20.391 35.586,19.1 34.021,19.1H32.682C31.116,19.1 29.825,20.391 29.825,21.956V25.587H36.861Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M52.514,41.239V21.956C52.514,20.391 51.239,19.1 49.674,19.1H48.334C46.769,19.1 45.478,20.391 45.478,21.956V41.239H52.514Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M45.478,50.533V54.164C45.478,55.729 46.769,57.02 48.334,57.02H49.674C51.239,57.02 52.53,55.729 52.53,54.164V50.533H45.478Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M28.696,42.369H25.065C23.5,42.369 22.209,43.644 22.209,45.225V46.565C22.209,48.13 23.484,49.421 25.065,49.421H28.696V42.369Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M57.274,42.369H37.99V49.421H57.274C58.839,49.421 60.13,48.13 60.13,46.565V45.225C60.13,43.644 58.839,42.369 57.274,42.369Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M44.348,26.717H25.065C23.5,26.717 22.209,27.992 22.209,29.573V30.913C22.209,32.478 23.484,33.769 25.065,33.769H44.348V26.717Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M57.274,26.717H53.643V33.769H57.274C58.839,33.769 60.13,32.494 60.13,30.912V29.573C60.13,27.992 58.839,26.717 57.274,26.717Z" />
- <path
- android:fillColor="#95DE2D"
- android:fillType="evenOdd"
- android:pathData="M108.864,100H129.086C129.852,100 130.587,100.305 131.129,100.848C131.671,101.39 131.975,102.126 131.975,102.894L131.975,127.695C131.975,128.8 130.688,129.403 129.841,128.695L124.6,124.308H108.864C108.098,124.308 107.363,124.003 106.821,123.46C106.279,122.917 105.975,122.181 105.975,121.414V102.894C105.975,102.126 106.279,101.39 106.821,100.848C107.363,100.305 108.098,100 108.864,100ZM116.549,112.823H110.597V104.63H127.353V112.823H121.499V115.656H123.64C124.026,115.656 124.22,116.123 123.947,116.397L119.331,121.021C119.161,121.19 118.887,121.19 118.718,121.021L114.102,116.397C113.829,116.123 114.022,115.656 114.408,115.656H116.549V112.823Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M190.408,151.656V162.803C190.408,163.708 191.145,164.454 192.059,164.454H192.833C193.738,164.454 194.484,163.708 194.484,162.803V151.656H190.408Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M194.475,146.283V144.184C194.475,143.279 193.738,142.533 192.833,142.533H192.059C191.154,142.533 190.408,143.279 190.408,144.184V146.283H194.475Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M203.523,155.331V144.184C203.523,143.279 202.786,142.533 201.881,142.533H201.107C200.202,142.533 199.456,143.279 199.456,144.184V155.331H203.523Z" />
- <path
- android:fillColor="#82C91E"
- android:pathData="M199.456,160.705V162.804C199.456,163.709 200.202,164.455 201.107,164.455H201.881C202.786,164.455 203.533,163.709 203.533,162.804V160.705H199.456Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M189.755,155.984H187.656C186.751,155.984 186.005,156.721 186.005,157.635V158.409C186.005,159.314 186.742,160.061 187.656,160.061H189.755V155.984Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M206.275,155.984H195.128V160.061H206.275C207.18,160.061 207.926,159.314 207.926,158.409V157.635C207.926,156.721 207.18,155.984 206.275,155.984Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M198.803,146.937H187.656C186.751,146.937 186.005,147.674 186.005,148.588V149.363C186.005,150.267 186.742,151.014 187.656,151.014H198.803V146.937Z" />
- <path
- android:fillColor="#95DE2D"
- android:pathData="M206.275,146.937H204.176V151.014H206.275C207.18,151.014 207.926,150.277 207.926,149.363V148.588C207.926,147.674 207.18,146.937 206.275,146.937Z" />
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_nickname.xml b/briar-android/src/main/res/drawable/ic_nickname.xml
deleted file mode 100644
index f7e69d3776fc1fa220e2f5822d52bb1c02ff4de7..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_nickname.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="200dp"
- android:height="237dp"
- android:viewportHeight="178"
- android:viewportWidth="150">
- <path
- android:fillAlpha="0.25"
- android:pathData="M85.19,0.128 L3.357,0.329C2.465,0.331 1.611,0.69 0.981,1.329 0.352,1.967 -0.001,2.832 0,3.733L0.373,156.201c0.001,0.446 0.089,0.888 0.26,1.3 0.17,0.412 0.419,0.786 0.732,1.101 0.313,0.315 0.685,0.564 1.093,0.734 0.409,0.17 0.846,0.257 1.288,0.256l81.834,-0.201c0.892,-0.003 1.746,-0.363 2.375,-1.002 0.629,-0.639 0.981,-1.504 0.98,-2.405L88.554,3.516C88.551,2.617 88.196,1.755 87.565,1.12 86.935,0.485 86.081,0.128 85.19,0.128Z">
- </path>
- <path
- android:fillAlpha="0.175"
- android:fillColor="#6d6d6d"
- android:pathData="M84.282,-0.002 L4.276,0.196C2.574,0.2 1.198,1.598 1.202,3.318L1.567,154.298c0.004,1.72 1.387,3.111 3.089,3.107l80.006,-0.198c1.702,-0.004 3.078,-1.402 3.074,-3.122L87.37,3.105C87.366,1.385 85.983,-0.006 84.282,-0.002Z"/>
- <path
- android:fillAlpha="0.25"
- android:fillColor="#646464"
- android:pathData="M81.939,3.957L65.934,3.996C65.689,5.664 64.862,7.188 63.602,8.293C62.342,9.398 60.732,10.01 59.064,10.02L29.303,10.092C27.635,10.091 26.021,9.487 24.756,8.389C23.49,7.29 22.655,5.77 22.402,4.104L6.637,4.143C5.769,4.145 4.938,4.495 4.326,5.117C3.714,5.739 3.371,6.58 3.373,7.457L3.461,44.068L3.717,150.168C3.721,151.045 4.069,151.885 4.686,152.502C5.302,153.119 6.136,153.464 7.004,153.461L82.307,153.275C83.172,153.27 83.999,152.921 84.609,152.301C85.219,151.681 85.561,150.841 85.561,149.967L85.307,43.563L85.221,7.256C85.218,6.379 84.871,5.539 84.256,4.92C83.641,4.301 82.807,3.955 81.939,3.957zM52.652,5.791L34.357,6.068C34.108,6.072 33.908,6.279 33.912,6.531L33.916,6.83C33.92,7.082 34.125,7.285 34.375,7.281L52.672,7.002C52.921,6.998 53.119,6.791 53.115,6.539L53.111,6.24C53.108,5.988 52.902,5.787 52.652,5.791z"/>
- <path
- android:fillAlpha="0.25"
- android:fillColor="#dbdbdb"
- android:pathData="M57.204,6.934C57.602,6.928 57.919,6.597 57.913,6.195 57.907,5.793 57.58,5.471 57.182,5.477c-0.398,0.006 -0.716,0.337 -0.71,0.739 0.006,0.402 0.333,0.723 0.731,0.717z"/>
- <path
- android:fillAlpha="0.25"
- android:fillColor="#e0e0e0"
- android:pathData="m17.641,19.459c-4.185,0 -7.576,3.446 -7.576,7.695 0,4.25 3.392,7.695 7.576,7.695 4.185,0 7.576,-3.446 7.576,-7.695 0,-4.25 -3.392,-7.695 -7.576,-7.695zM37.523,23.637v3.234h40.117v-3.234zM37.523,30.104v3.234L77.641,33.338L77.641,30.104ZM17.641,44.088c-4.185,0 -7.576,3.444 -7.576,7.693 0,4.25 3.392,7.695 7.576,7.695 4.185,0 7.576,-3.446 7.576,-7.695 0,-4.25 -3.392,-7.693 -7.576,-7.693zM37.523,48.266L37.523,51.5h40.117v-3.234zM37.523,54.732v3.232L77.641,57.965L77.641,54.732ZM17.641,68.715c-4.185,0 -7.576,3.446 -7.576,7.695 0,4.25 3.392,7.695 7.576,7.695 4.185,0 7.576,-3.446 7.576,-7.695 0,-4.25 -3.392,-7.695 -7.576,-7.695zM37.523,72.895v3.232h40.117v-3.232zM37.523,79.361L37.523,82.594L77.641,82.594L77.641,79.361ZM17.641,93.344c-4.185,0 -7.576,3.446 -7.576,7.695 0,4.25 3.392,7.695 7.576,7.695 4.185,0 7.576,-3.445 7.576,-7.695 0,-4.25 -3.392,-7.695 -7.576,-7.695zM37.523,97.523v3.232h40.117v-3.232zM37.523,103.988v3.234h40.117v-3.234zM17.641,117.973c-4.185,0 -7.576,3.446 -7.576,7.695 0,4.25 3.392,7.693 7.576,7.693 4.185,0 7.576,-3.443 7.576,-7.693 0,-4.249 -3.392,-7.695 -7.576,-7.695zM37.523,122.15v3.234h40.117v-3.234zM37.523,128.617v3.234h40.117v-3.234z"/>
- <path
- android:fillColor="#313131"
- android:pathData="m136.95,18.407 l-80.006,0.198c-1.702,0.004 -3.078,1.402 -3.074,3.122l0.365,150.981c0.004,1.72 1.387,3.111 3.089,3.107l80.006,-0.198c1.702,-0.004 3.078,-1.402 3.074,-3.122L140.039,21.514c-0.004,-1.72 -1.387,-3.111 -3.089,-3.107z"/>
- <path
- android:fillColor="#3e3e3e"
- android:pathData="M134.609,22.357L118.6,22.395C118.356,24.062 117.528,25.587 116.268,26.691C115.008,27.796 113.398,28.408 111.73,28.418L81.969,28.492C80.301,28.491 78.689,27.886 77.424,26.787C76.158,25.689 75.323,24.168 75.07,22.502L59.305,22.541C58.437,22.543 57.604,22.894 56.992,23.516C56.38,24.137 56.037,24.98 56.039,25.857L56.129,62.469L56.748,62.467L56.129,62.471L56.383,168.57C56.385,169.447 56.733,170.287 57.348,170.906C57.963,171.524 58.796,171.871 59.664,171.869L134.967,171.684C135.835,171.682 136.665,171.331 137.277,170.709C137.889,170.088 138.232,169.246 138.23,168.369L137.973,62.219L137.975,62.219L137.889,25.656C137.887,24.779 137.541,23.939 136.926,23.32C136.311,22.702 135.477,22.356 134.609,22.357z"/>
- <path
- android:fillColor="#e0e0e0"
- android:pathData="M109.85,23.891C109.452,23.897 109.135,24.229 109.141,24.631C109.147,25.033 109.473,25.354 109.871,25.348C110.269,25.342 110.586,25.01 110.58,24.607C110.574,24.205 110.248,23.885 109.85,23.891zM105.32,24.201L87.025,24.479C86.776,24.482 86.576,24.691 86.58,24.943L86.584,25.242C86.588,25.494 86.793,25.695 87.043,25.691L105.34,25.414C105.589,25.41 105.787,25.203 105.783,24.951L105.779,24.65C105.775,24.398 105.569,24.197 105.32,24.201zM63.365,37.568L63.365,53.738L79.365,53.738L79.365,37.568L63.365,37.568zM86.748,37.568L86.748,40.801L126.865,40.801L126.865,37.568L86.748,37.568zM86.748,44.037L86.748,47.27L126.865,47.27L126.865,44.037L86.748,44.037zM71.787,112.996C67.603,112.996 64.211,116.441 64.211,120.691C64.211,124.941 67.603,128.387 71.787,128.387C75.972,128.387 79.365,124.941 79.365,120.691C79.365,116.441 75.972,112.996 71.787,112.996zM86.748,116.928L86.748,120.16L126.865,120.16L126.865,116.928L86.748,116.928zM86.748,123.393L86.748,126.627L126.865,126.627L126.865,123.393L86.748,123.393zM71.787,142.602C67.603,142.602 64.211,146.047 64.211,150.297C64.211,154.547 67.603,157.99 71.787,157.99C75.972,157.99 79.365,154.547 79.365,150.297C79.365,146.047 75.972,142.602 71.787,142.602zM86.748,145.535L86.748,148.768L126.865,148.768L126.865,145.535L86.748,145.535zM86.748,152.002L86.748,155.234L126.865,155.234L126.865,152.002L86.748,152.002z"/>
- <path
- android:fillColor="#d5d6d7"
- android:pathData="M148.744,68.665H45.619v33.583h103.125z"/>
- <path
- android:fillColor="#87c214"
- android:pathData="m97.822,50.504v5.723h17.967v-5.723zM86.748,81.104v3.232h40.117v-3.232zM86.748,87.572v3.232h40.117v-3.232z"/>
- <path
- android:fillColor="#f5f5f5"
- android:pathData="m66.865,92.314c4.185,0 7.577,-3.445 7.577,-7.695 0,-4.25 -3.392,-7.695 -7.577,-7.695 -4.185,0 -7.577,3.445 -7.577,7.695 0,4.25 3.392,7.695 7.577,7.695z"/>
- <path
- android:fillColor="#87c214"
- android:pathData="m70.13,90.006h-6.574c-0.315,0.002 -0.625,0.082 -0.904,0.231 -0.278,0.149 -0.517,0.365 -0.696,0.627 1.477,0.856 3.147,1.311 4.85,1.321 1.702,0.01 3.378,-0.427 4.864,-1.266 -0.167,-0.265 -0.393,-0.486 -0.661,-0.645 -0.268,-0.159 -0.569,-0.251 -0.879,-0.269z"/>
- <path
- android:fillColor="#333333"
- android:pathData="m66.861,80.746c-2.08,0 -3.766,1.704 -3.766,3.807 0,0.394 0.076,0.766 0.186,1.123 -0.328,0.813 -0.822,1.878 -1.158,1.709 0,0 5.07,4.425 9.545,0 -0.355,-0.613 -0.773,-1.184 -1.219,-1.732 0.105,-0.35 0.178,-0.715 0.178,-1.1 0,-2.102 -1.686,-3.807 -3.766,-3.807z"/>
- <path
- android:fillColor="#fda57d"
- android:pathData="m66.861,81.57c-1.801,0 -3.302,1.279 -3.674,2.986 -0.005,-0 -0.009,-0.006 -0.014,-0.006 -0.193,0 -0.35,0.297 -0.35,0.664 0,0.347 0.142,0.623 0.32,0.652 0.181,1.408 1.109,2.569 2.381,3.059v0.732c0,0.323 0.127,0.635 0.354,0.863 0.226,0.229 0.534,0.357 0.854,0.357h0.225c0.159,0 0.316,-0.032 0.463,-0.094 0.147,-0.061 0.28,-0.15 0.393,-0.264 0.112,-0.113 0.201,-0.248 0.262,-0.396 0.061,-0.148 0.092,-0.308 0.092,-0.469v-0.721c1.289,-0.484 2.232,-1.655 2.412,-3.076 0.168,-0.049 0.299,-0.312 0.299,-0.645 0,-0.363 -0.153,-0.656 -0.344,-0.662 -0.373,-1.705 -1.873,-2.982 -3.672,-2.982z"/>
- <path
- android:fillColor="#333333"
- android:pathData="m63.253,83.934h7.179c0,0 -0.612,-2.93 -3.328,-2.74 -2.715,0.19 -3.852,2.74 -3.852,2.74z"/>
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_share_app.xml b/briar-android/src/main/res/drawable/ic_share_app.xml
deleted file mode 100644
index d8ae02dc4be49d264abb06471a3bc976a1b6dec1..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_share_app.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="256dp"
- android:height="204dp"
- android:viewportWidth="256"
- android:viewportHeight="204">
- <path
- android:fillColor="#657D99"
- android:pathData="M41.583,100.841H22.181V102.841H52.75V136.663H54.75V102.841H68.034C70.924,102.841 73.267,105.184 73.267,108.074C73.267,112.068 76.505,115.307 80.5,115.307H92.727V113.307H80.5C77.61,113.307 75.267,110.964 75.267,108.074C75.267,104.079 72.029,100.841 68.034,100.841H43.583V63.659H41.583V100.841Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M122.611,86.06V46.253H124.611V86.06H122.611Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M119.754,179.928L119.754,142.682L121.754,142.682L121.754,179.928L119.754,179.928Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M195.251,100.841V86.596H193.251V113.826H148.362V115.826H194.251C198.125,115.826 201.301,118.969 201.301,122.826V127.044H203.301V122.826C203.301,118.186 199.75,114.378 195.251,113.881V102.841H233.052V100.841H195.251Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M32.121,57.411L32.888,55.564C33.596,55.858 34.375,56.021 35.197,56.021H37.079V58.021H35.197C34.107,58.021 33.069,57.804 32.121,57.411ZM48.377,58.021V56.021H50.26C51.082,56.021 51.86,55.858 52.569,55.564L53.335,57.411C52.388,57.804 51.349,58.021 50.26,58.021H48.377ZM58.293,36.807H56.293V34.924C56.293,34.102 56.13,33.323 55.836,32.615L57.684,31.849C58.077,32.796 58.293,33.834 58.293,34.924V36.807ZM37.079,26.89H35.197C34.107,26.89 33.069,27.107 32.121,27.5L32.888,29.347C33.596,29.053 34.375,28.89 35.197,28.89H37.079V26.89ZM27.163,48.104H29.163V49.987C29.163,50.809 29.326,51.588 29.62,52.296L27.772,53.062C27.38,52.115 27.163,51.076 27.163,49.987V48.104ZM27.163,44.338H29.163V40.572H27.163V44.338ZM27.163,36.807H29.163V34.924C29.163,34.102 29.326,33.323 29.62,32.615L27.772,31.849C27.38,32.796 27.163,33.834 27.163,34.924V36.807ZM40.845,26.89V28.89H44.611V26.89H40.845ZM48.377,26.89V28.89H50.26C51.082,28.89 51.86,29.053 52.569,29.347L53.335,27.5C52.388,27.107 51.349,26.89 50.26,26.89H48.377ZM58.293,40.572H56.293V44.338H58.293V40.572ZM58.293,48.104H56.293V49.987C56.293,50.809 56.13,51.588 55.836,52.296L57.684,53.062C58.077,52.115 58.293,51.076 58.293,49.987V48.104ZM44.611,58.021V56.021H40.845V58.021H44.611Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M112.487,40.426L112.875,38.464C113.41,38.569 113.964,38.625 114.533,38.625H116.99V40.625H114.533C113.833,40.625 113.149,40.556 112.487,40.426ZM131.733,40.625V38.625H134.191C134.76,38.625 135.314,38.569 135.848,38.464L136.237,40.426C135.575,40.556 134.891,40.625 134.191,40.625H131.733ZM140.016,38.859L138.903,37.197C139.829,36.577 140.627,35.78 141.247,34.854L142.909,35.966C142.143,37.11 141.159,38.094 140.016,38.859ZM144.674,12.941H142.674V10.484C142.674,9.915 142.619,9.361 142.513,8.826L144.475,8.438C144.606,9.1 144.674,9.784 144.674,10.484V12.941ZM142.909,4.659L141.247,5.772C140.627,4.845 139.829,4.048 138.903,3.428L140.016,1.766C141.159,2.531 142.143,3.516 142.909,4.659ZM116.99,0H114.533C113.833,0 113.149,0.069 112.487,0.2L112.875,2.162C113.41,2.056 113.964,2 114.533,2H116.99V0ZM108.708,1.766L109.821,3.428C108.895,4.048 108.097,4.845 107.477,5.772L105.815,4.659C106.581,3.516 107.565,2.531 108.708,1.766ZM104.049,27.684H106.049V30.141C106.049,30.71 106.105,31.264 106.211,31.799L104.249,32.187C104.118,31.525 104.049,30.841 104.049,30.141V27.684ZM105.815,35.966L107.477,34.854C108.097,35.78 108.895,36.577 109.821,37.197L108.708,38.859C107.565,38.094 106.581,37.11 105.815,35.966ZM104.049,22.77H106.049V17.855H104.049V22.77ZM104.049,12.941H106.049V10.484C106.049,9.915 106.105,9.361 106.211,8.826L104.249,8.438C104.118,9.1 104.049,9.784 104.049,10.484V12.941ZM121.905,0V2H126.819V0H121.905ZM131.733,0V2H134.191C134.76,2 135.314,2.056 135.848,2.162L136.237,0.2C135.575,0.069 134.891,0 134.191,0H131.733ZM144.674,17.855H142.674V22.77H144.674V17.855ZM144.674,27.684H142.674V30.141C142.674,30.71 142.619,31.264 142.513,31.799L144.475,32.187C144.606,31.525 144.674,30.841 144.674,30.141V27.684ZM126.819,40.625V38.625H121.905V40.625H126.819Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M183.397,81.99L184.163,80.143C184.902,80.449 185.714,80.619 186.57,80.619H188.513V82.619H186.57C185.446,82.619 184.375,82.396 183.397,81.99ZM200.171,82.619V80.619H202.114C202.97,80.619 203.782,80.449 204.521,80.143L205.287,81.99C204.309,82.396 203.238,82.619 202.114,82.619H200.171ZM210.403,60.729H208.403V58.787C208.403,57.93 208.233,57.118 207.927,56.38L209.774,55.613C210.18,56.591 210.403,57.663 210.403,58.787V60.729ZM188.513,50.497H186.57C185.446,50.497 184.375,50.721 183.397,51.126L184.163,52.973C184.902,52.667 185.714,52.497 186.57,52.497H188.513V50.497ZM178.281,72.387H180.281V74.33C180.281,75.186 180.451,75.998 180.757,76.737L178.91,77.503C178.504,76.525 178.281,75.454 178.281,74.33V72.387ZM178.281,68.501H180.281V64.615H178.281V68.501ZM178.281,60.729H180.281V58.787C180.281,57.93 180.451,57.118 180.757,56.38L178.91,55.613C178.504,56.591 178.281,57.663 178.281,58.787V60.729ZM192.399,50.497V52.497H196.285V50.497H192.399ZM200.171,50.497V52.497H202.114C202.97,52.497 203.782,52.667 204.521,52.973L205.287,51.126C204.309,50.721 203.238,50.497 202.114,50.497H200.171ZM210.403,64.615H208.403V68.501H210.403V64.615ZM210.403,72.387H208.403V74.33C208.403,75.186 208.233,75.998 207.927,76.737L209.774,77.503C210.18,76.525 210.403,75.454 210.403,74.33V72.387ZM196.285,82.619V80.619H192.399V82.619H196.285Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M188.271,180.562L188.659,178.6C189.316,178.73 189.996,178.798 190.694,178.798H192.633V180.798H190.694C189.865,180.798 189.055,180.717 188.271,180.562ZM212.029,180.798V178.798H213.968C214.666,178.798 215.346,178.73 216.003,178.6L216.391,180.562C215.607,180.717 214.797,180.798 213.968,180.798H212.029ZM220.865,178.708L219.753,177.046C220.889,176.285 221.868,175.306 222.629,174.17L224.291,175.282C223.384,176.636 222.219,177.801 220.865,178.708ZM226.381,147.05H224.381V145.111C224.381,144.413 224.313,143.733 224.183,143.077L226.145,142.688C226.3,143.472 226.381,144.282 226.381,145.111V147.05ZM224.291,138.214L222.629,139.327C221.868,138.19 220.889,137.211 219.753,136.451L220.865,134.789C222.219,135.695 223.384,136.86 224.291,138.214ZM192.633,132.698H190.694C189.865,132.698 189.055,132.779 188.271,132.934L188.659,134.896C189.316,134.766 189.996,134.698 190.694,134.698H192.633V132.698ZM183.797,134.789L184.91,136.451C183.773,137.211 182.794,138.19 182.033,139.327L180.372,138.214C181.278,136.86 182.443,135.695 183.797,134.789ZM178.281,166.446H180.281V168.385C180.281,169.083 180.349,169.763 180.479,170.42L178.517,170.808C178.362,170.024 178.281,169.214 178.281,168.385V166.446ZM180.372,175.282L182.033,174.17C182.794,175.306 183.773,176.285 184.91,177.046L183.797,178.708C182.443,177.801 181.278,176.636 180.372,175.282ZM178.281,162.567H180.281V158.688H178.281V162.567ZM178.281,154.809H180.281V150.93H178.281V154.809ZM178.281,147.05H180.281V145.111C180.281,144.413 180.349,143.733 180.479,143.077L178.517,142.688C178.362,143.472 178.281,144.282 178.281,145.111V147.05ZM196.512,132.698V134.698H200.392V132.698H196.512ZM204.271,132.698V134.698H208.15V132.698H204.271ZM212.029,132.698V134.698H213.968C214.666,134.698 215.346,134.766 216.003,134.896L216.391,132.934C215.607,132.779 214.797,132.698 213.968,132.698H212.029ZM226.381,150.93H224.381V154.809H226.381V150.93ZM226.381,158.688H224.381V162.567H226.381V158.688ZM226.381,166.446H224.381V168.385C224.381,169.083 224.313,169.763 224.183,170.42L226.145,170.808C226.3,170.024 226.381,169.214 226.381,168.385V166.446ZM208.15,180.798V178.798H204.271V180.798H208.15ZM200.392,180.798V178.798H196.512V180.798H200.392Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M40.389,175.457L41.155,173.609C41.934,173.932 42.789,174.111 43.692,174.111H45.713V176.111H43.692C42.522,176.111 41.406,175.878 40.389,175.457ZM57.845,176.111V174.111H59.867C60.769,174.111 61.625,173.932 62.403,173.609L63.169,175.457C62.152,175.878 61.037,176.111 59.867,176.111H57.845ZM68.494,153.33H66.494V151.309C66.494,150.406 66.315,149.551 65.992,148.772L67.84,148.006C68.261,149.023 68.494,150.139 68.494,151.309V153.33ZM45.713,142.682H43.692C42.522,142.682 41.406,142.914 40.389,143.336L41.155,145.184C41.934,144.861 42.789,144.682 43.692,144.682H45.713V142.682ZM35.064,165.462H37.064V167.484C37.064,168.386 37.244,169.242 37.567,170.02L35.719,170.786C35.297,169.769 35.064,168.654 35.064,167.484V165.462ZM35.064,161.418H37.064V157.374H35.064V161.418ZM35.064,153.33H37.064V151.309C37.064,150.406 37.244,149.551 37.567,148.772L35.719,148.006C35.297,149.023 35.064,150.139 35.064,151.309V153.33ZM49.757,142.682V144.682H53.801V142.682H49.757ZM57.845,142.682V144.682H59.867C60.769,144.682 61.625,144.861 62.403,145.184L63.169,143.336C62.152,142.914 61.037,142.682 59.867,142.682H57.845ZM68.494,157.374H66.494V161.418H68.494V157.374ZM68.494,165.462H66.494V167.484C66.494,168.386 66.315,169.242 65.992,170.02L67.84,170.786C68.261,169.769 68.494,168.654 68.494,167.484V165.462ZM53.801,176.111V174.111H49.757V176.111H53.801Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M2.84,110.802L3.606,108.954C3.91,109.081 4.245,109.151 4.601,109.151H6.758V111.151H4.601C3.977,111.151 3.383,111.027 2.84,110.802ZM11.072,111.151V109.151H13.229C13.585,109.151 13.92,109.081 14.224,108.954L14.99,110.802C14.448,111.027 13.853,111.151 13.229,111.151H11.072ZM17.83,100.079H15.83V97.922C15.83,97.566 15.76,97.231 15.634,96.927L17.481,96.161C17.706,96.703 17.83,97.298 17.83,97.922V100.079ZM6.758,93.321H4.601C3.977,93.321 3.383,93.445 2.84,93.67L3.606,95.518C3.91,95.392 4.245,95.321 4.601,95.321H6.758V93.321ZM0,104.393H2V106.55C2,106.906 2.071,107.241 2.197,107.545L0.349,108.311C0.124,107.769 0,107.174 0,106.55V104.393ZM0,100.079H2V97.922C2,97.566 2.071,97.231 2.197,96.927L0.349,96.161C0.124,96.703 0,97.298 0,97.922V100.079ZM11.072,93.321V95.321H13.229C13.585,95.321 13.92,95.392 14.224,95.518L14.99,93.67C14.448,93.445 13.853,93.321 13.229,93.321H11.072ZM17.83,104.393H15.83V106.55C15.83,106.906 15.76,107.241 15.634,107.545L17.481,108.311C17.706,107.769 17.83,107.174 17.83,106.55V104.393Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M114.745,202.969L115.511,201.122C115.815,201.248 116.149,201.318 116.506,201.318H118.663V203.318H116.506C115.882,203.318 115.287,203.194 114.745,202.969ZM122.977,203.318V201.318H125.133C125.49,201.318 125.825,201.248 126.129,201.122L126.895,202.969C126.352,203.194 125.757,203.318 125.133,203.318H122.977ZM129.735,192.246H127.735V190.09C127.735,189.733 127.664,189.398 127.538,189.094L129.386,188.328C129.611,188.871 129.735,189.466 129.735,190.09V192.246ZM118.663,185.488H116.506C115.882,185.488 115.287,185.612 114.745,185.837L115.511,187.685C115.815,187.559 116.149,187.488 116.506,187.488H118.663V185.488ZM111.905,196.56H113.905V198.717C113.905,199.074 113.975,199.408 114.101,199.712L112.254,200.478C112.029,199.936 111.905,199.341 111.905,198.717V196.56ZM111.905,192.246H113.905V190.09C113.905,189.733 113.975,189.398 114.101,189.094L112.254,188.328C112.029,188.871 111.905,189.466 111.905,190.09V192.246ZM122.977,185.488V187.488H125.133C125.49,187.488 125.825,187.559 126.129,187.685L126.895,185.837C126.352,185.612 125.757,185.488 125.133,185.488H122.977ZM129.735,196.56H127.735V198.717C127.735,199.074 127.664,199.408 127.538,199.712L129.386,200.478C129.611,199.936 129.735,199.341 129.735,198.717V196.56Z" />
- <path
- android:fillColor="#657D99"
- android:pathData="M240.444,110.802L241.21,108.954C241.514,109.081 241.849,109.151 242.205,109.151H244.362V111.151H242.205C241.581,111.151 240.987,111.027 240.444,110.802ZM248.676,111.151V109.151H250.833C251.189,109.151 251.524,109.081 251.828,108.954L252.594,110.802C252.052,111.027 251.457,111.151 250.833,111.151H248.676ZM255.434,100.079H253.434V97.922C253.434,97.566 253.364,97.231 253.238,96.927L255.085,96.161C255.31,96.703 255.434,97.298 255.434,97.922V100.079ZM244.362,93.321H242.205C241.581,93.321 240.987,93.445 240.444,93.67L241.21,95.518C241.514,95.392 241.849,95.321 242.205,95.321H244.362V93.321ZM237.604,104.393H239.604V106.55C239.604,106.906 239.675,107.241 239.801,107.545L237.953,108.311C237.728,107.769 237.604,107.174 237.604,106.55V104.393ZM237.604,100.079H239.604V97.922C239.604,97.566 239.675,97.231 239.801,96.927L237.953,96.161C237.728,96.703 237.604,97.298 237.604,97.922V100.079ZM248.676,93.321V95.321H250.833C251.189,95.321 251.524,95.392 251.828,95.518L252.594,93.67C252.052,93.445 251.457,93.321 250.833,93.321H248.676ZM255.434,104.393H253.434V106.55C253.434,106.906 253.364,107.241 253.238,107.545L255.085,108.311C255.31,107.769 255.434,107.174 255.434,106.55V104.393Z" />
- <path
- android:fillColor="#87C214"
- android:pathData="M108.75,109.808V129.511C108.75,131.11 110.052,132.429 111.668,132.429H113.036C114.636,132.429 115.955,131.11 115.955,129.511V109.808H108.75V109.808Z" />
- <path
- android:fillColor="#87C214"
- android:pathData="M115.938,100.312V96.602C115.938,95.003 114.636,93.684 113.036,93.684H111.668C110.069,93.684 108.75,95.003 108.75,96.602V100.312H115.938V100.312Z" />
- <path
- android:fillColor="#87C214"
- android:pathData="M131.931,116.305V96.602C131.931,95.003 130.628,93.684 129.029,93.684H127.66C126.061,93.684 124.742,95.003 124.742,96.602V116.305H131.931V116.305Z" />
- <path
- android:fillColor="#87C214"
- android:pathData="M124.742,125.801V129.511C124.742,131.11 126.061,132.429 127.66,132.429H129.029C130.628,132.429 131.947,131.11 131.947,129.511V125.801H124.742Z" />
- <path
- android:fillColor="#95D220"
- android:pathData="M107.595,117.459H103.886C102.286,117.459 100.967,118.761 100.967,120.377V121.746C100.967,123.345 102.27,124.664 103.886,124.664H107.595V117.459Z" />
- <path
- android:fillColor="#95D220"
- android:pathData="M136.795,117.459H117.092V124.664H136.795C138.394,124.664 139.713,123.345 139.713,121.746V120.377C139.713,118.761 138.394,117.459 136.795,117.459Z" />
- <path
- android:fillColor="#95D220"
- android:pathData="M123.588,101.466H103.886C102.286,101.466 100.967,102.769 100.967,104.385V105.753C100.967,107.352 102.27,108.671 103.886,108.671H123.588V101.466Z" />
- <path
- android:fillColor="#95D220"
- android:pathData="M136.795,101.466H133.085V108.671H136.795C138.394,108.671 139.713,107.369 139.713,105.753V104.384C139.713,102.769 138.394,101.466 136.795,101.466Z" />
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_transfer_data.xml b/briar-android/src/main/res/drawable/ic_transfer_data.xml
deleted file mode 100644
index 68d313e52b40bec466bad587780c05bb6410e847..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_transfer_data.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="155dp"
- android:height="155dp"
- android:viewportWidth="155"
- android:viewportHeight="155">
- <path
- android:fillColor="@color/briar_lime_400"
- android:pathData="m34.889,27.866c-0.93,-0.021 -1.779,0.612 -1.994,1.555 -0.246,1.077 0.427,2.148 1.504,2.395l5.34,1.223c-6.857,4.771 -12.782,10.788 -17.445,17.768 -5.477,8.197 -9.072,17.492 -10.541,27.219 -0.217,1.437 0.827,2.738 2.271,2.898 1.444,0.16 2.741,-0.88 2.963,-2.316 1.373,-8.889 4.673,-17.381 9.682,-24.877 4.281,-6.406 9.717,-11.929 16.004,-16.316l-1.271,5.559c-0.246,1.077 0.427,2.15 1.504,2.396 1.077,0.246 2.15,-0.427 2.396,-1.504l2.076,-9.08c0.167,-0.732 0.108,-1.458 -0.109,-2.123 -0.033,-0.348 -0.136,-0.693 -0.314,-1.018 -0.354,-0.642 -0.935,-1.078 -1.586,-1.258 -0.31,-0.167 -0.638,-0.31 -0.998,-0.393l-9.078,-2.076c-0.135,-0.031 -0.269,-0.048 -0.402,-0.051zM111.871,30.743c-0.836,0.055 -1.633,0.527 -2.082,1.316 -0.717,1.263 -0.271,2.864 0.961,3.635 8.143,5.096 14.998,12.029 20.002,20.258 4.936,8.117 7.92,17.253 8.746,26.689l-4.25,-3.395c-0.863,-0.689 -2.121,-0.549 -2.811,0.314 -0.689,0.863 -0.549,2.121 0.314,2.811l7.277,5.813c1.726,1.379 4.242,1.097 5.621,-0.629l5.813,-7.277c0.69,-0.863 0.549,-2.121 -0.314,-2.811 -0.863,-0.689 -2.122,-0.549 -2.811,0.314l-3.59,4.494c-0.886,-10.274 -4.128,-20.221 -9.502,-29.057 -5.469,-8.994 -12.974,-16.564 -21.895,-22.105 -0.463,-0.288 -0.979,-0.404 -1.48,-0.371zM45.191,140.86c-0.852,0.028 -1.671,0.446 -2.164,1.209 -0.789,1.219 -0.443,2.855 0.807,3.596 9.034,5.356 19.211,8.518 29.715,9.217 10.503,0.699 21.012,-1.086 30.676,-5.197 1.337,-0.569 1.897,-2.143 1.277,-3.457 -0.621,-1.313 -2.188,-1.87 -3.527,-1.305 -8.852,3.73 -18.466,5.348 -28.076,4.709 -9.61,-0.64 -18.923,-3.518 -27.203,-8.389 -0.47,-0.276 -0.993,-0.4 -1.504,-0.383z" />
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="M68.475,3.03C66.724,3.03 65.046,3.726 63.809,4.964 62.571,6.201 61.875,7.879 61.875,9.63L61.875,49.229c0,1.75 0.696,3.43 1.934,4.668 1.238,1.238 2.916,1.934 4.666,1.934h19.801c1.75,0 3.428,-0.696 4.666,-1.934 1.238,-1.238 1.934,-2.918 1.934,-4.668L94.875,9.63c0,-1.75 -0.696,-3.428 -1.934,-4.666C91.704,3.726 90.026,3.03 88.275,3.03ZM68.475,6.331h19.801c0.875,0 1.715,0.346 2.334,0.965 0.619,0.619 0.965,1.459 0.965,2.334L91.574,49.229c0,0.875 -0.346,1.715 -0.965,2.334C89.99,52.182 89.151,52.53 88.275,52.53L68.475,52.53c-0.875,0 -1.715,-0.348 -2.334,-0.967 -0.619,-0.619 -0.965,-1.459 -0.965,-2.334L65.176,9.63c0,-0.875 0.346,-1.715 0.965,-2.334 0.619,-0.619 1.459,-0.965 2.334,-0.965zM11.25,100.03 L0,111.43v22.799C0,136.319 1.688,138.03 3.75,138.03h22.5c2.063,0 3.75,-1.711 3.75,-3.801L30,103.831C30,101.741 28.313,100.03 26.25,100.03ZM131,103.63c-0.796,0 -1.559,0.316 -2.121,0.879 -0.563,0.562 -0.879,1.325 -0.879,2.121v13.5c-0.796,0 -1.559,0.316 -2.121,0.879 -0.563,0.562 -0.879,1.325 -0.879,2.121v16.5h3v-16.5h24v16.5h3v-16.5c0,-0.796 -0.316,-1.559 -0.879,-2.121 -0.562,-0.563 -1.325,-0.879 -2.121,-0.879v-13.5c0,-0.796 -0.316,-1.559 -0.879,-2.121 -0.562,-0.563 -1.325,-0.879 -2.121,-0.879zM12.807,103.831L26.25,103.831v30.398L3.75,134.229L3.75,113.007ZM131,106.63h18v13.5L131,120.13ZM9.375,109.53v7.6h3.75L13.125,109.53ZM15,109.53v7.6h3.75L18.75,109.53ZM20.625,109.53v7.6h3.75L24.375,109.53Z" />
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="m78.375,46.2c0.875,0 1.715,-0.348 2.333,-0.967 0.619,-0.619 0.966,-1.458 0.966,-2.333 0,-0.875 -0.348,-1.715 -0.966,-2.333C80.09,39.948 79.25,39.6 78.375,39.6c-0.875,0 -1.715,0.348 -2.333,0.966 -0.619,0.619 -0.967,1.458 -0.967,2.333 0,0.875 0.348,1.715 0.967,2.333 0.619,0.619 1.458,0.967 2.333,0.967z" />
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="m134,109.6h4.5v3H134Z" />
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="m141.5,109.6h4.5v3h-4.5z" />
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_transfer_data_receive.xml b/briar-android/src/main/res/drawable/ic_transfer_data_receive.xml
deleted file mode 100644
index 87d43457fb80f45b6b23678e8b0ab6d3d4a41d65..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_transfer_data_receive.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="120dp"
- android:height="52dp"
- android:viewportWidth="120"
- android:viewportHeight="52">
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="m15.975,14.267c-0.596,0 -1.168,0.238 -1.589,0.659 -0.422,0.421 -0.659,0.993 -0.659,1.589v10.111c-0.596,0 -1.166,0.236 -1.587,0.658 -0.422,0.421 -0.659,0.993 -0.659,1.589v12.359h2.247v-12.359h17.977v12.359h2.247L33.951,28.873c0,-0.596 -0.236,-1.168 -0.658,-1.589 -0.421,-0.422 -0.993,-0.658 -1.589,-0.658L31.704,16.515c0,-0.596 -0.238,-1.168 -0.659,-1.589 -0.421,-0.422 -0.993,-0.659 -1.589,-0.659zM15.975,16.515L29.456,16.515L29.456,26.626L15.975,26.626ZM18.222,18.739v2.247h3.37v-2.247zM23.84,18.739v2.247h3.37v-2.247z" />
- <path
- android:fillColor="@color/briar_brand_green"
- android:pathData="m47.828,24.463v3.074h18.443l-8.453,8.453 2.182,2.182 12.172,-12.172 -12.172,-12.172 -2.182,2.182 8.453,8.453z" />
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="M93.999,0C92.275,0 90.624,0.686 89.405,1.905 88.186,3.124 87.501,4.776 87.501,6.5L87.501,45.498c0,1.724 0.686,3.379 1.905,4.598C90.624,51.314 92.275,52 93.999,52h19.501c1.724,0 3.377,-0.686 4.596,-1.905C119.314,48.877 120,47.222 120,45.498L120,6.5C120,4.776 119.314,3.124 118.095,1.905 116.877,0.686 115.224,0 113.5,0ZM93.999,3.252h19.501c0.862,0 1.689,0.34 2.299,0.949 0.609,0.609 0.951,1.437 0.951,2.299L116.75,45.498c0,0.862 -0.342,1.689 -0.951,2.299 -0.609,0.609 -1.437,0.953 -2.299,0.953L93.999,48.75c-0.862,0 -1.687,-0.344 -2.297,-0.953 -0.609,-0.61 -0.951,-1.437 -0.951,-2.299L90.751,6.5c0,-0.862 0.342,-1.689 0.951,-2.299 0.61,-0.609 1.435,-0.949 2.297,-0.949zM103.749,36.016c-0.862,0 -1.687,0.342 -2.297,0.951 -0.609,0.61 -0.953,1.437 -0.953,2.299 0,0.862 0.344,1.687 0.953,2.297 0.609,0.61 1.435,0.951 2.297,0.951 0.862,0 1.689,-0.342 2.299,-0.951 0.609,-0.609 0.951,-1.435 0.951,-2.297 0,-0.862 -0.342,-1.689 -0.951,-2.299 -0.61,-0.609 -1.437,-0.951 -2.299,-0.951z" />
-</vector>
diff --git a/briar-android/src/main/res/drawable/ic_transfer_data_send.xml b/briar-android/src/main/res/drawable/ic_transfer_data_send.xml
deleted file mode 100644
index 59b6f35ba289e0b9924b48cb20842fcb765e72cc..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_transfer_data_send.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="120dp"
- android:height="52dp"
- android:viewportWidth="120"
- android:viewportHeight="52">
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="m91.223,12.31c-0.596,0 -1.168,0.238 -1.589,0.659 -0.422,0.421 -0.659,0.993 -0.659,1.589v10.111c-0.596,0 -1.166,0.236 -1.587,0.658 -0.422,0.421 -0.659,0.993 -0.659,1.589v12.359h2.247v-12.359h17.977v12.359h2.247L109.199,26.916c0,-0.596 -0.236,-1.168 -0.658,-1.589 -0.421,-0.422 -0.993,-0.658 -1.589,-0.658L106.952,14.558c0,-0.596 -0.238,-1.168 -0.659,-1.589 -0.421,-0.422 -0.993,-0.659 -1.589,-0.659zM91.223,14.558L104.704,14.558L104.704,24.669L91.223,24.669ZM93.47,16.782v2.247h3.37v-2.247zM99.088,16.782v2.247h3.37v-2.247z" />
- <path
- android:fillColor="@color/briar_brand_green"
- android:pathData="m47.828,24.463v3.074h18.443l-8.453,8.453 2.182,2.182 12.172,-12.172 -12.172,-12.172 -2.182,2.182 8.453,8.453z" />
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="M6.498,0C4.774,0 3.123,0.686 1.905,1.905 0.686,3.124 0,4.776 0,6.5L0,45.498c0,1.724 0.686,3.379 1.905,4.598C3.123,51.314 4.774,52 6.498,52L25.999,52c1.724,0 3.377,-0.686 4.596,-1.905 1.219,-1.219 1.905,-2.874 1.905,-4.598L32.499,6.5c0,-1.724 -0.686,-3.377 -1.905,-4.596C29.376,0.686 27.723,0 25.999,0ZM6.498,3.252L25.999,3.252c0.862,0 1.689,0.34 2.299,0.949 0.609,0.609 0.951,1.437 0.951,2.299L29.249,45.498c0,0.862 -0.342,1.689 -0.951,2.299 -0.61,0.609 -1.437,0.953 -2.299,0.953L6.498,48.75c-0.862,0 -1.687,-0.344 -2.297,-0.953C3.592,47.187 3.25,46.36 3.25,45.498L3.25,6.5c0,-0.862 0.342,-1.689 0.951,-2.299C4.811,3.592 5.636,3.252 6.498,3.252ZM16.249,36.016c-0.862,0 -1.687,0.342 -2.297,0.951 -0.61,0.61 -0.953,1.437 -0.953,2.299 0,0.862 0.344,1.687 0.953,2.297 0.609,0.61 1.435,0.951 2.297,0.951 0.862,0 1.689,-0.342 2.299,-0.951 0.609,-0.609 0.951,-1.435 0.951,-2.297 0,-0.862 -0.342,-1.689 -0.951,-2.299 -0.61,-0.609 -1.437,-0.951 -2.299,-0.951z" />
-</vector>
diff --git a/briar-android/src/main/res/drawable/il_add_contact_remote.xml b/briar-android/src/main/res/drawable/il_add_contact_remote.xml
new file mode 100644
index 0000000000000000000000000000000000000000..36d63f8af4a2d8b31bbe36e9abd4594e935f4399
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_add_contact_remote.xml
@@ -0,0 +1,138 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="200dp"
+ android:height="100dp"
+ android:viewportWidth="289"
+ android:viewportHeight="145">
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M48.32,41C48.32,36.58 44.74,33 40.32,33H14.32C9.9,33 6.32,36.58 6.32,41V103C6.32,107.42 9.9,111 14.32,111H40.32C44.74,111 48.32,107.42 48.32,103V41Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M14.32,34.5H40.32C43.91,34.5 46.82,37.41 46.82,41V103C46.82,106.59 43.91,109.5 40.32,109.5H14.32C10.73,109.5 7.82,106.59 7.82,103V41C7.82,37.41 10.73,34.5 14.32,34.5ZM40.32,33C44.74,33 48.32,36.58 48.32,41V103C48.32,107.42 44.74,111 40.32,111H14.32C9.9,111 6.32,107.42 6.32,103V41C6.32,36.58 9.9,33 14.32,33H40.32Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M48.32,47.25H6.32V101.25H48.32V47.25Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M7.82,48.75H46.82V99.75H7.82V48.75ZM48.32,47.25V101.25H6.32V47.25H48.32Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M10.93,69.1C10.93,66.89 12.72,65.1 14.93,65.1H39.72C41.92,65.1 43.72,66.89 43.72,69.1V79.39C43.72,81.6 41.92,83.39 39.72,83.39H14.93C12.72,83.39 10.93,81.6 10.93,79.39V69.1Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M16.69,71.55C16.69,71.14 17.02,70.8 17.44,70.8H37.31C37.73,70.8 38.06,71.14 38.06,71.55C38.06,71.97 37.73,72.3 37.31,72.3H17.44C17.02,72.3 16.69,71.97 16.69,71.55Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M16.69,77.65C16.69,77.24 17.02,76.9 17.44,76.9H28.12C28.53,76.9 28.87,77.24 28.87,77.65C28.87,78.07 28.53,78.4 28.12,78.4H17.44C17.02,78.4 16.69,78.07 16.69,77.65Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M26.32,41C26.32,41.55 26.77,42 27.32,42C27.87,42 28.32,41.55 28.32,41C28.32,40.45 27.87,40 27.32,40C26.77,40 26.32,40.45 26.32,41Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M18.57,41.02C18.57,40.61 18.91,40.27 19.32,40.27H23.32C23.73,40.27 24.07,40.61 24.07,41.02C24.07,41.44 23.73,41.77 23.32,41.77H19.32C18.91,41.77 18.57,41.44 18.57,41.02Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M30.57,41.02C30.57,40.61 30.91,40.27 31.32,40.27H35.32C35.73,40.27 36.07,40.61 36.07,41.02C36.07,41.44 35.73,41.77 35.32,41.77H31.32C30.91,41.77 30.57,41.44 30.57,41.02Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M150.32,54C150.32,49.58 146.74,46 142.32,46H126.32C121.9,46 118.32,49.58 118.32,54V70C118.32,74.42 121.9,78 126.32,78H142.32C146.74,78 150.32,74.42 150.32,70V54Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M126.32,47.5H142.32C145.91,47.5 148.82,50.41 148.82,54V70C148.82,73.59 145.91,76.5 142.32,76.5H126.32C122.73,76.5 119.82,73.59 119.82,70V54C119.82,50.41 122.73,47.5 126.32,47.5ZM142.32,46C146.74,46 150.32,49.58 150.32,54V70C150.32,74.42 146.74,78 142.32,78H126.32C121.9,78 118.32,74.42 118.32,70V54C118.32,49.58 121.9,46 126.32,46H142.32Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M132.93,60.42C134.25,59.1 136.39,59.1 137.71,60.42C139.03,61.74 139.03,63.88 137.71,65.2L133.73,69.18C132.41,70.5 130.27,70.5 128.95,69.18C127.63,67.86 127.63,65.72 128.95,64.4L132.93,60.42ZM136.65,61.48C135.92,60.75 134.73,60.75 133.99,61.48L130.01,65.46C129.28,66.19 129.28,67.39 130.01,68.12C130.75,68.85 131.94,68.85 132.67,68.12L136.65,64.14C137.39,63.41 137.39,62.22 136.65,61.48Z" />
+ <path
+ android:fillColor="#D9D9D9"
+ android:pathData="M137.18,59.32L138.81,60.95L137.18,62.58L135.55,60.95L137.18,59.32Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M135.71,63.58C134.39,64.9 132.25,64.9 130.93,63.58C129.61,62.26 129.61,60.12 130.93,58.8L134.91,54.82C136.23,53.5 138.37,53.5 139.69,54.82C141.01,56.14 141.01,58.28 139.69,59.6L135.71,63.58ZM131.99,62.52C132.72,63.25 133.91,63.25 134.65,62.52L138.63,58.54C139.36,57.8 139.36,56.61 138.63,55.88C137.89,55.14 136.7,55.14 135.97,55.88L131.99,59.86C131.25,60.59 131.25,61.78 131.99,62.52Z" />
+ <path
+ android:fillColor="#D9D9D9"
+ android:pathData="M131.46,64.68L129.83,63.05L131.46,61.42L133.09,63.05L131.46,64.68Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M281.32,41C281.32,36.58 277.74,33 273.32,33H247.32C242.9,33 239.32,36.58 239.32,41V103C239.32,107.42 242.9,111 247.32,111H273.32C277.74,111 281.32,107.42 281.32,103V41Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M247.32,34.5H273.32C276.91,34.5 279.82,37.41 279.82,41V103C279.82,106.59 276.91,109.5 273.32,109.5H247.32C243.73,109.5 240.82,106.59 240.82,103V41C240.82,37.41 243.73,34.5 247.32,34.5ZM273.32,33C277.74,33 281.32,36.58 281.32,41V103C281.32,107.42 277.74,111 273.32,111H247.32C242.9,111 239.32,107.42 239.32,103V41C239.32,36.58 242.9,33 247.32,33H273.32Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M281.32,47.25H239.32V101.25H281.32V47.25Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M240.82,48.75H279.82V99.75H240.82V48.75ZM281.32,47.25V101.25H239.32V47.25H281.32Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M243.93,69.1C243.93,66.89 245.72,65.1 247.93,65.1H272.71C274.92,65.1 276.71,66.89 276.71,69.1V79.39C276.71,81.6 274.92,83.39 272.71,83.39H247.93C245.72,83.39 243.93,81.6 243.93,79.39V69.1Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M249.69,71.55C249.69,71.14 250.02,70.8 250.44,70.8H270.31C270.72,70.8 271.06,71.14 271.06,71.55C271.06,71.97 270.72,72.3 270.31,72.3H250.44C250.02,72.3 249.69,71.97 249.69,71.55Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M249.69,77.65C249.69,77.24 250.02,76.9 250.44,76.9H261.12C261.53,76.9 261.87,77.24 261.87,77.65C261.87,78.07 261.53,78.4 261.12,78.4H250.44C250.02,78.4 249.69,78.07 249.69,77.65Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M259.32,41C259.32,41.55 259.77,42 260.32,42C260.87,42 261.32,41.55 261.32,41C261.32,40.45 260.87,40 260.32,40C259.77,40 259.32,40.45 259.32,41Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M251.57,41.02C251.57,40.61 251.91,40.27 252.32,40.27H256.32C256.73,40.27 257.07,40.61 257.07,41.02C257.07,41.44 256.73,41.77 256.32,41.77H252.32C251.91,41.77 251.57,41.44 251.57,41.02Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M263.57,41.02C263.57,40.61 263.91,40.27 264.32,40.27H268.32C268.73,40.27 269.07,40.61 269.07,41.02C269.07,41.44 268.73,41.77 268.32,41.77H264.32C263.91,41.77 263.57,41.44 263.57,41.02Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M169.32,73C169.32,68.58 165.74,65 161.32,65H145.32C140.9,65 137.32,68.58 137.32,73V89C137.32,93.42 140.9,97 145.32,97H161.32C165.74,97 169.32,93.42 169.32,89V73Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M145.32,66.5H161.32C164.91,66.5 167.82,69.41 167.82,73V89C167.82,92.59 164.91,95.5 161.32,95.5H145.32C141.73,95.5 138.82,92.59 138.82,89V73C138.82,69.41 141.73,66.5 145.32,66.5ZM161.32,65C165.74,65 169.32,68.58 169.32,73V89C169.32,93.42 165.74,97 161.32,97H145.32C140.9,97 137.32,93.42 137.32,89V73C137.32,68.58 140.9,65 145.32,65H161.32Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M151.93,79.42C153.25,78.1 155.39,78.1 156.71,79.42C158.03,80.74 158.03,82.88 156.71,84.2L152.73,88.18C151.41,89.5 149.27,89.5 147.95,88.18C146.63,86.86 146.63,84.72 147.95,83.4L151.93,79.42ZM155.65,80.48C154.92,79.75 153.73,79.75 152.99,80.48L149.01,84.46C148.28,85.19 148.28,86.39 149.01,87.12C149.75,87.85 150.94,87.85 151.67,87.12L155.65,83.14C156.39,82.41 156.39,81.22 155.65,80.48Z" />
+ <path
+ android:fillColor="#D9D9D9"
+ android:pathData="M156.18,78.32L157.81,79.95L156.18,81.58L154.55,79.95L156.18,78.32Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:fillType="evenOdd"
+ android:pathData="M154.71,82.58C153.39,83.9 151.25,83.9 149.93,82.58C148.61,81.26 148.61,79.12 149.93,77.8L153.91,73.82C155.23,72.5 157.37,72.5 158.69,73.82C160.01,75.14 160.01,77.28 158.69,78.6L154.71,82.58ZM150.99,81.52C151.72,82.25 152.91,82.25 153.65,81.52L157.63,77.54C158.36,76.8 158.36,75.61 157.63,74.88C156.89,74.14 155.7,74.14 154.97,74.88L150.99,78.86C150.25,79.59 150.25,80.78 150.99,81.52Z" />
+ <path
+ android:fillColor="#D9D9D9"
+ android:pathData="M150.46,83.68L148.83,82.05L150.46,80.42L152.09,82.05L150.46,83.68Z" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M87.32,62C87.32,64.21 85.53,66 83.32,66C81.11,66 79.32,64.21 79.32,62C79.32,59.79 81.11,58 83.32,58C85.53,58 87.32,59.79 87.32,62Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M103.32,62C103.32,64.21 101.53,66 99.32,66C97.11,66 95.32,64.21 95.32,62C95.32,59.79 97.11,58 99.32,58C101.53,58 103.32,59.79 103.32,62Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M71.32,62C71.32,64.21 69.53,66 67.32,66C65.11,66 63.32,64.21 63.32,62C63.32,59.79 65.11,58 67.32,58C69.53,58 71.32,59.79 71.32,62Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:pathData="M200.32,81C200.32,78.79 202.11,77 204.32,77C206.53,77 208.32,78.79 208.32,81C208.32,83.21 206.53,85 204.32,85C202.11,85 200.32,83.21 200.32,81Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M184.32,81C184.32,78.79 186.11,77 188.32,77C190.53,77 192.32,78.79 192.32,81C192.32,83.21 190.53,85 188.32,85C186.11,85 184.32,83.21 184.32,81Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M216.32,81C216.32,78.79 218.11,77 220.32,77C222.53,77 224.32,78.79 224.32,81C224.32,83.21 222.53,85 220.32,85C218.11,85 216.32,83.21 216.32,81Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_add_contact_remote_nickname.xml b/briar-android/src/main/res/drawable/il_add_contact_remote_nickname.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5eda3f0d8f7080e0fd2b791ceae49015a7063f9d
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_add_contact_remote_nickname.xml
@@ -0,0 +1,135 @@
+<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="#DDEDFE"
+ android:pathData="M41.3,13.7H95.3C101.5,13.7 106.5,18.7 106.5,24.9V145.9C106.5,152.1 101.5,157.1 95.3,157.1H41.3C35.1,157.1 30.1,152.1 30.1,145.9V25C30.1,18.7 35.1,13.7 41.3,13.7Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M99.6,40.6C99.6,36.6 96.4,33.4 92.4,33.4H44.4C40.4,33.4 37.2,36.6 37.2,40.6V136.6C37.2,140.6 40.4,143.8 44.4,143.8H92.4C96.4,143.8 99.6,140.6 99.6,136.6V40.6Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M95.3,13H41.3C34.7,13 29.3,18.4 29.3,25V146C29.3,152.6 34.7,158 41.3,158H95.3C101.9,158 107.3,152.6 107.3,146V25C107.3,18.3 102,13 95.3,13ZM105.8,146C105.8,151.8 101.1,156.5 95.3,156.5H41.3C35.5,156.5 30.8,151.8 30.8,146V25C30.8,19.2 35.5,14.5 41.3,14.5H95.3C101.1,14.5 105.8,19.2 105.8,25V146Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M68.3,26.9C70,26.9 71.3,25.6 71.3,23.9C71.3,22.2 70,20.9 68.3,20.9C66.6,20.9 65.3,22.2 65.3,23.9C65.3,25.6 66.7,26.9 68.3,26.9ZM68.3,22.4C69.1,22.4 69.8,23.1 69.8,23.9C69.8,24.7 69.1,25.4 68.3,25.4C67.5,25.4 66.8,24.7 66.8,23.9C66.8,23.1 67.5,22.4 68.3,22.4Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M50.3,24.4H60.3C60.7,24.4 61.1,24.1 61.1,23.6C61.1,23.1 60.8,22.8 60.3,22.8H50.3C49.9,22.8 49.5,23.1 49.5,23.6C49.5,24.1 49.9,24.4 50.3,24.4Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M76.3,24.4H86.3C86.7,24.4 87.1,24.1 87.1,23.6C87.1,23.1 86.8,22.8 86.3,22.8H76.3C75.9,22.8 75.5,23.1 75.5,23.6C75.5,24.1 75.9,24.4 76.3,24.4Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M92.3,32.6H44.3C39.9,32.6 36.3,36.2 36.3,40.6V136.6C36.3,141 39.9,144.6 44.3,144.6H92.3C96.7,144.6 100.3,141 100.3,136.6V40.6C100.3,36.2 96.7,32.6 92.3,32.6ZM98.8,136.6C98.8,140.2 95.9,143.1 92.3,143.1H44.3C40.7,143.1 37.8,140.2 37.8,136.6V40.6C37.8,37 40.7,34.1 44.3,34.1H92.3C95.9,34.1 98.8,37 98.8,40.6V136.6Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M90.3,45.8H60.9C60.5,45.8 60.1,45.5 60.1,45C60.1,44.5 60.4,44.2 60.9,44.2H90.4C90.8,44.2 91.2,44.5 91.2,45C91.2,45.5 90.7,45.8 90.3,45.8Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M76.7,51.7H60.9C60.5,51.7 60.1,51.4 60.1,50.9C60.1,50.4 60.4,50.1 60.9,50.1H76.7C77.1,50.1 77.5,50.4 77.5,50.9C77.5,51.4 77.1,51.7 76.7,51.7Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M90.3,87.8H60.9C60.5,87.8 60.1,87.5 60.1,87C60.1,86.5 60.4,86.2 60.9,86.2H90.4C90.8,86.2 91.2,86.5 91.2,87C91.2,87.5 90.7,87.8 90.3,87.8Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M76.7,93.7H60.9C60.5,93.7 60.1,93.4 60.1,92.9C60.1,92.4 60.4,92.1 60.9,92.1H76.7C77.1,92.1 77.5,92.4 77.5,92.9C77.5,93.4 77.1,93.7 76.7,93.7Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M90.3,66.8H60.9C60.5,66.8 60.1,66.5 60.1,66C60.1,65.5 60.4,65.2 60.9,65.2H90.4C90.8,65.2 91.2,65.5 91.2,66C91.2,66.5 90.7,66.8 90.3,66.8Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M76.7,72.7H60.9C60.5,72.7 60.1,72.4 60.1,71.9C60.1,71.4 60.4,71.1 60.9,71.1H76.7C77.1,71.1 77.5,71.4 77.5,71.9C77.5,72.4 77.1,72.7 76.7,72.7Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M90.3,129.8H60.9C60.5,129.8 60.1,129.5 60.1,129C60.1,128.5 60.4,128.2 60.9,128.2H90.4C90.8,128.2 91.2,128.5 91.2,129C91.2,129.5 90.7,129.8 90.3,129.8Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M76.7,135.7H60.9C60.5,135.7 60.1,135.4 60.1,134.9C60.1,134.4 60.4,134.1 60.9,134.1H76.7C77.1,134.1 77.5,134.4 77.5,134.9C77.5,135.4 77.1,135.7 76.7,135.7Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M90.3,108.8H60.9C60.5,108.8 60.1,108.5 60.1,108C60.1,107.5 60.4,107.2 60.9,107.2H90.4C90.8,107.2 91.2,107.5 91.2,108C91.2,108.5 90.7,108.8 90.3,108.8Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M76.7,114.7H60.9C60.5,114.7 60.1,114.4 60.1,113.9C60.1,113.4 60.4,113.1 60.9,113.1H76.7C77.1,113.1 77.5,113.4 77.5,113.9C77.5,114.4 77.1,114.7 76.7,114.7Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M96.3,34.8H150.3C156.5,34.8 161.5,39.8 161.5,46V167C161.5,173.2 156.5,178.2 150.3,178.2H96.3C90.1,178.2 85.1,173.2 85.1,167V46C85.1,39.8 90.1,34.8 96.3,34.8Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M154.6,61.6C154.6,57.6 151.4,54.4 147.4,54.4H99.4C95.4,54.4 92.2,57.6 92.2,61.6V157.6C92.2,161.6 95.4,164.8 99.4,164.8H147.4C151.4,164.8 154.6,161.6 154.6,157.6V61.6Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M150.3,34H96.3C89.7,34 84.3,39.4 84.3,46V167C84.3,173.6 89.7,179 96.3,179H150.3C156.9,179 162.3,173.6 162.3,167V46C162.3,39.4 157,34 150.3,34ZM160.8,167C160.8,172.8 156.1,177.5 150.3,177.5H96.3C90.5,177.5 85.8,172.8 85.8,167V46C85.8,40.2 90.5,35.5 96.3,35.5H150.3C156.1,35.5 160.8,40.2 160.8,46V167Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M123.3,47.9C125,47.9 126.3,46.6 126.3,44.9C126.3,43.2 125,41.9 123.3,41.9C121.6,41.9 120.3,43.2 120.3,44.9C120.3,46.6 121.7,47.9 123.3,47.9ZM123.3,43.4C124.1,43.4 124.8,44.1 124.8,44.9C124.8,45.7 124.1,46.4 123.3,46.4C122.5,46.4 121.8,45.7 121.8,44.9C121.8,44.1 122.5,43.4 123.3,43.4Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M105.3,45.4H115.3C115.7,45.4 116.1,45.1 116.1,44.6C116.1,44.1 115.8,43.8 115.3,43.8H105.3C104.9,43.8 104.5,44.1 104.5,44.6C104.5,45.1 104.9,45.4 105.3,45.4Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M131.3,45.4H141.3C141.7,45.4 142.1,45.1 142.1,44.6C142.1,44.1 141.8,43.8 141.3,43.8H131.3C130.9,43.8 130.5,44.1 130.5,44.6C130.5,45.1 130.9,45.4 131.3,45.4Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M147.3,53.6H99.3C94.9,53.6 91.3,57.2 91.3,61.6V157.6C91.3,162 94.9,165.6 99.3,165.6H147.3C151.7,165.6 155.3,162 155.3,157.6V61.6C155.3,57.2 151.7,53.6 147.3,53.6ZM153.8,157.6C153.8,161.2 150.9,164.1 147.3,164.1H99.3C95.7,164.1 92.8,161.2 92.8,157.6V61.6C92.8,58 95.7,55.1 99.3,55.1H147.3C150.9,55.1 153.8,58 153.8,61.6V157.6Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M49.3,54C52.56,54 55.2,51.31 55.2,48C55.2,44.69 52.56,42 49.3,42C46.04,42 43.4,44.69 43.4,48C43.4,51.31 46.04,54 49.3,54Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M49.3,96C52.56,96 55.2,93.31 55.2,90C55.2,86.69 52.56,84 49.3,84C46.04,84 43.4,86.69 43.4,90C43.4,93.31 46.04,96 49.3,96Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M49.3,75C52.56,75 55.2,72.31 55.2,69C55.2,65.69 52.56,63 49.3,63C46.04,63 43.4,65.69 43.4,69C43.4,72.31 46.04,75 49.3,75Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M49.3,138C52.56,138 55.2,135.31 55.2,132C55.2,128.69 52.56,126 49.3,126C46.04,126 43.4,128.69 43.4,132C43.4,135.31 46.04,138 49.3,138Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M49.3,117C52.56,117 55.2,114.31 55.2,111C55.2,107.69 52.56,105 49.3,105C46.04,105 43.4,107.69 43.4,111C43.4,114.31 46.04,117 49.3,117Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M104.3,75C107.56,75 110.2,72.31 110.2,69C110.2,65.69 107.56,63 104.3,63C101.04,63 98.4,65.69 98.4,69C98.4,72.31 101.04,75 104.3,75Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M104.3,159C107.56,159 110.2,156.31 110.2,153C110.2,149.69 107.56,147 104.3,147C101.04,147 98.4,149.69 98.4,153C98.4,156.31 101.04,159 104.3,159Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M104.3,138C107.56,138 110.2,135.31 110.2,132C110.2,128.69 107.56,126 104.3,126C101.04,126 98.4,128.69 98.4,132C98.4,135.31 101.04,138 104.3,138Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M115.9,66.8H145.4C145.8,66.8 146.2,66.5 146.2,66C146.2,65.5 145.9,65.2 145.4,65.2H115.9C115.5,65.2 115.1,65.5 115.1,66C115.1,66.5 115.5,66.8 115.9,66.8Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M115.9,72.7H131.7C132.1,72.7 132.5,72.4 132.5,71.9C132.5,71.4 132.2,71.1 131.7,71.1H115.9C115.5,71.1 115.1,71.4 115.1,71.9C115.1,72.4 115.5,72.7 115.9,72.7Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M145.3,149.3H115.8C115.4,149.3 115,149.6 115,150.1C115,150.6 115.3,150.9 115.8,150.9H145.3C145.7,150.9 146.1,150.6 146.1,150.1C146.1,149.6 145.7,149.3 145.3,149.3Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M131.7,155.2H115.9C115.5,155.2 115.1,155.5 115.1,156C115.1,156.5 115.4,156.8 115.9,156.8H131.7C132.1,156.8 132.5,156.5 132.5,156C132.5,155.5 132.1,155.2 131.7,155.2Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M145.3,128.3H115.8C115.4,128.3 115,128.6 115,129.1C115,129.6 115.3,129.9 115.8,129.9H145.3C145.7,129.9 146.1,129.6 146.1,129.1C146.1,128.6 145.7,128.3 145.3,128.3Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M115.9,135.7H131.7C132.1,135.7 132.5,135.4 132.5,134.9C132.5,134.4 132.2,134.1 131.7,134.1H115.9C115.5,134.1 115.1,134.4 115.1,134.9C115.1,135.4 115.5,135.7 115.9,135.7Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M74.3,83H172.3C174.5,83 176.3,84.8 176.3,87V114C176.3,116.2 174.5,118 172.3,118H74.3C72.1,118 70.3,116.2 70.3,114V87C70.3,84.8 72.1,83 74.3,83Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M164.3,95.3H112.3C111.9,95.3 111.5,95.6 111.5,96.1C111.5,96.6 111.8,96.9 112.3,96.9H164.3C164.7,96.9 165.1,96.6 165.1,96.1C165.1,95.6 164.7,95.3 164.3,95.3Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M140.3,104.1H112.3C111.9,104.1 111.5,104.4 111.5,104.9C111.5,105.4 111.8,105.7 112.3,105.7H140.3C140.7,105.7 141.1,105.4 141.1,104.9C141.1,104.4 140.7,104.1 140.3,104.1Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M91.8,102.2H90.3C85.5,102.2 81.5,106.1 81.5,111V111.1C81.5,111.5 81.8,111.8 82.3,111.8C82.8,111.8 83.1,111.4 83.1,111C83.1,107 86.4,103.8 90.3,103.8H91.8C95.8,103.8 99,107.1 99,111.1C99,111.5 99.3,111.8 99.8,111.8C100.3,111.8 100.6,111.4 100.6,111C100.5,106.1 96.6,102.2 91.8,102.2Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M91.1,99.5C93.8,99.5 96,97.3 96,94.6C96,91.9 93.8,89.7 91.1,89.7C88.4,89.7 86.2,91.9 86.2,94.6C86.2,97.4 88.4,99.5 91.1,99.5ZM91.1,91.3C93,91.3 94.5,92.8 94.5,94.7C94.5,96.6 92.9,98 91.1,98C89.3,98 87.7,96.5 87.7,94.6C87.7,92.7 89.2,91.3 91.1,91.3Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_bluetooth_connect.xml b/briar-android/src/main/res/drawable/il_bluetooth_connect.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8ab5e0acc55acd72268e2a1d4270dcac0ac47ced
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_bluetooth_connect.xml
@@ -0,0 +1,85 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="200dp"
+ android:height="100dp"
+ android:viewportWidth="289"
+ android:viewportHeight="145">
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M268.9,40.8C268.9,36.39 265.32,32.8 260.9,32.8H234.9C230.48,32.8 226.9,36.39 226.9,40.8V102.81C226.9,107.22 230.48,110.81 234.9,110.81H260.9C265.32,110.81 268.9,107.22 268.9,102.81V40.8Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M234.9,34.3H260.9C264.49,34.3 267.4,37.21 267.4,40.8V102.81C267.4,106.39 264.49,109.31 260.9,109.31H234.9C231.31,109.31 228.4,106.39 228.4,102.81V40.8C228.4,37.21 231.31,34.3 234.9,34.3ZM260.9,32.8C265.32,32.8 268.9,36.39 268.9,40.8V102.81C268.9,107.22 265.32,110.81 260.9,110.81H234.9C230.48,110.81 226.9,107.22 226.9,102.81V40.8C226.9,36.39 230.48,32.8 234.9,32.8H260.9Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M246.9,40.81C246.9,41.36 247.35,41.81 247.9,41.81C248.45,41.81 248.9,41.36 248.9,40.81C248.9,40.25 248.45,39.8 247.9,39.8C247.35,39.8 246.9,40.25 246.9,40.81Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M239.15,40.83C239.15,40.41 239.49,40.08 239.9,40.08H243.9C244.32,40.08 244.65,40.41 244.65,40.83C244.65,41.24 244.32,41.58 243.9,41.58H239.9C239.49,41.58 239.15,41.24 239.15,40.83Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M251.15,40.83C251.15,40.41 251.49,40.08 251.9,40.08H255.9C256.32,40.08 256.65,40.41 256.65,40.83C256.65,41.24 256.32,41.58 255.9,41.58H251.9C251.49,41.58 251.15,41.24 251.15,40.83Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M268.9,47.05H226.9V101.05H268.9V47.05Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M228.4,48.55H267.4V99.55H228.4V48.55ZM268.9,47.05V101.05H226.9V47.05H268.9Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M61.9,40.8C61.9,36.39 58.32,32.8 53.9,32.8H27.9C23.48,32.8 19.9,36.39 19.9,40.8V102.81C19.9,107.22 23.48,110.81 27.9,110.81H53.9C58.32,110.81 61.9,107.22 61.9,102.81V40.8Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M27.9,34.3H53.9C57.49,34.3 60.4,37.21 60.4,40.8V102.81C60.4,106.39 57.49,109.31 53.9,109.31H27.9C24.31,109.31 21.4,106.39 21.4,102.81V40.8C21.4,37.21 24.31,34.3 27.9,34.3ZM53.9,32.8C58.32,32.8 61.9,36.39 61.9,40.8V102.81C61.9,107.22 58.32,110.81 53.9,110.81H27.9C23.48,110.81 19.9,107.22 19.9,102.81V40.8C19.9,36.39 23.48,32.8 27.9,32.8H53.9Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M39.9,40.81C39.9,41.36 40.35,41.81 40.9,41.81C41.45,41.81 41.9,41.36 41.9,40.81C41.9,40.25 41.45,39.8 40.9,39.8C40.35,39.8 39.9,40.25 39.9,40.81Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M32.15,40.83C32.15,40.41 32.49,40.08 32.9,40.08H36.9C37.32,40.08 37.65,40.41 37.65,40.83C37.65,41.24 37.32,41.58 36.9,41.58H32.9C32.49,41.58 32.15,41.24 32.15,40.83Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M44.15,40.83C44.15,40.41 44.49,40.08 44.9,40.08H48.9C49.32,40.08 49.65,40.41 49.65,40.83C49.65,41.24 49.32,41.58 48.9,41.58H44.9C44.49,41.58 44.15,41.24 44.15,40.83Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M61.9,47.05H19.9V101.05H61.9V47.05Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M21.4,48.55H60.4V99.55H21.4V48.55ZM61.9,47.05V101.05H19.9V47.05H61.9Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:pathData="M96.15,71.8C96.15,74.01 94.36,75.8 92.15,75.8C89.94,75.8 88.15,74.01 88.15,71.8C88.15,69.6 89.94,67.8 92.15,67.8C94.36,67.8 96.15,69.6 96.15,71.8Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M112.15,71.8C112.15,74.01 110.36,75.8 108.15,75.8C105.94,75.8 104.15,74.01 104.15,71.8C104.15,69.6 105.94,67.8 108.15,67.8C110.36,67.8 112.15,69.6 112.15,71.8Z" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M80.15,71.8C80.15,74.01 78.36,75.8 76.15,75.8C73.94,75.8 72.15,74.01 72.15,71.8C72.15,69.6 73.94,67.8 76.15,67.8C78.36,67.8 80.15,69.6 80.15,71.8Z" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M192.65,71.8C192.65,69.6 194.44,67.8 196.65,67.8C198.86,67.8 200.65,69.6 200.65,71.8C200.65,74.01 198.86,75.8 196.65,75.8C194.44,75.8 192.65,74.01 192.65,71.8Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M176.65,71.8C176.65,69.6 178.44,67.8 180.65,67.8C182.86,67.8 184.65,69.6 184.65,71.8C184.65,74.01 182.86,75.8 180.65,75.8C178.44,75.8 176.65,74.01 176.65,71.8Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M208.65,71.8C208.65,69.6 210.44,67.8 212.65,67.8C214.86,67.8 216.65,69.6 216.65,71.8C216.65,74.01 214.86,75.8 212.65,75.8C210.44,75.8 208.65,74.01 208.65,71.8Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M166.27,61.8C166.27,55.18 160.9,49.8 154.27,49.8H134.27C127.64,49.8 122.27,55.18 122.27,61.8V81.8C122.27,88.43 127.64,93.8 134.27,93.8H154.27C160.9,93.8 166.27,88.43 166.27,81.8V61.8Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M134.27,51.3H154.27C160.07,51.3 164.77,56.01 164.77,61.8V81.8C164.77,87.6 160.07,92.3 154.27,92.3H134.27C128.47,92.3 123.77,87.6 123.77,81.8V61.8C123.77,56.01 128.47,51.3 134.27,51.3ZM154.27,49.8C160.9,49.8 166.27,55.18 166.27,61.8V81.8C166.27,88.43 160.9,93.8 154.27,93.8H134.27C127.64,93.8 122.27,88.43 122.27,81.8V61.8C122.27,55.18 127.64,49.8 134.27,49.8H154.27Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M144.08,61.35C144.34,61.23 144.65,61.26 144.88,61.45L150.58,66.15C150.75,66.29 150.85,66.5 150.85,66.72C150.86,66.94 150.76,67.15 150.6,67.3L145.55,71.68L150.6,76.05C150.76,76.19 150.85,76.4 150.85,76.62C150.85,76.83 150.76,77.04 150.6,77.18L144.89,82.15C144.67,82.34 144.36,82.39 144.09,82.27C143.82,82.14 143.65,81.88 143.65,81.58V73.32L139.19,77.19C138.88,77.46 138.4,77.42 138.13,77.11C137.86,76.8 137.89,76.32 138.21,76.05L143.26,71.68L138.21,67.3C137.89,67.03 137.86,66.55 138.13,66.24C138.4,65.93 138.88,65.89 139.19,66.17L143.65,70.03V62.03C143.65,61.74 143.82,61.47 144.08,61.35ZM145.15,73.32L148.96,76.62L145.15,79.94V73.32ZM145.15,70.03V63.62L148.94,66.75L145.15,70.03Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_crash.xml b/briar-android/src/main/res/drawable/il_crash.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1149e2d933075a90374cbb4be0eca6563676b403
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_crash.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="80dp"
+ android:height="80dp"
+ android:viewportWidth="80"
+ android:viewportHeight="80">
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M40.651,76.5C60.81,76.5 77.151,60.158 77.151,40C77.151,19.842 60.81,3.5 40.651,3.5C20.493,3.5 4.151,19.842 4.151,40C4.151,60.158 20.493,76.5 40.651,76.5ZM40.651,78C61.638,78 78.651,60.987 78.651,40C78.651,19.013 61.638,2 40.651,2C19.664,2 2.651,19.013 2.651,40C2.651,60.987 19.664,78 40.651,78Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M16.083,26.651C16.376,26.358 16.851,26.358 17.144,26.651L24.614,34.121L32.083,26.651C32.376,26.358 32.851,26.358 33.144,26.651C33.437,26.944 33.437,27.419 33.144,27.712L25.674,35.182L33.144,42.651C33.437,42.944 33.437,43.419 33.144,43.712C32.851,44.005 32.376,44.005 32.083,43.712L24.614,36.242L17.144,43.712C16.851,44.005 16.376,44.005 16.083,43.712C15.79,43.419 15.79,42.944 16.083,42.651L23.553,35.182L16.083,27.712C15.79,27.419 15.79,26.944 16.083,26.651Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M48.159,26.651C48.452,26.358 48.927,26.358 49.22,26.651L56.689,34.121L64.159,26.651C64.452,26.358 64.927,26.358 65.22,26.651C65.513,26.944 65.513,27.419 65.22,27.712L57.75,35.182L65.22,42.651C65.513,42.944 65.513,43.419 65.22,43.712C64.927,44.005 64.452,44.005 64.159,43.712L56.689,36.242L49.22,43.712C48.927,44.005 48.452,44.005 48.159,43.712C47.866,43.419 47.866,42.944 48.159,42.651L55.629,35.182L48.159,27.712C47.866,27.419 47.866,26.944 48.159,26.651Z" />
+ <path
+ android:fillColor="@color/il_background"
+ android:pathData="M53.713,63.403C53.713,59.938 52.337,56.616 49.888,54.167C47.438,51.717 44.116,50.341 40.651,50.341C37.187,50.341 33.865,51.717 31.415,54.167C28.965,56.616 27.589,59.938 27.589,63.403L40.651,63.403L53.713,63.403Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M52.116,61.903C51.787,59.39 50.639,57.039 48.827,55.227C46.659,53.059 43.718,51.841 40.651,51.841C37.585,51.841 34.644,53.059 32.476,55.227C30.664,57.039 29.516,59.39 29.187,61.903L52.116,61.903ZM53.627,61.903C53.29,58.991 51.981,56.26 49.888,54.167C47.438,51.717 44.116,50.341 40.651,50.341C37.187,50.341 33.865,51.717 31.415,54.167C29.322,56.26 28.012,58.991 27.676,61.903C27.618,62.398 27.589,62.899 27.589,63.403L53.713,63.403C53.713,62.899 53.684,62.398 53.627,61.903Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_empty_state_blogs.xml b/briar-android/src/main/res/drawable/il_empty_state_blogs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e7889087afdea132b6ce01bf630cf05c077401f9
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_empty_state_blogs.xml
@@ -0,0 +1,37 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="81dp"
+ android:height="81dp"
+ android:viewportWidth="81"
+ android:viewportHeight="81">
+ <path
+ android:fillColor="@color/il_background"
+ android:pathData="M14.96,62.003C13.856,62.003 12.96,61.107 12.96,60.003L12.96,30.003C12.96,28.898 13.856,28.003 14.96,28.003L34.96,28.003C36.065,28.003 36.96,28.898 36.96,30.003L36.96,60.003C36.96,61.107 36.065,62.003 34.96,62.003L14.96,62.003Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M34.96,29.503L14.96,29.503C14.684,29.503 14.46,29.727 14.46,30.003L14.46,60.003C14.46,60.279 14.684,60.503 14.96,60.503L34.96,60.503C35.237,60.503 35.46,60.279 35.46,60.003L35.46,30.003C35.46,29.727 35.237,29.503 34.96,29.503ZM12.96,60.003C12.96,61.107 13.856,62.003 14.96,62.003L34.96,62.003C36.065,62.003 36.96,61.107 36.96,60.003L36.96,30.003C36.96,28.898 36.065,28.003 34.96,28.003L14.96,28.003C13.856,28.003 12.96,28.898 12.96,30.003L12.96,60.003Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M45.596,40.67C45.596,40.256 45.931,39.92 46.346,39.92L68.345,39.92C68.76,39.92 69.095,40.256 69.095,40.67C69.095,41.084 68.76,41.42 68.345,41.42L46.346,41.42C45.931,41.42 45.596,41.084 45.596,40.67Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M45.596,32.004C45.596,31.59 45.931,31.254 46.346,31.254L68.345,31.254C68.76,31.254 69.095,31.59 69.095,32.004C69.095,32.418 68.76,32.754 68.345,32.754L46.346,32.754C45.931,32.754 45.596,32.418 45.596,32.004Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M45.596,49.337C45.596,48.923 45.931,48.587 46.346,48.587L68.346,48.587C68.76,48.587 69.096,48.923 69.096,49.337C69.096,49.751 68.76,50.087 68.346,50.087L46.346,50.087C45.931,50.087 45.596,49.751 45.596,49.337Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M45.596,58.003C45.596,57.589 45.931,57.253 46.346,57.253L57.346,57.253C57.76,57.253 58.096,57.589 58.096,58.003C58.096,58.417 57.76,58.753 57.346,58.753L46.346,58.753C45.931,58.753 45.596,58.417 45.596,58.003Z" />
+ <path
+ android:fillColor="@color/il_background"
+ android:fillType="evenOdd"
+ android:pathData="M79.868,24.902C79.852,20.497 76.277,16.931 71.868,16.931L9.868,16.931C5.45,16.931 1.868,20.513 1.868,24.931L1.868,16.874C1.868,12.456 5.45,8.874 9.868,8.874L71.868,8.874C76.286,8.874 79.868,12.456 79.868,16.874V24.902Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M1.118,16.874C1.118,12.042 5.036,8.124 9.868,8.124L71.868,8.124C76.701,8.124 80.618,12.042 80.618,16.874V64.874C80.618,69.706 76.701,73.624 71.868,73.624L9.868,73.623C5.036,73.623 1.118,69.706 1.118,64.873L1.118,56.849L1.118,56.843L1.118,16.874ZM9.868,9.624L71.868,9.624C75.872,9.624 79.118,12.87 79.118,16.874V19.954C77.545,17.631 74.885,16.105 71.868,16.105L9.868,16.105C6.852,16.105 4.191,17.631 2.618,19.954L2.618,16.874C2.618,12.87 5.864,9.624 9.868,9.624ZM2.618,64.873C2.618,68.878 5.864,72.123 9.868,72.123L71.868,72.124C75.872,72.124 79.118,68.878 79.118,64.874L79.118,24.905L79.118,24.903C79.103,20.912 75.863,17.681 71.868,17.681L9.868,17.681C5.864,17.681 2.618,20.927 2.618,24.931L2.618,64.873Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_empty_state_contact_list.xml b/briar-android/src/main/res/drawable/il_empty_state_contact_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1cd9bc527512c5d8f91c3d5ec9af466831f0c20
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_empty_state_contact_list.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="81dp"
+ android:height="81dp"
+ android:viewportWidth="81"
+ android:viewportHeight="81">
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M54.877,3.199L70.294,5.822C75.408,6.692 78.855,11.5 78.039,16.622L69.73,68.746C68.748,74.906 62.001,78.315 56.476,75.442L57.175,74.112C61.791,76.512 67.427,73.664 68.247,68.518L76.556,16.395C77.244,12.081 74.341,8.032 70.034,7.299L56.398,4.98L57.175,74.112L55.674,74.136L54.877,3.199Z" />
+ <path
+ android:fillColor="@color/il_background"
+ android:fillType="evenOdd"
+ android:pathData="M9.602,74.999L9.602,4H57.602C62.02,4 65.602,7.582 65.602,12V67C65.602,71.418 62.02,75 57.602,75L9.602,74.999ZM21.89,49.166V53.039C21.89,57.458 25.471,61.039 29.89,61.039H45.847C50.265,61.039 53.847,57.458 53.847,53.039V49.166C53.847,44.747 50.265,41.166 45.847,41.166H29.89C25.471,41.166 21.89,44.747 21.89,49.166ZM37.868,34.853C42.557,34.853 46.357,31.072 46.357,26.407C46.357,21.742 42.557,17.961 37.868,17.961C33.18,17.961 29.38,21.742 29.38,26.407C29.38,31.072 33.18,34.853 37.868,34.853Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M21.89,49.166V53.039C21.89,57.458 25.471,61.039 29.89,61.039H45.847C50.265,61.039 53.847,57.458 53.847,53.039V49.166C53.847,44.747 50.265,41.166 45.847,41.166H29.89C25.471,41.166 21.89,44.747 21.89,49.166ZM23.39,53.039V49.166C23.39,45.576 26.3,42.666 29.89,42.666H45.847C49.437,42.666 52.347,45.576 52.347,49.166V53.039C52.347,56.629 49.437,59.539 45.847,59.539H29.89C26.3,59.539 23.39,56.629 23.39,53.039Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M37.868,34.853C42.557,34.853 46.357,31.072 46.357,26.407C46.357,21.742 42.557,17.961 37.868,17.961C33.18,17.961 29.38,21.742 29.38,26.407C29.38,31.072 33.18,34.853 37.868,34.853ZM44.857,26.407C44.857,30.236 41.735,33.353 37.868,33.353C34.002,33.353 30.88,30.236 30.88,26.407C30.88,22.578 34.002,19.461 37.868,19.461C41.735,19.461 44.857,22.578 44.857,26.407Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M57.602,2.5H8.102L8.102,17.733H2.851C2.436,17.733 2.101,18.069 2.101,18.483C2.101,18.898 2.436,19.233 2.851,19.233H8.102L8.102,38.878H2.851C2.436,38.878 2.101,39.214 2.101,39.628C2.101,40.042 2.436,40.378 2.851,40.378H8.102L8.102,60.752H2.851C2.436,60.752 2.101,61.088 2.101,61.502C2.101,61.916 2.436,62.252 2.851,62.252H8.102L8.102,76.499L57.602,76.5C62.849,76.5 67.102,72.247 67.102,67V12C67.102,6.753 62.849,2.5 57.602,2.5ZM9.602,62.252L9.602,74.999L57.602,75C62.02,75 65.602,71.418 65.602,67V12C65.602,7.582 62.02,4 57.602,4H9.602L9.602,17.733H14.615C15.029,17.733 15.365,18.069 15.365,18.483C15.365,18.898 15.029,19.233 14.615,19.233H9.602L9.602,38.878H14.615C15.029,38.878 15.365,39.214 15.365,39.628C15.365,40.042 15.029,40.378 14.615,40.378H9.602L9.602,60.752H14.615C15.029,60.752 15.365,61.088 15.365,61.502C15.365,61.916 15.029,62.252 14.615,62.252H9.602Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_empty_state_forum_list.xml b/briar-android/src/main/res/drawable/il_empty_state_forum_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b25b9d02ae9a028bc074298fda775e15eca310d7
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_empty_state_forum_list.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="81dp"
+ android:height="81dp"
+ android:viewportWidth="81"
+ android:viewportHeight="81">
+ <path
+ android:fillColor="@color/il_background"
+ android:fillType="evenOdd"
+ android:pathData="M20.394,48.642V58.213C20.394,62.631 23.975,66.213 28.394,66.213H63.081L79.401,75.329V30.909C79.401,26.491 75.82,22.909 71.401,22.909H60.407V40.642C60.407,45.061 56.825,48.642 52.407,48.642H20.394Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M9.401,4.579C4.569,4.579 0.651,8.497 0.651,13.329V59.02L17.915,49.378H19.644V58.213C19.644,63.046 23.561,66.963 28.394,66.963H62.886L80.151,76.606V30.909C80.151,26.077 76.234,22.159 71.401,22.159H61.152V13.329C61.152,8.497 57.235,4.579 52.402,4.579H9.401ZM2.151,13.329C2.151,9.325 5.397,6.079 9.401,6.079H52.402C56.406,6.079 59.652,9.325 59.652,13.329V40.628C59.652,44.632 56.406,47.878 52.402,47.878H17.524L2.151,56.464V13.329ZM61.157,40.642V23.659H71.401C75.406,23.659 78.651,26.905 78.651,30.909V74.051L63.277,65.463H28.394C24.389,65.463 21.144,62.217 21.144,58.213V49.392H52.407C57.239,49.392 61.157,45.475 61.157,40.642Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_empty_state_group_list.xml b/briar-android/src/main/res/drawable/il_empty_state_group_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..656a339ed23750cff2a490a93204b3b19cd61909
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_empty_state_group_list.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="81dp"
+ android:height="81dp"
+ android:viewportWidth="81"
+ android:viewportHeight="81">
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M49.133,16.654C49.133,21.219 45.433,24.919 40.868,24.919C36.304,24.919 32.603,21.219 32.603,16.654C32.603,12.089 36.304,8.389 40.868,8.389C45.433,8.389 49.133,12.089 49.133,16.654ZM47.633,16.654C47.633,20.39 44.604,23.419 40.868,23.419C37.132,23.419 34.103,20.39 34.103,16.654C34.103,12.917 37.132,9.889 40.868,9.889C44.604,9.889 47.633,12.917 47.633,16.654Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M25.745,25.92C25.745,30.484 22.045,34.185 17.48,34.185C12.915,34.185 9.215,30.484 9.215,25.92C9.215,21.355 12.915,17.654 17.48,17.654C22.045,17.654 25.745,21.355 25.745,25.92ZM24.245,25.92C24.245,29.656 21.216,32.685 17.48,32.685C13.744,32.685 10.715,29.656 10.715,25.92C10.715,22.183 13.744,19.154 17.48,19.154C21.216,19.154 24.245,22.183 24.245,25.92Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:pathData="M2.618,49.168C2.618,45.164 5.864,41.918 9.868,41.918H24.506V61.165C24.506,61.579 24.842,61.915 25.256,61.915C25.671,61.915 26.006,61.579 26.006,61.165V41.975C29.579,42.424 32.342,45.473 32.342,49.168V72.392C32.342,72.806 32.678,73.142 33.092,73.142C33.506,73.142 33.842,72.806 33.842,72.392V49.168C33.842,44.644 30.409,40.922 26.006,40.465V39.777C26.006,35.773 29.252,32.527 33.256,32.527H48.48C52.485,32.527 55.73,35.773 55.73,39.777V40.465C51.327,40.922 47.894,44.644 47.894,49.168V70.555C47.894,70.969 48.23,71.305 48.644,71.305C49.058,71.305 49.394,70.969 49.394,70.555V49.168C49.394,45.473 52.158,42.424 55.73,41.975V61.165C55.73,61.579 56.066,61.915 56.48,61.915C56.895,61.915 57.23,61.579 57.23,61.165V41.918H71.868C75.872,41.918 79.118,45.164 79.118,49.168V70.555C79.118,70.969 79.454,71.305 79.868,71.305C80.282,71.305 80.618,70.969 80.618,70.555V49.168C80.618,44.335 76.701,40.418 71.868,40.418H57.23V39.777C57.23,34.945 53.313,31.027 48.48,31.027H33.256C28.424,31.027 24.506,34.945 24.506,39.777V40.418H9.868C5.036,40.418 1.118,44.335 1.118,49.168V72.392C1.118,72.806 1.454,73.142 1.868,73.142C2.282,73.142 2.618,72.806 2.618,72.392V49.168Z" />
+ <path
+ android:fillColor="@color/il_border"
+ android:fillType="evenOdd"
+ android:pathData="M72.522,25.92C72.522,30.484 68.821,34.185 64.256,34.185C59.692,34.185 55.991,30.484 55.991,25.92C55.991,21.355 59.692,17.654 64.256,17.654C68.821,17.654 72.522,21.355 72.522,25.92ZM71.022,25.92C71.022,29.656 67.993,32.685 64.256,32.685C60.52,32.685 57.491,29.656 57.491,25.92C57.491,22.183 60.52,19.154 64.256,19.154C67.993,19.154 71.022,22.183 71.022,25.92Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_mailbox.xml b/briar-android/src/main/res/drawable/il_mailbox.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cc4f7945db45c6db507125ce60ec219c25bb6917
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_mailbox.xml
@@ -0,0 +1,124 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="192dp"
+ android:viewportWidth="193"
+ android:viewportHeight="192">
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M112.4,21C112.4,16.58 108.82,13 104.4,13H88.4C83.98,13 80.4,16.58 80.4,21V37C80.4,41.42 83.98,45 88.4,45H104.4C108.82,45 112.4,41.42 112.4,37V21Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M88.4,14.5H104.4C107.99,14.5 110.9,17.41 110.9,21V37C110.9,40.59 107.99,43.5 104.4,43.5H88.4C84.81,43.5 81.9,40.59 81.9,37V21C81.9,17.41 84.81,14.5 88.4,14.5ZM104.4,13C108.82,13 112.4,16.58 112.4,21V37C112.4,41.42 108.82,45 104.4,45H88.4C83.98,45 80.4,41.42 80.4,37V21C80.4,16.58 83.98,13 88.4,13H104.4Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M60.4,127C60.4,122.58 56.82,119 52.4,119H36.4C31.98,119 28.4,122.58 28.4,127V143C28.4,147.42 31.98,151 36.4,151H52.4C56.82,151 60.4,147.42 60.4,143V127Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M36.4,120.5H52.4C55.99,120.5 58.9,123.41 58.9,127V143C58.9,146.59 55.99,149.5 52.4,149.5H36.4C32.81,149.5 29.9,146.59 29.9,143V127C29.9,123.41 32.81,120.5 36.4,120.5ZM52.4,119C56.82,119 60.4,122.58 60.4,127V143C60.4,147.42 56.82,151 52.4,151H36.4C31.98,151 28.4,147.42 28.4,143V127C28.4,122.58 31.98,119 36.4,119H52.4Z" />
+ <path
+ android:fillColor="#9CA3AF"
+ android:fillType="evenOdd"
+ android:pathData="M43.65,116L43.65,100L45.15,100L45.15,116L43.65,116Z" />
+ <path
+ android:fillColor="#9CA3AF"
+ android:fillType="evenOdd"
+ android:pathData="M95.65,66L95.65,48L97.15,48L97.15,66L95.65,66Z" />
+ <path
+ android:fillColor="#9CA3AF"
+ android:fillType="evenOdd"
+ android:pathData="M95.65,155L95.65,126L97.15,126L97.15,155L95.65,155Z" />
+ <path
+ android:fillColor="#9CA3AF"
+ android:fillType="evenOdd"
+ android:pathData="M150.15,67V92H148.65V67H150.15Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M149.17,96.45H126.4V94.95H149.17C153.58,94.95 157.15,98.52 157.15,102.93L157.15,121.7L155.65,121.7L155.65,102.93C155.65,99.35 152.75,96.45 149.17,96.45Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M43.63,95.25L66.4,95.25L66.4,96.75L43.63,96.75C39.22,96.75 35.65,93.18 35.65,88.77L35.65,70L37.15,70L37.15,88.77C37.15,92.35 40.05,95.25 43.63,95.25Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M157.4,52C157.4,49.79 155.61,48 153.4,48H145.4C143.19,48 141.4,49.79 141.4,52V60C141.4,62.21 143.19,64 145.4,64H153.4C155.61,64 157.4,62.21 157.4,60V52Z" />
+ <path
+ android:fillColor="#9CA3AF"
+ android:fillType="evenOdd"
+ android:pathData="M145.4,49.5H153.4C154.78,49.5 155.9,50.62 155.9,52V60C155.9,61.38 154.78,62.5 153.4,62.5H145.4C144.02,62.5 142.9,61.38 142.9,60V52C142.9,50.62 144.02,49.5 145.4,49.5ZM153.4,48C155.61,48 157.4,49.79 157.4,52V60C157.4,62.21 155.61,64 153.4,64H145.4C143.19,64 141.4,62.21 141.4,60V52C141.4,49.79 143.19,48 145.4,48H153.4Z" />
+ <path
+ android:fillColor="#E5E7EB"
+ android:pathData="M104.4,162C104.4,159.79 102.61,158 100.4,158H92.4C90.19,158 88.4,159.79 88.4,162V170C88.4,172.21 90.19,174 92.4,174H100.4C102.61,174 104.4,172.21 104.4,170V162Z" />
+ <path
+ android:fillColor="#9CA3AF"
+ android:fillType="evenOdd"
+ android:pathData="M92.4,159.5H100.4C101.78,159.5 102.9,160.62 102.9,162V170C102.9,171.38 101.78,172.5 100.4,172.5H92.4C91.02,172.5 89.9,171.38 89.9,170V162C89.9,160.62 91.02,159.5 92.4,159.5ZM100.4,158C102.61,158 104.4,159.79 104.4,162V170C104.4,172.21 102.61,174 100.4,174H92.4C90.19,174 88.4,172.21 88.4,170V162C88.4,159.79 90.19,158 92.4,158H100.4Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M123.24,81C123.24,74.37 117.87,69 111.24,69H81.24C74.61,69 69.24,74.37 69.24,81V111C69.24,117.63 74.61,123 81.24,123H111.24C117.87,123 123.24,117.63 123.24,111V81Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M81.24,70.5H111.24C117.04,70.5 121.74,75.2 121.74,81V111C121.74,116.8 117.04,121.5 111.24,121.5H81.24C75.44,121.5 70.74,116.8 70.74,111V81C70.74,75.2 75.44,70.5 81.24,70.5ZM111.24,69C117.87,69 123.24,74.37 123.24,81V111C123.24,117.63 117.87,123 111.24,123H81.24C74.61,123 69.24,117.63 69.24,111V81C69.24,74.37 74.61,69 81.24,69H111.24Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:fillType="evenOdd"
+ android:pathData="M86.97,83.57H106.41C107.15,83.57 107.85,83.87 108.38,84.39C108.9,84.92 109.19,85.63 109.19,86.37L109.19,110.31C109.19,111.38 107.95,111.96 107.14,111.28L102.1,107.57H86.97C86.23,107.57 85.52,107.28 85,106.75C84.48,106.23 84.19,105.52 84.19,104.78V86.37C84.19,85.63 84.48,84.92 85,84.39C85.52,83.87 86.23,83.57 86.97,83.57ZM94.36,95.95H88.63V88.04H104.74V95.95H99.12V98.69H101.17C101.54,98.69 101.73,99.14 101.47,99.4L97.03,103.87C96.87,104.03 96.6,104.03 96.44,103.87L92,99.4C91.74,99.14 91.93,98.69 92.3,98.69H94.36V95.95Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M172.4,132C172.4,127.58 168.82,124 164.4,124H148.4C143.98,124 140.4,127.58 140.4,132V148C140.4,152.42 143.98,156 148.4,156H164.4C168.82,156 172.4,152.42 172.4,148V132Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M148.4,125.5H164.4C167.99,125.5 170.9,128.41 170.9,132V148C170.9,151.59 167.99,154.5 164.4,154.5H148.4C144.81,154.5 141.9,151.59 141.9,148V132C141.9,128.41 144.81,125.5 148.4,125.5ZM164.4,124C168.82,124 172.4,127.58 172.4,132V148C172.4,152.42 168.82,156 164.4,156H148.4C143.98,156 140.4,152.42 140.4,148V132C140.4,127.58 143.98,124 148.4,124H164.4Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M152,138.54V145.66C152,146.24 152.47,146.71 153.05,146.71H153.55C154.13,146.71 154.6,146.24 154.6,145.66V138.54H152Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M154.6,135.11V133.77C154.6,133.19 154.13,132.71 153.55,132.71H153.05C152.48,132.71 152,133.19 152,133.77V135.11H154.6Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M160.38,140.89V133.77C160.38,133.19 159.91,132.71 159.33,132.71H158.83C158.26,132.71 157.78,133.19 157.78,133.77V140.89H160.38Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M157.78,144.32V145.66C157.78,146.24 158.26,146.71 158.83,146.71H159.33C159.91,146.71 160.38,146.24 160.38,145.66V144.32H157.78Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M151.58,141.3H150.24C149.66,141.3 149.19,141.77 149.19,142.36V142.85C149.19,143.43 149.66,143.91 150.24,143.91H151.58V141.3Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M162.13,141.3H155.01V143.91H162.13C162.71,143.91 163.19,143.43 163.19,142.85V142.36C163.19,141.77 162.71,141.3 162.13,141.3Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M157.36,135.53H150.24C149.66,135.53 149.19,136 149.19,136.58V137.07C149.19,137.65 149.66,138.13 150.24,138.13H157.36V135.53Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M162.13,135.53H160.79V138.13H162.13C162.71,138.13 163.19,137.66 163.19,137.07V136.58C163.19,136 162.71,135.53 162.13,135.53Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M28.03,50.65V64.89C28.03,66.05 28.97,67 30.13,67H31.12C32.28,67 33.23,66.05 33.23,64.89V50.65H28.03Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M33.22,43.79V41.11C33.22,39.95 32.28,39 31.12,39H30.13C28.98,39 28.03,39.95 28.03,41.11V43.79H33.22Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M44.78,55.35V41.11C44.78,39.95 43.84,39 42.68,39H41.69C40.54,39 39.58,39.95 39.58,41.11V55.35H44.78Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M39.58,62.21V64.89C39.58,66.05 40.54,67 41.69,67H42.68C43.84,67 44.79,66.05 44.79,64.89V62.21H39.58Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M27.19,56.18H24.51C23.35,56.18 22.4,57.12 22.4,58.29V59.28C22.4,60.43 23.34,61.39 24.51,61.39H27.19V56.18Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M48.29,56.18H34.05V61.39H48.29C49.45,61.39 50.4,60.43 50.4,59.28V58.29C50.4,57.12 49.45,56.18 48.29,56.18Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M38.75,44.62H24.51C23.35,44.62 22.4,45.56 22.4,46.73V47.72C22.4,48.88 23.34,49.83 24.51,49.83H38.75V44.62Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M48.29,44.62H45.61V49.83H48.29C49.45,49.83 50.4,48.89 50.4,47.72V46.73C50.4,45.56 49.45,44.62 48.29,44.62Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_mailbox_setup.xml b/briar-android/src/main/res/drawable/il_mailbox_setup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..97f79a54a6a41280a65b594acd149330e652936c
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_mailbox_setup.xml
@@ -0,0 +1,106 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="192dp"
+ android:viewportWidth="193"
+ android:viewportHeight="192">
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M189.85,29C189.85,22.37 184.48,17 177.85,17H86.85C80.23,17 74.85,22.37 74.85,29V163C74.85,169.63 80.23,175 86.85,175H177.85C184.48,175 189.85,169.63 189.85,163V29Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M86.85,18.5H177.85C183.65,18.5 188.35,23.2 188.35,29V163C188.35,168.8 183.65,173.5 177.85,173.5H86.85C81.05,173.5 76.35,168.8 76.35,163V29C76.35,23.2 81.05,18.5 86.85,18.5ZM177.85,17C184.48,17 189.85,22.37 189.85,29V163C189.85,169.63 184.48,175 177.85,175H86.85C80.23,175 74.85,169.63 74.85,163V29C74.85,22.37 80.23,17 86.85,17H177.85Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M183.85,35C183.85,30.58 180.27,27 175.85,27H88.85C84.44,27 80.85,30.58 80.85,35V157C80.85,161.42 84.44,165 88.85,165H175.85C180.27,165 183.85,161.42 183.85,157V35Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M88.85,28.5H175.85C179.44,28.5 182.35,31.41 182.35,35V157C182.35,160.59 179.44,163.5 175.85,163.5H88.85C85.26,163.5 82.35,160.59 82.35,157V35C82.35,31.41 85.26,28.5 88.85,28.5ZM175.85,27C180.27,27 183.85,30.58 183.85,35V157C183.85,161.42 180.27,165 175.85,165H88.85C84.44,165 80.85,161.42 80.85,157V35C80.85,30.58 84.44,27 88.85,27H175.85Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M132.35,38.26C131.52,38.26 130.85,37.58 130.85,36.76C130.85,35.93 131.52,35.26 132.35,35.26C133.18,35.26 133.85,35.93 133.85,36.76C133.85,37.58 133.18,38.26 132.35,38.26ZM132.35,39.76C130.7,39.76 129.35,38.41 129.35,36.76C129.35,35.1 130.7,33.76 132.35,33.76C134.01,33.76 135.35,35.1 135.35,36.76C135.35,38.41 134.01,39.76 132.35,39.76Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:fillType="evenOdd"
+ android:pathData="M116.3,74H147.41C148.59,74 149.72,74.47 150.55,75.32C151.38,76.16 151.85,77.3 151.85,78.49L151.85,116.97C151.85,118.69 149.87,119.63 148.57,118.53L140.51,112.57H116.3C115.12,112.57 113.99,112.1 113.15,111.26C112.32,110.41 111.85,109.27 111.85,108.08V78.49C111.85,77.3 112.32,76.16 113.15,75.32C113.99,74.47 115.12,74 116.3,74ZM128.12,93.9H118.96V81.18H144.74V93.9H135.74V98.29H139.03C139.63,98.29 139.92,99.02 139.5,99.44L132.4,106.62C132.14,106.88 131.72,106.88 131.46,106.62L124.36,99.44C123.94,99.02 124.23,98.29 124.83,98.29H128.12V93.9Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M3.85,29.03C3.85,22.4 9.23,17.03 15.85,17.03H55.85C62.48,17.03 67.85,22.4 67.85,29.03V125.03C67.85,131.65 62.48,137.03 55.85,137.03H15.85C9.23,137.03 3.85,131.65 3.85,125.03V29.03Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M55.85,18.53H15.85C10.05,18.53 5.35,23.23 5.35,29.03V125.03C5.35,130.82 10.05,135.53 15.85,135.53H55.85C61.65,135.53 66.35,130.82 66.35,125.03V29.03C66.35,23.23 61.65,18.53 55.85,18.53ZM15.85,17.03C9.23,17.03 3.85,22.4 3.85,29.03V125.03C3.85,131.65 9.23,137.03 15.85,137.03H55.85C62.48,137.03 67.85,131.65 67.85,125.03V29.03C67.85,22.4 62.48,17.03 55.85,17.03H15.85Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M35.85,27.01C35.33,27.01 34.89,26.58 34.89,26.03C34.89,25.47 35.33,25.05 35.85,25.05C36.37,25.05 36.81,25.47 36.81,26.03C36.81,26.58 36.37,27.01 35.85,27.01ZM35.85,28.51C34.49,28.51 33.39,27.4 33.39,26.03C33.39,24.66 34.49,23.55 35.85,23.55C37.21,23.55 38.31,24.66 38.31,26.03C38.31,27.4 37.21,28.51 35.85,28.51Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M20.33,25.77C20.33,25.35 20.67,25.02 21.08,25.02H29.29C29.7,25.02 30.04,25.35 30.04,25.77C30.04,26.18 29.7,26.52 29.29,26.52H21.08C20.67,26.52 20.33,26.18 20.33,25.77Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M41.67,25.77C41.67,25.35 42,25.02 42.42,25.02L50.62,25.02C51.04,25.02 51.37,25.35 51.37,25.77C51.37,26.18 51.04,26.52 50.62,26.52L42.42,26.52C42,26.52 41.67,26.18 41.67,25.77Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M62.11,41.25C62.11,36.83 58.53,33.25 54.11,33.25H17.6C13.18,33.25 9.6,36.83 9.6,41.25V117.94C9.6,122.36 13.18,125.94 17.6,125.94H54.11C58.53,125.94 62.11,122.36 62.11,117.94V41.25Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M17.6,34.75H54.11C57.7,34.75 60.61,37.66 60.61,41.25V117.94C60.61,121.53 57.7,124.44 54.11,124.44H17.6C14.01,124.44 11.1,121.53 11.1,117.94V41.25C11.1,37.66 14.01,34.75 17.6,34.75ZM54.11,33.25C58.53,33.25 62.11,36.83 62.11,41.25V117.94C62.11,122.36 58.53,125.94 54.11,125.94H17.6C13.18,125.94 9.6,122.36 9.6,117.94V41.25C9.6,36.83 13.18,33.25 17.6,33.25H54.11Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M28,74.96V88.42C28,89.52 28.88,90.42 29.98,90.42H30.9C31.99,90.42 32.88,89.52 32.88,88.42V74.96H28Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M32.87,68.47V65.93C32.87,64.84 31.99,63.94 30.9,63.94H29.98C28.89,63.94 28,64.84 28,65.93V68.47H32.87Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M43.71,79.4V65.93C43.71,64.84 42.83,63.94 41.74,63.94H40.81C39.73,63.94 38.84,64.84 38.84,65.93V79.4H43.71Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M38.84,85.89V88.42C38.84,89.52 39.73,90.42 40.81,90.42H41.74C42.83,90.42 43.72,89.52 43.72,88.42V85.89H38.84Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M27.22,80.19H24.7C23.62,80.19 22.73,81.08 22.73,82.18V83.12C22.73,84.21 23.61,85.11 24.7,85.11H27.22V80.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M47,80.19H33.65V85.11H47C48.09,85.11 48.98,84.21 48.98,83.12V82.18C48.98,81.08 48.09,80.19 47,80.19Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M38.05,69.25H24.7C23.62,69.25 22.73,70.14 22.73,71.25V72.18C22.73,73.28 23.61,74.18 24.7,74.18H38.05V69.25Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M47,69.25H44.49V74.18H47C48.09,74.18 48.98,73.29 48.98,72.18V71.25C48.98,70.14 48.09,69.25 47,69.25Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M67.85,155C67.85,150.58 64.27,147 59.85,147H47.85C43.44,147 39.85,150.58 39.85,155V167C39.85,171.42 43.44,175 47.85,175H59.85C64.27,175 67.85,171.42 67.85,167V155Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M47.85,148.5H59.85C63.44,148.5 66.35,151.41 66.35,155V167C66.35,170.59 63.44,173.5 59.85,173.5H47.85C44.26,173.5 41.35,170.59 41.35,167V155C41.35,151.41 44.26,148.5 47.85,148.5ZM59.85,147C64.27,147 67.85,150.58 67.85,155V167C67.85,171.42 64.27,175 59.85,175H47.85C43.44,175 39.85,171.42 39.85,167V155C39.85,150.58 43.44,147 47.85,147H59.85Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M56.77,155.31H53.45L49.2,162.62H53.45L52.19,167.73L58.5,159.63H54.33L56.77,155.31Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M31.85,155C31.85,150.58 28.27,147 23.85,147H11.85C7.44,147 3.85,150.58 3.85,155V167C3.85,171.42 7.44,175 11.85,175H23.85C28.27,175 31.85,171.42 31.85,167V155Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M11.85,148.5H23.85C27.44,148.5 30.35,151.41 30.35,155V167C30.35,170.59 27.44,173.5 23.85,173.5H11.85C8.26,173.5 5.35,170.59 5.35,167V155C5.35,151.41 8.26,148.5 11.85,148.5ZM23.85,147C28.27,147 31.85,150.58 31.85,155V167C31.85,171.42 28.27,175 23.85,175H11.85C7.44,175 3.85,171.42 3.85,167V155C3.85,150.58 7.44,147 11.85,147H23.85Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M11.63,158.86C12.45,158.05 13.42,157.4 14.49,156.96C15.55,156.51 16.7,156.29 17.85,156.29C19.01,156.29 20.15,156.51 21.22,156.96C22.29,157.4 23.26,158.05 24.07,158.86L23.01,159.92C22.33,159.25 21.53,158.71 20.64,158.34C19.76,157.98 18.81,157.79 17.85,157.79C16.89,157.79 15.94,157.98 15.06,158.34C14.17,158.71 13.37,159.25 12.69,159.92L11.63,158.86Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M13.96,161.19C14.47,160.68 15.08,160.27 15.75,159.99C16.41,159.72 17.13,159.57 17.85,159.57C18.58,159.57 19.29,159.72 19.96,159.99C20.63,160.27 21.24,160.68 21.75,161.19L20.69,162.25C20.32,161.88 19.87,161.58 19.39,161.38C18.9,161.18 18.38,161.07 17.85,161.07C17.33,161.07 16.81,161.18 16.32,161.38C15.83,161.58 15.39,161.88 15.02,162.25L13.96,161.19Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M18.81,164.13C18.81,164.65 18.38,165.08 17.85,165.08C17.32,165.08 16.9,164.65 16.9,164.13C16.9,163.6 17.32,163.17 17.85,163.17C18.38,163.17 18.81,163.6 18.81,164.13Z" />
+</vector>
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 0000000000000000000000000000000000000000..8971fba280285f476e831296f4bb01f732ba9e16
--- /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_error.xml b/briar-android/src/main/res/drawable/il_qr_code_error.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04bc638c758e9145d6f6137d63409a242c6f84b4
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_qr_code_error.xml
@@ -0,0 +1,72 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="96dp"
+ android:viewportWidth="192"
+ android:viewportHeight="96">
+ <path
+ android:fillColor="#e5e7eb"
+ android:pathData="m180.9,17c0,-4.42 -3.58,-8 -8,-8h-26c-4.42,0 -8,3.58 -8,8v62c0,4.42 3.58,8 8,8h26c4.42,0 8,-3.58 8,-8z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:fillType="evenOdd"
+ android:pathData="m146.9,10.5h26c3.59,0 6.5,2.91 6.5,6.5v62c0,3.59 -2.91,6.5 -6.5,6.5h-26c-3.59,0 -6.5,-2.91 -6.5,-6.5L140.4,17c0,-3.59 2.91,-6.5 6.5,-6.5zM172.9,9c4.42,0 8,3.58 8,8v62c0,4.42 -3.58,8 -8,8h-26c-4.42,0 -8,-3.58 -8,-8L138.9,17c0,-4.42 3.58,-8 8,-8z" />
+ <path
+ android:fillColor="#f9fafb"
+ android:pathData="m180.9,23.25h-42v54h42z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:fillType="evenOdd"
+ android:pathData="m140.4,24.75h39v51h-39zM180.9,23.25v54h-42v-54z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:pathData="m163.24,60.25h-2.22v-2.22h2.22zM161.01,52.47h-2.22v5.56h2.22zM169.9,50.25h-2.22v4.44h2.22zM167.68,48.03h-2.22v2.22h2.22zM154.35,50.25h-2.22v2.22h2.22zM152.12,48.03h-2.22v2.22h2.22zM159.9,42.47h2.22L162.12,40.25h-2.22zM151.57,41.91v3.33h3.33v-3.33zM156.57,46.91h-6.67L149.9,40.25h6.67zM151.57,55.25v3.33h3.33L154.9,55.25ZM156.57,60.25h-6.67v-6.67h6.67zM164.9,41.91v3.33h3.33v-3.33zM169.9,46.91h-6.67L163.24,40.25h3.33,3.33zM167.68,58.03v-3.33h-4.44v2.22h2.22v3.33h4.44v-2.22zM165.46,50.25h-4.45v2.22h4.45zM161.01,48.03h-6.67v2.22h2.22v2.22h2.22L158.79,50.25h2.22zM162.12,46.91v-2.22h-2.22v-2.22h-2.22v4.44zM154.07,42.75h-1.67v1.67h1.67zM154.07,56.08h-1.67v1.67h1.67zM167.4,42.75h-1.67v1.67h1.67z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:pathData="m158.9,17c0,0.55 0.45,1 1,1 0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1 -0.55,0 -1,0.45 -1,1z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:fillType="evenOdd"
+ android:pathData="m151.15,17.02c0,-0.41 0.34,-0.75 0.75,-0.75h4c0.41,0 0.75,0.34 0.75,0.75 0,0.41 -0.34,0.75 -0.75,0.75h-4c-0.41,0 -0.75,-0.34 -0.75,-0.75z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:fillType="evenOdd"
+ android:pathData="m163.15,17.02c0,-0.41 0.34,-0.75 0.75,-0.75h4c0.41,0 0.75,0.34 0.75,0.75 0,0.41 -0.34,0.75 -0.75,0.75h-4c-0.41,0 -0.75,-0.34 -0.75,-0.75z" />
+ <path
+ android:fillColor="#e5e7eb"
+ android:pathData="m53.9,17c0,-4.42 -3.58,-8 -8,-8H19.9c-4.42,0 -8,3.58 -8,8v62c0,4.42 3.58,8 8,8H45.9c4.42,0 8,-3.58 8,-8z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:fillType="evenOdd"
+ android:pathData="M19.9,10.5H45.9c3.59,0 6.5,2.91 6.5,6.5v62c0,3.59 -2.91,6.5 -6.5,6.5H19.9c-3.59,0 -6.5,-2.91 -6.5,-6.5V17c0,-3.59 2.91,-6.5 6.5,-6.5zM45.9,9c4.42,0 8,3.58 8,8v62c0,4.42 -3.58,8 -8,8H19.9c-4.42,0 -8,-3.58 -8,-8V17c0,-4.42 3.58,-8 8,-8z" />
+ <path
+ android:fillColor="#f9fafb"
+ android:pathData="M53.9,23.25H11.9v54H53.9Z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:fillType="evenOdd"
+ android:pathData="M13.4,24.75L52.4,24.75v51L13.4,75.75ZM53.9,23.25v54L11.9,77.25v-54z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:pathData="m36.23,60.25h-2.22v-2.22h2.22zM34.01,52.47h-2.22v5.56h2.22zM42.9,50.25h-2.22v4.44h2.22zM40.68,48.03h-2.22v2.22h2.22zM27.35,50.25h-2.22v2.22h2.22zM25.12,48.03h-2.22v2.22h2.22zM32.9,42.47h2.22L35.12,40.25L32.9,40.25ZM24.57,41.91v3.33h3.33v-3.33zM29.57,46.91L22.9,46.91L22.9,40.25h6.67zM24.57,55.25v3.33h3.33L27.9,55.25ZM29.57,60.25h-6.67v-6.67h6.67zM37.9,41.91v3.33h3.33v-3.33zM42.9,46.91L36.23,46.91L36.23,40.25h3.33,3.33zM40.68,58.03v-3.33h-4.44v2.22h2.22L38.46,60.25L42.9,60.25L42.9,58.03ZM38.46,50.25h-4.44v2.22h4.44zM34.01,48.03h-6.67v2.22h2.22v2.22h2.22L31.79,50.25h2.22zM35.12,46.91v-2.22h-2.22v-2.22h-2.22v4.44zM27.07,42.75h-1.67v1.67h1.67zM27.07,56.08L25.4,56.08L25.4,57.75L27.07,57.75ZM40.4,42.75h-1.67v1.67h1.67z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:pathData="m31.9,17c0,0.55 0.45,1 1,1 0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1 -0.55,0 -1,0.45 -1,1z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:fillType="evenOdd"
+ android:pathData="m24.15,17.02c0,-0.41 0.34,-0.75 0.75,-0.75h4c0.41,0 0.75,0.34 0.75,0.75 0,0.41 -0.34,0.75 -0.75,0.75h-4c-0.41,0 -0.75,-0.34 -0.75,-0.75z" />
+ <path
+ android:fillColor="#9ca3af"
+ android:fillType="evenOdd"
+ android:pathData="m36.15,17.02c0,-0.41 0.34,-0.75 0.75,-0.75h4c0.41,0 0.75,0.34 0.75,0.75 0,0.41 -0.34,0.75 -0.75,0.75h-4c-0.41,0 -0.75,-0.34 -0.75,-0.75z" />
+ <path
+ android:fillColor="#f59e0b"
+ android:fillType="evenOdd"
+ android:pathData="m96,42.49c-0.58,0 -1.04,0.47 -1.04,1.04v12.59c0,0.58 0.47,1.04 1.04,1.04 0.58,0 1.04,-0.47 1.04,-1.04v-12.59c0,-0.58 -0.47,-1.04 -1.04,-1.04zM96,60.01c-0.58,0 -1.04,0.47 -1.04,1.04v0.12c0,0.58 0.47,1.04 1.04,1.04 0.58,0 1.04,-0.47 1.04,-1.04L97.04,61.06c0,-0.58 -0.47,-1.04 -1.04,-1.04z"
+ android:strokeWidth="1.39318" />
+ <path
+ android:fillColor="#f59e0b"
+ android:fillType="evenOdd"
+ android:pathData="M114.71,64.86 L96.69,34.28c-0.3,-0.51 -1.08,-0.51 -1.38,0L77.29,64.86c-0.25,0.42 0.02,1.08 0.69,1.08h36.03c0.67,0 0.94,-0.66 0.69,-1.08zM98.49,33.21c-1.11,-1.88 -3.87,-1.88 -4.98,0L75.49,63.8c-1.11,1.88 0.28,4.23 2.49,4.23h36.03c2.21,0 3.6,-2.35 2.49,-4.23z"
+ android:strokeWidth="1.39318" />
+</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 0000000000000000000000000000000000000000..52fc5e4b697f46cd81e156169127367d20bf6bac
--- /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/il_share_app.xml b/briar-android/src/main/res/drawable/il_share_app.xml
new file mode 100644
index 0000000000000000000000000000000000000000..16b4bb9a19700f51230c2d1698ef5ae7259aa3bd
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_share_app.xml
@@ -0,0 +1,103 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="192dp"
+ android:height="192dp"
+ android:viewportWidth="193"
+ android:viewportHeight="193">
+ <path
+ android:fillColor="#E2E8F0"
+ android:pathData="M112.4,21.88C112.4,17.46 108.82,13.88 104.4,13.88H88.4C83.98,13.88 80.4,17.46 80.4,21.88V37.88C80.4,42.3 83.98,45.88 88.4,45.88H104.4C108.82,45.88 112.4,42.3 112.4,37.88V21.88Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M88.4,15.38H104.4C107.99,15.38 110.9,18.29 110.9,21.88V37.88C110.9,41.47 107.99,44.38 104.4,44.38H88.4C84.81,44.38 81.9,41.47 81.9,37.88V21.88C81.9,18.29 84.81,15.38 88.4,15.38ZM104.4,13.88C108.82,13.88 112.4,17.46 112.4,21.88V37.88C112.4,42.3 108.82,45.88 104.4,45.88H88.4C83.98,45.88 80.4,42.3 80.4,37.88V21.88C80.4,17.46 83.98,13.88 88.4,13.88H104.4Z" />
+ <path
+ android:fillColor="#E2E8F0"
+ android:pathData="M60.4,127.88C60.4,123.46 56.82,119.88 52.4,119.88H36.4C31.98,119.88 28.4,123.46 28.4,127.88V143.88C28.4,148.3 31.98,151.88 36.4,151.88H52.4C56.82,151.88 60.4,148.3 60.4,143.88V127.88Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M36.4,121.38H52.4C55.99,121.38 58.9,124.29 58.9,127.88V143.88C58.9,147.47 55.99,150.38 52.4,150.38H36.4C32.81,150.38 29.9,147.47 29.9,143.88V127.88C29.9,124.29 32.81,121.38 36.4,121.38ZM52.4,119.88C56.82,119.88 60.4,123.46 60.4,127.88V143.88C60.4,148.3 56.82,151.88 52.4,151.88H36.4C31.98,151.88 28.4,148.3 28.4,143.88V127.88C28.4,123.46 31.98,119.88 36.4,119.88H52.4Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M43.65,116.88L43.65,100.88L45.15,100.88L45.15,116.88L43.65,116.88Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M95.65,66.88L95.65,48.88L97.15,48.88L97.15,66.88L95.65,66.88Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M95.65,155.88L95.65,126.88L97.15,126.88L97.15,155.88L95.65,155.88Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M150.15,67.88V92.88H148.65V67.88H150.15Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M149.17,97.33H126.4V95.83H149.17C153.58,95.83 157.15,99.41 157.15,103.81L157.15,122.58L155.65,122.58L155.65,103.81C155.65,100.24 152.75,97.33 149.17,97.33Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M43.63,96.13L66.4,96.13L66.4,97.63L43.63,97.63C39.22,97.63 35.65,94.06 35.65,89.65L35.65,70.88L37.15,70.88L37.15,89.65C37.15,93.23 40.05,96.13 43.63,96.13Z" />
+ <path
+ android:fillColor="#E2E8F0"
+ android:pathData="M157.4,52.88C157.4,50.67 155.61,48.88 153.4,48.88H145.4C143.19,48.88 141.4,50.67 141.4,52.88V60.88C141.4,63.09 143.19,64.88 145.4,64.88H153.4C155.61,64.88 157.4,63.09 157.4,60.88V52.88Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M145.4,50.38H153.4C154.78,50.38 155.9,51.5 155.9,52.88V60.88C155.9,62.26 154.78,63.38 153.4,63.38H145.4C144.02,63.38 142.9,62.26 142.9,60.88V52.88C142.9,51.5 144.02,50.38 145.4,50.38ZM153.4,48.88C155.61,48.88 157.4,50.67 157.4,52.88V60.88C157.4,63.09 155.61,64.88 153.4,64.88H145.4C143.19,64.88 141.4,63.09 141.4,60.88V52.88C141.4,50.67 143.19,48.88 145.4,48.88H153.4Z" />
+ <path
+ android:fillColor="#E2E8F0"
+ android:pathData="M104.4,162.88C104.4,160.67 102.61,158.88 100.4,158.88H92.4C90.19,158.88 88.4,160.67 88.4,162.88V170.88C88.4,173.09 90.19,174.88 92.4,174.88H100.4C102.61,174.88 104.4,173.09 104.4,170.88V162.88Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M92.4,160.38H100.4C101.78,160.38 102.9,161.5 102.9,162.88V170.88C102.9,172.26 101.78,173.38 100.4,173.38H92.4C91.02,173.38 89.9,172.26 89.9,170.88V162.88C89.9,161.5 91.02,160.38 92.4,160.38ZM100.4,158.88C102.61,158.88 104.4,160.67 104.4,162.88V170.88C104.4,173.09 102.61,174.88 100.4,174.88H92.4C90.19,174.88 88.4,173.09 88.4,170.88V162.88C88.4,160.67 90.19,158.88 92.4,158.88H100.4Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M123,81.88C123,75.26 117.63,69.88 111,69.88H81C74.37,69.88 69,75.26 69,81.88V111.88C69,118.51 74.37,123.88 81,123.88H111C117.63,123.88 123,118.51 123,111.88V81.88Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M81,71.38H111C116.8,71.38 121.5,76.08 121.5,81.88V111.88C121.5,117.68 116.8,122.38 111,122.38H81C75.2,122.38 70.5,117.68 70.5,111.88V81.88C70.5,76.08 75.2,71.38 81,71.38ZM111,69.88C117.63,69.88 123,75.26 123,81.88V111.88C123,118.51 117.63,123.88 111,123.88H81C74.37,123.88 69,118.51 69,111.88V81.88C69,75.26 74.37,69.88 81,69.88H111Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M88.93,94.44V106.65C88.93,107.64 89.73,108.46 90.73,108.46H91.58C92.57,108.46 93.39,107.64 93.39,106.65V94.44H88.93Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M93.38,88.56V86.26C93.38,85.27 92.57,84.46 91.58,84.46H90.73C89.74,84.46 88.93,85.27 88.93,86.26V88.56H93.38Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M103.29,98.47V86.26C103.29,85.27 102.48,84.46 101.49,84.46H100.64C99.65,84.46 98.83,85.27 98.83,86.26V98.47H103.29Z" />
+ <path
+ android:fillColor="#82C91E"
+ android:pathData="M98.83,104.35V106.65C98.83,107.64 99.65,108.46 100.64,108.46H101.49C102.48,108.46 103.3,107.64 103.3,106.65V104.35H98.83Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M88.21,99.18H85.91C84.92,99.18 84.11,99.99 84.11,100.99V101.84C84.11,102.83 84.91,103.64 85.91,103.64H88.21V99.18Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M106.3,99.18H94.09V103.64H106.3C107.29,103.64 108.11,102.83 108.11,101.84V100.99C108.11,99.99 107.29,99.18 106.3,99.18Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M98.12,89.28H85.91C84.92,89.28 84.11,90.08 84.11,91.08V91.93C84.11,92.92 84.91,93.74 85.91,93.74H98.12V89.28Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M106.3,89.28H104V93.74H106.3C107.29,93.74 108.11,92.93 108.11,91.93V91.08C108.11,90.08 107.29,89.28 106.3,89.28Z" />
+ <path
+ android:fillColor="#E2E8F0"
+ android:pathData="M172.4,132.88C172.4,128.46 168.82,124.88 164.4,124.88H148.4C143.98,124.88 140.4,128.46 140.4,132.88V148.88C140.4,153.3 143.98,156.88 148.4,156.88H164.4C168.82,156.88 172.4,153.3 172.4,148.88V132.88Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M148.4,126.38H164.4C167.99,126.38 170.9,129.29 170.9,132.88V148.88C170.9,152.47 167.99,155.38 164.4,155.38H148.4C144.81,155.38 141.9,152.47 141.9,148.88V132.88C141.9,129.29 144.81,126.38 148.4,126.38ZM164.4,124.88C168.82,124.88 172.4,128.46 172.4,132.88V148.88C172.4,153.3 168.82,156.88 164.4,156.88H148.4C143.98,156.88 140.4,153.3 140.4,148.88V132.88C140.4,128.46 143.98,124.88 148.4,124.88H164.4Z" />
+ <path
+ android:fillColor="#E2E8F0"
+ android:pathData="M52.4,45C52.4,40.58 48.82,37 44.4,37H28.4C23.98,37 20.4,40.58 20.4,45V61C20.4,65.42 23.98,69 28.4,69H44.4C48.82,69 52.4,65.42 52.4,61V45Z" />
+ <path
+ android:fillColor="#94A3B8"
+ android:fillType="evenOdd"
+ android:pathData="M28.4,38.5H44.4C47.99,38.5 50.9,41.41 50.9,45V61C50.9,64.59 47.99,67.5 44.4,67.5H28.4C24.81,67.5 21.9,64.59 21.9,61V45C21.9,41.41 24.81,38.5 28.4,38.5ZM44.4,37C48.82,37 52.4,40.58 52.4,45V61C52.4,65.42 48.82,69 44.4,69H28.4C23.98,69 20.4,65.42 20.4,61V45C20.4,40.58 23.98,37 28.4,37H44.4Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_transfer_data.xml b/briar-android/src/main/res/drawable/il_transfer_data.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5e21244d60a777a90df2e2dcb57f58d30e2bde28
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_transfer_data.xml
@@ -0,0 +1,105 @@
+<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="#F9FAFB"
+ android:pathData="M41.83,84C41.83,85.1 40.93,86 39.83,86L20.97,86C19.87,86 18.97,85.1 18.97,84L18.97,65.61L41.83,65.61L41.83,84Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M42.58,84C42.58,85.52 41.35,86.75 39.83,86.75L20.97,86.75C19.45,86.75 18.22,85.52 18.22,84L18.22,64.86L42.58,64.86L42.58,84ZM39.83,85.25C40.52,85.25 41.08,84.69 41.08,84L41.08,66.36L19.72,66.36L19.72,84C19.72,84.69 20.28,85.25 20.97,85.25L39.83,85.25Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M46.4,61.62C46.4,63.83 44.61,65.62 42.4,65.62L18.4,65.62C16.19,65.62 14.4,63.83 14.4,61.62L14.4,27C14.4,24.79 16.19,23 18.4,23L42.4,23C44.61,23 46.4,24.79 46.4,27L46.4,61.62Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M47.15,61.62C47.15,64.24 45.02,66.37 42.4,66.37L18.4,66.37C15.78,66.37 13.65,64.24 13.65,61.62L13.65,27C13.65,24.38 15.78,22.25 18.4,22.25L42.4,22.25C45.02,22.25 47.15,24.38 47.15,27L47.15,61.62ZM42.4,64.87C44.2,64.87 45.65,63.42 45.65,61.62L45.65,27C45.65,25.21 44.2,23.75 42.4,23.75L18.4,23.75C16.61,23.75 15.15,25.21 15.15,27L15.15,61.62C15.15,63.42 16.61,64.87 18.4,64.87L42.4,64.87Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M37.78,77.59L33.22,77.59L33.22,74.46L37.78,74.46L37.78,77.59Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M27.58,77.59L23.02,77.59L23.02,74.46L27.58,74.46L27.58,77.59Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:fillType="evenOdd"
+ android:pathData="M152,121C152,118.79 153.79,117 156,117H180.4C182.61,117 184.4,118.79 184.4,121V164C184.4,166.21 182.61,168 180.4,168H152V168H149.4C147.19,168 145.4,166.21 145.4,164V152.68C145.4,152.13 145.63,151.6 146.02,151.23L146.66,150.62C147.06,150.24 147.29,149.71 147.29,149.17V147.09C147.29,146.57 147.08,146.06 146.71,145.69L145.98,144.95C145.61,144.58 145.4,144.07 145.4,143.54V141.44C145.4,140.79 145.72,140.18 146.25,139.8L152,135.73V121ZM156.96,123.66C156.96,122.55 157.86,121.66 158.96,121.66H160.26C161.36,121.66 162.26,122.55 162.26,123.66V132.07C162.26,133.18 161.36,134.07 160.26,134.07H158.96C157.86,134.07 156.96,133.18 156.96,132.07V123.66ZM167.55,121.66C166.45,121.66 165.55,122.55 165.55,123.66V132.07C165.55,133.18 166.45,134.07 167.55,134.07H168.85C169.95,134.07 170.85,133.18 170.85,132.07V123.66C170.85,122.55 169.95,121.66 168.85,121.66H167.55ZM174.15,123.66C174.15,122.55 175.04,121.66 176.15,121.66H177.44C178.54,121.66 179.44,122.55 179.44,123.66V132.07C179.44,133.18 178.54,134.07 177.44,134.07H176.15C175.04,134.07 174.15,133.18 174.15,132.07V123.66Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M151.25,121C151.25,118.38 153.38,116.25 156,116.25H180.4C183.02,116.25 185.15,118.38 185.15,121V164C185.15,166.62 183.02,168.75 180.4,168.75H151.25V168.75H149.4C146.78,168.75 144.65,166.62 144.65,164V152.68C144.65,151.92 144.96,151.2 145.51,150.68L146.15,150.07C146.4,149.84 146.54,149.51 146.54,149.17V147.09C146.54,146.76 146.41,146.45 146.17,146.21L145.45,145.48C144.94,144.96 144.65,144.27 144.65,143.54V141.44C144.65,140.54 145.08,139.71 145.81,139.19L151.25,135.34V121ZM152.75,167.25H180.4C182.2,167.25 183.65,165.79 183.65,164V121C183.65,119.21 182.2,117.75 180.4,117.75H156C154.21,117.75 152.75,119.21 152.75,121V136.12L146.68,140.42C146.35,140.65 146.15,141.03 146.15,141.44V143.54C146.15,143.87 146.28,144.19 146.51,144.42L147.24,145.16C147.75,145.67 148.04,146.37 148.04,147.09V149.17C148.04,149.92 147.73,150.64 147.18,151.16L146.54,151.77C146.29,152.01 146.15,152.33 146.15,152.68V164C146.15,165.79 147.61,167.25 149.4,167.25H152.75V167.25ZM156.21,123.66C156.21,122.14 157.45,120.91 158.96,120.91H160.26C161.78,120.91 163.01,122.14 163.01,123.66V132.07C163.01,133.59 161.78,134.82 160.26,134.82H158.96C157.45,134.82 156.21,133.59 156.21,132.07V123.66ZM158.96,122.41C158.27,122.41 157.71,122.97 157.71,123.66V132.07C157.71,132.76 158.27,133.32 158.96,133.32H160.26C160.95,133.32 161.51,132.76 161.51,132.07V123.66C161.51,122.97 160.95,122.41 160.26,122.41H158.96ZM167.55,122.41C166.86,122.41 166.3,122.97 166.3,123.66V132.07C166.3,132.76 166.86,133.32 167.55,133.32H168.85C169.54,133.32 170.1,132.76 170.1,132.07V123.66C170.1,122.97 169.54,122.41 168.85,122.41H167.55ZM164.8,123.66C164.8,122.14 166.04,120.91 167.55,120.91H168.85C170.37,120.91 171.6,122.14 171.6,123.66V132.07C171.6,133.59 170.37,134.82 168.85,134.82H167.55C166.04,134.82 164.8,133.59 164.8,132.07V123.66ZM173.4,123.66C173.4,122.14 174.63,120.91 176.15,120.91H177.44C178.96,120.91 180.19,122.14 180.19,123.66V132.07C180.19,133.59 178.96,134.82 177.44,134.82H176.15C174.63,134.82 173.4,133.59 173.4,132.07V123.66ZM176.15,122.41C175.46,122.41 174.9,122.97 174.9,123.66V132.07C174.9,132.76 175.46,133.32 176.15,133.32H177.44C178.13,133.32 178.69,132.76 178.69,132.07V123.66C178.69,122.97 178.13,122.41 177.44,122.41H176.15Z" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M30.4,111C32.61,111 34.4,112.79 34.4,115C34.4,117.21 32.61,119 30.4,119C28.19,119 26.4,117.21 26.4,115C26.4,112.79 28.19,111 30.4,111Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M30.4,95C32.61,95 34.4,96.79 34.4,99C34.4,101.21 32.61,103 30.4,103C28.19,103 26.4,101.21 26.4,99C26.4,96.79 28.19,95 30.4,95Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M30.4,127C32.61,127 34.4,128.79 34.4,131C34.4,133.21 32.61,135 30.4,135C28.19,135 26.4,133.21 26.4,131C26.4,128.79 28.19,127 30.4,127Z" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M168.4,92C166.19,92 164.4,90.21 164.4,88C164.4,85.79 166.19,84 168.4,84C170.61,84 172.4,85.79 172.4,88C172.4,90.21 170.61,92 168.4,92Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M168.4,108C166.19,108 164.4,106.21 164.4,104C164.4,101.79 166.19,100 168.4,100C170.61,100 172.4,101.79 172.4,104C172.4,106.21 170.61,108 168.4,108Z" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M168.4,76C166.19,76 164.4,74.21 164.4,72C164.4,69.79 166.19,68 168.4,68C170.61,68 172.4,69.79 172.4,72C172.4,74.21 170.61,76 168.4,76Z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M57.4,35.03C57.4,28.4 62.77,23.03 69.4,23.03H123.4C130.03,23.03 135.4,28.4 135.4,35.03V156.03C135.4,162.66 130.03,168.03 123.4,168.03H69.4C62.77,168.03 57.4,162.66 57.4,156.03V35.03Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M123.4,24.53H69.4C63.6,24.53 58.9,29.23 58.9,35.03V156.03C58.9,161.83 63.6,166.53 69.4,166.53H123.4C129.2,166.53 133.9,161.83 133.9,156.03V35.03C133.9,29.23 129.2,24.53 123.4,24.53ZM69.4,23.03C62.77,23.03 57.4,28.4 57.4,35.03V156.03C57.4,162.66 62.77,168.03 69.4,168.03H123.4C130.03,168.03 135.4,162.66 135.4,156.03V35.03C135.4,28.4 130.03,23.03 123.4,23.03H69.4Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M96.4,35.41C95.57,35.41 94.9,34.74 94.9,33.91C94.9,33.08 95.57,32.41 96.4,32.41C97.23,32.41 97.9,33.08 97.9,33.91C97.9,34.74 97.23,35.41 96.4,35.41ZM96.4,36.91C94.74,36.91 93.4,35.57 93.4,33.91C93.4,32.25 94.74,30.91 96.4,30.91C98.06,30.91 99.4,32.25 99.4,33.91C99.4,35.57 98.06,36.91 96.4,36.91Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M77.65,33.59C77.65,33.18 77.99,32.84 78.4,32.84H88.4C88.82,32.84 89.15,33.18 89.15,33.59C89.15,34.01 88.82,34.34 88.4,34.34H78.4C77.99,34.34 77.65,34.01 77.65,33.59Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M103.65,33.59C103.65,33.18 103.99,32.84 104.4,32.84L114.4,32.84C114.82,32.84 115.15,33.18 115.15,33.59C115.15,34.01 114.82,34.34 114.4,34.34L104.4,34.34C103.99,34.34 103.65,34.01 103.65,33.59Z" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M128.4,50.63C128.4,46.22 124.82,42.63 120.4,42.63H72.4C67.98,42.63 64.4,46.22 64.4,50.63V146.63C64.4,151.05 67.98,154.63 72.4,154.63H120.4C124.82,154.63 128.4,151.05 128.4,146.63V50.63Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:fillType="evenOdd"
+ android:pathData="M72.4,44.13H120.4C123.99,44.13 126.9,47.04 126.9,50.63V146.63C126.9,150.22 123.99,153.13 120.4,153.13H72.4C68.81,153.13 65.9,150.22 65.9,146.63V50.63C65.9,47.04 68.81,44.13 72.4,44.13ZM120.4,42.63C124.82,42.63 128.4,46.22 128.4,50.63V146.63C128.4,151.05 124.82,154.63 120.4,154.63H72.4C67.98,154.63 64.4,151.05 64.4,146.63V50.63C64.4,46.22 67.98,42.63 72.4,42.63H120.4Z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M71.4,104C71.4,95.16 78.56,88 87.4,88H105.4C114.24,88 121.4,95.16 121.4,104V148H87.4C78.56,148 71.4,140.84 71.4,132V104Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M105.4,89.5H87.4C79.39,89.5 72.9,95.99 72.9,104V132C72.9,140.01 79.39,146.5 87.4,146.5H119.9V104C119.9,95.99 113.41,89.5 105.4,89.5ZM87.4,88C78.56,88 71.4,95.16 71.4,104V132C71.4,140.84 78.56,148 87.4,148H121.4V104C121.4,95.16 114.24,88 105.4,88H87.4Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,109.91C83.96,109.5 84.29,109.16 84.71,109.16H108.03C108.44,109.16 108.78,109.5 108.78,109.91C108.78,110.32 108.44,110.66 108.03,110.66H84.71C84.29,110.66 83.96,110.32 83.96,109.91Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,118C83.96,117.59 84.29,117.25 84.71,117.25H108.03C108.44,117.25 108.78,117.59 108.78,118C108.78,118.42 108.44,118.75 108.03,118.75H84.71C84.29,118.75 83.96,118.42 83.96,118Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,134.18C83.96,133.76 84.29,133.43 84.71,133.43H96.37C96.78,133.43 97.12,133.76 97.12,134.18C97.12,134.59 96.78,134.93 96.37,134.93H84.71C84.29,134.93 83.96,134.59 83.96,134.18Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,101.82C83.96,101.41 84.29,101.07 84.71,101.07H108.03C108.44,101.07 108.78,101.41 108.78,101.82C108.78,102.24 108.44,102.57 108.03,102.57H84.71C84.29,102.57 83.96,102.24 83.96,101.82Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:fillType="evenOdd"
+ android:pathData="M83.96,126.09C83.96,125.68 84.29,125.34 84.71,125.34H108.1C108.51,125.34 108.85,125.68 108.85,126.09C108.85,126.51 108.51,126.84 108.1,126.84H84.71C84.29,126.84 83.96,126.51 83.96,126.09Z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_transfer_data_receive.xml b/briar-android/src/main/res/drawable/il_transfer_data_receive.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a303a089071e877091155f4b0ee3f55c343e4fcc
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_transfer_data_receive.xml
@@ -0,0 +1,109 @@
+<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="#DDEDFE"
+ android:pathData="M265.47,33.75L239.47,33.75A7.25,7.25 0,0 0,232.22 41L232.22,103A7.25,7.25 0,0 0,239.47 110.25L265.47,110.25A7.25,7.25 0,0 0,272.72 103L272.72,41A7.25,7.25 0,0 0,265.47 33.75z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M272.72,48H232.22V100.5H272.72V48Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M240.07,65.1L264.86,65.1A4,4 0,0 1,268.86 69.1L268.86,79.39A4,4 0,0 1,264.86 83.39L240.07,83.39A4,4 0,0 1,236.07 79.39L236.07,69.1A4,4 0,0 1,240.07 65.1z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M242.58,71.55H262.46"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M242.58,77.65H253.26"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M253.47,41a1,1 90,1 1,-2 0a1,1 90,1 1,2 0z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M244.47,40.27C244.05,40.27 243.72,40.61 243.72,41.02C243.72,41.44 244.05,41.77 244.47,41.77V40.27ZM248.47,41.77C248.88,41.77 249.22,41.44 249.22,41.02C249.22,40.61 248.88,40.27 248.47,40.27V41.77ZM244.47,41.77H248.47V40.27H244.47V41.77Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M256.47,40.27C256.05,40.27 255.72,40.61 255.72,41.02C255.72,41.44 256.05,41.77 256.47,41.77V40.27ZM260.47,41.77C260.88,41.77 261.22,41.44 261.22,41.02C261.22,40.61 260.88,40.27 260.47,40.27V41.77ZM256.47,41.77H260.47V40.27H256.47V41.77Z" />
+ <path
+ android:fillColor="#BEF264"
+ android:pathData="M89.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M105.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M73.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#BEF264"
+ android:pathData="M198.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M214.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#D9F99D"
+ android:pathData="M182.47,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M29.04,43C29.04,41.9 29.93,41 31.04,41H49.9C51,41 51.9,41.9 51.9,43V61.39H29.04L29.04,43Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M24.47,65.38C24.47,63.17 26.26,61.38 28.47,61.38H52.47C54.68,61.38 56.47,63.17 56.47,65.38L56.47,100C56.47,102.21 54.68,104 52.47,104H28.47C26.26,104 24.47,102.21 24.47,100L24.47,65.38Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M33.09,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M43.29,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:fillType="evenOdd"
+ android:pathData="M151.87,42L143.97,42H126.47C124.26,42 122.47,43.79 122.47,46L122.47,98C122.47,100.21 124.26,102 126.47,102L161.47,102C163.68,102 165.47,100.21 165.47,98L165.47,55.97L151.87,42Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M143.97,42L143.97,41.25H143.97V42ZM151.87,42L152.4,41.48L152.18,41.25L151.87,41.25L151.87,42ZM122.47,46H123.22H122.47ZM122.47,98H121.72H122.47ZM126.47,102V101.25V102ZM161.47,102V102.75V102ZM165.47,98H164.72H165.47ZM165.47,55.97H166.22V55.66L166,55.45L165.47,55.97ZM143.97,42.75L151.87,42.75L151.87,41.25L143.97,41.25L143.97,42.75ZM126.47,42.75H143.97V41.25H126.47V42.75ZM123.22,46C123.22,44.21 124.67,42.75 126.47,42.75V41.25C123.84,41.25 121.72,43.38 121.72,46H123.22ZM123.22,98L123.22,46H121.72L121.72,98H123.22ZM126.47,101.25C124.67,101.25 123.22,99.79 123.22,98H121.72C121.72,100.62 123.84,102.75 126.47,102.75V101.25ZM161.47,101.25L126.47,101.25V102.75L161.47,102.75V101.25ZM164.72,98C164.72,99.79 163.26,101.25 161.47,101.25V102.75C164.09,102.75 166.22,100.62 166.22,98H164.72ZM164.72,55.97L164.72,98H166.22L166.22,55.97H164.72ZM166,55.45L152.4,41.48L151.33,42.52L164.93,56.49L166,55.45Z" />
+ <path
+ android:fillColor="#F7FEE7"
+ android:pathData="M165.2,55.68L156.16,55.68C153.95,55.68 152.16,53.89 152.16,51.68L152.16,42.29L165.2,55.68Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D"
+ android:strokeLineJoin="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.07,63.49H153.91"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.07,69.04H144.73"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M143.16,80.73C143.16,78.65 141.48,76.97 139.4,76.97C137.32,76.97 135.64,78.65 135.64,80.73V87.41C135.64,89.49 137.32,91.18 139.4,91.18C141.48,91.18 143.16,89.49 143.16,87.41V80.73Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M134.32,84.52L144.49,84.52A1.25,1.25 0,0 1,145.74 85.77L145.74,92.72A1.25,1.25 0,0 1,144.49 93.97L134.32,93.97A1.25,1.25 0,0 1,133.07 92.72L133.07,85.77A1.25,1.25 0,0 1,134.32 84.52z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/il_transfer_data_send.xml b/briar-android/src/main/res/drawable/il_transfer_data_send.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cf31870103802022287d83d8003124052359d670
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_transfer_data_send.xml
@@ -0,0 +1,109 @@
+<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="#ECFCCB"
+ android:pathData="M48.93,33.75L22.93,33.75A7.25,7.25 0,0 0,15.68 41L15.68,103A7.25,7.25 0,0 0,22.93 110.25L48.93,110.25A7.25,7.25 0,0 0,56.18 103L56.18,41A7.25,7.25 0,0 0,48.93 33.75z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M56.18,48H15.68V100.5H56.18V48Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M23.54,65.1L48.33,65.1A4,4 0,0 1,52.33 69.1L52.33,79.39A4,4 0,0 1,48.33 83.39L23.54,83.39A4,4 0,0 1,19.54 79.39L19.54,69.1A4,4 0,0 1,23.54 65.1z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M26.05,71.55H45.92"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M26.05,77.65H36.73"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M36.93,41a1,1 90,1 1,-2 0a1,1 90,1 1,2 0z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M27.93,40.27C27.52,40.27 27.18,40.61 27.18,41.02C27.18,41.44 27.52,41.77 27.93,41.77V40.27ZM31.93,41.77C32.35,41.77 32.68,41.44 32.68,41.02C32.68,40.61 32.35,40.27 31.93,40.27V41.77ZM27.93,41.77H31.93V40.27H27.93V41.77Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M39.93,40.27C39.52,40.27 39.18,40.61 39.18,41.02C39.18,41.44 39.52,41.77 39.93,41.77V40.27ZM43.93,41.77C44.35,41.77 44.68,41.44 44.68,41.02C44.68,40.61 44.35,40.27 43.93,40.27V41.77ZM39.93,41.77H43.93V40.27H39.93V41.77Z" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M89.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M105.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M73.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M198.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M214.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M182.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M236.51,43C236.51,41.9 237.4,41 238.51,41H257.36C258.47,41 259.36,41.9 259.36,43V61.39H236.51V43Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M231.93,65.38C231.93,63.17 233.73,61.38 235.93,61.38H259.93C262.14,61.38 263.93,63.17 263.93,65.38V100C263.93,102.21 262.14,104 259.93,104H235.93C233.73,104 231.93,102.21 231.93,100V65.38Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M240.56,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M250.76,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:fillType="evenOdd"
+ android:pathData="M152.33,42L144.43,42H126.93C124.72,42 122.93,43.79 122.93,46L122.93,98C122.93,100.21 124.72,102 126.93,102L161.93,102C164.14,102 165.93,100.21 165.93,98L165.93,55.97L152.33,42Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M144.43,42L144.43,41.25H144.43V42ZM152.33,42L152.87,41.48L152.65,41.25L152.33,41.25L152.33,42ZM122.93,46H123.68H122.93ZM122.93,98H122.18H122.93ZM126.93,102V101.25V102ZM161.93,102V102.75V102ZM165.93,98H165.18H165.93ZM165.93,55.97H166.68V55.66L166.47,55.45L165.93,55.97ZM144.43,42.75L152.33,42.75L152.33,41.25L144.43,41.25L144.43,42.75ZM126.93,42.75H144.43V41.25H126.93V42.75ZM123.68,46C123.68,44.21 125.14,42.75 126.93,42.75V41.25C124.31,41.25 122.18,43.38 122.18,46H123.68ZM123.68,98L123.68,46H122.18L122.18,98H123.68ZM126.93,101.25C125.14,101.25 123.68,99.79 123.68,98H122.18C122.18,100.62 124.31,102.75 126.93,102.75V101.25ZM161.93,101.25L126.93,101.25V102.75L161.93,102.75V101.25ZM165.18,98C165.18,99.79 163.73,101.25 161.93,101.25V102.75C164.56,102.75 166.68,100.62 166.68,98H165.18ZM165.18,55.97L165.18,98H166.68L166.68,55.97H165.18ZM166.47,55.45L152.87,41.48L151.79,42.52L165.4,56.49L166.47,55.45Z" />
+ <path
+ android:fillColor="#EFF7FF"
+ android:pathData="M165.66,55.68L156.63,55.68C154.42,55.68 152.63,53.89 152.63,51.68L152.63,42.29L165.66,55.68Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineJoin="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.54,63.49H154.38"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.54,69.04H145.2"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M143.63,80.73C143.63,78.65 141.95,76.97 139.87,76.97C137.79,76.97 136.1,78.65 136.1,80.73V87.41C136.1,89.49 137.79,91.18 139.87,91.18C141.95,91.18 143.63,89.49 143.63,87.41V80.73Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M134.78,84.52L144.95,84.52A1.25,1.25 0,0 1,146.2 85.77L146.2,92.72A1.25,1.25 0,0 1,144.95 93.97L134.78,93.97A1.25,1.25 0,0 1,133.53 92.72L133.53,85.77A1.25,1.25 0,0 1,134.78 84.52z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/qr_code_error.xml b/briar-android/src/main/res/drawable/qr_code_error.xml
deleted file mode 100644
index f866e63890ef95254d81bf74201fe37cca225cd8..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/qr_code_error.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="409.2dp"
- android:height="161.7dp"
- 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="#000000"
- android:pathData="M 207.61295,88.782357 h -6.42588 v -12.85177 h 6.42588 m 0,25.703533 h -6.42588 v -6.425883 h 6.42588 m -38.5553,16.064713 h 70.68472 L 204.40001,50.227047 Z"
- android:strokeWidth="3.21294165"/>
-</vector>
\ No newline at end of file
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 557b7cd85574483bba37b314c57661668c365bc3..0000000000000000000000000000000000000000
--- 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 6b09db32dd279901f6b64b19a03ecff6bf58beb6..0000000000000000000000000000000000000000
--- 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 fb2fe2c215811074057366380ec55c9653e1e88a..9fd9ff42026f590eedccadcc3e95e9801ed2ef54 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="wrap_content"
- android:padding="@dimen/margin_large">
+ 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="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/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" />
- <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/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" />
- <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" />
+ <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" />
- <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" />
+ <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" />
- <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" />
+ <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" />
- <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>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </ScrollView>
+
+ <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_marginHorizontal="16dp"
+ android:text="@string/continue_button"
+ app:layout_constraintBottom_toBottomOf="parent" />
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/briar_recycler_view.xml b/briar-android/src/main/res/layout/briar_recycler_view.xml
index 8bd992c850a9d209d1a0c2ca7ca77eb285bccb41..3c7bab0c0dc7aee117d6cf62609b595fdf20f738 100644
--- a/briar-android/src/main/res/layout/briar_recycler_view.xml
+++ b/briar-android/src/main/res/layout/briar_recycler_view.xml
@@ -41,7 +41,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:tint="?attr/colorControlNormal"
- tools:src="@drawable/ic_empty_state_group_list" />
+ tools:src="@drawable/il_empty_state_group_list" />
<TextView
android:id="@+id/emptyText"
diff --git a/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml b/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml
index f7c5a272cfabd2efba5493efea42151a02ddbacb..ac91982155b265ec9a64b5dbd54e1fd23022d898 100644
--- a/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml
@@ -1,51 +1,56 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true"
- tools:context=".android.contact.connect.BluetoothIntroFragment">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
+ android:id="@+id/scrollView"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/introImageView"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_margin="16dp"
- app:layout_constraintBottom_toTopOf="@+id/introTextView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHeight_percent="0.2"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:srcCompat="@drawable/ic_bluetooth" />
-
- <TextView
- android:id="@+id/introTextView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="16dp"
- android:text="@string/connect_via_bluetooth_intro"
- app:layout_constraintBottom_toTopOf="@+id/startButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/introImageView" />
-
- <Button
- android:id="@+id/startButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="16dp"
- android:text="@string/start"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
+ android:layout_height="0dp"
+ android:layout_weight="1">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/introImageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_height"
+ android:layout_margin="16dp"
+ app:layout_constraintBottom_toTopOf="@+id/introTextView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/il_bluetooth_connect" />
+
+ <TextView
+ android:id="@+id/introTextView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="16dp"
+ android:text="@string/connect_via_bluetooth_intro"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/introImageView" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </ScrollView>
+
+ <Button
+ android:id="@+id/startButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="16dp"
+ android:text="@string/start"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_bluetooth_progress.xml b/briar-android/src/main/res/layout/fragment_bluetooth_progress.xml
index 290d4996c231732e6596e1008f7190923f6c0cb1..88a27231c0bc80e0c0e4643382c1f6e2422776ad 100644
--- a/briar-android/src/main/res/layout/fragment_bluetooth_progress.xml
+++ b/briar-android/src/main/res/layout/fragment_bluetooth_progress.xml
@@ -15,7 +15,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_bluetooth" />
+ app:srcCompat="@drawable/il_bluetooth_connect" />
<ProgressBar
android:id="@+id/progressBar"
diff --git a/briar-android/src/main/res/layout/fragment_crash.xml b/briar-android/src/main/res/layout/fragment_crash.xml
index 02c136de416fa0a8e35bbf8534a7fff50990c2ab..80349dbee5c40e3958096a3c257650f549bbea41 100644
--- a/briar-android/src/main/res/layout/fragment_crash.xml
+++ b/briar-android/src/main/res/layout/fragment_crash.xml
@@ -30,7 +30,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_crash"
+ app:srcCompat="@drawable/il_crash"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_error.xml b/briar-android/src/main/res/layout/fragment_error.xml
index 643f81e387a1bd25ff292bbe041f1c833ff669cb..a785cfed6bca687b7a33c4596439f15b36a403aa 100644
--- a/briar-android/src/main/res/layout/fragment_error.xml
+++ b/briar-android/src/main/res/layout/fragment_error.xml
@@ -21,7 +21,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/alerts_and_states_error"
+ app:srcCompat="@drawable/ic_error"
app:tint="@color/briar_red_500"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
index 655441298851a7c21d9681b22342f5fc4fc7e1ba..40cc0983a54bdcc91da61c3e1eeacdb921a41fc0 100644
--- a/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
@@ -18,7 +18,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_xlarge">
+ android:layout_margin="@dimen/margin_large">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/errorIcon"
@@ -30,8 +30,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/qr_code_error"
- app:tint="?attr/colorControlNormal"
+ app:srcCompat="@drawable/il_qr_code_error"
tools:ignore="ContentDescription" />
<TextView
diff --git a/briar-android/src/main/res/layout/fragment_final.xml b/briar-android/src/main/res/layout/fragment_final.xml
index 13123fe8616dc20b84ef7cf1dfd7aa3af334f147..4b781301f63e01e8a6c9b7c3ab22a7e62d8f8fb5 100644
--- a/briar-android/src/main/res/layout/fragment_final.xml
+++ b/briar-android/src/main/res/layout/fragment_final.xml
@@ -1,70 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView 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:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ImageView
- android:id="@+id/iconView"
- android:layout_width="@dimen/hero_square"
- android:layout_height="@dimen/hero_square"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/titleView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.25"
- app:layout_constraintVertical_chainStyle="packed"
- tools:ignore="ContentDescription"
- tools:srcCompat="@drawable/alerts_and_states_error"
- tools:tint="@color/briar_red_500" />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/titleView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:gravity="center"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
- app:layout_constraintBottom_toTopOf="@+id/textView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/iconView"
- tools:text="@string/removable_drive_error_send_title" />
+ <ImageView
+ android:id="@+id/iconView"
+ android:layout_width="@dimen/hero_square"
+ android:layout_height="@dimen/hero_square"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/titleView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ tools:ignore="ContentDescription"
+ tools:srcCompat="@drawable/ic_error"
+ tools:tint="@color/briar_red_500" />
- <TextView
- android:id="@+id/textView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/button"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/titleView"
- tools:text="@string/removable_drive_error_send_text" />
+ <TextView
+ android:id="@+id/titleView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:gravity="center"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+ app:layout_constraintBottom_toTopOf="@+id/textView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/iconView"
+ tools:text="@string/removable_drive_error_send_title" />
- <Button
- android:id="@+id/button"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
- android:text="@string/finish"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ <TextView
+ android:id="@+id/textView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_large"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleView"
+ tools:text="@string/removable_drive_error_send_text" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.core.widget.NestedScrollView>
+ </ScrollView>
+
+ <Button
+ android:id="@+id/button"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_large"
+ android:text="@string/finish"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_forum_list.xml b/briar-android/src/main/res/layout/fragment_forum_list.xml
index b4351eae18cc5380699c845d5b4622ffeeb3aeb8..54b2ea1457ef8fb4d61cb840682d29b70d9f1b6f 100644
--- a/briar-android/src/main/res/layout/fragment_forum_list.xml
+++ b/briar-android/src/main/res/layout/fragment_forum_list.xml
@@ -5,6 +5,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:emptyAction="@string/no_forums_action"
- app:emptyImage="@drawable/ic_empty_state_forum_list"
+ app:emptyImage="@drawable/il_empty_state_forum_list"
app:emptyText="@string/no_forums"
app:layout_behavior="org.briarproject.briar.android.view.BriarRecyclerViewBehavior" />
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_intro.xml b/briar-android/src/main/res/layout/fragment_hotspot_intro.xml
index 5e5ff456ad74903406143b5607c3f7a58c295c91..5d2778cfa2fc38a1b73069251d41bcca351ffad7 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_intro.xml
@@ -1,52 +1,64 @@
<?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="match_parent"
- android:fillViewport="true"
- tools:context=".android.hotspot.HotspotIntroFragment">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
+ android:id="@+id/scrollView"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="@dimen/hero_rect_width"
- android:layout_height="@dimen/hero_rect_width"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/introView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.25"
- app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_share_app"
- tools:ignore="ContentDescription" />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/introView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
- android:text="@string/hotspot_intro"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/startButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView" />
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_width"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/introView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/il_share_app"
+ tools:ignore="ContentDescription" />
+
+ <TextView
+ android:id="@+id/introView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:layout_marginBottom="@dimen/margin_large"
+ android:text="@string/hotspot_intro"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </ScrollView>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
<Button
android:id="@+id/startButton"
style="@style/BriarButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
+ android:layout_marginHorizontal="@dimen/margin_large"
android:drawablePadding="8dp"
android:text="@string/hotspot_button_start_sharing"
app:drawableLeftCompat="@drawable/ic_wifi_tethering"
@@ -83,7 +95,6 @@
app:layout_constraintStart_toEndOf="@+id/progressBar"
app:layout_constraintTop_toTopOf="@+id/startButton"
tools:visibility="visible" />
-
</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 eb29e78fce98b84a70d5c4487cb128915b5d53e1..53d058c28fb0d760a2f7d0f76b8b841b867626e7 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="wrap_content"
- android:padding="@dimen/margin_large">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ImageView
- android:id="@+id/diagram"
- android:layout_width="wrap_content"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
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" />
+ android:padding="@dimen/margin_large">
- <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" />
+ <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/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" />
+ <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" />
- <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" />
+ <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" />
- <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" />
+ <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>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </ScrollView>
+
+ <Button
+ android:id="@+id/continueButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="16dp"
+ android:layout_marginTop="@dimen/margin_medium"
+ android:text="@string/continue_button" />
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml
index cdd06e18aea12276fecb14b8772a5932129a41d1..4ebd1a64c6af89f1f0537985ab6a1368d68d7e0b 100644
--- a/briar-android/src/main/res/layout/fragment_link_exchange.xml
+++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml
@@ -1,232 +1,250 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/margin_large">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <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" />
-
- <TextView
- android:id="@+id/stepOne"
- style="@style/StepBubble"
- android:text="@string/step_1"
- app:layout_constraintBottom_toTopOf="@+id/stepOneText"
- app:layout_constraintEnd_toStartOf="@+id/guideline"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0" />
-
- <TextView
- android:id="@+id/stepOneText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:text="@string/send_link_title"
- app:layout_constraintBottom_toTopOf="@+id/yourLinkIcon"
- app:layout_constraintEnd_toStartOf="@+id/guideline"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/stepOne" />
-
- <View
- android:id="@+id/stepConnector"
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_margin="16dp"
- android:alpha="0.5"
- android:background="@color/briar_accent"
- app:layout_constraintBottom_toBottomOf="@+id/stepOne"
- app:layout_constraintEnd_toStartOf="@+id/stepTwo"
- app:layout_constraintStart_toEndOf="@+id/stepOne"
- app:layout_constraintTop_toTopOf="@+id/stepOne" />
-
- <TextView
- android:id="@+id/stepTwo"
- style="@style/StepBubble.Upcoming"
- android:text="@string/step_2"
- app:layout_constraintBottom_toTopOf="@+id/stepTwoText"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="@+id/guideline"
- app:layout_constraintTop_toTopOf="@+id/stepOne"
- app:layout_constraintVertical_bias="0.0"
- app:layout_constraintVertical_chainStyle="packed" />
-
- <TextView
- android:id="@+id/stepTwoText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:alpha="0.5"
- android:text="@string/add_contact_choose_nickname"
- app:layout_constraintBottom_toTopOf="@+id/yourLinkIcon"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/guideline"
- app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
-
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/yourLinkIcon"
- android:layout_width="38dp"
- android:layout_height="38dp"
- android:layout_marginTop="32dp"
- android:background="@drawable/bubble_accent"
- android:scaleType="center"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/stepOneText"
- app:srcCompat="@drawable/ic_call_made"
- app:tint="@android:color/white" />
-
- <TextView
- android:id="@+id/yourLink"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginLeft="8dp"
- android:gravity="left|start"
- android:text="@string/your_link"
- android:textSize="16sp"
- app:layout_constraintBottom_toBottomOf="@+id/yourLinkIcon"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/yourLinkIcon"
- app:layout_constraintTop_toTopOf="@+id/yourLinkIcon" />
-
- <TextView
- android:id="@+id/linkView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:background="@android:color/white"
- android:ellipsize="end"
- android:padding="8dp"
- android:singleLine="true"
- android:textColor="@color/briar_primary"
- android:textIsSelectable="true"
- android:textSize="18sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/yourLinkIcon"
- tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv" />
-
- <Button
- android:id="@+id/copyButton"
- style="@style/BriarButtonFlat.Positive.Tiny"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawablePadding="8dp"
- android:enabled="false"
- android:text="@string/copy_button"
- app:drawableLeftCompat="@drawable/ic_content_copy"
- app:drawableStartCompat="@drawable/ic_content_copy"
- app:layout_constraintEnd_toStartOf="@id/shareButton"
- app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintHorizontal_chainStyle="packed"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/linkView" />
-
- <Button
- android:id="@+id/shareButton"
- style="@style/BriarButtonFlat.Positive.Tiny"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawablePadding="8dp"
- android:enabled="false"
- android:text="@string/share_button"
- app:drawableLeftCompat="@drawable/social_share_blue"
- app:drawableStartCompat="@drawable/social_share_blue"
- app:layout_constraintBottom_toBottomOf="@id/copyButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintStart_toEndOf="@id/copyButton"
- app:layout_constraintTop_toTopOf="@id/copyButton" />
-
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/linkInputIcon"
- android:layout_width="38dp"
- android:layout_height="38dp"
- android:layout_marginTop="16dp"
- android:background="@drawable/bubble_accent"
- android:scaleType="center"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/copyButton"
- app:srcCompat="@drawable/ic_call_received"
- app:tint="@android:color/white" />
-
- <TextView
- android:id="@+id/inputLink"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginLeft="8dp"
- android:gravity="left|start"
- android:text="@string/contact_link_intro"
- android:textSize="16sp"
- app:layout_constraintBottom_toBottomOf="@+id/linkInputIcon"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/linkInputIcon"
- app:layout_constraintTop_toTopOf="@+id/linkInputIcon" />
-
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/linkInputLayout"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- app:errorEnabled="true"
- app:hintEnabled="false"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/linkInputIcon">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/linkInput"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:hint="@string/contact_link_hint"
- android:importantForAutofill="no"
- android:inputType="textUri" />
-
- </com.google.android.material.textfield.TextInputLayout>
-
- <Button
- android:id="@+id/pasteButton"
- style="@style/BriarButtonFlat.Positive.Tiny"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawablePadding="8dp"
- android:text="@string/paste_button"
- app:drawableLeftCompat="@drawable/ic_content_paste"
- app:drawableStartCompat="@drawable/ic_content_paste"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/linkInputLayout"
- app:layout_constraintVertical_bias="0.0" />
-
- <Button
- android:id="@+id/addButton"
- style="@style/BriarButton"
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:enabled="false"
- android:text="@string/continue_button"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/pasteButton"
- app:layout_constraintVertical_bias="1.0"
- tools:enabled="true" />
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
+ android:padding="@dimen/margin_large">
+
+ <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" />
+
+ <TextView
+ android:id="@+id/stepOne"
+ style="@style/StepBubble"
+ android:text="@string/step_1"
+ app:layout_constraintBottom_toTopOf="@+id/stepOneText"
+ app:layout_constraintEnd_toStartOf="@+id/guideline"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0" />
+
+ <TextView
+ android:id="@+id/stepOneText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:text="@string/send_link_title"
+ app:layout_constraintBottom_toTopOf="@+id/imageView"
+ app:layout_constraintEnd_toStartOf="@+id/guideline"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/stepOne" />
+
+ <View
+ android:id="@+id/stepConnector"
+ android:layout_width="0dp"
+ android:layout_height="1dp"
+ android:layout_margin="16dp"
+ android:alpha="0.5"
+ android:background="@color/briar_accent"
+ app:layout_constraintBottom_toBottomOf="@+id/stepOne"
+ app:layout_constraintEnd_toStartOf="@+id/stepTwo"
+ app:layout_constraintStart_toEndOf="@+id/stepOne"
+ app:layout_constraintTop_toTopOf="@+id/stepOne" />
+
+ <TextView
+ android:id="@+id/stepTwo"
+ style="@style/StepBubble.Upcoming"
+ android:text="@string/step_2"
+ app:layout_constraintBottom_toTopOf="@+id/stepTwoText"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/guideline"
+ app:layout_constraintTop_toTopOf="@+id/stepOne"
+ app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintVertical_chainStyle="packed" />
+
+ <TextView
+ android:id="@+id/stepTwoText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:alpha="0.5"
+ android:text="@string/add_contact_choose_nickname"
+ app:layout_constraintBottom_toTopOf="@+id/imageView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/guideline"
+ app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
+
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_height"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/yourLinkIcon"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/stepOneText"
+ app:srcCompat="@drawable/il_add_contact_remote"
+ tools:ignore="ContentDescription" />
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/yourLinkIcon"
+ android:layout_width="38dp"
+ android:layout_height="38dp"
+ android:layout_marginTop="8dp"
+ android:background="@drawable/bubble_accent"
+ android:scaleType="center"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView"
+ app:srcCompat="@drawable/ic_call_made"
+ app:tint="@android:color/white" />
+
+ <TextView
+ android:id="@+id/yourLink"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
+ android:gravity="left|start"
+ android:text="@string/your_link"
+ android:textSize="16sp"
+ app:layout_constraintBottom_toBottomOf="@+id/yourLinkIcon"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/yourLinkIcon"
+ app:layout_constraintTop_toTopOf="@+id/yourLinkIcon" />
+
+ <TextView
+ android:id="@+id/linkView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:background="@android:color/white"
+ android:ellipsize="end"
+ android:padding="8dp"
+ android:singleLine="true"
+ android:textColor="@color/briar_primary"
+ android:textIsSelectable="true"
+ android:textSize="18sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/yourLinkIcon"
+ tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv" />
+
+ <Button
+ android:id="@+id/copyButton"
+ style="@style/BriarButtonFlat.Positive.Tiny"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawablePadding="8dp"
+ android:enabled="false"
+ android:text="@string/copy_button"
+ app:drawableLeftCompat="@drawable/ic_content_copy"
+ app:drawableStartCompat="@drawable/ic_content_copy"
+ app:layout_constraintEnd_toStartOf="@id/shareButton"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintHorizontal_chainStyle="packed"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/linkView" />
+
+ <Button
+ android:id="@+id/shareButton"
+ style="@style/BriarButtonFlat.Positive.Tiny"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawablePadding="8dp"
+ android:enabled="false"
+ android:text="@string/share_button"
+ app:drawableLeftCompat="@drawable/social_share_blue"
+ app:drawableStartCompat="@drawable/social_share_blue"
+ app:layout_constraintBottom_toBottomOf="@id/copyButton"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toEndOf="@id/copyButton"
+ app:layout_constraintTop_toTopOf="@id/copyButton" />
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/linkInputIcon"
+ android:layout_width="38dp"
+ android:layout_height="38dp"
+ android:layout_marginTop="16dp"
+ android:background="@drawable/bubble_accent"
+ android:scaleType="center"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/copyButton"
+ app:srcCompat="@drawable/ic_call_received"
+ app:tint="@android:color/white" />
+
+ <TextView
+ android:id="@+id/inputLink"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
+ android:gravity="left|start"
+ android:text="@string/contact_link_intro"
+ android:textSize="16sp"
+ app:layout_constraintBottom_toBottomOf="@+id/linkInputIcon"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/linkInputIcon"
+ app:layout_constraintTop_toTopOf="@+id/linkInputIcon" />
+
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/linkInputLayout"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ app:errorEnabled="true"
+ app:hintEnabled="false"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/linkInputIcon">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/linkInput"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:hint="@string/contact_link_hint"
+ android:importantForAutofill="no"
+ android:inputType="textUri" />
+
+ </com.google.android.material.textfield.TextInputLayout>
+
+ <Button
+ android:id="@+id/pasteButton"
+ style="@style/BriarButtonFlat.Positive.Tiny"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:drawablePadding="8dp"
+ android:text="@string/paste_button"
+ app:drawableLeftCompat="@drawable/ic_content_paste"
+ app:drawableStartCompat="@drawable/ic_content_paste"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/linkInputLayout"
+ app:layout_constraintVertical_bias="0.0" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </ScrollView>
+
+ <Button
+ android:id="@+id/addButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="16dp"
+ android:enabled="false"
+ android:text="@string/continue_button"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/pasteButton"
+ app:layout_constraintVertical_bias="1.0"
+ tools:enabled="true" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml b/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
index c3850b4af36a67b62b043b80d584b80711492c01..45bec3efb63819fcd906f41cca9024039797910f 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
@@ -1,63 +1,65 @@
<?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="match_parent"
- android:fillViewport="true"
- tools:context=".android.mailbox.MailboxActivity">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="@dimen/hero_rect_width"
- android:layout_height="@dimen/hero_rect_width"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/introView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.25"
- app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_mailbox"
- app:tint="@color/briar_brand_green"
- tools:ignore="ContentDescription" />
-
- <TextView
- android:id="@+id/introView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
- android:text="@string/mailbox_setup_download"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/scanButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
- <Button
- android:id="@+id/scanButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
- android:drawablePadding="8dp"
- android:text="@string/mailbox_setup_button_scan"
- app:drawableLeftCompat="@drawable/ic_qr_code"
- app:drawableStartCompat="@drawable/ic_qr_code"
- app:drawableTint="@color/button_text"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- tools:visibility="visible" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
+ 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/imageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_width"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/introView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/il_mailbox_setup"
+ tools:ignore="ContentDescription" />
+
+ <TextView
+ android:id="@+id/introView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_large"
+ android:text="@string/mailbox_setup_download"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </ScrollView>
+
+ <Button
+ android:id="@+id/scanButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_large"
+ android:drawablePadding="8dp"
+ android:text="@string/mailbox_setup_button_scan"
+ app:drawableLeftCompat="@drawable/ic_qr_code"
+ app:drawableStartCompat="@drawable/ic_qr_code"
+ app:drawableTint="@color/button_text"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ tools:visibility="visible" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml b/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
index 613287b0a970f7c5695f58772aa76607fc9cd924..5639d8a59a5268d717ab670a09154a5c3d4b806f 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
@@ -1,59 +1,58 @@
<?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="match_parent"
- android:fillViewport="true"
- tools:context=".android.mailbox.MailboxActivity">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/introView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.25"
- app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_mailbox_onboarding"
- tools:ignore="ContentDescription" />
-
- <TextView
- android:id="@+id/introView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
- android:text="@string/mailbox_setup_intro"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/continueButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
- <Button
- android:id="@+id/continueButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
- android:drawablePadding="8dp"
- android:text="@string/continue_button"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- tools:visibility="visible" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
+ 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/imageView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/introView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/il_mailbox"
+ tools:ignore="ContentDescription" />
+
+ <TextView
+ android:id="@+id/introView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_large"
+ android:text="@string/mailbox_setup_intro"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </ScrollView>
+
+ <Button
+ android:id="@+id/continueButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_large"
+ android:text="@string/continue_button"
+ tools:visibility="visible" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_nickname.xml b/briar-android/src/main/res/layout/fragment_nickname.xml
index a07cc970b453202b332b13768aa5b5b2d873b3cd..34d8c98b384780823b2b5c9d39ef22bb02178596 100644
--- a/briar-android/src/main/res/layout/fragment_nickname.xml
+++ b/briar-android/src/main/res/layout/fragment_nickname.xml
@@ -1,176 +1,166 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/margin_large">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <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" />
-
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/stepOne"
- style="@style/StepBubble.Completed"
- app:layout_constraintBottom_toTopOf="@+id/stepOneText"
- app:layout_constraintEnd_toStartOf="@+id/guideline"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0"
- app:layout_constraintVertical_chainStyle="packed" />
-
- <TextView
- android:id="@+id/stepOneText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:text="@string/send_link_title"
- app:layout_constraintBottom_toTopOf="@+id/imageView"
- app:layout_constraintEnd_toStartOf="@+id/guideline"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/stepOne" />
-
- <View
- android:id="@+id/stepConnector"
- android:layout_width="0dp"
- android:layout_height="1dp"
- android:layout_margin="16dp"
- android:background="@color/briar_accent"
- app:layout_constraintBottom_toBottomOf="@+id/stepOne"
- app:layout_constraintEnd_toStartOf="@+id/stepTwo"
- app:layout_constraintStart_toEndOf="@+id/stepOne"
- app:layout_constraintTop_toTopOf="@+id/stepOne" />
-
- <TextView
- android:id="@+id/stepTwo"
- style="@style/StepBubble"
- android:text="@string/step_2"
- app:layout_constraintBottom_toTopOf="@+id/stepTwoText"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="@+id/guideline"
- app:layout_constraintTop_toTopOf="@+id/stepOne"
- app:layout_constraintVertical_bias="0.0"
- app:layout_constraintVertical_chainStyle="packed" />
-
- <TextView
- android:id="@+id/stepTwoText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="8dp"
- android:text="@string/add_contact_choose_nickname"
- app:layout_constraintBottom_toTopOf="@+id/imageView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/guideline"
- app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
-
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_marginTop="32dp"
- app:layout_constraintBottom_toTopOf="@+id/nicknameIcon"
- app:layout_constraintDimensionRatio="1:1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHeight_max="256dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/stepOneText"
- app:srcCompat="@drawable/ic_nickname"
- tools:ignore="ContentDescription" />
-
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/nicknameIcon"
- android:layout_width="38dp"
- android:layout_height="38dp"
- android:layout_marginTop="32dp"
- android:background="@drawable/bubble_accent"
- android:scaleType="center"
- app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView"
- app:srcCompat="@drawable/ic_person"
- app:tint="@android:color/white" />
-
- <TextView
- android:id="@+id/nicknameIntro"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginLeft="8dp"
- android:gravity="left|start"
- android:text="@string/nickname_intro"
- android:textSize="16sp"
- app:layout_constraintBottom_toBottomOf="@+id/nicknameIcon"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/nicknameIcon"
- app:layout_constraintTop_toTopOf="@+id/nicknameIcon" />
-
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/contactNameLayout"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- app:errorEnabled="true"
- app:hintEnabled="false"
- app:layout_constraintBottom_toTopOf="@+id/space"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/nicknameIcon">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/contactNameInput"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:hint="@string/add_contact_choose_a_nickname"
- android:importantForAutofill="no"
- android:inputType="text|textCapWords" />
-
- </com.google.android.material.textfield.TextInputLayout>
-
- <Space
- android:id="@+id/space"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:layout_constrainedHeight="true"
- app:layout_constraintBottom_toTopOf="@+id/addButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/contactNameLayout" />
-
- <Button
- android:id="@+id/addButton"
- style="@style/BriarButton"
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/add_contact_button"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"
- app:layout_constraintVertical_bias="1.0" />
-
- <ProgressBar
- android:id="@+id/progressBar"
- style="?android:attr/progressBarStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:visibility="invisible"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"
- app:layout_constraintVertical_bias="1.0" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
+ android:padding="@dimen/margin_large">
+
+ <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" />
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/stepOne"
+ style="@style/StepBubble.Completed"
+ app:layout_constraintBottom_toTopOf="@+id/stepOneText"
+ app:layout_constraintEnd_toStartOf="@+id/guideline"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintVertical_chainStyle="packed" />
+
+ <TextView
+ android:id="@+id/stepOneText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:text="@string/send_link_title"
+ app:layout_constraintBottom_toTopOf="@+id/imageView"
+ app:layout_constraintEnd_toStartOf="@+id/guideline"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/stepOne" />
+
+ <View
+ android:id="@+id/stepConnector"
+ android:layout_width="0dp"
+ android:layout_height="1dp"
+ android:layout_margin="16dp"
+ android:background="@color/briar_accent"
+ app:layout_constraintBottom_toBottomOf="@+id/stepOne"
+ app:layout_constraintEnd_toStartOf="@+id/stepTwo"
+ app:layout_constraintStart_toEndOf="@+id/stepOne"
+ app:layout_constraintTop_toTopOf="@+id/stepOne" />
+
+ <TextView
+ android:id="@+id/stepTwo"
+ style="@style/StepBubble"
+ android:text="@string/step_2"
+ app:layout_constraintBottom_toTopOf="@+id/stepTwoText"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/guideline"
+ app:layout_constraintTop_toTopOf="@+id/stepOne"
+ app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintVertical_chainStyle="packed" />
+
+ <TextView
+ android:id="@+id/stepTwoText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:text="@string/add_contact_choose_nickname"
+ app:layout_constraintBottom_toTopOf="@+id/imageView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/guideline"
+ app:layout_constraintTop_toBottomOf="@+id/stepTwo" />
+
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginTop="32dp"
+ app:layout_constraintBottom_toTopOf="@+id/nicknameIcon"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHeight_max="256dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/stepOneText"
+ app:srcCompat="@drawable/il_add_contact_remote_nickname"
+ tools:ignore="ContentDescription" />
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/nicknameIcon"
+ android:layout_width="38dp"
+ android:layout_height="38dp"
+ android:layout_marginTop="32dp"
+ android:background="@drawable/bubble_accent"
+ android:scaleType="center"
+ app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView"
+ app:srcCompat="@drawable/ic_person"
+ app:tint="@android:color/white" />
+
+ <TextView
+ android:id="@+id/nicknameIntro"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
+ android:gravity="left|start"
+ android:text="@string/nickname_intro"
+ android:textSize="16sp"
+ app:layout_constraintBottom_toBottomOf="@+id/nicknameIcon"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/nicknameIcon"
+ app:layout_constraintTop_toTopOf="@+id/nicknameIcon" />
+
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/contactNameLayout"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ app:errorEnabled="true"
+ app:hintEnabled="false"
+ app:layout_constraintBottom_toTopOf="@+id/space"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/nicknameIcon">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/contactNameInput"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:hint="@string/add_contact_choose_a_nickname"
+ android:importantForAutofill="no"
+ android:inputType="text|textCapWords" />
+
+ </com.google.android.material.textfield.TextInputLayout>
+
+ <Space
+ android:id="@+id/space"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:layout_constrainedHeight="true"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/contactNameLayout" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </ScrollView>
+
+ <org.briarproject.briar.android.view.BriarButton
+ android:id="@+id/addButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="16dp"
+ app:buttonStyle="@style/BriarButton"
+ app:text="@string/add_contact_button" />
-</ScrollView>
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
index 3bfc7c9f0ba15370876369edc5a9a84a961f9e00..697d55b4a090d3d5b62d142ab528afe590c399c0 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
@@ -1,81 +1,88 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="@dimen/hero_square"
- android:layout_height="@dimen/hero_square"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/introView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.25"
- app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_transfer_data"
- tools:ignore="ContentDescription" />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <TextView
- android:id="@+id/introView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:text="@string/removable_drive_intro"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/buttonLearnMore"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView" />
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="@dimen/hero_square"
+ android:layout_height="@dimen/hero_square"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/introView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/il_transfer_data"
+ tools:ignore="ContentDescription" />
- <Button
- android:id="@+id/buttonLearnMore"
- style="@style/BriarButtonFlat.Positive"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/margin_large"
- android:padding="16dp"
- android:text="@string/learn_more"
- android:textAllCaps="false"
- android:textSize="14sp"
- app:layout_constraintBottom_toTopOf="@id/sendButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/introView" />
+ <TextView
+ android:id="@+id/introView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:text="@string/removable_drive_intro"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toTopOf="@+id/buttonLearnMore"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView" />
- <Button
- android:id="@+id/sendButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_large"
- android:layout_marginTop="@dimen/margin_large"
- android:text="@string/removable_drive_title_send"
- app:layout_constraintBottom_toTopOf="@+id/receiveButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ <Button
+ android:id="@+id/buttonLearnMore"
+ style="@style/BriarButtonFlat.Positive"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/margin_large"
+ android:padding="16dp"
+ android:text="@string/learn_more"
+ android:textAllCaps="false"
+ android:textSize="14sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/introView" />
- <Button
- android:id="@+id/receiveButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
- android:text="@string/removable_drive_title_receive"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </ScrollView>
-</ScrollView>
+ <Button
+ android:id="@+id/sendButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_large"
+ android:layout_marginTop="8dp"
+ android:text="@string/removable_drive_title_send"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+ <Button
+ android:id="@+id/receiveButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_large"
+ android:text="@string/removable_drive_title_receive"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml b/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
index 71f87ee87784c4e20fc1f9f3bf1fd09b81f7922d..3911756c6d9356a31586594e1887412da9424888 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_receive.xml
@@ -1,71 +1,78 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="@dimen/hero_rect_width"
- android:layout_height="@dimen/hero_rect_height"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/progressBar"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_chainStyle="packed"
- app:layout_constraintVertical_bias="0.25"
- app:srcCompat="@drawable/ic_transfer_data_receive"
- tools:ignore="ContentDescription" />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <ProgressBar
- android:id="@+id/progressBar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:indeterminate="true"
- android:visibility="invisible"
- app:layout_constraintBottom_toTopOf="@+id/introTextView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView"
- tools:visibility="visible" />
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_height"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/progressBar"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/il_transfer_data_receive"
+ tools:ignore="ContentDescription" />
- <TextView
- android:id="@+id/introTextView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
- android:text="@string/removable_drive_receive_intro"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/fileButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/progressBar" />
+ <ProgressBar
+ android:id="@+id/progressBar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:indeterminate="true"
+ android:visibility="gone"
+ app:layout_constraintBottom_toTopOf="@+id/introTextView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView"
+ tools:visibility="visible" />
- <Button
- android:id="@+id/fileButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
- android:enabled="false"
- android:text="@string/removable_drive_receive_button"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ <TextView
+ android:id="@+id/introTextView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:layout_marginBottom="@dimen/margin_large"
+ android:text="@string/removable_drive_receive_intro"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/progressBar" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+ </ScrollView>
+
+ <Button
+ android:id="@+id/fileButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_large"
+ android:enabled="false"
+ android:text="@string/removable_drive_receive_button"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_send.xml b/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
index f8bf50af3e54813142b7386e21d92feff8971c35..a7564a3986f911b398230e13488250d55179b60f 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
@@ -1,70 +1,77 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="@dimen/hero_rect_width"
- android:layout_height="@dimen/hero_rect_height"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/progressBar"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.25"
- app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_transfer_data_send"
- tools:ignore="ContentDescription" />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <ProgressBar
- android:id="@+id/progressBar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:visibility="invisible"
- app:layout_constraintBottom_toTopOf="@+id/introTextView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView"
- tools:visibility="visible" />
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_height"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/progressBar"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/il_transfer_data_send"
+ tools:ignore="ContentDescription" />
- <TextView
- android:id="@+id/introTextView"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
- android:text="@string/removable_drive_send_intro"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/fileButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/progressBar" />
+ <ProgressBar
+ android:id="@+id/progressBar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:visibility="gone"
+ app:layout_constraintBottom_toTopOf="@+id/introTextView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView"
+ tools:visibility="visible" />
- <Button
- android:id="@+id/fileButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
- android:enabled="false"
- android:text="@string/removable_drive_send_button"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ <TextView
+ android:id="@+id/introTextView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:layout_marginBottom="@dimen/margin_large"
+ android:text="@string/removable_drive_send_intro"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/progressBar" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+ </ScrollView>
+
+ <Button
+ android:id="@+id/fileButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_large"
+ android:enabled="false"
+ android:text="@string/removable_drive_send_button"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+</LinearLayout>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
index 7e03d0a7fb6c1785a8e622642928d4d0d0dd67a7..9bd2ea5896ca9d916863fe656281b1db507c74b3 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
@@ -36,8 +36,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:spanCount="2"
- tools:ignore="ContentDescription"
- tools:src="@drawable/alerts_and_states_error" />
+ tools:ignore="ContentDescription" />
<com.vanniktech.emoji.EmojiTextView
android:id="@+id/text"
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index ee94e4a5edf88d097930741f189e57677bdb9931..5cffcc605c1d3cb94fe494cb3729ef92d9ce79ed 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -26,4 +26,10 @@
<color name="thread_item_highlight">@android:color/black</color>
<color name="divider">@android:color/black</color>
-</resources>
\ No newline at end of file
+
+ <color name="il_border">#64748B</color>
+ <color name="il_background">#334155</color>
+ <color name="il_lime">@color/briar_lime_400_new</color>
+ <color name="il_orange">@color/briar_orange_400</color>
+ <color name="il_red">@color/briar_red_500_new</color>
+</resources>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index f0b66de155505752eb13d668fa459ab6b8cc5cea..973a0a0fc68dbfd584f65dcd5f1f24cdcbd04835 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -1,20 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="briar_lime_600">#67a60f</color>
+ <color name="briar_lime_600_new">#65A30D</color>
<color name="briar_lime_400">#82c91e</color>
+ <color name="briar_lime_400_new">#A3E635</color>
<color name="briar_blue_800">#134a81</color>
<color name="briar_blue_600">#1b69b6</color>
<color name="briar_blue_400">#418cd8</color>
<color name="briar_orange_200">#fed69f</color>
+ <color name="briar_orange_400">#FBBF24</color>
<color name="briar_orange_500">#fc9403</color>
+ <color name="briar_orange_500_new">#F59E0B</color>
<color name="briar_red_500">#db3b21</color>
+ <color name="briar_red_500_new">#EF4444</color>
+ <color name="briar_red_600">#DC2626</color>
<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>
@@ -52,6 +59,12 @@
<color name="msg_status_bubble_foreground">@android:color/white</color>
<color name="msg_selected_background">@color/briar_accent</color>
+ <color name="il_border">#9CA3AF</color>
+ <color name="il_background">#E5E7EB</color>
+ <color name="il_lime">@color/briar_lime_600_new</color>
+ <color name="il_orange">@color/briar_orange_500_new</color>
+ <color name="il_red">@color/briar_red_600</color>
+
<!-- text colors -->
<color name="briar_text_link">@color/briar_blue_400</color>
<color name="briar_text_primary">#df000000</color>
@@ -73,4 +86,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 8887fcd7b11bcd241a1d22501d3586f1fc624994..93f3730871865248daf60f1e0d1d4fcdfceafb5e 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -240,6 +240,8 @@
<!-- 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="add_contact_error_two_way">Did both of you 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>