diff --git a/camino/BrowserWindow.nib/objects.nib b/camino/BrowserWindow.nib/objects.nib
index 8ab7b8b7b9f..b8b3f58e461 100644
Binary files a/camino/BrowserWindow.nib/objects.nib and b/camino/BrowserWindow.nib/objects.nib differ
diff --git a/camino/BrowserWindowController.mm b/camino/BrowserWindowController.mm
index 1669620f52b..aa35fd1c1a7 100644
--- a/camino/BrowserWindowController.mm
+++ b/camino/BrowserWindowController.mm
@@ -1012,7 +1012,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 //
 - (void)updateLock:(unsigned int)inSecurityState
 {
-  switch ( inSecurityState ) {
+  switch ( inSecurityState & 0x000000FF ) {
     case nsIWebProgressListener::STATE_IS_INSECURE:
       [mLock setImage:[BrowserWindowController insecureIcon]];
       break;
@@ -1037,7 +1037,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 {
   static NSImage* sSecureIcon = nil;
   if ( !sSecureIcon )
-    sSecureIcon = [NSImage imageNamed:@"historyicon"];
+    sSecureIcon = [NSImage imageNamed:@"security_lock"];
   return sSecureIcon;
 }
 
@@ -1045,7 +1045,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 {
   static NSImage* sBrokenIcon = nil;
   if ( !sBrokenIcon )
-    sBrokenIcon = [NSImage imageNamed:@"smallbookmark"];
+    sBrokenIcon = [NSImage imageNamed:@"security_broken"];
   return sBrokenIcon;
 }
 
diff --git a/camino/Chimera.pbproj/project.pbxproj b/camino/Chimera.pbproj/project.pbxproj
index 227eaa103fe..319d9f4d335 100644
--- a/camino/Chimera.pbproj/project.pbxproj
+++ b/camino/Chimera.pbproj/project.pbxproj
@@ -469,6 +469,8 @@
 				F5179420027F3F2901A967DF,
 				F5179423028275B901A967DF,
 				F57F20730299A02301000106,
+				F540BD1B029ED15301026D5D,
+				F540BD1D029ED17901026D5D,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -721,6 +723,8 @@
 			children = (
 				F557149D023B46BF010001CA,
 				F557149E023B46BF010001CA,
+				F540BD1A029ED15301026D5D,
+				F540BD1C029ED17901026D5D,
 			);
 			isa = PBXGroup;
 			name = Graphics;
@@ -1861,6 +1865,28 @@
 			settings = {
 			};
 		};
+		F540BD1A029ED15301026D5D = {
+			isa = PBXFileReference;
+			path = security_lock.tif;
+			refType = 4;
+		};
+		F540BD1B029ED15301026D5D = {
+			fileRef = F540BD1A029ED15301026D5D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F540BD1C029ED17901026D5D = {
+			isa = PBXFileReference;
+			path = security_broken.tif;
+			refType = 4;
+		};
+		F540BD1D029ED17901026D5D = {
+			fileRef = F540BD1C029ED17901026D5D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F541495A02711A8301A80166 = {
 			isa = PBXFileReference;
 			path = CHToolbarAdditions.h;
diff --git a/camino/English.lproj/BrowserWindow.nib/objects.nib b/camino/English.lproj/BrowserWindow.nib/objects.nib
index 8ab7b8b7b9f..b8b3f58e461 100644
Binary files a/camino/English.lproj/BrowserWindow.nib/objects.nib and b/camino/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/camino/projects/Chimera.pbproj/project.pbxproj b/camino/projects/Chimera.pbproj/project.pbxproj
index 227eaa103fe..319d9f4d335 100644
--- a/camino/projects/Chimera.pbproj/project.pbxproj
+++ b/camino/projects/Chimera.pbproj/project.pbxproj
@@ -469,6 +469,8 @@
 				F5179420027F3F2901A967DF,
 				F5179423028275B901A967DF,
 				F57F20730299A02301000106,
+				F540BD1B029ED15301026D5D,
+				F540BD1D029ED17901026D5D,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -721,6 +723,8 @@
 			children = (
 				F557149D023B46BF010001CA,
 				F557149E023B46BF010001CA,
+				F540BD1A029ED15301026D5D,
+				F540BD1C029ED17901026D5D,
 			);
 			isa = PBXGroup;
 			name = Graphics;
@@ -1861,6 +1865,28 @@
 			settings = {
 			};
 		};
+		F540BD1A029ED15301026D5D = {
+			isa = PBXFileReference;
+			path = security_lock.tif;
+			refType = 4;
+		};
+		F540BD1B029ED15301026D5D = {
+			fileRef = F540BD1A029ED15301026D5D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F540BD1C029ED17901026D5D = {
+			isa = PBXFileReference;
+			path = security_broken.tif;
+			refType = 4;
+		};
+		F540BD1D029ED17901026D5D = {
+			fileRef = F540BD1C029ED17901026D5D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F541495A02711A8301A80166 = {
 			isa = PBXFileReference;
 			path = CHToolbarAdditions.h;
diff --git a/camino/resources/images/chrome/security_broken.tif b/camino/resources/images/chrome/security_broken.tif
new file mode 100644
index 00000000000..7cbc1580f39
Binary files /dev/null and b/camino/resources/images/chrome/security_broken.tif differ
diff --git a/camino/resources/images/chrome/security_lock.tif b/camino/resources/images/chrome/security_lock.tif
new file mode 100644
index 00000000000..2b872eff3ba
Binary files /dev/null and b/camino/resources/images/chrome/security_lock.tif differ
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index 8ab7b8b7b9f..b8b3f58e461 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/security_broken.tif b/camino/security_broken.tif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/camino/security_lock.tif b/camino/security_lock.tif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm
index 1669620f52b..aa35fd1c1a7 100644
--- a/camino/src/browser/BrowserWindowController.mm
+++ b/camino/src/browser/BrowserWindowController.mm
@@ -1012,7 +1012,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 //
 - (void)updateLock:(unsigned int)inSecurityState
 {
-  switch ( inSecurityState ) {
+  switch ( inSecurityState & 0x000000FF ) {
     case nsIWebProgressListener::STATE_IS_INSECURE:
       [mLock setImage:[BrowserWindowController insecureIcon]];
       break;
@@ -1037,7 +1037,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 {
   static NSImage* sSecureIcon = nil;
   if ( !sSecureIcon )
-    sSecureIcon = [NSImage imageNamed:@"historyicon"];
+    sSecureIcon = [NSImage imageNamed:@"security_lock"];
   return sSecureIcon;
 }
 
@@ -1045,7 +1045,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 {
   static NSImage* sBrokenIcon = nil;
   if ( !sBrokenIcon )
-    sBrokenIcon = [NSImage imageNamed:@"smallbookmark"];
+    sBrokenIcon = [NSImage imageNamed:@"security_broken"];
   return sBrokenIcon;
 }
 
diff --git a/chimera/BrowserWindow.nib/objects.nib b/chimera/BrowserWindow.nib/objects.nib
index 8ab7b8b7b9f..b8b3f58e461 100644
Binary files a/chimera/BrowserWindow.nib/objects.nib and b/chimera/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/BrowserWindowController.mm b/chimera/BrowserWindowController.mm
index 1669620f52b..aa35fd1c1a7 100644
--- a/chimera/BrowserWindowController.mm
+++ b/chimera/BrowserWindowController.mm
@@ -1012,7 +1012,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 //
 - (void)updateLock:(unsigned int)inSecurityState
 {
-  switch ( inSecurityState ) {
+  switch ( inSecurityState & 0x000000FF ) {
     case nsIWebProgressListener::STATE_IS_INSECURE:
       [mLock setImage:[BrowserWindowController insecureIcon]];
       break;
@@ -1037,7 +1037,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 {
   static NSImage* sSecureIcon = nil;
   if ( !sSecureIcon )
-    sSecureIcon = [NSImage imageNamed:@"historyicon"];
+    sSecureIcon = [NSImage imageNamed:@"security_lock"];
   return sSecureIcon;
 }
 
@@ -1045,7 +1045,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 {
   static NSImage* sBrokenIcon = nil;
   if ( !sBrokenIcon )
-    sBrokenIcon = [NSImage imageNamed:@"smallbookmark"];
+    sBrokenIcon = [NSImage imageNamed:@"security_broken"];
   return sBrokenIcon;
 }
 
diff --git a/chimera/Chimera.pbproj/project.pbxproj b/chimera/Chimera.pbproj/project.pbxproj
index 227eaa103fe..319d9f4d335 100644
--- a/chimera/Chimera.pbproj/project.pbxproj
+++ b/chimera/Chimera.pbproj/project.pbxproj
@@ -469,6 +469,8 @@
 				F5179420027F3F2901A967DF,
 				F5179423028275B901A967DF,
 				F57F20730299A02301000106,
+				F540BD1B029ED15301026D5D,
+				F540BD1D029ED17901026D5D,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -721,6 +723,8 @@
 			children = (
 				F557149D023B46BF010001CA,
 				F557149E023B46BF010001CA,
+				F540BD1A029ED15301026D5D,
+				F540BD1C029ED17901026D5D,
 			);
 			isa = PBXGroup;
 			name = Graphics;
@@ -1861,6 +1865,28 @@
 			settings = {
 			};
 		};
+		F540BD1A029ED15301026D5D = {
+			isa = PBXFileReference;
+			path = security_lock.tif;
+			refType = 4;
+		};
+		F540BD1B029ED15301026D5D = {
+			fileRef = F540BD1A029ED15301026D5D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F540BD1C029ED17901026D5D = {
+			isa = PBXFileReference;
+			path = security_broken.tif;
+			refType = 4;
+		};
+		F540BD1D029ED17901026D5D = {
+			fileRef = F540BD1C029ED17901026D5D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F541495A02711A8301A80166 = {
 			isa = PBXFileReference;
 			path = CHToolbarAdditions.h;
diff --git a/chimera/English.lproj/BrowserWindow.nib/objects.nib b/chimera/English.lproj/BrowserWindow.nib/objects.nib
index 8ab7b8b7b9f..b8b3f58e461 100644
Binary files a/chimera/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/projects/Chimera.pbproj/project.pbxproj b/chimera/projects/Chimera.pbproj/project.pbxproj
index 227eaa103fe..319d9f4d335 100644
--- a/chimera/projects/Chimera.pbproj/project.pbxproj
+++ b/chimera/projects/Chimera.pbproj/project.pbxproj
@@ -469,6 +469,8 @@
 				F5179420027F3F2901A967DF,
 				F5179423028275B901A967DF,
 				F57F20730299A02301000106,
+				F540BD1B029ED15301026D5D,
+				F540BD1D029ED17901026D5D,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -721,6 +723,8 @@
 			children = (
 				F557149D023B46BF010001CA,
 				F557149E023B46BF010001CA,
+				F540BD1A029ED15301026D5D,
+				F540BD1C029ED17901026D5D,
 			);
 			isa = PBXGroup;
 			name = Graphics;
@@ -1861,6 +1865,28 @@
 			settings = {
 			};
 		};
+		F540BD1A029ED15301026D5D = {
+			isa = PBXFileReference;
+			path = security_lock.tif;
+			refType = 4;
+		};
+		F540BD1B029ED15301026D5D = {
+			fileRef = F540BD1A029ED15301026D5D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F540BD1C029ED17901026D5D = {
+			isa = PBXFileReference;
+			path = security_broken.tif;
+			refType = 4;
+		};
+		F540BD1D029ED17901026D5D = {
+			fileRef = F540BD1C029ED17901026D5D;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F541495A02711A8301A80166 = {
 			isa = PBXFileReference;
 			path = CHToolbarAdditions.h;
diff --git a/chimera/resources/images/chrome/security_broken.tif b/chimera/resources/images/chrome/security_broken.tif
new file mode 100644
index 00000000000..7cbc1580f39
Binary files /dev/null and b/chimera/resources/images/chrome/security_broken.tif differ
diff --git a/chimera/resources/images/chrome/security_lock.tif b/chimera/resources/images/chrome/security_lock.tif
new file mode 100644
index 00000000000..2b872eff3ba
Binary files /dev/null and b/chimera/resources/images/chrome/security_lock.tif differ
diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index 8ab7b8b7b9f..b8b3f58e461 100644
Binary files a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib and b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib differ
diff --git a/chimera/security_broken.tif b/chimera/security_broken.tif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/chimera/security_lock.tif b/chimera/security_lock.tif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/chimera/src/browser/BrowserWindowController.mm b/chimera/src/browser/BrowserWindowController.mm
index 1669620f52b..aa35fd1c1a7 100644
--- a/chimera/src/browser/BrowserWindowController.mm
+++ b/chimera/src/browser/BrowserWindowController.mm
@@ -1012,7 +1012,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 //
 - (void)updateLock:(unsigned int)inSecurityState
 {
-  switch ( inSecurityState ) {
+  switch ( inSecurityState & 0x000000FF ) {
     case nsIWebProgressListener::STATE_IS_INSECURE:
       [mLock setImage:[BrowserWindowController insecureIcon]];
       break;
@@ -1037,7 +1037,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 {
   static NSImage* sSecureIcon = nil;
   if ( !sSecureIcon )
-    sSecureIcon = [NSImage imageNamed:@"historyicon"];
+    sSecureIcon = [NSImage imageNamed:@"security_lock"];
   return sSecureIcon;
 }
 
@@ -1045,7 +1045,7 @@ static NSString *PrintToolbarItemIdentifier	= @"Print Toolbar Item";
 {
   static NSImage* sBrokenIcon = nil;
   if ( !sBrokenIcon )
-    sBrokenIcon = [NSImage imageNamed:@"smallbookmark"];
+    sBrokenIcon = [NSImage imageNamed:@"security_broken"];
   return sBrokenIcon;
 }