diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NAVIGATION_TABS_GROUP.ts b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NAVIGATION_TABS_GROUP.ts
deleted file mode 100644
index 859a6b6cba..0000000000
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NAVIGATION_TABS_GROUP.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
-import { ROOT_SETTINGS_GROUP } from '@cloudbeaver/core-settings';
-
-export const NAVIGATION_TABS_GROUP = ROOT_SETTINGS_GROUP.createSubGroup('plugin_navigation_tabs_navigation_tabs_group');
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/shared/NavigationTabsBarTab.module.css b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/shared/NavigationTabsBarTab.module.css
index 4814e4c86c..a47eeb356d 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/shared/NavigationTabsBarTab.module.css
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsBar/shared/NavigationTabsBarTab.module.css
@@ -9,6 +9,9 @@
 .tab {
   composes: theme-ripple theme-background-background theme-text-text-primary-on-light from global;
   height: 38px !important;
+}
+
+.tabOuter {
   border: 1px solid color-mix(in srgb, transparent, var(--theme-on-secondary) 10%);
   border-top: none;
   border-left: none;
diff --git a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsSettingsService.ts b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsSettingsService.ts
index fb6bd81c68..873b64be00 100644
--- a/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsSettingsService.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/NavigationTabs/NavigationTabsSettingsService.ts
@@ -7,9 +7,14 @@
  */
 
 import { Dependency, injectable } from '@cloudbeaver/core-di';
-import { ESettingsValueType, SettingsManagerService, SettingsProvider, SettingsProviderService } from '@cloudbeaver/core-settings';
+import {
+  ESettingsValueType,
+  INTERFACE_SETTINGS_GROUP,
+  SettingsManagerService,
+  SettingsProvider,
+  SettingsProviderService,
+} from '@cloudbeaver/core-settings';
 import { schema, schemaExtra } from '@cloudbeaver/core-utils';
-import { NAVIGATION_TABS_GROUP } from './NAVIGATION_TABS_GROUP.js';
 
 const settings = schema.object({
   'plugin.navigation-tabs.multipleRows': schemaExtra.stringedBoolean().default(false),
@@ -38,7 +43,7 @@ export class NavigationTabsSettingsService extends Dependency {
   private registerSettings() {
     this.settingsManagerService.registerSettings(this.settings, () => [
       {
-        group: NAVIGATION_TABS_GROUP,
+        group: INTERFACE_SETTINGS_GROUP,
         key: 'plugin.navigation-tabs.multipleRows',
         access: {
           scope: ['client'],
diff --git a/webapp/packages/plugin-navigation-tabs/src/locales/en.ts b/webapp/packages/plugin-navigation-tabs/src/locales/en.ts
index c412fbfaf3..be4c3056fb 100644
--- a/webapp/packages/plugin-navigation-tabs/src/locales/en.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/locales/en.ts
@@ -1,6 +1,6 @@
 export default [
   ['plugin_navigation_tabs_welcome_start', 'Start'],
   ['plugin_navigation_tabs_navigation_tabs_group', 'Navigation Tabs'],
-  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows'],
+  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows for tabs'],
   ['plugin_navigation_tabs_multiple_rows_description', 'Display navigation tabs in multiple rows instead of scrolling'],
 ];
diff --git a/webapp/packages/plugin-navigation-tabs/src/locales/fr.ts b/webapp/packages/plugin-navigation-tabs/src/locales/fr.ts
index 11587306b8..9a076388fd 100644
--- a/webapp/packages/plugin-navigation-tabs/src/locales/fr.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/locales/fr.ts
@@ -1,6 +1,6 @@
 export default [
   ['plugin_navigation_tabs_welcome_start', 'Démarrer'],
   ['plugin_navigation_tabs_navigation_tabs_group', 'Navigation Tabs'],
-  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows'],
+  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows for tabs'],
   ['plugin_navigation_tabs_multiple_rows_description', 'Display navigation tabs in multiple rows instead of scrolling'],
 ];
diff --git a/webapp/packages/plugin-navigation-tabs/src/locales/it.ts b/webapp/packages/plugin-navigation-tabs/src/locales/it.ts
index e9dc518609..08219993b8 100644
--- a/webapp/packages/plugin-navigation-tabs/src/locales/it.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/locales/it.ts
@@ -1,6 +1,6 @@
 export default [
   ['plugin_navigation_tabs_welcome_start', 'Inizia'],
   ['plugin_navigation_tabs_navigation_tabs_group', 'Navigation Tabs'],
-  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows'],
+  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows for tabs'],
   ['plugin_navigation_tabs_multiple_rows_description', 'Display navigation tabs in multiple rows instead of scrolling'],
 ];
diff --git a/webapp/packages/plugin-navigation-tabs/src/locales/ru.ts b/webapp/packages/plugin-navigation-tabs/src/locales/ru.ts
index d003d1f99d..6da0d19515 100644
--- a/webapp/packages/plugin-navigation-tabs/src/locales/ru.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/locales/ru.ts
@@ -1,6 +1,6 @@
 export default [
   ['plugin_navigation_tabs_welcome_start', 'Начать'],
   ['plugin_navigation_tabs_navigation_tabs_group', 'Навигационные вкладки'],
-  ['plugin_navigation_tabs_multiple_rows', 'Мульти строчные вкладки'],
+  ['plugin_navigation_tabs_multiple_rows', 'Несколько строк для вкладок'],
   ['plugin_navigation_tabs_multiple_rows_description', 'Выключить прокрутку навигационных вкладок и отображать их в нескольких строках'],
 ];
diff --git a/webapp/packages/plugin-navigation-tabs/src/locales/vi.ts b/webapp/packages/plugin-navigation-tabs/src/locales/vi.ts
index c15fa0ca18..e958ed2f8d 100644
--- a/webapp/packages/plugin-navigation-tabs/src/locales/vi.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/locales/vi.ts
@@ -1,6 +1,6 @@
 export default [
   ['plugin_navigation_tabs_welcome_start', 'Bắt đầu'],
   ['plugin_navigation_tabs_navigation_tabs_group', 'Navigation Tabs'],
-  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows'],
+  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows for tabs'],
   ['plugin_navigation_tabs_multiple_rows_description', 'Enable multiple rows for navigation tabs'],
 ];
diff --git a/webapp/packages/plugin-navigation-tabs/src/locales/zh.ts b/webapp/packages/plugin-navigation-tabs/src/locales/zh.ts
index ae6383589e..9f5b29f065 100644
--- a/webapp/packages/plugin-navigation-tabs/src/locales/zh.ts
+++ b/webapp/packages/plugin-navigation-tabs/src/locales/zh.ts
@@ -1,6 +1,6 @@
 export default [
   ['plugin_navigation_tabs_welcome_start', '开始'],
   ['plugin_navigation_tabs_navigation_tabs_group', 'Navigation Tabs'],
-  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows'],
+  ['plugin_navigation_tabs_multiple_rows', 'Multiple rows for tabs'],
   ['plugin_navigation_tabs_multiple_rows_description', 'Display navigation tabs in multiple rows instead of scrolling'],
 ];