diff --git a/packages/web/src/icons/FontIcon.svelte b/packages/web/src/icons/FontIcon.svelte
index 2c5cc0bfb..6593016be 100644
--- a/packages/web/src/icons/FontIcon.svelte
+++ b/packages/web/src/icons/FontIcon.svelte
@@ -40,8 +40,8 @@
     'icon columns': 'mdi mdi-view-column',
     'icon columns-outline': 'mdi mdi-view-column-outline',
 
-    'icon single-database-mode': 'mdi mdi-database-lock',
-    'icon multi-database-mode': 'mdi mdi-database-eye',
+    'icon locked-database-mode': 'mdi mdi-database-lock',
+    'icon unlocked-database-mode': 'mdi mdi-database-eye',
 
     'icon database': 'mdi mdi-database',
     'icon server': 'mdi mdi-server',
diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte
index 674774c90..c111d67c7 100644
--- a/packages/web/src/settings/SettingsModal.svelte
+++ b/packages/web/src/settings/SettingsModal.svelte
@@ -24,7 +24,7 @@
     currentEditorTheme,
     extensions,
     selectedWidget,
-    singleDatabaseMode,
+    lockedDatabaseMode,
     visibleWidgetSideBar,
   } from '../stores';
   import { isMac } from '../utility/common';
@@ -115,11 +115,11 @@ ORDER BY
             type="checkbox"
             labelProps={{
               onClick: () => {
-                $singleDatabaseMode = !$singleDatabaseMode;
+                $lockedDatabaseMode = !$lockedDatabaseMode;
               },
             }}
           >
-            <CheckboxField checked={$singleDatabaseMode} on:change={e => ($singleDatabaseMode = e.target.checked)} />
+            <CheckboxField checked={$lockedDatabaseMode} on:change={e => ($lockedDatabaseMode = e.target.checked)} />
           </FormFieldTemplateLarge>
 
           <FormCheckboxField
diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts
index 17967188c..658ee4f30 100644
--- a/packages/web/src/stores.ts
+++ b/packages/web/src/stores.ts
@@ -50,7 +50,7 @@ function subscribeCssVariable(store, transform, cssVariable) {
 }
 
 export const selectedWidget = writableWithStorage('database', 'selectedWidget');
-export const singleDatabaseMode = writableWithStorage<boolean>(false, 'singleDatabaseMode');
+export const lockedDatabaseMode = writableWithStorage<boolean>(false, 'lockedDatabaseMode');
 export const visibleWidgetSideBar = writableWithStorage(true, 'visibleWidgetSideBar');
 export const visibleSelectedWidget = derived(
   [selectedWidget, visibleWidgetSideBar],
@@ -138,7 +138,7 @@ subscribeCssVariable(visibleSelectedWidget, x => (x ? 1 : 0), '--dim-visible-lef
 // subscribeCssVariable(visibleToolbar, x => (x ? 1 : 0), '--dim-visible-toolbar');
 subscribeCssVariable(leftPanelWidth, x => `${x}px`, '--dim-left-panel-width');
 subscribeCssVariable(visibleTitleBar, x => (x ? 1 : 0), '--dim-visible-titlebar');
-subscribeCssVariable(singleDatabaseMode, x => (x ? 0 : 1), '--dim-visible-tabs-databases');
+subscribeCssVariable(lockedDatabaseMode, x => (x ? 0 : 1), '--dim-visible-tabs-databases');
 
 let activeTabIdValue = null;
 activeTabId.subscribe(value => {
@@ -200,11 +200,11 @@ pinnedDatabases.subscribe(value => {
 });
 export const getPinnedDatabases = () => _.compact(pinnedDatabasesValue);
 
-let singleDatabaseModeValue = null;
-singleDatabaseMode.subscribe(value => {
-  singleDatabaseModeValue = value;
+let lockedDatabaseModeValue = null;
+lockedDatabaseMode.subscribe(value => {
+  lockedDatabaseModeValue = value;
 });
-export const getSingleDatabaseMode = () => singleDatabaseModeValue;
+export const getLockedDatabaseMode = () => lockedDatabaseModeValue;
 
 let currentDatabaseValue = null;
 currentDatabase.subscribe(value => {
diff --git a/packages/web/src/utility/changeCurrentDbByTab.ts b/packages/web/src/utility/changeCurrentDbByTab.ts
index 46424320f..3f4ba1a23 100644
--- a/packages/web/src/utility/changeCurrentDbByTab.ts
+++ b/packages/web/src/utility/changeCurrentDbByTab.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { currentDatabase, getCurrentDatabase, getSingleDatabaseMode, openedTabs } from '../stores';
+import { currentDatabase, getCurrentDatabase, getLockedDatabaseMode, openedTabs } from '../stores';
 import { shouldShowTab } from '../widgets/TabsPanel.svelte';
 import { callWhenAppLoaded } from './appLoadManager';
 import { getConnectionInfo } from './metadataLoaders';
@@ -9,7 +9,7 @@ let lastCurrentTab = null;
 openedTabs.subscribe(value => {
   const newCurrentTab = (value || []).find(x => x.selected);
   if (newCurrentTab == lastCurrentTab) return;
-  if (getSingleDatabaseMode() && getCurrentDatabase()) return;
+  if (getLockedDatabaseMode() && getCurrentDatabase()) return;
 
   const lastTab = lastCurrentTab;
   lastCurrentTab = newCurrentTab;
@@ -31,7 +31,7 @@ openedTabs.subscribe(value => {
 });
 
 currentDatabase.subscribe(currentDb => {
-  if (!getSingleDatabaseMode()) return;
+  if (!getLockedDatabaseMode()) return;
   openedTabs.update(tabs => {
     const newTabs = tabs.map(tab => ({
       ...tab,
diff --git a/packages/web/src/widgets/TabsPanel.svelte b/packages/web/src/widgets/TabsPanel.svelte
index 5df04a1d5..39bbba912 100644
--- a/packages/web/src/widgets/TabsPanel.svelte
+++ b/packages/web/src/widgets/TabsPanel.svelte
@@ -1,11 +1,11 @@
 <script lang="ts" context="module">
   const getCurrentValueMarker: any = {};
 
-  export function shouldShowTab(tab, singleDbMode = getCurrentValueMarker, currentDb = getCurrentValueMarker) {
-    if (singleDbMode == getCurrentValueMarker) {
-      singleDbMode = getSingleDatabaseMode();
+  export function shouldShowTab(tab, lockedDbMode = getCurrentValueMarker, currentDb = getCurrentValueMarker) {
+    if (lockedDbMode == getCurrentValueMarker) {
+      lockedDbMode = getLockedDatabaseMode();
     }
-    if (singleDbMode) {
+    if (lockedDbMode) {
       if (currentDb == getCurrentValueMarker) {
         currentDb = getCurrentDatabase();
       }
@@ -250,8 +250,8 @@
     activeTabId,
     getActiveTabId,
     getCurrentDatabase,
-    singleDatabaseMode,
-    getSingleDatabaseMode,
+    lockedDatabaseMode,
+    getLockedDatabaseMode,
   } from '../stores';
   import tabs from '../tabs';
   import { setSelectedTab } from '../utility/common';
@@ -264,7 +264,7 @@
   import TabCloseButton from '../elements/TabCloseButton.svelte';
   import CloseTabModal from '../modals/CloseTabModal.svelte';
 
-  $: showTabFilterFunc = tab => shouldShowTab(tab, $singleDatabaseMode, $currentDatabase);
+  $: showTabFilterFunc = tab => shouldShowTab(tab, $lockedDatabaseMode, $currentDatabase);
   $: connectionList = useConnectionList();
 
   $: currentDbKey =
@@ -443,7 +443,7 @@
   <div class="tabs" on:wheel={handleTabsWheel} bind:this={domTabs}>
     {#each groupedTabs as tabGroup}
       <div class="db-wrapper">
-        {#if !$singleDatabaseMode}
+        {#if !$lockedDatabaseMode}
           <div
             class="db-name"
             class:selected={draggingDbGroup
diff --git a/packages/web/src/widgets/WidgetIconPanel.svelte b/packages/web/src/widgets/WidgetIconPanel.svelte
index f4ea164a4..58cd206da 100644
--- a/packages/web/src/widgets/WidgetIconPanel.svelte
+++ b/packages/web/src/widgets/WidgetIconPanel.svelte
@@ -7,7 +7,7 @@
     visibleSelectedWidget,
     visibleWidgetSideBar,
     visibleHamburgerMenuWidget,
-    singleDatabaseMode,
+    lockedDatabaseMode,
   } from '../stores';
   import mainMenuDefinition from '../../../../app/src/mainMenuDefinition';
   import hasPermission from '../utility/hasPermission';
@@ -112,12 +112,12 @@
 
   <div
     class="wrapper"
-    title={`Toggle whether tabs from all databases are visible. Currently - ${$singleDatabaseMode ? 'NO' : 'YES'}`}
+    title={`Toggle whether tabs from all databases are visible. Currently - ${$lockedDatabaseMode ? 'NO' : 'YES'}`}
     on:click={() => {
-      $singleDatabaseMode = !$singleDatabaseMode;
+      $lockedDatabaseMode = !$lockedDatabaseMode;
     }}
   >
-    <FontIcon icon={$singleDatabaseMode ? 'icon single-database-mode' : 'icon multi-database-mode'} />
+    <FontIcon icon={$lockedDatabaseMode ? 'icon locked-database-mode' : 'icon unlocked-database-mode'} />
   </div>
   <div class="wrapper" on:click={handleSettingsMenu} bind:this={domSettings}>
     <FontIcon icon="icon settings" />