diff --git a/mozilla/xpfe/AppCores/src/makefile.win b/mozilla/xpfe/AppCores/src/makefile.win
index 0fd0fd9d8c6..be7a4656999 100644
--- a/mozilla/xpfe/AppCores/src/makefile.win
+++ b/mozilla/xpfe/AppCores/src/makefile.win
@@ -196,107 +196,110 @@ install:: $(DLL)
   $(MAKE_INSTALL) ..\xul\resources\ED_Underline.gif			$(DIST)\bin\res\toolbar
   $(MAKE_INSTALL) ..\xul\resources\ED_Undo.gif			$(DIST)\bin\res\toolbar
 
+  $(MAKE_INSTALL) ..\xul\resources\throbbingN.gif			$(DIST)\bin\res\throbber
 
 clobber::
 	rm -f $(DIST)\lib\$(MODULE).lib
 	rm -f $(DIST)\bin\components\$(MODULE).dll
-	rm -f $(DIST)\res\samples\MailAppShell.html
-	rm -f $(DIST)\res\samples\MailAppShellNoTB.html
-	rm -f $(DIST)\res\samples\MailFrame.html
-	rm -f $(DIST)\res\samples\MailToolbar.xml
-	rm -f $(DIST)\res\toolbar\Mail_SendMsg.gif
-	rm -f $(DIST)\res\toolbar\Mail_GetMsg.gif
-	rm -f $(DIST)\res\toolbar\Mail_Reply.gif
-	rm -f $(DIST)\res\toolbar\Mail_NewMsg.gif
-	rm -f $(DIST)\res\toolbar\Mail_Forward.gif
+	rm -f $(DIST)\bin\res\samples\MailAppShell.html
+	rm -f $(DIST)\bin\res\samples\MailAppShellNoTB.html
+	rm -f $(DIST)\bin\res\samples\MailFrame.html
+	rm -f $(DIST)\bin\res\samples\MailToolbar.xml
+	rm -f $(DIST)\bin\res\toolbar\Mail_SendMsg.gif
+	rm -f $(DIST)\bin\res\toolbar\Mail_GetMsg.gif
+	rm -f $(DIST)\bin\res\toolbar\Mail_Reply.gif
+	rm -f $(DIST)\bin\res\toolbar\Mail_NewMsg.gif
+	rm -f $(DIST)\bin\res\toolbar\Mail_Forward.gif
 
-	rm -f $(DIST)\res\samples\DialogAddrIcon.gif		
-	rm -f $(DIST)\res\samples\DialogAddrIcon_mo.gif	
-	rm -f $(DIST)\res\samples\DialogCompIcon.gif		
-	rm -f $(DIST)\res\samples\DialogCompIcon_mo.gif	
-	rm -f $(DIST)\res\samples\DialogMailIcon.gif		
-	rm -f $(DIST)\res\samples\DialogMailIcon_mo.gif	
-	rm -f $(DIST)\res\samples\DialogNavIcon.gif		
-	rm -f $(DIST)\res\samples\DialogNavIcon_mo.gif	
-	rm -f $(DIST)\res\samples\TB_Back.gif			
-	rm -f $(DIST)\res\samples\TB_Back_dis.gif		
-	rm -f $(DIST)\res\samples\TB_Back_mo.gif			
-	rm -f $(DIST)\res\samples\TB_Bookmarks.gif		
-	rm -f $(DIST)\res\samples\TB_Bookmarks_mo.gif	
-	rm -f $(DIST)\res\samples\TB_Edit.gif			
-	rm -f $(DIST)\res\samples\TB_Forward.gif			
-	rm -f $(DIST)\res\samples\TB_Forward_dis.gif		
-	rm -f $(DIST)\res\samples\TB_Forward_mo.gif		
-	rm -f $(DIST)\res\samples\TB_Home.gif			
-	rm -f $(DIST)\res\samples\TB_Home_mo.gif			
-	rm -f $(DIST)\res\samples\TB_HTab.gif			
-	rm -f $(DIST)\res\samples\TB_HTab_mo.gif			
-	rm -f $(DIST)\res\samples\TB_LoadImages.gif		
-	rm -f $(DIST)\res\samples\TB_LoadImages.mo.gif	
-	rm -f $(DIST)\res\samples\TB_Location.gif		
-	rm -f $(DIST)\res\samples\TB_Location_mo.gif		
-	rm -f $(DIST)\res\samples\TB_MiniAddr.gif		
-	rm -f $(DIST)\res\samples\TB_MiniComp.gif		
-	rm -f $(DIST)\res\samples\TB_MiniMail.gif		
-	rm -f $(DIST)\res\samples\TB_MiniNav.gif			
-	rm -f $(DIST)\res\samples\TB_MiniTab.gif			
-	rm -f $(DIST)\res\samples\TB_MixSecurity.gif		
-	rm -f $(DIST)\res\samples\TB_MixSecurity.mo.gif	
-	rm -f $(DIST)\res\samples\TB_Netscape.gif		
-	rm -f $(DIST)\res\samples\TB_Netscape_mo.gif		
-	rm -f $(DIST)\res\samples\TB_PersonalIcon.gif	
-	rm -f $(DIST)\res\samples\TB_Places.gif			
-	rm -f $(DIST)\res\samples\TB_Places_mo.gif
-	rm -f $(DIST)\res\samples\TB_popup.gif		
-	rm -f $(DIST)\res\samples\TB_Print.gif			
-	rm -f $(DIST)\res\samples\TB_Print_mo.gif		
-	rm -f $(DIST)\res\samples\TB_Reload.gif			
-	rm -f $(DIST)\res\samples\TB_Reload_mo.gif		
-	rm -f $(DIST)\res\samples\TB_Search.gif			
-	rm -f $(DIST)\res\samples\TB_Search_mo.gif		
-	rm -f $(DIST)\res\samples\TB_Secure.gif			
-	rm -f $(DIST)\res\samples\TB_Secure_mo.gif		
-	rm -f $(DIST)\res\samples\TB_Stop.gif			
-	rm -f $(DIST)\res\samples\TB_Stop.mo.gif			
-	rm -f $(DIST)\res\samples\TB_Stop_dis.gif		
-	rm -f $(DIST)\res\samples\TB_Stop_mo.gif			
-	rm -f $(DIST)\res\samples\TB_Tab.gif				
-	rm -f $(DIST)\res\samples\TB_TabSmall.gif		
-	rm -f $(DIST)\res\samples\TB_TabSmall_mo.gif		
-	rm -f $(DIST)\res\samples\TB_Tab_mo.gif			
-	rm -f $(DIST)\res\samples\TB_Unsecure.gif		
-	rm -f $(DIST)\res\samples\TB_Unsecure.mo.gif		
-	rm -f $(DIST)\res\samples\TB_WhatsRelated.gif	
-	rm -f $(DIST)\res\samples\TB_WhatsRelated_mo.gif 
-	rm -f $(DIST)\res\samples\StatusBar-insecure.gif 
-	rm -f $(DIST)\res\samples\StatusBar-secure.gif	
-	rm -f $(DIST)\res\samples\TB_NewBack.gif	
-	rm -f $(DIST)\res\samples\TB_NewForward.gif	
-	rm -f $(DIST)\res\samples\TB_NewReload.gif	
-	rm -f $(DIST)\res\samples\TB_NewStop.gif	
-	rm -f $(DIST)\res\samples\TB_NewHome.gif	
-	rm -f $(DIST)\res\samples\TB_NewPrint.gif	
+	rm -f $(DIST)\bin\res\samples\DialogAddrIcon.gif		
+	rm -f $(DIST)\bin\res\samples\DialogAddrIcon_mo.gif	
+	rm -f $(DIST)\bin\res\samples\DialogCompIcon.gif		
+	rm -f $(DIST)\bin\res\samples\DialogCompIcon_mo.gif	
+	rm -f $(DIST)\bin\res\samples\DialogMailIcon.gif		
+	rm -f $(DIST)\bin\res\samples\DialogMailIcon_mo.gif	
+	rm -f $(DIST)\bin\res\samples\DialogNavIcon.gif		
+	rm -f $(DIST)\bin\res\samples\DialogNavIcon_mo.gif	
+	rm -f $(DIST)\bin\res\samples\TB_Back.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Back_dis.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Back_mo.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Bookmarks.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Bookmarks_mo.gif	
+	rm -f $(DIST)\bin\res\samples\TB_Edit.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Forward.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Forward_dis.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Forward_mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Home.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Home_mo.gif			
+	rm -f $(DIST)\bin\res\samples\TB_HTab.gif			
+	rm -f $(DIST)\bin\res\samples\TB_HTab_mo.gif			
+	rm -f $(DIST)\bin\res\samples\TB_LoadImages.gif		
+	rm -f $(DIST)\bin\res\samples\TB_LoadImages.mo.gif	
+	rm -f $(DIST)\bin\res\samples\TB_Location.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Location_mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_MiniAddr.gif		
+	rm -f $(DIST)\bin\res\samples\TB_MiniComp.gif		
+	rm -f $(DIST)\bin\res\samples\TB_MiniMail.gif		
+	rm -f $(DIST)\bin\res\samples\TB_MiniNav.gif			
+	rm -f $(DIST)\bin\res\samples\TB_MiniTab.gif			
+	rm -f $(DIST)\bin\res\samples\TB_MixSecurity.gif		
+	rm -f $(DIST)\bin\res\samples\TB_MixSecurity.mo.gif	
+	rm -f $(DIST)\bin\res\samples\TB_Netscape.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Netscape_mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_PersonalIcon.gif	
+	rm -f $(DIST)\bin\res\samples\TB_Places.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Places_mo.gif
+	rm -f $(DIST)\bin\res\samples\TB_popup.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Print.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Print_mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Reload.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Reload_mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Search.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Search_mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Secure.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Secure_mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Stop.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Stop.mo.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Stop_dis.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Stop_mo.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Tab.gif				
+	rm -f $(DIST)\bin\res\samples\TB_TabSmall.gif		
+	rm -f $(DIST)\bin\res\samples\TB_TabSmall_mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Tab_mo.gif			
+	rm -f $(DIST)\bin\res\samples\TB_Unsecure.gif		
+	rm -f $(DIST)\bin\res\samples\TB_Unsecure.mo.gif		
+	rm -f $(DIST)\bin\res\samples\TB_WhatsRelated.gif	
+	rm -f $(DIST)\bin\res\samples\TB_WhatsRelated_mo.gif 
+	rm -f $(DIST)\bin\res\samples\StatusBar-insecure.gif 
+	rm -f $(DIST)\bin\res\samples\StatusBar-secure.gif	
+	rm -f $(DIST)\bin\res\samples\TB_NewBack.gif	
+	rm -f $(DIST)\bin\res\samples\TB_NewForward.gif	
+	rm -f $(DIST)\bin\res\samples\TB_NewReload.gif	
+	rm -f $(DIST)\bin\res\samples\TB_NewStop.gif	
+	rm -f $(DIST)\bin\res\samples\TB_NewHome.gif	
+	rm -f $(DIST)\bin\res\samples\TB_NewPrint.gif	
   
-  rm -f $(DIST)\res\samples\ED_Bold.gif			
-	rm -f $(DIST)\res\samples\ED_Bullets.gif			
-	rm -f $(DIST)\res\samples\ED_Center.gif			
-	rm -f $(DIST)\res\samples\ED_ClearStyle.gif			
-	rm -f $(DIST)\res\samples\ED_Copy.gif			
-	rm -f $(DIST)\res\samples\ED_Cut.gif			
-	rm -f $(DIST)\res\samples\ED_Dedent.gif			
-	rm -f $(DIST)\res\samples\ED_Find.gif			
-	rm -f $(DIST)\res\samples\ED_HLine.gif			
-	rm -f $(DIST)\res\samples\ED_Image.gif			
-  rm -f $(DIST)\res\samples\ED_Indent.gif			
-  rm -f $(DIST)\res\samples\ED_Italic.gif			
-  rm -f $(DIST)\res\samples\ED_Left.gif			
-  rm -f $(DIST)\res\samples\ED_Link.gif			
-  rm -f $(DIST)\res\samples\ED_Numbers.gif			
-  rm -f $(DIST)\res\samples\ED_Paste.gif			
-  rm -f $(DIST)\res\samples\ED_Right.gif			
-  rm -f $(DIST)\res\samples\ED_Spell.gif			
-  rm -f $(DIST)\res\samples\ED_Table.gif			
-  rm -f $(DIST)\res\samples\ED_Target.gif			
-  rm -f $(DIST)\res\samples\ED_Underline.gif			
-  rm -f $(DIST)\res\samples\ED_Undo.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Bold.gif			
+	rm -f $(DIST)\bin\res\samples\ED_Bullets.gif			
+	rm -f $(DIST)\bin\res\samples\ED_Center.gif			
+	rm -f $(DIST)\bin\res\samples\ED_ClearStyle.gif			
+	rm -f $(DIST)\bin\res\samples\ED_Copy.gif			
+	rm -f $(DIST)\bin\res\samples\ED_Cut.gif			
+	rm -f $(DIST)\bin\res\samples\ED_Dedent.gif			
+	rm -f $(DIST)\bin\res\samples\ED_Find.gif			
+	rm -f $(DIST)\bin\res\samples\ED_HLine.gif			
+	rm -f $(DIST)\bin\res\samples\ED_Image.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Indent.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Italic.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Left.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Link.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Numbers.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Paste.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Right.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Spell.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Table.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Target.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Underline.gif			
+  rm -f $(DIST)\bin\res\samples\ED_Undo.gif			
+  
+  rm -f $(DIST)\bin\res\throbber\throbbingN.gif