diff -r 3af93b7e5e3d -r 284da266ec46 firefox-branded-icons.patch
--- a/firefox-branded-icons.patch	Sat Jul 18 14:48:41 2015 +0200
+++ b/firefox-branded-icons.patch	Sat Jul 18 15:01:59 2015 +0200
@@ -1,10 +1,11 @@
 # HG changeset patch
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
+# Parent  d938107fbc91e13c9cc60be7de200fe891826ca1
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -62,16 +62,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
+@@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
  endif
  
  ifdef MOZ_WIDGET_GTK
@@ -26,37 +27,31 @@
  	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
  	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
  endif
-diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
---- a/browser/branding/official/Makefile.in
-+++ b/browser/branding/official/Makefile.in
-@@ -35,18 +35,21 @@ BRANDING_FILES := \
- 	document.icns \
- 	dsstore \
- 	$(NULL)
- endif
- 
- ifdef MOZ_WIDGET_GTK
- BRANDING_FILES := \
- 	default16.png \
-+	default22.png \
-+	default24.png \
- 	default32.png \
- 	default48.png \
-+	default256.png \
- 	mozicon128.png \
- 	$(NULL)
- endif
- 
- BRANDING_DEST := $(DIST)/branding
- BRANDING_TARGET := export
- INSTALL_TARGETS += BRANDING
- 
+diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
+--- a/browser/branding/branding-common.mozbuild
++++ b/browser/branding/branding-common.mozbuild
+@@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+         'disk.icns',
+         'document.icns',
+         'dsstore',
+         'firefox.icns',
+     ]
+ elif CONFIG['MOZ_WIDGET_GTK']:
+     BRANDING_FILES += [
+         'default16.png',
++	'default22.png',
++	'default24.png',
+         'default32.png',
+         'default48.png',
++	'default256.png',
+         'mozicon128.png',
+     ]
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -654,18 +654,21 @@
+@@ -669,18 +669,21 @@
+ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
- @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @RESPATH@/chrome/toolkit@JAREXT@
  @RESPATH@/chrome/toolkit.manifest
  @RESPATH@/chrome/recording.manifest