diff --git a/mozilla/browser/base/content/pageinfo/pageInfo.xul b/mozilla/browser/base/content/pageinfo/pageInfo.xul
index 67f2d71f1d4..f5c651c62b8 100644
--- a/mozilla/browser/base/content/pageinfo/pageInfo.xul
+++ b/mozilla/browser/base/content/pageinfo/pageInfo.xul
@@ -191,7 +191,7 @@
         </tree>        
       </groupbox>
       <groupbox id="securityBox">
-        <caption label="&securityHeader;"/>
+        <caption id="securityBoxCaption" label="&securityHeader;"/>
         <description id="general-security-identity" class="header"/>
         <description id="general-security-privacy"  class="header"/>
         <hbox align="right">
@@ -371,103 +371,113 @@
     <!-- Security & Privacy -->
     <vbox id="securityPanel">
       <!-- Identity Section -->
-      <label id="security-identity" class="header" value="&securityView.identity.header;"/>
-      <grid>
-        <columns>
-          <column/>
-          <column flex="1"/>
-        </columns>
-        <rows>
-          <row><!-- Domain -->
-            <label id="security-identity-domain-label"
-                   class="fieldLabel"
-                   value="&securityView.identity.domain;"
-                   control="security-identity-domain-value"/>
-            <textbox id="security-identity-domain-value"
-                     class="fieldValue" readonly="true"/>
-          </row>
-          <row><!-- Owner -->
-            <label id="security-identity-owner-label"
-                   class="fieldLabel"
-                   value="&securityView.identity.owner;"
-                   control="security-identity-owner-value"/>
-            <textbox id="security-identity-owner-value"
-                     class="fieldValue" readonly="true"/>
-          </row>
-          <row><!-- Verifier -->
-            <label id="security-identity-verifier-label"
-                   class="fieldLabel"
-                   value="&securityView.identity.verifier;"
-                   control="security-identity-verifier-value"/>
-            <textbox id="security-identity-verifier-value"
-                     class="fieldValue" readonly="true" />
-          </row>
-          <row><!-- Cert button -->
-            <button id="security-view-cert" label="&securityView.label;"
-                    accesskey="&securityView.accesskey;"
-                    oncommand="security.viewCert();"/>
-            <label id="security-view-text" class="fieldLabel"
-                   control="security-view-cert" flex="1"/>
-          </row>
-        </rows>
-      </grid>
-        
-      <separator class="groove"/>
+      <groupbox id="security-identity-groupbox" flex="1">
+        <caption id="security-identity" label="&securityView.identity.header;"/>
+        <grid flex="1">
+          <columns>
+            <column/>
+            <column flex="1"/>
+          </columns>
+          <rows>
+            <row><!-- Domain -->
+              <label id="security-identity-domain-label"
+                     class="fieldLabel"
+                     value="&securityView.identity.domain;"
+                     control="security-identity-domain-value"/>
+              <textbox id="security-identity-domain-value"
+                       class="fieldValue" readonly="true"/>
+            </row>
+            <row><!-- Owner -->
+              <label id="security-identity-owner-label"
+                     class="fieldLabel"
+                     value="&securityView.identity.owner;"
+                     control="security-identity-owner-value"/>
+              <textbox id="security-identity-owner-value"
+                       class="fieldValue" readonly="true"/>
+            </row>
+            <row><!-- Verifier -->
+              <label id="security-identity-verifier-label"
+                     class="fieldLabel"
+                     value="&securityView.identity.verifier;"
+                     control="security-identity-verifier-value"/>
+              <textbox id="security-identity-verifier-value"
+                       class="fieldValue" readonly="true" />
+            </row>
+          </rows>
+        </grid>
+        <spacer flex="1"/>
+        <hbox><!-- Cert button -->
+          <label id="security-view-text" class="fieldLabel"
+                 control="security-view-cert" flex="1"/>
+          <button id="security-view-cert" label="&securityView.certView;"
+                  accesskey="&securityView.accesskey;"
+                  oncommand="security.viewCert();"/>
+        </hbox>
+      </groupbox>
       
       <!-- Privacy & History section -->
-      <label id="security-privacy" class="header" value="&securityView.privacy.header;" />
-      <grid>
-        <columns>
-          <column flex="1"/>
-          <column/>
-          <column/>
-        </columns>
-        
-        <rows>
-          <row><!-- History -->
-            <description id="security-privacy-history-label"
-                         control="security-privacy-history-value"
-                         class="fieldLabel">&securityView.privacy.history;</description>
-            <textbox id="security-privacy-history-value"
-                     class="fieldValue"
-                     value="&securityView.unknown;" />
-          </row>
-          <row><!-- Cookies -->
-            <description id="security-privacy-cookies-label"
-                         control="security-privacy-cookies-value"
-                         class="fieldLabel">&securityView.privacy.cookies;</description>
-            <textbox id="security-privacy-cookies-value"
-                     class="fieldValue"
-                     value="&securityView.unknown;" />
-            <button id="security-view-cookies"
-                    label="&securityView.privacy.viewCookies;"
-                    accesskey="&securityView.privacy.viewCookies.accessKey;"
-                    oncommand="security.viewCookies();"/>
-          </row>
-          <row><!-- Passwords -->
-            <description  id="security-privacy-passwords-label"
-                          control="security-privacy-passwords-value"
-                          class="fieldLabel">&securityView.privacy.passwords;</description>
-            <textbox id="security-privacy-passwords-value"
-                     class="fieldValue"
-                     value="&securityView.unknown;" />
-            <button id="security-view-password"
-                    label="&securityView.privacy.viewPasswords;"
-                    accesskey="&securityView.privacy.viewPasswords.accessKey;"
-                    oncommand="security.viewPasswords();"/>
-          </row>
-        </rows>
-      </grid>
-
-      <separator class="groove"/>
+      <groupbox id="security-privacy-groupbox" flex="1">
+        <caption id="security-privacy" label="&securityView.privacy.header;" />
+        <grid>
+          <columns>
+            <column flex="1"/>
+            <column flex="1"/>
+          </columns>
+          <rows>
+            <row><!-- History -->
+              <description id="security-privacy-history-label"
+                           control="security-privacy-history-value"
+                           class="fieldLabel">&securityView.privacy.history;</description>
+              <textbox id="security-privacy-history-value"
+                       class="fieldValue"
+                       value="&securityView.unknown;"
+                       readonly="true"/>
+            </row>
+            <row><!-- Cookies -->
+              <description id="security-privacy-cookies-label"
+                           control="security-privacy-cookies-value"
+                           class="fieldLabel">&securityView.privacy.cookies;</description>
+              <hbox>
+                <textbox id="security-privacy-cookies-value"
+                         class="fieldValue"
+                         value="&securityView.unknown;"
+                         flex="1"
+                         readonly="true"/>
+                <button id="security-view-cookies"
+                        label="&securityView.privacy.viewCookies;"
+                        accesskey="&securityView.privacy.viewCookies.accessKey;"
+                        oncommand="security.viewCookies();"/>
+              </hbox>
+            </row>
+            <row><!-- Passwords -->
+              <description  id="security-privacy-passwords-label"
+                            control="security-privacy-passwords-value"
+                            class="fieldLabel">&securityView.privacy.passwords;</description>
+              <hbox>
+                <textbox id="security-privacy-passwords-value"
+                         class="fieldValue"
+                         value="&securityView.unknown;"
+                         flex="1"
+                         readonly="true"/>
+                <button id="security-view-password"
+                        label="&securityView.privacy.viewPasswords;"
+                        accesskey="&securityView.privacy.viewPasswords.accessKey;"
+                        oncommand="security.viewPasswords();"/>
+              </hbox>
+            </row>
+          </rows>
+        </grid>
+      </groupbox>
       
       <!-- Technical Details section -->
-      <label id="security-technical" class="header" value="&securityView.technical.header;" />
-      <vbox flex="1">
-        <label id="security-technical-shortform" class="fieldValue"/>
-        <description id="security-technical-longform1" class="fieldLabel"/>
-        <description id="security-technical-longform2" class="fieldLabel"/>
-      </vbox>
+      <groupbox id="security-technical-groupbox" flex="1">
+        <caption id="security-technical" label="&securityView.technical.header;" />
+        <vbox flex="1">
+          <label id="security-technical-shortform" class="fieldValue"/>
+          <description id="security-technical-longform1" class="fieldLabel"/>
+          <description id="security-technical-longform2" class="fieldLabel"/>
+        </vbox>
+      </groupbox>
     </vbox>
     <!-- Others added by overlay -->
   </deck>
diff --git a/mozilla/browser/base/content/pageinfo/security.js b/mozilla/browser/base/content/pageinfo/security.js
index a2bf7382034..085bace452b 100644
--- a/mozilla/browser/base/content/pageinfo/security.js
+++ b/mozilla/browser/base/content/pageinfo/security.js
@@ -199,7 +199,7 @@ function securityOnLoad() {
 
   /* Manage the View Cert button*/
   if (info.cert) {
-    var viewText = bundle.GetStringFromName("pageInfo_ViewCertificate");
+    var viewText = pageInfoBundle.getString("securityCertText");
     setText("security-view-text", viewText);
     security._cert = info.cert;
   }
@@ -220,7 +220,7 @@ function securityOnLoad() {
   var visitCount = previousVisitCount(info.hostName);
   if(visitCount > 1) {
     setText("security-privacy-history-value",
-            pageInfoBundle.getFormattedString("securityNVisits", [visitCount]));
+            pageInfoBundle.getFormattedString("securityNVisits", [visitCount.toLocaleString()]));
   }
   else if (visitCount == 1) {
     setText("security-privacy-history-value",
diff --git a/mozilla/browser/locales/en-US/chrome/browser/pageInfo.dtd b/mozilla/browser/locales/en-US/chrome/browser/pageInfo.dtd
index ca51dc38a3a..c237d3b8220 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/pageInfo.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/pageInfo.dtd
@@ -97,7 +97,7 @@
 <!ENTITY  securityTab           "Security">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "Security information for this page">
-<!ENTITY  securityView.label    "View">
+<!ENTITY  securityView.certView "View Certificate">
 <!ENTITY  securityView.accesskey "V">
 <!ENTITY  securityView.unknown   "Unknown">
 
diff --git a/mozilla/browser/locales/en-US/chrome/browser/pageInfo.properties b/mozilla/browser/locales/en-US/chrome/browser/pageInfo.properties
index b607051b296..e98493880d4 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/pageInfo.properties
+++ b/mozilla/browser/locales/en-US/chrome/browser/pageInfo.properties
@@ -69,6 +69,7 @@ generalSiteIdentity=This web site is owned by %S\nThis has been verified by %S
 feedRss=RSS
 feedAtom=Atom
 
+securityCertText=This web site provides a certificate to verify its identity.
 securityNoIdentity=This web site does not supply identity information.
 securityOneVisit=Yes, once
 securityNVisits=Yes, %S times
diff --git a/mozilla/browser/themes/pinstripe/browser/pageInfo.css b/mozilla/browser/themes/pinstripe/browser/pageInfo.css
index 0a895aeec49..7e2d1fa23c1 100644
--- a/mozilla/browser/themes/pinstripe/browser/pageInfo.css
+++ b/mozilla/browser/themes/pinstripe/browser/pageInfo.css
@@ -247,15 +247,19 @@ treechildren::-moz-tree-cell-text(broken) {
 }
 
 /* Security Tab */
+#securityPanel .caption-icon {
+  display: none;
+}
+
 #securityPanel .header {
   font-size: 120%;
 }
  
 #securityPanel .fieldLabel {
-  margin: 5px 10px 10px 10px;
+  margin: 2px 10px 3px 10px;
 }
 
 #securityPanel .fieldValue {
   font-weight: bold;
-  margin: 5px 10px 0px 10px;
+  margin: 2px 10px 0px 10px;
 }
diff --git a/mozilla/browser/themes/winstripe/browser/pageInfo.css b/mozilla/browser/themes/winstripe/browser/pageInfo.css
index 47b6af84bcf..f49c2b10bc6 100644
--- a/mozilla/browser/themes/winstripe/browser/pageInfo.css
+++ b/mozilla/browser/themes/winstripe/browser/pageInfo.css
@@ -145,6 +145,10 @@ textbox[disabled] {
   -moz-margin-end: 3px;
 }
 
+#securityBoxCaption .caption-icon {
+  display: none;
+}
+
 groupbox caption .caption-icon { 
   background-image: url("chrome://global/skin/tree/twisty-open.png");
 }
@@ -254,15 +258,19 @@ treechildren::-moz-tree-cell-text(broken) {
 }
 
 /* Security Tab */
+#securityPanel .caption-icon {
+  display: none;
+}
+
 #securityPanel .header {
   font-size: 120%;
 }
  
 #securityPanel .fieldLabel {
-  margin: 5px 10px 10px 10px;
+  margin: 2px 10px 3px 10px;
 }
 
 #securityPanel .fieldValue {
   font-weight: bold;
-  margin: 5px 10px 0px 10px;
+  margin: 2px 10px 0px 10px;
 }