diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
index b95849cbd0..af84e97332 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SqlEditor.tsx
@@ -33,10 +33,12 @@ const styles = css`
     }
 
     container {
+      composes: theme-border-color-background from global;
       display: flex;
       flex-direction: column;
       justify-content: space-between;
       overflow: auto;
+      border-right: solid 1px;
     }
   
     actions {
@@ -76,6 +78,7 @@ const styles = css`
 
 const tabStyles = css`
   tabs {
+    composes: theme-background-secondary theme-text-on-secondary from global;
     overflow-x: hidden;
   }
   Tab {
diff --git a/webapp/packages/plugin-sql-editor/src/index.ts b/webapp/packages/plugin-sql-editor/src/index.ts
index 4130717d42..fa404dcfc2 100644
--- a/webapp/packages/plugin-sql-editor/src/index.ts
+++ b/webapp/packages/plugin-sql-editor/src/index.ts
@@ -8,6 +8,7 @@ export * from './QueryDataSource';
 export * from './SqlDialectInfoService';
 export * from './ISqlEditorTabState';
 export * from './SqlEditor';
+export * from './SqlEditorModeService';
 export * from './SqlEditorService';
 
 export default sqlEditorPluginManifest;
diff --git a/webapp/packages/plugin-sql-editor/src/locales/en.ts b/webapp/packages/plugin-sql-editor/src/locales/en.ts
index bbaa10eccd..39e25a8a84 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/en.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/en.ts
@@ -1,6 +1,6 @@
 export default [
   ['sql_editor_menu', 'SQL Editor'],
-  ['sql_editor_script_editor', 'Script Editor'],
+  ['sql_editor_script_editor', 'SQL Editor'],
   ['sql_editor_alias_loading_error', 'Error occurred while loading node alias'],
   ['sql_editor_restore_message', 'Do you want to restore the connection?'],
   ['sql_editor_restore', 'Restore'],
diff --git a/webapp/packages/plugin-sql-editor/src/locales/it.ts b/webapp/packages/plugin-sql-editor/src/locales/it.ts
index 23c7448cb1..fc90bd2531 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/it.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/it.ts
@@ -1,6 +1,6 @@
 export default [
   ['sql_editor_menu', 'SQL Editor'],
-  ['sql_editor_script_editor', 'Script Editor'],
+  ['sql_editor_script_editor', 'SQL Editor'],
   ['sql_editor_alias_loading_error', 'Error occurred while loading node alias'],
   ['sql_editor_restore_message', 'Do you want to restore the connection?'],
   ['sql_editor_restore', 'Restore'],
diff --git a/webapp/packages/plugin-sql-editor/src/locales/ru.ts b/webapp/packages/plugin-sql-editor/src/locales/ru.ts
index 92f818dff9..ee889c3bfb 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/ru.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/ru.ts
@@ -1,6 +1,6 @@
 export default [
   ['sql_editor_menu', 'SQL Редактор'],
-  ['sql_editor_script_editor', 'Редактор Скрипта'],
+  ['sql_editor_script_editor', 'Редактор SQL'],
   ['sql_editor_alias_loading_error', 'Возникла ошибка при загрузке псевдонима'],
   ['sql_editor_restore_message', 'Вы хотите восстановить подключение?'],
   ['sql_editor_restore', 'Восстановить'],
diff --git a/webapp/packages/plugin-sql-editor/src/locales/zh.ts b/webapp/packages/plugin-sql-editor/src/locales/zh.ts
index bcb73ffd49..2c81a629a4 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/zh.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/zh.ts
@@ -1,6 +1,6 @@
 export default [
   ['sql_editor_menu', 'SQL编辑器'],
-  ['sql_editor_script_editor', 'Script Editor'],
+  ['sql_editor_script_editor', 'SQL Editor'],
   ['sql_editor_alias_loading_error', 'Error occurred while loading node alias'],
   ['sql_editor_restore_message', 'Do you want to restore the connection?'],
   ['sql_editor_restore', 'Restore'],