diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index e1e4f2e4..46655400 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -381,8 +381,8 @@
   "editorCodeLabel": {
     "message": "Code"
   },
-  "editorSettingLabel": {
-    "message": "Settings"
+  "editorSettings": {
+    "message": "Editor settings"
   },
   "enableStyleLabel": {
     "message": "Enable",
@@ -1452,6 +1452,10 @@
     "message": "Sections",
     "description": "Header for the table of contents block listing style section names in the left panel of the classic editor"
   },
+  "settings": {
+    "message": "Settings",
+    "description": "Generic label/title for settings"
+  },
   "shortcuts": {
     "message": "Shortcuts",
     "description": "Go to shortcut configuration"
@@ -1623,6 +1627,10 @@
     "message": "Save",
     "description": "Label for save button for style editing"
   },
+  "styleSettings": {
+    "message": "Style settings",
+    "description": "Label/title for style settings dialog"
+  },
   "styleToMozillaFormatHelp": {
     "message": "The Mozilla format of the code can be submitted to userstyles.org and used with the classic Stylish for Firefox",
     "description": "Help info for the Mozilla format header section that converts the code to/from Mozilla format"
diff --git a/edit.html b/edit.html
index 71c97766..79881afc 100644
--- a/edit.html
+++ b/edit.html
@@ -315,7 +315,7 @@
         <div>
           <button id="save-button" i18n-text="styleSaveLabel" data-hotkey-tooltip="save" disabled></button>
           <button id="beautify" i18n-text="styleBeautify"></button>
-          <button id="style-cfg-btn" i18n-text="editorSettingLabel"></button>
+          <button id="style-cfg-btn" i18n-text="settings"></button>
           <button id="cancel-button" i18n-title="styleCancelEditLabel">↩</button>
         </div>
         <div id="mozilla-format-buttons" class="sectioned-only">
@@ -329,7 +329,7 @@
       </section>
       <div id="details-wrapper">
         <details id="options" data-pref="editor.options.expanded" class="ignore-pref-if-compact">
-          <summary><h2 id="options-heading" i18n-text="optionsHeading"></h2></summary>
+          <summary><h2 id="options-heading" i18n-text="editorSettings"></h2></summary>
           <div id="options-wrapper">
             <div class="options-column">
               <div class="option">
diff --git a/edit/settings.js b/edit/settings.js
index a1ed0966..f74037a4 100644
--- a/edit/settings.js
+++ b/edit/settings.js
@@ -21,7 +21,7 @@ function StyleSettings() {
   ];
   update(style);
   editor.on('styleUpdated', update);
-  helpPopup.show(t('editorSettingLabel'), $create([
+  helpPopup.show(t('styleSettings'), $create([
     ui,
     $create('.buttons', [
       $create('button', {