diff --git a/drawable_resources/whats_new_device_credentials.svg b/drawable_resources/whats_new_device_credentials.svg
index 3bed025b96..01aaefa5c5 100644
--- a/drawable_resources/whats_new_device_credentials.svg
+++ b/drawable_resources/whats_new_device_credentials.svg
@@ -2,8 +2,8 @@
 <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="969" height="677" viewBox="0 0 969.00001 677"
-    version="1.1" id="svg4" sodipodi:docname="whats_new_device_credentials.svg"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="858.763" height="429.86121"
+    viewBox="0 0 858.763 429.86121" version="1.1" id="svg4" sodipodi:docname="whats_new_device_credentials.svg"
     inkscape:version="0.92.2 2405546, 2018-03-11" inkscape:export-filename="/tmp/device_credentials.png"
     inkscape:export-xdpi="96" inkscape:export-ydpi="96">
     <metadata id="metadata10">
@@ -11,7 +11,7 @@
             <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>
+                <dc:title />
             </cc:Work>
         </rdf:RDF>
     </metadata>
@@ -19,117 +19,79 @@
     <sodipodi:namedview pagecolor="#000000" bordercolor="#666666" borderopacity="1" objecttolerance="10"
         gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2"
         inkscape:window-width="1600" inkscape:window-height="835" id="namedview6" showgrid="false"
-        inkscape:zoom="0.43457604" inkscape:cx="68.872457" inkscape:cy="479.66113" inkscape:window-x="0"
-        inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg4" fit-margin-top="1"
-        fit-margin-left="1" fit-margin-right="1" fit-margin-bottom="1" />
-    <path fill="#FF000000"
-        d="m 352.28821,129.77489 c -1.63939,0 -3.27889,-0.41057 -4.71341,-1.2291 -39.34672,-20.28795 -73.36522,-28.89518 -114.14646,-28.89518 -40.5763,0 -79.10333,9.63181 -114.1465,28.89518 -4.91834,2.66422 -11.06625,0.81853 -13.93527,-4.09859 -2.66412,-4.91817 -0.81982,-11.2712 4.09859,-13.93517 38.11714,-20.697995 79.92304,-31.354392 123.98318,-31.354392 43.65025,0 81.76738,9.631556 123.57328,31.149372 5.12328,2.66422 6.96766,8.81199 4.30355,13.73039 -1.84439,3.68883 -5.32819,5.73799 -9.01696,5.73799 z M 59.032198,237.36368 c -2.049167,0 -4.098618,-0.61583 -5.942998,-1.84493 -4.713422,-3.27875 -5.738058,-9.6318 -2.459208,-14.34519 20.288156,-28.69017 46.109453,-51.23256 76.849068,-67.01239 64.34828,-33.19879 146.7305,-33.40356 211.28369,-0.20528 30.73961,15.77983 56.56091,38.11721 76.84908,66.60261 3.27887,4.50836 2.25417,11.06617 -2.45922,14.3452 -4.71339,3.27877 -11.06626,2.25548 -14.34515,-2.45818 -18.44376,-25.82116 -41.80586,-46.10937 -69.47153,-60.24956 -58.81514,-30.12505 -134.02477,-30.12505 -192.63497,0.20528 -27.8706,14.34494 -51.232713,34.83818 -69.676488,60.65934 -1.639387,2.86925 -4.713423,4.30361 -7.992299,4.30361 z M 187.11395,484.71523 c -2.66411,0 -5.32822,-1.02379 -7.17259,-3.074 -17.82898,-17.82899 -27.4607,-29.30521 -41.19108,-54.10181 -14.14021,-25.20635 -21.51774,-55.94594 -21.51774,-88.93998 0,-60.86436 52.05243,-110.45753 115.99086,-110.45753 63.93844,0 115.99087,49.59317 115.99087,110.45753 0,5.73824 -4.50848,10.24663 -10.24657,10.24663 -5.73805,0 -10.24654,-4.50839 -10.24654,-10.24663 0,-49.59315 -42.83053,-89.96455 -95.49776,-89.96455 -52.66724,0 -95.49778,40.3714 -95.49778,89.96455 0,29.50998 6.5578,56.76603 19.05857,78.8984 13.11557,23.56697 22.13253,33.60857 37.9122,49.59343 3.8937,4.09858 3.8937,10.45138 0,14.54996 -2.25419,2.05021 -4.91834,3.074 -7.58244,3.074 z m 146.93541,-37.91218 c -24.38676,0 -45.90448,-6.14802 -63.52855,-18.23879 -30.53468,-20.69824 -48.77355,-54.30681 -48.77355,-89.96482 0,-5.73797 4.50848,-10.24636 10.24657,-10.24636 5.73805,0 10.24653,4.50839 10.24653,10.24636 0,28.89545 14.75501,56.15123 39.75657,72.9554 14.5501,9.83683 31.55935,14.55022 52.05243,14.55022 4.91834,0 13.11558,-0.61582 21.31281,-2.0502 5.53314,-1.0238 10.86134,2.66397 11.88598,8.40196 1.02458,5.53322 -2.66411,10.86141 -8.40216,11.886 -11.68105,2.25546 -21.9276,2.45818 -24.79663,2.45818 z m -41.19109,42.2158 c -0.81981,0 -1.8444,-0.20527 -2.66409,-0.41055 -32.58401,-9.017 -53.89682,-21.10802 -76.23428,-43.03562 -28.69035,-28.4854 -44.47,-66.39758 -44.47,-106.97375 0,-33.19879 28.28047,-60.24981 63.11869,-60.24981 34.83826,0 63.11871,27.05102 63.11871,60.24981 0,21.9276 19.05857,39.75659 42.62563,39.75659 23.56703,0 42.62561,-17.82899 42.62561,-39.75659 0,-77.259 -66.60253,-139.96777 -148.57486,-139.96777 -58.20037,0 -111.48237,32.37898 -135.459291,82.58695 -7.992299,16.59939 -12.090917,36.06802 -12.090917,57.38082 0,15.9846 1.434623,41.19097 13.73038,73.97997 2.049168,5.32821 -0.614802,11.27121 -5.943,13.1156 -5.3282,2.05021 -11.271198,-0.8211 -13.11558,-5.943 -10.041618,-26.84599 -14.959957,-53.487 -14.959957,-81.15257 0,-24.59183 4.71342,-46.9292 13.935296,-66.39758 27.255819,-57.17581 87.710399,-94.26818 153.903069,-94.26818 93.24352,0 169.06792,71.93054 169.06792,160.46075 0,33.19879 -28.28045,60.24956 -63.11867,60.24956 -34.83826,0 -63.11871,-27.05077 -63.11871,-60.24956 0,-21.9276 -19.05856,-39.75659 -42.62563,-39.75659 -23.56704,0 -42.62561,17.82899 -42.62561,39.75659 0,35.04319 13.52544,67.83194 38.32208,92.42377 19.46844,19.26363 38.11713,29.92002 67.01238,37.91218 5.53313,1.43438 8.60711,7.17261 7.17259,12.5008 -1.02458,4.71341 -5.32819,7.78741 -9.63176,7.78741 z"
-        id="path2" inkscape:connector-curvature="0" style="stroke-width:20.49308205;fill:#ffffff" />
-    <path
-        style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:12.81995392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-        d="m 541.20339,602.43731 c 354.79919,0 354.79919,0 354.79919,0" id="path819" inkscape:connector-curvature="0" />
-    <path
-        style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-        d="m 879.08295,586.35303 c 0,-67.04873 0,-67.40366 0,-67.40366" id="path821" inkscape:connector-curvature="0" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823" sodipodi:type="arc" sodipodi:cx="572.16339" sodipodi:cy="551.21521" sodipodi:rx="5.2678409"
-        sodipodi:ry="5.2678409" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 568.51013,547.41997 a 5.2678409,5.2678409 0 0 1 7.44775,0.1412 5.2678409,5.2678409 0 0 1 -0.13967,7.44778 5.2678409,5.2678409 0 0 1 -7.44781,-0.13815 5.2678409,5.2678409 0 0 1 0.13662,-7.44783" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-1" sodipodi:type="arc" sodipodi:cx="608.79175" sodipodi:cy="551.21521" sodipodi:rx="5.2678409"
-        sodipodi:ry="5.2678409" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 605.13849,547.41997 a 5.2678409,5.2678409 0 0 1 7.44775,0.1412 5.2678409,5.2678409 0 0 1 -0.13968,7.44778 5.2678409,5.2678409 0 0 1 -7.4478,-0.13815 5.2678409,5.2678409 0 0 1 0.13662,-7.44783" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-1-2" sodipodi:type="arc" sodipodi:cx="645.42017" sodipodi:cy="551.21521" sodipodi:rx="5.2678409"
-        sodipodi:ry="5.2678409" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 641.76691,547.41997 a 5.2678409,5.2678409 0 0 1 7.44775,0.1412 5.2678409,5.2678409 0 0 1 -0.13968,7.44778 5.2678409,5.2678409 0 0 1 -7.4478,-0.13815 5.2678409,5.2678409 0 0 1 0.13661,-7.44783" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-1-2-2" sodipodi:type="arc" sodipodi:cx="682.04865" sodipodi:cy="551.21521" sodipodi:rx="5.2678409"
-        sodipodi:ry="5.2678409" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 678.39538,547.41997 a 5.2678409,5.2678409 0 0 1 7.44775,0.1412 5.2678409,5.2678409 0 0 1 -0.13967,7.44778 5.2678409,5.2678409 0 0 1 -7.44781,-0.13815 5.2678409,5.2678409 0 0 1 0.13662,-7.44783" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-1-2-2-1" sodipodi:type="arc" sodipodi:cx="718.67719" sodipodi:cy="551.21521" sodipodi:rx="5.2678409"
-        sodipodi:ry="5.2678409" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 715.02392,547.41997 a 5.2678409,5.2678409 0 0 1 7.44775,0.1412 5.2678409,5.2678409 0 0 1 -0.13967,7.44778 5.2678409,5.2678409 0 0 1 -7.44781,-0.13815 5.2678409,5.2678409 0 0 1 0.13662,-7.44783" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-1-2-2-1-6" sodipodi:type="arc" sodipodi:cx="755.3056" sodipodi:cy="551.21521"
-        sodipodi:rx="5.2678409" sodipodi:ry="5.2678409" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
-        sodipodi:open="true"
-        d="m 751.65234,547.41997 a 5.2678409,5.2678409 0 0 1 7.44775,0.1412 5.2678409,5.2678409 0 0 1 -0.13967,7.44778 5.2678409,5.2678409 0 0 1 -7.44781,-0.13815 5.2678409,5.2678409 0 0 1 0.13662,-7.44783" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-1-2-2-1-6-2" sodipodi:type="arc" sodipodi:cx="791.93396" sodipodi:cy="551.21521"
-        sodipodi:rx="5.2678409" sodipodi:ry="5.2678409" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
-        sodipodi:open="true"
-        d="m 788.2807,547.41997 a 5.2678409,5.2678409 0 0 1 7.44775,0.1412 5.2678409,5.2678409 0 0 1 -0.13967,7.44778 5.2678409,5.2678409 0 0 1 -7.44781,-0.13815 5.2678409,5.2678409 0 0 1 0.13662,-7.44783" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:5.49426556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-1-2-2-1-6-2-0" sodipodi:type="arc" sodipodi:cx="828.56244" sodipodi:cy="551.21521"
-        sodipodi:rx="5.2678409" sodipodi:ry="5.2678409" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
-        sodipodi:open="true"
-        d="m 824.90918,547.41997 a 5.2678409,5.2678409 0 0 1 7.44775,0.1412 5.2678409,5.2678409 0 0 1 -0.13967,7.44778 5.2678409,5.2678409 0 0 1 -7.44781,-0.13815 5.2678409,5.2678409 0 0 1 0.13662,-7.44783" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2" sodipodi:type="arc" sodipodi:cx="565.53778" sodipodi:cy="69.753868" sodipodi:rx="9.2415485"
-        sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 559.12874,63.095755 a 9.2415485,9.2415485 0 0 1 13.06584,0.247711 9.2415485,9.2415485 0 0 1 -0.24503,13.065886 9.2415485,9.2415485 0 0 1 -13.06594,-0.242352 9.2415485,9.2415485 0 0 1 0.23967,-13.065986" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2-9" sodipodi:type="arc" sodipodi:cx="719.49548" sodipodi:cy="69.753868" sodipodi:rx="9.2415485"
-        sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 713.08645,63.095755 a 9.2415485,9.2415485 0 0 1 13.06583,0.247711 9.2415485,9.2415485 0 0 1 -0.24503,13.065886 9.2415485,9.2415485 0 0 1 -13.06594,-0.242352 9.2415485,9.2415485 0 0 1 0.23968,-13.065986" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2-9-7" sodipodi:type="arc" sodipodi:cx="873.45319" sodipodi:cy="69.753868" sodipodi:rx="9.2415485"
-        sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 867.04415,63.095755 a 9.2415485,9.2415485 0 0 1 13.06583,0.247711 9.2415485,9.2415485 0 0 1 -0.24503,13.065886 9.2415485,9.2415485 0 0 1 -13.06593,-0.242352 9.2415485,9.2415485 0 0 1 0.23967,-13.065986" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fff6f6;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2-4" sodipodi:type="arc" sodipodi:cx="565.53778" sodipodi:cy="223.71153" sodipodi:rx="9.2415485"
-        sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 559.12874,217.05342 a 9.2415485,9.2415485 0 0 1 13.06584,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06589 9.2415485,9.2415485 0 0 1 -13.06594,-0.24236 9.2415485,9.2415485 0 0 1 0.23967,-13.06598" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffe7e7;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2-9-3" sodipodi:type="arc" sodipodi:cx="719.49548" sodipodi:cy="223.71153" sodipodi:rx="9.2415485"
-        sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 713.08645,217.05342 a 9.2415485,9.2415485 0 0 1 13.06583,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06589 9.2415485,9.2415485 0 0 1 -13.06594,-0.24236 9.2415485,9.2415485 0 0 1 0.23968,-13.06598" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffe7e7;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2-9-7-5" sodipodi:type="arc" sodipodi:cx="873.45319" sodipodi:cy="223.71153" sodipodi:rx="9.2415485"
-        sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 867.04415,217.05342 a 9.2415485,9.2415485 0 0 1 13.06583,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06589 9.2415485,9.2415485 0 0 1 -13.06593,-0.24236 9.2415485,9.2415485 0 0 1 0.23967,-13.06598" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fff6f6;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2-4-6" sodipodi:type="arc" sodipodi:cx="565.53778" sodipodi:cy="377.66922" sodipodi:rx="9.2415485"
-        sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 559.12874,371.01111 a 9.2415485,9.2415485 0 0 1 13.06584,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06594,-0.24235 9.2415485,9.2415485 0 0 1 0.23967,-13.06598" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fff6f6;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2-9-3-1" sodipodi:type="arc" sodipodi:cx="719.49548" sodipodi:cy="377.66922" sodipodi:rx="9.2415485"
-        sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295" sodipodi:open="true"
-        d="m 713.08645,371.01111 a 9.2415485,9.2415485 0 0 1 13.06583,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06594,-0.24235 9.2415485,9.2415485 0 0 1 0.23968,-13.06598" />
-    <path
-        style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffe7e7;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-        id="path823-2-9-7-5-4" sodipodi:type="arc" sodipodi:cx="873.45319" sodipodi:cy="377.66922"
-        sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
-        sodipodi:open="true"
-        d="m 867.04415,371.01111 a 9.2415485,9.2415485 0 0 1 13.06583,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06593,-0.24235 9.2415485,9.2415485 0 0 1 0.23967,-13.06598" />
-    <path
-        style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.77341413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-        d="M 565.3017,69.309077 H 719.60332" id="path1066" inkscape:connector-curvature="0" />
-    <path
-        style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.77341413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-        d="M 720.54662,224.23964 H 874.84825" id="path1066-0" inkscape:connector-curvature="0" />
-    <path
-        style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.77341413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-        d="M 719.60332,223.61067 V 69.309077" id="path1066-3" inkscape:connector-curvature="0" />
-    <path
-        style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.77341413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-        d="M 873.60332,377.56838 V 223.26658" id="path1066-3-1" inkscape:connector-curvature="0" />
+        inkscape:zoom="0.43457604" inkscape:cx="55.463573" inkscape:cy="381.67998" inkscape:window-x="0"
+        inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg4" fit-margin-top="10"
+        fit-margin-left="10" fit-margin-right="10" fit-margin-bottom="10" />
+    <g id="g841" transform="translate(92.156453)">
+    <path style="fill:#ffffff;stroke-width:16.58121872" inkscape:connector-curvature="0" id="path2"
+        d="m 255.62025,115.19225 c -1.32645,0 -2.65299,-0.3322 -3.81368,-0.99448 C 219.97063,97.78252 192.44582,90.8183 159.44919,90.8183 c -32.83082,0 -64.003538,7.79322 -92.357423,23.37947 -3.979493,2.15565 -8.953847,0.66228 -11.275209,-3.31623 -2.155574,-3.97935 -0.663327,-9.11967 3.316223,-11.27512 30.841074,-16.747017 64.666769,-25.369249 100.316409,-25.369249 35.31798,0 66.15905,7.793013 99.98474,25.203359 4.14532,2.15566 5.63763,7.1299 3.48206,11.10944 -1.49232,2.98468 -4.31111,4.64268 -7.29574,4.64268 z M 18.342997,202.24374 c -1.658007,0 -3.316245,-0.49828 -4.808557,-1.49276 -3.8136906,-2.65288 -4.6427369,-7.79321 -1.989777,-11.60688 16.415411,-23.21359 37.307759,-41.45293 62.179581,-54.2206 52.065026,-26.86157 118.721556,-27.02725 170.952386,-0.16609 24.87182,12.76766 45.76417,30.84113 62.17959,53.88904 2.65297,3.64777 1.82388,8.95378 -1.98979,11.60689 -3.81366,2.65289 -8.95385,1.82493 -11.60685,-1.98895 -14.92308,-20.89224 -33.82566,-37.30769 -56.21032,-48.7487 -47.58809,-24.37457 -108.44118,-24.37457 -155.863457,0.16609 -22.550465,11.60668 -41.453054,28.18803 -56.376153,49.08026 -1.326449,2.32155 -3.813692,3.48211 -6.466673,3.48211 z M 121.97561,402.3791 c -2.15557,0 -4.31113,-0.82837 -5.80344,-2.48722 C 101.74651,385.46621 93.953364,376.18065 82.843935,356.1174 71.402907,335.72262 65.433651,310.85081 65.433651,284.15491 c 0,-49.24615 42.116299,-89.37263 93.849719,-89.37263 51.73342,0 93.84972,40.12648 93.84972,89.37263 0,4.64288 -3.64787,8.29068 -8.29063,8.29068 -4.64274,0 -8.29061,-3.6478 -8.29061,-8.29068 0,-40.12647 -34.65474,-72.79149 -77.26848,-72.79149 -42.61375,0 -77.268501,32.66502 -77.268501,72.79149 0,23.87691 5.306001,45.93013 15.420537,63.83772 10.611974,19.06834 17.907714,27.19313 30.675254,40.12669 3.15044,3.31621 3.15044,8.45635 0,11.77256 -1.82389,1.65885 -3.97949,2.48722 -6.13505,2.48722 z m 118.88735,-30.67524 c -19.73164,0 -37.14191,-4.97445 -51.40177,-14.75725 -24.70601,-16.74721 -39.46332,-43.94034 -39.46332,-72.7917 0,-4.64267 3.64787,-8.29047 8.29063,-8.29047 4.64274,0 8.29061,3.6478 8.29061,8.29047 0,23.37968 11.93847,45.43269 32.16755,59.02916 11.77268,7.95911 25.53508,11.77277 42.1163,11.77277 3.9795,0 10.61199,-0.49826 17.24447,-1.65884 4.47694,-0.82837 8.78806,2.15545 9.61711,6.79814 0.829,4.477 -2.15557,8.7881 -6.7983,9.61711 -9.45129,1.82492 -17.74191,1.98895 -20.06328,1.98895 z m -33.32824,34.15735 c -0.66332,0 -1.49233,-0.16609 -2.15555,-0.33218 -26.36415,-7.29577 -43.60862,-17.07878 -61.68215,-34.82068 -23.21374,-23.04791 -35.98126,-53.72315 -35.98126,-86.55385 0,-26.86158 22.8821,-48.74891 51.07015,-48.74891 28.18809,0 51.07017,21.88733 51.07017,48.74891 0,17.7419 15.42054,32.16757 34.48896,32.16757 19.06839,0 34.48893,-14.42567 34.48893,-32.16757 0,-62.51127 -53.88897,-113.24975 -120.21385,-113.24975 -47.09068,0 -90.201837,26.19826 -109.601876,66.82218 -6.466673,13.43078 -9.782918,29.1831 -9.782918,46.42757 0,12.93334 1.160772,33.32815 11.109429,59.85815 1.658009,4.31113 -0.497444,9.11968 -4.808558,10.612 -4.311116,1.65886 -9.119673,-0.66436 -10.611987,-4.80855 -8.124804,-21.72144 -12.104296,-43.27703 -12.104296,-65.6616 0,-19.89757 3.81369,-37.97103 11.27523,-53.72315 22.053037,-46.26169 70.967626,-76.27361 124.524976,-76.27361 75.44455,0 136.79505,58.19993 136.79505,129.83088 0,26.86157 -22.88208,48.7487 -51.07013,48.7487 -28.18809,0 -51.07017,-21.88713 -51.07017,-48.7487 0,-17.74191 -15.42053,-32.16758 -34.48896,-32.16758 -19.06839,0 -34.48893,14.42567 -34.48893,32.16758 0,28.3539 10.94361,54.8837 31.00689,74.78127 15.75217,15.58646 30.84107,24.20868 54.22059,30.67524 4.47693,1.16058 6.96413,5.80345 5.80344,10.11456 -0.829,3.81368 -4.31111,6.3009 -7.79318,6.3009 z" />
+        <g transform="matrix(0.73707241,0,0,0.73707241,10.310182,16.19179)" id="g848">
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2" sodipodi:type="arc" sodipodi:cx="565.53778" sodipodi:cy="149.75388"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 559.12874,143.09576 a 9.2415485,9.2415485 0 0 1 13.06584,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06589 9.2415485,9.2415485 0 0 1 -13.06594,-0.24235 9.2415485,9.2415485 0 0 1 0.23967,-13.06599" />
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2-9" sodipodi:type="arc" sodipodi:cx="719.49548" sodipodi:cy="149.75388"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 713.08645,143.09576 a 9.2415485,9.2415485 0 0 1 13.06583,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06589 9.2415485,9.2415485 0 0 1 -13.06594,-0.24235 9.2415485,9.2415485 0 0 1 0.23968,-13.06599" />
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2-9-7" sodipodi:type="arc" sodipodi:cx="873.45319" sodipodi:cy="149.75388"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 867.04415,143.09576 a 9.2415485,9.2415485 0 0 1 13.06583,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06589 9.2415485,9.2415485 0 0 1 -13.06593,-0.24235 9.2415485,9.2415485 0 0 1 0.23967,-13.06599" />
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fff6f6;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2-4" sodipodi:type="arc" sodipodi:cx="565.53778" sodipodi:cy="303.71155"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 559.12874,297.05343 a 9.2415485,9.2415485 0 0 1 13.06584,0.24772 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06594,-0.24235 9.2415485,9.2415485 0 0 1 0.23967,-13.06599" />
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffe7e7;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2-9-3" sodipodi:type="arc" sodipodi:cx="719.49548" sodipodi:cy="303.71155"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 713.08645,297.05343 a 9.2415485,9.2415485 0 0 1 13.06583,0.24772 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06594,-0.24235 9.2415485,9.2415485 0 0 1 0.23968,-13.06599" />
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffe7e7;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2-9-7-5" sodipodi:type="arc" sodipodi:cx="873.45319" sodipodi:cy="303.71155"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 867.04415,297.05343 a 9.2415485,9.2415485 0 0 1 13.06583,0.24772 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06593,-0.24235 9.2415485,9.2415485 0 0 1 0.23967,-13.06599" />
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fff6f6;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2-4-6" sodipodi:type="arc" sodipodi:cx="565.53778" sodipodi:cy="457.66922"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 559.12874,451.01111 a 9.2415485,9.2415485 0 0 1 13.06584,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06594,-0.24235 9.2415485,9.2415485 0 0 1 0.23967,-13.06598" />
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#fff6f6;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2-9-3-1" sodipodi:type="arc" sodipodi:cx="719.49548" sodipodi:cy="457.66922"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 713.08645,451.01111 a 9.2415485,9.2415485 0 0 1 13.06583,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06594,-0.24235 9.2415485,9.2415485 0 0 1 0.23968,-13.06598" />
+            <path
+                style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#ffe7e7;fill-opacity:1;stroke:#fffcfc;stroke-width:9.63877487;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                id="path823-2-9-7-5-4" sodipodi:type="arc" sodipodi:cx="873.45319" sodipodi:cy="457.66922"
+                sodipodi:rx="9.2415485" sodipodi:ry="9.2415485" sodipodi:start="3.9460498" sodipodi:end="3.9452295"
+                sodipodi:open="true"
+                d="m 867.04415,451.01111 a 9.2415485,9.2415485 0 0 1 13.06583,0.24771 9.2415485,9.2415485 0 0 1 -0.24503,13.06588 9.2415485,9.2415485 0 0 1 -13.06593,-0.24235 9.2415485,9.2415485 0 0 1 0.23967,-13.06598" />
+            <path
+                style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.77341413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 565.3017,149.30908 H 719.60332" id="path1066" inkscape:connector-curvature="0" />
+            <path
+                style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.77341413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 720.54662,304.23964 H 874.84825" id="path1066-0" inkscape:connector-curvature="0" />
+            <path
+                style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.77341413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 719.60332,303.61067 V 149.30908" id="path1066-3" inkscape:connector-curvature="0" />
+            <path
+                style="fill:none;fill-rule:evenodd;stroke:#fffcfc;stroke-width:5.77341413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                d="M 873.60332,457.56838 V 303.26658" id="path1066-3-1" inkscape:connector-curvature="0" />
+        </g>
+    </g>
 </svg>
diff --git a/src/main/res/drawable-hdpi/whats_new_device_credentials.png b/src/main/res/drawable-hdpi/whats_new_device_credentials.png
index dc37936d44..771b875d8b 100644
Binary files a/src/main/res/drawable-hdpi/whats_new_device_credentials.png and b/src/main/res/drawable-hdpi/whats_new_device_credentials.png differ
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a70f6feb8c..bb10bb1fb9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -795,5 +795,5 @@
     <string name="unsharing_failed">Unsharing failed</string>
     <string name="updating_share_failed">Updating share failed</string>
     <string name="whats_new_device_credentials_title">Use Android device protection</string>
-    <string name="whats_new_device_credentials_content">Use android internal device protection, e.g. pattern, password, pin or fingerprint. No need to re-setup it again.</string>
+    <string name="whats_new_device_credentials_content">Use anything like a pattern, password, pin or your fingerprint to keep your data safe.</string>
 </resources>