diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 8765a85a7c7d..1a2442b30562 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -98,6 +98,7 @@ tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) $(objdir)/macbuild/Contents/MacOS-
rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
$(RM) '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)'
rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'
+ cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/Assets.car '$(dist_dest)/Contents/Resources/Assets.car'
cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'
cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(dist_dest)/Contents/Resources/document.icns'
$(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'
diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in
index 0ec61b9d110b..7a2584294912 100644
--- a/browser/app/macbuild/Contents/Info.plist.in
+++ b/browser/app/macbuild/Contents/Info.plist.in
@@ -190,6 +190,8 @@
@MAC_APP_NAME@ @APP_VERSION@
CFBundleIconFile
firefox.icns
+ CFBundleIconName
+ Waterfox
CFBundleIdentifier
@MOZ_MACBUNDLE_ID@
CFBundleInfoDictionaryVersion
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 662b0ba39a38..5c20e7a79f4e 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -40,6 +40,7 @@
#endif
@APPNAME@/Contents/Frameworks
@APPNAME@/Contents/PkgInfo
+@RESPATH@/Assets.car
@RESPATH@/firefox.icns
@RESPATH@/document.icns
@RESPATH@/@LPROJ_ROOT@.lproj/*
diff --git a/browser/moz.configure b/browser/moz.configure
index 53249bb27f46..ad8162ae1416 100644
--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -12,7 +12,6 @@ imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False)
imply_option("MOZ_NORMANDY", False)
imply_option("MOZ_PROFILE_MIGRATOR", True)
-
imply_option("MOZ_APP_VENDOR", "BrowserWorks")
imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
# Include the DevTools client, not just the server (which is the default)
@@ -70,3 +69,4 @@ def requires_stub_installer(
imply_option("MOZ_STUB_INSTALLER", True, when=requires_stub_installer)
include("../toolkit/moz.configure")
+include("../waterfox/moz.configure")
diff --git a/waterfox/browser/branding/Assets.car b/waterfox/browser/branding/Assets.car
new file mode 100644
index 000000000000..3ebcadf7b964
Binary files /dev/null and b/waterfox/browser/branding/Assets.car differ
diff --git a/waterfox/browser/branding/PrivateBrowsing_150.png b/waterfox/browser/branding/PrivateBrowsing_150.png
new file mode 100644
index 000000000000..da83daa23062
Binary files /dev/null and b/waterfox/browser/branding/PrivateBrowsing_150.png differ
diff --git a/waterfox/browser/branding/PrivateBrowsing_70.png b/waterfox/browser/branding/PrivateBrowsing_70.png
new file mode 100644
index 000000000000..e053a26179f5
Binary files /dev/null and b/waterfox/browser/branding/PrivateBrowsing_70.png differ
diff --git a/waterfox/browser/branding/VisualElements_150.png b/waterfox/browser/branding/VisualElements_150.png
index 828ef6828456..3de159dced05 100644
Binary files a/waterfox/browser/branding/VisualElements_150.png and b/waterfox/browser/branding/VisualElements_150.png differ
diff --git a/waterfox/browser/branding/VisualElements_70.png b/waterfox/browser/branding/VisualElements_70.png
index dbba4a3f97b3..4e465dfe0a19 100644
Binary files a/waterfox/browser/branding/VisualElements_70.png and b/waterfox/browser/branding/VisualElements_70.png differ
diff --git a/waterfox/browser/branding/background.png b/waterfox/browser/branding/background.png
index 5f8b443d3151..9009d985bbc9 100644
Binary files a/waterfox/browser/branding/background.png and b/waterfox/browser/branding/background.png differ
diff --git a/waterfox/browser/branding/branding-common.mozbuild b/waterfox/browser/branding/branding-common.mozbuild
index 70d2d34749a0..674dd158267c 100644
--- a/waterfox/browser/branding/branding-common.mozbuild
+++ b/waterfox/browser/branding/branding-common.mozbuild
@@ -13,8 +13,11 @@ def Branding():
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
FINAL_TARGET_FILES['..'] += [
'firefox.VisualElementsManifest.xml',
+ 'private_browsing.VisualElementsManifest.xml',
]
FINAL_TARGET_FILES.VisualElements += [
+ 'PrivateBrowsing_150.png',
+ 'PrivateBrowsing_70.png',
'VisualElements_150.png',
'VisualElements_70.png',
]
diff --git a/waterfox/browser/branding/configure.sh b/waterfox/browser/branding/configure.sh
index 9aee99074089..02163744fd71 100644
--- a/waterfox/browser/branding/configure.sh
+++ b/waterfox/browser/branding/configure.sh
@@ -3,25 +3,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
MOZ_APP_DISPLAYNAME=Waterfox
-MOZ_APP_NAME=Waterfox
-MOZ_APP_PROFILE=Waterfox
-MOZ_APP_VENDOR="BrowserWorks"
+MOZ_APP_NAME=waterfox
MOZ_DISTRIBUTION_ID=net.waterfox
MOZ_INCLUDE_SOURCE_INFO=1
MOZ_REQUIRE_SIGNING=
MOZ_TELEMETRY_REPORTING=
-MOZ_APP_UA_NAME="Firefox"
-
-if test "$MOZ_UPDATE_CHANNEL" = "beta"; then
- # Official beta builds
- MOZ_ASYNCIHANDLERCONTROL_IID="d4d2d920-5d8d-46b0-8169-6c75518fd6e8"
- MOZ_HANDLER_CLSID="bb83e31f-4bed-47ec-9edb-cd328ce4c65a"
- MOZ_IGECKOBACKCHANNEL_IID="3248b994-9ae6-4eb6-81c7-f50c95ad9e9d"
- MOZ_IHANDLERCONTROL_IID="eced8a70-3d19-4d40-b4eb-726231285528"
-else
- # Official release/esr builds
- MOZ_ASYNCIHANDLERCONTROL_IID="fb2703de-e41b-4565-a50b-777f44879c65"
- MOZ_HANDLER_CLSID="af069df1-ed1c-4994-9097-8c033d09539c"
- MOZ_IGECKOBACKCHANNEL_IID="6f2c203c-73b4-4f74-8a79-1e99202815e3"
- MOZ_IHANDLERCONTROL_IID="713883ba-0f4e-481e-823e-e1cb9a7a283c"
-fi
+MOZ_ASYNCIHANDLERCONTROL_IID="fb2703de-e41b-4565-a50b-777f44879c65"
+MOZ_HANDLER_CLSID="af069df1-ed1c-4994-9097-8c033d09539c"
+MOZ_IGECKOBACKCHANNEL_IID="6f2c203c-73b4-4f74-8a79-1e99202815e3"
+MOZ_IHANDLERCONTROL_IID="713883ba-0f4e-481e-823e-e1cb9a7a283c"
diff --git a/waterfox/browser/branding/content/about-logo-private.png b/waterfox/browser/branding/content/about-logo-private.png
new file mode 100644
index 000000000000..ebb139302dd8
Binary files /dev/null and b/waterfox/browser/branding/content/about-logo-private.png differ
diff --git a/waterfox/browser/branding/content/about-logo-private@2x.png b/waterfox/browser/branding/content/about-logo-private@2x.png
new file mode 100644
index 000000000000..85a182526e22
Binary files /dev/null and b/waterfox/browser/branding/content/about-logo-private@2x.png differ
diff --git a/waterfox/browser/branding/content/about-logo.png b/waterfox/browser/branding/content/about-logo.png
index 4c962f79782e..656881f07199 100644
Binary files a/waterfox/browser/branding/content/about-logo.png and b/waterfox/browser/branding/content/about-logo.png differ
diff --git a/waterfox/browser/branding/content/about-logo.svg b/waterfox/browser/branding/content/about-logo.svg
index 531737bcdd14..38393b850522 100644
--- a/waterfox/browser/branding/content/about-logo.svg
+++ b/waterfox/browser/branding/content/about-logo.svg
@@ -1,42891 +1 @@
-
-
-
-
+
diff --git a/waterfox/browser/branding/content/about-logo@2x.png b/waterfox/browser/branding/content/about-logo@2x.png
index 01ea8c399440..ec9501eaed0a 100644
Binary files a/waterfox/browser/branding/content/about-logo@2x.png and b/waterfox/browser/branding/content/about-logo@2x.png differ
diff --git a/waterfox/browser/branding/content/about-wordmark.svg b/waterfox/browser/branding/content/about-wordmark.svg
index 63f3b8c4aa52..72fbe2bc287b 100644
--- a/waterfox/browser/branding/content/about-wordmark.svg
+++ b/waterfox/browser/branding/content/about-wordmark.svg
@@ -1,13 +1,11 @@
-
-