diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm
index a5387bf4a9f..81acc5dd23d 100644
--- a/mozilla/camino/src/browser/BrowserWindowController.mm
+++ b/mozilla/camino/src/browser/BrowserWindowController.mm
@@ -1438,7 +1438,7 @@ enum BWCOpenDest {
     [toolbarItem setLabel:NSLocalizedString(@"Bookmark", nil)];
     [toolbarItem setPaletteLabel:NSLocalizedString(@"Bookmark Page", nil)];
     [toolbarItem setToolTip:NSLocalizedString(@"BookmarkToolTip", nil)];
-    [toolbarItem setImage:[NSImage imageNamed:@"add_to_bookmark.tif"]];
+    [toolbarItem setImage:[NSImage imageNamed:@"add_to_bookmark"]];
     [toolbarItem setTarget:self];
     [toolbarItem setAction:@selector(addBookmark:)];
   }
@@ -1446,7 +1446,7 @@ enum BWCOpenDest {
     [toolbarItem setLabel:NSLocalizedString(@"BigText", nil)];
     [toolbarItem setPaletteLabel:NSLocalizedString(@"BigText", nil)];
     [toolbarItem setToolTip:NSLocalizedString(@"BigTextToolTip", nil)];
-    [toolbarItem setImage:[NSImage imageNamed:@"textBigger.tif"]];
+    [toolbarItem setImage:[NSImage imageNamed:@"textBigger"]];
     [toolbarItem setTarget:self];
     [toolbarItem setAction:@selector(makeTextBigger:)];
   }
@@ -1454,7 +1454,7 @@ enum BWCOpenDest {
     [toolbarItem setLabel:NSLocalizedString(@"SmallText", nil)];
     [toolbarItem setPaletteLabel:NSLocalizedString(@"SmallText", nil)];
     [toolbarItem setToolTip:NSLocalizedString(@"SmallTextToolTip", nil)];
-    [toolbarItem setImage:[NSImage imageNamed:@"textSmaller.tif"]];
+    [toolbarItem setImage:[NSImage imageNamed:@"textSmaller"]];
     [toolbarItem setTarget:self];
     [toolbarItem setAction:@selector(makeTextSmaller:)];
   }
@@ -1462,7 +1462,7 @@ enum BWCOpenDest {
     [toolbarItem setLabel:NSLocalizedString(@"NewTab", nil)];
     [toolbarItem setPaletteLabel:NSLocalizedString(@"NewTab", nil)];
     [toolbarItem setToolTip:NSLocalizedString(@"NewTabToolTip", nil)];
-    [toolbarItem setImage:[NSImage imageNamed:@"newTab.tif"]];
+    [toolbarItem setImage:[NSImage imageNamed:@"newTab"]];
     [toolbarItem setTarget:self];
     [toolbarItem setAction:@selector(newTab:)];
   }
@@ -1470,7 +1470,7 @@ enum BWCOpenDest {
     [toolbarItem setLabel:NSLocalizedString(@"CloseTab", nil)];
     [toolbarItem setPaletteLabel:NSLocalizedString(@"CloseTab", nil)];
     [toolbarItem setToolTip:NSLocalizedString(@"CloseTabToolTip", nil)];
-    [toolbarItem setImage:[NSImage imageNamed:@"closeTab.tif"]];
+    [toolbarItem setImage:[NSImage imageNamed:@"closeTab"]];
     [toolbarItem setTarget:self];
     [toolbarItem setAction:@selector(closeCurrentTab:)];
   }
@@ -1478,7 +1478,7 @@ enum BWCOpenDest {
     [toolbarItem setLabel:NSLocalizedString(@"SendLink", nil)];
     [toolbarItem setPaletteLabel:NSLocalizedString(@"SendLinkPaletteLabel", nil)];
     [toolbarItem setToolTip:NSLocalizedString(@"SendLinkToolTip", nil)];
-    [toolbarItem setImage:[NSImage imageNamed:@"sendLink.tif"]];
+    [toolbarItem setImage:[NSImage imageNamed:@"sendLink"]];
     [toolbarItem setTarget:self];
     [toolbarItem setAction:@selector(sendURL:)];
   }
@@ -1486,7 +1486,7 @@ enum BWCOpenDest {
     [toolbarItem setLabel:NSLocalizedString(@"Downloads", nil)];
     [toolbarItem setPaletteLabel:NSLocalizedString(@"Downloads", nil)];
     [toolbarItem setToolTip:NSLocalizedString(@"DownloadsToolTip", nil)];
-    [toolbarItem setImage:[NSImage imageNamed:@"dl_manager.tif"]];
+    [toolbarItem setImage:[NSImage imageNamed:@"dl_manager"]];
     [toolbarItem setTarget:[ProgressDlgController sharedDownloadController]];
     [toolbarItem setAction:@selector(showWindow:)];
   }
@@ -2779,8 +2779,8 @@ enum BWCOpenDest {
 
 - (NSArray*)throbberImages
 {
-  // Simply load an array of NSImage objects from the files "throbber-NN.tif". I used "Quicktime Player" to
-  // save all of the frames of the animated gif as individual .tif files for simplicity of implementation.
+  // Simply load an array of NSImage objects from the files "throbber-NN.tiff". I used "Quicktime Player" to
+  // save all of the frames of the animated gif as individual .tiff files for simplicity of implementation.
   if (mThrobberImages == nil)
   {
     NSImage* images[64];
diff --git a/mozilla/camino/src/download/ProgressDlgController.mm b/mozilla/camino/src/download/ProgressDlgController.mm
index 2380750a611..cfec168aeff 100644
--- a/mozilla/camino/src/download/ProgressDlgController.mm
+++ b/mozilla/camino/src/download/ProgressDlgController.mm
@@ -1002,7 +1002,7 @@ static id gSharedProgressController = nil;
   // only set the action of the selector to pause if we validate properly
   [theItem setLabel:NSLocalizedString(@"dlPauseButtonLabel", nil)];
   [theItem setPaletteLabel:NSLocalizedString(@"dlPauseButtonLabel", nil)];
-  [theItem setImage:[NSImage imageNamed:@"dl_pause.tif"]];
+  [theItem setImage:[NSImage imageNamed:@"dl_pause"]];
   
   if ([self shouldAllowPauseAction]) {
     [theItem setAction:@selector(pause:)];
@@ -1013,7 +1013,7 @@ static id gSharedProgressController = nil;
     [theItem setLabel:NSLocalizedString(@"dlResumeButtonLabel", nil)];
     [theItem setPaletteLabel:NSLocalizedString(@"dlResumeButtonLabel", nil)];
     [theItem setAction:@selector(resume:)];
-    [theItem setImage:[NSImage imageNamed:@"dl_resume.tif"]];
+    [theItem setImage:[NSImage imageNamed:@"dl_resume"]];
     
     return [[self window] isKeyWindow]; // if not key window, dont enable
   }
@@ -1082,37 +1082,37 @@ static id gSharedProgressController = nil;
     [theItem setLabel:NSLocalizedString(@"dlRemoveButtonLabel", nil)];
     [theItem setPaletteLabel:NSLocalizedString(@"dlRemoveButtonLabel", nil)];
     [theItem setAction:@selector(remove:)];
-    [theItem setImage:[NSImage imageNamed:@"dl_remove.tif"]];
+    [theItem setImage:[NSImage imageNamed:@"dl_remove"]];
   }
   else if ([itemIdentifier isEqualToString:@"cancelbutton"]) {
     [theItem setLabel:NSLocalizedString(@"dlCancelButtonLabel", nil)];
     [theItem setPaletteLabel:NSLocalizedString(@"dlCancelButtonLabel", nil)];
     [theItem setAction:@selector(cancel:)];
-    [theItem setImage:[NSImage imageNamed:@"dl_cancel.tif"]];
+    [theItem setImage:[NSImage imageNamed:@"dl_cancel"]];
   }
   else if ([itemIdentifier isEqualToString:@"revealbutton"]) {
     [theItem setLabel:NSLocalizedString(@"dlRevealButtonLabel", nil)];
     [theItem setPaletteLabel:NSLocalizedString(@"dlRevealButtonLabel", nil)];
     [theItem setAction:@selector(reveal:)];
-    [theItem setImage:[NSImage imageNamed:@"dl_reveal.tif"]];
+    [theItem setImage:[NSImage imageNamed:@"dl_reveal"]];
   }
   else if ([itemIdentifier isEqualToString:@"openbutton"]) {
     [theItem setLabel:NSLocalizedString(@"dlOpenButtonLabel", nil)];
     [theItem setPaletteLabel:NSLocalizedString(@"dlOpenButtonLabel", nil)];
     [theItem setAction:@selector(open:)];
-    [theItem setImage:[NSImage imageNamed:@"dl_open.tif"]];
+    [theItem setImage:[NSImage imageNamed:@"dl_open"]];
   }
   else if ([itemIdentifier isEqualToString:@"cleanupbutton"]) {
     [theItem setLabel:NSLocalizedString(@"dlCleanUpButtonLabel", nil)];
     [theItem setPaletteLabel:NSLocalizedString(@"dlCleanUpButtonLabel", nil)];
     [theItem setAction:@selector(cleanUpDownloads:)];
-    [theItem setImage:[NSImage imageNamed:@"dl_clearall.tif"]];
+    [theItem setImage:[NSImage imageNamed:@"dl_clearall"]];
   }
   else if ([itemIdentifier isEqualToString:@"movetotrashbutton"]) {
     [theItem setLabel:NSLocalizedString(@"dlTrashButtonLabel", nil)];
     [theItem setPaletteLabel:NSLocalizedString(@"dlTrashButtonLabel", nil)];
     [theItem setAction:@selector(deleteDownloads:)];
-    [theItem setImage:[NSImage imageNamed:@"dl_trash.tif"]];
+    [theItem setImage:[NSImage imageNamed:@"dl_trash"]];
   }
   else if ([itemIdentifier isEqualToString:@"pauseresumebutton"]) {
     [self setPauseResumeToolbarItem:theItem];