diff --git a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
index 810c538edd..9f16c555c9 100644
--- a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
+++ b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
@@ -27,6 +27,7 @@ Export-Package: io.cloudbeaver,
  io.cloudbeaver.websocket,
  io.cloudbeaver.model,
  io.cloudbeaver.model.app,
+ io.cloudbeaver.model.fs,
  io.cloudbeaver.model.rm,
  io.cloudbeaver.model.rm.local,
  io.cloudbeaver.model.rm.lock,
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/fs/FSUtils.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/fs/FSUtils.java
new file mode 100644
index 0000000000..9a8a4f240d
--- /dev/null
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/fs/FSUtils.java
@@ -0,0 +1,27 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.fs;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.fs.DBFVirtualFileSystem;
+
+public class FSUtils {
+    @NotNull
+    public static String makeUniqueFsId(@NotNull DBFVirtualFileSystem fileSystem) {
+        return fileSystem.getType() + ":" + fileSystem.getId();
+    }
+}
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
index d076318f3e..b1cd5fa4fb 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/WebAppUtils.java
@@ -16,9 +16,12 @@
  */
 package io.cloudbeaver.utils;
 
+import io.cloudbeaver.DBWebException;
+import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.auth.NoAuthCredentialsProvider;
 import io.cloudbeaver.model.app.WebApplication;
 import io.cloudbeaver.model.app.WebAuthApplication;
+import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -209,4 +212,12 @@ public static String getGlobalProjectId() {
         return RMProjectType.GLOBAL.getPrefix() + "_" + globalConfigurationName;
     }
 
+    public static WebProjectImpl getProjectById(WebSession webSession, String projectId) throws DBWebException {
+        WebProjectImpl project = webSession.getProjectById(projectId);
+        if (project == null) {
+            throw new DBWebException("Project '" + projectId + "' not found");
+        }
+        return project;
+    }
+
 }
diff --git a/server/bundles/io.cloudbeaver.server/schema/service.navigator.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.navigator.graphqls
index d38686e06e..4bc24544d4 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.navigator.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.navigator.graphqls
@@ -78,7 +78,7 @@ type NavigatorNodeInfo {
 
     # Associated object. Return value depends on the node type - connectionId for connection node, resource path for resource node, etc.
     # null - if node currently not support this property
-    objectId: String
+    objectId: String @since(version: "23.2.4")
 
     # Supported features: item, container, leaf
     # canDelete, canRename
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceServletBase.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceServletBase.java
index 58f68f9f4a..280b01d21b 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceServletBase.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/WebServiceServletBase.java
@@ -1,20 +1,31 @@
 package io.cloudbeaver.service;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBPlatform;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.data.json.JSONUtils;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.Map;
 
 public abstract class WebServiceServletBase extends HttpServlet {
 
     private static final Log log = Log.getLog(WebServiceServletBase.class);
+    private static final Type MAP_STRING_OBJECT_TYPE = JSONUtils.MAP_TYPE_TOKEN;
+    private static final String REQUEST_PARAM_VARIABLES = "variables";
+    private static final Gson gson = new GsonBuilder()
+        .serializeNulls()
+        .setPrettyPrinting()
+        .create();
 
     private final CBApplication application;
 
@@ -43,4 +54,7 @@ protected final void service(HttpServletRequest request, HttpServletResponse res
 
     protected abstract void processServiceRequest(WebSession session, HttpServletRequest request, HttpServletResponse response) throws DBException, IOException;
 
+    protected Map<String, Object> getVariables(HttpServletRequest request) {
+        return gson.fromJson(request.getParameter(REQUEST_PARAM_VARIABLES), MAP_STRING_OBJECT_TYPE);
+    }
 }
\ No newline at end of file
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java
index 3aa7f4e777..b53a5c39c8 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java
@@ -20,6 +20,7 @@
 import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.WebServiceUtils;
 import io.cloudbeaver.model.WebPropertyInfo;
+import io.cloudbeaver.model.fs.FSUtils;
 import io.cloudbeaver.model.rm.DBNResourceManagerProject;
 import io.cloudbeaver.model.rm.DBNResourceManagerResource;
 import io.cloudbeaver.model.session.WebSession;
@@ -32,6 +33,7 @@
 import org.jkiss.dbeaver.model.meta.Association;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.*;
+import org.jkiss.dbeaver.model.navigator.fs.DBNFileSystem;
 import org.jkiss.dbeaver.model.navigator.fs.DBNPathBase;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.rm.RMProjectPermission;
@@ -283,6 +285,8 @@ public WebDatabaseObjectInfo getObject() {
     public String getObjectId() {
         if (node instanceof DBNPathBase dbnPath) {
             return dbnPath.getPath().toUri().toString();
+        } else if (node instanceof DBNFileSystem dbnFs) {
+            return FSUtils.makeUniqueFsId(dbnFs.getFileSystem());
         }
         return null;
     }
diff --git a/server/bundles/io.cloudbeaver.service.fs/plugin.xml b/server/bundles/io.cloudbeaver.service.fs/plugin.xml
index 09ad0fdeca..e3cbaf3f82 100644
--- a/server/bundles/io.cloudbeaver.service.fs/plugin.xml
+++ b/server/bundles/io.cloudbeaver.service.fs/plugin.xml
@@ -8,7 +8,4 @@
                  class="io.cloudbeaver.service.fs.WebServiceBindingFS">
         </service>
     </extension>
-    <extension point="io.cloudbeaver.feature">
-        <feature id="fileSystems" label="File Systems" description="File Systems"/>
-    </extension>
 </plugin>
diff --git a/server/bundles/io.cloudbeaver.service.fs/schema/service.fs.graphqls b/server/bundles/io.cloudbeaver.service.fs/schema/service.fs.graphqls
index 558d088c43..50ce1ef548 100644
--- a/server/bundles/io.cloudbeaver.service.fs/schema/service.fs.graphqls
+++ b/server/bundles/io.cloudbeaver.service.fs/schema/service.fs.graphqls
@@ -5,8 +5,15 @@ type FSFile @since(version: "23.2.2") {
     metaData: Object!
 }
 
+type FSFileSystem @since(version: "23.2.4") {
+    id: ID!
+    requiredAuth: String
+}
+
 extend type Query @since(version: "23.2.2") {
-    fsListFileSystems(projectId: ID!): [String!]!
+    fsListFileSystems(projectId: ID!): [FSFileSystem!]!
+
+    fsFileSystem(projectId: ID!, fileSystemId: ID!): FSFileSystem! @since(version: "23.2.4")
 
     fsFile(projectId: ID!, fileURI: String!):  FSFile!
 
@@ -21,14 +28,14 @@ extend type Mutation @since(version: "23.2.2") {
 
     fsCreateFolder(projectId: ID!, folderURI:String!): FSFile!
 
-    fsDeleteFile(projectId: ID!, fileURI:String!): Boolean!
+    fsDelete(projectId: ID!, fileURI:String!): Boolean!
 
-    fsMoveFile(projectId: ID!, fromURI: String!, toURI: String!): FSFile!
+    fsMove(projectId: ID!, fromURI: String!, toURI: String!): FSFile!
 
     fsWriteFileStringContent(
         projectId: ID!,
         fileURI:String!,
         data: String!,
         forceOverwrite: Boolean!
-    ): Boolean!
+    ): FSFile!
 }
\ No newline at end of file
diff --git a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/DBWServiceFS.java b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/DBWServiceFS.java
index 461c088b0e..e4d37b4072 100644
--- a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/DBWServiceFS.java
+++ b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/DBWServiceFS.java
@@ -20,6 +20,7 @@
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.service.DBWService;
 import io.cloudbeaver.service.fs.model.FSFile;
+import io.cloudbeaver.service.fs.model.FSFileSystem;
 import org.jkiss.code.NotNull;
 
 import java.net.URI;
@@ -29,9 +30,17 @@
  */
 public interface DBWServiceFS extends DBWService {
     @NotNull
-    String[] getAvailableFileSystems(@NotNull WebSession webSession, @NotNull String projectId)
+    FSFileSystem[] getAvailableFileSystems(@NotNull WebSession webSession, @NotNull String projectId)
         throws DBWebException;
 
+
+    @NotNull
+    FSFileSystem getFileSystem(
+        @NotNull WebSession webSession,
+        @NotNull String projectId,
+        @NotNull String fileSystemId
+    ) throws DBWebException;
+
     @NotNull
     FSFile getFile(
         @NotNull WebSession webSession,
@@ -53,7 +62,7 @@ String readFileContent(
         @NotNull URI fileURI
     ) throws DBWebException;
 
-    boolean writeFileContent(
+    FSFile writeFileContent(
         @NotNull WebSession webSession,
         @NotNull String projectId,
         @NotNull URI fileURI,
diff --git a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java
index e492bf0ced..4f7e5e6552 100644
--- a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java
+++ b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java
@@ -17,9 +17,14 @@
 package io.cloudbeaver.service.fs;
 
 import io.cloudbeaver.DBWebException;
+import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.service.DBWBindingContext;
+import io.cloudbeaver.service.DBWServiceBindingServlet;
+import io.cloudbeaver.service.DBWServletContext;
 import io.cloudbeaver.service.WebServiceBindingBase;
 import io.cloudbeaver.service.fs.impl.WebServiceFS;
+import io.cloudbeaver.service.fs.model.WebFSServlet;
+import org.jkiss.dbeaver.DBException;
 import org.jkiss.utils.CommonUtils;
 
 import java.net.URI;
@@ -27,7 +32,7 @@
 /**
  * Web service implementation
  */
-public class WebServiceBindingFS extends WebServiceBindingBase<DBWServiceFS> {
+public class WebServiceBindingFS extends WebServiceBindingBase<DBWServiceFS> implements DBWServiceBindingServlet<CBApplication> {
 
     private static final String SCHEMA_FILE_NAME = "schema/service.fs.graphqls";
 
@@ -40,44 +45,58 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
         model.getQueryType()
             .dataFetcher("fsListFileSystems",
                 env -> getService(env).getAvailableFileSystems(getWebSession(env), env.getArgument("projectId")))
+            .dataFetcher("fsFileSystem",
+                env -> getService(env).getFileSystem(
+                    getWebSession(env),
+                    env.getArgument("projectId"),
+                    env.getArgument("fileSystemId")
+                )
+            )
             .dataFetcher("fsFile",
                 env -> getService(env).getFile(getWebSession(env),
                     env.getArgument("projectId"),
-                    URI.create(env.getArgument("fileURI")))
+                    URI.create(env.getArgument("fileURI"))
+                )
             )
             .dataFetcher("fsListFiles",
                 env -> getService(env).getFiles(getWebSession(env),
                     env.getArgument("projectId"),
-                    URI.create(env.getArgument("folderURI")))
+                    URI.create(env.getArgument("folderURI"))
+                )
             )
             .dataFetcher("fsReadFileContentAsString",
                 env -> getService(env).readFileContent(getWebSession(env),
                     env.getArgument("projectId"),
-                    URI.create(env.getArgument("fileURI")))
+                    URI.create(env.getArgument("fileURI"))
+                )
             )
         ;
         model.getMutationType()
             .dataFetcher("fsCreateFile",
                 env -> getService(env).createFile(getWebSession(env),
                     env.getArgument("projectId"),
-                    URI.create(env.getArgument("fileURI")))
+                    URI.create(env.getArgument("fileURI"))
+                )
             )
             .dataFetcher("fsCreateFolder",
                 env -> getService(env).createFolder(getWebSession(env),
                     env.getArgument("projectId"),
-                    URI.create(env.getArgument("folderURI")))
+                    URI.create(env.getArgument("folderURI"))
+                    )
             )
-            .dataFetcher("fsDeleteFile",
+            .dataFetcher("fsDelete",
                 env -> getService(env).deleteFile(getWebSession(env),
                     env.getArgument("projectId"),
-                    URI.create(env.getArgument("fileURI")))
+                    URI.create(env.getArgument("fileURI"))
+                )
             )
-            .dataFetcher("fsMoveFile",
+            .dataFetcher("fsMove",
                 env -> getService(env).moveFile(
                     getWebSession(env),
                     env.getArgument("projectId"),
                     URI.create(env.getArgument("fromURI")),
-                    URI.create(env.getArgument("toURI")))
+                    URI.create(env.getArgument("toURI"))
+                )
             )
             .dataFetcher("fsWriteFileStringContent",
                 env -> getService(env).writeFileContent(
@@ -90,4 +109,13 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
             )
         ;
     }
+
+    @Override
+    public void addServlets(CBApplication application, DBWServletContext servletContext) throws DBException {
+        servletContext.addServlet(
+            "fileSystems",
+            new WebFSServlet(application, getServiceImpl()),
+            application.getServicesURI() + "fs-data/*"
+        );
+    }
 }
diff --git a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/impl/WebServiceFS.java b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/impl/WebServiceFS.java
index 2c0a7596d5..e527149b2f 100644
--- a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/impl/WebServiceFS.java
+++ b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/impl/WebServiceFS.java
@@ -17,14 +17,17 @@
 package io.cloudbeaver.service.fs.impl;
 
 import io.cloudbeaver.DBWebException;
+import io.cloudbeaver.model.fs.FSUtils;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.service.fs.DBWServiceFS;
 import io.cloudbeaver.service.fs.model.FSFile;
+import io.cloudbeaver.service.fs.model.FSFileSystem;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.fs.DBFVirtualFileSystem;
+import org.jkiss.dbeaver.registry.fs.FileSystemProviderRegistry;
 
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -35,19 +38,47 @@ public class WebServiceFS implements DBWServiceFS {
 
     @NotNull
     @Override
-    public String[] getAvailableFileSystems(@NotNull WebSession webSession, @NotNull String projectId)
+    public FSFileSystem[] getAvailableFileSystems(@NotNull WebSession webSession, @NotNull String projectId)
         throws DBWebException {
         try {
+            var fsRegistry = FileSystemProviderRegistry.getInstance();
             return webSession.getFileSystemManager(projectId)
                 .getVirtualFileSystems()
                 .stream()
-                .map(DBFVirtualFileSystem::getType)
-                .toArray(String[]::new);
+                .map(fs -> new FSFileSystem(
+                    FSUtils.makeUniqueFsId(fs),
+                        fsRegistry.getProvider(fs.getProviderId()).getRequiredAuth()
+                    )
+                )
+                .toArray(FSFileSystem[]::new);
         } catch (Exception e) {
             throw new DBWebException("Failed to load file systems: " + e.getMessage(), e);
         }
     }
 
+    @NotNull
+    @Override
+    public FSFileSystem getFileSystem(
+        @NotNull WebSession webSession,
+        @NotNull String projectId,
+        @NotNull String fileSystemId
+    ) throws DBWebException {
+        try {
+            var fsRegistry = FileSystemProviderRegistry.getInstance();
+            return webSession.getFileSystemManager(projectId)
+                .getVirtualFileSystems()
+                .stream()
+                .filter(fs -> FSUtils.makeUniqueFsId(fs).equals(fileSystemId))
+                .findFirst()
+                .map(fs -> new FSFileSystem(
+                    FSUtils.makeUniqueFsId(fs),
+                    fsRegistry.getProvider(fs.getProviderId()).getRequiredAuth()
+                )).orElseThrow(() -> new DBWebException("File system not found"));
+        } catch (Exception e) {
+            throw new DBWebException("Failed to get file system: " + e.getMessage(), e);
+        }
+    }
+
     @NotNull
     @Override
     public FSFile getFile(@NotNull WebSession webSession, @NotNull String projectId, @NotNull URI fileUri)
@@ -80,15 +111,17 @@ public FSFile[] getFiles(@NotNull WebSession webSession, @NotNull String project
     public String readFileContent(@NotNull WebSession webSession, @NotNull String projectId, @NotNull URI fileUri)
         throws DBWebException {
         try {
-            Path filePath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), fileUri);
-            return Files.readString(filePath);
+            Path filePath = webSession.getFileSystemManager(projectId)
+                .getPathFromURI(webSession.getProgressMonitor(), fileUri);
+            var data = Files.readAllBytes(filePath);
+            return new String(data, StandardCharsets.UTF_8);
         } catch (Exception e) {
             throw new DBWebException("Failed to read file content: " + e.getMessage(), e);
         }
     }
 
     @Override
-    public boolean writeFileContent(
+    public FSFile writeFileContent(
         @NotNull WebSession webSession,
         @NotNull String projectId,
         @NotNull URI fileURI,
@@ -97,12 +130,13 @@ public boolean writeFileContent(
     )
         throws DBWebException {
         try {
-            Path filePath = webSession.getFileSystemManager(projectId).getPathFromURI(webSession.getProgressMonitor(), fileURI);
+            Path filePath = webSession.getFileSystemManager(projectId)
+                .getPathFromURI(webSession.getProgressMonitor(), fileURI);
             if (!forceOverwrite && Files.exists(filePath)) {
                 throw new DBException("Cannot overwrite exist file");
             }
             Files.writeString(filePath, data);
-            return true;
+            return new FSFile(filePath);
         } catch (Exception e) {
             throw new DBWebException("Failed to write file content: " + e.getMessage(), e);
         }
diff --git a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java
new file mode 100644
index 0000000000..3684946f3e
--- /dev/null
+++ b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java
@@ -0,0 +1,111 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.service.fs.model;
+
+import io.cloudbeaver.DBWebException;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.server.CBApplication;
+import io.cloudbeaver.service.WebServiceServletBase;
+import io.cloudbeaver.service.fs.DBWServiceFS;
+import org.eclipse.jetty.server.Request;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.data.json.JSONUtils;
+import org.jkiss.utils.CommonUtils;
+import org.jkiss.utils.IOUtils;
+
+import javax.servlet.MultipartConfigElement;
+import javax.servlet.annotation.MultipartConfig;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
+@MultipartConfig()
+public class WebFSServlet extends WebServiceServletBase {
+    private static final String PARAM_PROJECT_ID = "projectId";
+    private final DBWServiceFS fs;
+
+    public WebFSServlet(CBApplication application, DBWServiceFS fs) {
+        super(application);
+        this.fs = fs;
+    }
+
+    @Override
+    protected void processServiceRequest(WebSession session, HttpServletRequest request, HttpServletResponse response) throws DBException, IOException {
+        if (!session.isAuthorizedInSecurityManager()) {
+            response.sendError(HttpServletResponse.SC_FORBIDDEN, "Anonymous access restricted.");
+            return;
+        }
+        if (request.getMethod().equals("POST")) {
+            doPost(session, request, response);
+        } else {
+            doGet(session, request, response);
+        }
+
+    }
+
+    private void doGet(WebSession session, HttpServletRequest request, HttpServletResponse response) throws DBException, IOException {
+        String projectId = request.getParameter(PARAM_PROJECT_ID);
+        Path path = getPath(session, projectId, request.getParameter("fileURI"));
+        session.addInfoMessage("Download data ...");
+        response.setHeader("Content-Type", "application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment; filename=\"" + path.getFileName() + "\"");
+        response.setHeader("Content-Length", String.valueOf(Files.size(path)));
+
+        try (InputStream is = Files.newInputStream(path)) {
+            IOUtils.copyStream(is, response.getOutputStream());
+        }
+    }
+
+    private void doPost(WebSession session, HttpServletRequest request, HttpServletResponse response) throws DBException, IOException {
+        // we need to set this attribute to get parts
+        request.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, new MultipartConfigElement(""));
+        Map<String, Object> variables = getVariables(request);
+        String projectId = JSONUtils.getString(variables, PARAM_PROJECT_ID);
+        String uri = JSONUtils.getString(variables, "toURI");
+        Path path = getPath(session, projectId, uri);
+        try {
+            for (Part part : request.getParts()) {
+                String fileName = part.getSubmittedFileName();
+                if (CommonUtils.isEmpty(fileName)) {
+                    continue;
+                }
+                try (InputStream is = part.getInputStream()) {
+                    Files.copy(is, path.resolve(fileName));
+                }
+            }
+        } catch (Exception e) {
+            throw new DBWebException("File Upload Failed: Unable to Save File to the File System", e);
+        }
+    }
+
+    @NotNull
+    private Path getPath(WebSession session, String projectId, String uri) throws DBException {
+        if (CommonUtils.isEmpty(projectId)) {
+            throw new DBWebException("Project ID is not found");
+        }
+        if (CommonUtils.isEmpty(uri)) {
+            throw new DBWebException("URI is not found");
+        }
+        return session.getFileSystemManager(projectId).getPathFromString(session.getProgressMonitor(), uri);
+    }
+}
diff --git a/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/WebServiceBindingRM.java b/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/WebServiceBindingRM.java
index 1909e3126b..17b86299e4 100644
--- a/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/WebServiceBindingRM.java
+++ b/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/WebServiceBindingRM.java
@@ -118,7 +118,7 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
                 env.getArgument("subjectIds"),
                 env.getArgument("permissions")
             ))
-            .dataFetcher("rmDeleteProjectsPermissions", env -> getService(env).addProjectsPermissions(
+            .dataFetcher("rmDeleteProjectsPermissions", env -> getService(env).deleteProjectsPermissions(
                 getWebSession(env),
                 env.getArgument("projectIds"),
                 env.getArgument("subjectIds"),
diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_create.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_create.sql
index 2896c125c2..febb3482c3 100644
--- a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_create.sql
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_create.sql
@@ -308,7 +308,7 @@ CREATE TABLE {table_prefix}CB_USER_SECRETS
 
     SECRET_LABEL                   VARCHAR(128),
     SECRET_DESCRIPTION             VARCHAR(1024),
-    ENCODING_TYPE                  VARCHAR(32) NOT NULL DEFAULT 'PLAINTEXT',
+    ENCODING_TYPE                  VARCHAR(32) DEFAULT 'PLAINTEXT' NOT NULL,
     UPDATE_TIME                    TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
 
     PRIMARY KEY (USER_ID, SECRET_ID),
diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_10.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_10.sql
index 7fdc12e8d0..8d1d44cf82 100644
--- a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_10.sql
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_10.sql
@@ -7,7 +7,7 @@ CREATE TABLE {table_prefix}CB_USER_SECRETS
     SECRET_LABEL                   VARCHAR(128),
     SECRET_DESCRIPTION             VARCHAR(1024),
 
-    UPDATE_TIME                    TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    UPDATE_TIME                    TIMESTAMP   DEFAULT CURRENT_TIMESTAMP NOT NULL,
 
     PRIMARY KEY (USER_ID, SECRET_ID),
     FOREIGN KEY (USER_ID) REFERENCES {table_prefix}CB_USER (USER_ID) ON DELETE CASCADE
diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_13.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_13.sql
index 843ab47a31..200cc664ea 100644
--- a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_13.sql
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_13.sql
@@ -1,2 +1,2 @@
 ALTER TABLE {table_prefix}CB_USER_SECRETS
-    ADD COLUMN ENCODING_TYPE VARCHAR(32) NOT NULL DEFAULT 'PLAINTEXT';
\ No newline at end of file
+    ADD COLUMN ENCODING_TYPE VARCHAR(32) DEFAULT 'PLAINTEXT' NOT NULL;
\ No newline at end of file
diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_2.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_2.sql
index ee14af9683..fbffddcab3 100644
--- a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_2.sql
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_2.sql
@@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS {table_prefix}CB_WORKSPACE(
     FOREIGN KEY(INSTANCE_ID) REFERENCES {table_prefix}CB_INSTANCE(INSTANCE_ID)
 );
 
-ALTER TABLE {table_prefix}CB_USER_CREDENTIALS ADD UPDATE_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE {table_prefix}CB_USER_CREDENTIALS ADD UPDATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
 
 ALTER TABLE {table_prefix}CB_SESSION ALTER COLUMN LAST_ACCESS_REMOTE_ADDRESS VARCHAR(128) NULL;
 ALTER TABLE {table_prefix}CB_SESSION ALTER COLUMN LAST_ACCESS_USER_AGENT VARCHAR(255) NULL;
diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_5.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_5.sql
index c15cbf971c..b7ccc68097 100644
--- a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_5.sql
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_5.sql
@@ -5,7 +5,7 @@ CREATE TABLE {table_prefix}CB_AUTH_TOKEN
     USER_ID VARCHAR(128),
 
     EXPIRATION_TIME TIMESTAMP NOT NULL,
-    CREATE_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CREATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
 
     PRIMARY KEY (TOKEN_ID),
     FOREIGN KEY (SESSION_ID) REFERENCES {table_prefix}CB_SESSION (SESSION_ID) ON DELETE CASCADE,
diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_7.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_7.sql
index 410597bc0e..64cb9ca652 100644
--- a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_7.sql
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_7.sql
@@ -8,7 +8,7 @@ CREATE TABLE {table_prefix}CB_AUTH_ATTEMPT
     SESSION_TYPE      VARCHAR(64)  NOT NULL,
     APP_SESSION_STATE TEXT         NOT NULL,
 
-    CREATE_TIME       TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CREATE_TIME       TIMESTAMP    DEFAULT CURRENT_TIMESTAMP NOT NULL,
 
     PRIMARY KEY (AUTH_ID),
     FOREIGN KEY (SESSION_ID) REFERENCES {table_prefix}CB_SESSION (SESSION_ID) ON DELETE CASCADE
@@ -21,7 +21,7 @@ CREATE TABLE {table_prefix}CB_AUTH_ATTEMPT_INFO
     AUTH_PROVIDER_CONFIGURATION_ID VARCHAR(128),
     AUTH_STATE                     TEXT         NOT NULL,
 
-    CREATE_TIME                    TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CREATE_TIME                    TIMESTAMP    DEFAULT CURRENT_TIMESTAMP NOT NULL,
 
     PRIMARY KEY (AUTH_ID, AUTH_PROVIDER_ID),
     FOREIGN KEY (AUTH_ID) REFERENCES {table_prefix}CB_AUTH_ATTEMPT (AUTH_ID) ON DELETE CASCADE
diff --git a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_9.sql b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_9.sql
index ca028aabbc..a6c7e3e712 100644
--- a/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_9.sql
+++ b/server/bundles/io.cloudbeaver.service.security/db/cb_schema_update_9.sql
@@ -2,4 +2,4 @@ ALTER TABLE {table_prefix}CB_AUTH_TOKEN
     ADD REFRESH_TOKEN_ID VARCHAR(128);
 
 ALTER TABLE {table_prefix}CB_AUTH_TOKEN
-    ADD REFRESH_TOKEN_EXPIRATION_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP;
\ No newline at end of file
+    ADD REFRESH_TOKEN_EXPIRATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
\ No newline at end of file
diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
index 592892804f..4b68f9d8ae 100644
--- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
+++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
@@ -375,10 +375,8 @@ public SMUser[] findUsers(@NotNull SMUserFilter filter)
             // Read users
             try (PreparedStatement dbStat = dbCon.prepareStatement(
                 database.normalizeTableNames("SELECT USER_ID,IS_ACTIVE,DEFAULT_AUTH_ROLE FROM {table_prefix}CB_USER"
-                    + buildUsersFilter(filter) + "\nORDER BY USER_ID LIMIT ? OFFSET ?"))) {
+                    + buildUsersFilter(filter) + "\nORDER BY USER_ID " + getOffsetLimitPart(filter)))) {
                 int parameterIndex = setUsersFilterValues(dbStat, filter, 1);
-                dbStat.setInt(parameterIndex++, filter.getPage().getLimit());
-                dbStat.setInt(parameterIndex++, filter.getPage().getOffset());
 
                 try (ResultSet dbResult = dbStat.executeQuery()) {
                     while (dbResult.next()) {
@@ -424,6 +422,10 @@ public SMUser[] findUsers(@NotNull SMUserFilter filter)
         }
     }
 
+    private String getOffsetLimitPart(@NotNull SMUserFilter filter) {
+        return database.getDialect().getOffsetLimitQueryPart(filter.getPage().getOffset(), filter.getPage().getLimit());
+    }
+
     private String buildUsersFilter(SMUserFilter filter) {
         StringBuilder where = new StringBuilder();
         List<String> whereParts = new ArrayList<>();
@@ -2758,9 +2760,10 @@ public void clearOldAuthAttemptInfo() throws DBException {
                     "WHERE EXISTS " +
                     "(SELECT 1 FROM {table_prefix}CB_AUTH_ATTEMPT AA " +
                     "LEFT JOIN {table_prefix}CB_AUTH_TOKEN CAT ON AA.SESSION_ID = CAT.SESSION_ID " +
-                    "WHERE (CAT.REFRESH_TOKEN_EXPIRATION_TIME < NOW() OR CAT.EXPIRATION_TIME IS NULL) " +
+                    "WHERE (CAT.REFRESH_TOKEN_EXPIRATION_TIME < ? OR CAT.EXPIRATION_TIME IS NULL) " +
                     "AND AA.AUTH_ID=AAI.AUTH_ID AND AUTH_STATUS='" + SMAuthStatus.EXPIRED + "') " +
                     "AND CREATE_TIME<?"),
+                Timestamp.valueOf(LocalDateTime.now()),
                 Timestamp.valueOf(LocalDateTime.now().minusMinutes(smConfig.getExpiredAuthAttemptInfoTtl()))
             );
         } catch (SQLException e) {
diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
index 13475c8960..5ce47a1c59 100644
--- a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
+++ b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
@@ -86,6 +86,7 @@ public class CBDatabase {
 
     private String instanceId;
     private SMAdminController adminSecurityController;
+    private SQLDialect dialect;
 
     public CBDatabase(WebApplication application, CBDatabaseConfig databaseConfiguration) {
         this.application = application;
@@ -178,7 +179,7 @@ public void initialize() throws DBException {
         } catch (SQLException e) {
             throw new DBException("Error initializing connection pool");
         }
-        SQLDialect dialect = driver.getScriptDialect().createInstance();
+        dialect = driver.getScriptDialect().createInstance();
 
         try (Connection connection = cbDataSource.getConnection()) {
             DatabaseMetaData metaData = connection.getMetaData();
@@ -540,5 +541,10 @@ private String getCurrentInstanceId() throws IOException {
     public String normalizeTableNames(@NotNull String sql) {
         return CommonUtils.normalizeTableNames(sql, databaseConfiguration.getSchema());
     }
+
+    @NotNull
+    public SQLDialect getDialect() {
+        return dialect;
+    }
     
 }
diff --git a/server/test/io.cloudbeaver.test.platform/workspace/conf/cloudbeaver.conf b/server/test/io.cloudbeaver.test.platform/workspace/conf/cloudbeaver.conf
index ba7e5de3b3..13b7b24448 100644
--- a/server/test/io.cloudbeaver.test.platform/workspace/conf/cloudbeaver.conf
+++ b/server/test/io.cloudbeaver.test.platform/workspace/conf/cloudbeaver.conf
@@ -60,27 +60,6 @@
             "sqlite:sqlite_jdbc",
             "h2:h2_embedded",
             "h2:h2_embedded_v2"
-        ],
-
-        plugins: {
-            aws: {
-                clouds: {
-                    AWS: {
-                        cloudName: "AWS",
-
-                        autoRegistrationEnabled: true,
-                        autoRegistrationAccounts: [  ],
-                        defaultRegions: [  ],
-                        enabledServices: [ "rds", "redshift", "dynamodb", "documentdb" ],
-
-                        federatedAccessEnabled: true
-                    }
-                }
-            },
-            saml: {
-                signon-finish-uri = "/sso.html",
-                signout-finish-uri = "/sso.html"
-            }
-        }
+        ]
     }
 }
diff --git a/webapp/packages/core-authentication/src/UsersResource.ts b/webapp/packages/core-authentication/src/UsersResource.ts
index ba1d6e8f62..8d0692960e 100644
--- a/webapp/packages/core-authentication/src/UsersResource.ts
+++ b/webapp/packages/core-authentication/src/UsersResource.ts
@@ -182,7 +182,15 @@ export class UsersResource extends CachedMapResource<string, AdminUser, UserReso
   }
 
   async setAuthRole(userId: string, authRole?: string, skipUpdate?: boolean): Promise<void> {
-    await this.graphQLService.sdk.setUserAuthRole({ userId, authRole });
+    await this.performUpdate(userId, undefined, async () => {
+      await this.graphQLService.sdk.setUserAuthRole({ userId, authRole });
+
+      const user = this.get(userId);
+
+      if (user) {
+        user.authRole = authRole;
+      }
+    });
 
     if (!skipUpdate) {
       this.markOutdated(userId);
diff --git a/webapp/packages/core-blocks/src/Containers/ColoredContainer.m.css b/webapp/packages/core-blocks/src/Containers/ColoredContainer.m.css
index 2d38b9b425..4c30c0cb88 100644
--- a/webapp/packages/core-blocks/src/Containers/ColoredContainer.m.css
+++ b/webapp/packages/core-blocks/src/Containers/ColoredContainer.m.css
@@ -1,3 +1,6 @@
-.coloredContainer {
+.secondary {
   composes: theme-background-secondary theme-text-on-secondary from global;
 }
+.surface {
+  composes: theme-background-surface theme-text-on-surface from global;
+}
diff --git a/webapp/packages/core-blocks/src/Containers/ColoredContainer.tsx b/webapp/packages/core-blocks/src/Containers/ColoredContainer.tsx
index fe7cce0814..ec572b0904 100644
--- a/webapp/packages/core-blocks/src/Containers/ColoredContainer.tsx
+++ b/webapp/packages/core-blocks/src/Containers/ColoredContainer.tsx
@@ -15,13 +15,14 @@ import { filterContainerFakeProps, getContainerProps } from './filterContainerFa
 import type { IContainerProps } from './IContainerProps';
 import elementsSizeStyles from './shared/ElementsSize.m.css';
 
-export const ColoredContainer = forwardRef<HTMLDivElement, IContainerProps & React.HTMLAttributes<HTMLDivElement>>(function ColoredContainer(
-  { className, ...rest },
-  ref,
-) {
+interface Props extends IContainerProps, React.HTMLAttributes<HTMLDivElement> {
+  surface?: boolean;
+}
+
+export const ColoredContainer = forwardRef<HTMLDivElement, Props>(function ColoredContainer({ className, surface, ...rest }, ref) {
   const styles = useS(coloredContainerStyles, containerStyles, elementsSizeStyles);
   const divProps = filterContainerFakeProps(rest);
   const containerProps = getContainerProps(rest);
 
-  return <div ref={ref} {...divProps} className={s(styles, { coloredContainer: true, container: true, ...containerProps }, className)} />;
+  return <div ref={ref} {...divProps} className={s(styles, { surface, secondary: !surface, container: true, ...containerProps }, className)} />;
 });
diff --git a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
index a6893b2768..5a8280c6d2 100644
--- a/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
+++ b/webapp/packages/core-blocks/src/Snackbars/SnackbarMarkups/SnackbarStatus.tsx
@@ -22,7 +22,7 @@ export const SnackbarStatus: React.FC<SnackbarStatusProps> = function SnackbarSt
   const styles = useS(style);
   return status === ENotificationType.Loading ? (
     <div data-testid="loader-container" className={s(styles, { loaderContainer: true }, className)}>
-      <Loader className={styles.loader} fullSize hideMessage />
+      <Loader className={styles.loader} hideMessage />
     </div>
   ) : (
     <NotificationMark className={s(styles, { notificationMark: true }, className)} type={status} />
diff --git a/webapp/packages/core-browser/src/selectFiles.ts b/webapp/packages/core-browser/src/selectFiles.ts
index 3c15074e7e..9021a69b2b 100644
--- a/webapp/packages/core-browser/src/selectFiles.ts
+++ b/webapp/packages/core-browser/src/selectFiles.ts
@@ -6,10 +6,15 @@
  * you may not use this file except in compliance with the License.
  */
 
-export function selectFiles(callback: (files: FileList | null) => any): void {
+export function selectFiles(callback: (files: FileList | null) => any, multiple?: boolean): void {
   let removed = false;
   const input = document.createElement('input');
   input.type = 'file';
+
+  if (multiple) {
+    input.multiple = true;
+  }
+
   input.onchange = () => {
     callback(input.files);
     removed = true;
diff --git a/webapp/packages/core-events/src/INotification.ts b/webapp/packages/core-events/src/INotification.ts
index cee5197b84..0bbda71bb3 100644
--- a/webapp/packages/core-events/src/INotification.ts
+++ b/webapp/packages/core-events/src/INotification.ts
@@ -14,6 +14,7 @@ export interface IProcessNotificationState {
   init: (title: string, message?: string) => void;
   resolve: (title: string, message?: string) => void;
   reject: (error: Error, title?: string, message?: string) => void;
+  setMessage: (message: string | null) => void;
 }
 
 export enum ENotificationType {
diff --git a/webapp/packages/core-events/src/ProcessNotificationController.ts b/webapp/packages/core-events/src/ProcessNotificationController.ts
index f7052007de..3324bb4dfa 100644
--- a/webapp/packages/core-events/src/ProcessNotificationController.ts
+++ b/webapp/packages/core-events/src/ProcessNotificationController.ts
@@ -28,7 +28,7 @@ export class ProcessNotificationController implements IProcessNotificationState
       error: observable,
       title: observable,
       status: observable,
-      message: observable,
+      message: observable.ref,
     });
   }
 
@@ -52,4 +52,8 @@ export class ProcessNotificationController implements IProcessNotificationState
     this.message = message || errorDetails?.message || error.message;
     this.error = error;
   }
+
+  setMessage(message: string | null) {
+    this.message = message;
+  }
 }
diff --git a/webapp/packages/core-localization/src/locales/en.ts b/webapp/packages/core-localization/src/locales/en.ts
index 14498d138d..7332c011f9 100644
--- a/webapp/packages/core-localization/src/locales/en.ts
+++ b/webapp/packages/core-localization/src/locales/en.ts
@@ -92,6 +92,7 @@ export default [
   ['ui_close_all_to_the_left', 'Close all to the Left'],
   ['ui_or', 'Or'],
   ['ui_download', 'Download'],
+  ['ui_download_file', 'Download file'],
   ['ui_upload', 'Upload'],
   ['ui_import', 'Import'],
   ['ui_view', 'View'],
@@ -103,6 +104,8 @@ export default [
   ['ui_upload_file', 'Upload file'],
   ['ui_upload_files', 'Upload files'],
   ['ui_upload_files_duplicate_error', 'Files with the same name already exist'],
+  ['ui_upload_file_fail', 'Failed to upload file'],
+  ['ui_filter', 'Filter'],
 
   ['root_permission_denied', "You don't have permissions"],
   ['root_permission_no_permission', "You don't have permission for this action"],
diff --git a/webapp/packages/core-localization/src/locales/it.ts b/webapp/packages/core-localization/src/locales/it.ts
index 2c8a057faf..c310a4e35d 100644
--- a/webapp/packages/core-localization/src/locales/it.ts
+++ b/webapp/packages/core-localization/src/locales/it.ts
@@ -76,6 +76,7 @@ export default [
   ['ui_close_all_to_the_left', 'Close all to the Left'],
   ['ui_or', 'Or'],
   ['ui_download', 'Download'],
+  ['ui_download_file', 'Download file'],
   ['ui_upload', 'Upload'],
   ['ui_import', 'Import'],
   ['ui_view', 'View'],
@@ -87,6 +88,8 @@ export default [
   ['ui_upload_file', 'Upload file'],
   ['ui_upload_files', 'Upload files'],
   ['ui_upload_files_duplicate_error', 'Files with the same name already exist'],
+  ['ui_upload_file_fail', 'Failed to upload file'],
+  ['ui_filter', 'Filter'],
 
   ['root_permission_denied', 'Non hai i permessi'],
   ['app_root_session_expire_warning_title', 'La sessione sta per scadere'],
diff --git a/webapp/packages/core-localization/src/locales/ru.ts b/webapp/packages/core-localization/src/locales/ru.ts
index a61d30fd4f..f7030e15e3 100644
--- a/webapp/packages/core-localization/src/locales/ru.ts
+++ b/webapp/packages/core-localization/src/locales/ru.ts
@@ -88,6 +88,7 @@ export default [
   ['ui_close_all_to_the_left', 'Закрыть все слева'],
   ['ui_or', 'Или'],
   ['ui_download', 'Cкачать'],
+  ['ui_download_file', 'Скачать файл'],
   ['ui_upload', 'Загрузить'],
   ['ui_import', 'Импортировать'],
   ['ui_view', 'Смотреть'],
@@ -99,6 +100,8 @@ export default [
   ['ui_upload_file', 'Загрузить файл'],
   ['ui_upload_files', 'Загрузить файлы'],
   ['ui_upload_files_duplicate_error', 'Файлы с такими именами уже существуют'],
+  ['ui_upload_file_fail', 'Не удалось загрузить файл'],
+  ['ui_filter', 'Фильтр'],
 
   ['root_permission_denied', 'Отказано в доступе'],
   ['root_permission_no_permission', 'У вас нет разрешения на это действие'],
diff --git a/webapp/packages/core-localization/src/locales/zh.ts b/webapp/packages/core-localization/src/locales/zh.ts
index dcd8b9e5a2..7c0a1619fa 100644
--- a/webapp/packages/core-localization/src/locales/zh.ts
+++ b/webapp/packages/core-localization/src/locales/zh.ts
@@ -89,6 +89,7 @@ export default [
   ['ui_close_all_to_the_left', 'Close all to the Left'],
   ['ui_or', 'Or'],
   ['ui_download', 'Download'],
+  ['ui_download_file', 'Download file'],
   ['ui_upload', 'Upload'],
   ['ui_import', 'Import'],
   ['ui_view', 'View'],
@@ -100,6 +101,8 @@ export default [
   ['ui_upload_file', 'Upload file'],
   ['ui_upload_files', 'Upload files'],
   ['ui_upload_files_duplicate_error', 'Files with the same name already exist'],
+  ['ui_upload_file_fail', 'Failed to upload file'],
+  ['ui_filter', 'Filter'],
 
   ['root_permission_denied', '您没有权限'],
   ['root_permission_no_permission', '您没有权限执行此操作'],
diff --git a/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeManagerService.ts b/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeManagerService.ts
index daf26f1667..fa14691ce9 100644
--- a/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeManagerService.ts
+++ b/webapp/packages/core-navigation-tree/src/NodesManager/NavNodeManagerService.ts
@@ -322,13 +322,13 @@ export class NavNodeManagerService extends Bootstrap {
     let icon: string | undefined;
     let canOpen = false;
 
-    if (NodeManagerUtils.isDatabaseObject(nodeId)) {
-      const node = this.getNode(nodeId);
-
-      if (node) {
-        name = node.name;
-        icon = node.icon;
+    const node = this.getNode(nodeId);
+    if (node) {
+      name = node.name;
+      icon = node.icon;
+      projectId ||= node.projectId;
 
+      if (NodeManagerUtils.isDatabaseObject(nodeId)) {
         if (node.folder) {
           const parent = this.getParent(node);
           folderId = nodeId;
diff --git a/webapp/packages/core-projects/src/isResourceOfType.ts b/webapp/packages/core-projects/src/isResourceOfType.ts
index 2e9f076aba..3f8a9bbfc2 100644
--- a/webapp/packages/core-projects/src/isResourceOfType.ts
+++ b/webapp/packages/core-projects/src/isResourceOfType.ts
@@ -8,5 +8,5 @@
 import type { ProjectInfoResourceType } from './ProjectInfoResource';
 
 export function isResourceOfType(resourceType: ProjectInfoResourceType, name: string): boolean {
-  return resourceType.fileExtensions.some(type => name.endsWith(`.${type}`));
+  return resourceType.fileExtensions.some(type => name.toLowerCase().endsWith(`.${type.toLowerCase()}`));
 }
diff --git a/webapp/packages/core-sdk/src/Extensions/uploadBlobResultSetExtension.ts b/webapp/packages/core-sdk/src/Extensions/uploadBlobResultSetExtension.ts
index c80271ed8c..10b0a7a1fe 100644
--- a/webapp/packages/core-sdk/src/Extensions/uploadBlobResultSetExtension.ts
+++ b/webapp/packages/core-sdk/src/Extensions/uploadBlobResultSetExtension.ts
@@ -9,11 +9,11 @@ import { GlobalConstants } from '@cloudbeaver/core-utils';
 
 import type { CustomGraphQLClient, UploadProgressEvent } from '../CustomGraphQLClient';
 
-export interface IUploadDriverLibraryExtension {
+export interface IUploadBlobResultSetExtension {
   uploadBlobResultSet: (fileId: string, data: Blob, onUploadProgress?: (event: UploadProgressEvent) => void) => Promise<void>;
 }
 
-export function uploadBlobResultSetExtension(client: CustomGraphQLClient): IUploadDriverLibraryExtension {
+export function uploadBlobResultSetExtension(client: CustomGraphQLClient): IUploadBlobResultSetExtension {
   return {
     uploadBlobResultSet(fileId: string, data: Blob, onUploadProgress?: (event: UploadProgressEvent) => void): Promise<void> {
       // api/resultset/blob
diff --git a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
index f3b2b7c472..fc869bb06e 100644
--- a/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
+++ b/webapp/packages/core-ui/src/ContextMenu/MenuBar/MenuBarItem.tsx
@@ -35,29 +35,23 @@ export const MenuBarItem = observer<Props, HTMLButtonElement>(
     const title = translate(rest.title);
     return (
       <button ref={ref} className={s(styles, { menuBarItem: true, hidden }, className)} {...rest} title={title} aria-label={title}>
-        <div className={s(styles, { menuBarItemBox: true }, className)}>
+        <div className={s(styles, { menuBarItemBox: true })}>
           {loading ? (
-            <div className={s(styles, { menuBarItemIcon: true }, className)}>
-              <Loader className={s(styles, { loader: true }, className)} small fullSize />
+            <div className={s(styles, { menuBarItemIcon: true })}>
+              <Loader className={s(styles, { loader: true })} small fullSize />
             </div>
           ) : (
             icon && (
-              <div className={s(styles, { menuBarItemIcon: true }, className)}>
-                <Loader className={s(styles, { loader: true }, className)} suspense small fullSize>
-                  {typeof icon === 'string' ? (
-                    <IconOrImage className={s(styles, { iconOrImage: true }, className)} icon={icon} viewBox={viewBox} />
-                  ) : (
-                    icon
-                  )}
+              <div className={s(styles, { menuBarItemIcon: true })}>
+                <Loader className={s(styles, { loader: true })} suspense small fullSize>
+                  {typeof icon === 'string' ? <IconOrImage className={s(styles, { iconOrImage: true })} icon={icon} viewBox={viewBox} /> : icon}
                 </Loader>
               </div>
             )
           )}
-          {label && displayLabel && (
-            <div className={s(styles, { menuBarItemLabel: true }, className)}>{translate(label)}</div>
-          )}
+          {label && displayLabel && <div className={s(styles, { menuBarItemLabel: true })}>{translate(label)}</div>}
           {displaySubmenuMark && (
-            <div className={s(styles, { menuBarItemMark: true }, className)}>
+            <div className={s(styles, { menuBarItemMark: true })}>
               <Icon className={s(styles, { icon: true }, className)} name="angle" viewBox="0 0 15 8" />
             </div>
           )}
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_DOWNLOAD.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_DOWNLOAD.ts
new file mode 100644
index 0000000000..931afffec5
--- /dev/null
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_DOWNLOAD.ts
@@ -0,0 +1,13 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { createAction } from '../createAction';
+
+export const ACTION_DOWNLOAD = createAction('download', {
+  label: 'ui_download',
+  icon: '/icons/export.svg',
+});
diff --git a/webapp/packages/core-view/src/Action/Actions/ACTION_UPLOAD.ts b/webapp/packages/core-view/src/Action/Actions/ACTION_UPLOAD.ts
new file mode 100644
index 0000000000..437a5671a8
--- /dev/null
+++ b/webapp/packages/core-view/src/Action/Actions/ACTION_UPLOAD.ts
@@ -0,0 +1,13 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { createAction } from '../createAction';
+
+export const ACTION_UPLOAD = createAction('upload', {
+  label: 'ui_upload',
+  icon: '/icons/import.svg',
+});
diff --git a/webapp/packages/core-view/src/index.ts b/webapp/packages/core-view/src/index.ts
index 197185f995..ce0e214a88 100644
--- a/webapp/packages/core-view/src/index.ts
+++ b/webapp/packages/core-view/src/index.ts
@@ -16,6 +16,8 @@ export * from './Action/Actions/ACTION_SETTINGS';
 export * from './Action/Actions/ACTION_UNDO';
 export * from './Action/Actions/ACTION_ZOOM_IN';
 export * from './Action/Actions/ACTION_ZOOM_OUT';
+export * from './Action/Actions/ACTION_DOWNLOAD';
+export * from './Action/Actions/ACTION_UPLOAD';
 export * from './Action/KeyBinding/Bindings/KEY_BINDING_OPEN_IN_TAB';
 export * from './Action/KeyBinding/Bindings/KEY_BINDING_REDO';
 export * from './Action/KeyBinding/Bindings/KEY_BINDING_UNDO';
diff --git a/webapp/packages/plugin-administration/src/locales/en.ts b/webapp/packages/plugin-administration/src/locales/en.ts
index e604f04af4..10887d7624 100644
--- a/webapp/packages/plugin-administration/src/locales/en.ts
+++ b/webapp/packages/plugin-administration/src/locales/en.ts
@@ -7,7 +7,7 @@ export default [
   ['administration_configuration_wizard_welcome_title', 'Welcome to {alias:product_full_name}, cloud database management system!'],
   [
     'administration_configuration_wizard_welcome_message',
-    'The easy configuration wizard will guide you through several simple steps to set up the CloudBeaver server. You will need to set server information and administrator credentials. You can set up additional server parameters once the easy configuration is completed.',
+    'The easy configuration wizard will guide you through several simple steps to set up the server. You will need to set server information and administrator credentials. You can set up additional server parameters once the easy configuration is completed.',
   ],
   [
     'administration_configuration_wizard_welcome_note',
@@ -70,7 +70,7 @@ export default [
   ['administration_configuration_wizard_finish_title', 'That is almost it.'],
   [
     'administration_configuration_wizard_finish_message',
-    'Press the Finish button to complete the server configuration. You can return to the previous pages if you want to change or add something.\nWhen the configuration is completed all entered settings will be applied for your CloudBeaver server. You will be redirected to the main page to start working.\nYou can always login to the system as administrator to change the server settings.',
+    'Press the Finish button to complete the server configuration. You can return to the previous pages if you want to change or add something.\nWhen the configuration is completed all entered settings will be applied for your server. You will be redirected to the main page to start working.\nYou can always login to the system as administrator to change the server settings.',
   ],
 
   ['administration_disabled_drivers_title', 'Disabled drivers'],
diff --git a/webapp/packages/plugin-administration/src/locales/it.ts b/webapp/packages/plugin-administration/src/locales/it.ts
index f054baf291..2fcc1d55e8 100644
--- a/webapp/packages/plugin-administration/src/locales/it.ts
+++ b/webapp/packages/plugin-administration/src/locales/it.ts
@@ -7,7 +7,7 @@ export default [
   ['administration_configuration_wizard_welcome_title', 'Benvenuto a CloudBeaver, il sistema di gestione database in cloud!'],
   [
     'administration_configuration_wizard_welcome_message',
-    'Il semplice wizard di configurazione ti guiderà per diversi semplici passi per configurare il tuo server CloudBeaver. Dovrai impostare informazioni sul server e le credenziali amministrative. Potrai inoltre aggiungere la tua prima connessione al database.',
+    'Il semplice wizard di configurazione ti guiderà per diversi semplici passi per configurare il tuo server. Dovrai impostare informazioni sul server e le credenziali amministrative. Potrai inoltre aggiungere la tua prima connessione al database.',
   ],
   [
     'administration_configuration_wizard_welcome_note',
@@ -75,7 +75,7 @@ export default [
   ['administration_configuration_wizard_finish_title', 'Ci siamo quasi.'],
   [
     'administration_configuration_wizard_finish_message',
-    'Premi il pulsante Conferma per completare la configurazione del server. Puoi tornare alle pagine precedenti se vuoi modificare o aggiungere qualcosa.\nQuando la configurazione è completa le impostazioni saranno applicate al tuo server CloudBeaver. Sarai portarto alla pagina principale.\nTi ricordiamo che puoi sempre fare login come amministratore e modificare i settaggi del server.',
+    'Premi il pulsante Conferma per completare la configurazione del server. Puoi tornare alle pagine precedenti se vuoi modificare o aggiungere qualcosa.\nQuando la configurazione è completa le impostazioni saranno applicate al tuo server. Sarai portarto alla pagina principale.\nTi ricordiamo che puoi sempre fare login come amministratore e modificare i settaggi del server.',
   ],
 
   ['administration_disabled_drivers_title', 'Disabled drivers'],
diff --git a/webapp/packages/plugin-authentication/src/AuthenticationService.ts b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
index 20ab3ebac6..c89974080a 100644
--- a/webapp/packages/plugin-authentication/src/AuthenticationService.ts
+++ b/webapp/packages/plugin-authentication/src/AuthenticationService.ts
@@ -214,8 +214,6 @@ export class AuthenticationService extends Bootstrap {
     this.authProviderService.requestAuthProvider.addHandler(this.requestAuthProviderHandler);
   }
 
-  load(): void {}
-
   private async authSessionAction(data: ISessionAction | null, contexts: IExecutionContextProvider<ISessionAction | null>) {
     const action = contexts.getContext(sessionActionContext);
 
diff --git a/webapp/packages/plugin-data-export/src/DataExportMenuService.ts b/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
index 4dcec1dcf6..e3d1b2c220 100644
--- a/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
+++ b/webapp/packages/plugin-data-export/src/DataExportMenuService.ts
@@ -5,11 +5,12 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { EAdminPermission } from '@cloudbeaver/core-authentication';
 import { createConnectionParam, DATA_CONTEXT_CONNECTION } from '@cloudbeaver/core-connections';
 import { injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, IMenuContext } from '@cloudbeaver/core-dialogs';
-import { LocalizationService } from '@cloudbeaver/core-localization';
 import { DATA_CONTEXT_NAV_NODE, EObjectFeature } from '@cloudbeaver/core-navigation-tree';
+import { SessionPermissionsResource } from '@cloudbeaver/core-root';
 import { ACTION_EXPORT, ActionService, DATA_CONTEXT_MENU_NESTED, MenuService } from '@cloudbeaver/core-view';
 import { IDatabaseDataSource, IDataContainerOptions, ITableFooterMenuContext, TableFooterMenuService } from '@cloudbeaver/plugin-data-viewer';
 import type { IDataQueryOptions } from '@cloudbeaver/plugin-sql-editor';
@@ -25,7 +26,7 @@ export class DataExportMenuService {
     private readonly dataExportSettingsService: DataExportSettingsService,
     private readonly actionService: ActionService,
     private readonly menuService: MenuService,
-    private readonly localizationService: LocalizationService,
+    private readonly sessionPermissionsResource: SessionPermissionsResource,
   ) {}
 
   register(): void {
@@ -106,9 +107,14 @@ export class DataExportMenuService {
   }
 
   private isDisabled() {
+    if (this.sessionPermissionsResource.has(EAdminPermission.admin)) {
+      return false;
+    }
+
     if (this.dataExportSettingsService.settings.isValueDefault('disabled')) {
       return this.dataExportSettingsService.deprecatedSettings.getValue('disabled');
     }
+
     return this.dataExportSettingsService.settings.getValue('disabled');
   }
 }
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeService.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeService.ts
new file mode 100644
index 0000000000..891de97644
--- /dev/null
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/ElementsTreeService.ts
@@ -0,0 +1,23 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { injectable } from '@cloudbeaver/core-di';
+import { Executor, type IExecutor } from '@cloudbeaver/core-executor';
+
+export interface IElementsTreeLoadData {
+  nodeId: string;
+  manual: boolean;
+}
+
+@injectable()
+export class ElementsTreeService {
+  readonly onLoad: IExecutor<IElementsTreeLoadData>;
+
+  constructor() {
+    this.onLoad = new Executor();
+  }
+}
diff --git a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTree.ts b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTree.ts
index 7ef4442738..1858edc4fe 100644
--- a/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTree.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NavigationTree/ElementsTree/useElementsTree.ts
@@ -12,13 +12,14 @@ import { getComputed, IFolderExplorerContext, useExecutor, useObjectRef, useObse
 import { ConnectionInfoActiveProjectKey, ConnectionInfoResource } from '@cloudbeaver/core-connections';
 import { useService } from '@cloudbeaver/core-di';
 import { NotificationService } from '@cloudbeaver/core-events';
-import { ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
+import { ExecutorInterrupter, ISyncExecutor, SyncExecutor } from '@cloudbeaver/core-executor';
 import { type NavNode, NavNodeInfoResource, NavTreeResource, ROOT_NODE_PATH } from '@cloudbeaver/core-navigation-tree';
 import { ProjectInfoResource, ProjectsService } from '@cloudbeaver/core-projects';
 import { CachedMapAllKey, CachedResourceOffsetPageKey, getNextPageOffset, ResourceKeyUtils } from '@cloudbeaver/core-resource';
 import type { IDNDData } from '@cloudbeaver/core-ui';
 import { ILoadableState, MetadataMap, throttle } from '@cloudbeaver/core-utils';
 
+import { ElementsTreeService } from './ElementsTreeService';
 import type { IElementsTreeAction } from './IElementsTreeAction';
 import type { INavTreeNodeInfo } from './INavTreeNodeInfo';
 import type { NavigationNodeRendererComponent } from './NavigationNodeComponent';
@@ -137,6 +138,7 @@ export function useElementsTree(options: IOptions): IElementsTree {
   const navNodeInfoResource = useService(NavNodeInfoResource);
   const navTreeResource = useService(NavTreeResource);
   const connectionInfoResource = useService(ConnectionInfoResource);
+  const elementsTreeService = useService(ElementsTreeService);
 
   const [localTreeNodesState] = useState(
     () =>
@@ -156,6 +158,12 @@ export function useElementsTree(options: IOptions): IElementsTree {
 
   async function handleLoadChildren(id: string, manual: boolean): Promise<boolean> {
     try {
+      const context = await elementsTreeService.onLoad.execute({ nodeId: id, manual });
+
+      if (ExecutorInterrupter.isInterrupted(context)) {
+        return false;
+      }
+
       return await options.loadChildren(id, manual);
     } catch (exception: any) {
       notificationService.logException(exception);
diff --git a/webapp/packages/plugin-navigation-tree/src/index.ts b/webapp/packages/plugin-navigation-tree/src/index.ts
index 762055ddd2..1a763288d1 100644
--- a/webapp/packages/plugin-navigation-tree/src/index.ts
+++ b/webapp/packages/plugin-navigation-tree/src/index.ts
@@ -26,12 +26,14 @@ export * from './NavigationTree/ElementsTree/useElementsTree';
 export * from './NavigationTree/ElementsTree/ElementsTreeTools/MENU_ELEMENTS_TREE_TOOLS';
 export * from './NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenuService';
 export * from './NavigationTree/ElementsTree/elementsTreeNameFilter';
+export * from './NavigationTree/ElementsTree/ElementsTreeService';
 export * from './NavigationTree/NavigationTreeBootstrap';
 export * from './NavigationTree/NavigationTreeService';
 export { default as ElementsTreeToolsStyles } from './NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeTools.m.css';
 export { default as ElementsTreeFilterStyles } from './NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeFilter.m.css';
 export { default as NavigationNodeNestedStyles } from './NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeNested.m.css';
 export { default as NavigationNodeControlRendererStyles } from './NavigationTree/ElementsTree/NavigationTreeNode/NavigationNodeControlRenderer.m.css';
+export { default as NavigationNodeControlStyles } from './NavigationTree/ElementsTree/NavigationTreeNode/NavigationNode/NavigationNodeControl.m.css';
 
 export * from './NavigationTree/NavigationTreeLoader';
 
diff --git a/webapp/packages/plugin-navigation-tree/src/manifest.ts b/webapp/packages/plugin-navigation-tree/src/manifest.ts
index a6c87d5c80..6cc907c4ec 100644
--- a/webapp/packages/plugin-navigation-tree/src/manifest.ts
+++ b/webapp/packages/plugin-navigation-tree/src/manifest.ts
@@ -8,6 +8,7 @@
 import type { PluginManifest } from '@cloudbeaver/core-di';
 
 import { LocaleService } from './LocaleService';
+import { ElementsTreeService } from './NavigationTree/ElementsTree/ElementsTreeService';
 import { ElementsTreeToolsMenuService } from './NavigationTree/ElementsTree/ElementsTreeTools/ElementsTreeToolsMenuService';
 import { ElementsTreeSettingsService } from './NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/ElementsTreeSettingsService';
 import { NavigationTreeBootstrap } from './NavigationTree/NavigationTreeBootstrap';
@@ -27,5 +28,6 @@ export const navigationTreePlugin: PluginManifest = {
     NavNodeViewService,
     ElementsTreeSettingsService,
     NavigationTreeSettingsService,
+    ElementsTreeService,
   ],
 };
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/PluginBootstrap.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/PluginBootstrap.ts
index f778fd15ab..6c514ee951 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/PluginBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/PluginBootstrap.ts
@@ -14,7 +14,7 @@ import { isResourceOfType, ProjectInfoResource, ProjectsService } from '@cloudbe
 import { CachedMapAllKey, CachedTreeChildrenKey } from '@cloudbeaver/core-resource';
 import { getRmResourcePath, NAV_NODE_TYPE_RM_RESOURCE, ResourceManagerResource, RESOURCES_NODE_PATH } from '@cloudbeaver/core-resource-manager';
 import { createPath, getPathName } from '@cloudbeaver/core-utils';
-import { ACTION_SAVE, ActionService, DATA_CONTEXT_MENU, KEY_BINDING_SAVE, KeyBindingService, MenuService } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
 import { NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
 import { getResourceKeyFromNodeId } from '@cloudbeaver/plugin-navigation-tree-rm';
 import { RESOURCE_NAME_REGEX, ResourceManagerService } from '@cloudbeaver/plugin-resource-manager';
@@ -55,7 +55,6 @@ export class PluginBootstrap extends Bootstrap {
     private readonly sqlEditorSettingsService: SqlEditorSettingsService,
     private readonly resourceManagerResource: ResourceManagerResource,
     private readonly resourceManagerScriptsService: ResourceManagerScriptsService,
-    private readonly keyBindingService: KeyBindingService,
   ) {
     super();
   }
@@ -83,10 +82,6 @@ export class PluginBootstrap extends Bootstrap {
           return dataSource instanceof MemorySqlDataSource || dataSource instanceof LocalStorageSqlDataSource;
         }
 
-        if (action === ACTION_SAVE) {
-          return dataSource?.isAutoSaveEnabled === false;
-        }
-
         return false;
       },
       handler: async (context, action) => {
@@ -187,34 +182,9 @@ export class PluginBootstrap extends Bootstrap {
             }
           }
         }
-
-        if (action === ACTION_SAVE) {
-          const state = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
-          const source = this.sqlDataSourceService.get(state.editorId) as ResourceSqlDataSource | undefined;
-
-          if (!source) {
-            return;
-          }
-
-          await source.save();
-        }
-      },
-      isDisabled: (context, action) => {
-        if (action === ACTION_SAVE) {
-          const state = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
-          const source = this.sqlDataSourceService.get(state.editorId) as ResourceSqlDataSource | undefined;
-
-          if (!source) {
-            return true;
-          }
-
-          return source.isLoading() || source.isSaved;
-        }
-
-        return false;
       },
       getActionInfo: (context, action) => {
-        if (action === ACTION_SAVE_AS_SCRIPT || action === ACTION_SAVE) {
+        if (action === ACTION_SAVE_AS_SCRIPT) {
           return {
             ...action.info,
             label: '',
@@ -241,23 +211,7 @@ export class PluginBootstrap extends Bootstrap {
           !!dataSource?.hasFeature(ESqlDataSourceFeatures.script)
         );
       },
-      getItems: (context, items) => [...items, ACTION_SAVE_AS_SCRIPT, ACTION_SAVE],
-    });
-
-    this.keyBindingService.addKeyBindingHandler({
-      id: 'script-save',
-      binding: KEY_BINDING_SAVE,
-      isBindingApplicable: (context, action) => action === ACTION_SAVE,
-      handler: async context => {
-        const state = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
-        const source = this.sqlDataSourceService.get(state.editorId) as ResourceSqlDataSource | undefined;
-
-        if (!source) {
-          return;
-        }
-
-        await source.save();
-      },
+      getItems: (context, items) => [...items, ACTION_SAVE_AS_SCRIPT],
     });
   }
 
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSource.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSource.ts
index a724107bb6..1d7f71fd93 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSource.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSource.ts
@@ -17,16 +17,13 @@ import { TaskScheduler } from '@cloudbeaver/core-executor';
 import type { ProjectInfoResource } from '@cloudbeaver/core-projects';
 import { isResourceAlias, ResourceKey, ResourceKeyUtils } from '@cloudbeaver/core-resource';
 import { getRmResourceKey, ResourceManagerResource } from '@cloudbeaver/core-resource-manager';
+import type { NetworkStateService } from '@cloudbeaver/core-root';
 import { debounce, getPathName, isArraysEqual, isNotNullDefined, isObjectsEqual, isValuesEqual } from '@cloudbeaver/core-utils';
 import { SCRIPTS_TYPE_ID } from '@cloudbeaver/plugin-resource-manager-scripts';
 import { BaseSqlDataSource, ESqlDataSourceFeatures, SqlEditorService } from '@cloudbeaver/plugin-sql-editor';
 
 import type { IResourceSqlDataSourceState } from './IResourceSqlDataSourceState';
 
-interface IResourceInfo {
-  isReadonly?: (dataSource: ResourceSqlDataSource) => boolean;
-}
-
 interface IResourceActions {
   rename(dataSource: ResourceSqlDataSource, key: string, name: string): Promise<string>;
   read(dataSource: ResourceSqlDataSource, key: string): Promise<string>;
@@ -103,7 +100,6 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
   }
 
   private actions?: IResourceActions;
-  private info?: IResourceInfo;
   private lastAction: (() => Promise<void>) | undefined;
   private state!: IResourceSqlDataSourceState;
 
@@ -112,6 +108,7 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
   private resourceUseKeyId: string | null;
 
   constructor(
+    private readonly networkStateService: NetworkStateService,
     private readonly projectInfoResource: ProjectInfoResource,
     private readonly connectionInfoResource: ConnectionInfoResource,
     private readonly resourceManagerResource: ResourceManagerResource,
@@ -144,10 +141,22 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
   }
 
   isReadonly(): boolean {
-    return !this.isLoaded() || this.info?.isReadonly?.(this) === true;
+    if (!this.projectId || !this.networkStateService.state) {
+      return true;
+    }
+
+    const project = this.projectInfoResource.get(this.projectId);
+
+    return !this.isLoaded() || !project?.canEditResources;
   }
 
   isOutdated(): boolean {
+    if (this.projectId) {
+      if (this.projectInfoResource.isOutdated(this.projectId)) {
+        return true;
+      }
+    }
+
     return this.resourceKey !== undefined && super.isOutdated();
   }
 
@@ -189,10 +198,6 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
     this.actions = actions;
   }
 
-  setInfo(info?: IResourceInfo): void {
-    this.info = info;
-  }
-
   setName(name: string | null): void {
     name = name?.trim() ?? null;
     if (!name || name === this.name) {
@@ -267,6 +272,11 @@ export class ResourceSqlDataSource extends BaseSqlDataSource {
     if (this.state.resourceKey && !this.resourceUseKeyId) {
       this.resourceUseKeyId = this.resourceManagerResource.useTracker.use(this.state.resourceKey);
     }
+
+    if (this.projectId) {
+      await this.projectInfoResource.load(this.projectId);
+    }
+
     await this.read();
   }
 
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSourceBootstrap.ts b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSourceBootstrap.ts
index fb006be0b6..8f807ee0fa 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSourceBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab-script/src/ResourceSqlDataSourceBootstrap.ts
@@ -5,7 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-import { action, makeObservable, observable, untracked } from 'mobx';
+import { action, makeObservable, observable } from 'mobx';
 
 import { ConfirmationDialog } from '@cloudbeaver/core-blocks';
 import { ConnectionInfoResource, IConnectionExecutionContextInfo } from '@cloudbeaver/core-connections';
@@ -13,11 +13,11 @@ import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
 import { NotificationService } from '@cloudbeaver/core-events';
 import { ProjectInfoResource } from '@cloudbeaver/core-projects';
-import { CachedMapAllKey, resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-resource';
-import { getRmResourceKey, IResourceManagerMoveData, ResourceManagerResource } from '@cloudbeaver/core-resource-manager';
-import { NetworkStateService, WindowEventsService } from '@cloudbeaver/core-root';
+import { resourceKeyList, ResourceKeySimple, ResourceKeyUtils } from '@cloudbeaver/core-resource';
+import { IResourceManagerMoveData, ResourceManagerResource } from '@cloudbeaver/core-resource-manager';
+import { NetworkStateService } from '@cloudbeaver/core-root';
 import { LocalStorageSaveService } from '@cloudbeaver/core-settings';
-import { createPath, getPathParent, throttle } from '@cloudbeaver/core-utils';
+import { createPath, getPathParent } from '@cloudbeaver/core-utils';
 import { NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
 import { NavResourceNodeService } from '@cloudbeaver/plugin-navigation-tree-rm';
 import { ResourceManagerService } from '@cloudbeaver/plugin-resource-manager';
@@ -30,7 +30,6 @@ import { ResourceSqlDataSource } from './ResourceSqlDataSource';
 import { SqlEditorTabResourceService } from './SqlEditorTabResourceService';
 
 const RESOURCE_TAB_STATE = 'sql_editor_resource_tab_state';
-const SYNC_DELAY = 5 * 60 * 1000;
 
 @injectable()
 export class ResourceSqlDataSourceBootstrap extends Bootstrap {
@@ -49,14 +48,12 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
     private readonly resourceManagerResource: ResourceManagerResource,
     private readonly resourceManagerScriptsService: ResourceManagerScriptsService,
     private readonly projectInfoResource: ProjectInfoResource,
-    private readonly windowEventsService: WindowEventsService,
     private readonly sqlEditorTabResourceService: SqlEditorTabResourceService,
     private readonly sqlEditorService: SqlEditorService,
     localStorageSaveService: LocalStorageSaveService,
   ) {
     super();
     this.dataSourceStateState = new Map();
-    this.focusChangeHandler = throttle(this.focusChangeHandler.bind(this), SYNC_DELAY, false);
 
     makeObservable<this, 'dataSourceStateState' | 'createState'>(this, {
       createState: action,
@@ -87,7 +84,6 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
   }
 
   register(): void | Promise<void> {
-    this.windowEventsService.onFocusChange.addHandler(this.focusChangeHandler.bind(this));
     this.resourceManagerResource.onItemDelete.addHandler(this.resourceDeleteHandler.bind(this));
     this.resourceManagerResource.onMove.addHandler(this.resourceMoveHandler.bind(this));
 
@@ -95,6 +91,7 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
       key: ResourceSqlDataSource.key,
       getDataSource: (editorId, options) => {
         const dataSource = new ResourceSqlDataSource(
+          this.networkStateService,
           this.projectInfoResource,
           this.connectionInfoResource,
           this.resourceManagerResource,
@@ -118,20 +115,6 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
           setProperties: this.setProperties.bind(this),
         });
 
-        dataSource.setInfo({
-          isReadonly: (dataSource: ResourceSqlDataSource) => {
-            if (!dataSource.resourceKey) {
-              return true;
-            }
-            const resourceKey = getRmResourceKey(dataSource.resourceKey);
-
-            untracked(() => this.projectInfoResource.load(CachedMapAllKey));
-            const project = this.projectInfoResource.get(resourceKey.projectId);
-
-            return !this.networkStateService.state || !project?.canEditResources;
-          },
-        });
-
         return dataSource;
       },
       onDestroy: (_, editorId) => this.deleteState(editorId),
@@ -188,22 +171,6 @@ export class ResourceSqlDataSourceBootstrap extends Bootstrap {
     this.dataSourceStateState.delete(editorId);
   }
 
-  private async focusChangeHandler(focused: boolean) {
-    if (!this.resourceManagerService.enabled) {
-      return;
-    }
-
-    if (focused) {
-      const dataSources = this.sqlDataSourceService.dataSources
-        .filter(([, dataSource]) => dataSource instanceof ResourceSqlDataSource)
-        .map(([, dataSource]) => dataSource as ResourceSqlDataSource);
-
-      for (const dataSource of dataSources) {
-        dataSource.markOutdated();
-      }
-    }
-  }
-
   private resourceMoveHandler(data: IResourceManagerMoveData) {
     if (!this.resourceManagerService.enabled) {
       return;
diff --git a/webapp/packages/plugin-sql-editor/public/icons/sql_output_logs.svg b/webapp/packages/plugin-sql-editor/public/icons/sql_output_logs.svg
index bc9e4420c2..f188563b19 100644
--- a/webapp/packages/plugin-sql-editor/public/icons/sql_output_logs.svg
+++ b/webapp/packages/plugin-sql-editor/public/icons/sql_output_logs.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><defs><style>.cls-1{fill:#338ecc;}</style></defs><path class="cls-1" d="M20.33,2H6A2,2,0,0,0,4,4V28a2,2,0,0,0,2,2H26a2,2,0,0,0,2-2V9.67ZM20,4.5,25.46,10H20ZM26,28H6V4H18v6a2,2,0,0,0,2,2h6Z"/><polygon class="cls-1" points="17 23 17 15 23 19 17 23"/><rect class="cls-1" x="15" y="14" width="2" height="10" transform="translate(35 3) rotate(90)"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><defs><style>.cls-1{fill:#338ecc;}</style></defs><path class="cls-1" d="M22.53,1.16H6.68A2.76,2.76,0,0,0,3.9,3.89V28.43a2.76,2.76,0,0,0,2.78,2.73H26.13a2.75,2.75,0,0,0,2.77-2.73v-21Zm3.6,12.9V28.43H6.68V3.89H20.57V9.34h5.56Z"/><polygon class="cls-1" points="22.45 18.84 16.4 14.89 16.4 17.48 10.36 17.48 10.36 20.21 16.4 20.21 16.4 22.8 22.45 18.84"/></svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-sql-editor/src/MenuBootstrap.ts b/webapp/packages/plugin-sql-editor/src/MenuBootstrap.ts
index 7b8540f542..e993177ea2 100644
--- a/webapp/packages/plugin-sql-editor/src/MenuBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor/src/MenuBootstrap.ts
@@ -7,7 +7,21 @@
  */
 import type { IDataContextProvider } from '@cloudbeaver/core-data-context';
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
-import { ACTION_REDO, ACTION_UNDO, ActionService, IAction, KEY_BINDING_REDO, KEY_BINDING_UNDO, KeyBindingService } from '@cloudbeaver/core-view';
+import { WindowEventsService } from '@cloudbeaver/core-root';
+import { throttle } from '@cloudbeaver/core-utils';
+import {
+  ACTION_REDO,
+  ACTION_SAVE,
+  ACTION_UNDO,
+  ActionService,
+  DATA_CONTEXT_MENU,
+  IAction,
+  KEY_BINDING_REDO,
+  KEY_BINDING_SAVE,
+  KEY_BINDING_UNDO,
+  KeyBindingService,
+  MenuService,
+} from '@cloudbeaver/core-view';
 
 import { ACTION_SQL_EDITOR_EXECUTE } from './actions/ACTION_SQL_EDITOR_EXECUTE';
 import { ACTION_SQL_EDITOR_EXECUTE_NEW } from './actions/ACTION_SQL_EDITOR_EXECUTE_NEW';
@@ -20,16 +34,114 @@ import { KEY_BINDING_SQL_EDITOR_EXECUTE_NEW } from './actions/bindings/KEY_BINDI
 import { KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT } from './actions/bindings/KEY_BINDING_SQL_EDITOR_EXECUTE_SCRIPT';
 import { KEY_BINDING_SQL_EDITOR_FORMAT } from './actions/bindings/KEY_BINDING_SQL_EDITOR_FORMAT';
 import { KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN } from './actions/bindings/KEY_BINDING_SQL_EDITOR_SHOW_EXECUTION_PLAN';
+import { DATA_CONTEXT_SQL_EDITOR_STATE } from './DATA_CONTEXT_SQL_EDITOR_STATE';
 import { ESqlDataSourceFeatures } from './SqlDataSource/ESqlDataSourceFeatures';
+import { SqlDataSourceService } from './SqlDataSource/SqlDataSourceService';
 import { DATA_CONTEXT_SQL_EDITOR_DATA } from './SqlEditor/DATA_CONTEXT_SQL_EDITOR_DATA';
+import { SQL_EDITOR_TOOLS_MENU } from './SqlEditor/SQL_EDITOR_TOOLS_MENU';
+
+const SYNC_DELAY = 5 * 60 * 1000;
 
 @injectable()
 export class MenuBootstrap extends Bootstrap {
-  constructor(private readonly actionService: ActionService, private readonly keyBindingService: KeyBindingService) {
+  constructor(
+    private readonly menuService: MenuService,
+    private readonly actionService: ActionService,
+    private readonly keyBindingService: KeyBindingService,
+    private readonly sqlDataSourceService: SqlDataSourceService,
+    private readonly windowEventsService: WindowEventsService,
+  ) {
     super();
   }
 
   register(): void {
+    this.windowEventsService.onFocusChange.addHandler(throttle(this.focusChangeHandler.bind(this), SYNC_DELAY, false));
+    this.actionService.addHandler({
+      id: 'sql-editor-base-handler',
+      isActionApplicable: (context, action): boolean => {
+        const state = context.tryGet(DATA_CONTEXT_SQL_EDITOR_STATE);
+
+        if (!state) {
+          return false;
+        }
+
+        const dataSource = this.sqlDataSourceService.get(state.editorId);
+
+        if (action === ACTION_SAVE) {
+          return dataSource?.isAutoSaveEnabled === false;
+        }
+
+        return false;
+      },
+      handler: async (context, action) => {
+        if (action === ACTION_SAVE) {
+          const state = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
+          const source = this.sqlDataSourceService.get(state.editorId);
+
+          if (!source) {
+            return;
+          }
+
+          await source.save();
+        }
+      },
+      isDisabled: (context, action) => {
+        if (action === ACTION_SAVE) {
+          const state = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
+          const source = this.sqlDataSourceService.get(state.editorId);
+
+          if (!source) {
+            return true;
+          }
+
+          return source.isLoading() || source.isSaved || source.isReadonly();
+        }
+
+        return false;
+      },
+      getActionInfo: (context, action) => {
+        if (action === ACTION_SAVE) {
+          return {
+            ...action.info,
+            label: '',
+          };
+        }
+
+        return action.info;
+      },
+    });
+
+    this.menuService.addCreator({
+      isApplicable: context => {
+        const state = context.tryGet(DATA_CONTEXT_SQL_EDITOR_STATE);
+
+        if (!state) {
+          return false;
+        }
+
+        const dataSource = this.sqlDataSourceService.get(state.editorId);
+
+        return context.get(DATA_CONTEXT_MENU) === SQL_EDITOR_TOOLS_MENU && !!dataSource?.hasFeature(ESqlDataSourceFeatures.script);
+      },
+      getItems: (context, items) => [...items, ACTION_SAVE],
+    });
+
+    this.keyBindingService.addKeyBindingHandler({
+      id: 'sql-editor-save',
+      binding: KEY_BINDING_SAVE,
+      isBindingApplicable: (context, action) => action === ACTION_SAVE,
+      handler: async context => {
+        const state = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
+        const source = this.sqlDataSourceService.get(state.editorId);
+
+        if (!source) {
+          return;
+        }
+
+        await source.save();
+      },
+    });
+
     this.actionService.addHandler({
       id: 'sql-editor-actions',
       isActionApplicable: (contexts, action): boolean => {
@@ -179,5 +291,13 @@ export class MenuBootstrap extends Bootstrap {
     }
   }
 
-  load(): void | Promise<void> {}
+  private async focusChangeHandler(focused: boolean) {
+    if (focused) {
+      const dataSources = this.sqlDataSourceService.dataSources.values();
+
+      for (const [_, dataSource] of dataSources) {
+        dataSource.markOutdated();
+      }
+    }
+  }
 }
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/ACTION_SHOW_OUTPUT_LOGS.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/ACTION_SHOW_OUTPUT_LOGS.ts
index ffe85a38f9..cb3285a4e7 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/ACTION_SHOW_OUTPUT_LOGS.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/ACTION_SHOW_OUTPUT_LOGS.ts
@@ -1,3 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { createAction } from '@cloudbeaver/core-view';
 
 export const ACTION_SHOW_OUTPUT_LOGS = createAction('action-show_output_logs', {
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/IOutputLogTypes.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/IOutputLogTypes.ts
index 5078ee9ff3..fb89ad6fe9 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/IOutputLogTypes.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/IOutputLogTypes.ts
@@ -1,2 +1,9 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
 export const OUTPUT_LOG_TYPES = ['Debug', 'Log', 'Info', 'Notice', 'Warning', 'Error'] as const;
 export type IOutputLogType = (typeof OUTPUT_LOG_TYPES)[number];
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_FILTER_MENU.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_FILTER_MENU.ts
index e1f53931bd..a00b8b4ab3 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_FILTER_MENU.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_FILTER_MENU.ts
@@ -7,4 +7,4 @@
  */
 import { createMenu } from '@cloudbeaver/core-view';
 
-export const OUTPUT_LOGS_FILTER_MENU = createMenu('output_logs_filter_menu', 'Output Logs');
+export const OUTPUT_LOGS_FILTER_MENU = createMenu('output_logs_filter_menu', '', 'filter', 'ui_filter');
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_MENU.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_MENU.ts
new file mode 100644
index 0000000000..ccc63a6def
--- /dev/null
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_MENU.ts
@@ -0,0 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { createMenu } from '@cloudbeaver/core-view';
+
+export const OUTPUT_LOGS_MENU = createMenu('output_logs_menu', 'Output Logs');
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_SETTINGS_MENU.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_SETTINGS_MENU.ts
new file mode 100644
index 0000000000..dd3b3766e1
--- /dev/null
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OUTPUT_LOGS_SETTINGS_MENU.ts
@@ -0,0 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2023 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 { createMenu } from '@cloudbeaver/core-view';
+
+export const OUTPUT_LOGS_SETTINGS_MENU = createMenu('output_logs_settings_menu', '', '/icons/settings_cog_sm.svg', 'ui_settings');
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogTypesFilterMenu.m.css b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogTypesFilterMenu.m.css
deleted file mode 100644
index 83bd17790b..0000000000
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogTypesFilterMenu.m.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.contextMenu {
-  padding: 0;
-  height: 24px;
-  width: 24px;
-  display: flex;
-  box-sizing: border-box;
-  align-items: center;
-  justify-content: center;
-
-  & .icon {
-    width: 16px;
-    height: 100%;
-  }
-}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsMenu.m.css b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsMenu.m.css
new file mode 100644
index 0000000000..79df9ac939
--- /dev/null
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsMenu.m.css
@@ -0,0 +1,3 @@
+.menuBar {
+  align-items: center;
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogTypesFilterMenu.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsMenu.tsx
similarity index 54%
rename from webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogTypesFilterMenu.tsx
rename to webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsMenu.tsx
index 9b31a9b4c8..0b854c464b 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogTypesFilterMenu.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsMenu.tsx
@@ -8,23 +8,22 @@
 import { observer } from 'mobx-react-lite';
 import React, { useEffect } from 'react';
 
-import { Icon, s, useS } from '@cloudbeaver/core-blocks';
-import { ContextMenu } from '@cloudbeaver/core-ui';
+import { s } from '@cloudbeaver/core-blocks';
+import { MenuBar, MenuBarItemStyles } from '@cloudbeaver/core-ui';
 import { useMenu } from '@cloudbeaver/core-view';
 
 import { DATA_CONTEXT_SQL_EDITOR_STATE } from '../../DATA_CONTEXT_SQL_EDITOR_STATE';
 import type { ISqlEditorTabState } from '../../ISqlEditorTabState';
-import { OUTPUT_LOGS_FILTER_MENU } from './OUTPUT_LOGS_FILTER_MENU';
-import style from './OutputLogTypesFilterMenu.m.css';
+import { OUTPUT_LOGS_MENU } from './OUTPUT_LOGS_MENU';
+import styles from './OutputLogsMenu.m.css';
 
 interface Props {
   sqlEditorTabState: ISqlEditorTabState;
 }
 
-export const OutputLogsFilterMenu = observer<Props>(function OutputLogTypesFilterMenu({ sqlEditorTabState }) {
-  const styles = useS(style);
+export const OutputLogsMenu = observer<Props>(function OutputLogsMenu({ sqlEditorTabState }) {
   const menu = useMenu({
-    menu: OUTPUT_LOGS_FILTER_MENU,
+    menu: OUTPUT_LOGS_MENU,
   });
 
   useEffect(() => {
@@ -32,8 +31,10 @@ export const OutputLogsFilterMenu = observer<Props>(function OutputLogTypesFilte
   }, []);
 
   return (
-    <ContextMenu className={s(styles, { contextMenu: true })} menu={menu} placement="bottom-end" modal>
-      <Icon className={s(styles, { icon: true })} name="filter" viewBox="0 0 16 16" />
-    </ContextMenu>
+    <MenuBar
+      menu={menu}
+      nestedMenuSettings={{ modal: true, placement: 'top-start' }}
+      className={s(styles, { menuBar: true }, MenuBarItemStyles.floating)}
+    />
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsPanel.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsPanel.tsx
index 246fad90eb..ded36defc4 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsPanel.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsPanel.tsx
@@ -7,7 +7,7 @@
  */
 import { observer } from 'mobx-react-lite';
 
-import { Container, Group, s, useResource, useS } from '@cloudbeaver/core-blocks';
+import { Container, useResource } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
 import { EditorLoader } from '@cloudbeaver/plugin-codemirror6';
 
@@ -29,11 +29,19 @@ export const OutputLogsPanel = observer<Props>(function SqlOutputLogsPanel({ sql
   const state = useOutputLogsPanelState(outputLogs, sqlEditorTabState);
 
   return (
-    <Container className="theme-background-secondary" parent vertical gap dense>
-      <OutputLogsToolbar state={state} sqlEditorTabState={sqlEditorTabState}/>
-      <Group overflow box>
-        {data && <EditorLoader value={state.resultValue} foldGutter={false} highlightActiveLine={false} lineWrapping readonly />}
-      </Group>
+    <Container className="theme-background-secondary" overflow vertical noWrap dense parent gap>
+      <OutputLogsToolbar state={state} sqlEditorTabState={sqlEditorTabState} />
+      {data && (
+        <Container overflow>
+          <EditorLoader
+            value={state.resultValue}
+            foldGutter={false}
+            lineWrapping={outputLogsService.settings.wrapMode}
+            highlightActiveLine={false}
+            readonly
+          />
+        </Container>
+      )}
     </Container>
   );
 });
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsService.ts
index f518517bf7..85e8736571 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsService.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsService.ts
@@ -5,6 +5,7 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+import { UserDataService } from '@cloudbeaver/core-authentication';
 import { injectable } from '@cloudbeaver/core-di';
 
 import type { ISqlEditorTabState } from '../../ISqlEditorTabState';
@@ -13,9 +14,19 @@ import { OUTPUT_LOG_TYPES } from './IOutputLogTypes';
 import { OUTPUT_LOGS_TAB_ID } from './OUTPUT_LOGS_TAB_ID';
 import type { IOutputLog } from './OutputLogsResource';
 
+const OUTPUT_LOGS_KEY = 'output_logs';
+
+interface ISettings {
+  wrapMode: boolean;
+}
+
 @injectable()
 export class OutputLogsService {
-  constructor(private readonly sqlDataSourceService: SqlDataSourceService) {}
+  get settings() {
+    return this.userDataService.getUserData(OUTPUT_LOGS_KEY, getOutputLogsDefaultSettings);
+  }
+
+  constructor(private readonly sqlDataSourceService: SqlDataSourceService, private readonly userDataService: UserDataService) {}
 
   async showOutputLogs(editorState: ISqlEditorTabState): Promise<void> {
     this.createOutputLogsTab(editorState);
@@ -28,6 +39,10 @@ export class OutputLogsService {
     }
   }
 
+  toggleWrapMode() {
+    this.settings.wrapMode = !this.settings.wrapMode;
+  }
+
   private createOutputLogsTab(state: ISqlEditorTabState) {
     const order = Math.max(0, ...state.tabs.map(tab => tab.order + 1));
 
@@ -52,3 +67,9 @@ export class OutputLogsService {
     return events.filter(event => event.contextId === dataSource?.executionContext?.id);
   }
 }
+
+function getOutputLogsDefaultSettings(): ISettings {
+  return {
+    wrapMode: true,
+  };
+}
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsToolbar.tsx b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsToolbar.tsx
index 8f6002dd87..adaf1364a5 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsToolbar.tsx
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputLogsToolbar.tsx
@@ -11,8 +11,8 @@ import React from 'react';
 import { Container, Icon, InputField, s, useS, useTranslate } from '@cloudbeaver/core-blocks';
 
 import type { ISqlEditorTabState } from '../../ISqlEditorTabState';
+import { OutputLogsMenu } from './OutputLogsMenu';
 import style from './OutputLogsToolbar.m.css';
-import { OutputLogsFilterMenu } from './OutputLogTypesFilterMenu';
 import type { SqlOutputLogsPanelState } from './useOutputLogsPanelState';
 
 interface Props {
@@ -20,7 +20,7 @@ interface Props {
   sqlEditorTabState: ISqlEditorTabState;
 }
 
-export const OutputLogsToolbar = observer<Props>(function SqlOutputLogsToolbar({ state, sqlEditorTabState }) {
+export const OutputLogsToolbar = observer<Props>(function OutputLogsToolbar({ state, sqlEditorTabState }) {
   const styles = useS(style);
   const translate = useTranslate();
 
@@ -38,7 +38,7 @@ export const OutputLogsToolbar = observer<Props>(function SqlOutputLogsToolbar({
         onChange={value => state.setSearchValue(value.toString())}
       />
       <Container keepSize>
-        <OutputLogsFilterMenu sqlEditorTabState={sqlEditorTabState} />
+        <OutputLogsMenu sqlEditorTabState={sqlEditorTabState} />
       </Container>
     </Container>
   );
diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputMenuBootstrap.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputMenuBootstrap.ts
index c23292cd31..afde6d4bf6 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputMenuBootstrap.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/OutputLogs/OutputMenuBootstrap.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
-import { ActionService, KeyBindingService, MenuCheckboxItem, MenuService } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_MENU, KeyBindingService, MenuCheckboxItem, MenuService } from '@cloudbeaver/core-view';
 
 import { ACTION_SQL_EDITOR_SHOW_OUTPUT } from '../../actions/ACTION_SQL_EDITOR_SHOW_OUTPUT';
 import { KEY_BINDING_SQL_EDITOR_SHOW_OUTPUT } from '../../actions/bindings/KEY_BINDING_SQL_EDITOR_SHOW_OUTPUT';
@@ -17,6 +17,8 @@ import { SQL_EDITOR_ACTIONS_MENU } from '../../SqlEditor/SQL_EDITOR_ACTIONS_MENU
 import { ACTION_SHOW_OUTPUT_LOGS } from './ACTION_SHOW_OUTPUT_LOGS';
 import { OUTPUT_LOG_TYPES } from './IOutputLogTypes';
 import { OUTPUT_LOGS_FILTER_MENU } from './OUTPUT_LOGS_FILTER_MENU';
+import { OUTPUT_LOGS_MENU } from './OUTPUT_LOGS_MENU';
+import { OUTPUT_LOGS_SETTINGS_MENU } from './OUTPUT_LOGS_SETTINGS_MENU';
 import { OutputLogsService } from './OutputLogsService';
 
 @injectable()
@@ -32,9 +34,16 @@ export class OutputMenuBootstrap extends Bootstrap {
   }
 
   register(): void | Promise<void> {
+    this.menuService.addCreator({
+      isApplicable: context => context.get(DATA_CONTEXT_MENU) === OUTPUT_LOGS_MENU,
+      getItems(context, items) {
+        return [...items, OUTPUT_LOGS_FILTER_MENU, OUTPUT_LOGS_SETTINGS_MENU];
+      },
+    });
+
     this.menuService.addCreator({
       menus: [OUTPUT_LOGS_FILTER_MENU],
-      getItems: context => {
+      getItems: (context, items) => {
         const state = context.tryGet(DATA_CONTEXT_SQL_EDITOR_STATE);
 
         if (!state) {
@@ -42,10 +51,10 @@ export class OutputMenuBootstrap extends Bootstrap {
         }
 
         const outputLogsTabState = state?.outputLogsTab;
-        const items = [];
+        const result = [];
 
         for (const logType of OUTPUT_LOG_TYPES) {
-          items.push(
+          result.push(
             new MenuCheckboxItem(
               {
                 id: logType,
@@ -70,7 +79,36 @@ export class OutputMenuBootstrap extends Bootstrap {
           );
         }
 
-        return items;
+        return [...items, ...result];
+      },
+    });
+
+    this.menuService.addCreator({
+      menus: [OUTPUT_LOGS_SETTINGS_MENU],
+      getItems: (context, items) => {
+        const state = context.tryGet(DATA_CONTEXT_SQL_EDITOR_STATE);
+
+        if (!state) {
+          return [];
+        }
+
+        const wrapMode = new MenuCheckboxItem(
+          {
+            id: 'wrap-mode',
+            label: 'sql_editor_output_logs_wrap_mode',
+            tooltip: 'sql_editor_output_logs_wrap_mode',
+          },
+          {
+            onSelect: () => {
+              this.outputLogsService.toggleWrapMode();
+            },
+          },
+          {
+            isChecked: () => this.outputLogsService.settings.wrapMode,
+          },
+        );
+
+        return [...items, wrapMode];
       },
     });
 
diff --git a/webapp/packages/plugin-sql-editor/src/locales/en.ts b/webapp/packages/plugin-sql-editor/src/locales/en.ts
index 54308fd446..6188f2c387 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/en.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/en.ts
@@ -10,6 +10,7 @@ export default [
   ['sql_editor_output_logs_button_tooltip', 'Show server output (Shift + Ctrl + O)'],
   ['sql_editor_output_logs_tab_title', 'Output'],
   ['sql_editor_output_logs_input_placeholder', 'Enter a part of a message to search for here'],
+  ['sql_editor_output_logs_wrap_mode', 'Wrap mode'],
   ['sql_editor_sql_execution_button_tooltip', 'Execute SQL Statement (Ctrl + Enter)'],
   ['sql_editor_sql_execution_new_tab_button_tooltip', 'Execute SQL Statement in new tab (Ctrl + \\)(Shift + Ctrl + Enter)'],
   ['sql_editor_sql_execution_script_button_tooltip', 'Execute SQL Script (Alt + X)'],
diff --git a/webapp/packages/plugin-sql-editor/src/locales/it.ts b/webapp/packages/plugin-sql-editor/src/locales/it.ts
index 8071d17e7e..86bd014eec 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/it.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/it.ts
@@ -10,6 +10,7 @@ export default [
   ['sql_editor_output_logs_button_tooltip', 'Show server output (Shift + Ctrl + O)'],
   ['sql_editor_output_logs_tab_title', 'Output'],
   ['sql_editor_output_logs_input_placeholder', 'Enter a part of a message to search for here'],
+  ['sql_editor_output_logs_wrap_mode', 'Wrap mode'],
   ['sql_editor_sql_execution_button_tooltip', "Esegui l'istruzione SQL (Ctrl + Enter)"],
   ['sql_editor_sql_execution_new_tab_button_tooltip', "Esegui l'istruzione SQL in una nuova tab (Ctrl + \\)(Shift + Ctrl + Enter)"],
   ['sql_editor_sql_execution_script_button_tooltip', 'Esegui lo script SQL (Alt + X)'],
diff --git a/webapp/packages/plugin-sql-editor/src/locales/ru.ts b/webapp/packages/plugin-sql-editor/src/locales/ru.ts
index f639337962..988660cdde 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/ru.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/ru.ts
@@ -10,6 +10,7 @@ export default [
   ['sql_editor_output_logs_button_tooltip', 'Показать вывод сервера (Shift + Ctrl + O)'],
   ['sql_editor_output_logs_tab_title', 'Вывод логов'],
   ['sql_editor_output_logs_input_placeholder', 'Введите часть сообщения для поиска'],
+  ['sql_editor_output_logs_wrap_mode', 'Перенос строк'],
   ['sql_editor_sql_execution_button_tooltip', 'Выполнить SQL Выражение (Ctrl + Enter)'],
   ['sql_editor_sql_execution_new_tab_button_tooltip', 'Выполнить SQL Выражение в новой вкладке (Ctrl + \\)(Shift + Ctrl + Enter)'],
   ['sql_editor_sql_execution_script_button_tooltip', 'Исполнить SQL Скрипт (Alt + X)'],
diff --git a/webapp/packages/plugin-sql-editor/src/locales/zh.ts b/webapp/packages/plugin-sql-editor/src/locales/zh.ts
index 3c6d9ac298..840c8b6cee 100644
--- a/webapp/packages/plugin-sql-editor/src/locales/zh.ts
+++ b/webapp/packages/plugin-sql-editor/src/locales/zh.ts
@@ -10,6 +10,7 @@ export default [
   ['sql_editor_output_logs_button_tooltip', 'Show server output (Shift + Ctrl + O)'],
   ['sql_editor_output_logs_tab_title', 'Output'],
   ['sql_editor_output_logs_input_placeholder', 'Enter a part of a message to search for here'],
+  ['sql_editor_output_logs_wrap_mode', 'Wrap mode'],
   ['sql_editor_sql_execution_button_tooltip', '执行SQL语句（Ctrl + Enter）'],
   ['sql_editor_sql_execution_new_tab_button_tooltip', '在新选项卡中执行SQL语句（Ctrl + \\）（Shift + Ctrl + Enter）'],
   ['sql_editor_sql_execution_script_button_tooltip', '执行SQL脚本（Alt + X）'],