--- a/browser/components/preferences/in-content-new/privacy.xul
+++ b/browser/components/preferences/in-content-new/privacy.xul
@@ -548,17 +548,17 @@
         <description flex="1">
           <image class="geo-icon permission-icon" />
           <separator orient="vertical" class="thin"/>
           <label id="locationPermissionsLabel">&locationPermissions.label;</label>
         </description>
         <hbox pack="end">
           <button id="locationSettingsButton"
                   class="accessory-button"
-                  label="&permissionSettingsButton2.label;"
+                  label="&locationSettingsButton.label;"
                   accesskey="&locationSettingsButton.accesskey;"
                   searchkeywords="&removepermission2.label;
                                   &removeallpermissions2.label;
                                   &button.cancel.label;
                                   &button.ok.label;"/>
         </hbox>
       </row>
 
@@ -566,17 +566,17 @@
         <description flex="1">
           <image class="camera-icon permission-icon" />
           <separator orient="vertical" class="thin"/>
           <label id="cameraPermissionsLabel">&cameraPermissions.label;</label>
         </description>
         <hbox pack="end">
           <button id="cameraSettingsButton"
                   class="accessory-button"
-                  label="&permissionSettingsButton2.label;"
+                  label="&cameraSettingsButton.label;"
                   accesskey="&cameraSettingsButton.accesskey;"
                   searchkeywords="&removepermission2.label;
                                   &removeallpermissions2.label;
                                   &button.cancel.label;
                                   &button.ok.label;"/>
         </hbox>
       </row>
 
@@ -584,17 +584,17 @@
         <description flex="1">
           <image class="microphone-icon permission-icon" />
           <separator orient="vertical" class="thin"/>
           <label id="microphonePermissionsLabel">&microphonePermissions.label;</label>
         </description>
         <hbox pack="end">
           <button id="microphoneSettingsButton"
                   class="accessory-button"
-                  label="&permissionSettingsButton2.label;"
+                  label="&microphoneSettingsButton.label;"
                   accesskey="&microphoneSettingsButton.accesskey;"
                   searchkeywords="&removepermission2.label;
                                   &removeallpermissions2.label;
                                   &button.cancel.label;
                                   &button.ok.label;"/>
         </hbox>
       </row>
 
@@ -604,17 +604,17 @@
           <separator orient="vertical" class="thin"/>
           <label id="notificationPermissionsLabel">&notificationPermissions.label;</label>
           <label id="notificationPermissionsLearnMore"
                  class="learnMore text-link">&notificationPermissionsLearnMore.label;</label>
         </description>
         <hbox pack="end">
           <button id="notificationSettingsButton"
                   class="accessory-button"
-                  label="&permissionSettingsButton2.label;"
+                  label="&notificationSettingsButton.label;"
                   accesskey="&notificationSettingsButton.accesskey;"
                   searchkeywords="&removepermission2.label;
                                   &removeallpermissions2.label;
                                   &button.cancel.label;
                                   &button.ok.label;"/>
         </hbox>
       </row>
     </rows>

--- a/browser/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd
@@ -9,30 +9,32 @@
 
 <!ENTITY  notificationsDoNotDisturb.label      "Do not disturb me">
 <!ENTITY  notificationsDoNotDisturb.accesskey  "n">
 <!ENTITY  notificationsDoNotDisturbDetails.value "No notification will be shown until you restart &brandShortName;">
 
 <!ENTITY  popupExceptions.label                                 "Exceptions…">
 <!ENTITY  popupExceptions.accesskey                             "E">
 
-<!ENTITY  permissionSettingsButton2.label                       "Settings…">
-
 <!ENTITY  notificationPermissions.label                         "Notifications">
-<!ENTITY  notificationSettingsButton.accesskey                  "n">
+<!ENTITY  notificationSettingsButton.label                      "Settings…">
+<!ENTITY  notificationSettingsButton.accesskey                  "t">
 <!ENTITY  notificationPermissionsLearnMore.label                "Learn more">
 
 <!ENTITY  locationPermissions.label                             "Location">
-<!ENTITY  locationSettingsButton.accesskey                      "l">
+<!ENTITY  locationSettingsButton.label                          "Settings…">
+<!ENTITY  locationSettingsButton.accesskey                      "t">
 
 <!ENTITY  cameraPermissions.label                               "Camera">
-<!ENTITY  cameraSettingsButton.accesskey                        "c">
+<!ENTITY  cameraSettingsButton.label                            "Settings…">
+<!ENTITY  cameraSettingsButton.accesskey                        "t">
 
 <!ENTITY  microphonePermissions.label                           "Microphone">
-<!ENTITY  microphoneSettingsButton.accesskey                    "m">
+<!ENTITY  microphoneSettingsButton.label                        "Settings…">
+<!ENTITY  microphoneSettingsButton.accesskey                    "t">
 
 <!ENTITY  fontsAndColors.label        "Fonts &amp; Colors">
 
 <!ENTITY  defaultFont2.label          "Default font">
 <!ENTITY  defaultFont2.accesskey      "D">
 <!ENTITY  defaultSize2.label          "Size">
 <!ENTITY  defaultSize2.accesskey      "S">