diff --git a/packages/asc-web-common/components/FilterInput/StyledFilterInput.js b/packages/asc-web-common/components/FilterInput/StyledFilterInput.js
index a4b7ca35b1..b920c448a5 100644
--- a/packages/asc-web-common/components/FilterInput/StyledFilterInput.js
+++ b/packages/asc-web-common/components/FilterInput/StyledFilterInput.js
@@ -26,9 +26,9 @@ const StyledFilterInput = styled.div`
 
   .styled-filter-block {
     display: flex;
-
     .filter-button {
       svg {
+        height: 25px;
         path:not(:first-child) {
           stroke: #a3a9ae;
         }
@@ -140,37 +140,35 @@ const StyledFilterInput = styled.div`
 `;
 
 export const StyledViewSelector = styled.div`
-  
-    border: 1px solid ${(props) => (props.isDisabled ? "#ECEEF1" : "#D0D5DA")};
-    border-radius: 3px;
-    padding: 7px;
-    ${(props) => props.isDisabled && "background-color: #F8F9F9;"}
+  border: 1px solid ${(props) => (props.isDisabled ? "#ECEEF1" : "#D0D5DA")};
+  border-radius: 3px;
+  padding: 7px;
+  ${(props) => props.isDisabled && "background-color: #F8F9F9;"}
 
-    svg {
-      pointer-events: none;
-    }
+  svg {
+    pointer-events: none;
+  }
 
-    &.active {
-      background-color: #a3a9ae;
-      border-color: #a3a9ae;
-    }
+  &.active {
+    background-color: #a3a9ae;
+    border-color: #a3a9ae;
+  }
 
-    &:hover {
-      ${(props) => !props.isDisabled && "background-color: #A3A9AE;"}
-      ${(props) => !props.isDisabled && "border-color: #A3A9AE;"}
-    }
+  &:hover {
+    ${(props) => !props.isDisabled && "background-color: #A3A9AE;"}
+    ${(props) => !props.isDisabled && "border-color: #A3A9AE;"}
+  }
 
-    &:first-child {
-      border-right: none;
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-    }
+  &:first-child {
+    border-right: none;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
 
-    &:last-child {
-      border-left: none;
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
+  &:last-child {
+    border-left: none;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
   }
 `;
 
@@ -178,7 +176,7 @@ export const StyledFilterItem = styled.div`
   display: ${(props) => (props.block ? "flex" : "inline-block")};
   margin-bottom: ${(props) => (props.block ? "8px" : "0")};
   position: relative;
-  height: 26px;
+  height: 25px;
   margin-right: 2px;
   border: 1px solid #eceef1;
   border-radius: 3px;
@@ -266,7 +264,7 @@ export const StyledHideFilterButton = styled.div`
   align-items: center;
   font-weight: 600;
   font-size: 16px;
-  height: 100%;
+  height: 25px;
   border: 1px solid #eceef1;
   border-radius: 3px;
   background-color: #f8f9f9;
diff --git a/packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js b/packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
index e3939e30ba..7248abc42b 100644
--- a/packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
+++ b/packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
@@ -159,13 +159,11 @@ class SortComboBox extends React.Component {
       >
         <StyledIconButton sortDirection={!!sortDirection}>
           <IconButton
-            clickColor={"#333"}
             color={"#A3A9AE"}
-            hoverColor={"#333"}
             iconName="/static/images/z-a.sorting.react.svg"
             isDisabled={isDisabled}
             isFill={true}
-            onClick={this.onButtonClick}
+            onClick={this.onToggleAction}
             size={10}
           />
         </StyledIconButton>
diff --git a/packages/asc-web-common/components/PageLayout/sub-components/article.js b/packages/asc-web-common/components/PageLayout/sub-components/article.js
index 7d6766c371..0aab982d7e 100644
--- a/packages/asc-web-common/components/PageLayout/sub-components/article.js
+++ b/packages/asc-web-common/components/PageLayout/sub-components/article.js
@@ -21,7 +21,7 @@ const StyledArticle = styled.article`
     min-width: 265px;
     height: 100% !important;
     max-width: ${(props) =>
-      props.isLoading ? "calc(100vw - 368px)" : "265px"};
+      props.firstLoad ? "265px" : "calc(100vw - 368px)"};
     box-sizing: border-box;
     overflow: hidden auto;
     display: flex;
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
index 9ff490d96b..1248626869 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
@@ -320,7 +320,6 @@ class SectionHeaderContent extends React.Component {
       isRecycleBin,
       isThirdPartySelection,
       isPrivacy,
-      isOnlyFoldersSelected,
       isFavoritesFolder,
       isRecentFolder,
       isShareFolder,
@@ -384,7 +383,6 @@ class SectionHeaderContent extends React.Component {
           isFavoritesFolder ||
           isRecentFolder ||
           !isAccessedSelected ||
-          isOnlyFoldersSelected ||
           selectionCount > 1,
         onClick: this.onOpenSharingPanel,
       },
@@ -589,7 +587,6 @@ export default inject(
       isHeaderChecked,
       userAccess,
       isAccessedSelected,
-      isOnlyFoldersSelected,
       isThirdPartySelection,
       isWebEditSelected,
       setIsLoading,
@@ -632,7 +629,6 @@ export default inject(
       isHeaderChecked,
       deleteDialogVisible: userAccess,
       isAccessedSelected,
-      isOnlyFoldersSelected,
       isThirdPartySelection,
       isWebEditSelected,
       isTabletView: auth.settingsStore.isTabletView,
diff --git a/products/ASC.Files/Client/src/pages/Home/index.js b/products/ASC.Files/Client/src/pages/Home/index.js
index 67760b815e..074ee7a267 100644
--- a/products/ASC.Files/Client/src/pages/Home/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/index.js
@@ -272,6 +272,7 @@ class PureHome extends React.Component {
           isHeaderVisible={isHeaderVisible}
           onOpenUploadPanel={this.showUploadPanel}
           isLoading={isLoading}
+          firstLoad={firstLoad}
           dragging={dragging}
         >
           <PageLayout.ArticleHeader>
diff --git a/products/ASC.Files/Client/src/store/FilesStore.js b/products/ASC.Files/Client/src/store/FilesStore.js
index a4e1393873..867449d323 100644
--- a/products/ASC.Files/Client/src/store/FilesStore.js
+++ b/products/ASC.Files/Client/src/store/FilesStore.js
@@ -1164,10 +1164,6 @@ class FilesStore {
     );
   }
 
-  get isOnlyFoldersSelected() {
-    return this.selection.every((selected) => selected.fileExst === undefined);
-  }
-
   get isThirdPartySelection() {
     const withProvider = this.selection.find((x) => !x.providerKey);
     return !withProvider && this.selectedFolderStore.isRootFolder;
diff --git a/products/ASC.Files/Server/DocStore b/products/ASC.Files/Server/DocStore
index b1063eae56..8177bad15d 160000
--- a/products/ASC.Files/Server/DocStore
+++ b/products/ASC.Files/Server/DocStore
@@ -1 +1 @@
-Subproject commit b1063eae56d183b5c0b6eb887115c378f3941ebe
+Subproject commit 8177bad15d567d997a79478a65d32662a6f773b1
diff --git a/web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js b/web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
index f4969aea81..a7286acacc 100644
--- a/web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
+++ b/web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
@@ -11,12 +11,12 @@ import { AppServerConfig } from "@appserver/common/constants";
 const backgroundColor = "#0F4071";
 
 const Header = styled.header`
-  align-items: center;
+  align-items: left;
   background-color: ${backgroundColor};
   display: flex;
   width: calc(100vw - 64px);
   height: 56px;
-  justify-content: center;
+  justify-content: left;
   padding: 0 32px;
 
   .header-items-wrapper {