--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -262,31 +262,42 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 ICON_DIR=gtk
 else
 ICON_DIR=$(MOZ_WIDGET_TOOLKIT)
 endif
 
 DESKTOP_ICONS = \
 	abcardWindow \
 	addressbookWindow \
-	messengerWindow \
 	msgcomposeWindow \
 	$(NULL) 
 
+BRANDED_ICONS = \
+	messengerWindow \
+	$(NULL)
+
 ifeq ($(ICON_DIR),gtk)
 DESKTOP_ICONS_SMALL=$(patsubst %,%16,$(DESKTOP_ICONS))
+BRANDED_ICONS_SMALL=$(patsubst %,%16,$(BRANDED_ICONS))
 endif
 
 DESKTOP_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(DESKTOP_ICONS) $(DESKTOP_ICONS_SMALL))
+BRANDED_ICON_FILES = $(addsuffix $(ICON_SUFFIX), $(BRANDED_ICONS) $(BRANDED_ICONS_SMALL))
 
 libs:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
 	$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
 
+libs:: $(addprefix $(DIST)/branding/,$(BRANDED_ICON_FILES))
+	$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
+
 install:: $(addprefix icons/$(ICON_DIR)/,$(DESKTOP_ICON_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
+
+install:: $(addprefix $(DIST)/branding,$(BRANDED_ICON_FILES))
+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
 	$(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default

--- a/mail/branding/nightly/Makefile.in
+++ b/mail/branding/nightly/Makefile.in
@@ -69,8 +69,19 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_
 	cp $(srcdir)/license.r         $(DIST)/branding/license.r
 	cp $(srcdir)/thunderbird.icns  $(DIST)/branding/thunderbird.icns
 endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 	cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm
 	cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm
 	cp $(srcdir)/default.xpm   $(DIST)/branding/default.xpm	
 endif
+# Now sort out the branding specific icons
+ifeq ($(OS_ARCH),WINNT)
+	cp $(srcdir)/windows/messengerWindow.ico  $(DIST)/branding/messengerWindow.ico
+endif
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+	cp $(srcdir)/gtk/messengerWindow.xpm  $(DIST)/branding/messengerWindow.xpm
+	cp $(srcdir)/gtk/messengerWindow16.xpm  $(DIST)/branding/messengerWindow16.xpm
+endif
+ifeq ($(OS_ARCH),OS2)
+	cp $(srcdir)/os2/messengerWindow.ico  $(DIST)/branding/messengerWindow.ico
+endif

rename from mail/app/icons/gtk/messengerWindow.xpm
rename to mail/branding/nightly/gtk/messengerWindow.xpm

rename from mail/app/icons/gtk/messengerWindow16.xpm
rename to mail/branding/nightly/gtk/messengerWindow16.xpm

rename from mail/app/icons/os2/messengerWindow.ico
rename to mail/branding/nightly/os2/messengerWindow.ico

rename from mail/app/icons/windows/messengerWindow.ico
rename to mail/branding/nightly/windows/messengerWindow.ico

--- a/other-licenses/branding/thunderbird/Makefile.in
+++ b/other-licenses/branding/thunderbird/Makefile.in
@@ -41,23 +41,19 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 	cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm
 	cp $(srcdir)/default.xpm   $(DIST)/branding/default.xpm	
 endif
 ifeq ($(OS_ARCH),OS2)
 	cp $(srcdir)/thunderbird-os2.ico  $(DIST)/branding/thunderbird.ico
 	cp $(srcdir)/thunderbird-os2.ico  $(DIST)/branding/app.ico
 endif
 # Now sort out the branding specific icons
-	$(NSINSTALL) -D $(DIST)/mail/app/icons
 ifeq ($(OS_ARCH),WINNT)
-	$(NSINSTALL) -D $(DIST)/mail/app/icons/windows
-	cp $(srcdir)/thunderbird.ico  $(DEPTH)/mail/app/icons/windows/messengerWindow.ico
+	cp $(srcdir)/thunderbird.ico  $(DIST)/branding/messengerWindow.ico
 endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-	$(NSINSTALL) -D $(DIST)/mail/app/icons/gtk
-	cp $(srcdir)/mozicon50.xpm  $(DEPTH)/mail/app/icons/gtk/messengerWindow.xpm
-	cp $(srcdir)/mozicon16.xpm  $(DEPTH)/mail/app/icons/gtk/messengerWindow16.xpm
+	cp $(srcdir)/mozicon50.xpm  $(DIST)/branding/messengerWindow.xpm
+	cp $(srcdir)/mozicon16.xpm  $(DIST)/branding/messengerWindow16.xpm
 endif
 ifeq ($(OS_ARCH),OS2)
-	$(NSINSTALL) -D $(DIST)/mail/app/icons/os2
-	cp $(srcdir)/thunderbird-os2.ico  $(DEPTH)/mail/app/icons/os2/messengerWindow.ico
+	cp $(srcdir)/thunderbird-os2.ico  $(DIST)/branding/messengerWindow.ico
 endif