mozilla · alexgibson · Nov 17, 2016 · Nov 11, 2016
diff --git a/bedrock/firefox/redirects.py b/bedrock/firefox/redirects.py
@@ -520,4 +520,8 @@ def firefox_mobile_faq(request, *args, **kwargs):
 
     # bug 1299947
     redirect('^firefox/channel/?$', 'firefox.channel.desktop'),
+
+    # Bug 1277196
+    redirect(r'^firefox(?:\/\d+\.\d+(?:\.\d+)?(?:a\d+)?)?/firstrun/learnmore/?$', 'firefox.features'),
+    redirect(r'^firefox/windows-10/welcome/?$', 'https://support.mozilla.org/kb/how-change-your-default-browser-windows-10'),
 )
diff --git a/bedrock/firefox/templates/firefox/firstrun/learnmore/learnmore.html b/bedrock/firefox/templates/firefox/firstrun/learnmore/learnmore.html
diff --git a/bedrock/firefox/templates/firefox/firstrun/learnmore/yahoo-search.html b/bedrock/firefox/templates/firefox/firstrun/learnmore/yahoo-search.html
diff --git a/bedrock/firefox/templates/firefox/firstrun/ravioli.html b/bedrock/firefox/templates/firefox/firstrun/ravioli.html
@@ -43,7 +43,7 @@
 <main role="main" class="container">
   <h2>
     <a href="{{ url('firefox.new') }}">
-      {{ high_res_img('firefox/firstrun/learnmore/yahoo/firefox-logo.png', {'alt': 'Firefox', 'width': '97', 'height': '100'}) }}
+      {{ high_res_img('firefox/template/logo-large.png', {'alt': 'Firefox', 'width': '97', 'height': '100'}) }}
     </a>
   </h2>
 

diff --git a/bedrock/firefox/templates/firefox/win10-welcome.html b/bedrock/firefox/templates/firefox/win10-welcome.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-1.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-1.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-10.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-10.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-2.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-2.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-3.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-3.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-4.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-4.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-5.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-5.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-6.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-6.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-7.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-7.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-8.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-8.html
diff --git a/bedrock/firefox/templates/firefox/win10_variants/variant-3-9.html b/bedrock/firefox/templates/firefox/win10_variants/variant-3-9.html