diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html
index 551ea2d10d..eda615c653 100644
--- a/apps/desktop/src/app/accounts/settings.component.html
+++ b/apps/desktop/src/app/accounts/settings.component.html
@@ -174,10 +174,10 @@
                       [(ngModel)]="enableFavicons"
                       (change)="saveFavicons()"
                     />
-                    {{ "enableFavicon" | i18n }}
+                    {{ "showWebsiteIcons" | i18n }}
                   </label>
                 </div>
-                <small class="help-block">{{ "faviconDesc" | i18n }}</small>
+                <small class="help-block">{{ "showWebsiteIconsDesc" | i18n }}</small>
               </div>
             </ng-container>
           </div>
@@ -305,10 +305,10 @@
                       [(ngModel)]="enableBrowserIntegration"
                       (change)="saveBrowserIntegration()"
                     />
-                    {{ "enableBrowserIntegration" | i18n }}
+                    {{ "allowBrowserIntegration" | i18n }}
                   </label>
                 </div>
-                <small class="help-block">{{ "enableBrowserIntegrationDesc" | i18n }}</small>
+                <small class="help-block">{{ "allowBrowserIntegrationDesc" | i18n }}</small>
               </div>
               <div class="form-group">
                 <div class="checkbox">
@@ -321,11 +321,11 @@
                       (change)="saveBrowserIntegrationFingerprint()"
                       [disabled]="!enableBrowserIntegration"
                     />
-                    {{ "enableBrowserIntegrationFingerprint" | i18n }}
+                    {{ "requireVerificationForBrowserIntegration" | i18n }}
                   </label>
                 </div>
                 <small class="help-block">{{
-                  "enableBrowserIntegrationFingerprintDesc" | i18n
+                  "requireVerificationForBrowserIntegrationDesc" | i18n
                 }}</small>
               </div>
               <div class="form-group">
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index 79396679c7..fe522c0f34 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -81,7 +81,7 @@ export class SettingsComponent implements OnInit {
     // Workaround to avoid ghosting trays https://github.com/electron/electron/issues/17622
     this.requireEnableTray = this.platformUtilsService.getDevice() === DeviceType.LinuxDesktop;
 
-    const trayKey = isMac ? "enableMenuBar" : "enableTray";
+    const trayKey = isMac ? "showMenuBarIcon" : "showTrayIcon";
     this.enableTrayText = this.i18nService.t(trayKey);
     this.enableTrayDescText = this.i18nService.t(trayKey + "Desc");
 
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index b1c783516c..011d1586e9 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -894,10 +894,10 @@
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "enableFavicon": {
+  "showWebsiteIcons": {
     "message": "Show website icons"
   },
-  "faviconDesc": {
+  "showWebsiteIconsDesc": {
     "message": "Show a recognizable image next to each login."
   },
   "enableMinToTray": {
@@ -924,10 +924,10 @@
   "enableCloseToMenuBarDesc": {
     "message": "When closing the window, show an icon in the menu bar instead."
   },
-  "enableTray": {
-    "message": "Enable tray icon"
+  "showTrayIcon": {
+    "message": "Show tray icon"
   },
-  "enableTrayDesc": {
+  "showTrayIconDesc": {
     "message": "Always show an icon in the system tray."
   },
   "startToTray": {
@@ -1381,10 +1381,10 @@
   "touchIdConsentMessage": {
     "message": "unlock your vault"
   },
-  "autoPromptWindowsHello": {
+  "askForWindowsHelloOnLaunch": {
     "message": "Ask for Windows Hello on launch"
   },
-  "autoPromptTouchId": {
+  "askForTouchIdOnLaunch": {
     "message": "Ask for Touch ID on launch"
   },
   "lockWithMasterPassOnRestart": {
@@ -1393,10 +1393,10 @@
   "preferences": {
     "message": "Preferences"
   },
-  "enableMenuBar": {
+  "showMenuBarIcon": {
     "message": "Show menu bar icon"
   },
-  "enableMenuBarDesc": {
+  "showMenuBarIconDesc": {
     "message": "Always show an icon in the menu bar."
   },
   "hideToMenuBar": {
@@ -1546,10 +1546,10 @@
   "acceptPoliciesError": {
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
-  "enableBrowserIntegration": {
+  "allowBrowserIntegration": {
     "message": "Allow browser integration"
   },
-  "enableBrowserIntegrationDesc": {
+  "allowBrowserIntegrationDesc": {
     "message": "Browser integration is used for biometrics in browser."
   },
   "browserIntegrationUnsupportedTitle": {
@@ -1564,10 +1564,10 @@
   "browserIntegrationLinuxDesc": {
     "message": "Unfortunately browser integration is currently not supported in the linux version."
   },
-  "enableBrowserIntegrationFingerprint": {
+  "requireVerificationForBrowserIntegration": {
     "message": "Require verification for browser integration"
   },
-  "enableBrowserIntegrationFingerprintDesc": {
+  "requireVerificationForBrowserIntegrationDesc": {
     "message": "Add an additional layer of security by requiring fingerprint phrase confirmation when establishing a link between your desktop and browser. This requires user action and verification each time a connection is created."
   },
   "approve": {
diff --git a/apps/desktop/src/main/biometric/biometric.darwin.main.ts b/apps/desktop/src/main/biometric/biometric.darwin.main.ts
index 2b1b644476..13ff7628d5 100644
--- a/apps/desktop/src/main/biometric/biometric.darwin.main.ts
+++ b/apps/desktop/src/main/biometric/biometric.darwin.main.ts
@@ -13,7 +13,7 @@ export default class BiometricDarwinMain implements BiometricMain {
   async init() {
     await this.stateService.setEnableBiometric(await this.supportsBiometric());
     await this.stateService.setBiometricText("unlockWithTouchId");
-    await this.stateService.setNoAutoPromptBiometricsText("autoPromptTouchId");
+    await this.stateService.setNoAutoPromptBiometricsText("askForTouchIdOnLaunch");
 
     // eslint-disable-next-line
     ipcMain.on("biometric", async (event: any, message: any) => {
diff --git a/apps/desktop/src/main/biometric/biometric.windows.main.ts b/apps/desktop/src/main/biometric/biometric.windows.main.ts
index c584f6ccfe..6690171319 100644
--- a/apps/desktop/src/main/biometric/biometric.windows.main.ts
+++ b/apps/desktop/src/main/biometric/biometric.windows.main.ts
@@ -31,7 +31,7 @@ export default class BiometricWindowsMain implements BiometricMain {
     }
     await this.stateService.setEnableBiometric(supportsBiometric);
     await this.stateService.setBiometricText("unlockWithWindowsHello");
-    await this.stateService.setNoAutoPromptBiometricsText("autoPromptWindowsHello");
+    await this.stateService.setNoAutoPromptBiometricsText("askForWindowsHelloOnLaunch");
 
     ipcMain.on("biometric", async (event: any, message: any) => {
       event.returnValue = await this.authenticateBiometric();