diff --git a/mozilla/extensions/help/resources/content/contents.rdf b/mozilla/extensions/help/resources/content/contents.rdf
index 8f2236773c2..8786cd4bcf4 100644
--- a/mozilla/extensions/help/resources/content/contents.rdf
+++ b/mozilla/extensions/help/resources/content/contents.rdf
@@ -16,6 +16,28 @@
   <!-- Declare overlay points used in this package -->
   <RDF:Seq about="urn:mozilla:overlays">
     <RDF:li resource="chrome://communicator/content/utilityOverlay.xul"/>
+    <RDF:li resource="chrome://pippki/content/certViewer.xul"/>
+    <RDF:li resource="chrome://pippki/content/certManager.xul"/>
+    <RDF:li resource="chrome://pippki/content/changepassword.xul"/>
+    <RDF:li resource="chrome://pippki/content/device_manager.xul"/>
+    <RDF:li resource="chrome://pippki/content/choosetoken.xul"/>
+    <RDF:li resource="chrome://pippki/content/clientauthask.xul"/>
+    <RDF:li resource="chrome://pippki/content/crlImportDialog.xul"/>
+    <RDF:li resource="chrome://pippki/content/deletecert.xul"/>
+    <RDF:li resource="chrome://pippki/content/domainMismatch.xul"/>
+    <RDF:li resource="chrome://pippki/content/editcacert.xul"/>
+    <RDF:li resource="chrome://pippki/content/editemailcert.xul"/>
+    <RDF:li resource="chrome://pippki/content/editsslcert.xul"/>
+    <RDF:li resource="chrome://pippki/content/escrowWarn.xul"/>
+    <RDF:li resource="chrome://pippki/content/getp12password.xul"/>
+    <RDF:li resource="chrome://pippki/content/setp12password.xul"/>
+    <RDF:li resource="chrome://pippki/content/newserver.xul"/>
+    <RDF:li resource="chrome://pippki/content/pref-crlupdate.xul"/>
+    <RDF:li resource="chrome://pippki/content/serverCertExpired.xul"/>
+    <RDF:li resource="chrome://pippki/content/serverCrlNextupdate.xul"/>
+    <RDF:li resource="chrome://pippki/content/crlManager.xul"/>
+    <RDF:li resource="chrome://pippki/content/resetpassword.xul"/>
+    <RDF:li resource="chrome://pippki/content/downloadcert.xul"/>
   </RDF:Seq>
 
   <!-- Define the local overlay file(s) for each overlay point -->
@@ -23,4 +45,91 @@
     <RDF:li>chrome://help/content/helpMenuOverlay.xul</RDF:li>
   </RDF:Seq>
 
+  <RDF:Seq about="chrome://pippki/content/certViewer.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/certManager.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/changepassword.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/device_manager.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/choosetoken.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/clientauthask.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/crlImportDialog.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/deletecert.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/domainMismatch.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/editcacert.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/editemailcert.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/editsslcert.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/escrowWarn.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/getp12password.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/setp12password.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/newserver.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/pref-crlupdate.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/serverCertExpired.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/serverCrlNextupdate.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/crlManager.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/resetpassword.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://pippki/content/downloadcert.xul">
+    <RDF:li>chrome://help/content/helpSecurityOverlay.xul</RDF:li>
+  </RDF:Seq>
 </RDF:RDF>
diff --git a/mozilla/extensions/help/resources/content/helpSecurityOverlay.xul b/mozilla/extensions/help/resources/content/helpSecurityOverlay.xul
new file mode 100644
index 00000000000..484d40a5a34
--- /dev/null
+++ b/mozilla/extensions/help/resources/content/helpSecurityOverlay.xul
@@ -0,0 +1,179 @@
+<?xml version="1.0"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is SeaMonkey internet suite code.
+   -
+   - The Initial Developer of the Original Code is
+   - Mark Banner <bugzilla@standard8.demon.co.uk>
+   - Portions created by the Initial Developer are Copyright (C) 2006
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<overlay id="securityManagerOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
+  <script type="application/x-javascript">
+  <![CDATA[
+    function doCertManagerHelpButton()
+    {
+      var selTab = document.getElementById('certMgrTabbox').selectedItem;
+      var selTabID = selTab.getAttribute('id');
+      switch (selTabID) {
+        case 'mine_tab':
+          openHelp("my_certs");
+          break;
+        case 'others_tab':
+          openHelp("others_certs");
+          break;
+        case 'websites_tab':
+          openHelp("web_certs");
+          break;
+        case 'ca_tab':
+          openHelp("ca_certs");
+          break;
+      }
+    }
+
+    function doDeleteCertificateHelpButton()
+    {
+      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
+      switch (gParams.GetString(0)) {
+        case bundle.GetStringFromName("deleteUserCertFlag"):
+          openHelp("delete_my_certs");
+          break;
+        case bundle.GetStringFromName("deleteSslCertFlag"):
+          openHelp("delete_web_certs");
+          break;
+        case bundle.GetStringFromName("deleteCaCertFlag"):
+          openHelp("delete_ca_certs");
+          break;
+        case bundle.GetStringFromName("deleteEmailCertFlag"):
+          openHelp("delete_email_certs");
+          break;
+      }
+    }
+  ]]>
+  </script>
+
+  <dialog id="certmanager"
+          buttons="accept,help"
+          ondialoghelp="return doCertManagerHelpButton();"/>
+
+  <dialog id="certDetails"
+          buttons="accept,help"
+          ondialoghelp="openHelp('cert_details');"/>
+
+  <dialog id="set_password"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('change_pwd');"/>
+
+  <dialog id="devicemanager"
+          buttons="accept,help"
+          ondialoghelp="openHelp('sec_devices');"/>
+
+  <dialog id="ssl_warning"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('which_token');"/>
+
+  <dialog id="certAuthAsk"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('which_cert');"/>
+
+  <dialog id="crlImportSuccess"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('validation-crl-import');"/>
+
+  <dialog id="deleteCertificate"
+          buttons="accept,cancel,help"
+          ondialoghelp="doDeleteCertificateHelpButton();"/>
+
+  <dialog id="domainMismatch"
+          spacerflex="1"
+          buttons="accept,cancel,help,extra2"
+          ondialoghelp="openHelp('bad_name_web_cert');"/>
+
+  <dialog id="editCaCert"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('edit_ca_certs');"/>
+
+  <dialog id="editEmailCert"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('edit_email_certs');"/>
+
+  <dialog id="editWebsiteCert"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('edit_web_certs');"/>
+
+  <dialog id="escrowWarnDialog"
+          spacerflex="1"
+          buttons="accept,cancel,help,extra2"
+          ondialoghelp="openHelp('priv_key_copy');"/>
+
+  <dialog id="getp12password"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('my_certs');"/>
+
+  <dialog id="setp12password"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('cert_backup_pwd');"/>
+
+  <dialog id="newServerDialog"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('new_web_cert');"/>
+
+  <dialog id="crlUpdatePref"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('validation-crl-auto-update-prefs');"/>
+
+  <dialog id="serverCertExpired"
+          spacerflex="1"
+          buttons="accept,cancel,help,extra2"
+          ondialoghelp="openHelp('exp_web_cert');"/>
+
+  <dialog id="serverCrlNextupdate"
+          buttons="accept,help"
+          ondialoghelp="openHelp('exp_crl');"/>
+
+  <dialog id="crlviewer"
+          buttons="help"
+          ondialoghelp="openHelp('validation-crl-manage');">
+    <hbox id="dialogButtons">
+      <button dlgtype="help"/>
+    </hbox>
+  </dialog>
+
+  <dialog id="reset_password"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('reset_pwd');"/>
+
+  <dialog id="download_cert"
+          buttons="accept,cancel,help"
+          ondialoghelp="openHelp('new_ca');"/>
+</overlay>
diff --git a/mozilla/extensions/help/resources/jar.mn b/mozilla/extensions/help/resources/jar.mn
index 8e92df05bdd..d349e680c0e 100644
--- a/mozilla/extensions/help/resources/jar.mn
+++ b/mozilla/extensions/help/resources/jar.mn
@@ -1,10 +1,38 @@
 help.jar:
+#ifdef MOZ_XUL_APP
+% content help %content/help/ xpcnativewrappers=yes
+% overlay chrome://communicator/content/utilityOverlay.xul chrome://help/content/helpMenuOverlay.xul
+% overlay chrome://pippki/content/certManager.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/certViewer.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/changepassword.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/device_manager.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/choosetoken.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/clientauthask.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/crlImportDialog.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/deletecert.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/domainMismatch.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/editcacert.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/editemailcert.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/editsslcert.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/escrowWarn.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/getp12password.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/setp12password.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/newserver.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/pref-crlupdate.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/serverCertExpired.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/serverCrlNextupdate.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/crlManager.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/resetpassword.xul chrome://help/content/helpSecurityOverlay.xul
+% overlay chrome://pippki/content/downloadcert.xul chrome://help/content/helpSecurityOverlay.xul
+#else
+*       content/help/contents.rdf                       (content/contents.rdf)
+#endif
         content/help/help.xul                           (content/help.xul)
         content/help/contextHelp.js                     (content/contextHelp.js)
         content/help/help.js                            (content/help.js)
-*       content/help/contents.rdf                       (content/contents.rdf)
 *       content/help/helpMenuOverlay.xul                (content/helpMenuOverlay.xul)
         content/help/helpContextOverlay.xul             (content/helpContextOverlay.xul)
+        content/help/helpSecurityOverlay.xul            (content/helpSecurityOverlay.xul)
 *       content/help/platformClasses.css                (content/platformClasses.css)
 
 en-US.jar:
diff --git a/mozilla/security/manager/pki/resources/Makefile.in b/mozilla/security/manager/pki/resources/Makefile.in
index 58f5a5d75c7..46623f07545 100644
--- a/mozilla/security/manager/pki/resources/Makefile.in
+++ b/mozilla/security/manager/pki/resources/Makefile.in
@@ -43,9 +43,3 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_XUL_APP
-DEFINES += -DHELP_BUTTON=
-else
-DEFINES += "-DHELP_BUTTON=,help"
-endif
diff --git a/mozilla/security/manager/pki/resources/content/certManager.js b/mozilla/security/manager/pki/resources/content/certManager.js
index 1fd7af551af..ee9a7f2c68a 100644
--- a/mozilla/security/manager/pki/resources/content/certManager.js
+++ b/mozilla/security/manager/pki/resources/content/certManager.js
@@ -109,29 +109,6 @@ function LoadCerts()
   }
 }
 
-function getSelectedTab()
-{
-  var selTab = document.getElementById('certMgrTabbox').selectedItem;
-  var selTabID = selTab.getAttribute('id');
-  if (selTabID == 'mine_tab') {
-    key = "my_certs";
-  } else if (selTabID == "others_tab") {
-    key = "others_certs";
-  } else if (selTabID == "websites_tab") {
-    key = "web_certs";
-  } else if (selTabID == "ca_tab") {
-    key = "ca_certs";
-  }  
-  return key;
-}
-
-
-function doHelpButton() {
-   var uri = getSelectedTab();
-   openHelp(uri);
-}
-
-
 function getSelectedCerts()
 {
   var ca_tab = document.getElementById("ca_tab");
diff --git a/mozilla/security/manager/pki/resources/content/certManager.xul b/mozilla/security/manager/pki/resources/content/certManager.xul
index d8937bc2ca1..836e53445b3 100644
--- a/mozilla/security/manager/pki/resources/content/certManager.xul
+++ b/mozilla/security/manager/pki/resources/content/certManager.xul
@@ -51,12 +51,10 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
         title="&certmgr.title;"
         onload="LoadCerts();"
-#expand        buttons="accept__HELP_BUTTON__"
-        ondialoghelp="return doHelpButton();"
+        buttons="accept"
         style="width: 48em; height: 32em;"
         persist="screenX screenY width height">
 
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
diff --git a/mozilla/security/manager/pki/resources/content/certViewer.xul b/mozilla/security/manager/pki/resources/content/certViewer.xul
index 819ace350b7..b9473e61cce 100644
--- a/mozilla/security/manager/pki/resources/content/certViewer.xul
+++ b/mozilla/security/manager/pki/resources/content/certViewer.xul
@@ -49,15 +49,13 @@
 <dialog id="certDetails" 
   title="&certmgr.certdetail.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-#expand buttons="accept__HELP_BUTTON__"
+  buttons="accept"
   buttonlabelaccept="&certmgr.close.label;"
-  ondialoghelp="openHelp('cert_details');"
   onload="setWindowName();">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/viewCertDetails.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <tabbox>
     <tabs>
diff --git a/mozilla/security/manager/pki/resources/content/changepassword.xul b/mozilla/security/manager/pki/resources/content/changepassword.xul
index e8a33b626d6..f3ee768a114 100644
--- a/mozilla/security/manager/pki/resources/content/changepassword.xul
+++ b/mozilla/security/manager/pki/resources/content/changepassword.xul
@@ -43,14 +43,12 @@
 
 <dialog id="set_password" title="&setPassword.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-#expand  buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return setPassword();"
-  ondialoghelp="openHelp('change_pwd');"
   onload="onLoad();">
 
 <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
 <hbox align="center">
   <label value="&setPassword.tokenName.label;: "/>
diff --git a/mozilla/security/manager/pki/resources/content/choosetoken.xul b/mozilla/security/manager/pki/resources/content/choosetoken.xul
index 90b7049f3ad..c336bd282de 100644
--- a/mozilla/security/manager/pki/resources/content/choosetoken.xul
+++ b/mozilla/security/manager/pki/resources/content/choosetoken.xul
@@ -47,16 +47,14 @@
 <dialog id="ssl_warning" title="&chooseToken.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 40em;"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return doOK();"
   ondialogcancel="return doCancel();"
-  ondialoghelp="openHelp('which_token');"
   onload="onLoad();">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/choosetoken.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <groupbox>
     <description>&chooseToken.message1;</description>
diff --git a/mozilla/security/manager/pki/resources/content/clientauthask.xul b/mozilla/security/manager/pki/resources/content/clientauthask.xul
index c6784e22320..3baacae5526 100644
--- a/mozilla/security/manager/pki/resources/content/clientauthask.xul
+++ b/mozilla/security/manager/pki/resources/content/clientauthask.xul
@@ -44,18 +44,16 @@
 ]>
 
 
-<dialog id="ssl_warning" title="&clientAuthAsk.title;"
+<dialog id="certAuthAsk" title="&clientAuthAsk.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-#expand buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return doOK();"
   ondialogcancel="return doCancel();"
-  ondialoghelp="openHelp('which_cert');"
   onload="onLoad();">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/clientauthask.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
 
   <groupbox>
     <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
diff --git a/mozilla/security/manager/pki/resources/content/crlImportDialog.js b/mozilla/security/manager/pki/resources/content/crlImportDialog.js
index 0cacf36ecd0..f4ffee2baaa 100644
--- a/mozilla/security/manager/pki/resources/content/crlImportDialog.js
+++ b/mozilla/security/manager/pki/resources/content/crlImportDialog.js
@@ -115,9 +115,3 @@ function onAccept()
                     "chrome,centerscreen,modal",params);
   return true;
 }
-
-function doHelpButton()
-{
-  openHelp("validation-crl-import");
-}
-
diff --git a/mozilla/security/manager/pki/resources/content/crlImportDialog.xul b/mozilla/security/manager/pki/resources/content/crlImportDialog.xul
index 91a0d3c04a6..fb5b8115f22 100644
--- a/mozilla/security/manager/pki/resources/content/crlImportDialog.xul
+++ b/mozilla/security/manager/pki/resources/content/crlImportDialog.xul
@@ -44,12 +44,10 @@
   title="&crl.import.status.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
   onload="onLoad();"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return onAccept();"
-  ondialogcancel="return onCancel();"
-  ondialoghelp="return doHelpButton();">
+  ondialogcancel="return onCancel();">
   
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
   <script type="application/x-javascript" src="chrome://pippki/content/crlImportDialog.js" />
   <script type="application/x-javascript" src="pippki.js" />
diff --git a/mozilla/security/manager/pki/resources/content/crlManager.xul b/mozilla/security/manager/pki/resources/content/crlManager.xul
index 1e8ff81cf8b..d2502b80046 100644
--- a/mozilla/security/manager/pki/resources/content/crlManager.xul
+++ b/mozilla/security/manager/pki/resources/content/crlManager.xul
@@ -53,16 +53,13 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 30em;"
         onload="onLoad();"
-#ifndef MOZ_XUL_APP
-        buttons="help"
-#endif
-        ondialoghelp="openHelp('validation-crl-manage');"
+        buttons="accept"
+        buttonlabelaccept="&certmgr.close.label;"
         persist="screenX screenY width height">
 
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/crlManager.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
 
   <description value="&validation.crlmanager.label;"/>
   <separator class="thin"/>
@@ -86,7 +83,7 @@
   </tree>
   <separator class="thin"/>
 
-  <hbox>
+  <hbox id="dialogButtons">
     <button id="deleteCrl" disabled="true"
             label="&validation.deletecrl.label;"
             accesskey="&validation.deletecrl.accesskey;"
@@ -103,9 +100,7 @@
             label="&certmgr.restore.label;"
             accesskey="&certmgr.restore.accesskey;"
             oncommand="ImportCRL();"/>
-#ifdef MOZ_SUITE
     <spacer flex="2"/>
-    <button dlgtype="help"/>
-#endif
+    <button dlgtype="accept"/>
   </hbox>
 </dialog>
diff --git a/mozilla/security/manager/pki/resources/content/deletecert.js b/mozilla/security/manager/pki/resources/content/deletecert.js
index 2e0356af880..3f058f94905 100644
--- a/mozilla/security/manager/pki/resources/content/deletecert.js
+++ b/mozilla/security/manager/pki/resources/content/deletecert.js
@@ -43,7 +43,6 @@ const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
 
 var certdb;
 var certs = [];
-var helpUrl;
 var gParams;
 
 function setWindowName()
@@ -72,28 +71,24 @@ function setWindowName()
      title = bundle.GetStringFromName("deleteUserCertTitle");
      confirm = bundle.GetStringFromName("deleteUserCertConfirm");
      impact = bundle.GetStringFromName("deleteUserCertImpact");
-     helpUrl = "delete_my_certs"
   }
   else if(typeFlag == bundle.GetStringFromName("deleteSslCertFlag"))
   {
      title = bundle.GetStringFromName("deleteSslCertTitle");
      confirm = bundle.GetStringFromName("deleteSslCertConfirm");
      impact = bundle.GetStringFromName("deleteSslCertImpact");
-     helpUrl = "delete_web_certs"
   }
   else if(typeFlag == bundle.GetStringFromName("deleteCaCertFlag"))
   {
      title = bundle.GetStringFromName("deleteCaCertTitle");
      confirm = bundle.GetStringFromName("deleteCaCertConfirm");
      impact = bundle.GetStringFromName("deleteCaCertImpact");
-     helpUrl = "delete_ca_certs"   
   }
   else if(typeFlag == bundle.GetStringFromName("deleteEmailCertFlag"))
   {
      title = bundle.GetStringFromName("deleteEmailCertTitle");
      confirm = bundle.GetStringFromName("deleteEmailCertConfirm");
      impact = bundle.GetStringFromName("deleteEmailCertImpact");
-     helpUrl = "delete_email_certs"
   }
   else
   {
@@ -150,8 +145,3 @@ function doCancel()
   gParams.SetInt(1, 0); // means CANCEL
   return true;
 }
-
-function doHelp()
-{
-   openHelp(helpUrl);
-}
diff --git a/mozilla/security/manager/pki/resources/content/deletecert.xul b/mozilla/security/manager/pki/resources/content/deletecert.xul
index 506f1757857..00875998fbc 100644
--- a/mozilla/security/manager/pki/resources/content/deletecert.xul
+++ b/mozilla/security/manager/pki/resources/content/deletecert.xul
@@ -44,13 +44,11 @@
   title="&certmgr.deletecert.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="setWindowName();"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return doOK();"
-  ondialogcancel="return doCancel();"
-  ondialoghelp="doHelp();">
+  ondialogcancel="return doCancel();">
 
   <script type="application/x-javascript" src="chrome://pippki/content/deletecert.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
   <script type="application/x-javascript" src="pippki.js" />
 
diff --git a/mozilla/security/manager/pki/resources/content/device_manager.xul b/mozilla/security/manager/pki/resources/content/device_manager.xul
index b088336cef3..09b653bf157 100644
--- a/mozilla/security/manager/pki/resources/content/device_manager.xul
+++ b/mozilla/security/manager/pki/resources/content/device_manager.xul
@@ -53,12 +53,10 @@
         style="width: 52em; height: 32em;"
         persist="screenX screenY width height"
         onload="LoadModules();"
-#expand buttons="accept__HELP_BUTTON__"
-        ondialoghelp="openHelp('sec_devices');">
+        buttons="accept">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
 <grid flex="1" style="margin:5px">
   <columns>
diff --git a/mozilla/security/manager/pki/resources/content/domainMismatch.xul b/mozilla/security/manager/pki/resources/content/domainMismatch.xul
index b57476dbda0..8b443b02d9c 100644
--- a/mozilla/security/manager/pki/resources/content/domainMismatch.xul
+++ b/mozilla/security/manager/pki/resources/content/domainMismatch.xul
@@ -44,21 +44,18 @@
 <dialog id="domainMismatch" title="&domainMismatch.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 32em;"
-  spacerflex="1"
-#expand buttons="accept,cancel__HELP_BUTTON__,extra2"
+  buttons="accept,cancel,extra2"
   buttonlabelextra2="&examineCert.label;"
   buttonaccesskeyextra2="&examineCert.accesskey;"
   defaultButton="cancel"
   ondialogaccept="return doOK();"
   ondialogcancel="return doCancel();"
-  ondialoghelp="openHelp('bad_name_web_cert');"
   ondialogextra2="viewCert();"
   onload="onLoad();">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/domainMismatch.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <description id="message1"/>
   <separator/>
diff --git a/mozilla/security/manager/pki/resources/content/downloadcert.xul b/mozilla/security/manager/pki/resources/content/downloadcert.xul
index 3ba65f34357..31d9e52e452 100644
--- a/mozilla/security/manager/pki/resources/content/downloadcert.xul
+++ b/mozilla/security/manager/pki/resources/content/downloadcert.xul
@@ -43,16 +43,14 @@
 <dialog id="download_cert" title="&downloadCert.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 46em;"
-#expand buttons="accept,cancel__HELP__"
+  buttons="accept,cancel"
   ondialogaccept="return doOK();"
   ondialogcancel="return doCancel();"
-  ondialoghelp="openHelp('new_ca');"
   onload="onLoad();">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/downloadcert.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
 
   <!--  Let 'em know what they're doing -->
diff --git a/mozilla/security/manager/pki/resources/content/editcacert.xul b/mozilla/security/manager/pki/resources/content/editcacert.xul
index cca0ac0781f..b20a9a51023 100644
--- a/mozilla/security/manager/pki/resources/content/editcacert.xul
+++ b/mozilla/security/manager/pki/resources/content/editcacert.xul
@@ -44,17 +44,14 @@
 <dialog id="editCaCert" 
         title="&certmgr.editcacert.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+        buttons="accept,cancel"
         ondialogaccept="return doOK();"
-        ondialoghelp="openHelp('edit_ca_certs');"
         onload="setWindowName();"
 >
 
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-
 
   <description id="certmsg"/>
   <separator/>
diff --git a/mozilla/security/manager/pki/resources/content/editemailcert.xul b/mozilla/security/manager/pki/resources/content/editemailcert.xul
index d8cd931ddec..a45f7417c56 100644
--- a/mozilla/security/manager/pki/resources/content/editemailcert.xul
+++ b/mozilla/security/manager/pki/resources/content/editemailcert.xul
@@ -44,17 +44,14 @@
 <dialog id="editEmailCert" 
         title="&certmgr.editemailcert.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+        buttons="accept,cancel"
         ondialogaccept="return doEmailOK();"
-        ondialoghelp="openHelp('edit_email_certs');"
         onload="doLoadForEmailCert();"
 >
 
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-
 
   <description id="certmsg"/>
   <description id="issuer"/>
diff --git a/mozilla/security/manager/pki/resources/content/editsslcert.xul b/mozilla/security/manager/pki/resources/content/editsslcert.xul
index dbe8e7ff596..1c9bcec33ec 100644
--- a/mozilla/security/manager/pki/resources/content/editsslcert.xul
+++ b/mozilla/security/manager/pki/resources/content/editsslcert.xul
@@ -44,17 +44,14 @@
 <dialog id="editWebsiteCert" 
         title="&certmgr.editsslcert.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+        buttons="accept,cancel"
         ondialogaccept="return doSSLOK();"
-        ondialoghelp="openHelp('edit_web_certs');"
         onload="doLoadForSSLCert();"
 >
 
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-
 
   <description id="certmsg"/>
   <description id="issuer"/>
diff --git a/mozilla/security/manager/pki/resources/content/escrowWarn.xul b/mozilla/security/manager/pki/resources/content/escrowWarn.xul
index 7c8f6795248..ac6fff293db 100644
--- a/mozilla/security/manager/pki/resources/content/escrowWarn.xul
+++ b/mozilla/security/manager/pki/resources/content/escrowWarn.xul
@@ -44,20 +44,17 @@
 <dialog id="escrowWarnDialog" title="&escrowWarn.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 40em;"
-  spacerflex="1"
-#expand buttons="accept,cancel__HELP_BUTTON__,extra2"
+  buttons="accept,cancel,extra2"
   buttonlabelextra2="&examineCert.label;"
   buttonaccesskeyextra2="&examineCert.accesskey;"
   ondialogaccept="return doOK();"
   ondialogcancel="return doCancel();"
-  ondialoghelp="openHelp('priv_key_copy');"
   ondialogextra2="viewCert();"
   onload="onLoad();">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/escrowWarn.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <description>&escrowWarn.message1;</description>
   <separator/>
diff --git a/mozilla/security/manager/pki/resources/content/getp12password.xul b/mozilla/security/manager/pki/resources/content/getp12password.xul
index 17512d57428..febb4070020 100644
--- a/mozilla/security/manager/pki/resources/content/getp12password.xul
+++ b/mozilla/security/manager/pki/resources/content/getp12password.xul
@@ -45,13 +45,11 @@
 <dialog id="getp12password" title="&pkcs12.getpassword.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 30em;"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return getPassword();"
-  ondialoghelp="openHelp('my_certs');"
   onload="onP12Load(false);">
 
   <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <description>&pkcs12.getpassword.message;</description>
   <separator />
diff --git a/mozilla/security/manager/pki/resources/content/newserver.xul b/mozilla/security/manager/pki/resources/content/newserver.xul
index e72c9677d05..460c72c7085 100644
--- a/mozilla/security/manager/pki/resources/content/newserver.xul
+++ b/mozilla/security/manager/pki/resources/content/newserver.xul
@@ -47,19 +47,17 @@
 %pippkiDTD;
 ]>
 
-<dialog id="ssl_warning" title="&newserver.title;"
+<dialog id="newServerDialog" title="&newserver.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   style="width: 47em;"
   onload="onLoad();"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return doOK();"
-  ondialogcancel="return doCancel();"
-  ondialoghelp="openHelp('new_web_cert');">
+  ondialogcancel="return doCancel();">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/newserver.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
 <stringbundle id="newserver_bundle" src="chrome://pippki/locale/newserver.properties"/>
 
diff --git a/mozilla/security/manager/pki/resources/content/pref-crlupdate.js b/mozilla/security/manager/pki/resources/content/pref-crlupdate.js
index fcdaeda5e4c..39314c1b1bb 100644
--- a/mozilla/security/manager/pki/resources/content/pref-crlupdate.js
+++ b/mozilla/security/manager/pki/resources/content/pref-crlupdate.js
@@ -210,11 +210,6 @@ function onCancel()
   return true;
 }
 
-function doHelpButton()
-{
-  openHelp("validation-crl-auto-update-prefs");
-}
-
 function onAccept()
 {
    if(!validatePrefs())
diff --git a/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul b/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul
index 9d79bef3645..2dd638a138e 100644
--- a/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul
+++ b/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul
@@ -44,12 +44,10 @@
   title="&validation.crl.autoupdate.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
   onload="onLoad();"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return onAccept();"
-  ondialogcancel="return onCancel();"
-  ondialoghelp="return doHelpButton();">
+  ondialogcancel="return onCancel();">
 
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
   <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
   <script type="application/x-javascript" src="chrome://pippki/content/pref-crlupdate.js" />
diff --git a/mozilla/security/manager/pki/resources/content/resetpassword.xul b/mozilla/security/manager/pki/resources/content/resetpassword.xul
index f220310c275..a319228f354 100644
--- a/mozilla/security/manager/pki/resources/content/resetpassword.xul
+++ b/mozilla/security/manager/pki/resources/content/resetpassword.xul
@@ -41,17 +41,15 @@
 
 <dialog id="reset_password" title="&resetPassword.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-#expand buttons="accept,cancel__HELP__"
+  buttons="accept,cancel"
   buttonlabelaccept="&resetPasswordButtonLabel;"
   defaultButton="cancel"
   ondialogaccept="return resetPassword();"
-  ondialoghelp="openHelp('reset_pwd');"
   style="width: 40em;" onload="onLoad();">
 
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
   <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/resetpassword.js"/>
 
   <hbox flex="1">
diff --git a/mozilla/security/manager/pki/resources/content/serverCertExpired.xul b/mozilla/security/manager/pki/resources/content/serverCertExpired.xul
index 7cf36394a09..42d0219ec74 100644
--- a/mozilla/security/manager/pki/resources/content/serverCertExpired.xul
+++ b/mozilla/security/manager/pki/resources/content/serverCertExpired.xul
@@ -44,22 +44,19 @@
 <dialog id="serverCertExpired"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 30em;"
-  spacerflex="1"
-#expand buttons="accept,cancel__HELP_BUTTON__,extra2"
+  buttons="accept,cancel,extra2"
   buttonlabelaccept="&serverCertExpired.accept.label;"
   buttonlabelextra2="&examineCert.label;"
   buttonaccesskeyextra2="&examineCert.accesskey;"
   defaultButton="accept"
   ondialogaccept="return doOK();"
   ondialogcancel="return doCancel();"
-  ondialoghelp="openHelp('exp_web_cert');"
   ondialogextra2="viewCert();"
   onload="onLoad();">
 
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
 <script type="application/x-javascript" src="chrome://pippki/content/serverCertExpired.js"/>
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <description id="message1"/>
   <separator/>
diff --git a/mozilla/security/manager/pki/resources/content/serverCrlNextupdate.xul b/mozilla/security/manager/pki/resources/content/serverCrlNextupdate.xul
index 9e875d66350..b411f9790e6 100644
--- a/mozilla/security/manager/pki/resources/content/serverCrlNextupdate.xul
+++ b/mozilla/security/manager/pki/resources/content/serverCrlNextupdate.xul
@@ -48,7 +48,7 @@
   id="serverCrlNextupdate"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 30em;"
-#expand buttons="accept__HELP_BUTTON__"
+  buttons="accept"
   defaultButton="accept"
   ondialoghelp="openHelp('exp_crl');"
   onload="onLoad();"
@@ -56,7 +56,6 @@
 <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 <script type="application/x-javascript" src="chrome://pippki/content/pippki.js" />
 <script type="application/x-javascript" src="chrome://pippki/content/serverCrlNextupdate.js" />
-<script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
 
   <description id="message1"/>
   <separator/>
diff --git a/mozilla/security/manager/pki/resources/content/setp12password.xul b/mozilla/security/manager/pki/resources/content/setp12password.xul
index c564c2ae672..85ed6568bb8 100644
--- a/mozilla/security/manager/pki/resources/content/setp12password.xul
+++ b/mozilla/security/manager/pki/resources/content/setp12password.xul
@@ -45,13 +45,11 @@
 <dialog id="setp12password" title="&pkcs12.setpassword.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 48em;"
-#expand buttons="accept,cancel__HELP_BUTTON__"
+  buttons="accept,cancel"
   ondialogaccept="return setP12Password();"
-  ondialoghelp="openHelp('cert_backup_pwd');"
   onload="onP12Load(true);">
 
   <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <description>&pkcs12.setpassword.message;</description>
   <separator />
diff --git a/mozilla/security/manager/pki/resources/jar.mn b/mozilla/security/manager/pki/resources/jar.mn
index cb2025de059..6a760ebe47e 100644
--- a/mozilla/security/manager/pki/resources/jar.mn
+++ b/mozilla/security/manager/pki/resources/jar.mn
@@ -4,10 +4,10 @@ pippki.jar:
 #else
 *   content/pippki/contents.rdf              (content/contents.rdf)
 #endif
-*   content/pippki/changepassword.xul        (content/changepassword.xul)
+    content/pippki/changepassword.xul        (content/changepassword.xul)
     content/pippki/getpassword.xul           (content/getpassword.xul)
     content/pippki/password.js               (content/password.js)
-*   content/pippki/resetpassword.xul         (content/resetpassword.xul)
+    content/pippki/resetpassword.xul         (content/resetpassword.xul)
     content/pippki/resetpassword.js          (content/resetpassword.js)
     content/pippki/PrefOverlay.xul           (content/PrefOverlay.xul)
     content/pippki/pref-security.js          (content/pref-security.js)
@@ -15,57 +15,57 @@ pippki.jar:
     content/pippki/pref-certs.xul            (content/pref-certs.xul)
     content/pippki/PageInfoOverlay.xul       (content/PageInfoOverlay.xul)
 *   content/pippki/newserver.js              (content/newserver.js)
-*   content/pippki/newserver.xul             (content/newserver.xul)
+    content/pippki/newserver.xul             (content/newserver.xul)
     content/pippki/downloadcert.js           (content/downloadcert.js)
-*   content/pippki/downloadcert.xul          (content/downloadcert.xul)
+    content/pippki/downloadcert.xul          (content/downloadcert.xul)
     content/pippki/cacertexists.xul          (content/cacertexists.xul)
     content/pippki/certManager.js            (content/certManager.js)
-*   content/pippki/certManager.xul           (content/certManager.xul)
+    content/pippki/certManager.xul           (content/certManager.xul)
     content/pippki/CAOverlay.xul             (content/CAOverlay.xul)
     content/pippki/WebSitesOverlay.xul       (content/WebSitesOverlay.xul)
     content/pippki/OthersOverlay.xul         (content/OthersOverlay.xul)
     content/pippki/MineOverlay.xul           (content/MineOverlay.xul)
     content/pippki/viewCertDetails.xul       (content/viewCertDetails.xul)
-*   content/pippki/editcacert.xul            (content/editcacert.xul)
-*   content/pippki/editemailcert.xul         (content/editemailcert.xul)
-*   content/pippki/editsslcert.xul           (content/editsslcert.xul)
+    content/pippki/editcacert.xul            (content/editcacert.xul)
+    content/pippki/editemailcert.xul         (content/editemailcert.xul)
+    content/pippki/editsslcert.xul           (content/editsslcert.xul)
     content/pippki/editcerts.js              (content/editcerts.js)
-*   content/pippki/deletecert.xul            (content/deletecert.xul)
+    content/pippki/deletecert.xul            (content/deletecert.xul)
     content/pippki/deletecert.js             (content/deletecert.js)
     content/pippki/viewCertDetails.js        (content/viewCertDetails.js)
-*   content/pippki/getp12password.xul        (content/getp12password.xul)
-*   content/pippki/setp12password.xul        (content/setp12password.xul)
+    content/pippki/getp12password.xul        (content/getp12password.xul)
+    content/pippki/setp12password.xul        (content/setp12password.xul)
     content/pippki/pippki.js                 (content/pippki.js)
-*   content/pippki/domainMismatch.xul        (content/domainMismatch.xul)
+    content/pippki/domainMismatch.xul        (content/domainMismatch.xul)
     content/pippki/domainMismatch.js         (content/domainMismatch.js)
-*   content/pippki/serverCertExpired.xul     (content/serverCertExpired.xul)
+    content/pippki/serverCertExpired.xul     (content/serverCertExpired.xul)
     content/pippki/serverCertExpired.js      (content/serverCertExpired.js)
-*   content/pippki/clientauthask.xul	       (content/clientauthask.xul)
+    content/pippki/clientauthask.xul	     (content/clientauthask.xul)
     content/pippki/clientauthask.js          (content/clientauthask.js)
     content/pippki/certpicker.xul	           (content/certpicker.xul)
     content/pippki/certpicker.js             (content/certpicker.js)
-*   content/pippki/certViewer.xul            (content/certViewer.xul)
+    content/pippki/certViewer.xul            (content/certViewer.xul)
     content/pippki/certDump.xul              (content/certDump.xul)
-*   content/pippki/device_manager.xul        (content/device_manager.xul)
+    content/pippki/device_manager.xul        (content/device_manager.xul)
     content/pippki/device_manager.js         (content/device_manager.js)
     content/pippki/load_device.xul           (content/load_device.xul)
-*   content/pippki/choosetoken.xul           (content/choosetoken.xul)
+    content/pippki/choosetoken.xul           (content/choosetoken.xul)
     content/pippki/choosetoken.js            (content/choosetoken.js)
-*   content/pippki/escrowWarn.xul            (content/escrowWarn.xul)
+    content/pippki/escrowWarn.xul            (content/escrowWarn.xul)
     content/pippki/escrowWarn.js             (content/escrowWarn.js)
     content/pippki/pref-validation.xul       (content/pref-validation.xul)
     content/pippki/pref-validation.js        (content/pref-validation.js)
-*   content/pippki/crlManager.xul            (content/crlManager.xul)
+    content/pippki/crlManager.xul            (content/crlManager.xul)
     content/pippki/crlManager.js             (content/crlManager.js)
     content/pippki/pref-masterpass.js        (content/pref-masterpass.js)
     content/pippki/pref-masterpass.xul       (content/pref-masterpass.xul)
     content/pippki/serverCrlNextupdate.js    (content/serverCrlNextupdate.js)
-*   content/pippki/serverCrlNextupdate.xul   (content/serverCrlNextupdate.xul)
+    content/pippki/serverCrlNextupdate.xul   (content/serverCrlNextupdate.xul)
     content/pippki/createCertInfo.xul        (content/createCertInfo.xul)
     content/pippki/createCertInfo.js         (content/createCertInfo.js)
-*   content/pippki/crlImportDialog.xul       (content/crlImportDialog.xul)
+    content/pippki/crlImportDialog.xul       (content/crlImportDialog.xul)
     content/pippki/crlImportDialog.js        (content/crlImportDialog.js)
-*   content/pippki/pref-crlupdate.xul        (content/pref-crlupdate.xul)
+    content/pippki/pref-crlupdate.xul        (content/pref-crlupdate.xul)
     content/pippki/pref-crlupdate.js         (content/pref-crlupdate.js)
     content/pippki/formsigning.xul           (content/formsigning.xul)
     content/pippki/formsigning.js            (content/formsigning.js)