diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index d95e74dd428..add74062bc0 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -31,7 +31,7 @@
 		<key>801</key>
 		<string>418 469 201 79 0 0 1024 746 </string>
 		<key>826</key>
-		<string>96 451 213 78 0 0 1280 832 </string>
+		<string>84 461 213 78 0 0 1152 848 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>291.0</string>
@@ -47,7 +47,11 @@
 	<string>8</string>
 	<key>IBLockedObjects</key>
 	<array/>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>826</integer>
+	</array>
 	<key>IBSystem Version</key>
-	<string>6I32</string>
+	<string>6L29</string>
 </dict>
 </plist>
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index f1b2c0801a1..f27fae47dfd 100644
Binary files a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm
index 9eea0240887..bb7a545d1d0 100644
--- a/camino/src/browser/BrowserWindowController.mm
+++ b/camino/src/browser/BrowserWindowController.mm
@@ -196,6 +196,7 @@ static NSArray* sToolbarDefaults = nil;
 - (void)dealloc
 {
   [fImage release];
+  [super dealloc];
 }
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
@@ -368,6 +369,8 @@ static NSArray* sToolbarDefaults = nil;
   // ensure that the browser is visible when we close.
   [self ensureBrowserVisible:self];
   
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+
   // autorelease just in case we're here because of a window closing
   // initiated from gecko, in which case this BWC would still be on the 
   // stack and may need to stay alive until it unwinds. We've already
@@ -462,10 +465,13 @@ static NSArray* sToolbarDefaults = nil;
       // However, unlike the progress meter, this doesn't need to be in a subview from
       // the status bar because it is in a fixed position on the LHS.
       [mPopupBlocked retain];
+      NSFont* savedFont = [[mPopupBlocked cell] font];
       NSMenu* savedMenu = [mPopupBlocked menu];     // must cache this before replacing cell
       IconPopUpCell* iconCell = [[[IconPopUpCell alloc] initWithImage:[NSImage imageNamed:@"popup-blocked"]] autorelease];
       [mPopupBlocked setCell:iconCell];
-      //[iconCell setPreferredEdge:NSMinYEdge];
+      [iconCell setFont:savedFont];
+      [mPopupBlocked setToolTip:NSLocalizedString(@"A web popup was blocked", "Web Popup Toolitp")]; 
+//      [iconCell setPreferredEdge:NSMaxYEdge];
       [iconCell setMenu:savedMenu];
       [iconCell setBordered:NO];
       mPopupBlockSuperview = [mPopupBlocked superview];
@@ -474,7 +480,7 @@ static NSArray* sToolbarDefaults = nil;
       // register for notifications so we can populate the popup blocker menu
       // right before it's displayed.
       [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(buildPopupBlockerMenu:)
-                                              name:NSPopUpButtonCellWillPopUpNotification object:nil];
+                                              name:NSPopUpButtonCellWillPopUpNotification object:iconCell];
     }
 
     // Set up the toolbar's search text field
@@ -2321,7 +2327,6 @@ static NSArray* sToolbarDefaults = nil;
   NSPopUpButton* popup = [notifier object];
   
   // clear out existing menu. loop until we hit our special tag
-  NSMenu* menu = [popup menu];
   int numItemsToDelete = [popup indexOfItemWithTag:kSeparatorTag];
   for ( int i = 0; i < numItemsToDelete; ++i ) 
     [popup removeItemAtIndex:0];