diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
index 24e0834f8ac..8cda05cb4c1 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -165,7 +165,6 @@
                 mLocationSheetURLField = NSTextField; 
                 mLocationSheetWindow = NSWindow; 
                 mLocationToolbarView = NSView; 
-                mLock = NSImageView; 
                 mMailToLinkMenu = NSMenu; 
                 mPageMenu = NSMenu; 
                 mPersonalToolbar = BookmarkToolbar; 
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index a780a3622f2..327bdd94a31 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>34 105 530 384 0 0 1280 938 </string>
+	<string>3 3 530 384 0 0 1280 832 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1014</key>
@@ -30,7 +30,7 @@
 		<string>124 551 213 61 0 0 1600 1002 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>437.0</string>
+	<string>439.0</string>
 	<key>IBLockedObjects</key>
 	<array>
 		<integer>748</integer>
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib
index 326f4da0266..0a6310843d5 100644
Binary files a/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib and b/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib differ
diff --git a/camino/src/browser/BrowserWindowController.h b/camino/src/browser/BrowserWindowController.h
index a0889a70564..f1b47a4dd8e 100644
--- a/camino/src/browser/BrowserWindowController.h
+++ b/camino/src/browser/BrowserWindowController.h
@@ -101,7 +101,6 @@ typedef enum
   IBOutlet AutoCompleteTextField* mURLBar;
   IBOutlet NSTextField*       mStatus;
   IBOutlet NSProgressIndicator* mProgress;              // STRONG reference
-  IBOutlet NSImageView*       mLock;
   IBOutlet NSButton*          mPopupBlocked;
   IBOutlet NSWindow*          mLocationSheetWindow;
   IBOutlet NSTextField*       mLocationSheetURLField;
diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm
index 8d58b5b77fd..003f163d337 100644
--- a/camino/src/browser/BrowserWindowController.mm
+++ b/camino/src/browser/BrowserWindowController.mm
@@ -593,7 +593,6 @@ enum BWCOpenDest {
       // crash if we give them things that have gone away.
       mProgress = nil;
       mStatus = nil;
-      mLock = nil;
       mPopupBlocked = nil;
     }
     else {
@@ -770,9 +769,6 @@ enum BWCOpenDest {
       if (NSAppKitVersionNumber < kPantherAppKit)
         [mURLBar setNextKeyView:mSearchBar];
     }
-    
-    // needed when full keyboard access is enabled
-    [mLock setRefusesFirstResponder:YES];
 }
 
 - (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
@@ -3155,22 +3151,10 @@ enum BWCOpenDest {
 
 // updateLock:
 //
-// Sets the lock icon in the status bar to the appropriate image and updates
-// the url bar display of security state appropriately.
+// updates the url bar display of security state appropriately.
 - (void)updateLock:(unsigned int)inSecurityState
 {
   unsigned char securityState = inSecurityState & 0x000000FF;
-  switch ( securityState ) {
-    case nsIWebProgressListener::STATE_IS_INSECURE:
-      [mLock setImage:[BrowserWindowController insecureIcon]];
-      break;
-    case nsIWebProgressListener::STATE_IS_SECURE:
-      [mLock setImage:[BrowserWindowController secureIcon]];;
-      break;
-    case nsIWebProgressListener::STATE_IS_BROKEN:
-      [mLock setImage:[BrowserWindowController brokenIcon]];
-      break;
-  }
   [mURLBar setSecureState:securityState];
 }