diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index 1b6db8bdc..100bb6332 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -767,6 +767,19 @@ if (isProApp()) {
 }
 
 if (hasPermission('settings/change')) {
+  registerCommand({
+    id: 'settings.settingsTab',
+    category: __t('command.settings', { defaultMessage: 'Settings' }),
+    name: __t('command.settings.settingsTab', { defaultMessage: 'Settings tab' }),
+    onClick: () => {
+      openNewTab({
+        title: _t('command.settings.settingsTab', { defaultMessage: 'Settings tab' }),
+        icon: 'icon settings',
+        tabComponent: 'SettingsTab',
+        props: {},
+      });
+    },
+  });
   registerCommand({
     id: 'settings.commands',
     category: __t('command.settings', { defaultMessage: 'Settings' }),
diff --git a/packages/web/src/elements/SettingsMenuControl.svelte b/packages/web/src/elements/SettingsMenuControl.svelte
new file mode 100644
index 000000000..8fc1bd875
--- /dev/null
+++ b/packages/web/src/elements/SettingsMenuControl.svelte
@@ -0,0 +1,166 @@
+<script lang="ts">
+  import _ from 'lodash';
+  import HorizontalSplitter from './HorizontalSplitter.svelte';
+
+  interface MenuItemDef {
+    label: string;
+    slot?: number;
+    component?: any;
+    props?: any;
+    testid?: string;
+    identifier?: string;
+  }
+
+  export let items: MenuItemDef[];
+  export let value: string | number = 0;
+  export let containerMaxWidth = undefined;
+  export let containerMaxHeight = undefined;
+  export let flex1 = true;
+  export let flexColContainer = false;
+  export let maxHeight100 = false;
+  export let scrollableContentContainer = false;
+  export let contentTestId = undefined;
+  export let onUserChange = null;
+
+  export function setValue(index) {
+    value = index;
+  }
+  export function getValue() {
+    return value;
+  }
+</script>
+
+<div class="main" class:maxHeight100 class:flex1>
+  <HorizontalSplitter initialValue="20%">
+    <svelte:fragment slot="1">
+      <div class="menu">
+        {#each _.compact(items) as item, index}
+          <div
+            class="menu-item"
+            class:selected={value == (item.identifier ?? index)}
+            on:click={() => {
+              value = item.identifier ?? index;
+              onUserChange?.(item.identifier ?? index);
+            }}
+            data-testid={item.testid}
+          >
+            <span class="ml-2 noselect">
+              {item.label}
+            </span>
+          </div>
+        {/each}
+      </div>
+    </svelte:fragment>
+
+    <svelte:fragment slot="2">
+      <div
+        class="content-container"
+        class:scrollableContentContainer
+        style:max-height={containerMaxHeight}
+        data-testid={contentTestId}
+      >
+        {#each _.compact(items) as item, index}
+          <div
+            class="container"
+            class:flexColContainer
+            class:maxHeight100
+            class:itemVisible={(item.identifier ?? index) == value}
+            style:max-width={containerMaxWidth}
+          >
+            <svelte:component
+              this={item.component}
+              {...item.props}
+              itemVisible={(item.identifier ?? index) == value}
+              menuControlHiddenItem={(item.identifier ?? index) != value}
+            />
+          </div>
+        {/each}
+      </div>
+    </svelte:fragment>
+  </HorizontalSplitter>
+</div>
+
+<style>
+  .main {
+    display: flex;
+    flex: 1;
+  }
+
+  .main.flex1 {
+    flex: 1;
+    max-height: 100%;
+  }
+
+  .main.maxHeight100 {
+    max-height: 100%;
+  }
+
+  .menu {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    width: 100%;
+    background-color: var(--theme-bg-2);
+    overflow-y: auto;
+  }
+
+  .menu::-webkit-scrollbar {
+    width: 7px;
+  }
+
+  .menu-item {
+    white-space: nowrap;
+    padding: 12px 20px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    border-bottom: 1px solid var(--theme-border);
+    transition: background-color 0.2s ease;
+  }
+
+  .menu-item:hover {
+    background-color: var(--theme-bg-hover);
+  }
+
+  .menu-item.selected {
+    background-color: var(--theme-bg-1);
+    font-weight: 600;
+    border-left: 3px solid var(--theme-font-link);
+  }
+
+  .content-container {
+    flex: 1;
+    position: relative;
+    overflow: hidden;
+    height: 100%;
+  }
+
+  .scrollableContentContainer {
+    overflow-y: auto;
+  }
+
+  .container.maxHeight100 {
+    max-height: 100%;
+  }
+
+  .container.flexColContainer {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .container {
+    position: absolute;
+    display: flex;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    overflow-y: auto;
+    padding: 20px;
+  }
+
+  .container:not(.itemVisible) {
+    visibility: hidden;
+  }
+</style>
diff --git a/packages/web/src/settings/BehaviourSettings.svelte b/packages/web/src/settings/BehaviourSettings.svelte
new file mode 100644
index 000000000..95d32d5f0
--- /dev/null
+++ b/packages/web/src/settings/BehaviourSettings.svelte
@@ -0,0 +1,68 @@
+<script lang="ts">
+    import FormCheckboxField from "../forms/FormCheckboxField.svelte";
+    import { _t } from "../translations";
+    import FontIcon from '../icons/FontIcon.svelte';
+    import FormValues from "../forms/FormValues.svelte";
+</script>
+
+<FormValues let:values>
+    <div class="heading">{_t('settings.behaviour', { defaultMessage: 'Behaviour' })}</div>
+
+    <FormCheckboxField
+    name="behaviour.useTabPreviewMode"
+    label={_t('settings.behaviour.useTabPreviewMode', { defaultMessage: 'Use tab preview mode' })}
+    defaultValue={true}
+    />
+
+    <FormCheckboxField
+    name="behaviour.jsonPreviewWrap"
+    label={_t('settings.behaviour.jsonPreviewWrap', { defaultMessage: 'Wrap JSON in preview' })}
+    defaultValue={false}
+    />
+
+    <div class="tip">
+    <FontIcon icon="img tip" />
+    {_t('settings.behaviour.singleClickPreview', {
+        defaultMessage:
+        'When you single-click or select a file in the "Tables, Views, Functions" view, it is shown in a preview mode and reuses an existing tab (preview tab). This is useful if you are quickly browsing tables and don\'t want every visited table to have its own tab. When you start editing the table or use double-click to open the table from the "Tables" view, a new tab is dedicated to that table.',
+    })}
+    </div>
+
+    <FormCheckboxField
+    name="behaviour.openDetailOnArrows"
+    label={_t('settings.behaviour.openDetailOnArrows', {
+        defaultMessage: 'Open detail on keyboard navigation',
+    })}
+    defaultValue={true}
+    disabled={values['behaviour.useTabPreviewMode'] === false}
+    />
+
+    <div class="heading">{_t('settings.confirmations', { defaultMessage: 'Confirmations' })}</div>
+
+    <FormCheckboxField
+    name="skipConfirm.tableDataSave"
+    label={_t('settings.confirmations.skipConfirm.tableDataSave', {
+        defaultMessage: 'Skip confirmation when saving table data (SQL)',
+    })}
+    />
+    <FormCheckboxField
+    name="skipConfirm.collectionDataSave"
+    label={_t('settings.confirmations.skipConfirm.collectionDataSave', {
+        defaultMessage: 'Skip confirmation when saving collection data (NoSQL)',
+    })}
+    />
+</FormValues>
+
+<style>
+  .heading {
+    font-size: 20px;
+    margin: 5px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .tip {
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+</style>
\ No newline at end of file
diff --git a/packages/web/src/settings/ConnectionSettings.svelte b/packages/web/src/settings/ConnectionSettings.svelte
new file mode 100644
index 000000000..b57df5786
--- /dev/null
+++ b/packages/web/src/settings/ConnectionSettings.svelte
@@ -0,0 +1,89 @@
+<script lang="ts">
+  import CheckboxField from "../forms/CheckboxField.svelte";
+  import FormCheckboxField from "../forms/FormCheckboxField.svelte";
+  import FormFieldTemplateLarge from "../forms/FormFieldTemplateLarge.svelte";
+  import FormSelectField from "../forms/FormSelectField.svelte";
+  import FormTextField from "../forms/FormTextField.svelte";
+  import FormValues from "../forms/FormValues.svelte";
+  import { lockedDatabaseMode } from "../stores";
+  import { _t } from "../translations";
+
+    
+</script>
+
+<FormValues let:values>
+    <div class="heading">{_t('settings.connection', { defaultMessage: 'Connection' })}</div>
+
+    <FormFieldTemplateLarge
+    label={_t('settings.connection.showOnlyTabsFromSelectedDatabase', {
+        defaultMessage: 'Show only tabs from selected database',
+    })}
+    type="checkbox"
+    labelProps={{
+        onClick: () => {
+        $lockedDatabaseMode = !$lockedDatabaseMode;
+        },
+    }}
+    >
+    <CheckboxField checked={$lockedDatabaseMode} on:change={e => ($lockedDatabaseMode = e.target.checked)} />
+    </FormFieldTemplateLarge>
+
+    <FormCheckboxField
+    name="connection.autoRefresh"
+    label={_t('settings.connection.autoRefresh', {
+        defaultMessage: 'Automatic refresh of database model on background',
+    })}
+    defaultValue={false}
+    />
+    <FormTextField
+    name="connection.autoRefreshInterval"
+    label={_t('settings.connection.autoRefreshInterval', {
+        defaultMessage: 'Interval between automatic DB structure reloads in seconds',
+    })}
+    defaultValue="30"
+    disabled={values['connection.autoRefresh'] === false}
+    />
+    <FormSelectField
+    label={_t('settings.connection.sshBindHost', { defaultMessage: 'Local host address for SSH connections' })}
+    name="connection.sshBindHost"
+    isNative
+    defaultValue="127.0.0.1"
+    options={[
+        { value: '127.0.0.1', label: '127.0.0.1 (IPv4)' },
+        { value: '::1', label: '::1  (IPv6)' },
+        { value: 'localhost', label: 'localhost (domain name)' },
+    ]}
+    />
+
+    <div class="heading">{_t('settings.session', { defaultMessage: 'Query sessions' })}</div>
+    <FormCheckboxField
+    name="session.autoClose"
+    label={_t('settings.session.autoClose', {
+        defaultMessage: 'Automatic close query sessions after period without any activity',
+    })}
+    defaultValue={true}
+    />
+    <FormTextField
+    name="session.autoCloseTimeout"
+    label={_t('settings.session.autoCloseTimeout', {
+        defaultMessage: 'Interval, after which query session without activity is closed (in minutes)',
+    })}
+    defaultValue="15"
+    disabled={values['session.autoClose'] === false}
+    />
+</FormValues>
+
+<style>
+  .heading {
+    font-size: 20px;
+    margin: 5px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .tip {
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+</style>
\ No newline at end of file
diff --git a/packages/web/src/settings/DefaultActionsSettings.svelte b/packages/web/src/settings/DefaultActionsSettings.svelte
new file mode 100644
index 000000000..ab360f830
--- /dev/null
+++ b/packages/web/src/settings/DefaultActionsSettings.svelte
@@ -0,0 +1,105 @@
+<script lang="ts">
+  import FormCheckboxField from "../forms/FormCheckboxField.svelte";
+  import FormSelectField from "../forms/FormSelectField.svelte";
+  import FormValues from "../forms/FormValues.svelte";
+  import { _t } from "../translations";
+  import FormDefaultActionField from "./FormDefaultActionField.svelte";
+
+
+</script>
+
+<FormValues let:values>
+    <div class="heading">{_t('settings.defaultActions', { defaultMessage: 'Default actions' })}</div>
+
+    <FormSelectField
+    label={_t('settings.defaultActions.connectionClick', { defaultMessage: 'Connection click' })}
+    name="defaultAction.connectionClick"
+    isNative
+    defaultValue="connect"
+    options={[
+        {
+        value: 'openDetails',
+        label: _t('settings.defaultActions.connectionClick.openDetails', {
+            defaultMessage: 'Edit / open details',
+        }),
+        },
+        {
+        value: 'connect',
+        label: _t('settings.defaultActions.connectionClick.connect', { defaultMessage: 'Connect' }),
+        },
+        {
+        value: 'none',
+        label: _t('settings.defaultActions.connectionClick.none', { defaultMessage: 'Do nothing' }),
+        },
+    ]}
+    />
+
+    <FormSelectField
+    label={_t('settings.defaultActions.databaseClick', { defaultMessage: 'Database click' })}
+    name="defaultAction.databaseClick"
+    isNative
+    defaultValue="switch"
+    options={[
+        {
+        value: 'switch',
+        label: _t('settings.defaultActions.databaseClick.switch', { defaultMessage: 'Switch database' }),
+        },
+        {
+        value: 'none',
+        label: _t('settings.defaultActions.databaseClick.none', { defaultMessage: 'Do nothing' }),
+        },
+    ]}
+    />
+
+    <FormCheckboxField
+    name="defaultAction.useLastUsedAction"
+    label={_t('settings.defaultActions.useLastUsedAction', { defaultMessage: 'Use last used action' })}
+    defaultValue={true}
+    />
+
+    <FormDefaultActionField
+    label={_t('settings.defaultActions.tableClick', { defaultMessage: 'Table click' })}
+    objectTypeField="tables"
+    disabled={values['defaultAction.useLastUsedAction'] !== false}
+    />
+    <FormDefaultActionField
+    label={_t('settings.defaultActions.viewClick', { defaultMessage: 'View click' })}
+    objectTypeField="views"
+    disabled={values['defaultAction.useLastUsedAction'] !== false}
+    />
+    <FormDefaultActionField
+    label={_t('settings.defaultActions.materializedViewClick', { defaultMessage: 'Materialized view click' })}
+    objectTypeField="matviews"
+    disabled={values['defaultAction.useLastUsedAction'] !== false}
+    />
+    <FormDefaultActionField
+    label={_t('settings.defaultActions.procedureClick', { defaultMessage: 'Procedure click' })}
+    objectTypeField="procedures"
+    disabled={values['defaultAction.useLastUsedAction'] !== false}
+    />
+    <FormDefaultActionField
+    label={_t('settings.defaultActions.functionClick', { defaultMessage: 'Function click' })}
+    objectTypeField="functions"
+    disabled={values['defaultAction.useLastUsedAction'] !== false}
+    />
+    <FormDefaultActionField
+    label={_t('settings.defaultActions.collectionClick', { defaultMessage: 'NoSQL collection click' })}
+    objectTypeField="collections"
+    disabled={values['defaultAction.useLastUsedAction'] !== false}
+    />
+</FormValues>
+
+<style>
+  .heading {
+    font-size: 20px;
+    margin: 5px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .tip {
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+</style>
\ No newline at end of file
diff --git a/packages/web/src/settings/ExternalToolsSettings.svelte b/packages/web/src/settings/ExternalToolsSettings.svelte
new file mode 100644
index 000000000..0547094ac
--- /dev/null
+++ b/packages/web/src/settings/ExternalToolsSettings.svelte
@@ -0,0 +1,52 @@
+<script lang="ts">
+  import FormTextField from "../forms/FormTextField.svelte";
+  import { _t } from "../translations";
+</script>
+
+<div class="heading">{_t('settings.externalTools', { defaultMessage: 'External tools' })}</div>
+<FormTextField
+    name="externalTools.mysqldump"
+    label={_t('settings.other.externalTools.mysqldump', {
+    defaultMessage: 'mysqldump (backup MySQL database)',
+    })}
+    defaultValue="mysqldump"
+/>
+<FormTextField
+    name="externalTools.mysql"
+    label={_t('settings.other.externalTools.mysql', { defaultMessage: 'mysql (restore MySQL database)' })}
+    defaultValue="mysql"
+/>
+<FormTextField
+    name="externalTools.mysqlPlugins"
+    label={_t('settings.other.externalTools.mysqlPlugins', {
+    defaultMessage:
+        'Folder with mysql plugins (for example for authentication). Set only in case of problems',
+    })}
+    defaultValue=""
+/>
+<FormTextField
+    name="externalTools.pg_dump"
+    label={_t('settings.other.externalTools.pg_dump', {
+    defaultMessage: 'pg_dump (backup PostgreSQL database)',
+    })}
+    defaultValue="pg_dump"
+/>
+<FormTextField
+    name="externalTools.psql"
+    label={_t('settings.other.externalTools.psql', { defaultMessage: 'psql (restore PostgreSQL database)' })}
+    defaultValue="psql"
+/>
+
+<style>
+  .heading {
+    font-size: 20px;
+    margin: 5px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .tip {
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+</style>
\ No newline at end of file
diff --git a/packages/web/src/settings/GeneralSettings.svelte b/packages/web/src/settings/GeneralSettings.svelte
new file mode 100644
index 000000000..d8375fd5c
--- /dev/null
+++ b/packages/web/src/settings/GeneralSettings.svelte
@@ -0,0 +1,259 @@
+<script lang="ts">
+  import { internalRedirectTo } from '../clientAuth';
+  import CheckboxField from '../forms/CheckboxField.svelte';
+  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
+  import FormFieldTemplateLarge from '../forms/FormFieldTemplateLarge.svelte';
+  import FormSelectField from '../forms/FormSelectField.svelte';
+  import FormTextField from '../forms/FormTextField.svelte';
+  import SelectField from '../forms/SelectField.svelte';
+  import FontIcon from '../icons/FontIcon.svelte';
+  import { showModal } from '../modals/modalTools';
+  import { EDITOR_KEYBINDINGS_MODES } from '../query/AceEditor.svelte';
+  import { currentEditorKeybindigMode, currentEditorWrapEnabled } from '../stores';
+  import { _t, getSelectedLanguage, setSelectedLanguage } from '../translations';
+  import { isMac } from '../utility/common';
+  import getElectron from '../utility/getElectron';
+  import { isProApp } from '../utility/proTools';
+  import ConfirmModal from '../modals/ConfirmModal.svelte';
+
+    const electron = getElectron();
+    let restartWarning = false;
+</script>
+
+{#if electron}
+    <div class="heading">{_t('settings.appearance', { defaultMessage: 'Appearance' })}</div>
+    <FormCheckboxField
+        name="app.useNativeMenu"
+        label={isMac()
+        ? _t('settings.useNativeWindowTitle', { defaultMessage: 'Use native window title' })
+        : _t('settings.useSystemNativeMenu', { defaultMessage: 'Use system native menu' })}
+        on:change={() => {
+        restartWarning = true;
+        }}
+    />
+    {#if restartWarning}
+        <div class="ml-5 mb-3">
+        <FontIcon icon="img warn" />
+        {_t('settings.nativeMenuRestartWarning', {
+            defaultMessage: 'Native menu settings will be applied after app restart',
+        })}
+        </div>
+    {/if}
+{/if}
+
+<FormCheckboxField
+name="tabGroup.showServerName"
+label={_t('settings.tabGroup.showServerName', {
+    defaultMessage: 'Show server name alongside database name in title of the tab group',
+})}
+defaultValue={false}
+/>
+<div class="heading">{_t('settings.localization', { defaultMessage: 'Localization' })}</div>
+
+<FormFieldTemplateLarge
+label={_t('settings.localization.language', { defaultMessage: 'Language' })}
+type="combo"
+>
+<SelectField
+    isNative
+    data-testid="SettingsModal_languageSelect"
+    options={[
+    { value: 'cs', label: 'Čeština' },
+    { value: 'de', label: 'Deutsch' },
+    { value: 'en', label: 'English' },
+    { value: 'es', label: 'Español' },
+    { value: 'fr', label: 'Français' },
+    { value: 'it', label: 'Italiano' },
+    { value: 'pt', label: 'Português (Brasil)' },
+    { value: 'sk', label: 'Slovenčina' },
+    { value: 'ja', label: '日本語' },
+    { value: 'zh', label: '中文' },
+    ]}
+    defaultValue={getSelectedLanguage()}
+    value={getSelectedLanguage()}
+    on:change={e => {
+    setSelectedLanguage(e.detail);
+    showModal(ConfirmModal, {
+        message: _t('settings.localization.reloadWarning', {
+        defaultMessage: 'Application will be reloaded to apply new language settings',
+        }),
+        onConfirm: () => {
+        setTimeout(() => {
+            internalRedirectTo(electron ? '/index.html' : '/');
+        }, 100);
+        },
+    });
+    }}
+/>
+</FormFieldTemplateLarge>
+
+<div class="heading">{_t('settings.dataGrid.title', { defaultMessage: 'Data grid' })}</div>
+<FormTextField
+name="dataGrid.pageSize"
+label={_t('settings.dataGrid.pageSize', {
+    defaultMessage: 'Page size (number of rows for incremental loading, must be between 5 and 50000)',
+})}
+defaultValue="100"
+/>
+{#if isProApp()}
+<FormCheckboxField
+    name="dataGrid.showHintColumns"
+    label={_t('settings.dataGrid.showHintColumns', { defaultMessage: 'Show foreign key hints' })}
+    defaultValue={true}
+/>
+{/if}
+<!-- <FormCheckboxField name="dataGrid.showHintColumns" label="Show foreign key hints" defaultValue={true} /> -->
+
+<FormCheckboxField
+name="dataGrid.thousandsSeparator"
+label={_t('settings.dataGrid.thousandsSeparator', {
+    defaultMessage: 'Use thousands separator for numbers',
+})}
+/>
+
+<FormTextField
+name="dataGrid.defaultAutoRefreshInterval"
+label={_t('settings.dataGrid.defaultAutoRefreshInterval', {
+    defaultMessage: 'Default grid auto refresh interval in seconds',
+})}
+defaultValue="10"
+/>
+
+<FormCheckboxField
+name="dataGrid.alignNumbersRight"
+label={_t('settings.dataGrid.alignNumbersRight', { defaultMessage: 'Align numbers to right' })}
+defaultValue={false}
+/>
+
+<FormTextField
+name="dataGrid.collectionPageSize"
+label={_t('settings.dataGrid.collectionPageSize', {
+    defaultMessage: 'Collection page size (for MongoDB JSON view, must be between 5 and 1000)',
+})}
+defaultValue="50"
+/>
+
+<FormSelectField
+label={_t('settings.dataGrid.coloringMode', { defaultMessage: 'Row coloring mode' })}
+name="dataGrid.coloringMode"
+isNative
+defaultValue="36"
+options={[
+    {
+    value: '36',
+    label: _t('settings.dataGrid.coloringMode.36', { defaultMessage: 'Every 3rd and 6th row' }),
+    },
+    {
+    value: '2-primary',
+    label: _t('settings.dataGrid.coloringMode.2-primary', {
+        defaultMessage: 'Every 2-nd row, primary color',
+    }),
+    },
+    {
+    value: '2-secondary',
+    label: _t('settings.dataGrid.coloringMode.2-secondary', {
+        defaultMessage: 'Every 2-nd row, secondary color',
+    }),
+    },
+    { value: 'none', label: _t('settings.dataGrid.coloringMode.none', { defaultMessage: 'None' }) },
+]}
+/>
+
+<FormCheckboxField
+name="dataGrid.showAllColumnsWhenSearch"
+label={_t('settings.dataGrid.showAllColumnsWhenSearch', {
+    defaultMessage: 'Show all columns when searching',
+})}
+defaultValue={false}
+/>
+
+<div class="heading">{_t('settings.sqlEditor', { defaultMessage: 'SQL editor' })}</div>
+
+<div class="flex">
+<div class="col-3">
+    <FormSelectField
+    label={_t('settings.sqlEditor.sqlCommandsCase', { defaultMessage: 'SQL commands case' })}
+    name="sqlEditor.sqlCommandsCase"
+    isNative
+    defaultValue="upperCase"
+    options={[
+        { value: 'upperCase', label: 'UPPER CASE' },
+        { value: 'lowerCase', label: 'lower case' },
+    ]}
+    />
+</div>
+<div class="col-3">
+    <FormFieldTemplateLarge
+    label={_t('settings.editor.keybinds', { defaultMessage: 'Editor keybinds' })}
+    type="combo"
+    >
+    <SelectField
+        isNative
+        defaultValue="default"
+        options={EDITOR_KEYBINDINGS_MODES.map(mode => ({ label: mode.label, value: mode.value }))}
+        value={$currentEditorKeybindigMode}
+        on:change={e => ($currentEditorKeybindigMode = e.detail)}
+    />
+    </FormFieldTemplateLarge>
+</div>
+<div class="col-3">
+    <FormFieldTemplateLarge
+    label={_t('settings.editor.wordWrap', { defaultMessage: 'Enable word wrap' })}
+    type="combo"
+    >
+    <CheckboxField
+        checked={$currentEditorWrapEnabled}
+        on:change={e => ($currentEditorWrapEnabled = e.target.checked)}
+    />
+    </FormFieldTemplateLarge>
+</div>
+</div>
+
+<FormTextField
+name="sqlEditor.limitRows"
+label={_t('settings.sqlEditor.limitRows', { defaultMessage: 'Return only N rows from query' })}
+placeholder={_t('settings.sqlEditor.limitRowsPlaceholder', { defaultMessage: '(No rows limit)' })}
+/>
+
+<FormCheckboxField
+name="sqlEditor.showTableAliasesInCodeCompletion"
+label={_t('settings.sqlEditor.showTableAliasesInCodeCompletion', {
+    defaultMessage: 'Show table aliases in code completion',
+})}
+defaultValue={false}
+/>
+
+<FormCheckboxField
+name="sqlEditor.disableSplitByEmptyLine"
+label={_t('settings.sqlEditor.disableSplitByEmptyLine', { defaultMessage: 'Disable split by empty line' })}
+defaultValue={false}
+/>
+
+<FormCheckboxField
+name="sqlEditor.disableExecuteCurrentLine"
+label={_t('settings.sqlEditor.disableExecuteCurrentLine', {
+    defaultMessage: 'Disable current line execution (Execute current)',
+})}
+defaultValue={false}
+/>
+
+<FormCheckboxField
+name="sqlEditor.hideColumnsPanel"
+label={_t('settings.sqlEditor.hideColumnsPanel', { defaultMessage: 'Hide Columns/Filters panel by default' })}
+defaultValue={false}
+/>
+
+<style>
+  .heading {
+    font-size: 20px;
+    margin: 5px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .tip {
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+</style>
\ No newline at end of file
diff --git a/packages/web/src/settings/LicenseSettings.svelte b/packages/web/src/settings/LicenseSettings.svelte
new file mode 100644
index 000000000..d25f6c51c
--- /dev/null
+++ b/packages/web/src/settings/LicenseSettings.svelte
@@ -0,0 +1,96 @@
+<script lang="ts">
+    import { safeFormatDate } from "dbgate-tools";
+    import FormStyledButton from "../buttons/FormStyledButton.svelte";
+    import FormTextAreaField from "../forms/FormTextAreaField.svelte";
+    import FontIcon from "../icons/FontIcon.svelte";
+    import { _t } from "../translations";
+    import { apiCall } from "../utility/api";
+  import { useSettings } from "../utility/metadataLoaders";
+  import { derived } from "svelte/store";
+
+    const settings = useSettings();
+    const settingsValues = derived(settings, $settings => {
+        if (!$settings) {
+        return {};
+        }
+        return $settings;
+    });
+    let licenseKeyCheckResult = null;
+
+    $: licenseKey = $settingsValues['other.licenseKey'];
+    
+</script>
+
+<div class="heading">{_t('settings.other.license', { defaultMessage: 'License' })}</div>
+<FormTextAreaField
+name="other.licenseKey"
+label={_t('settings.other.licenseKey', { defaultMessage: 'License key' })}
+rows={7}
+onChange={async value => {
+    licenseKeyCheckResult = await apiCall('config/check-license', { licenseKey: value });
+}}
+/>
+{#if licenseKeyCheckResult}
+<div class="m-3 ml-5">
+    {#if licenseKeyCheckResult.status == 'ok'}
+    <div>
+        <FontIcon icon="img ok" />
+        {_t('settings.other.licenseKey.valid', { defaultMessage: 'License key is valid' })}
+    </div>
+    {#if licenseKeyCheckResult.validTo}
+        <div>
+        {_t('settings.other.licenseKey.validTo', { defaultMessage: 'License valid to:' })}
+        {licenseKeyCheckResult.validTo}
+        </div>
+    {/if}
+    {#if licenseKeyCheckResult.expiration}
+        <div>
+        {_t('settings.other.licenseKey.expiration', { defaultMessage: 'License key expiration:' })}
+        <b>{safeFormatDate(licenseKeyCheckResult.expiration)}</b>
+        </div>
+    {/if}
+    {:else if licenseKeyCheckResult.status == 'error'}
+    <div>
+        <FontIcon icon="img error" />
+        {licenseKeyCheckResult.errorMessage ??
+        _t('settings.other.licenseKey.invalid', { defaultMessage: 'License key is invalid' })}
+        {#if licenseKeyCheckResult.expiration}
+        <div>
+            {_t('settings.other.licenseKey.expiration', { defaultMessage: 'License key expiration:' })}
+            <b>{safeFormatDate(licenseKeyCheckResult.expiration)}</b>
+        </div>
+        {/if}
+    </div>
+    {#if licenseKeyCheckResult.isExpired}
+        <div class="mt-2">
+        <FormStyledButton
+            value={_t('settings.other.licenseKey.checkForNew', {
+            defaultMessage: 'Check for new license key',
+            })}
+            skipWidth
+            on:click={async () => {
+            licenseKeyCheckResult = await apiCall('config/get-new-license', { oldLicenseKey: licenseKey });
+            if (licenseKeyCheckResult.licenseKey) {
+                apiCall('config/update-settings', { 'other.licenseKey': licenseKeyCheckResult.licenseKey });
+            }
+            }}
+        />
+        </div>
+    {/if}
+    {/if}
+</div>
+{/if}
+
+<style>
+  .heading {
+    font-size: 20px;
+    margin: 5px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .tip {
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+</style>
\ No newline at end of file
diff --git a/packages/web/src/settings/OtherSettings.svelte b/packages/web/src/settings/OtherSettings.svelte
new file mode 100644
index 000000000..80d94d067
--- /dev/null
+++ b/packages/web/src/settings/OtherSettings.svelte
@@ -0,0 +1,66 @@
+<script lang="ts">
+  import FormCheckboxField from "../forms/FormCheckboxField.svelte";
+  import FormSelectField from "../forms/FormSelectField.svelte";
+  import FormTextField from "../forms/FormTextField.svelte";
+  import { _t } from "../translations";
+  import { isProApp } from "../utility/proTools";
+
+
+</script>
+
+<div class="heading">{_t('settings.other', { defaultMessage: 'Other' })}</div>
+
+<FormTextField
+name="other.gistCreateToken"
+label={_t('settings.other.gistCreateToken', { defaultMessage: 'API token for creating error gists' })}
+defaultValue=""
+/>
+
+<FormSelectField
+label={_t('settings.other.autoUpdateApplication', { defaultMessage: 'Auto update application' })}
+name="app.autoUpdateMode"
+isNative
+defaultValue=""
+options={[
+    {
+    value: 'skip',
+    label: _t('settings.other.autoUpdateApplication.skip', {
+        defaultMessage: 'Do not check for new versions',
+    }),
+    },
+    {
+    value: '',
+    label: _t('settings.other.autoUpdateApplication.check', { defaultMessage: 'Check for new versions' }),
+    },
+    {
+    value: 'download',
+    label: _t('settings.other.autoUpdateApplication.download', {
+        defaultMessage: 'Check and download new versions',
+    }),
+    },
+]}
+/>
+
+{#if isProApp()}
+<FormCheckboxField
+    name="ai.allowSendModels"
+    label={_t('settings.other.ai.allowSendModels', {
+    defaultMessage: 'Allow to send DB models and query snippets to AI service',
+    })}
+    defaultValue={false}
+/>
+{/if}
+
+<style>
+  .heading {
+    font-size: 20px;
+    margin: 5px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .tip {
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+</style>
\ No newline at end of file
diff --git a/packages/web/src/settings/ThemeSettings.svelte b/packages/web/src/settings/ThemeSettings.svelte
new file mode 100644
index 000000000..80590f25d
--- /dev/null
+++ b/packages/web/src/settings/ThemeSettings.svelte
@@ -0,0 +1,169 @@
+<script lang="ts">
+    import Link from "../elements/Link.svelte";
+    import CheckboxField from "../forms/CheckboxField.svelte";
+    import FormFieldTemplateLarge from "../forms/FormFieldTemplateLarge.svelte";
+    import SelectField from "../forms/SelectField.svelte";
+    import { currentEditorFontSize, currentEditorTheme, currentTheme, extensions, getSystemTheme, selectedWidget, visibleWidgetSideBar } from "../stores";
+    import { _t } from "../translations";
+    import ThemeSkeleton from "./ThemeSkeleton.svelte";
+    import { EDITOR_THEMES, FONT_SIZES } from '../query/AceEditor.svelte';
+    import { closeCurrentModal } from "../modals/modalTools";
+    import TextField from "../forms/TextField.svelte";
+    import FormTextField from "../forms/FormTextField.svelte";
+    import SqlEditor from "../query/SqlEditor.svelte";
+
+    function openThemePlugins() {
+        closeCurrentModal();
+        $selectedWidget = 'plugins';
+        $visibleWidgetSideBar = true;
+    }
+
+    const sqlPreview = `-- example query
+SELECT
+  MAX(Album.AlbumId) AS max_album,
+  MAX(Album.Title) AS max_title,
+  Artist.ArtistId,
+  'album' AS test_string,
+  123 AS test_number
+FROM
+  Album
+  INNER JOIN Artist ON Album.ArtistId = Artist.ArtistId
+GROUP BY
+  Artist.ArtistId
+ORDER BY
+  Artist.Name ASC
+  `;
+</script>
+
+<div class="heading">{_t('settings.appearance', { defaultMessage: 'Application theme' })}</div>
+
+<FormFieldTemplateLarge
+label={_t('settings.appearance.useSystemTheme', { defaultMessage: 'Use system theme' })}
+type="checkbox"
+labelProps={{
+    onClick: () => {
+    if ($currentTheme) {
+        $currentTheme = null;
+    } else {
+        $currentTheme = getSystemTheme();
+    }
+    },
+}}
+>
+<CheckboxField
+    checked={!$currentTheme}
+    on:change={e => {
+    if (e.target['checked']) {
+        $currentTheme = null;
+    } else {
+        $currentTheme = getSystemTheme();
+    }
+    }}
+/>
+</FormFieldTemplateLarge>
+
+<div class="themes">
+{#each $extensions.themes as theme}
+    <ThemeSkeleton {theme} />
+{/each}
+</div>
+
+<div class="m-5">
+{_t('settings.appearance.moreThemes', { defaultMessage: 'More themes are available as' })}
+<Link onClick={openThemePlugins}>plugins</Link>
+<br />
+{_t('settings.appearance.afterInstalling', {
+    defaultMessage:
+    'After installing theme plugin (try search "theme" in available extensions) new themes will be available here.',
+})}
+</div>
+
+<div class="heading">{_t('settings.appearance.editorTheme', { defaultMessage: 'Editor theme' })}</div>
+
+<div class="flex">
+<div class="col-3">
+    <FormFieldTemplateLarge
+    label={_t('settings.appearance.editorTheme', { defaultMessage: 'Theme' })}
+    type="combo"
+    >
+    <SelectField
+        isNative
+        notSelected={_t('settings.appearance.editorTheme.default', { defaultMessage: '(use theme default)' })}
+        options={EDITOR_THEMES.map(theme => ({ label: theme, value: theme }))}
+        value={$currentEditorTheme}
+        on:change={e => ($currentEditorTheme = e.detail)}
+    />
+    </FormFieldTemplateLarge>
+</div>
+
+<div class="col-3">
+    <FormFieldTemplateLarge
+    label={_t('settings.appearance.fontSize', { defaultMessage: 'Font size' })}
+    type="combo"
+    >
+    <SelectField
+        isNative
+        notSelected="(default)"
+        options={FONT_SIZES}
+        value={FONT_SIZES.find(x => x.value == $currentEditorFontSize) ? $currentEditorFontSize : 'custom'}
+        on:change={e => ($currentEditorFontSize = e.detail)}
+    />
+    </FormFieldTemplateLarge>
+</div>
+
+<div class="col-3">
+    <FormFieldTemplateLarge
+    label={_t('settings.appearance.customSize', { defaultMessage: 'Custom size' })}
+    type="text"
+    >
+    <TextField
+        value={$currentEditorFontSize == 'custom' ? '' : $currentEditorFontSize}
+        on:change={e => ($currentEditorFontSize = e.target['value'])}
+        disabled={!!FONT_SIZES.find(x => x.value == $currentEditorFontSize) &&
+        $currentEditorFontSize != 'custom'}
+    />
+    </FormFieldTemplateLarge>
+</div>
+
+<div class="col-3">
+    <FormTextField
+    name="editor.fontFamily"
+    label={_t('settings.appearance.fontFamily', { defaultMessage: 'Editor font family' })}
+    />
+</div>
+</div>
+
+<div class="editor">
+<SqlEditor value={sqlPreview} readOnly />
+</div>
+
+
+<style>
+  .heading {
+    font-size: 20px;
+    margin: 5px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .tip {
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+  }
+
+  .themes {
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: var(--dim-large-form-margin);
+  }
+
+  .editor {
+    position: relative;
+    height: 400px;
+    min-height: 200px;
+    width: 400px;
+    margin-left: var(--dim-large-form-margin);
+    margin-top: var(--dim-large-form-margin);
+    margin-bottom: var(--dim-large-form-margin);
+  }
+</style>
\ No newline at end of file
diff --git a/packages/web/src/tabs/SettingsTab.svelte b/packages/web/src/tabs/SettingsTab.svelte
new file mode 100644
index 000000000..4598926c7
--- /dev/null
+++ b/packages/web/src/tabs/SettingsTab.svelte
@@ -0,0 +1,85 @@
+<script>
+  import HorizontalSplitter from "../elements/HorizontalSplitter.svelte";
+  import SettingsMenuControl from "../elements/SettingsMenuControl.svelte";
+  import GeneralSettings from "../settings/GeneralSettings.svelte";
+  import SettingsFormProvider from "../forms/SettingsFormProvider.svelte";
+  import ConnectionSettings from "../settings/ConnectionSettings.svelte";
+  import ThemeSettings from "../settings/ThemeSettings.svelte";
+  import DefaultActionsSettings from "../settings/DefaultActionsSettings.svelte";
+  import BehaviourSettings from "../settings/BehaviourSettings.svelte";
+  import ExternalToolsSettings from "../settings/ExternalToolsSettings.svelte";
+  import OtherSettings from "../settings/OtherSettings.svelte";
+  import LicenseSettings from "../settings/LicenseSettings.svelte";
+  import { isProApp } from "../utility/proTools";
+
+    const menuItems = [
+        {
+            label: 'General',
+            identifier: 'general',
+            component: GeneralSettings,
+            props: {},
+            testid: 'settings-general',
+        },
+        {
+            label: 'Connection',
+            identifier: 'connection',
+            component: ConnectionSettings,
+            props: {},
+            testid: 'settings-connection',
+        },
+        {
+            label: 'Themes',
+            identifier: 'theme',
+            component: ThemeSettings,
+            props: {},
+            testid: 'settings-themes',
+        },
+        {
+            label: 'Default Actions',
+            identifier: 'default-actions',
+            component: DefaultActionsSettings,
+            props: {},
+            testid: 'settings-default-actions',
+        },
+        {
+            label: 'Behaviour',
+            identifier: 'behaviour',
+            component: BehaviourSettings,
+            props: {},
+            testid: 'settings-behaviour',
+        },
+        {
+            label: 'External Tools',
+            identifier: 'external-tools',
+            component: ExternalToolsSettings,
+            props: {},
+            testid: 'settings-external-tools',
+        },
+        isProApp() && {
+            label: 'License',
+            identifier: 'license',
+            component: LicenseSettings,
+            props: {},
+            testid: 'settings-license',
+        },
+        {
+            label: 'Other',
+            identifier: 'other',
+            component: OtherSettings,
+            props: {},
+            testid: 'settings-other',
+        },
+    ];
+
+    let selectedItem = 'general';
+</script>
+
+<SettingsFormProvider>
+  <SettingsMenuControl 
+      items={menuItems}
+      bind:value={selectedItem}
+      flex1={true}
+      flexColContainer={true}
+      scrollableContentContainer={true}
+  />
+</SettingsFormProvider>
\ No newline at end of file
diff --git a/packages/web/src/tabs/index.js b/packages/web/src/tabs/index.js
index f8c0cdd8b..1e34e5102 100644
--- a/packages/web/src/tabs/index.js
+++ b/packages/web/src/tabs/index.js
@@ -25,6 +25,7 @@ import * as ServerSummaryTab from './ServerSummaryTab.svelte';
 import * as ImportExportTab from './ImportExportTab.svelte';
 import * as SqlObjectTab from './SqlObjectTab.svelte';
 import * as AppLogTab from './AppLogTab.svelte';
+import * as SettingsTab from './SettingsTab.svelte';
 
 import protabs from './index-pro';
 
@@ -56,5 +57,6 @@ export default {
   ImportExportTab,
   SqlObjectTab,
   AppLogTab,
+  SettingsTab,
   ...protabs,
 };
diff --git a/packages/web/src/widgets/WidgetIconPanel.svelte b/packages/web/src/widgets/WidgetIconPanel.svelte
index 4dfef5ab5..9d9a4360f 100644
--- a/packages/web/src/widgets/WidgetIconPanel.svelte
+++ b/packages/web/src/widgets/WidgetIconPanel.svelte
@@ -118,6 +118,7 @@
     const top = rect.bottom;
     const items = [
       hasPermission('settings/change') && { command: 'settings.show' },
+      hasPermission('settings/change') && { command: 'settings.settingsTab' },
       { command: 'theme.changeTheme' },
       hasPermission('settings/change') && { command: 'settings.commands' },
       hasPermission('widgets/plugins') && {