--- a/browser/components/preferences/in-content-new/privacy.xul
+++ b/browser/components/preferences/in-content-new/privacy.xul
@@ -484,18 +484,18 @@
                 accesskey="&trackingProtectionExceptions.accesskey;"
                 preference="pref.privacy.disable_button.tracking_protection_exceptions"
                 searchkeywords="&removepermission.label;
                                 &removeallpermissions.label;
                                 &button.cancel.label;
                                 &button.ok.label;"/>
         <button id="changeBlockList"
                 class="accessory-button"
-                label="&changeBlockList.label;"
-                accesskey="&changeBlockList.accesskey;"
+                label="&changeBlockList2.label;"
+                accesskey="&changeBlockList2.accesskey;"
                 preference="pref.privacy.disable_button.change_blocklist"
                 searchkeywords="&button.cancel.label; &button.ok.label;"/>
       </vbox>
     </hbox>
     <vbox id="doNotTrackLearnMoreBox">
       <label>&doNotTrack.description;<label
       class="learnMore text-link" href="https://www.mozilla.org/dnt"
       >&doNotTrack.learnMore.label;</label></label>
@@ -669,18 +669,18 @@
               accesskey="&enableOCSP.accesskey;"
               onsyncfrompreference="return gPrivacyPane.readEnableOCSP();"
               onsynctopreference="return gPrivacyPane.writeEnableOCSP();"
               preference="security.OCSP.enabled"
               flex="1" />
     <vbox>
       <button id="viewCertificatesButton"
               class="accessory-button"
-              label="&viewCerts.label;"
-              accesskey="&viewCerts.accesskey;"
+              label="&viewCerts2.label;"
+              accesskey="&viewCerts2.accesskey;"
               preference="security.disable_button.openCertManager"
               searchkeywords="&certmgr.tab.mine;
                               &certmgr.tab.others2;
                               &certmgr.tab.websites3;
                               &certmgr.tab.ca;
                               &certmgr.tab.orphan2;
                               &certmgr.mine;
                               &certmgr.others;
@@ -689,18 +689,18 @@
                               &certmgr.orphans;
                               &certmgr.certname;
                               &certmgr.tokenname;
                               &certmgr.view2.label;
                               &certmgr.export.label;
                               &certmgr.delete2.label;"/>
       <button id="viewSecurityDevicesButton"
               class="accessory-button"
-              label="&viewSecurityDevices.label;"
-              accesskey="&viewSecurityDevices.accesskey;"
+              label="&viewSecurityDevices2.label;"
+              accesskey="&viewSecurityDevices2.accesskey;"
               preference="security.disable_button.openDeviceManager"
               searchkeywords="&devmgr.title;
                               &devmgr.devlist.label;
                               &devmgr.details.title;
                               &devmgr.details.title2;
                               &devmgr.button.login.label;
                               &devmgr.button.logout.label;
                               &devmgr.button.changepw.label;

--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -125,20 +125,20 @@ available. -->
 <!ENTITY certificateTab.label            "Certificates">
 <!ENTITY certPersonal2.description       "When a server requests your personal certificate">
 <!ENTITY selectCerts.auto                "Select one automatically">
 <!ENTITY selectCerts.auto.accesskey      "S">
 <!ENTITY selectCerts.ask                 "Ask you every time">
 <!ENTITY selectCerts.ask.accesskey       "A">
 <!ENTITY enableOCSP.label                "Query OCSP responder servers to confirm the current validity of certificates">
 <!ENTITY enableOCSP.accesskey            "Q">
-<!ENTITY viewCerts.label                 "View Certificates">
-<!ENTITY viewCerts.accesskey             "C">
-<!ENTITY viewSecurityDevices.label       "Security Devices">
-<!ENTITY viewSecurityDevices.accesskey   "D">
+<!ENTITY viewCerts2.label                "View Certificates…">
+<!ENTITY viewCerts2.accesskey            "C">
+<!ENTITY viewSecurityDevices2.label      "Security Devices…">
+<!ENTITY viewSecurityDevices2.accesskey  "D">
 
 <!ENTITY performance.label               "Performance">
 <!ENTITY useRecommendedPerformanceSettings2.label
                                          "Use recommended performance settings">
 <!ENTITY useRecommendedPerformanceSettings2.description
                                          "These settings are tailored to your computer’s hardware and operating system.">
 <!ENTITY useRecommendedPerformanceSettings2.accesskey
                                          "U">

--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -17,18 +17,18 @@
 
 <!-- LOCALIZATION NOTE (trackingProtectionPBM5.label): This string is displayed if privacy.trackingprotection.ui.enabled is set to true. This currently happens on the release and beta channel. -->
 <!ENTITY trackingProtectionPBM5.label         "Use Tracking Protection in Private Windows">
 <!ENTITY trackingProtectionPBM5.accesskey     "v">
 <!-- LOCALIZATION NOTE (trackingProtectionPBM6.label): This string is displayed if privacy.trackingprotection.ui.enabled is set to false. This currently happens on the nightly channel. -->
 <!ENTITY trackingProtectionPBM6.label         "Use Tracking Protection in Private Browsing to block known trackers">
 <!ENTITY trackingProtectionPBM6.accesskey     "v">
 <!ENTITY trackingProtectionPBMLearnMore.label "Learn more">
-<!ENTITY changeBlockList.label          "Change Block List">
-<!ENTITY changeBlockList.accesskey      "C">
+<!ENTITY changeBlockList2.label               "Change Block List…">
+<!ENTITY changeBlockList2.accesskey           "C">
 
 <!ENTITY  doNotTrack.description        "Send websites a “Do Not Track” signal that you don’t want to be tracked">
 <!ENTITY  doNotTrack.learnMore.label    "Learn more">
 <!ENTITY  doNotTrack.default.label      "Only when using Tracking Protection">
 <!ENTITY  doNotTrack.always.label       "Always">
 
 <!ENTITY  history.label                 "History">
 <!ENTITY  permissions.label             "Permissions">