Only show security icon when the page is secure; get rid of cruft at right of Classic statusbar;

browser/base/content/browser.xul

@@ -897,11 +897,11 @@ Contributor(s):
 
   <statusbar class="chromeclass-status" id="status-bar"
              ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
+    <statusbarpanel id="security-button" class="statusbarpanel-iconic"
+                  onclick="displayPageInfo()"/>    
     <statusbarpanel id="statusbar-display" label="&statusText.label;" flex="1"/>
     <statusbarpanel class="statusbarpanel-progress">
       <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
     </statusbarpanel>
-  <statusbarpanel id="security-button" class="statusbarpanel-iconic"
-                  onclick="displayPageInfo()"/>    
   </statusbar>
 </window>

browser/base/content/customizeToolbar.js

@@ -69,6 +69,7 @@ function buildDialog()
   var newToolbar = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
                                             "toolbar");
   newToolbar.id = "cloneToolbar";
+  
   if (useSmallIcons.checked)
     newToolbar.setAttribute("iconsize", "small");
   newToolbar.setAttribute("mode", modeList.value);

browser/base/skin/browser.css

@@ -611,19 +611,22 @@ toolbar[iconsize="small"] #print-button[disabled="true"] {
 }
 
 #security-button {
-  list-style-image: url("chrome://browser/skin/lock-insecure.gif");
+  display: none;
 }
 
 #security-button[level="high"] {
   list-style-image: url("chrome://browser/skin/lock-secure.gif");
+  display: -moz-box;
 }
 
 #security-button[level="low"] {
   list-style-image: url("chrome://browser/skin/lock-secure.gif");
+  display: -moz-box;
 }
 
 #security-button[level="broken"] {
   list-style-image: url("chrome://browser/skin/lock-broken.gif");
+  display: -moz-box;
 }
 
 /* ::::: tabs ::::: */

toolkit/skin/win/global.css

@@ -130,6 +130,7 @@ statusbarpanel {
   -moz-box-pack: end;
   -moz-appearance: resizerpanel;
   padding: 0px;
+  border: none;
 }
 
 .statusbarpanel-iconic {