diff --git a/data/resources/assets/other-device.svg b/data/resources/assets/other-device.svg
index b2596e77..800a3ea1 100644
--- a/data/resources/assets/other-device.svg
+++ b/data/resources/assets/other-device.svg
@@ -1,435 +1,109 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="340"
-   height="200"
-   viewBox="0 0 89.958331 52.916668"
-   version="1.1"
-   id="svg8662"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <defs
-     id="defs8656">
-    <linearGradient
-       id="linearGradient104655">
-      <stop
-         style="stop-color:#3d3846;stop-opacity:1"
-         offset="0"
-         id="stop104651" />
-      <stop
-         style="stop-color:#5e5c64;stop-opacity:1"
-         offset="1"
-         id="stop104653" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient82129">
-      <stop
-         style="stop-color:#62a0ea;stop-opacity:1;"
-         offset="0"
-         id="stop82125" />
-      <stop
-         style="stop-color:#c061cb;stop-opacity:1"
-         offset="1"
-         id="stop82127" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient70265">
-      <stop
-         style="stop-color:#99c1f1;stop-opacity:1"
-         offset="0"
-         id="stop70261" />
-      <stop
-         style="stop-color:#dc8add;stop-opacity:1"
-         offset="1"
-         id="stop70263" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient56117">
-      <stop
-         style="stop-color:#3d3846;stop-opacity:1"
-         offset="0"
-         id="stop56113" />
-      <stop
-         style="stop-color:#77767b;stop-opacity:1"
-         offset="1"
-         id="stop56115" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient70265"
-       id="linearGradient39055"
-       x1="34.925"
-       y1="35.057291"
-       x2="67.943703"
-       y2="35.057289"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(6.6145842)" />
-    <linearGradient
-       xlink:href="#linearGradient82129"
-       id="linearGradient82131"
-       x1="11.200694"
-       y1="33.249307"
-       x2="32.54375"
-       y2="33.249307"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5,0,0,1.5,-0.9260416,-15.875)" />
-    <linearGradient
-       xlink:href="#linearGradient82129"
-       id="linearGradient82161"
-       x1="73.554153"
-       y1="31.750002"
-       x2="85.195839"
-       y2="31.750002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,2.6458333)" />
-    <linearGradient
-       xlink:href="#linearGradient56117"
-       id="linearGradient98041"
-       x1="9.260417"
-       y1="46.302082"
-       x2="9.260417"
-       y2="45.243752"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       xlink:href="#linearGradient104655"
-       id="linearGradient98624"
-       gradientUnits="userSpaceOnUse"
-       x1="9.260417"
-       y1="46.302082"
-       x2="9.260417"
-       y2="45.243752"
-       gradientTransform="matrix(0.38333333,0,0,1,30.021389,0)" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath99524">
-      <rect
-         style="fill:#dc8add;fill-opacity:1;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:26.4"
-         id="rect99526"
-         width="35.71875"
-         height="26.458332"
-         x="14.552083"
-         y="17.727087" />
-    </clipPath>
-  </defs>
-  <metadata
-     id="metadata8659">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="g77929"
-     transform="translate(-26.223863,0.26458333)">
-    <rect
-       y="10.054167"
-       x="59.29678"
-       height="7.1434927"
-       width="18.520782"
-       id="rect77923"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#c0bfbc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00569266;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       rx="1.5874978"
-       ry="1.2245986" />
-    <rect
-       y="8.7312498"
-       x="59.29678"
-       height="7.9372444"
-       width="18.520782"
-       id="rect77925"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#deddda;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0060006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       rx="1.5874978"
-       ry="1.3606703" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="340" height="200" version="1.1" viewBox="0 0 89.958 52.917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="linearGradient82129">
+   <stop stop-color="#62a0ea" offset="0"/>
+   <stop stop-color="#c061cb" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient39055" x1="34.925" x2="67.944" y1="35.057" y2="35.057" gradientTransform="matrix(.96573 0 0 .96573 9.3346 .15412)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#99c1f1" offset="0"/>
+   <stop stop-color="#dc8add" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient82131" x1="11.201" x2="32.544" y1="33.249" y2="33.249" gradientTransform="matrix(1.5 0 0 1.5 -.92604 -15.875)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient82129"/>
+  <linearGradient id="linearGradient82161" x1="73.554" x2="85.196" y1="31.75" y2="31.75" gradientTransform="matrix(.96573 0 0 .96573 2.9467 2.7093)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient82129"/>
+  <linearGradient id="linearGradient98041" x1="9.2604" x2="9.2604" y1="46.302" y2="45.244" gradientTransform="matrix(.96573 0 0 .96573 2.9467 .15412)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3d3846" offset="0"/>
+   <stop stop-color="#77767b" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient98624" x1="9.2604" x2="9.2604" y1="46.302" y2="45.244" gradientTransform="matrix(.3702 0 0 .96573 31.939 .15412)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3d3846" offset="0"/>
+   <stop stop-color="#5e5c64" offset="1"/>
+  </linearGradient>
+  <clipPath id="clipPath99524">
+   <rect x="14.552" y="17.727" width="35.719" height="26.458" fill="#dc8add" stroke-dashoffset="26.4" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.1167"/>
+  </clipPath>
+ </defs>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g transform="matrix(.96573 0 0 .96573 -22.379 .40964)" shape-rendering="auto">
+  <rect x="59.297" y="10.054" width="18.521" height="7.1435" rx="1.5875" ry="1.2246" color="#000000" color-rendering="auto" fill="#c0bfbc" image-rendering="auto"/>
+  <rect x="59.297" y="8.7312" width="18.521" height="7.9372" rx="1.5875" ry="1.3607" color="#000000" color-rendering="auto" fill="#deddda" image-rendering="auto"/>
+ </g>
+ <g transform="matrix(.96573 0 0 .96573 10.612 8.3307)">
+  <g shape-rendering="auto">
+   <rect x="43.656" y="7.1435" width="19.844" height="9.2604" rx="1.5875" ry="1.5875" color="#000000" color-rendering="auto" fill="#c0bfbc" image-rendering="auto"/>
+   <rect x="43.656" y="6.6143" width="19.844" height="9.2604" rx="1.5875" ry="1.5875" color="#000000" color-rendering="auto" fill="#deddda" image-rendering="auto"/>
   </g>
-  <g
-     id="g72761"
-     transform="translate(7.9375002,8.4666665)">
-    <g
-       id="g72759">
-      <rect
-         y="7.1435065"
-         x="43.65625"
-         height="9.2604046"
-         width="19.843752"
-         id="rect72755"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#c0bfbc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00648149;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         rx="1.5874978"
-         ry="1.5874978" />
-      <rect
-         y="6.6143403"
-         x="43.65625"
-         height="9.2604046"
-         width="19.843752"
-         id="rect72757"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#deddda;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00648149;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         rx="1.5874978"
-         ry="1.5874978" />
-    </g>
+ </g>
+ <rect x="60.212" y="10.119" width="17.886" height="8.9431" rx="1.5331" ry="1.5331" color="#000000" color-rendering="auto" fill="#813d9c" image-rendering="auto" shape-rendering="auto"/>
+ <rect x="60.212" y="9.608" width="17.886" height="8.9431" rx="1.5331" ry="1.5331" color="#000000" color-rendering="auto" fill="#c061cb" image-rendering="auto" shape-rendering="auto"/>
+ <g transform="matrix(.19164 0 0 .19164 813.35 57.29)" fill-rule="evenodd" stroke-width=".66667">
+  <path d="m-3989.3-232.71c-4.4319 0-8 3.568-8 8v27.898c0 4.432 3.5681 8 8 8h23l12.667 12.667v-12.667h48.334c4.432 0 8-3.568 8-8v-27.898c0-4.432-3.568-8-8-8z" enable-background="new" fill="#62a0ea"/>
+  <path d="m-3997.3-198.81v2c0 4.432 3.5681 8 8 8h23l12.667 12.667v-2l-12.667-12.667h-23c-4.4319 0-8-3.568-8-8zm100 0c0 4.432-3.568 8-8 8h-48.334v2h48.334c4.432 0 8-3.568 8-8z" enable-background="new" fill="#3584e4"/>
+ </g>
+ <g transform="matrix(.20361 0 0 .12776 758.05 61.667)" stroke-width=".79212">
+  <rect x="-3490" y="-443.48" width="101.5" height="70" rx="8.7004" ry="12" color="#000000" color-rendering="auto" fill="#1a5fb4" image-rendering="auto" shape-rendering="auto"/>
+  <rect x="-3490" y="-447.48" width="101.5" height="70" rx="8.7004" ry="12" color="#000000" color-rendering="auto" fill="#1c71d8" image-rendering="auto" shape-rendering="auto"/>
+  <g transform="translate(8.0038e-5 .50001)" fill="#99c1f1">
+   <rect x="-3477.5" y="-431.98" width="76.407" height="5"/>
+   <rect x="-3477.5" y="-421.98" width="59.608" height="5"/>
+   <rect x="-3477.5" y="-411.98" width="37.02" height="5"/>
   </g>
-  <rect
-     y="10.318505"
-     x="59.29678"
-     height="9.2604046"
-     width="18.520782"
-     id="rect72763"
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#813d9c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00648149;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     rx="1.5874978"
-     ry="1.5874978" />
-  <rect
-     y="9.78934"
-     x="59.29678"
-     height="9.2604046"
-     width="18.520782"
-     id="rect72765"
-     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#c061cb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00648149;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     rx="1.5874978"
-     ry="1.5874978" />
-  <g
-     transform="matrix(0.19843723,0,0,0.19843723,839.155,59.163211)"
-     id="g72771"
-     style="stroke-width:0.666667">
-    <path
-       style="display:inline;fill:#62a0ea;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.00753214px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
-       d="m -3989.3337,-232.71069 c -4.4319,0 -8,3.56799 -8,8 v 27.89844 c 0,4.43202 3.5681,8 8,8 h 22.9999 l 12.6667,12.66667 v -12.66667 h 48.3335 c 4.432,0 8,-3.56798 8,-8 v -27.89844 c 0,-4.43201 -3.568,-8 -8,-8 z"
-       id="path72767" />
-    <path
-       id="path72769"
-       d="m -3997.3337,-198.81225 v 2 c 0,4.43202 3.5681,8 8,8 h 22.9999 l 12.6667,12.66667 v -2 l -12.6667,-12.66667 h -22.9999 c -4.4319,0 -8,-3.56798 -8,-8 z m 100.0001,0 c 0,4.43202 -3.568,8 -8,8 h -48.3335 v 2 h 48.3335 c 4.432,0 8,-3.56798 8,-8 z"
-       style="display:inline;fill:#3584e4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.00753214px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" />
+ </g>
+ <g transform="matrix(.19164 0 0 .19164 788.75 53.329)" stroke-width=".66667">
+  <path d="m-3913.7-217.48c-4.4319 0-8 3.568-8 8v24c0 4.432 3.5681 8 8 8h15.333v12.667l12.667-12.667h46c4.432 0 8-3.568 8-8v-24c0-4.432-3.568-8-8-8z" enable-background="new" fill="#dc8add" fill-rule="evenodd"/>
+  <g fill="#c061cb">
+   <path d="m-3921.7-187.48v2c0 4.432 3.5681 8 8 8h15.333v-2h-15.333c-4.4319 0-8-3.568-8-8zm90 0c0 4.432-3.568 8-8 8h-46l-12.667 12.667v2l12.667-12.667h46c4.432 0 8-3.568 8-8z" enable-background="new" fill-rule="evenodd"/>
+   <rect x="-3905" y="-207.48" width="56.667" height="3.3333"/>
+   <rect x="-3905" y="-200.81" width="56.667" height="3.3333"/>
+   <rect x="-3905" y="-194.15" width="33.333" height="3.3333"/>
   </g>
-  <g
-     transform="matrix(0.21083945,0,0,0.13229149,781.89724,63.69551)"
-     id="g72785"
-     style="stroke-width:0.792118">
-    <rect
-       y="-443.48032"
-       x="-3490"
-       height="70"
-       width="101.50459"
-       id="rect72773"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#1a5fb4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.041718;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       rx="8.7004051"
-       ry="12" />
-    <rect
-       y="-447.48032"
-       x="-3490"
-       height="70"
-       width="101.50459"
-       id="rect72775"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#1c71d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.041718;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       rx="8.7004051"
-       ry="12" />
-    <g
-       id="g72783"
-       style="fill:#99c1f1"
-       transform="translate(8.0037955e-5,0.50000642)">
-      <rect
-         y="-431.98038"
-         x="-3477.4512"
-         height="4.9999967"
-         width="76.406708"
-         id="rect72777"
-         style="fill:#99c1f1;fill-opacity:1;stroke:none;stroke-width:12.5555;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="-421.98038"
-         x="-3477.4512"
-         height="4.9999967"
-         width="59.607872"
-         id="rect72779"
-         style="fill:#99c1f1;fill-opacity:1;stroke:none;stroke-width:11.0897;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="fill:#99c1f1;fill-opacity:1;stroke:none;stroke-width:11.0897;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect72781"
-         width="37.01963"
-         height="4.9999967"
-         x="-3477.4512"
-         y="-411.98038" />
-    </g>
+ </g>
+ <g transform="matrix(.48287 0 0 .48287 37.214 3.6034)">
+  <g transform="matrix(.26458 0 0 .26458 939.27 123.16)">
+   <g transform="matrix(1.5 0 0 1.5 2465 -75.912)" fill-rule="evenodd" stroke-width=".66667">
+    <path d="m-3905.3-237.71c-4.4319 0-8 3.8424-8 8.6154v29.436c0 4.7729 3.5681 8.6154 8 8.6154h57.333c4.432 0 8-3.8424 8-8.6154v-29.436c0-4.7729-3.568-8.6154-8-8.6154z" enable-background="new" fill="#fff"/>
+    <path d="m-3913.3-201.05v2c0 4.432 3.5681 8 8 8h19l12.667 12.667v-2l-12.667-12.667h-19c-4.4319 0-8-3.568-8-8zm73.333 0c0 4.432-3.568 8-8 8h-25.667v2h25.667c4.432 0 8-3.568 8-8z" enable-background="new" fill="#deddda"/>
+   </g>
+   <g fill="#deddda">
+    <rect x="-3385" y="-407.48" width="70" height="5"/>
+    <rect x="-3385" y="-397.48" width="70" height="5"/>
+    <rect x="-3385" y="-387.48" width="59" height="5"/>
+    <rect x="-3385" y="-417.48" width="70" height="5"/>
+   </g>
   </g>
-  <g
-     transform="matrix(0.19843723,0,0,0.19843723,813.68885,55.062177)"
-     id="g72797"
-     style="stroke-width:0.666667">
-    <path
-       id="path72787"
-       d="m -3913.6666,-217.48035 c -4.4319,0 -8,3.56798 -8,8 v 24 c 0,4.43202 3.5681,8 8,8 h 15.3333 v 12.66667 l 12.6667,-12.66667 h 45.9999 c 4.432,0 8,-3.56798 8,-8 v -24 c 0,-4.43202 -3.568,-8 -8,-8 z"
-       style="display:inline;fill:#dc8add;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.00753214px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" />
-    <path
-       id="path72789"
-       d="m -3921.6666,-187.48035 v 2 c 0,4.43202 3.5681,8 8,8 h 15.3333 v -2 h -15.3333 c -4.4319,0 -8,-3.56798 -8,-8 z m 89.9999,0 c 0,4.43202 -3.568,8 -8,8 h -45.9999 l -12.6667,12.66667 v 2 l 12.6667,-12.66667 h 45.9999 c 4.432,0 8,-3.56798 8,-8 z"
-       style="display:inline;fill:#c061cb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.00753214px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" />
-    <rect
-       style="opacity:1;fill:#c061cb;fill-opacity:1;stroke:none;stroke-width:9.33333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect72791"
-       width="56.666668"
-       height="3.3333311"
-       x="-3905"
-       y="-207.48033" />
-    <rect
-       style="opacity:1;fill:#c061cb;fill-opacity:1;stroke:none;stroke-width:9.33333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect72793"
-       width="56.666668"
-       height="3.3333311"
-       x="-3905"
-       y="-200.81364" />
-    <rect
-       y="-194.14696"
-       x="-3905"
-       height="3.3333311"
-       width="33.333332"
-       id="rect72795"
-       style="opacity:1;fill:#c061cb;fill-opacity:1;stroke:none;stroke-width:9.33337;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  <path d="m54.107 26.458v5.0271l-5.0271-5.0271z" fill="#fff"/>
+ </g>
+ <g transform="matrix(.96573 0 0 .96573 2.9467 .15412)" clip-path="url(#clipPath99524)" stroke-dashoffset="26.4" stroke-linecap="round" stroke-linejoin="round">
+  <rect x="15.081" y="20.637" width="33.602" height="26.988" rx="2.9104" fill="#3d3846" stroke-width="3.0795"/>
+  <rect x="15.875" y="21.431" width="32.015" height="25.135" rx="2.1167" fill="url(#linearGradient82131)" stroke-width="3.1428"/>
+ </g>
+ <g transform="matrix(1.4486 0 0 1.4486 9.3562 -1.4932)" fill="#fff">
+  <g transform="matrix(.5 0 0 .5 5.4165 8.0651)" fill="#fff">
+   <path d="m17.712 25.655c-0.87946 0-1.5875 0.76249-1.5875 1.7096v5.4443c0 0.94713 0.70804 1.7096 1.5875 1.7096h11.113c0.87948 0 1.5875-0.76248 1.5875-1.7096v-5.4443c0-0.94713-0.70802-1.7096-1.5875-1.7096z" enable-background="new" fill-rule="evenodd"/>
+   <path d="m26.179 32.534v5.0271l-5.0271-5.0271z"/>
   </g>
-  <g
-     id="g72817"
-     transform="matrix(0.49999932,0,0,0.49999932,35.483542,3.5716243)">
-    <g
-       id="g72813"
-       transform="matrix(0.26458333,0,0,0.26458333,939.27082,123.15833)">
-      <g
-         style="stroke-width:0.666667"
-         transform="matrix(1.5,0,0,1.5,2465.0001,-75.912199)"
-         id="g72803">
-        <path
-           style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.00753214px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
-           d="m -3905.3334,-237.71207 c -4.4319,0 -8,3.84245 -8,8.61537 v 29.43586 c 0,4.77294 3.5681,8.61538 8,8.61538 H -3848 c 4.432,0 8,-3.84244 8,-8.61538 v -29.43586 c 0,-4.77292 -3.568,-8.61537 -8,-8.61537 z"
-           id="path72799" />
-        <path
-           id="path72801"
-           d="m -3913.3334,-201.04546 v 2 c 0,4.43202 3.5681,8 8,8 h 19 l 12.6667,12.66667 v -2 l -12.6667,-12.66667 h -19 c -4.4319,0 -8,-3.56798 -8,-8 z m 73.3334,0 c 0,4.43202 -3.568,8 -8,8 h -25.6667 v 2 H -3848 c 4.432,0 8,-3.56798 8,-8 z"
-           style="display:inline;fill:#deddda;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.00753214px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new" />
-      </g>
-      <rect
-         y="-407.48035"
-         x="-3385"
-         height="4.9999967"
-         width="70"
-         id="rect72805"
-         style="opacity:1;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:14;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="-397.48035"
-         x="-3385"
-         height="4.9999967"
-         width="70"
-         id="rect72807"
-         style="opacity:1;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:14;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:14;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect72809"
-         width="59.000008"
-         height="4.9999967"
-         x="-3385"
-         y="-387.48035" />
-      <rect
-         y="-417.48035"
-         x="-3385"
-         height="4.9999967"
-         width="70"
-         id="rect72811"
-         style="opacity:1;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:14;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 54.107302,26.458311 v 5.027084 l -5.027097,-5.027084 z"
-       id="path72815" />
+ </g>
+ <g stroke-linecap="round" stroke-linejoin="round" stroke-width="2.0441">
+  <path d="m43.829 33.371h2.5552a2.5552 2.5552 0 0 1 2.5552 2.5552v1.2776a2.5552 2.5552 0 0 0 2.5552 2.5552 2.5552 2.5552 0 0 0 2.5552-2.5552v-8.9431a2.5552 2.5552 0 0 1 2.5552-2.5552 2.5552 2.5552 0 0 1 2.5552 2.5552v11.498a2.5552 2.5552 0 0 0 2.5552 2.5552 2.5552 2.5552 0 0 0 2.5552-2.5552v-8.9431a2.5552 2.5552 0 0 1 2.5552-2.5552 2.5552 2.5552 0 0 1 2.5552 2.5552v1.2776a2.5552 2.5552 0 0 0 2.5552 2.5552h2.5552" fill="none" stroke="url(#linearGradient39055)"/>
+  <rect x="73.214" y="20.595" width="12.776" height="25.552" rx="1.7886" ry="1.7886" fill="#3d3846" stroke-dashoffset="26.4"/>
+  <rect x="73.98" y="21.362" width="11.243" height="24.019" rx="1.0221" ry="1.0221" fill="url(#linearGradient82161)" stroke-dashoffset="26.4"/>
+ </g>
+ <g transform="matrix(.96573 0 0 .96573 63.135 10.703)" fill="#fff">
+  <g transform="matrix(.5 0 0 .5 5.4165 8.0651)" fill="#fff">
+   <path d="m17.712 25.655c-0.87946 0-1.5875 0.76249-1.5875 1.7096v5.4443c0 0.94713 0.70804 1.7096 1.5875 1.7096h11.113c0.87948 0 1.5875-0.76248 1.5875-1.7096v-5.4443c0-0.94713-0.70802-1.7096-1.5875-1.7096z" enable-background="new" fill-rule="evenodd"/>
+   <path d="m26.179 32.534v5.0271l-5.0271-5.0271z"/>
   </g>
-  <g
-     id="g137252"
-     transform="matrix(0.26458333,0,0,0.26208726,931.33332,121.81302)"
-     style="stroke-width:1.00475" />
-  <g
-     id="g99322"
-     clip-path="url(#clipPath99524)">
-    <rect
-       style="fill:#3d3846;stroke-width:3.07951;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:26.4"
-       id="rect4199"
-       width="33.602081"
-       height="26.987755"
-       x="15.081252"
-       y="20.637245"
-       rx="2.9104166" />
-    <rect
-       style="fill:url(#linearGradient82131);fill-opacity:1;stroke-width:3.14283;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:26.4"
-       id="rect47002"
-       width="32.014584"
-       height="25.135418"
-       x="15.875"
-       y="21.431252"
-       rx="2.1166668" />
-  </g>
-  <g
-     id="g9559"
-     transform="matrix(1.5,0,0,1.5,6.6369485,-1.7057333)"
-     style="fill:#ffffff;fill-opacity:1">
-    <g
-       id="g9536"
-       transform="matrix(0.49999955,0,0,0.49999955,5.4165084,8.0651133)"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.00149466px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
-         d="m 17.712178,25.65522 c -0.879455,0 -1.5875,0.762486 -1.5875,1.709612 v 5.444313 c 0,0.94713 0.708045,1.709614 1.5875,1.709614 h 11.112513 c 0.879475,0 1.5875,-0.762484 1.5875,-1.709614 v -5.444313 c 0,-0.947126 -0.708025,-1.709612 -1.5875,-1.709612 z"
-         id="path137290-3" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 26.178854,32.534384 v 5.027084 l -5.027097,-5.027084 z"
-         id="path62781-6" />
-    </g>
-  </g>
-  <path
-     style="fill:none;stroke:url(#linearGradient39055);stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 42.333334,34.395833 h 2.645832 A 2.645834,2.645834 45 0 1 47.625,37.041667 v 1.322917 a 2.6458333,2.6458333 45 0 0 2.645833,2.645833 h 0 a 2.6458337,2.6458337 135 0 0 2.645834,-2.645834 v -9.260418 a 2.645833,2.645833 135 0 1 2.645833,-2.645833 2.645833,2.645833 45 0 1 2.645833,2.645833 V 41.010416 A 2.6458336,2.6458336 45 0 0 60.854167,43.65625 2.6458334,2.6458334 135 0 0 63.5,41.010417 V 31.75 a 2.6458333,2.6458333 135 0 1 2.645833,-2.645833 h 0 a 2.6458337,2.6458337 45 0 1 2.645834,2.645834 v 1.322915 a 2.6458336,2.6458336 45 0 0 2.645834,2.645834 h 2.645832"
-     id="path22180" />
-  <rect
-     style="fill:#3d3846;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:26.4"
-     id="rect37332"
-     width="13.229169"
-     height="26.458334"
-     x="72.760422"
-     y="21.166668"
-     rx="1.8520825"
-     ry="1.8520826" />
-  <rect
-     style="fill:url(#linearGradient82161);fill-opacity:1;stroke-width:2.11667;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:26.4"
-     id="rect43271"
-     width="11.641685"
-     height="24.870831"
-     x="73.554153"
-     y="21.960421"
-     rx="1.0583326"
-     ry="1.0583326" />
-  <g
-     id="g45487"
-     transform="translate(62.324284,10.923441)"
-     style="fill:#ffffff">
-    <g
-       id="g45485"
-       transform="matrix(0.49999955,0,0,0.49999955,5.4165084,8.0651133)"
-       style="fill:#ffffff">
-      <path
-         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.00149466px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
-         d="m 17.712178,25.65522 c -0.879455,0 -1.5875,0.762486 -1.5875,1.709612 v 5.444313 c 0,0.94713 0.708045,1.709614 1.5875,1.709614 h 11.112513 c 0.879475,0 1.5875,-0.762484 1.5875,-1.709614 v -5.444313 c 0,-0.947126 -0.708025,-1.709612 -1.5875,-1.709612 z"
-         id="path45481" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 26.178854,32.534384 v 5.027084 l -5.027097,-5.027084 z"
-         id="path45483" />
-    </g>
-  </g>
-  <path
-     id="rect95344"
-     d="M 1.0583333,44.185417 H 48.683333 a 2.1166662,2.1166662 135.00001 0 1 -2.116666,2.116666 H 3.175 A 2.1166664,2.1166664 44.999991 0 1 1.0583333,44.185417 Z"
-     style="fill:url(#linearGradient98041);fill-opacity:1;stroke-width:3.12455;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:26.4" />
-  <path
-     id="path98517"
-     style="fill:#4b4a50;stroke-width:2.11666;stroke-linecap:round;stroke-linejoin:round;stroke-dashoffset:26.4;fill-opacity:1"
-     d="m 12.594174,44.185417 c 0,0.439737 0.354014,0.79375 0.79375,0.79375 h 6.297072 c 0.439738,0 0.79375,-0.354013 0.79375,-0.79375 z" />
-  <path
-     id="path98618"
-     d="m 30.427083,44.185417 h 18.25625 a 2.1166662,2.1166662 135.00001 0 1 -2.116666,2.116666 H 32.54375 a 2.1166664,2.1166664 44.999991 0 1 -2.116667,-2.116666 z"
-     style="fill:url(#linearGradient98624);fill-opacity:1;stroke-width:1.93453;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:26.4" />
+ </g>
+ <g stroke-dashoffset="26.4" stroke-linecap="round" stroke-linejoin="round">
+  <path d="m3.9688 42.825h45.993a2.0441 2.0441 0 0 1-2.0441 2.0441h-41.905a2.0441 2.0441 0 0 1-2.0441-2.0441z" fill="url(#linearGradient98041)" stroke-width="3.0175"/>
+  <path d="m15.109 42.825c0 0.42467 0.34188 0.76656 0.76655 0.76656h6.0813c0.42467 0 0.76655-0.34189 0.76655-0.76656z" fill="#4b4a50" stroke-width="2.0441"/>
+  <path d="m32.331 42.825h17.631a2.0441 2.0441 0 0 1-2.0441 2.0441h-13.542a2.0441 2.0441 0 0 1-2.0441-2.0441z" fill="url(#linearGradient98624)" stroke-width="1.8682"/>
+ </g>
 </svg>
diff --git a/data/resources/style.css b/data/resources/style.css
index 07002f70..e7910519 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -196,9 +196,13 @@ login {
 
 /* Verification */
 
+.session-verification clamp {
+  margin: 12px;
+}
+
 .session-verification .text-button {
   min-width: 200px;
- }
+}
 
 
 /* Account switcher */
diff --git a/data/resources/ui/greeter.ui b/data/resources/ui/greeter.ui
index 0a7a9e46..b36ba6db 100644
--- a/data/resources/ui/greeter.ui
+++ b/data/resources/ui/greeter.ui
@@ -34,7 +34,7 @@
                     <child>
                       <object class="AdwClamp">
                         <property name="maximum-size">440</property>
-                        <property name="tightening-threshold">440</property>
+                        <property name="tightening-threshold">340</property>
                         <property name="hexpand">true</property>
                         <child>
                           <object class="GtkLabel">
@@ -50,7 +50,7 @@
                 <child>
                   <object class="AdwClamp">
                     <property name="maximum-size">440</property>
-                    <property name="tightening-threshold">500</property>
+                    <property name="tightening-threshold">340</property>
                     <property name="margin-top">0</property>
                     <property name="margin-bottom">24</property>
                     <property name="margin-start">24</property>
diff --git a/data/resources/ui/identity-verification-widget.ui b/data/resources/ui/identity-verification-widget.ui
index deeb223c..12d1702f 100644
--- a/data/resources/ui/identity-verification-widget.ui
+++ b/data/resources/ui/identity-verification-widget.ui
@@ -42,29 +42,23 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkButton" id="decline_btn">
+                        <property name="label" translatable="yes">Decline</property>
                         <property name="halign">center</property>
-                        <property name="spacing">24</property>
-                        <child>
-                          <object class="GtkButton" id="decline_btn">
-                            <property name="label" translatable="yes">Decline</property>
-                            <property name="halign">center</property>
-                            <property name="action-name">verification.decline</property>
-                            <style>
-                              <class name="pill"/>
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="SpinnerButton" id="accept_btn">
-                            <property name="label" translatable="yes">Verify</property>
-                            <property name="halign">center</property>
-                            <style>
-                              <class name="suggested-action"/>
-                              <class name="pill"/>
-                            </style>
-                          </object>
-                        </child>
+                        <property name="action-name">verification.decline</property>
+                        <style>
+                          <class name="pill"/>
+                        </style>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="SpinnerButton" id="accept_btn">
+                        <property name="label" translatable="yes">Verify</property>
+                        <property name="halign">center</property>
+                        <style>
+                          <class name="suggested-action"/>
+                          <class name="pill"/>
+                        </style>
                       </object>
                     </child>
                   </object>
@@ -469,4 +463,3 @@
     </child>
   </template>
 </interface>
-
diff --git a/data/resources/ui/login.ui b/data/resources/ui/login.ui
index 4d20622e..79b29620 100644
--- a/data/resources/ui/login.ui
+++ b/data/resources/ui/login.ui
@@ -215,7 +215,7 @@
                         <property name="justify">center</property>
                         <property name="label" translatable="yes">Please follow the steps in the browser.</property>
                         <style>
-                          <class name="title-1"/>
+                          <class name="title-2"/>
                         </style>
                       </object>
                     </child>
diff --git a/data/resources/ui/session-verification.ui b/data/resources/ui/session-verification.ui
index d66f18ce..59fe62cb 100644
--- a/data/resources/ui/session-verification.ui
+++ b/data/resources/ui/session-verification.ui
@@ -103,7 +103,12 @@
               </object>
             </child>
             <child>
-              <object class="IdentityVerificationWidget" id="verification_widget"/>
+              <object class="GtkStackPage">
+                <property name="name">verification</property>
+                <property name="child">
+                  <object class="IdentityVerificationWidget" id="verification_widget"/>
+                </property>
+              </object>
             </child>
             <child>
               <object class="GtkStackPage">
@@ -268,9 +273,11 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkPasswordEntry">
-                            <property name="placeholder-text" translatable="yes">Passphrase</property>
-                            <property name="show-peek-icon">True</property>
+                          <object class="ComponentsPasswordEntryRow">
+                            <style>
+                              <class name="card"/>
+                            </style>
+                            <property name="title" translatable="yes">Passphrase</property>
                           </object>
                         </child>
                         <child>
@@ -279,6 +286,7 @@
                             <property name="halign">center</property>
                             <style>
                               <class name="suggested-action"/>
+                              <class name="pill"/>
                             </style>
                           </object>
                         </child>