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/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/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 ed774bcd2d1d2be3a9b4b6aa60b52b098f91ef5c..63ceaa6fb8dc984a1bbe6a8e0ff1256c872f2fb0 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
@@ -25,6 +25,7 @@ import androidx.lifecycle.ViewModelProvider;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
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
@@ -71,6 +72,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/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/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/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/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"