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 000000000..1d14a6e0d
--- /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 000000000..470361a40
--- /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/qr_code_error.svg b/briar-android/artwork/qr_code_error.svg
deleted file mode 100644
index cfd12461e..000000000
--- 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/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 34f985a1f..408fab4ec 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/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 000000000..36cb7b1d6
--- /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/il_qr_code_error.xml b/briar-android/src/main/res/drawable/il_qr_code_error.xml
new file mode 100644
index 000000000..04bc638c7
--- /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/qr_code_error.xml b/briar-android/src/main/res/drawable/qr_code_error.xml
deleted file mode 100644
index f866e6389..000000000
--- 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/layout/fragment_error_contact_exchange.xml b/briar-android/src/main/res/layout/fragment_error_contact_exchange.xml
index 655441298..40cc0983a 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/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index d8a6c261c..dcecc300c 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -241,6 +241,7 @@
 
 	<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>