Bug 1371538 - Should add the Screenshots tour in the onBoarding overlay, r=flod,rexboy
authorFischer.json <fischer.json@gmail.com>
Fri, 25 Aug 2017 12:11:26 +0800
changeset 378065 15b957e02bbf59a2eaf5b4fcf17dff260bef819d
parent 378064 84021c7d6b3924cfc907c75bdf3608c3e2980a04
child 378066 e6189da47385a9a7286259d013103634432722ba
push id94412
push userarchaeopteryx@coole-files.de
push dateFri, 01 Sep 2017 08:46:09 +0000
treeherdermozilla-inbound@d56571d7f1be [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod, rexboy
bugs1371538
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1371538 - Should add the Screenshots tour in the onBoarding overlay, r=flod,rexboy MozReview-Commit-ID: D7YKZyV2Bm2
browser/extensions/onboarding/bootstrap.js
browser/extensions/onboarding/content/img/figure_screenshots.svg
browser/extensions/onboarding/content/img/icons_screenshots-colored.svg
browser/extensions/onboarding/content/img/icons_screenshots.svg
browser/extensions/onboarding/content/onboarding.css
browser/extensions/onboarding/content/onboarding.js
browser/extensions/onboarding/locales/en-US/onboarding.properties
browser/extensions/onboarding/test/browser/head.js
--- a/browser/extensions/onboarding/bootstrap.js
+++ b/browser/extensions/onboarding/bootstrap.js
@@ -29,16 +29,17 @@ const PREF_WHITELIST = [
 
 [
   "onboarding-tour-addons",
   "onboarding-tour-customize",
   "onboarding-tour-default-browser",
   "onboarding-tour-library",
   "onboarding-tour-performance",
   "onboarding-tour-private-browsing",
+  "onboarding-tour-screenshots",
   "onboarding-tour-singlesearch",
   "onboarding-tour-sync",
 ].forEach(tourId => PREF_WHITELIST.push([`browser.onboarding.tour.${tourId}.completed`, PREF_BOOL]));
 
 let waitingForBrowserReady = true;
 
 /**
  * Set pref. Why no `getPrefs` function is due to the priviledge level.
new file mode 100644
--- /dev/null
+++ b/browser/extensions/onboarding/content/img/figure_screenshots.svg
@@ -0,0 +1,1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 352 303"><defs><style>.cls-1{fill:none;}.cls-2{fill:#eaeaee;}.cls-3{fill:#fff;}.cls-4{fill:#f9f9fa;}.cls-5{fill:url(#linear-gradient);}.cls-6{fill:url(#linear-gradient-2);}.cls-7{fill:url(#linear-gradient-3);}.cls-8{fill:url(#linear-gradient-4);}.cls-9{fill:url(#linear-gradient-5);}.cls-10{fill:url(#linear-gradient-6);}.cls-11{fill:url(#linear-gradient-7);}.cls-12{fill:url(#linear-gradient-8);}.cls-13{fill:url(#linear-gradient-9);}.cls-14{fill:url(#linear-gradient-10);}.cls-15{fill:url(#linear-gradient-11);}.cls-16{fill:url(#linear-gradient-12);}.cls-17{fill:url(#linear-gradient-13);}.cls-18{fill:url(#linear-gradient-14);}.cls-19{fill:url(#linear-gradient-15);}.cls-20{fill:#c8c8cc;}.cls-21{fill:#e1e1e6;}.cls-22{fill:url(#linear-gradient-16);}.cls-23{fill:url(#linear-gradient-17);}.cls-24{fill:url(#linear-gradient-18);}.cls-25{fill:url(#linear-gradient-19);}.cls-26{fill:url(#linear-gradient-20);}.cls-27{fill:url(#linear-gradient-21);}.cls-28{fill:url(#linear-gradient-22);}.cls-29{fill:url(#linear-gradient-23);}.cls-30{fill:url(#linear-gradient-24);}.cls-31{fill:url(#linear-gradient-25);}.cls-32{fill:url(#linear-gradient-26);}.cls-33{fill:url(#linear-gradient-27);}.cls-34{fill:url(#linear-gradient-28);}.cls-35{fill:url(#linear-gradient-29);}</style><linearGradient id="linear-gradient" x1="153.43" y1="100.32" x2="366.35" y2="313.24" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00c8d7"/><stop offset="1" stop-color="#008ea4"/></linearGradient><linearGradient id="linear-gradient-2" x1="128.19" y1="52.41" x2="361.62" y2="285.84" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e6fcff"/><stop offset="1" stop-color="#b5f2ff"/></linearGradient><linearGradient id="linear-gradient-3" x1="155.36" y1="25.24" x2="388.79" y2="258.67" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-4" x1="117.02" y1="63.58" x2="350.45" y2="297.01" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-5" x1="70.58" y1="110.02" x2="304.01" y2="343.45" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-6" x1="97.11" y1="83.5" x2="330.54" y2="316.92" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-7" x1="156.09" y1="24.51" x2="389.52" y2="257.94" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-8" x1="131.77" y1="48.83" x2="365.2" y2="282.26" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-9" x1="167.45" y1="88.64" x2="377.35" y2="298.55" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-10" x1="186.29" y1="69.79" x2="396.2" y2="279.7" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-11" x1="149.81" y1="81.58" x2="384.59" y2="316.37" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-12" x1="172.37" y1="59.02" x2="407.15" y2="293.81" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-13" x1="155.88" y1="75.51" x2="390.67" y2="310.29" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-14" x1="180.52" y1="75.57" x2="390.43" y2="285.48" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-15" x1="180.53" y1="75.55" x2="390.44" y2="285.46" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-16" x1="107.18" y1="24.04" x2="385.86" y2="302.73" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-17" x1="114.16" y1="17.06" x2="392.84" y2="295.75" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-18" x1="176.77" y1="110.77" x2="313.63" y2="247.63" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-19" x1="149.6" y1="81.67" x2="354.13" y2="286.2" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-20" x1="112.99" y1="67.61" x2="346.42" y2="301.04" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-21" x1="133.52" y1="47.08" x2="366.95" y2="280.51" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-22" x1="98.26" y1="82.35" x2="331.68" y2="315.77" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-23" x1="149.32" y1="104.44" x2="362.23" y2="317.35" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-24" x1="170.12" y1="83.63" x2="383.04" y2="296.55" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-25" x1="127.74" y1="126.01" x2="340.66" y2="338.93" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-26" x1="168.08" y1="85.68" x2="380.99" y2="298.6" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-27" x1="194.79" y1="57.57" x2="407.7" y2="270.49" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-28" x1="167.57" y1="86.19" x2="380.48" y2="299.1" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-29" x1="106.85" y1="146.9" x2="319.77" y2="359.82" xlink:href="#linear-gradient"/></defs><title>Artboard 1</title><g id="Layer_1" data-name="Layer 1"><rect class="cls-1" width="352" height="303"/></g><g id="Layer_2" data-name="Layer 2"><path class="cls-2" d="M256,101.72H159.4a1.4,1.4,0,0,1,0-2.8H256a1.4,1.4,0,0,1,0,2.8Z"/><path class="cls-2" d="M242.92,94.56H226.15a.7.7,0,0,1,0-1.4h16.77a.7.7,0,0,1,0,1.4Z"/><path class="cls-2" d="M221,108H204.19a.7.7,0,1,1,0-1.4H221a.7.7,0,1,1,0,1.4Zm-28,0h-4.19a.7.7,0,1,1,0-1.4H193a.7.7,0,0,1,0,1.4Zm-9.78,0h-1.4a.7.7,0,0,1,0-1.4h1.4a.7.7,0,0,1,0,1.4Zm-14,0H152.47a.7.7,0,1,1,0-1.4h16.77a.7.7,0,1,1,0,1.4Zm-28,0h-4.19a.7.7,0,1,1,0-1.4h4.19a.7.7,0,0,1,0,1.4Zm-9.78,0h-1.4a.7.7,0,0,1,0-1.4h1.4a.7.7,0,0,1,0,1.4Zm-14,0H100.75a.7.7,0,1,1,0-1.4h16.77a.7.7,0,0,1,0,1.4Zm-28,0H85.37a.7.7,0,1,1,0-1.4h4.19a.7.7,0,1,1,0,1.4Zm-9.78,0h-1.4a.7.7,0,1,1,0-1.4h1.4a.7.7,0,1,1,0,1.4Z"/><path class="cls-3" d="M190.66,65.45h29.8s-9.32-20.84,10.48-23.53c17.66-2.4,24.63,15.75,24.63,15.75s2.1-10.47,12.6-8.46,18,18.63,18,18.63h26"/><path class="cls-2" d="M312.62,62.94H307a.7.7,0,1,1,0-1.4h5.6a.7.7,0,0,1,0,1.4Zm-18.18,0H293a.7.7,0,0,1,0-1.4h1.4a.7.7,0,1,1,0,1.4Zm-7,0h-.78a.72.72,0,0,1-.63-.39c-.15-.3-.72-1.38-1.68-2.91a.7.7,0,0,1,1.19-.74c.74,1.19,1.26,2.12,1.54,2.64h.36a.7.7,0,1,1,0,1.4ZM221,62.08h-1.85a.7.7,0,1,1,0-1.4h.81c-.13-.35-.29-.78-.45-1.29a.7.7,0,0,1,1.33-.43c.42,1.31.78,2.13.79,2.13a.7.7,0,0,1-.64,1Zm-13,0H191.17a.7.7,0,0,1,0-1.4h16.77a.7.7,0,1,1,0,1.4Zm11-7.65a.7.7,0,0,1-.69-.62c-.06-.47-.1-1-.13-1.44a.7.7,0,1,1,1.4-.08c0,.46.07.91.12,1.35a.7.7,0,0,1-.61.78ZM255.49,53a.7.7,0,0,1-.63-.39c-.17-.35-.38-.76-.63-1.22a.7.7,0,1,1,1.23-.67c.26.48.48.91.66,1.27a.7.7,0,0,1-.63,1ZM278,51.21a.7.7,0,0,1-.48-.19c-3-2.89-6-4.64-9-5.2a10.73,10.73,0,0,0-5.43.22.7.7,0,0,1-.44-1.33,12.11,12.11,0,0,1,6.13-.27c3.21.61,6.47,2.48,9.69,5.56a.7.7,0,0,1-.48,1.2Zm-26.28-4.14a.7.7,0,0,1-.54-.26,27,27,0,0,0-2.79-3,.7.7,0,1,1,.94-1,28.31,28.31,0,0,1,2.94,3.14.7.7,0,0,1-.54,1.14ZM223.1,41.74a.7.7,0,0,1-.44-1.24,17.49,17.49,0,0,1,8.69-3.34,22.5,22.5,0,0,1,7.91.28.7.7,0,0,1-.3,1.37,21,21,0,0,0-7.42-.26,16.13,16.13,0,0,0-8,3A.7.7,0,0,1,223.1,41.74Z"/><path class="cls-3" d="M313.48,68.24h0l-122.82,0a1.4,1.4,0,0,1,0-2.8h0l122.82,0a1.4,1.4,0,0,1,0,2.8Z"/><path class="cls-3" d="M61.43,42.31H78s-5.18-11.59,5.83-13.09C93.65,27.89,97.53,38,97.53,38s1.17-5.82,7-4.71,10,10.36,10,10.36H129"/><path class="cls-2" d="M78.51,40.46H61.94a.7.7,0,1,1,0-1.4H78a.7.7,0,0,1,1.12.25l.07.17a.7.7,0,0,1-.64,1Zm45.93-.2h-4.19a.7.7,0,1,1,0-1.4h4.19a.7.7,0,0,1,0,1.4ZM98.14,35.75l-.2,0a.7.7,0,0,1-.47-.87c.35-1.17,1.82-5,6.15-5a8.39,8.39,0,0,1,1.56.15A13.09,13.09,0,0,1,112,34.28a.7.7,0,1,1-1,1,11.76,11.76,0,0,0-6.06-3.82,7,7,0,0,0-1.29-.13c-3.27,0-4.45,2.78-4.81,4A.7.7,0,0,1,98.14,35.75Zm-19-6.06a.7.7,0,0,1-.5-1.18,8.36,8.36,0,0,1,3.94-2.19.7.7,0,0,1,.36,1.35,7,7,0,0,0-3.3,1.81A.7.7,0,0,1,79.11,29.69ZM89.62,27.8a.69.69,0,0,1-.21,0,10.39,10.39,0,0,0-1.27-.32.7.7,0,0,1-.56-.82.71.71,0,0,1,.82-.56,11.81,11.81,0,0,1,1.44.37.7.7,0,0,1-.22,1.36Z"/><path class="cls-3" d="M130,45.11h0l-68.31,0a1.4,1.4,0,0,1,0-2.8h0l68.31,0a1.4,1.4,0,0,1,0,2.8Z"/><path class="cls-4" d="M24.16,217.66a6.18,6.18,0,0,1-6.33-6V63.18a6.72,6.72,0,0,1,6.72-6.72H183.91a6.72,6.72,0,0,1,6.71,6.72V211.64a6.18,6.18,0,0,1-6.33,6Z"/><path class="cls-2" d="M183.91,57.87a5.32,5.32,0,0,1,5.32,5.32V211.64a4.78,4.78,0,0,1-4.93,4.62H24.16a4.78,4.78,0,0,1-4.93-4.62V63.18a5.32,5.32,0,0,1,5.32-5.32H183.91m0-2.8H24.55a8.12,8.12,0,0,0-8.11,8.11V211.64a7.58,7.58,0,0,0,7.73,7.41H184.3a7.58,7.58,0,0,0,7.73-7.41V63.18a8.12,8.12,0,0,0-8.11-8.11Z"/><g id="Layer_8" data-name="Layer 8"><path class="cls-2" d="M182.45,84.32V207.37c0,1.24-.15,1.48-.18,1.52s-.28.18-1.51.18H27.7c-1.23,0-1.48-.15-1.51-.18s-.18-.28-.18-1.52V84.32H182.45m1.4-1.4H24.61V207.37c0,2.55.54,3.09,3.09,3.09H180.76c2.55,0,3.09-.54,3.09-3.09V82.92Z"/></g><g id="Layer_3" data-name="Layer 3"><circle class="cls-2" cx="33.15" cy="70.32" r="3.59"/></g><g id="Layer_5" data-name="Layer 5"><circle class="cls-2" cx="44.73" cy="70.32" r="3.59"/></g><g id="Layer_6" data-name="Layer 6"><path class="cls-2" d="M144.28,74.38H64.19a3.89,3.89,0,0,1-3.89-3.89v-.35a3.89,3.89,0,0,1,3.89-3.89h80.09a3.89,3.89,0,0,1,3.89,3.89v.35A3.89,3.89,0,0,1,144.28,74.38Z"/></g><g id="Layer_3-2" data-name="Layer 3"><circle class="cls-2" cx="163.73" cy="70.32" r="3.59"/></g><g id="Layer_5-2" data-name="Layer 5"><circle class="cls-2" cx="175.32" cy="70.32" r="3.59"/></g><ellipse class="cls-2" cx="240.05" cy="289.07" rx="53.38" ry="8.11"/><path class="cls-3" d="M338.61,235.8a10.42,10.42,0,0,0-12.25-6.18c-1,0-3.88-.36-9.07-2.47-2.12-.86-6.09-4.83-10.5-13.21,6.56-25,6.85-46.18.85-63.12a25.86,25.86,0,0,0-1.82-4l-.43-1.72,2.46-2.08a6.73,6.73,0,0,0-.37-10.58,6.75,6.75,0,0,0-5.68-6.74c-.54-.09-13.27-2.1-21.47-2.1h-.47l-2.17-3.49a17.8,17.8,0,0,0-31.61,2.72,94.46,94.46,0,0,0-22.88,5.84L219,127a17.8,17.8,0,0,0-15.9,31.73,96.72,96.72,0,0,0-1.26,24.57c.74,11.3-2.75,16.9-6.45,22.84-5.55,8.91-11.84,19,0,42.4a64.12,64.12,0,0,0,.3,7.29c1.61,14.75,5.83,22.24,12.55,22.24a7.83,7.83,0,0,0,3.44-.8c2.75-1.35,4.1-3.32,6.28-12.42a203.73,203.73,0,0,0,38.83,8.63c-2.19,9.51-1.87,11.83.06,14.32a7.9,7.9,0,0,0,6.29,3.05c5.21,0,11.1-5.12,17.53-15.21a80.74,80.74,0,0,0,5.46-10.7,192.18,192.18,0,0,0,12.5-26.25,31.31,31.31,0,0,0,10.83,7.81c6.53,2.64,12.24,4,17,4a17.09,17.09,0,0,0,6.43-1.09A10.44,10.44,0,0,0,338.61,235.8Z"/><path class="cls-1" d="M331,238.06a2.32,2.32,0,0,0-3-1.26,4.57,4.57,0,0,1-1.5.16c-1.78,0-5.76-.4-12.35-3.07-6.92-2.8-12.92-13.35-15.88-19.39a1.4,1.4,0,0,1-.09-1c6.77-24.42,7.34-44.86,1.71-60.77a18.69,18.69,0,0,0-1.66-3.4,1.41,1.41,0,0,1-.16-.38l-1.68-6.71a1.4,1.4,0,0,1,.45-1.41l3.31-2.8-7.29-1.11a1.4,1.4,0,0,1-.44-2.62l3.74-2a137.19,137.19,0,0,0-16-1.39,23.15,23.15,0,0,0-3.31.19l-.52.07a1.38,1.38,0,0,1-1.38-.65l-4.32-6.94a9.66,9.66,0,0,0-17.86,4.75,1.4,1.4,0,0,1-1.32,1.34,84.88,84.88,0,0,0-27.89,6.72,1.39,1.39,0,0,1-1.07,0l-6.74-2.76a9.66,9.66,0,0,0-7.32,17.89l2.86,1.17a1.4,1.4,0,0,1,.81,1.68c-2.22,7.83-3,17.09-2.32,27.51.91,13.92-3.64,21.22-7.66,27.67-5.39,8.64-9.64,15.46,1.09,35.86a1.4,1.4,0,0,1,.16.69,62.35,62.35,0,0,0,.22,8c1.06,9.76,3.29,14,4.27,14.83.46-1,1.53-4.12,3.65-14.23a1.4,1.4,0,0,1,1.91-1c13.51,5.68,37.17,10.92,51.68,11.45a1.4,1.4,0,0,1,1.3,1.75c-2.7,10.41-3.15,13.82-3.17,14.93,1.43-.39,5.29-3.38,10.4-11.4a74.59,74.59,0,0,0,5-10l.08-.16c4.18-7,11-20.85,16.33-36.94a1.4,1.4,0,0,1,2.52-.28c4.7,7.83,9.79,13,14.73,15,6.91,2.8,11.38,3.39,13.92,3.39a9.24,9.24,0,0,0,3.37-.49A2.29,2.29,0,0,0,331,238.06Z"/><path class="cls-5" d="M335.33,236.31a6.93,6.93,0,0,0-8.53-4c-.87,0-4.26-.05-10.86-2.72-3.78-1.53-8.59-7.51-12.91-16,6.71-24.83,7.15-45.8,1.28-62.35a22.82,22.82,0,0,0-1.8-3.82l-1.07-4.3,4.12-3.48a3.24,3.24,0,0,0-1.61-5.68l-.86-.13a3.24,3.24,0,0,0-1.88-5.39c-.13,0-12.93-2.06-20.94-2.06-.84,0-1.64,0-2.34.07l-3.24-5.21a14.3,14.3,0,0,0-26,4.11,90.38,90.38,0,0,0-25.52,6.37l-5.51-2.25a14.3,14.3,0,0,0-10.83,26.47l.24.1a90,90,0,0,0-1.75,26.26c.82,12.43-3.14,18.77-7,24.91-5.37,8.62-10.93,17.53.53,39.73a63.83,63.83,0,0,0,.27,7.74c.78,7.14,3,19.12,9.07,19.12a4.34,4.34,0,0,0,1.91-.44c1.58-.77,2.63-1.83,5.29-13.87a193.64,193.64,0,0,0,45.7,10.14c-3.23,13-2.5,14-1.51,15.27a4.37,4.37,0,0,0,3.53,1.7c5.16,0,11.35-8.52,14.58-13.59A78.17,78.17,0,0,0,283,262.53,201.5,201.5,0,0,0,297.45,231c4.22,5.7,8.68,9.53,13.28,11.39,6.11,2.47,11.37,3.73,15.66,3.73a13.62,13.62,0,0,0,5.12-.83A6.94,6.94,0,0,0,335.33,236.31ZM329.77,241a9.24,9.24,0,0,1-3.37.49c-2.53,0-7-.59-13.92-3.39-4.94-2-10-7.2-14.73-15a1.4,1.4,0,0,0-2.52.28c-5.37,16.1-12.15,30-16.33,36.94l-.08.16a74.59,74.59,0,0,1-5,10c-5.11,8-9,11-10.4,11.4,0-1.11.48-4.53,3.17-14.93a1.4,1.4,0,0,0-1.3-1.75c-14.5-.53-38.17-5.77-51.68-11.45a1.41,1.41,0,0,0-.54-.11,1.4,1.4,0,0,0-1.37,1.11C209.54,264.84,208.46,268,208,269c-1-.86-3.21-5.07-4.27-14.83a62.35,62.35,0,0,1-.22-8,1.4,1.4,0,0,0-.16-.69c-10.73-20.4-6.47-27.22-1.09-35.86,4-6.45,8.57-13.75,7.66-27.67-.68-10.42.09-19.67,2.32-27.51a1.4,1.4,0,0,0-.81-1.68l-2.86-1.17a9.66,9.66,0,1,1,7.32-17.89l6.74,2.76a1.39,1.39,0,0,0,1.07,0,84.88,84.88,0,0,1,27.89-6.72,1.4,1.4,0,0,0,1.32-1.34,9.66,9.66,0,0,1,17.86-4.75l4.32,6.94a1.38,1.38,0,0,0,1.38.65l.52-.07a23.15,23.15,0,0,1,3.31-.19,137.19,137.19,0,0,1,16,1.39l-3.74,2a1.4,1.4,0,0,0,.44,2.62l7.29,1.11-3.31,2.8a1.4,1.4,0,0,0-.45,1.41l1.68,6.71a1.41,1.41,0,0,0,.16.38,18.69,18.69,0,0,1,1.66,3.4c5.63,15.9,5.06,36.35-1.71,60.77a1.4,1.4,0,0,0,.09,1c3,6,9,16.58,15.88,19.39,6.59,2.67,10.56,3.07,12.35,3.07a4.57,4.57,0,0,0,1.5-.16,2.32,2.32,0,0,1,3,1.26A2.29,2.29,0,0,1,329.77,241Z"/><path class="cls-6" d="M232.46,161.75a11,11,0,0,1-4.18-.83L208,152.63a11.06,11.06,0,1,1,8.38-20.47l20.28,8.29a11.06,11.06,0,0,1-4.19,21.3Z"/><path class="cls-7" d="M275.37,160.2A11.05,11.05,0,0,1,266,155l-12.85-20.66a11.06,11.06,0,0,1,18.78-11.68l12.85,20.66a11.06,11.06,0,0,1-9.38,16.9Z"/><path class="cls-8" d="M222.37,135.21c-2.79,1.19-16.09,13.13-13.89,46.57,2.16,32.87-27.08,27.39-4.81,67.05,4.85,8.64,63,22.26,73.58,15.9,3.12-1.87,39.63-68.47,24-112.71C296.08,137.52,265.49,116.81,222.37,135.21Z"/><path class="cls-9" d="M204.41,220.61s-3.32,22.34-2.11,33.4,4.2,17.16,6.34,16.12,7.84-33.61,7.84-33.61Z"/><path class="cls-10" d="M287.79,240.05s-6.91,21.5-12.88,30.89-11.36,13.53-12.81,11.65S269.93,249,269.93,249Z"/><path class="cls-11" d="M228.5,134.68c9.81-5.07,36.21-3.34,48.22-5.16,6.44-1,23.94,1.81,23.94,1.81l-7.57,4,10.34,1.57-5.67,4.79,2.3,9.22-1.61-.92-58-16.05Z"/><path class="cls-12" d="M326.35,242.66c-2.93,0-7.57-.71-14.44-3.49-12.49-5.07-20.9-26.29-21.82-28.69a3.69,3.69,0,0,1,6.89-2.63c2.18,5.7,9.62,21.21,17.7,24.49,8.92,3.61,12.77,2.92,12.8,2.9a3.69,3.69,0,1,1,2.77,6.83A10.53,10.53,0,0,1,326.35,242.66Z"/><path class="cls-4" d="M231,148.19c-10.45,6.93-4,91.1,3.34,100.19,12,14.75,39.78,11.66,43.47,3.78,1.36-2.9,32.66-60.52,17.91-100.15C291.93,141.92,267.48,124,231,148.19Z"/><path class="cls-13" d="M249.68,165.79a2,2,0,0,1,1.49,2.39l-1,4.35a2,2,0,0,1-2.39,1.49h0a2,2,0,0,1-1.49-2.39l1-4.35a2,2,0,0,1,2.39-1.49Z"/><path class="cls-14" d="M288.62,167a2,2,0,0,1,1.49,2.39l-1,4.35a2,2,0,0,1-2.39,1.49h0a2,2,0,0,1-1.49-2.39l1-4.35a2,2,0,0,1,2.39-1.49Z"/><path class="cls-15" d="M247.82,183.08a8.42,8.42,0,0,1-1.92-.23,8.56,8.56,0,0,1-5.92-5.08,1.84,1.84,0,0,1,3.46-1.27,4.77,4.77,0,0,0,7.47,1.76,1.84,1.84,0,0,1,2.56,2.66A8.65,8.65,0,0,1,247.82,183.08Z"/><path class="cls-16" d="M287.62,177.75a8.45,8.45,0,0,1-1.92-.22,8.56,8.56,0,0,1-5.92-5.08,1.84,1.84,0,0,1,3.46-1.27,4.77,4.77,0,0,0,7.48,1.74,1.84,1.84,0,0,1,2.54,2.67A8.65,8.65,0,0,1,287.62,177.75Z"/><path class="cls-17" d="M257.56,197.71a1.84,1.84,0,0,1-.15-3.68c11.13-.94,21.49-3.11,22.61-4.73a12.83,12.83,0,0,0,1.51-5.09,1.84,1.84,0,0,1,3.67-.1c.18,1.59.77,4.24,1.51,5.12a4,4,0,0,0,2.93,1.57,1.84,1.84,0,1,1,.27,3.68,7.66,7.66,0,0,1-6-2.89,5.7,5.7,0,0,1-.51-.73l-.22.37c-2.54,4.12-18.63,5.89-25.43,6.47Z"/><path class="cls-18" d="M277.42,181.43c-1.4.94,6.61,4.92,7.74,4.94,1.69,0,9.83-3.53,9.49-6.24C294.47,178.67,282.94,177.74,277.42,181.43Z"/><path class="cls-19" d="M285.17,188.22h0c-1.37,0-8.89-3.36-9.62-5.86a2.17,2.17,0,0,1,.89-2.45h0c5.24-3.51,15.38-3.37,18.46-2a2.5,2.5,0,0,1,1.63,2,4.1,4.1,0,0,1-1.25,3.26C292.95,185.7,287.17,188.22,285.17,188.22Zm-5-6.18a25.83,25.83,0,0,0,5.13,2.51,19.36,19.36,0,0,0,6.91-3.56C289.79,180.52,284.18,180.42,280.22,182Zm-1.78.93h0Z"/><g id="Layer_2-2" data-name="Layer 2"><path class="cls-20" d="M330.82,227.3l-9,.11-.63-51.07a7.89,7.89,0,0,1,7.2-8,.56.56,0,0,1,.61.54Z"/></g><g id="Layer_3-3" data-name="Layer 3"><path class="cls-21" d="M349.71,177.78a.58.58,0,0,1,.84.12,7.89,7.89,0,0,1-1.4,10.63l-39.27,32.65-5.75-6.91Z"/></g><g id="Layer_4" data-name="Layer 4"><path class="cls-22" d="M284.08,217.5a11.07,11.07,0,0,0,2.35,9,10.67,10.67,0,0,0,3.65,2.83,13,13,0,0,0,13.78-2.12c.29-.24.57-.5.84-.76l12.71-10.56a2.64,2.64,0,0,0,.34-3.72l-3.58-4.3a2.64,2.64,0,0,0-3.72-.34l-3.64,3c-.15-.2-.3-.41-.46-.6a10.67,10.67,0,0,0-3.65-2.83,13,13,0,0,0-13.78,2.12A13.65,13.65,0,0,0,284.08,217.5Zm8.21-4.25a7.83,7.83,0,0,1,8.14-1.41,5.42,5.42,0,0,1,1.86,1.44c1.72,2.06,1.66,5.1.11,7.63a14.83,14.83,0,0,1-2.56,2.67h0l-.06.05a7.67,7.67,0,0,1-7.43.89,5.42,5.42,0,0,1-1.86-1.44,5.87,5.87,0,0,1-1.19-4.75A8.37,8.37,0,0,1,292.29,213.25Z"/></g><g id="Layer_5-3" data-name="Layer 5"><path class="cls-23" d="M320.75,218.16l.2,16.52c0,.37,0,.75,0,1.12A13.09,13.09,0,0,0,328,247.56a10.67,10.67,0,0,0,4.76,1c6.44-.08,11.61-6,11.53-13.09a13.09,13.09,0,0,0-7.09-11.76h0a10.67,10.67,0,0,0-4.75-1c-.26,0-.51,0-.76,0l-.06-4.73a2.64,2.64,0,0,0-2.67-2.61l-5.6.07a2.64,2.64,0,0,0-2.61,2.67Zm14.18,10.37a7.79,7.79,0,0,1,4.08,7.05c.05,4.23-2.78,7.7-6.31,7.75a5.43,5.43,0,0,1-2.42-.54,7.62,7.62,0,0,1-4-6.17s0-.05,0-.08a14.83,14.83,0,0,1,.38-3.68c.92-2.82,3.19-4.84,5.88-4.87A5.43,5.43,0,0,1,334.94,228.53Z"/></g><g id="Layer_6-2" data-name="Layer 6"><path class="cls-20" d="M326.18,199.49a2.93,2.93,0,1,1-3.18,2.65A2.93,2.93,0,0,1,326.18,199.49Z"/></g><path id="_Clipping_Path_" data-name="&lt;Clipping Path&gt;" class="cls-24" d="M259.85,197.52,258.41,202a7.37,7.37,0,0,0,14.05,4.47l3.69-11.6Z"/><path class="cls-25" d="M265.89,204.53a.92.92,0,0,1-.88-1.2l2.73-8.56a.92.92,0,0,1,1.76.56l-2.73,8.56A.92.92,0,0,1,265.89,204.53Z"/><path class="cls-26" d="M260.18,234c-22,0-41.36-34.86-42.19-36.38a3.69,3.69,0,0,1,6.46-3.55c5.22,9.49,22,33.84,36.9,32.5,19-1.7,28-8.66,28.14-8.73a3.69,3.69,0,0,1,4.61,5.75c-.42.34-10.64,8.41-32.09,10.33C261.4,233.95,260.79,234,260.18,234Z"/><path class="cls-27" d="M327.7,233.59s-10,4-10.17,7.44,10.33,7.57,14.81.93S329.48,232.82,327.7,233.59Z"/><path class="cls-28" d="M224.77,192.8s.92,7.37,5.53,11.52-6,10.14-5.53,19.35S224.77,192.8,224.77,192.8Z"/><path class="cls-29" d="M260.27,235l-1.34,0c-17.17-.47-32.21-22.51-32.84-23.45a.92.92,0,1,1,1.53-1c.15.22,15.14,22.19,31.37,22.63,16,.4,31.79-7.82,33.95-9.62.66-.55,1.16-3.29.2-4.61s-3-.39-4.49.57a.92.92,0,0,1-1-1.56c4.21-2.63,6.17-1.18,7-.09,1.5,2.07,1,5.88-.51,7.11S277.4,235,260.27,235Z"/><path class="cls-30" d="M325.53,246.71a11.39,11.39,0,0,1-5.58-1.59c-2.35-1.31-3.48-2.81-3.36-4.46.23-3.41,5.9-5.71,6.55-6a.92.92,0,0,1,.67,1.72c-2,.79-5.26,2.67-5.38,4.37-.07,1.09,1.28,2.08,2.42,2.72,2.76,1.54,5.34,1.77,7.68.7a8,8,0,0,0,4-4.07c.15-.74.6-3-.62-4.33-.92-1-2.65-1.42-5.15-1.18a.94.94,0,0,1-1-.83.92.92,0,0,1,.83-1c3.11-.3,5.36.3,6.69,1.78,1.84,2,1.25,5,1.06,5.93a9.62,9.62,0,0,1-5.06,5.38A8.94,8.94,0,0,1,325.53,246.71Z"/><path class="cls-31" d="M263.25,268.28a.92.92,0,0,1,0-1.84,68.93,68.93,0,0,0,10.27-1.21.92.92,0,0,1,.35,1.81A69.6,69.6,0,0,1,263.25,268.28Z"/><path class="cls-32" d="M215.33,142.76a.88.88,0,0,1-.24,0,.91.91,0,0,1-.65-1.09c.22-.88,3-6.31,9.75-9.22a.92.92,0,0,1,.73,1.69,16.94,16.94,0,0,0-8.69,8A1,1,0,0,1,215.33,142.76Z"/><path class="cls-33" d="M272.44,129.39a206.54,206.54,0,0,1-23-1.52.92.92,0,0,1-.79-1,.91.91,0,0,1,1-.79c.18,0,17.71,2.28,30.22,1.22a.92.92,0,0,1,.15,1.84C277.65,129.3,275.06,129.39,272.44,129.39Z"/><path class="cls-34" d="M298,222.51a.94.94,0,0,1-.29,0,.92.92,0,0,1-.59-1.16l2.46-7.53a.92.92,0,1,1,1.75.57l-2.46,7.53A.92.92,0,0,1,298,222.51Z"/><path class="cls-35" d="M212.87,260.29l-.18,0a.92.92,0,0,1-.72-1.08l2.15-10.75a.92.92,0,1,1,1.81.36l-2.15,10.75A.92.92,0,0,1,212.87,260.29Z"/><path class="cls-2" d="M88.44,108.87a8.34,8.34,0,0,0-8.34,8.34h8.34Zm25,0h-8.34v8.34h8.34Zm16.68,0v8.34h8.34A8.34,8.34,0,0,0,130.15,108.87Zm-29.19,0H92.61v8.34H101Zm25,0h-8.34v8.34H126Zm4.17,20.85h8.34v-8.34h-8.34Zm0,25a8.34,8.34,0,0,0,8.34-8.34h-8.34Zm0-12.51h8.34v-8.34h-8.34Zm-1.84-9a8.34,8.34,0,0,0-11.61-2.05l-16,11.8-8.21-5.76a10.24,10.24,0,0,0,.12-1.22,10.38,10.38,0,0,0-4.17-8.29v-6.3H80.1v4.38a10.42,10.42,0,1,0,8.16,18.65L93.43,148l-5.81,4.1a10.4,10.4,0,1,0,5,8.86,10.46,10.46,0,0,0-.21-2Zm-46.12,8A5.21,5.21,0,1,1,87.4,136,5.21,5.21,0,0,1,82.19,141.19Zm0,25A5.21,5.21,0,1,1,87.4,161,5.21,5.21,0,0,1,82.19,166.21Zm22.5-10.13,12.58,9.57a8.34,8.34,0,0,0,11.61-2.05L112,151Z"/><path class="cls-2" d="M21.57,39,21.43,39C21.46,39,21.51,39,21.57,39Z"/><path class="cls-2" d="M333.94,7.28v5.53a1.84,1.84,0,1,1-3.69,0V9.12h-3.69a1.84,1.84,0,0,1,0-3.69h5.53A1.84,1.84,0,0,1,333.94,7.28Z"/><path class="cls-2" d="M333.94,23.5V34.19a1.84,1.84,0,1,1-3.69,0V23.5a1.84,1.84,0,1,1,3.69,0Zm0,21.38V55.56a1.84,1.84,0,1,1-3.69,0V44.88a1.84,1.84,0,1,1,3.69,0Zm0,21.38V76.94a1.84,1.84,0,1,1-3.69,0V66.25a1.84,1.84,0,1,1,3.69,0Zm0,21.38V98.32a1.84,1.84,0,1,1-3.69,0V87.63a1.84,1.84,0,1,1,3.69,0Zm0,21.38V119.7a1.84,1.84,0,0,1-3.69,0V109a1.84,1.84,0,0,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V130.39a1.84,1.84,0,0,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,1,1-3.69,0V151.76a1.84,1.84,0,1,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V173.14a1.84,1.84,0,0,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V194.52a1.84,1.84,0,1,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V215.9a1.84,1.84,0,0,1,3.69,0Z"/><path class="cls-2" d="M333.94,237.28v5.53a1.84,1.84,0,0,1-1.84,1.84h-5.53a1.84,1.84,0,0,1,0-3.69h3.69v-3.69a1.84,1.84,0,1,1,3.69,0Z"/><path class="cls-2" d="M317.41,242.81a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,317.41,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,295.41,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,273.41,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,251.41,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,229.41,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,207.41,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,185.4,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,163.4,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,141.4,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,119.4,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,97.4,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,75.4,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,53.4,242.81Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,31.4,242.81Z"/><path class="cls-2" d="M9.4,242.81a1.84,1.84,0,0,1-1.84,1.84H2a1.84,1.84,0,0,1-1.84-1.84v-5.53a1.84,1.84,0,0,1,3.69,0V241H7.55A1.84,1.84,0,0,1,9.4,242.81Z"/><path class="cls-2" d="M3.87,23.5V34.19a1.84,1.84,0,0,1-3.69,0V23.5a1.84,1.84,0,0,1,3.69,0Zm0,21.38V55.57a1.84,1.84,0,0,1-3.69,0V44.88a1.84,1.84,0,0,1,3.69,0Zm0,21.38V76.94a1.84,1.84,0,0,1-3.69,0V66.25a1.84,1.84,0,0,1,3.69,0Zm0,21.38V98.32a1.84,1.84,0,0,1-3.69,0V87.63a1.84,1.84,0,0,1,3.69,0Zm0,21.38V119.7a1.84,1.84,0,0,1-3.69,0V109a1.84,1.84,0,1,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V130.39a1.84,1.84,0,0,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V151.77a1.84,1.84,0,0,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V173.14a1.84,1.84,0,0,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V194.52a1.84,1.84,0,0,1,3.69,0Zm0,21.38v10.69a1.84,1.84,0,0,1-3.69,0V215.9a1.84,1.84,0,0,1,3.69,0Z"/><path class="cls-2" d="M9.4,7.28A1.84,1.84,0,0,1,7.55,9.12H3.87v3.69a1.84,1.84,0,0,1-3.69,0V7.28A1.84,1.84,0,0,1,2,5.44H7.55A1.84,1.84,0,0,1,9.4,7.28Z"/><path class="cls-2" d="M317.41,7.28a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,317.41,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,295.41,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,273.41,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,251.41,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,229.41,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,207.41,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,185.4,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,163.4,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,141.4,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,119.4,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,97.4,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,75.4,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,0,1,0-3.69h11A1.84,1.84,0,0,1,53.4,7.28Zm-22,0a1.84,1.84,0,0,1-1.84,1.84h-11a1.84,1.84,0,1,1,0-3.69h11A1.84,1.84,0,0,1,31.4,7.28Z"/></g></svg>
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/browser/extensions/onboarding/content/img/icons_screenshots-colored.svg
@@ -0,0 +1,1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="92px" height="92px" viewBox="0 0 92 92" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>Tip / Icon / Screenshots</title><desc>Created with Sketch.</desc><defs></defs><g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="Tip-/-Icon-/-Screenshots" fill-rule="nonzero" fill="#0C0C0D"><g id="Icon-/-Screenshot-/-Web"><path fill="#0A84FF" d="M23.0526905,5.75 C16.7062659,5.75 11.5614723,10.8982866 11.5614723,17.2490201 L23.0526905,17.2490201 L23.0526905,5.75 Z M57.5263453,5.75 L46.035127,5.75 L46.035127,17.2490201 L57.5263453,17.2490201 L57.5263453,5.75 Z M80.5087818,5.75 L80.5087818,17.2490201 L92,17.2490201 C92,10.8982866 86.8552063,5.75 80.5087818,5.75 Z M40.2895179,5.75 L28.7982997,5.75 L28.7982997,17.2490201 L40.2895179,17.2490201 L40.2895179,5.75 Z M74.7631726,5.75 L63.2719544,5.75 L63.2719544,17.2490201 L74.7631726,17.2490201 L74.7631726,5.75 Z M80.5087818,34.4975502 L92,34.4975502 L92,22.9985301 L80.5087818,22.9985301 L80.5087818,34.4975502 Z M80.5087818,68.9946104 C86.8552063,68.9946104 92,63.8463237 92,57.4955903 L80.5087818,57.4955903 L80.5087818,68.9946104 Z M80.5087818,51.7460803 L92,51.7460803 L92,40.2470602 L80.5087818,40.2470602 L80.5087818,51.7460803 Z M77.9749681,39.286892 C74.3364854,34.0846734 67.1729138,32.8182928 61.9734467,36.4581331 L39.9390357,52.734996 L28.631677,44.8006721 C28.7205927,44.2448747 28.7762328,43.6842562 28.7982997,43.1218152 C28.7892628,38.6172543 26.6604054,34.3800822 23.0526905,31.6860398 L23.0526905,22.9985301 L11.5614723,22.9985301 L11.5614723,29.0355156 C5.79583786,30.1835386 1.31120668,34.7313256 0.240775953,40.5156383 C-0.829654779,46.2999509 1.73019662,52.1531434 6.70268981,55.2910372 C11.675183,58.4289309 18.0565494,58.2180974 22.811375,54.7588235 L29.9474215,59.7551477 L21.9035687,65.4011666 C16.3310302,62.0167647 9.17796578,62.8225007 4.49677041,67.3619045 C-0.184424965,71.9013083 -1.21401,79.0303725 1.99130168,84.710299 C5.19661336,90.3902255 11.8290284,93.1895755 18.1311131,91.5224455 C24.4331979,89.8553154 28.8167193,84.1418505 28.7982997,77.6188754 C28.7959008,76.6687877 28.699673,75.721263 28.5110192,74.7901165 L77.9749681,39.286892 Z M14.4342769,50.3087028 C10.4677615,50.3087028 7.25226545,47.0910236 7.25226545,43.1218152 C7.25226545,39.1526068 10.4677615,35.9349277 14.4342769,35.9349277 C18.4007922,35.9349277 21.6162883,39.1526068 21.6162883,43.1218152 C21.6162883,47.0910236 18.4007922,50.3087028 14.4342769,50.3087028 Z M14.4342769,84.805763 C10.4677615,84.805763 7.25226545,81.5880838 7.25226545,77.6188754 C7.25226545,73.649667 10.4677615,70.4319879 14.4342769,70.4319879 C18.4007922,70.4319879 21.6162883,73.649667 21.6162883,77.6188754 C21.6162883,81.5880838 18.4007922,84.805763 14.4342769,84.805763 Z M45.4605661,70.8402031 L62.7950688,84.0640762 C67.9945359,87.7039165 75.1581075,86.4375358 78.7965902,81.2353172 L55.457926,63.8200513 L45.4605661,70.8402031 Z" id="Shape"></path></g></g></g></svg>
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/browser/extensions/onboarding/content/img/icons_screenshots.svg
@@ -0,0 +1,1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="92px" height="92px" viewBox="0 0 92 92" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>Tip / Icon / Screenshots</title><desc>Created with Sketch.</desc><defs></defs><g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="Tip-/-Icon-/-Screenshots" fill-rule="nonzero" fill="#0C0C0D"><g id="Icon-/-Screenshot-/-Web"><path d="M23.0526905,5.75 C16.7062659,5.75 11.5614723,10.8982866 11.5614723,17.2490201 L23.0526905,17.2490201 L23.0526905,5.75 Z M57.5263453,5.75 L46.035127,5.75 L46.035127,17.2490201 L57.5263453,17.2490201 L57.5263453,5.75 Z M80.5087818,5.75 L80.5087818,17.2490201 L92,17.2490201 C92,10.8982866 86.8552063,5.75 80.5087818,5.75 Z M40.2895179,5.75 L28.7982997,5.75 L28.7982997,17.2490201 L40.2895179,17.2490201 L40.2895179,5.75 Z M74.7631726,5.75 L63.2719544,5.75 L63.2719544,17.2490201 L74.7631726,17.2490201 L74.7631726,5.75 Z M80.5087818,34.4975502 L92,34.4975502 L92,22.9985301 L80.5087818,22.9985301 L80.5087818,34.4975502 Z M80.5087818,68.9946104 C86.8552063,68.9946104 92,63.8463237 92,57.4955903 L80.5087818,57.4955903 L80.5087818,68.9946104 Z M80.5087818,51.7460803 L92,51.7460803 L92,40.2470602 L80.5087818,40.2470602 L80.5087818,51.7460803 Z M77.9749681,39.286892 C74.3364854,34.0846734 67.1729138,32.8182928 61.9734467,36.4581331 L39.9390357,52.734996 L28.631677,44.8006721 C28.7205927,44.2448747 28.7762328,43.6842562 28.7982997,43.1218152 C28.7892628,38.6172543 26.6604054,34.3800822 23.0526905,31.6860398 L23.0526905,22.9985301 L11.5614723,22.9985301 L11.5614723,29.0355156 C5.79583786,30.1835386 1.31120668,34.7313256 0.240775953,40.5156383 C-0.829654779,46.2999509 1.73019662,52.1531434 6.70268981,55.2910372 C11.675183,58.4289309 18.0565494,58.2180974 22.811375,54.7588235 L29.9474215,59.7551477 L21.9035687,65.4011666 C16.3310302,62.0167647 9.17796578,62.8225007 4.49677041,67.3619045 C-0.184424965,71.9013083 -1.21401,79.0303725 1.99130168,84.710299 C5.19661336,90.3902255 11.8290284,93.1895755 18.1311131,91.5224455 C24.4331979,89.8553154 28.8167193,84.1418505 28.7982997,77.6188754 C28.7959008,76.6687877 28.699673,75.721263 28.5110192,74.7901165 L77.9749681,39.286892 Z M14.4342769,50.3087028 C10.4677615,50.3087028 7.25226545,47.0910236 7.25226545,43.1218152 C7.25226545,39.1526068 10.4677615,35.9349277 14.4342769,35.9349277 C18.4007922,35.9349277 21.6162883,39.1526068 21.6162883,43.1218152 C21.6162883,47.0910236 18.4007922,50.3087028 14.4342769,50.3087028 Z M14.4342769,84.805763 C10.4677615,84.805763 7.25226545,81.5880838 7.25226545,77.6188754 C7.25226545,73.649667 10.4677615,70.4319879 14.4342769,70.4319879 C18.4007922,70.4319879 21.6162883,73.649667 21.6162883,77.6188754 C21.6162883,81.5880838 18.4007922,84.805763 14.4342769,84.805763 Z M45.4605661,70.8402031 L62.7950688,84.0640762 C67.9945359,87.7039165 75.1581075,86.4375358 78.7965902,81.2353172 L55.457926,63.8200513 L45.4605661,70.8402031 Z" id="Shape"></path></g></g></g></svg>
\ No newline at end of file
--- a/browser/extensions/onboarding/content/onboarding.css
+++ b/browser/extensions/onboarding/content/onboarding.css
@@ -429,16 +429,33 @@
   background-image: url("img/icons_performance.svg");
 }
 
 #onboarding-tour-performance.onboarding-active,
 #onboarding-tour-performance:hover {
   background-image: url("img/icons_performance-colored.svg");
 }
 
+#onboarding-tour-screenshots,
+#onboarding-notification-bar[data-target-tour-id=onboarding-tour-screenshots] #onboarding-notification-tour-title::before {
+  background-image: url("img/icons_screenshots.svg");
+}
+
+#onboarding-tour-screenshots.onboarding-active,
+#onboarding-tour-screenshots:hover {
+  background-image: url("img/icons_screenshots-colored.svg");
+}
+
+a#onboarding-tour-screenshots-button,
+a#onboarding-tour-screenshots-button:hover,
+a#onboarding-tour-screenshots-button:visited {
+  color: #fff;
+  text-decoration: none;
+}
+
 /* Tour Notifications */
 #onboarding-notification-bar {
   --onboarding-notification-bar-background-color: rgba(255, 255, 255, 0.97);
   position: fixed;
   z-index: 20998; /* We want this always under #onboarding-overlay */
   left: 0;
   bottom: 0;
   width: 100%;
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -290,16 +290,46 @@ var onboardingTourset = {
         </section>
         <section class="onboarding-tour-content">
           <img src="resource://onboarding/img/figure_performance.svg" role="presentation"/>
         </section>
       `;
       return div;
     },
   },
+  "screenshots": {
+    id: "onboarding-tour-screenshots",
+    tourNameId: "onboarding.tour-screenshots",
+    getNotificationStrings(bundle) {
+      return {
+        title: bundle.GetStringFromName("onboarding.notification.onboarding-tour-screenshots.title"),
+        message: bundle.formatStringFromName("onboarding.notification.onboarding-tour-screenshots.message", [BRAND_SHORT_NAME], 1),
+        button: bundle.GetStringFromName("onboarding.button.learnMore"),
+      };
+    },
+    getPage(win, bundle) {
+      let div = win.document.createElement("div");
+      // Screenshot tour opens the screenshot page directly, see below a#onboarding-tour-screenshots-button.
+      // The screenshots page should be responsible for highlighting the Screenshots button
+      div.innerHTML = `
+        <section class="onboarding-tour-description">
+          <h1 data-l10n-id="onboarding.tour-screenshots.title"></h1>
+          <p data-l10n-id="onboarding.tour-screenshots.description"></p>
+        </section>
+        <section class="onboarding-tour-content">
+          <img src="resource://onboarding/img/figure_screenshots.svg" role="presentation"/>
+        </section>
+        <aside class="onboarding-tour-button-container">
+          <a id="onboarding-tour-screenshots-button" class="onboarding-tour-action-button" data-l10n-id="onboarding.tour-screenshots.button"
+             href="https://screenshots.firefox.com/#tour" target="_blank"></a>
+        </aside>
+      `;
+      return div;
+    },
+  },
 };
 
 /**
  * @param {String} action the action to ask the chrome to do
  * @param {Array} params the parameters for the action
  */
 function sendMessageToChrome(action, params) {
   sendAsyncMessage("Onboarding:OnContentMessage", {
@@ -437,33 +467,33 @@ class Onboarding {
       this._prefsObserved = null;
     }
   }
 
   /**
    * Find a tour that should be selected. It is either a first tour that was not
    * yet complete or the first one in the tab list.
    */
-  get selectedTour() {
+  get _firstUncompleteTour() {
     return this._tours.find(tour => !this.isTourCompleted(tour.id)) ||
            this._tours[0];
   }
 
   handleClick(target) {
     let { id, classList } = target;
     // Only containers receive pointer events in onboarding tour tab list,
     // actual semantic tab is their first child.
     if (classList.contains("onboarding-tour-item-container")) {
       ({ id, classList } = target.firstChild);
     }
 
     switch (id) {
       case "onboarding-overlay-button":
         this.showOverlay();
-        this.gotoPage(this.selectedTour.id);
+        this.gotoPage(this._firstUncompleteTour.id);
         break;
       case "onboarding-overlay-close-btn":
       // If the clicking target is directly on the outer-most overlay,
       // that means clicking outside the tour content area.
       // Let's toggle the overlay.
       case "onboarding-overlay":
         this.hideOverlay();
         break;
@@ -520,17 +550,16 @@ class Onboarding {
 
     if (target === this._overlayIcon) {
       if ([" ", "Enter"].includes(key)) {
         // Remember that the dialog was opened with a keyboard.
         this._overlayIcon.dataset.keyboardFocus = true;
         this.handleClick(target);
         event.preventDefault();
       }
-
       return;
     }
 
     // Current focused item can be tab container if previous navigation was done
     // via mouse.
     if (target.classList.contains("onboarding-tour-item-container")) {
       target = target.firstChild;
     }
@@ -641,20 +670,20 @@ class Onboarding {
    */
   toggleModal(opened) {
     let { document: doc } = this._window;
     if (opened) {
       // Set aria-hidden to true for the rest of the document.
       [...doc.body.children].forEach(
         child => child.id !== "onboarding-overlay" &&
                  child.setAttribute("aria-hidden", true));
-      // When dialog is opened with the keyboard, focus on the selected or
-      // first tour item.
+      // When dialog is opened with the keyboard, focus on the 1st uncomplete tour
+      // because it will be the selected tour
       if (this._overlayIcon.dataset.keyboardFocus) {
-        doc.getElementById(this.selectedTour.id).focus();
+        doc.getElementById(this._firstUncompleteTour.id).focus();
       } else {
         // When dialog is opened with mouse, focus on the dialog itself to avoid
         // visible keyboard focus styling.
         this._dialog.focus();
       }
     } else {
       // Remove all set aria-hidden attributes.
       [...doc.body.children].forEach(
--- a/browser/extensions/onboarding/locales/en-US/onboarding.properties
+++ b/browser/extensions/onboarding/locales/en-US/onboarding.properties
@@ -111,8 +111,19 @@ onboarding.notification.onboarding-tour-
 
 onboarding.tour-performance=Performance
 onboarding.tour-performance.title=Browse with the best of ‘em.
 # LOCALIZATION NOTE(onboarding.tour-performance.description): %1$S is brandShortName.
 onboarding.tour-performance.description=It’s a whole new %1$S, built for faster page loading, smoother scrolling, and more responsive tab switching. These performance upgrades come paired with a modern, intuitive design. Start browsing and experience it for yourself: the best %1$S yet.
 onboarding.notification.onboarding-tour-performance.title=Browse with the best of ‘em.
 # LOCALIZATION NOTE(onboarding.notification.onboarding-tour-performance.message): %S is brandShortName.
 onboarding.notification.onboarding-tour-performance.message=Prepare yourself for the fastest, smoothest, most reliable %S yet.
+
+# LOCALIZATION NOTE (onboarding.tour-screenshots): "Screenshots" is the name of the Firefox Screenshots feature and should not be localized.
+onboarding.tour-screenshots=Screenshots
+onboarding.tour-screenshots.title=Take better screenshots.
+# LOCALIZATION NOTE(onboarding.tour-screenshots.description): %S is brandShortName.
+onboarding.tour-screenshots.description=Take, save and share screenshots — without leaving %S. Capture a region or an entire page as you browse. Then save to the web for easy access and sharing.
+# LOCALIZATION NOTE (onboarding.tour-screenshots.button): "Screenshots" is the name of the Firefox Screenshots feature and should not be localized.
+onboarding.tour-screenshots.button=Open Screenshots Website
+onboarding.notification.onboarding-tour-screenshots.title=Take better screenshots.
+# LOCALIZATION NOTE(onboarding.notification.onboarding-tour-screenshots.message): %S is brandShortName.
+onboarding.notification.onboarding-tour-screenshots.message=Take, save and share screenshots — without leaving %S.
--- a/browser/extensions/onboarding/test/browser/head.js
+++ b/browser/extensions/onboarding/test/browser/head.js
@@ -4,27 +4,25 @@
 let { Preferences } = Cu.import("resource://gre/modules/Preferences.jsm", {});
 
 const ABOUT_HOME_URL = "about:home";
 const ABOUT_NEWTAB_URL = "about:newtab";
 const URLs = [ABOUT_HOME_URL, ABOUT_NEWTAB_URL];
 const TOUR_IDs = [
   "onboarding-tour-performance",
   "onboarding-tour-private-browsing",
-  // TODO: should enable in bug 1371538
-  // "onboarding-tour-screenshots",
+  "onboarding-tour-screenshots",
   "onboarding-tour-addons",
   "onboarding-tour-customize",
   "onboarding-tour-default-browser",
 ];
 const UPDATE_TOUR_IDs = [
   "onboarding-tour-performance",
   "onboarding-tour-library",
-  // TODO: should enable in bug 1371538
-  // "onboarding-tour-screenshots",
+  "onboarding-tour-screenshots",
   "onboarding-tour-singlesearch",
   "onboarding-tour-customize",
   "onboarding-tour-sync",
 ];
 
 registerCleanupFunction(resetOnboardingDefaultState);
 
 function resetOnboardingDefaultState() {