diff --git a/web/ASC.Web.Client/src/Shell.jsx b/web/ASC.Web.Client/src/Shell.jsx
index 4115731d05..bb9e571c72 100644
--- a/web/ASC.Web.Client/src/Shell.jsx
+++ b/web/ASC.Web.Client/src/Shell.jsx
@@ -12,7 +12,9 @@ import Layout from "./components/Layout";
 import ScrollToTop from "./components/Layout/ScrollToTop";
 import history from "@appserver/common/history";
 import toastr from "studio/toastr";
-import RectangleLoader from "@appserver/common/components/Loaders/RectangleLoader";
+import Loader from "@appserver/components/loader";
+import Grid from "@appserver/components/grid";
+import PageLayout from "@appserver/common/components/PageLayout";
 import { updateTempContent } from "@appserver/common/utils";
 import { Provider as MobxProvider } from "mobx-react";
 import ThemeProvider from "@appserver/components/theme-provider";
@@ -33,14 +35,14 @@ const About = React.lazy(() => import("./components/pages/About"));
 const Settings = React.lazy(() => import("./components/pages/Settings"));
 const ComingSoon = React.lazy(() => import("./components/pages/ComingSoon"));
 
-const LoadingBody = styled.div`
-  width: 100vw;
-  padding: 20px;
-`;
 const LoadingShell = () => (
-  <LoadingBody>
-    <RectangleLoader height="100%" width="100%" />
-  </LoadingBody>
+  <PageLayout>
+    <PageLayout.SectionBody>
+      <Box displayProp="flex" alignItems="center" justifyContent="center">
+        <Loader type="rombs" size="40px" />
+      </Box>
+    </PageLayout.SectionBody>
+  </PageLayout>
 );
 
 const SettingsRoute = (props) => (
diff --git a/yarn.lock b/yarn.lock
index 83754ad6d9..85da9447e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4272,9 +4272,9 @@ acorn@^7.1.0, acorn@^7.1.1:
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.0.4:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7"
-  integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
+  integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
 
 add-dom-event-listener@^1.1.0:
   version "1.1.0"
@@ -9687,9 +9687,9 @@ i18next-http-backend@^1.1.0, i18next-http-backend@^1.1.1:
     node-fetch "2.6.1"
 
 i18next@^19.8.4, i18next@^19.9.1:
-  version "19.9.1"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.1.tgz#7a072b75daf677aa51fd4ce55214f21702af3ffd"
-  integrity sha512-9Azzyb3DvMJUMd7sPhwVEs6PQcogvdHmLQTjMQ+P+h3XwW4O66/8lgZTmYShgkjPOCqTw4Fwl5LOp/VhZgPo5A==
+  version "19.9.2"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.2.tgz#ea5a124416e3c5ab85fddca2c8e3c3669a8da397"
+  integrity sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg==
   dependencies:
     "@babel/runtime" "^7.12.0"