Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

62 files changed, 478 insertions, 0 deletions

diff --git a/browser/branding/official/LICENSE b/browser/branding/official/LICENSE
new file mode 100644
index 0000000000..9593f9c7b6
--- /dev/null
+++ b/browser/branding/official/LICENSE
@@ -0,0 +1,10 @@
+These files are under the MPL 2, as below. However, please note that you 
+are not granted any trademark rights or licenses to the trademarks of the
+Mozilla Foundation or any party, including without limitation the
+Firefox name or logo.
+
+For more information, see: https://www.mozilla.org/foundation/licensing/
+
+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 https://mozilla.org/MPL/2.0/.
diff --git a/browser/branding/official/PrivateBrowsing_150.png b/browser/branding/official/PrivateBrowsing_150.png
new file mode 100644
index 0000000000..e95485e137
--- /dev/null
+++ b/browser/branding/official/PrivateBrowsing_150.png
diff --git a/browser/branding/official/PrivateBrowsing_70.png b/browser/branding/official/PrivateBrowsing_70.png
new file mode 100644
index 0000000000..b6fb4a11de
--- /dev/null
+++ b/browser/branding/official/PrivateBrowsing_70.png
diff --git a/browser/branding/official/VisualElements_150.png b/browser/branding/official/VisualElements_150.png
new file mode 100644
index 0000000000..f764a48966
--- /dev/null
+++ b/browser/branding/official/VisualElements_150.png
diff --git a/browser/branding/official/VisualElements_70.png b/browser/branding/official/VisualElements_70.png
new file mode 100644
index 0000000000..197a645b42
--- /dev/null
+++ b/browser/branding/official/VisualElements_70.png
diff --git a/browser/branding/official/background.png b/browser/branding/official/background.png
new file mode 100644
index 0000000000..31331ff808
--- /dev/null
+++ b/browser/branding/official/background.png
diff --git a/browser/branding/official/branding.nsi b/browser/branding/official/branding.nsi
new file mode 100644
index 0000000000..bbdead7e4a
--- /dev/null
+++ b/browser/branding/official/branding.nsi
@@ -0,0 +1,76 @@
+# 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 official release builds.
+# The nightly build branding.nsi is located in browser/installer/windows/nsis/
+# 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 "Mozilla Firefox"
+!define BrandFullName         "Mozilla Firefox"
+!define CompanyName           "Mozilla Corporation"
+!define URLInfoAbout          "https://www.mozilla.org"
+!define URLUpdateInfo         "https://www.mozilla.org/firefox/${AppVersion}/releasenotes"
+!define HelpLink              "https://support.mozilla.org"
+
+; The OFFICIAL define is a workaround to support different urls for Release and
+; Beta since they share the same branding when building with other branches that
+; set the update channel to beta.
+!define OFFICIAL
+!define URLStubDownloadX86 "https://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-latest"
+!define URLStubDownloadAMD64 "https://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-latest"
+!define URLStubDownloadAArch64 "https://download.mozilla.org/?os=win64-aarch64&lang=${AB_CD}&product=firefox-latest"
+!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=release&installer_lang=${AB_CD}"
+!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/"
+!define Channel "release"
+
+# 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. These are tweaked to look good with the en-US strings; ideally
+# we would customize them for each locale but we don't really have a way to
+# implement that and it would be a ton of work for the localizers.
+!define PROFILE_CLEANUP_LABEL_TOP "50u"
+!define PROFILE_CLEANUP_LABEL_LEFT "22u"
+!define PROFILE_CLEANUP_LABEL_WIDTH "175u"
+!define PROFILE_CLEANUP_LABEL_HEIGHT "100u"
+!define PROFILE_CLEANUP_LABEL_ALIGN "left"
+!define PROFILE_CLEANUP_CHECKBOX_LEFT "22u"
+!define PROFILE_CLEANUP_CHECKBOX_WIDTH "175u"
+!define PROFILE_CLEANUP_BUTTON_LEFT "22u"
+!define INSTALL_HEADER_TOP "70u"
+!define INSTALL_HEADER_LEFT "22u"
+!define INSTALL_HEADER_WIDTH "180u"
+!define INSTALL_HEADER_HEIGHT "100u"
+!define INSTALL_BODY_LEFT "22u"
+!define INSTALL_BODY_WIDTH "180u"
+!define INSTALL_INSTALLING_TOP "115u"
+!define INSTALL_INSTALLING_LEFT "270u"
+!define INSTALL_INSTALLING_WIDTH "150u"
+!define INSTALL_PROGRESS_BAR_TOP "100u"
+!define INSTALL_PROGRESS_BAR_LEFT "270u"
+!define INSTALL_PROGRESS_BAR_WIDTH "150u"
+!define INSTALL_PROGRESS_BAR_HEIGHT "12u"
+
+!define PROFILE_CLEANUP_CHECKBOX_TOP_MARGIN "12u"
+!define PROFILE_CLEANUP_BUTTON_TOP_MARGIN "12u"
+!define PROFILE_CLEANUP_BUTTON_X_PADDING "80u"
+!define PROFILE_CLEANUP_BUTTON_Y_PADDING "8u"
+!define INSTALL_BODY_TOP_MARGIN "20u"
+
+# Font settings that can be customized for each channel
+!define INSTALL_HEADER_FONT_SIZE 20
+!define INSTALL_HEADER_FONT_WEIGHT 600
+!define INSTALL_INSTALLING_FONT_SIZE 15
+!define INSTALL_INSTALLING_FONT_WEIGHT 600
+
+# UI Colors that can be customized for each channel
+!define COMMON_TEXT_COLOR 0x000000
+!define COMMON_BACKGROUND_COLOR 0xFFFFFF
+!define INSTALL_INSTALLING_TEXT_COLOR 0xFFFFFF
+# This color is written as 0x00BBGGRR because it's actually a COLORREF value.
+!define PROGRESS_BAR_BACKGROUND_COLOR 0xFFAA00
diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh
new file mode 100644
index 0000000000..92ef14e03f
--- /dev/null
+++ b/browser/branding/official/configure.sh
@@ -0,0 +1,5 @@
+# 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=Firefox
diff --git a/browser/branding/official/content/about-logo-private.png b/browser/branding/official/content/about-logo-private.png
new file mode 100644
index 0000000000..e5359a1c23
--- /dev/null
+++ b/browser/branding/official/content/about-logo-private.png
diff --git a/browser/branding/official/content/about-logo-private@2x.png b/browser/branding/official/content/about-logo-private@2x.png
new file mode 100644
index 0000000000..74315c3973
--- /dev/null
+++ b/browser/branding/official/content/about-logo-private@2x.png
diff --git a/browser/branding/official/content/about-logo.png b/browser/branding/official/content/about-logo.png
new file mode 100644
index 0000000000..b37e61c59f
--- /dev/null
+++ b/browser/branding/official/content/about-logo.png
diff --git a/browser/branding/official/content/about-logo.svg b/browser/branding/official/content/about-logo.svg
new file mode 100644
index 0000000000..c382310ecd
--- /dev/null
+++ b/browser/branding/official/content/about-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512"><defs><radialGradient id="g" cx="210%" cy="-100%" r="290%"><stop offset=".1" stop-color="#ffe226"/><stop offset=".79" stop-color="#ff7139"/></radialGradient><radialGradient id="c" cx="49%" cy="40%" r="128%" gradientTransform="matrix(.82 0 0 1 .088 0)"><stop offset=".3" stop-color="#960e18"/><stop offset=".35" stop-color="#b11927" stop-opacity=".74"/><stop offset=".43" stop-color="#db293d" stop-opacity=".34"/><stop offset=".5" stop-color="#f5334b" stop-opacity=".09"/><stop offset=".53" stop-color="#ff3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="48%" cy="-12%" r="140%"><stop offset=".13" stop-color="#fff44f"/><stop offset=".53" stop-color="#ff980e"/></radialGradient><radialGradient id="e" cx="22.76%" cy="110.11%" r="100%"><stop offset=".35" stop-color="#3a8ee6"/><stop offset=".67" stop-color="#9059ff"/><stop offset="1" stop-color="#c139e6"/></radialGradient><radialGradient id="f" cx="52%" cy="33%" r="59%" gradientTransform="scale(.9 1)"><stop offset=".21" stop-color="#9059ff" stop-opacity="0"/><stop offset=".97" stop-color="#6e008b" stop-opacity=".6"/></radialGradient><radialGradient id="b" cx="87.4%" cy="-12.9%" r="128%" gradientTransform="matrix(.8 0 0 1 .178 .129)"><stop offset=".13" stop-color="#ffbd4f"/><stop offset=".28" stop-color="#ff980e"/><stop offset=".47" stop-color="#ff3750"/><stop offset=".78" stop-color="#eb0878"/><stop offset=".86" stop-color="#e50080"/></radialGradient><radialGradient id="h" cx="84%" cy="-41%" r="180%"><stop offset=".11" stop-color="#fff44f"/><stop offset=".46" stop-color="#ff980e"/><stop offset=".72" stop-color="#ff3647"/><stop offset=".9" stop-color="#e31587"/></radialGradient><radialGradient id="i" cx="16.1%" cy="-18.6%" r="348.8%" gradientTransform="scale(1 .47) rotate(84 .279 -.297)"><stop offset="0" stop-color="#fff44f"/><stop offset=".3" stop-color="#ff980e"/><stop offset=".57" stop-color="#ff3647"/><stop offset=".74" stop-color="#e31587"/></radialGradient><radialGradient id="j" cx="18.9%" cy="-42.5%" r="238.4%"><stop offset=".14" stop-color="#fff44f"/><stop offset=".48" stop-color="#ff980e"/><stop offset=".66" stop-color="#ff3647"/><stop offset=".9" stop-color="#e31587"/></radialGradient><radialGradient id="k" cx="159.3%" cy="-44.72%" r="313.1%"><stop offset=".09" stop-color="#fff44f"/><stop offset=".63" stop-color="#ff980e"/></radialGradient><linearGradient id="a" x1="87.25%" y1="15.5%" x2="9.4%" y2="93.1%"><stop offset=".05" stop-color="#fff44f"/><stop offset=".37" stop-color="#ff980e"/><stop offset=".53" stop-color="#ff3647"/><stop offset=".7" stop-color="#e31587"/></linearGradient><linearGradient id="l" x1="80%" y1="14%" x2="18%" y2="84%"><stop offset=".17" stop-color="#fff44f" stop-opacity=".8"/><stop offset=".6" stop-color="#fff44f" stop-opacity="0"/></linearGradient></defs><path d="M478.711 166.353c-10.445-25.124-31.6-52.248-48.212-60.821 13.52 26.505 21.345 53.093 24.335 72.936 0 .039.015.136.047.4C427.706 111.135 381.627 83.823 344 24.355c-1.9-3.007-3.805-6.022-5.661-9.2a73.716 73.716 0 01-2.646-4.972A43.7 43.7 0 01332.1.677a.626.626 0 00-.546-.644.818.818 0 00-.451 0c-.034.012-.084.051-.12.065-.053.021-.12.069-.176.1.027-.036.083-.117.1-.136-60.37 35.356-80.85 100.761-82.732 133.484a120.249 120.249 0 00-66.142 25.488 71.355 71.355 0 00-6.225-4.7 111.338 111.338 0 01-.674-58.732c-24.688 11.241-43.89 29.01-57.85 44.7h-.111c-9.527-12.067-8.855-51.873-8.312-60.184-.114-.515-7.107 3.63-8.023 4.255a175.073 175.073 0 00-23.486 20.12 210.478 210.478 0 00-22.442 26.913c0 .012-.007.026-.011.038 0-.013.007-.026.011-.038a202.838 202.838 0 00-32.247 72.805c-.115.521-.212 1.061-.324 1.586-.452 2.116-2.08 12.7-2.365 15-.022.177-.032.347-.053.524a229.066 229.066 0 00-3.9 33.157c0 .41-.025.816-.025 1.227C16 388.418 123.6 496 256.324 496c118.865 0 217.56-86.288 236.882-199.63.407-3.076.733-6.168 1.092-9.271 4.777-41.21-.53-84.525-15.587-120.746zM201.716 354.447c1.124.537 2.18 1.124 3.334 1.639.048.033.114.07.163.1a126.191 126.191 0 01-3.497-1.739zm55.053-144.93zm198.131-30.59l-.032-.233c.012.085.027.174.04.259z" fill="url(#a)"/><path d="M478.711 166.353c-10.445-25.124-31.6-52.248-48.212-60.821 13.52 26.505 21.345 53.093 24.335 72.936 0-.058.011.048.036.226.012.085.027.174.04.259 22.675 61.47 10.322 123.978-7.479 162.175-27.539 59.1-94.215 119.67-198.576 116.716C136.1 454.651 36.766 370.988 18.223 261.41c-3.379-17.28 0-26.054 1.7-40.084-2.071 10.816-2.86 13.94-3.9 33.157 0 .41-.025.816-.025 1.227C16 388.418 123.6 496 256.324 496c118.865 0 217.56-86.288 236.882-199.63.407-3.076.733-6.168 1.092-9.271 4.777-41.21-.53-84.525-15.587-120.746z" fill="url(#b)"/><path d="M478.711 166.353c-10.445-25.124-31.6-52.248-48.212-60.821 13.52 26.505 21.345 53.093 24.335 72.936 0-.058.011.048.036.226.012.085.027.174.04.259 22.675 61.47 10.322 123.978-7.479 162.175-27.539 59.1-94.215 119.67-198.576 116.716C136.1 454.651 36.766 370.988 18.223 261.41c-3.379-17.28 0-26.054 1.7-40.084-2.071 10.816-2.86 13.94-3.9 33.157 0 .41-.025.816-.025 1.227C16 388.418 123.6 496 256.324 496c118.865 0 217.56-86.288 236.882-199.63.407-3.076.733-6.168 1.092-9.271 4.777-41.21-.53-84.525-15.587-120.746z" fill="url(#c)"/><path d="M361.922 194.6c.524.368 1 .734 1.493 1.1a130.706 130.706 0 00-22.31-29.112C266.4 91.892 321.516 4.626 330.811.194c.027-.036.083-.117.1-.136-60.37 35.356-80.85 100.761-82.732 133.484 2.8-.194 5.592-.429 8.442-.429 45.051 0 84.289 24.77 105.301 61.487z" fill="url(#d)"/><path d="M256.772 209.514c-.393 5.978-21.514 26.593-28.9 26.593-68.339 0-79.432 41.335-79.432 41.335 3.027 34.81 27.261 63.475 56.611 78.643 1.339.692 2.694 1.317 4.05 1.935a132.768 132.768 0 007.059 2.886 106.743 106.743 0 0031.271 6.031c119.78 5.618 142.986-143.194 56.545-186.408 22.137-3.85 45.115 5.053 57.947 14.067-21.012-36.714-60.25-61.484-105.3-61.484-2.85 0-5.641.235-8.442.429a120.249 120.249 0 00-66.142 25.488c3.664 3.1 7.8 7.244 16.514 15.828 16.302 16.067 58.13 32.705 58.219 34.657z" fill="url(#e)"/><path d="M256.772 209.514c-.393 5.978-21.514 26.593-28.9 26.593-68.339 0-79.432 41.335-79.432 41.335 3.027 34.81 27.261 63.475 56.611 78.643 1.339.692 2.694 1.317 4.05 1.935a132.768 132.768 0 007.059 2.886 106.743 106.743 0 0031.271 6.031c119.78 5.618 142.986-143.194 56.545-186.408 22.137-3.85 45.115 5.053 57.947 14.067-21.012-36.714-60.25-61.484-105.3-61.484-2.85 0-5.641.235-8.442.429a120.249 120.249 0 00-66.142 25.488c3.664 3.1 7.8 7.244 16.514 15.828 16.302 16.067 58.13 32.705 58.219 34.657z" fill="url(#f)"/><path d="M170.829 151.036a244.042 244.042 0 014.981 3.3 111.338 111.338 0 01-.674-58.732c-24.688 11.241-43.89 29.01-57.85 44.7 1.155-.033 36.014-.66 53.543 10.732z" fill="url(#g)"/><path d="M18.223 261.41C36.766 370.988 136.1 454.651 248.855 457.844c104.361 2.954 171.037-57.62 198.576-116.716 17.8-38.2 30.154-100.7 7.479-162.175l-.008-.026-.032-.233c-.025-.178-.04-.284-.036-.226 0 .039.015.136.047.4 8.524 55.661-19.79 109.584-64.051 146.044l-.133.313c-86.245 70.223-168.774 42.368-185.484 30.966a144.108 144.108 0 01-3.5-1.743c-50.282-24.029-71.054-69.838-66.6-109.124-42.457 0-56.934-35.809-56.934-35.809s38.119-27.179 88.358-3.541c46.53 21.893 90.228 3.543 90.233 3.541-.089-1.952-41.917-18.59-58.223-34.656-8.713-8.584-12.85-12.723-16.514-15.828a71.355 71.355 0 00-6.225-4.7 282.929 282.929 0 00-4.981-3.3c-17.528-11.392-52.388-10.765-53.543-10.735h-.111c-9.527-12.067-8.855-51.873-8.312-60.184-.114-.515-7.107 3.63-8.023 4.255a175.073 175.073 0 00-23.486 20.12 210.478 210.478 0 00-22.442 26.919c0 .012-.007.026-.011.038 0-.013.007-.026.011-.038a202.838 202.838 0 00-32.247 72.805c-.115.521-8.65 37.842-4.44 57.199z" fill="url(#h)"/><path d="M341.105 166.587a130.706 130.706 0 0122.31 29.112c1.323.994 2.559 1.985 3.608 2.952 54.482 50.2 25.936 121.2 23.807 126.26 44.261-36.46 72.575-90.383 64.051-146.044C427.706 111.135 381.627 83.823 344 24.355c-1.9-3.007-3.805-6.022-5.661-9.2a73.716 73.716 0 01-2.646-4.972A43.7 43.7 0 01332.1.677a.626.626 0 00-.546-.644.818.818 0 00-.451 0c-.034.012-.084.051-.12.065-.053.021-.12.069-.176.1-9.291 4.428-64.407 91.694 10.298 166.389z" fill="url(#i)"/><path d="M367.023 198.651c-1.049-.967-2.285-1.958-3.608-2.952-.489-.368-.969-.734-1.493-1.1-12.832-9.014-35.81-17.917-57.947-14.067 86.441 43.214 63.235 192.026-56.545 186.408a106.743 106.743 0 01-31.271-6.031 134.51 134.51 0 01-7.059-2.886c-1.356-.618-2.711-1.243-4.05-1.935.048.033.114.07.163.1 16.71 11.4 99.239 39.257 185.484-30.966l.133-.313c2.129-5.054 30.675-76.057-23.807-126.258z" fill="url(#j)"/><path d="M148.439 277.443s11.093-41.335 79.432-41.335c7.388 0 28.509-20.615 28.9-26.593s-43.7 18.352-90.233-3.541c-50.239-23.638-88.358 3.541-88.358 3.541s14.477 35.809 56.934 35.809c-4.453 39.286 16.319 85.1 66.6 109.124 1.124.537 2.18 1.124 3.334 1.639-29.348-15.169-53.582-43.834-56.609-78.644z" fill="url(#k)"/><path d="M478.711 166.353c-10.445-25.124-31.6-52.248-48.212-60.821 13.52 26.505 21.345 53.093 24.335 72.936 0 .039.015.136.047.4C427.706 111.135 381.627 83.823 344 24.355c-1.9-3.007-3.805-6.022-5.661-9.2a73.716 73.716 0 01-2.646-4.972A43.7 43.7 0 01332.1.677a.626.626 0 00-.546-.644.818.818 0 00-.451 0c-.034.012-.084.051-.12.065-.053.021-.12.069-.176.1.027-.036.083-.117.1-.136-60.37 35.356-80.85 100.761-82.732 133.484 2.8-.194 5.592-.429 8.442-.429 45.053 0 84.291 24.77 105.3 61.484-12.832-9.014-35.81-17.917-57.947-14.067 86.441 43.214 63.235 192.026-56.545 186.408a106.743 106.743 0 01-31.271-6.031 134.51 134.51 0 01-7.059-2.886c-1.356-.618-2.711-1.243-4.05-1.935.048.033.114.07.163.1a144.108 144.108 0 01-3.5-1.743c1.124.537 2.18 1.124 3.334 1.639-29.35-15.168-53.584-43.833-56.611-78.643 0 0 11.093-41.335 79.432-41.335 7.388 0 28.509-20.615 28.9-26.593-.089-1.952-41.917-18.59-58.223-34.656-8.713-8.584-12.85-12.723-16.514-15.828a71.355 71.355 0 00-6.225-4.7 111.338 111.338 0 01-.674-58.732c-24.688 11.241-43.89 29.01-57.85 44.7h-.111c-9.527-12.067-8.855-51.873-8.312-60.184-.114-.515-7.107 3.63-8.023 4.255a175.073 175.073 0 00-23.486 20.12 210.478 210.478 0 00-22.435 26.916c0 .012-.007.026-.011.038 0-.013.007-.026.011-.038a202.838 202.838 0 00-32.247 72.805c-.115.521-.212 1.061-.324 1.586-.452 2.116-2.486 12.853-2.77 15.156-.022.177.021-.176 0 0a279.565 279.565 0 00-3.544 33.53c0 .41-.025.816-.025 1.227C16 388.418 123.6 496 256.324 496c118.865 0 217.56-86.288 236.882-199.63.407-3.076.733-6.168 1.092-9.271 4.777-41.21-.53-84.525-15.587-120.746zm-23.841 12.341c.012.085.027.174.04.259l-.008-.026-.032-.233z" fill="url(#l)"/></svg>
\ No newline at end of file
diff --git a/browser/branding/official/content/about-logo@2x.png b/browser/branding/official/content/about-logo@2x.png
new file mode 100644
index 0000000000..6ca067c1af
--- /dev/null
+++ b/browser/branding/official/content/about-logo@2x.png
diff --git a/browser/branding/official/content/about-wordmark.svg b/browser/branding/official/content/about-wordmark.svg
new file mode 100644
index 0000000000..22a228028d
--- /dev/null
+++ b/browser/branding/official/content/about-wordmark.svg
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="336" height="48" viewBox="0 0 336 48">
+  <path d="M.972 7.879H22.4v5.8H7.119v7.859H22.4v5.752H7.119v12.642H.972zM29.688 5.64a3.447 3.447 0 0 1 3.557 3.6 3.434 3.434 0 0 1-3.6 3.6 3.4 3.4 0 0 1-3.556-3.513 3.555 3.555 0 0 1 3.599-3.687zm-3.03 10.582h6.06v23.71h-6.06zm23.623 6.586a4.894 4.894 0 0 0-2.942-1.054c-2.459 0-3.864 1.581-3.864 5.049v13.129H37.46v-23.71h5.752v3.424A5.649 5.649 0 0 1 48.876 16a7.191 7.191 0 0 1 4.04 1.229zm2.5 5.4A12.129 12.129 0 0 1 64.99 15.739c7.113 0 12.163 5.049 12.163 12.074v2.5H58.711c.659 2.986 2.986 4.962 6.543 4.962a6.357 6.357 0 0 0 5.884-3.513l5.049 3.03c-2.5 3.688-6.059 5.62-11.109 5.62-7.684.003-12.294-5.134-12.294-12.204zM58.8 25.53h12.47c-.658-3.03-3.117-4.7-6.323-4.7a6.091 6.091 0 0 0-6.147 4.7zm19.847-9.308h4.259v-1.186c0-6.455 2.722-9.133 8.694-9.133h2.107v5.225h-1.713c-2.81 0-3.425.966-3.425 3.908v1.186h5.137v5.444H88.7v18.266h-5.8V21.666h-4.254zm16.2 11.855a12.139 12.139 0 0 1 12.383-12.338 12.338 12.338 0 1 1 0 24.676 11.96 11.96 0 0 1-12.382-12.338zm18.88 0a6.5 6.5 0 1 0-13 0 6.5 6.5 0 1 0 13 0zm14.051-.264l-8.562-11.591h7.113l5.05 7.288 5.181-7.288h6.981l-8.694 11.547 9.133 12.163h-7.069l-5.663-7.732-5.489 7.728h-7.069z" fill="#fff"/>
+  <path d="M180.394 23.377a7.41 7.41 0 0 0 4.266-6.948c0-5.189-3.958-8.532-9.938-8.532H161V40h14.161c6.068 0 10.158-3.43 10.158-9.059a7.71 7.71 0 0 0-4.925-7.564zM164.65 11.24h10.028c3.913 0 6.332 2.111 6.332 5.189s-2.111 5.365-6.025 5.365H164.65zm10.467 25.374H164.65V25.18h10.291c4.4 0 6.685 2.331 6.685 5.717 0 3.342-2.551 5.717-6.509 5.717zm18.032-15.876v-4.485h-3.474V40h3.562V26.983c0-5.233 2.286-7.52 6.244-7.52a5.2 5.2 0 0 1 2.9.748l1.5-3.43a7.754 7.754 0 0 0-3.957-.88 6.576 6.576 0 0 0-6.775 4.837zm23.22-4.968a12.192 12.192 0 0 0-12.312 12.357 12.335 12.335 0 1 0 24.669 0 12.2 12.2 0 0 0-12.357-12.357zm0 21.284a8.606 8.606 0 0 1-8.663-8.927 8.69 8.69 0 1 1 17.371 0 8.642 8.642 0 0 1-8.708 8.927zm41.3-2.112l-7.081-18.689h-3.342l-7.256 18.821-5.98-18.821h-3.782L238.009 40h3.517l7.3-18.821 7.3 18.821h3.255l8.219-23.747h-3.738zm22.649-8.663c-3.694-.747-6.552-1.231-6.552-3.693 0-2.2 1.5-3.782 5.145-3.782a7.664 7.664 0 0 1 6.509 3.166l2.99-2.023a11.481 11.481 0 0 0-9.5-4.221c-5.629-.044-8.839 3.21-8.839 6.9 0 4.749 4.354 5.849 8.444 6.64 3.473.7 6.727 1.231 6.727 3.87 0 2.375-1.934 4.133-5.629 4.133a8.772 8.772 0 0 1-7.651-3.87l-3.122 2.112c2.11 3.034 5.5 4.968 10.685 4.968 6.2.044 9.368-3.649 9.368-7.387-.002-4.877-4.493-6.021-8.578-6.813zM304.24 15.77a12.178 12.178 0 0 0-12.4 12.445c0 6.948 4.925 12.268 12.532 12.268a12.2 12.2 0 0 0 11.038-6.024l-3.078-1.8a8.489 8.489 0 0 1-7.96 4.573c-5.013 0-8.487-3.209-9.015-7.739h20.977v-1.631A11.714 11.714 0 0 0 304.24 15.77zm-8.8 10.553a8.822 8.822 0 0 1 8.8-7.344 8 8 0 0 1 8.4 7.344zM330.893 15.9a6.576 6.576 0 0 0-6.773 4.837v-4.484h-3.475V40h3.563V26.983c0-5.233 2.286-7.52 6.244-7.52a5.2 5.2 0 0 1 2.9.748l1.5-3.43a7.757 7.757 0 0 0-3.959-.881z" fill="#fff"/>
+</svg>
diff --git a/browser/branding/official/content/about.png b/browser/branding/official/content/about.png
new file mode 100644
index 0000000000..bec6b90de5
--- /dev/null
+++ b/browser/branding/official/content/about.png
diff --git a/browser/branding/official/content/aboutDialog.css b/browser/branding/official/content/aboutDialog.css
new file mode 100644
index 0000000000..5df20cc227
--- /dev/null
+++ b/browser/branding/official/content/aboutDialog.css
@@ -0,0 +1,52 @@
+/* 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-color: #20123a;
+  color: #fff;
+  color-scheme: dark;
+}
+
+#clientBox {
+  padding: 10px 0 15px;
+}
+
+#leftBox {
+  background-image: url("chrome://branding/content/about-logo.png");
+  background-repeat: no-repeat;
+  background-size: 192px auto;
+  background-position: center 20%;
+  /* min-width and min-height create room for the logo */
+  min-width: 210px;
+  min-height: 210px;
+  margin-top: 20px;
+  margin-inline-start: 30px;
+}
+
+@media (min-resolution: 2dppx) {
+  #leftBox {
+    background-image: url("chrome://branding/content/about-logo@2x.png");
+  }
+}
+
+.text-link {
+  color: #fff !important;
+  text-decoration: underline;
+}
+
+#rightBox {
+  margin-inline: 30px;
+}
+
+#bottomBox {
+  background-color: hsla(235, 43%, 10%, .5);
+  padding: 15px 10px 15px;
+}
+
+#trademark {
+  font-size: xx-small;
+  text-align: center;
+  color: #999999;
+  margin-block: 10px;
+}
diff --git a/browser/branding/official/content/firefox-wordmark.svg b/browser/branding/official/content/firefox-wordmark.svg
new file mode 100644
index 0000000000..65270a3cd9
--- /dev/null
+++ b/browser/branding/official/content/firefox-wordmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="172" height="42"><path fill="context-fill #20123a" d="M.19 2.82h25.72v7H7.57v9.43h18.34v6.9H7.57v15.14H.19zM34.65.13a4.14 4.14 0 0 1 4.27 4.33 4.12 4.12 0 0 1-4.32 4.32 4.09 4.09 0 0 1-4.27-4.22A4.27 4.27 0 0 1 34.65.13zM31 12.83h7.27v28.46H31zm28.35 7.91a5.89 5.89 0 0 0-3.53-1.27c-3 0-4.64 1.9-4.64 6.06v15.76H44V12.83h6.9v4.11a6.79 6.79 0 0 1 6.8-4.37A8.69 8.69 0 0 1 62.53 14zm3 6.48c0-8.17 6.06-15 14.65-15s14.59 6.06 14.59 14.49v3H69.48c.79 3.58 3.58 6 7.85 6a7.62 7.62 0 0 0 7.06-4.21l6.06 3.63c-3 4.43-7.27 6.75-13.33 6.75-9.22-.01-14.75-6.18-14.75-14.66zM69.59 24h15c-.79-3.63-3.74-5.63-7.59-5.63A7.31 7.31 0 0 0 69.59 24zM93.4 12.83h5.11v-1.42c0-7.75 3.27-11 10.44-11h2.53v6.31h-2.06c-3.37 0-4.11 1.16-4.11 4.69v1.42h6.17v6.54h-6v21.92h-7V19.37H93.4zm19.45 14.23a14.56 14.56 0 0 1 14.85-14.81 14.81 14.81 0 1 1 0 29.62c-8.85 0-14.85-6.49-14.85-14.81zm22.65 0a7.8 7.8 0 1 0-15.59 0 7.8 7.8 0 1 0 15.59 0zm16.86-.32l-10.27-13.91h8.53l6.06 8.75 6.22-8.75h8.38l-10.43 13.86 11 14.6h-8.49L156.53 32l-6.59 9.28h-8.48z"/></svg>
\ No newline at end of file
diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn
new file mode 100644
index 0000000000..d623a6a2b3
--- /dev/null
+++ b/browser/branding/official/content/jar.mn
@@ -0,0 +1,21 @@
+# 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-logo.png
+  content/branding/about-logo.svg
+  content/branding/about-logo@2x.png
+  content/branding/about-logo-private.png
+  content/branding/about-logo-private@2x.png
+  content/branding/about-wordmark.svg
+  content/branding/document.ico                  (../document.ico)
+  content/branding/firefox-wordmark.svg
+  content/branding/icon16.png                    (../default16.png)
+  content/branding/icon32.png                    (../default32.png)
+  content/branding/icon48.png                    (../default48.png)
+  content/branding/icon64.png                    (../default64.png)
+  content/branding/icon128.png                   (../default128.png)
+  content/branding/aboutDialog.css
diff --git a/browser/branding/official/content/moz.build b/browser/branding/official/content/moz.build
new file mode 100644
index 0000000000..d988c0ff9b
--- /dev/null
+++ b/browser/branding/official/content/moz.build
@@ -0,0 +1,7 @@
+# -*- 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"]
diff --git a/browser/branding/official/default128.png b/browser/branding/official/default128.png
new file mode 100644
index 0000000000..b92d78ca6d
--- /dev/null
+++ b/browser/branding/official/default128.png
diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png
new file mode 100644
index 0000000000..fe860e46b1
--- /dev/null
+++ b/browser/branding/official/default16.png
diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png
new file mode 100644
index 0000000000..3aff987a84
--- /dev/null
+++ b/browser/branding/official/default22.png
diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png
new file mode 100644
index 0000000000..cfce6e7d64
--- /dev/null
+++ b/browser/branding/official/default24.png
diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png
new file mode 100644
index 0000000000..ddc9d4db1f
--- /dev/null
+++ b/browser/branding/official/default256.png
diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png
new file mode 100644
index 0000000000..67042dbb2b
--- /dev/null
+++ b/browser/branding/official/default32.png
diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png
new file mode 100644
index 0000000000..765ea42459
--- /dev/null
+++ b/browser/branding/official/default48.png
diff --git a/browser/branding/official/default64.png b/browser/branding/official/default64.png
new file mode 100644
index 0000000000..39e7738902
--- /dev/null
+++ b/browser/branding/official/default64.png
diff --git a/browser/branding/official/disk.icns b/browser/branding/official/disk.icns
new file mode 100644
index 0000000000..4353ef0965
--- /dev/null
+++ b/browser/branding/official/disk.icns
diff --git a/browser/branding/official/document.icns b/browser/branding/official/document.icns
new file mode 100644
index 0000000000..50d9701405
--- /dev/null
+++ b/browser/branding/official/document.icns
diff --git a/browser/branding/official/document.ico b/browser/branding/official/document.ico
new file mode 100644
index 0000000000..fcec7dc156
--- /dev/null
+++ b/browser/branding/official/document.ico
diff --git a/browser/branding/official/document_pdf.ico b/browser/branding/official/document_pdf.ico
new file mode 100644
index 0000000000..d6fe7c5bde
--- /dev/null
+++ b/browser/branding/official/document_pdf.ico
diff --git a/browser/branding/official/dsstore b/browser/branding/official/dsstore
new file mode 100644
index 0000000000..8ea7036745
--- /dev/null
+++ b/browser/branding/official/dsstore
diff --git a/browser/branding/official/firefox.VisualElementsManifest.xml b/browser/branding/official/firefox.VisualElementsManifest.xml
new file mode 100644
index 0000000000..85e09dd7a9
--- /dev/null
+++ b/browser/branding/official/firefox.VisualElementsManifest.xml
@@ -0,0 +1,12 @@
+<!-- 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/. -->
+
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='browser\VisualElements\VisualElements_150.png'
+      Square70x70Logo='browser\VisualElements\VisualElements_70.png'
+      ForegroundText='light'
+      BackgroundColor='#20123a'/>
+</Application>
diff --git a/browser/branding/official/firefox.icns b/browser/branding/official/firefox.icns
new file mode 100644
index 0000000000..6e8ca8725f
--- /dev/null
+++ b/browser/branding/official/firefox.icns
diff --git a/browser/branding/official/firefox.ico b/browser/branding/official/firefox.ico
new file mode 100644
index 0000000000..d8ba663ba7
--- /dev/null
+++ b/browser/branding/official/firefox.ico
diff --git a/browser/branding/official/firefox64.ico b/browser/branding/official/firefox64.ico
new file mode 100644
index 0000000000..c3a32449d2
--- /dev/null
+++ b/browser/branding/official/firefox64.ico
diff --git a/browser/branding/official/locales/en-US/brand.ftl b/browser/branding/official/locales/en-US/brand.ftl
new file mode 100644
index 0000000000..8496cb22ff
--- /dev/null
+++ b/browser/branding/official/locales/en-US/brand.ftl
@@ -0,0 +1,27 @@
+# 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/.
+
+## Firefox and Mozilla Brand
+##
+## Firefox and Mozilla must be treated as a brand.
+##
+## They cannot be:
+## - Transliterated.
+## - Translated.
+##
+## Declension should be avoided where possible, leaving the original
+## brand unaltered in prominent UI positions.
+##
+## For further details, consult:
+## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark
+
+-brand-shorter-name = Firefox
+-brand-short-name = Firefox
+-brand-shortcut-name = Firefox
+-brand-full-name = Mozilla Firefox
+# This brand name can be used in messages where the product name needs to
+# remain unchanged across different versions (Nightly, Beta, etc.).
+-brand-product-name = Firefox
+-vendor-short-name = Mozilla
+trademarkInfo = Firefox and the Firefox logos are trademarks of the Mozilla Foundation.
diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties
new file mode 100644
index 0000000000..e199526902
--- /dev/null
+++ b/browser/branding/official/locales/en-US/brand.properties
@@ -0,0 +1,7 @@
+# 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
+brandFullName=Mozilla Firefox
diff --git a/browser/branding/official/locales/jar.mn b/browser/branding/official/locales/jar.mn
new file mode 100644
index 0000000000..2250233dd6
--- /dev/null
+++ b/browser/branding/official/locales/jar.mn
@@ -0,0 +1,11 @@
+#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/.
+
+[localization] @AB_CD@.jar:
+  branding                                          (%*.ftl)
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+  locale/branding/brand.properties (%brand.properties)
diff --git a/browser/branding/official/locales/moz.build b/browser/branding/official/locales/moz.build
new file mode 100644
index 0000000000..d988c0ff9b
--- /dev/null
+++ b/browser/branding/official/locales/moz.build
@@ -0,0 +1,7 @@
+# -*- 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"]
diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build
new file mode 100644
index 0000000000..dd081ac444
--- /dev/null
+++ b/browser/branding/official/moz.build
@@ -0,0 +1,13 @@
+# -*- 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/official/msix/Assets/Document44x44.png b/browser/branding/official/msix/Assets/Document44x44.png
new file mode 100644
index 0000000000..61d83ee39f
--- /dev/null
+++ b/browser/branding/official/msix/Assets/Document44x44.png
diff --git a/browser/branding/official/msix/Assets/LargeTile.scale-200.png b/browser/branding/official/msix/Assets/LargeTile.scale-200.png
new file mode 100644
index 0000000000..2e36cdfb1b
--- /dev/null
+++ b/browser/branding/official/msix/Assets/LargeTile.scale-200.png
diff --git a/browser/branding/official/msix/Assets/SmallTile.scale-200.png b/browser/branding/official/msix/Assets/SmallTile.scale-200.png
new file mode 100644
index 0000000000..16c23dabbf
--- /dev/null
+++ b/browser/branding/official/msix/Assets/SmallTile.scale-200.png
diff --git a/browser/branding/official/msix/Assets/Square150x150Logo.scale-200.png b/browser/branding/official/msix/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000000..3a8409e643
--- /dev/null
+++ b/browser/branding/official/msix/Assets/Square150x150Logo.scale-200.png
diff --git a/browser/branding/official/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/browser/branding/official/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
new file mode 100644
index 0000000000..9b370d66df
--- /dev/null
+++ b/browser/branding/official/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/browser/branding/official/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/browser/branding/official/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
new file mode 100644
index 0000000000..9b370d66df
--- /dev/null
+++ b/browser/branding/official/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/browser/branding/official/msix/Assets/Square44x44Logo.scale-200.png b/browser/branding/official/msix/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000000..74af40181a
--- /dev/null
+++ b/browser/branding/official/msix/Assets/Square44x44Logo.scale-200.png
diff --git a/browser/branding/official/msix/Assets/Square44x44Logo.targetsize-256.png b/browser/branding/official/msix/Assets/Square44x44Logo.targetsize-256.png
new file mode 100644
index 0000000000..15b9de5641
--- /dev/null
+++ b/browser/branding/official/msix/Assets/Square44x44Logo.targetsize-256.png
diff --git a/browser/branding/official/msix/Assets/StoreLogo.scale-200.png b/browser/branding/official/msix/Assets/StoreLogo.scale-200.png
new file mode 100644
index 0000000000..6e83ce4084
--- /dev/null
+++ b/browser/branding/official/msix/Assets/StoreLogo.scale-200.png
diff --git a/browser/branding/official/msix/Assets/Wide310x150Logo.scale-200.png b/browser/branding/official/msix/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000000..b37f47de6c
--- /dev/null
+++ b/browser/branding/official/msix/Assets/Wide310x150Logo.scale-200.png
diff --git a/browser/branding/official/newtab.ico b/browser/branding/official/newtab.ico
new file mode 100644
index 0000000000..a9b37c08c6
--- /dev/null
+++ b/browser/branding/official/newtab.ico
diff --git a/browser/branding/official/newwindow.ico b/browser/branding/official/newwindow.ico
new file mode 100644
index 0000000000..5537207710
--- /dev/null
+++ b/browser/branding/official/newwindow.ico
diff --git a/browser/branding/official/pbmode.ico b/browser/branding/official/pbmode.ico
new file mode 100644
index 0000000000..bfa3aa6ced
--- /dev/null
+++ b/browser/branding/official/pbmode.ico
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js
new file mode 100644
index 0000000000..2d6967ef6d
--- /dev/null
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -0,0 +1,47 @@
+/* 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/. */
+
+// This file contains branding-specific prefs.
+
+pref("startup.homepage_override_url", "");
+pref("startup.homepage_welcome_url", "about:welcome");
+pref("startup.homepage_welcome_url.additional", "");
+// Interval: Time between checks for a new version (in seconds)
+pref("app.update.interval", 43200); // 12 hours
+// Give the user x seconds to react before showing the big UI. default=192 hours
+pref("app.update.promptWaitTime", 691200);
+// app.update.url.manual: URL user can browse to manually if for some reason
+// all update installation attempts fail.
+// app.update.url.details: a default value for the "More information about this
+// update" link supplied in the "An update is available" page of the update
+// wizard.
+#if MOZ_UPDATE_CHANNEL == beta
+  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/beta?reason=manual-update");
+  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/beta/notes");
+  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
+  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
+#elifdef MOZ_ESR
+  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/enterprise?reason=manual-update");
+  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/organizations/notes");
+  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
+  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
+#else
+  pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/new?reason=manual-update");
+  pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes");
+  pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
+  pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog");
+#endif
+
+// 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", 63);
+
+// 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.
+// If this is less than 5, then pasting code into the web console is disabled
+pref("devtools.selfxss.count", 0);
diff --git a/browser/branding/official/private_browsing.VisualElementsManifest.xml b/browser/branding/official/private_browsing.VisualElementsManifest.xml
new file mode 100644
index 0000000000..fdff8c55ff
--- /dev/null
+++ b/browser/branding/official/private_browsing.VisualElementsManifest.xml
@@ -0,0 +1,12 @@
+<!-- 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/. -->
+
+<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <VisualElements
+      ShowNameOnSquare150x150Logo='on'
+      Square150x150Logo='browser\VisualElements\PrivateBrowsing_150.png'
+      Square70x70Logo='browser\VisualElements\PrivateBrowsing_70.png'
+      ForegroundText='light'
+      BackgroundColor='#14171a'/>
+</Application>
diff --git a/browser/branding/official/stubinstaller/bgstub.jpg b/browser/branding/official/stubinstaller/bgstub.jpg
new file mode 100644
index 0000000000..4d6240399c
--- /dev/null
+++ b/browser/branding/official/stubinstaller/bgstub.jpg
diff --git a/browser/branding/official/stubinstaller/installing_page.css b/browser/branding/official/stubinstaller/installing_page.css
new file mode 100644
index 0000000000..5704eb3b3e
--- /dev/null
+++ b/browser/branding/official/stubinstaller/installing_page.css
@@ -0,0 +1,87 @@
+/* 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/. */
+
+body {
+  color: black;
+}
+
+/*
+ * We want to treat the two pieces of text in the left column as one unit and
+   center that unit vertically in the window. In order to make IE8 do that,
+   we have to wrap the two bits of text in a container and make that a
+   table-cell (which means we need an outer container that's display: table).
+   So that's what this mess is doing.
+ */
+#text_column {
+  position: fixed;
+  height: 100%;
+  margin-left: 30px;
+  width: 40%;
+  display: table;
+}
+
+#text_column_container {
+  display: table-cell;
+  vertical-align: middle;
+  padding-top: 60px;
+}
+
+#header {
+  font-size: 24px;
+  font-weight: 800;
+  margin-top: 0;
+}
+
+#content {
+  font-size: 22px;
+}
+
+#installing {
+  position: fixed;
+  right: 30px;
+  bottom: 55%;
+  margin-top: auto;
+  margin-bottom: auto;
+  width: 35%;
+}
+
+#label {
+  color: white;
+
+  position: relative;
+  top: 50px;
+
+  text-align: center;
+  font-size: 20px;
+}
+
+#progress_background {
+  width: 100%;
+  height: 20px;
+  background-color: white;
+}
+
+body.high-contrast #progress_background {
+  outline: solid;
+}
+
+#progress_bar {
+  margin: 0;
+  width: 0%;
+  height: 100%;
+  background-color: #00AAFF;
+}
+
+/* In high contrast mode, fill the entire progress bar with its border. */
+body.high-contrast #progress_bar {
+  /* This border should be the height of progress_background. */
+  border-top: 20px solid;
+  box-sizing: border-box;
+}
+
+/* No blurb or footer for this layout. */
+#blurb,
+#footer {
+  visibility: hidden;
+}
diff --git a/browser/branding/official/stubinstaller/profile_cleanup_page.css b/browser/branding/official/stubinstaller/profile_cleanup_page.css
new file mode 100644
index 0000000000..a8dbad0e11
--- /dev/null
+++ b/browser/branding/official/stubinstaller/profile_cleanup_page.css
@@ -0,0 +1,75 @@
+/* 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/. */
+
+body {
+  color: black;
+}
+
+/*
+ * We want to treat the two pieces of text in the left column as one unit and
+   center that unit vertically in the window. In order to make IE8 do that,
+   we have to wrap the two bits of text in a container and make that a
+   table-cell (which means we need an outer container that's display: table).
+   So that's what this mess is doing.
+ */
+#profileRefreshForm {
+  position: fixed;
+  height: 100%;
+  margin-left: 30px;
+  width: 40%;
+  display: table;
+}
+
+#profileRefreshContainer {
+  display: table-cell;
+  vertical-align: middle;
+}
+
+#refreshCheckboxContainer,
+#refreshButtonContainer {
+  margin-top: 20px;
+}
+
+#header {
+  font-size: 25px;
+  font-weight: 600;
+}
+
+#refreshCheckboxContainer {
+  position: relative;
+}
+
+#refreshCheckbox {
+  position: absolute;
+  top: 1px;
+}
+
+#checkboxLabel {
+  font-size: 14px;
+  display: block;
+}
+
+.checkboxLabel-ltr {
+  margin-left: 25px;
+}
+
+.checkboxLabel-rtl {
+  margin-right: 25px;
+}
+
+#refreshButton {
+  padding: 8px 70px;
+  font-size: 16px;
+  background: #005ccc;
+  color: white;
+}
+
+body.normal-contrast #refreshButton {
+  border: none;
+}
+
+/* No footer for this layout. */
+#footer {
+  visibility: hidden;
+}
diff --git a/browser/branding/official/wizHeader.bmp b/browser/branding/official/wizHeader.bmp
new file mode 100644
index 0000000000..420824226d
--- /dev/null
+++ b/browser/branding/official/wizHeader.bmp
diff --git a/browser/branding/official/wizHeaderRTL.bmp b/browser/branding/official/wizHeaderRTL.bmp
new file mode 100644
index 0000000000..7f74929910
--- /dev/null
+++ b/browser/branding/official/wizHeaderRTL.bmp
diff --git a/browser/branding/official/wizWatermark.bmp b/browser/branding/official/wizWatermark.bmp
new file mode 100644
index 0000000000..b3b3c91d32
--- /dev/null
+++ b/browser/branding/official/wizWatermark.bmp