diff --git a/bedrock/firefox/templates/firefox/all.html b/bedrock/firefox/templates/firefox/all.html
index 32509921f71..ac84c2e805c 100644
--- a/bedrock/firefox/templates/firefox/all.html
+++ b/bedrock/firefox/templates/firefox/all.html
@@ -11,14 +11,6 @@
   {%- endif -%}
 {% endblock %}
 
-{% block page_favicon %}
-  {%- if channel == 'nightly' -%}
-    {{ static('img/firefox/favicon-nightly.png') }}
-  {%- else -%}
-    {{ super() }}
-  {%- endif -%}
-{% endblock %}
-
 {% block twitter_id %}
   {%- if channel == 'nightly' -%}
     FirefoxNightly
@@ -27,8 +19,6 @@
   {%- endif -%}
 {% endblock %}
 
-{% block body_id %}firefox-all{% endblock %}
-
 {% block page_desc %}
   {%- if channel == 'beta' -%}
     {{ _('Download Firefox Beta in your language and experience cutting edge features before they make it to final release. Provide feedback to help us refine and polish the next version of Firefox.') }}
@@ -43,14 +33,37 @@
   {%- endif -%}
 {% endblock %}
 
+{% block page_favicon %}
+  {%- if channel == 'alpha' -%}
+    {{ static('img/firefox/developer/favicon.png') }}
+  {%- elif channel == 'nightly' -%}
+    {{ static('img/firefox/nightly/favicon.png') }}
+  {%- else -%}
+    {{ super() }}
+  {%- endif -%}
+{% endblock %}
+
+{% block page_favicon_large %}
+  {%- if channel == 'alpha' -%}
+    {{ static('img/firefox/developer/favicon-196.png') }}
+  {%- elif channel == 'nightly' -%}
+    {{ static('img/firefox/nightly/favicon-196.png') }}
+  {%- else -%}
+    {{ super() }}
+  {%- endif -%}
+{% endblock %}
+
 {% block page_image %}
-  {%- if channel == 'aurora' -%}
+  {%- if channel == 'alpha' -%}
     {{ static('img/firefox/developer/page-image.png') }}
+  {%- elif channel == 'nightly' -%}
+    {{ static('img/firefox/nightly/page-image.png') }}
   {%- else -%}
     {{ static('img/firefox/all/page-image.png') }}
   {%- endif -%}
 {% endblock %}
 
+{% block body_id %}firefox-all{% endblock %}
 {% block body_class -%}
   sky {{ platform }} {{ channel }} {% if channel == 'alpha' %}blueprint{% endif %}
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/dev-firstrun.html b/bedrock/firefox/templates/firefox/dev-firstrun.html
index e0aec13484e..85591a9e13f 100644
--- a/bedrock/firefox/templates/firefox/dev-firstrun.html
+++ b/bedrock/firefox/templates/firefox/dev-firstrun.html
@@ -17,6 +17,8 @@
 {% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{_('Welcome to Firefox Developer Edition')}}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/developer/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/developer/favicon-196.png') }}{% endblock %}
 {% block page_image %}{{ static('img/firefox/developer/page-image.png') }}{% endblock %}
 {% block page_og_url %}{{ url('firefox.developer') }}{% endblock %}
 
diff --git a/bedrock/firefox/templates/firefox/dev-whatsnew.html b/bedrock/firefox/templates/firefox/dev-whatsnew.html
index c3e340a3c1e..3730a97b2a9 100644
--- a/bedrock/firefox/templates/firefox/dev-whatsnew.html
+++ b/bedrock/firefox/templates/firefox/dev-whatsnew.html
@@ -17,6 +17,8 @@
 {% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{_('Welcome to Firefox Developer Edition')}}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/developer/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/developer/favicon-196.png') }}{% endblock %}
 {% block page_image %}{{ static('img/firefox/developer/page-image.png') }}{% endblock %}
 {% block page_og_url %}{{ url('firefox.developer') }}{% endblock %}
 
diff --git a/bedrock/firefox/templates/firefox/developer.html b/bedrock/firefox/templates/firefox/developer.html
index 69ce7b16469..dc08b501ffe 100644
--- a/bedrock/firefox/templates/firefox/developer.html
+++ b/bedrock/firefox/templates/firefox/developer.html
@@ -6,6 +6,8 @@
 
 {% block page_title_prefix %}{% endblock %}
 {% block page_title %}{{_('Firefox Developer Edition')}}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/developer/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/developer/favicon-196.png') }}{% endblock %}
 {% block page_image %}{{ static('img/firefox/developer/page-image.png') }}{% endblock %}
 
 {% block page_desc %}
diff --git a/bedrock/firefox/templates/firefox/nightly_firstrun.html b/bedrock/firefox/templates/firefox/nightly_firstrun.html
index 05ea888939f..bdb83503597 100644
--- a/bedrock/firefox/templates/firefox/nightly_firstrun.html
+++ b/bedrock/firefox/templates/firefox/nightly_firstrun.html
@@ -15,9 +15,13 @@
 {% add_lang_files "firstrun" "mobile" %}
 
 {% block page_title_prefix %}{% endblock %}
-{% block page_favicon %}{{ static('img/firefox/favicon-nightly.png') }}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/nightly/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/nightly/favicon-196.png') }}{% endblock %}
+{% block page_image %}{{ static('img/firefox/nightly/page-image.png') }}{% endblock %}
 {% block page_title %}{{ _('Firefox Nightly First Run Page') }}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
+{% block page_og_url %}{{ url('firefox.all', channel='nightly') }}{% endblock %}
+
 {% block body_id %}firefox-firstrun{% endblock %}
 
 {% block site_header_nav %}{% endblock %}
diff --git a/bedrock/firefox/templates/firefox/nightly_whatsnew.html b/bedrock/firefox/templates/firefox/nightly_whatsnew.html
index caf25f0208c..28881afc38e 100644
--- a/bedrock/firefox/templates/firefox/nightly_whatsnew.html
+++ b/bedrock/firefox/templates/firefox/nightly_whatsnew.html
@@ -15,9 +15,12 @@
 {% endblock %}
 
 {% block page_title_prefix %}{% endblock %}
-{% block page_favicon %}{{ static('img/firefox/favicon-nightly.png') }}{% endblock %}
+{% block page_favicon %}{{ static('img/firefox/nightly/favicon.png') }}{% endblock %}
+{% block page_favicon_large %}{{ static('img/firefox/nightly/favicon-196.png') }}{% endblock %}
+{% block page_image %}{{ static('img/firefox/nightly/page-image.png') }}{% endblock %}
 {% block page_title %}{{ _('You’ve just been upgraded to Firefox Nightly %(version)s!')|format(version=num_version) }}{% endblock %}
 {% block page_title_suffix %}{% endblock %}
+{% block page_og_url %}{{ url('firefox.all', channel='nightly') }}{% endblock %}
 
 {% block body_id %}nightly-whatsnew{% endblock %}
 {% block body_class %}{% endblock %}
diff --git a/media/img/firefox/developer/favicon-196.png b/media/img/firefox/developer/favicon-196.png
new file mode 100644
index 00000000000..1b8c66e80f0
Binary files /dev/null and b/media/img/firefox/developer/favicon-196.png differ
diff --git a/media/img/firefox/developer/favicon.png b/media/img/firefox/developer/favicon.png
new file mode 100644
index 00000000000..1bfe85dd70b
Binary files /dev/null and b/media/img/firefox/developer/favicon.png differ
diff --git a/media/img/firefox/favicon-nightly.png b/media/img/firefox/favicon-nightly.png
deleted file mode 100644
index 5734dfc90d6..00000000000
Binary files a/media/img/firefox/favicon-nightly.png and /dev/null differ
diff --git a/media/img/firefox/nightly/favicon-196.png b/media/img/firefox/nightly/favicon-196.png
new file mode 100644
index 00000000000..72ab53e5f8a
Binary files /dev/null and b/media/img/firefox/nightly/favicon-196.png differ
diff --git a/media/img/firefox/nightly/favicon.png b/media/img/firefox/nightly/favicon.png
new file mode 100644
index 00000000000..8058c5bd3a1
Binary files /dev/null and b/media/img/firefox/nightly/favicon.png differ
diff --git a/media/img/firefox/nightly/page-image.png b/media/img/firefox/nightly/page-image.png
new file mode 100644
index 00000000000..fcd9bc43b4b
Binary files /dev/null and b/media/img/firefox/nightly/page-image.png differ