--- a/calendar/installer/removed-files.in
+++ b/calendar/installer/removed-files.in
@@ -429,8 +429,14 @@ js/calWeekPrinter.js
 
 # Bug 462773 drop JSON.jsm
 modules/JSON.jsm
 
 # Bug 439620
 calendar-js/calProviderBase.js
 calendar-js/calProviderUtils.js
 calendar-js/calAuthUtils.js
+
+#ifndef MOZILLA_1_9_1_BRANCH
+# Bug 420811 replace loading and broken image GIFs with PNGs
+res/broken-image.gif
+res/loading-image.gif
+#endif

--- a/calendar/installer/windows/packages-static
+++ b/calendar/installer/windows/packages-static
@@ -307,18 +307,23 @@ bin\res\ua.css
 bin\res\html.css
 bin\res\quirk.css
 bin\res\forms.css
 bin\res\svg.css
 
 bin\res\arrowd.gif
 bin\res\viewsource.css
 bin\res\arrow.gif
+#ifdef MOZILLA_1_9_1_BRANCH
 bin\res\loading-image.gif
 bin\res\broken-image.gif
+#else
+bin\res\loading-image.png
+bin\res\broken-image.png
+#endif
 bin\res\fonts\*
 bin\res\dtd\*
 bin\res\html\*
 bin\res\wincharset.properties
 bin\res\charsetalias.properties
 bin\res\charsetData.properties
 bin\res\langGroups.properties
 bin\res\language.properties

--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -243,16 +243,20 @@ components/palmSync.xpt
 uninstall/UninstallThunderbird.exe
 uninstall/uninst.exe
 uninstall/uninstall.exe
 components/myspell/en-US.dic
 components/myspell/en-US.aff
 regxpcom.exe
 components/xmlextras.xpt
 res/cmessage.txt
+#ifndef MOZILLA_1_9_1_BRANCH
+res/broken-image.gif
+res/loading-image.gif
+#endif
 res/html/gopher-audio.gif
 res/html/gopher-binary.gif
 res/html/gopher-find.gif
 res/html/gopher-image.gif
 res/html/gopher-menu.gif
 res/html/gopher-movie.gif
 res/html/gopher-sound.gif
 res/html/gopher-telnet.gif

--- a/mail/installer/windows/packages-static
+++ b/mail/installer/windows/packages-static
@@ -413,21 +413,26 @@ bin\res\charsetData.properties
 bin\res\charsetalias.properties
 bin\res\langGroups.properties
 bin\res\language.properties
 bin\res\wincharset.properties
 bin\res\entityTables\*
 bin\res\dtd\*
 bin\res\arrow.gif
 bin\res\arrowd.gif
-bin\res\broken-image.gif
 bin\res\contenteditable.css
 bin\res\designmode.css
+bin\res\html\folder.png
+#ifdef MOZILLA_1_9_1_BRANCH
+bin\res\broken-image.gif
 bin\res\loading-image.gif
-bin\res\html\folder.png
+#else
+bin\res\broken-image.png
+bin\res\loading-image.png
+#endif
 
 ; editor resource files
 bin\res\EditorOverride.css
 bin\res\grabber.gif
 bin\res\table-add-column-after-active.gif
 bin\res\table-add-column-after-hover.gif
 bin\res\table-add-column-after.gif
 bin\res\table-add-column-before-active.gif

--- a/mailnews/mime/src/mimemoz2.cpp
+++ b/mailnews/mime/src/mimemoz2.cpp
@@ -1188,17 +1188,21 @@ mime_image_make_image_html(void *image_c
   const char *url;
   char *buf;
 
   PR_ASSERT(mid);
   if (!mid) return 0;
 
   /* Internal-external-reconnect only works when going to the screen. */
   if (!mid->istream)
+#ifdef MOZILLA_1_9_1_BRANCH
     return strdup("<P><CENTER><IMG SRC=\"resource://gre/res/loading-image.gif\" ALT=\"[Image]\"></CENTER><P>");
+#else
+    return strdup("<P><CENTER><IMG SRC=\"resource://gre/res/loading-image.png\" ALT=\"[Image]\"></CENTER><P>");
+#endif
 
   nsCOMPtr<nsIPrefBranch> prefBranch;
   nsCOMPtr<nsIPrefService> prefSvc(do_GetService(NS_PREFSERVICE_CONTRACTID));
   PRBool resize = PR_TRUE;
 
   if (prefSvc)
     prefSvc->GetBranch("", getter_AddRefs(prefBranch));
   if (prefBranch)

--- a/suite/browser/jar.mn
+++ b/suite/browser/jar.mn
@@ -45,11 +45,11 @@ comm.jar:
    content/navigator/platformMailOverlay.xul                        (unix/platformMailOverlay.xul)
 #endif
 #endif
 #endif
    content/navigator/pageinfo/feeds.js                              (pageinfo/feeds.js)
    content/navigator/pageinfo/feeds.xml                             (pageinfo/feeds.xml)
    content/navigator/pageinfo/pageInfo.css                          (pageinfo/pageInfo.css)
    content/navigator/pageinfo/pageInfo.js                           (pageinfo/pageInfo.js)
-   content/navigator/pageinfo/pageInfo.xul                          (pageinfo/pageInfo.xul)
+*  content/navigator/pageinfo/pageInfo.xul                          (pageinfo/pageInfo.xul)
    content/navigator/pageinfo/permissions.js                        (pageinfo/permissions.js)
    content/navigator/pageinfo/security.js                           (pageinfo/security.js)

--- a/suite/browser/pageinfo/pageInfo.xul
+++ b/suite/browser/pageinfo/pageInfo.xul
@@ -286,17 +286,21 @@
                     icon="save" id="imagesaveasbutton" disabled="true"
                     oncommand="saveMedia();"/>
           </hbox>
           <vbox class="inset iframe" flex="1" pack="center">
             <hbox id="theimagecontainer" pack="center">
               <image id="thepreviewimage"/>
             </hbox>
             <hbox id="brokenimagecontainer" pack="center" collapsed="true">
+#ifdef MOZILLA_1_9_1_BRANCH
               <image id="brokenimage" src="resource:///res/broken-image.gif"/>
+#else
+              <image id="brokenimage" src="resource:///res/broken-image.png"/>
+#endif
             </hbox>
           </vbox>
         </vbox>
         <hbox id="mediaSaveBox" collapsed="true">
           <spacer flex="1"/>
           <button label="&mediaSaveAs;" accesskey="&mediaSaveAs2.accesskey;"
                   icon="save" oncommand="saveMedia();"/>
         </hbox>

--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -112,8 +112,12 @@ msvcr80.dll
 #endif
 xpicleanup.exe
 #ifndef MOZILLA_1_9_1_BRANCH
 components/nsPostUpdateWin.js
 #endif
 #else
 xpicleanup
 #endif
+#ifndef MOZILLA_1_9_1_BRANCH
+res/broken-image.gif
+res/loading-image.gif
+#endif

--- a/suite/installer/unix/packages
+++ b/suite/installer/unix/packages
@@ -365,33 +365,31 @@ bin/libprldap60.so
 bin/components/libmozldap.so
 bin/components/mozldap.xpt
 bin/components/nsLDAPProtocolHandler.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
 bin/res/arrow.gif
 bin/res/arrowd.gif
-bin/res/broken-image.gif
 bin/res/charsetalias.properties
 bin/res/charsetData.properties
 bin/res/contenteditable.css
 bin/res/dtd/*
 bin/res/designmode.css
 bin/res/EditorOverride.css
 bin/res/entityTables/*
 bin/res/fonts/*
 bin/res/forms.css
 bin/res/grabber.gif
 bin/res/hiddenWindow.html
 bin/res/html.css
 bin/res/html/*
 bin/res/langGroups.properties
 bin/res/language.properties
-bin/res/loading-image.gif
 bin/res/mathml.css
 bin/res/quirk.css
 bin/res/svg.css
 bin/res/table-add-column-after-active.gif
 bin/res/table-add-column-after-hover.gif
 bin/res/table-add-column-after.gif
 bin/res/table-add-column-before-active.gif
 bin/res/table-add-column-before-hover.gif
@@ -406,16 +404,23 @@ bin/res/table-remove-column-active.gif
 bin/res/table-remove-column-hover.gif
 bin/res/table-remove-column.gif
 bin/res/table-remove-row-active.gif
 bin/res/table-remove-row-hover.gif
 bin/res/table-remove-row.gif
 bin/res/ua.css
 bin/res/unixcharset.properties
 bin/res/viewsource.css
+#ifdef MOZILLA_1_9_1_BRANCH
+bin/res/broken-image.gif
+bin/res/loading-image.gif
+#else
+bin/res/broken-image.png
+bin/res/loading-image.png
+#endif
 
 ; Personal Security Manager
 bin/libnssckbi.so
 bin/components/libpipboot.so
 bin/components/pipboot.xpt
 bin/components/libpipnss.so
 bin/components/pipnss.xpt
 bin/components/libpippki.so

--- a/suite/installer/windows/packages
+++ b/suite/installer/windows/packages
@@ -366,18 +366,16 @@ bin\res\hiddenWindow.html
 bin\res\ua.css
 bin\res\html.css
 bin\res\quirk.css
 bin\res\forms.css
 bin\res\contenteditable.css
 bin\res\designmode.css
 bin\res\viewsource.css
 bin\res\EditorOverride.css
-bin\res\broken-image.gif
-bin\res\loading-image.gif
 bin\res\grabber.gif
 bin\res\arrow.gif
 bin\res\arrowd.gif
 bin\res\table-add-column-after-active.gif
 bin\res\table-add-column-after-hover.gif
 bin\res\table-add-column-after.gif
 bin\res\table-add-column-before-active.gif
 bin\res\table-add-column-before-hover.gif
@@ -398,16 +396,23 @@ bin\res\charsetalias.properties
 bin\res\charsetData.properties
 bin\res\langGroups.properties
 bin\res\language.properties
 bin\res\wincharset.properties
 bin\res\entityTables\*
 bin\res\dtd\*
 bin\res\fonts\*
 bin\res\html\*
+#ifdef MOZILLA_1_9_1_BRANCH
+bin\res\broken-image.gif
+bin\res\loading-image.gif
+#else
+bin\res\broken-image.png
+bin\res\loading-image.png
+#endif
 
 ; MathML, optional for MathML charset conversion
 bin\components\ucvmath.dll
 bin\res\mathml.css
 bin\res\entityTables\mathml20.properties
 bin\res\fonts\mathfont.properties
 bin\res\fonts\mathfontCMEX10.properties
 bin\res\fonts\mathfontCMSY10.properties