diff --git a/browser/branding/aurora/VisualElements_150.png b/browser/branding/aurora/VisualElements_150.png
deleted file mode 100644
index 92370ee7aa..0000000000
Binary files a/browser/branding/aurora/VisualElements_150.png and /dev/null differ
diff --git a/browser/branding/aurora/VisualElements_70.png b/browser/branding/aurora/VisualElements_70.png
deleted file mode 100644
index aa206c51e3..0000000000
Binary files a/browser/branding/aurora/VisualElements_70.png and /dev/null differ
diff --git a/browser/branding/aurora/appname.bmp b/browser/branding/aurora/appname.bmp
deleted file mode 100644
index 904794ddbe..0000000000
Binary files a/browser/branding/aurora/appname.bmp and /dev/null differ
diff --git a/browser/branding/aurora/background.png b/browser/branding/aurora/background.png
deleted file mode 100644
index 704d1c2eba..0000000000
Binary files a/browser/branding/aurora/background.png and /dev/null differ
diff --git a/browser/branding/aurora/bgintro.bmp b/browser/branding/aurora/bgintro.bmp
deleted file mode 100644
index 02ef9b3360..0000000000
Binary files a/browser/branding/aurora/bgintro.bmp and /dev/null differ
diff --git a/browser/branding/aurora/branding.nsi b/browser/branding/aurora/branding.nsi
deleted file mode 100644
index bb42794d14..0000000000
--- a/browser/branding/aurora/branding.nsi
+++ /dev/null
@@ -1,49 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# NSIS branding defines for Aurora builds.
-# The official release build branding.nsi is located in other-license/branding/firefox/
-# The unofficial build branding.nsi is located in browser/branding/unofficial/
-
-# BrandFullNameInternal is used for some registry and file system values
-# instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Firefox Developer Edition"
-!define BrandShortName "Firefox Developer Edition"
-!define CompanyName "mozilla.org"
-!define URLInfoAbout "https://www.mozilla.org"
-!define HelpLink "https://support.mozilla.org"
-
-!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-aurora-latest"
-!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=aurora&installer_lang=${AB_CD}"
-!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/"
-!define Channel "aurora"
-
-# The installer's certificate name and issuer expected by the stub installer
-!define CertNameDownload "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
-
-# Dialog units are used so the UI displays correctly with the system's DPI
-# settings.
-# The dialog units for the bitmap's dimensions should match exactly with the
-# bitmap's width and height in pixels.
-!define APPNAME_BMP_WIDTH_DU 108u
-!define APPNAME_BMP_HEIGHT_DU 48u
-!define INTRO_BLURB_WIDTH_DU "232u"
-!define INTRO_BLURB_EDGE_DU "196u"
-!define INTRO_BLURB_LTR_TOP_DU "16u"
-!define INTRO_BLURB_RTL_TOP_DU "11u"
-
-# UI Colors that can be customized for each channel
-!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
-!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
-!define FOOTER_BKGRD_COLOR 0xFFFFFF
-!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
-!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
-!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
-!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF
-!define COMMON_TEXT_COLOR_FADED 0xA1AAB3
-!define COMMON_BKGRD_COLOR 0x0F1B26
-
-# Enable DeveloperEdition-specific behavior
-!define DEV_EDITION
diff --git a/browser/branding/aurora/clock.bmp b/browser/branding/aurora/clock.bmp
deleted file mode 100644
index c74398edbc..0000000000
Binary files a/browser/branding/aurora/clock.bmp and /dev/null differ
diff --git a/browser/branding/aurora/configure.sh b/browser/branding/aurora/configure.sh
deleted file mode 100644
index 36feb08283..0000000000
--- a/browser/branding/aurora/configure.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOZ_APP_DISPLAYNAME=FirefoxDeveloperEdition
-MOZ_APP_REMOTINGNAME=firefox-dev
-MOZ_DEV_EDITION=1
diff --git a/browser/branding/aurora/content/about-background.png b/browser/branding/aurora/content/about-background.png
deleted file mode 100644
index 1fd5c9c888..0000000000
Binary files a/browser/branding/aurora/content/about-background.png and /dev/null differ
diff --git a/browser/branding/aurora/content/about-logo.png b/browser/branding/aurora/content/about-logo.png
deleted file mode 100644
index e3b7e1c8b4..0000000000
Binary files a/browser/branding/aurora/content/about-logo.png and /dev/null differ
diff --git a/browser/branding/aurora/content/about-logo@2x.png b/browser/branding/aurora/content/about-logo@2x.png
deleted file mode 100644
index 08dd73dd67..0000000000
Binary files a/browser/branding/aurora/content/about-logo@2x.png and /dev/null differ
diff --git a/browser/branding/aurora/content/about-wordmark.svg b/browser/branding/aurora/content/about-wordmark.svg
deleted file mode 100644
index 23a12221f0..0000000000
--- a/browser/branding/aurora/content/about-wordmark.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
diff --git a/browser/branding/aurora/content/about.png b/browser/branding/aurora/content/about.png
deleted file mode 100644
index c7d54ef1c5..0000000000
Binary files a/browser/branding/aurora/content/about.png and /dev/null differ
diff --git a/browser/branding/aurora/content/aboutDialog.css b/browser/branding/aurora/content/aboutDialog.css
deleted file mode 100644
index 209c53244e..0000000000
--- a/browser/branding/aurora/content/aboutDialog.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#aboutDialogContainer {
- background-image: url("chrome://branding/content/about-background.png");
- background-repeat: no-repeat;
- background-color: rgb(26,58,99);
- color: #fff;
-}
-
-.text-link {
- color: #fff !important;
- text-decoration: underline;
-}
-
-.text-link:-moz-focusring {
- border-color: #fff;
-}
-
-#rightBox {
- /* this margin prevents text from overlapping the planet image */
- margin-left: 280px;
- margin-right: 20px;
-}
-
-#bottomBox {
- padding: 15px 10px 15px;
- background-color: rgba(0,0,0,.7);
-}
-
-#version {
- margin-top: 30px;
-}
diff --git a/browser/branding/aurora/content/icon48.png b/browser/branding/aurora/content/icon48.png
deleted file mode 100644
index 85e3c0d4b8..0000000000
Binary files a/browser/branding/aurora/content/icon48.png and /dev/null differ
diff --git a/browser/branding/aurora/content/icon64.png b/browser/branding/aurora/content/icon64.png
deleted file mode 100644
index 4b90768d2d..0000000000
Binary files a/browser/branding/aurora/content/icon64.png and /dev/null differ
diff --git a/browser/branding/aurora/content/identity-icons-brand.svg b/browser/branding/aurora/content/identity-icons-brand.svg
deleted file mode 100644
index b284275bfc..0000000000
--- a/browser/branding/aurora/content/identity-icons-brand.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn
deleted file mode 100644
index 140359a19e..0000000000
--- a/browser/branding/aurora/content/jar.mn
+++ /dev/null
@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-browser.jar:
-% content branding %content/branding/ contentaccessible=yes
- content/branding/about.png
- content/branding/about-background.png
- content/branding/about-logo.png
- content/branding/about-logo@2x.png
- content/branding/about-wordmark.svg
- content/branding/icon48.png
- content/branding/icon64.png
- content/branding/icon16.png (../default16.png)
- content/branding/icon32.png (../default32.png)
- content/branding/icon128.png (../mozicon128.png)
- content/branding/identity-icons-brand.svg
- content/branding/silhouette-40.svg
- content/branding/aboutDialog.css
diff --git a/browser/branding/aurora/content/moz.build b/browser/branding/aurora/content/moz.build
deleted file mode 100644
index eb4454d28f..0000000000
--- a/browser/branding/aurora/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/branding/aurora/content/silhouette-40.svg b/browser/branding/aurora/content/silhouette-40.svg
deleted file mode 100644
index 338f0b3172..0000000000
--- a/browser/branding/aurora/content/silhouette-40.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
diff --git a/browser/branding/aurora/default16.png b/browser/branding/aurora/default16.png
deleted file mode 100644
index 3b2baaa8dc..0000000000
Binary files a/browser/branding/aurora/default16.png and /dev/null differ
diff --git a/browser/branding/aurora/default32.png b/browser/branding/aurora/default32.png
deleted file mode 100644
index 04cfba796d..0000000000
Binary files a/browser/branding/aurora/default32.png and /dev/null differ
diff --git a/browser/branding/aurora/default48.png b/browser/branding/aurora/default48.png
deleted file mode 100644
index 85e3c0d4b8..0000000000
Binary files a/browser/branding/aurora/default48.png and /dev/null differ
diff --git a/browser/branding/aurora/disk.icns b/browser/branding/aurora/disk.icns
deleted file mode 100644
index d9e0e6b614..0000000000
Binary files a/browser/branding/aurora/disk.icns and /dev/null differ
diff --git a/browser/branding/aurora/document.icns b/browser/branding/aurora/document.icns
deleted file mode 100644
index 7eedd34eed..0000000000
Binary files a/browser/branding/aurora/document.icns and /dev/null differ
diff --git a/browser/branding/aurora/document.ico b/browser/branding/aurora/document.ico
deleted file mode 100644
index 2402ac57f7..0000000000
Binary files a/browser/branding/aurora/document.ico and /dev/null differ
diff --git a/browser/branding/aurora/dsstore b/browser/branding/aurora/dsstore
deleted file mode 100644
index 4a5fa3f54c..0000000000
Binary files a/browser/branding/aurora/dsstore and /dev/null differ
diff --git a/browser/branding/aurora/firefox.VisualElementsManifest.xml b/browser/branding/aurora/firefox.VisualElementsManifest.xml
deleted file mode 100644
index 7654e0ab75..0000000000
--- a/browser/branding/aurora/firefox.VisualElementsManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
diff --git a/browser/branding/aurora/firefox.icns b/browser/branding/aurora/firefox.icns
deleted file mode 100644
index 662165bb30..0000000000
Binary files a/browser/branding/aurora/firefox.icns and /dev/null differ
diff --git a/browser/branding/aurora/firefox.ico b/browser/branding/aurora/firefox.ico
deleted file mode 100644
index 4f1856b99d..0000000000
Binary files a/browser/branding/aurora/firefox.ico and /dev/null differ
diff --git a/browser/branding/aurora/locales/browserconfig.properties b/browser/branding/aurora/locales/browserconfig.properties
deleted file mode 100644
index 06cefece3b..0000000000
--- a/browser/branding/aurora/locales/browserconfig.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Do NOT localize or otherwise change these values
-browser.startup.homepage=about:home
diff --git a/browser/branding/aurora/locales/en-US/brand.dtd b/browser/branding/aurora/locales/en-US/brand.dtd
deleted file mode 100644
index 9598f79b0f..0000000000
--- a/browser/branding/aurora/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/browser/branding/aurora/locales/en-US/brand.properties b/browser/branding/aurora/locales/en-US/brand.properties
deleted file mode 100644
index e49d0ae864..0000000000
--- a/browser/branding/aurora/locales/en-US/brand.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-brandShorterName=Firefox
-brandShortName=Firefox Developer Edition
-brandFullName=Firefox Developer Edition
-vendorShortName=Mozilla
-
-syncBrandShortName=Sync
diff --git a/browser/branding/aurora/locales/jar.mn b/browser/branding/aurora/locales/jar.mn
deleted file mode 100644
index 24880ad7d2..0000000000
--- a/browser/branding/aurora/locales/jar.mn
+++ /dev/null
@@ -1,12 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Aurora branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
- locale/branding/browserconfig.properties
diff --git a/browser/branding/aurora/locales/moz.build b/browser/branding/aurora/locales/moz.build
deleted file mode 100644
index 8bad13124d..0000000000
--- a/browser/branding/aurora/locales/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/branding/aurora/moz.build b/browser/branding/aurora/moz.build
deleted file mode 100644
index 9045cee11b..0000000000
--- a/browser/branding/aurora/moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['content', 'locales']
-
-DIST_SUBDIR = 'browser'
-export('DIST_SUBDIR')
-
-include('../branding-common.mozbuild')
-FirefoxBranding()
diff --git a/browser/branding/aurora/mozicon128.png b/browser/branding/aurora/mozicon128.png
deleted file mode 100644
index 2822bf4491..0000000000
Binary files a/browser/branding/aurora/mozicon128.png and /dev/null differ
diff --git a/browser/branding/aurora/newtab.ico b/browser/branding/aurora/newtab.ico
deleted file mode 100644
index a9b37c08c6..0000000000
Binary files a/browser/branding/aurora/newtab.ico and /dev/null differ
diff --git a/browser/branding/aurora/newwindow.ico b/browser/branding/aurora/newwindow.ico
deleted file mode 100644
index 5537207710..0000000000
Binary files a/browser/branding/aurora/newwindow.ico and /dev/null differ
diff --git a/browser/branding/aurora/particles.bmp b/browser/branding/aurora/particles.bmp
deleted file mode 100644
index ab74ce0471..0000000000
Binary files a/browser/branding/aurora/particles.bmp and /dev/null differ
diff --git a/browser/branding/aurora/pbmode.ico b/browser/branding/aurora/pbmode.ico
deleted file mode 100644
index 47677c13fb..0000000000
Binary files a/browser/branding/aurora/pbmode.ico and /dev/null differ
diff --git a/browser/branding/aurora/pencil-rtl.bmp b/browser/branding/aurora/pencil-rtl.bmp
deleted file mode 100644
index e50d92db7c..0000000000
Binary files a/browser/branding/aurora/pencil-rtl.bmp and /dev/null differ
diff --git a/browser/branding/aurora/pencil.bmp b/browser/branding/aurora/pencil.bmp
deleted file mode 100644
index 252c10f417..0000000000
Binary files a/browser/branding/aurora/pencil.bmp and /dev/null differ
diff --git a/browser/branding/aurora/pref/firefox-branding.js b/browser/branding/aurora/pref/firefox-branding.js
deleted file mode 100644
index 9f005b8570..0000000000
--- a/browser/branding/aurora/pref/firefox-branding.js
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-pref("startup.homepage_override_url", "");
-pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/");
-pref("startup.homepage_welcome_url.additional", "");
-// The time interval between checks for a new version (in seconds)
-pref("app.update.interval", 28800); // 8 hours
-// The time interval between the downloading of mar file chunks in the
-// background (in seconds)
-// 0 means "download everything at once"
-pref("app.update.download.backgroundInterval", 0);
-// Give the user x seconds to react before showing the big UI. default=192 hours
-pref("app.update.promptWaitTime", 691200);
-// URL user can browse to manually if for some reason all update installation
-// attempts fail.
-pref("app.update.url.manual", "https://www.mozilla.org/firefox/aurora/");
-// A default value for the "More information about this update" link
-// supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "https://www.mozilla.org/firefox/aurora/");
-
-// The number of days a binary is permitted to be old
-// without checking for an update. This assumes that
-// app.update.checkInstallTime is true.
-pref("app.update.checkInstallTime.days", 2);
-
-// Give the user x seconds to reboot before showing a badge on the hamburger
-// button. default=4 days
-pref("app.update.badgeWaitTime", 345600);
-
-// Number of usages of the web console or scratchpad.
-// If this is less than 5, then pasting code into the web console or scratchpad is disabled
-pref("devtools.selfxss.count", 5);
diff --git a/browser/branding/aurora/wizHeader.bmp b/browser/branding/aurora/wizHeader.bmp
deleted file mode 100644
index 32aefb96e7..0000000000
Binary files a/browser/branding/aurora/wizHeader.bmp and /dev/null differ
diff --git a/browser/branding/aurora/wizHeaderRTL.bmp b/browser/branding/aurora/wizHeaderRTL.bmp
deleted file mode 100644
index 5f0ccb1c45..0000000000
Binary files a/browser/branding/aurora/wizHeaderRTL.bmp and /dev/null differ
diff --git a/browser/branding/aurora/wizWatermark.bmp b/browser/branding/aurora/wizWatermark.bmp
deleted file mode 100644
index 56c6c3103c..0000000000
Binary files a/browser/branding/aurora/wizWatermark.bmp and /dev/null differ
diff --git a/browser/branding/nightly/VisualElements_150.png b/browser/branding/nightly/VisualElements_150.png
deleted file mode 100644
index 461961e8d4..0000000000
Binary files a/browser/branding/nightly/VisualElements_150.png and /dev/null differ
diff --git a/browser/branding/nightly/VisualElements_70.png b/browser/branding/nightly/VisualElements_70.png
deleted file mode 100644
index aad81f40d0..0000000000
Binary files a/browser/branding/nightly/VisualElements_70.png and /dev/null differ
diff --git a/browser/branding/nightly/appname.bmp b/browser/branding/nightly/appname.bmp
deleted file mode 100644
index fc1b6343c4..0000000000
Binary files a/browser/branding/nightly/appname.bmp and /dev/null differ
diff --git a/browser/branding/nightly/background.png b/browser/branding/nightly/background.png
deleted file mode 100644
index db5576a336..0000000000
Binary files a/browser/branding/nightly/background.png and /dev/null differ
diff --git a/browser/branding/nightly/bgintro.bmp b/browser/branding/nightly/bgintro.bmp
deleted file mode 100644
index 777ab2e848..0000000000
Binary files a/browser/branding/nightly/bgintro.bmp and /dev/null differ
diff --git a/browser/branding/nightly/branding.nsi b/browser/branding/nightly/branding.nsi
deleted file mode 100644
index fa13b32c6d..0000000000
--- a/browser/branding/nightly/branding.nsi
+++ /dev/null
@@ -1,45 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# NSIS branding defines for nightly builds.
-# The official release build branding.nsi is located in other-license/branding/firefox/
-# The unofficial build branding.nsi is located in browser/branding/unofficial/
-
-# BrandFullNameInternal is used for some registry and file system values
-# instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Nightly"
-!define CompanyName "mozilla.org"
-!define URLInfoAbout "https://www.mozilla.org"
-!define HelpLink "https://support.mozilla.org"
-
-!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-nightly-latest"
-!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=nightly&installer_lang=${AB_CD}"
-!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/"
-!define Channel "nightly"
-
-# The installer's certificate name and issuer expected by the stub installer
-!define CertNameDownload "Mozilla Corporation"
-!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
-
-# Dialog units are used so the UI displays correctly with the system's DPI
-# settings.
-# The dialog units for the bitmap's dimensions should match exactly with the
-# bitmap's width and height in pixels.
-!define APPNAME_BMP_WIDTH_DU 159u
-!define APPNAME_BMP_HEIGHT_DU 28u
-!define INTRO_BLURB_WIDTH_DU "230u"
-!define INTRO_BLURB_EDGE_DU "198u"
-!define INTRO_BLURB_LTR_TOP_DU "16u"
-!define INTRO_BLURB_RTL_TOP_DU "11u"
-
-# UI Colors that can be customized for each channel
-!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
-!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
-!define FOOTER_BKGRD_COLOR 0xFFFFFF
-!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
-!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
-!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
-!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF
-!define COMMON_TEXT_COLOR_FADED 0xA1AAB3
-!define COMMON_BKGRD_COLOR 0x0F1B26
diff --git a/browser/branding/nightly/clock.bmp b/browser/branding/nightly/clock.bmp
deleted file mode 100644
index c74398edbc..0000000000
Binary files a/browser/branding/nightly/clock.bmp and /dev/null differ
diff --git a/browser/branding/nightly/configure.sh b/browser/branding/nightly/configure.sh
deleted file mode 100644
index edd3bd3e86..0000000000
--- a/browser/branding/nightly/configure.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOZ_APP_DISPLAYNAME=Nightly
diff --git a/browser/branding/nightly/content/about-background.png b/browser/branding/nightly/content/about-background.png
deleted file mode 100644
index b572ab2377..0000000000
Binary files a/browser/branding/nightly/content/about-background.png and /dev/null differ
diff --git a/browser/branding/nightly/content/about-logo.png b/browser/branding/nightly/content/about-logo.png
deleted file mode 100644
index cd985a92f3..0000000000
Binary files a/browser/branding/nightly/content/about-logo.png and /dev/null differ
diff --git a/browser/branding/nightly/content/about-logo@2x.png b/browser/branding/nightly/content/about-logo@2x.png
deleted file mode 100644
index fb12dfbd7e..0000000000
Binary files a/browser/branding/nightly/content/about-logo@2x.png and /dev/null differ
diff --git a/browser/branding/nightly/content/about-wordmark.svg b/browser/branding/nightly/content/about-wordmark.svg
deleted file mode 100644
index 6f71130b41..0000000000
--- a/browser/branding/nightly/content/about-wordmark.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
diff --git a/browser/branding/nightly/content/about.png b/browser/branding/nightly/content/about.png
deleted file mode 100644
index 5917b1e119..0000000000
Binary files a/browser/branding/nightly/content/about.png and /dev/null differ
diff --git a/browser/branding/nightly/content/aboutDialog.css b/browser/branding/nightly/content/aboutDialog.css
deleted file mode 100644
index f0df8b1aa2..0000000000
--- a/browser/branding/nightly/content/aboutDialog.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#aboutDialogContainer {
- background-image: url("chrome://branding/content/about-background.png");
- background-repeat: no-repeat;
- background-color: rgb(10,17,37);
- color: #fff;
-}
-
-.text-link {
- color: #fff !important;
- text-decoration: underline;
-}
-
-.text-link:-moz-focusring {
- border-color: #fff;
-}
-
-#rightBox {
- /* this margin prevents text from overlapping the planet image */
- margin-left: 280px;
- margin-right: 20px;
-}
-
-#bottomBox {
- background-color: rgba(0,0,0,.7);
-}
diff --git a/browser/branding/nightly/content/icon48.png b/browser/branding/nightly/content/icon48.png
deleted file mode 100644
index 88a307340f..0000000000
Binary files a/browser/branding/nightly/content/icon48.png and /dev/null differ
diff --git a/browser/branding/nightly/content/icon64.png b/browser/branding/nightly/content/icon64.png
deleted file mode 100644
index 2eab258cba..0000000000
Binary files a/browser/branding/nightly/content/icon64.png and /dev/null differ
diff --git a/browser/branding/nightly/content/identity-icons-brand.svg b/browser/branding/nightly/content/identity-icons-brand.svg
deleted file mode 100644
index 6c33113e56..0000000000
--- a/browser/branding/nightly/content/identity-icons-brand.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn
deleted file mode 100644
index 140359a19e..0000000000
--- a/browser/branding/nightly/content/jar.mn
+++ /dev/null
@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-browser.jar:
-% content branding %content/branding/ contentaccessible=yes
- content/branding/about.png
- content/branding/about-background.png
- content/branding/about-logo.png
- content/branding/about-logo@2x.png
- content/branding/about-wordmark.svg
- content/branding/icon48.png
- content/branding/icon64.png
- content/branding/icon16.png (../default16.png)
- content/branding/icon32.png (../default32.png)
- content/branding/icon128.png (../mozicon128.png)
- content/branding/identity-icons-brand.svg
- content/branding/silhouette-40.svg
- content/branding/aboutDialog.css
diff --git a/browser/branding/nightly/content/moz.build b/browser/branding/nightly/content/moz.build
deleted file mode 100644
index eb4454d28f..0000000000
--- a/browser/branding/nightly/content/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/branding/nightly/content/silhouette-40.svg b/browser/branding/nightly/content/silhouette-40.svg
deleted file mode 100644
index aa17cd3093..0000000000
--- a/browser/branding/nightly/content/silhouette-40.svg
+++ /dev/null
@@ -1,1360 +0,0 @@
-
-
-
diff --git a/browser/branding/nightly/default16.png b/browser/branding/nightly/default16.png
deleted file mode 100644
index ace90e53c7..0000000000
Binary files a/browser/branding/nightly/default16.png and /dev/null differ
diff --git a/browser/branding/nightly/default32.png b/browser/branding/nightly/default32.png
deleted file mode 100644
index b62d0200fb..0000000000
Binary files a/browser/branding/nightly/default32.png and /dev/null differ
diff --git a/browser/branding/nightly/default48.png b/browser/branding/nightly/default48.png
deleted file mode 100644
index 88a307340f..0000000000
Binary files a/browser/branding/nightly/default48.png and /dev/null differ
diff --git a/browser/branding/nightly/disk.icns b/browser/branding/nightly/disk.icns
deleted file mode 100644
index c49b7b878e..0000000000
Binary files a/browser/branding/nightly/disk.icns and /dev/null differ
diff --git a/browser/branding/nightly/document.icns b/browser/branding/nightly/document.icns
deleted file mode 100644
index 98b461d753..0000000000
Binary files a/browser/branding/nightly/document.icns and /dev/null differ
diff --git a/browser/branding/nightly/document.ico b/browser/branding/nightly/document.ico
deleted file mode 100644
index 796181004f..0000000000
Binary files a/browser/branding/nightly/document.ico and /dev/null differ
diff --git a/browser/branding/nightly/dsstore b/browser/branding/nightly/dsstore
deleted file mode 100644
index 657101d6e2..0000000000
Binary files a/browser/branding/nightly/dsstore and /dev/null differ
diff --git a/browser/branding/nightly/firefox.VisualElementsManifest.xml b/browser/branding/nightly/firefox.VisualElementsManifest.xml
deleted file mode 100644
index 7654e0ab75..0000000000
--- a/browser/branding/nightly/firefox.VisualElementsManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
diff --git a/browser/branding/nightly/firefox.icns b/browser/branding/nightly/firefox.icns
deleted file mode 100644
index 858cb2a191..0000000000
Binary files a/browser/branding/nightly/firefox.icns and /dev/null differ
diff --git a/browser/branding/nightly/firefox.ico b/browser/branding/nightly/firefox.ico
deleted file mode 100644
index 12bebb1c22..0000000000
Binary files a/browser/branding/nightly/firefox.ico and /dev/null differ
diff --git a/browser/branding/nightly/locales/browserconfig.properties b/browser/branding/nightly/locales/browserconfig.properties
deleted file mode 100644
index 06cefece3b..0000000000
--- a/browser/branding/nightly/locales/browserconfig.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Do NOT localize or otherwise change these values
-browser.startup.homepage=about:home
diff --git a/browser/branding/nightly/locales/en-US/brand.dtd b/browser/branding/nightly/locales/en-US/brand.dtd
deleted file mode 100644
index cf4596ae03..0000000000
--- a/browser/branding/nightly/locales/en-US/brand.dtd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/browser/branding/nightly/locales/en-US/brand.properties b/browser/branding/nightly/locales/en-US/brand.properties
deleted file mode 100644
index 8cd2c2ec98..0000000000
--- a/browser/branding/nightly/locales/en-US/brand.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-brandShorterName=Nightly
-brandShortName=Nightly
-brandFullName=Nightly
-vendorShortName=Mozilla
-
-syncBrandShortName=Sync
diff --git a/browser/branding/nightly/locales/jar.mn b/browser/branding/nightly/locales/jar.mn
deleted file mode 100644
index 63af8f6f96..0000000000
--- a/browser/branding/nightly/locales/jar.mn
+++ /dev/null
@@ -1,12 +0,0 @@
-#filter substitution
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-@AB_CD@.jar:
-% locale branding @AB_CD@ %locale/branding/
-# Nightly branding only exists in en-US
- locale/branding/brand.dtd (en-US/brand.dtd)
- locale/branding/brand.properties (en-US/brand.properties)
- locale/branding/browserconfig.properties
diff --git a/browser/branding/nightly/locales/moz.build b/browser/branding/nightly/locales/moz.build
deleted file mode 100644
index 8bad13124d..0000000000
--- a/browser/branding/nightly/locales/moz.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
-
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
diff --git a/browser/branding/nightly/moz.build b/browser/branding/nightly/moz.build
deleted file mode 100644
index 9045cee11b..0000000000
--- a/browser/branding/nightly/moz.build
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['content', 'locales']
-
-DIST_SUBDIR = 'browser'
-export('DIST_SUBDIR')
-
-include('../branding-common.mozbuild')
-FirefoxBranding()
diff --git a/browser/branding/nightly/mozicon128.png b/browser/branding/nightly/mozicon128.png
deleted file mode 100644
index 4222e6814b..0000000000
Binary files a/browser/branding/nightly/mozicon128.png and /dev/null differ
diff --git a/browser/branding/nightly/newtab.ico b/browser/branding/nightly/newtab.ico
deleted file mode 100644
index a9b37c08c6..0000000000
Binary files a/browser/branding/nightly/newtab.ico and /dev/null differ
diff --git a/browser/branding/nightly/newwindow.ico b/browser/branding/nightly/newwindow.ico
deleted file mode 100644
index 5537207710..0000000000
Binary files a/browser/branding/nightly/newwindow.ico and /dev/null differ
diff --git a/browser/branding/nightly/particles.bmp b/browser/branding/nightly/particles.bmp
deleted file mode 100644
index ab74ce0471..0000000000
Binary files a/browser/branding/nightly/particles.bmp and /dev/null differ
diff --git a/browser/branding/nightly/pbmode.ico b/browser/branding/nightly/pbmode.ico
deleted file mode 100644
index 47677c13fb..0000000000
Binary files a/browser/branding/nightly/pbmode.ico and /dev/null differ
diff --git a/browser/branding/nightly/pencil-rtl.bmp b/browser/branding/nightly/pencil-rtl.bmp
deleted file mode 100644
index e50d92db7c..0000000000
Binary files a/browser/branding/nightly/pencil-rtl.bmp and /dev/null differ
diff --git a/browser/branding/nightly/pencil.bmp b/browser/branding/nightly/pencil.bmp
deleted file mode 100644
index 252c10f417..0000000000
Binary files a/browser/branding/nightly/pencil.bmp and /dev/null differ
diff --git a/browser/branding/nightly/pref/firefox-branding.js b/browser/branding/nightly/pref/firefox-branding.js
deleted file mode 100644
index 359d6bb6ec..0000000000
--- a/browser/branding/nightly/pref/firefox-branding.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%");
-pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
-pref("startup.homepage_welcome_url.additional", "");
-// The time interval between checks for a new version (in seconds)
-pref("app.update.interval", 7200); // 2 hours
-// The time interval between the downloading of mar file chunks in the
-// background (in seconds)
-// 0 means "download everything at once"
-pref("app.update.download.backgroundInterval", 0);
-// Give the user x seconds to react before showing the big UI. default=12 hours
-pref("app.update.promptWaitTime", 43200);
-// URL user can browse to manually if for some reason all update installation
-// attempts fail.
-pref("app.update.url.manual", "https://nightly.mozilla.org");
-// A default value for the "More information about this update" link
-// supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "https://nightly.mozilla.org");
-
-// The number of days a binary is permitted to be old
-// without checking for an update. This assumes that
-// app.update.checkInstallTime is true.
-pref("app.update.checkInstallTime.days", 2);
-
-// Give the user x seconds to reboot before showing a badge on the hamburger
-// button. default=immediately
-pref("app.update.badgeWaitTime", 0);
-
-// Number of usages of the web console or scratchpad.
-// If this is less than 5, then pasting code into the web console or scratchpad is disabled
-pref("devtools.selfxss.count", 5);
diff --git a/browser/branding/nightly/wizHeader.bmp b/browser/branding/nightly/wizHeader.bmp
deleted file mode 100644
index ac96070a8b..0000000000
Binary files a/browser/branding/nightly/wizHeader.bmp and /dev/null differ
diff --git a/browser/branding/nightly/wizHeaderRTL.bmp b/browser/branding/nightly/wizHeaderRTL.bmp
deleted file mode 100644
index 710af4a8e2..0000000000
Binary files a/browser/branding/nightly/wizHeaderRTL.bmp and /dev/null differ
diff --git a/browser/branding/nightly/wizWatermark.bmp b/browser/branding/nightly/wizWatermark.bmp
deleted file mode 100644
index 86d929cc11..0000000000
Binary files a/browser/branding/nightly/wizWatermark.bmp and /dev/null differ