diff -r 0dd4ede5105c -r 73640b76d6c3 firefox-branded-icons.patch
--- a/firefox-branded-icons.patch	Tue Mar 19 09:18:24 2013 +0100
+++ b/firefox-branded-icons.patch	Mon Mar 25 23:57:09 2013 +0100
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent 716c063a34dc33046c36b49e3bd2b4ec867d2b5b
+# Parent ad0e2fcaa00769bc56cc2b58d1264209f8c32623
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -131,16 +131,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
+@@ -132,16 +132,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
  endif
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -29,14 +29,14 @@
 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
-@@ -42,18 +42,21 @@ OSX_BRANDING_FILES = \
- 	firefox.icns \
- 	disk.icns \
+@@ -47,18 +47,21 @@ BRANDING_FILES := \
  	document.icns \
  	dsstore \
  	$(NULL)
+ endif
  
- LINUX_BRANDING_FILES = \
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ BRANDING_FILES := \
  	default16.png \
 +	default22.png \
 +	default24.png \
@@ -45,34 +45,34 @@
 +	default256.png \
  	mozicon128.png \
  	$(NULL)
+ endif
  
- OS2_BRANDING_FILES = \
+ ifeq ($(OS_ARCH),OS2)
+ BRANDING_FILES := \
  	firefox-os2.ico \
  	document-os2.ico \
- 	$(NULL)
- 
 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
-@@ -552,18 +552,21 @@
- @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@@ -558,18 +558,21 @@
+ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  #ifdef SHIP_FEEDBACK
- @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
+ @BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi
  #endif
  @BINPATH@/chrome/toolkit@JAREXT@
  @BINPATH@/chrome/toolkit.manifest
  #ifdef MOZ_GTK2
- @BINPATH@/chrome/icons/default/default16.png
-+@BINPATH@/chrome/icons/default/default22.png
-+@BINPATH@/chrome/icons/default/default24.png
- @BINPATH@/chrome/icons/default/default32.png
- @BINPATH@/chrome/icons/default/default48.png
-+@BINPATH@/chrome/icons/default/default256.png
+ @BINPATH@/browser/chrome/icons/default/default16.png
++@BINPATH@/browser/chrome/icons/default/default22.png
++@BINPATH@/browser/chrome/icons/default/default24.png
+ @BINPATH@/browser/chrome/icons/default/default32.png
+ @BINPATH@/browser/chrome/icons/default/default48.png
++@BINPATH@/browser/chrome/icons/default/default256.png
  #endif
  
  ; shell icons
  #ifdef XP_UNIX
  #ifndef XP_MACOSX
- @BINPATH@/icons/*.xpm
- @BINPATH@/icons/*.png
- #endif
+ ; shell icons
+ @BINPATH@/browser/icons/*.png
+ #ifdef MOZ_UPDATER