diff --git a/packages/client/public/locales/az/ChangeUserStatusDialog.json b/packages/client/public/locales/az/ChangeUserStatusDialog.json
index 301e2acf0a..e2cff10ec7 100644
--- a/packages/client/public/locales/az/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/az/ChangeUserStatusDialog.json
@@ -2,6 +2,5 @@
   "ChangeUserStatusDialog": "{{ userStatus }} olan istifadəçilər {{ status }} olacaqlar.",
   "ChangeUserStatusDialogHeader": "İstifadəçi statusunun dəyişdirilməsi",
   "ChangeUsersActiveStatus": "iz ver",
-  "ChangeUsersDisableStatus": "söndürülüb",
-  "ChangeUsersStatusButton": "İstifadəçi statusunun dəyişdirilməsi"
+  "ChangeUsersDisableStatus": "söndürülüb"
 }
diff --git a/packages/client/public/locales/bg/ChangeUserStatusDialog.json b/packages/client/public/locales/bg/ChangeUserStatusDialog.json
index c4cb780296..31c6e7fcc9 100644
--- a/packages/client/public/locales/bg/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/bg/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Промени статус",
   "ChangeUserStatusDialogMessage": "Не можете да смените статуса за собственика на DocSpace и за себе си.",
   "ChangeUsersActiveStatus": "активиран",
-  "ChangeUsersDisableStatus": "активиран",
-  "ChangeUsersStatusButton": "Промени потребителския статус"
+  "ChangeUsersDisableStatus": "активиран"
 }
diff --git a/packages/client/public/locales/cs/ChangeUserStatusDialog.json b/packages/client/public/locales/cs/ChangeUserStatusDialog.json
index 8a181d7528..8ebbdc82c5 100644
--- a/packages/client/public/locales/cs/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/cs/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Změnit status",
   "ChangeUserStatusDialogMessage": "Nemůžete změnit status pro vlastníka DocSpace a pro sebe.",
   "ChangeUsersActiveStatus": "aktivován",
-  "ChangeUsersDisableStatus": "aktivován",
-  "ChangeUsersStatusButton": "Změnit status uživatele"
+  "ChangeUsersDisableStatus": "aktivován"
 }
diff --git a/packages/client/public/locales/de/ChangeUserStatusDialog.json b/packages/client/public/locales/de/ChangeUserStatusDialog.json
index 2b68571904..9df20c1b5d 100644
--- a/packages/client/public/locales/de/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/de/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Status ändern",
   "ChangeUserStatusDialogMessage": "Sie können Status für Sie oder Portalbesitzer nicht ändern.",
   "ChangeUsersActiveStatus": "aktiviert",
-  "ChangeUsersDisableStatus": "deaktiviert",
-  "ChangeUsersStatusButton": "Benutzerstatus ändern"
+  "ChangeUsersDisableStatus": "deaktiviert"
 }
diff --git a/packages/client/public/locales/el-GR/ChangeUserStatusDialog.json b/packages/client/public/locales/el-GR/ChangeUserStatusDialog.json
index 5d691c373a..e0b5a42d58 100644
--- a/packages/client/public/locales/el-GR/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/el-GR/ChangeUserStatusDialog.json
@@ -1,5 +1,4 @@
 {
   "ChangeUserStatusDialog": "Οι χρήστες με κατάσταση '{{ userStatus }}' θα είναι {{ status }}.",
-  "ChangeUserStatusDialogHeader": "Αλλαγή κατάστασης χρήστη",
-  "ChangeUsersStatusButton": "Αλλαγή κατάστασης χρήστη"
+  "ChangeUserStatusDialogHeader": "Αλλαγή κατάστασης χρήστη"
 }
diff --git a/packages/client/public/locales/en/ChangeUserStatusDialog.json b/packages/client/public/locales/en/ChangeUserStatusDialog.json
index ec50345bac..50e64e9e72 100644
--- a/packages/client/public/locales/en/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/en/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Change status",
   "ChangeUserStatusDialogMessage": "You can't change the status for the DocSpace owner and for yourself.",
   "ChangeUsersActiveStatus": "enabled",
-  "ChangeUsersDisableStatus": "disabled",
-  "ChangeUsersStatusButton": "Change user status"
+  "ChangeUsersDisableStatus": "disabled"
 }
diff --git a/packages/client/public/locales/es/ChangeUserStatusDialog.json b/packages/client/public/locales/es/ChangeUserStatusDialog.json
index c4d22cfd62..42d84929ea 100644
--- a/packages/client/public/locales/es/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/es/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Cambiar estado",
   "ChangeUserStatusDialogMessage": "No puede cambiar el estado para el propietario del portal y para usted mismo.",
   "ChangeUsersActiveStatus": "activados",
-  "ChangeUsersDisableStatus": "desactivados",
-  "ChangeUsersStatusButton": "Cambiar estado de usuario"
+  "ChangeUsersDisableStatus": "desactivados"
 }
diff --git a/packages/client/public/locales/fi/ChangeUserStatusDialog.json b/packages/client/public/locales/fi/ChangeUserStatusDialog.json
index e3f01e709f..459cb90485 100644
--- a/packages/client/public/locales/fi/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/fi/ChangeUserStatusDialog.json
@@ -1,5 +1,4 @@
 {
   "ChangeUserStatusDialog": "Käyttäjät, joilla on tila {{userStatus}}, tulee {{ status }}.",
-  "ChangeUserStatusDialogHeader": "Muuta käyttäjän tilaa",
-  "ChangeUsersStatusButton": "Muuta käyttäjän tilaa"
+  "ChangeUserStatusDialogHeader": "Muuta käyttäjän tilaa"
 }
diff --git a/packages/client/public/locales/fr/ChangeUserStatusDialog.json b/packages/client/public/locales/fr/ChangeUserStatusDialog.json
index 1b93c14fa7..dccb298ad4 100644
--- a/packages/client/public/locales/fr/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/fr/ChangeUserStatusDialog.json
@@ -1,8 +1,7 @@
 {
   "ChangeUserStatusDialog": "Les utilisateurs avec le statut '{{ userStatus }}' seront {{ status }}",
-  "ChangeUserStatusDialogHeader": "Modifier le statut",
+  "ChangeUserStatusDialogHeader": "Modifier le statut de l'utilisateur",
   "ChangeUserStatusDialogMessage": "Vous ne pouvez pas changer le statut du propriétaire de DocSpace ainsi que votre statut.",
   "ChangeUsersActiveStatus": "activés",
-  "ChangeUsersDisableStatus": "désactivés",
-  "ChangeUsersStatusButton": "Modifier le statut de l'utilisateur"
+  "ChangeUsersDisableStatus": "désactivés"
 }
diff --git a/packages/client/public/locales/hy-AM/ChangeUserStatusDialog.json b/packages/client/public/locales/hy-AM/ChangeUserStatusDialog.json
index 0bc8f631bb..95880e86dd 100644
--- a/packages/client/public/locales/hy-AM/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/hy-AM/ChangeUserStatusDialog.json
@@ -1,5 +1,4 @@
 {
   "ChangeUserStatusDialog": "'{{ userStatus }}'ունեցող օգտվողները կլինեն {{ status }}.",
-  "ChangeUserStatusDialogHeader": "Փոխել օգտվողի կարգավիճակը",
-  "ChangeUsersStatusButton": "Փոխել օգտվողի կարգավիճակը"
+  "ChangeUserStatusDialogHeader": "Փոխել օգտվողի կարգավիճակը"
 }
diff --git a/packages/client/public/locales/it/ChangeUserStatusDialog.json b/packages/client/public/locales/it/ChangeUserStatusDialog.json
index d1f359c351..311c20b4a6 100644
--- a/packages/client/public/locales/it/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/it/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Cambia stato",
   "ChangeUserStatusDialogMessage": "Non è possibile modificare lo stato per il proprietario di DocSpace e per te stesso",
   "ChangeUsersActiveStatus": "attivati",
-  "ChangeUsersDisableStatus": "disattivati",
-  "ChangeUsersStatusButton": "Cambia lo stato dell'utente"
+  "ChangeUsersDisableStatus": "disattivati"
 }
diff --git a/packages/client/public/locales/ja-JP/ChangeUserStatusDialog.json b/packages/client/public/locales/ja-JP/ChangeUserStatusDialog.json
index 6331af202f..b4b232b576 100644
--- a/packages/client/public/locales/ja-JP/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/ja-JP/ChangeUserStatusDialog.json
@@ -1,5 +1,4 @@
 {
   "ChangeUserStatusDialog": "ステータスが'{{ userStatus }}' のユーザーは {{ status }} になります。",
-  "ChangeUserStatusDialogHeader": "ユーザーステータスの変更",
-  "ChangeUsersStatusButton": "ユーザーステータスの変更"
+  "ChangeUserStatusDialogHeader": "ユーザーステータスの変更"
 }
diff --git a/packages/client/public/locales/ko-KR/ChangeUserStatusDialog.json b/packages/client/public/locales/ko-KR/ChangeUserStatusDialog.json
index 3a98d94921..c3a6793b5a 100644
--- a/packages/client/public/locales/ko-KR/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/ko-KR/ChangeUserStatusDialog.json
@@ -1,5 +1,4 @@
 {
   "ChangeUserStatusDialog": "'{{ userStatus }}' 상태 사용자는 {{ status }}.",
-  "ChangeUserStatusDialogHeader": "사용자 상태 변경",
-  "ChangeUsersStatusButton": "사용자 상태 변경"
+  "ChangeUserStatusDialogHeader": "사용자 상태 변경"
 }
diff --git a/packages/client/public/locales/lo-LA/ChangeUserStatusDialog.json b/packages/client/public/locales/lo-LA/ChangeUserStatusDialog.json
index abfcd00d2d..dd18723b39 100644
--- a/packages/client/public/locales/lo-LA/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/lo-LA/ChangeUserStatusDialog.json
@@ -1,6 +1,5 @@
 {
   "ChangeUserStatusDialog": "ສະຖານະຂອງຜູ້ໃຊ້ທີ່ມີ '{{ userStatus }}' ຈະເປັນ {{ status }}.",
   "ChangeUserStatusDialogHeader": "ປ່ຽນສະຖານະຜູ້ໃຊ້",
-  "ChangeUserStatusDialogMessage": "ທ່ານບໍ່ສາມາດປ່ຽນສະຖານະພາບສຳລັບເຈົ້າຂອງ DocSpace ແລະ ສຳລັບທ່ານເອງ",
-  "ChangeUsersStatusButton": "ປ່ຽນສະຖານະຜູ້ໃຊ້"
+  "ChangeUserStatusDialogMessage": "ທ່ານບໍ່ສາມາດປ່ຽນສະຖານະພາບສຳລັບເຈົ້າຂອງ DocSpace ແລະ ສຳລັບທ່ານເອງ"
 }
diff --git a/packages/client/public/locales/lv/ChangeUserStatusDialog.json b/packages/client/public/locales/lv/ChangeUserStatusDialog.json
index be2ff31b0d..f1117e8eec 100644
--- a/packages/client/public/locales/lv/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/lv/ChangeUserStatusDialog.json
@@ -1,6 +1,5 @@
 {
   "ChangeUserStatusDialog": "Lietotāji ar '{{ userStatus }}' statusu tiks {{ status }}.",
   "ChangeUserStatusDialogHeader": "Mainiet lietotāja statusu",
-  "ChangeUserStatusDialogMessage": "Jūs nevarat mainīt statusu DocSpace īpašnieka un sev.",
-  "ChangeUsersStatusButton": "Mainīt lietotāja statusu"
+  "ChangeUserStatusDialogMessage": "Jūs nevarat mainīt statusu DocSpace īpašnieka un sev."
 }
diff --git a/packages/client/public/locales/nl/ChangeUserStatusDialog.json b/packages/client/public/locales/nl/ChangeUserStatusDialog.json
index 2fae084ff5..b9ede0a52d 100644
--- a/packages/client/public/locales/nl/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/nl/ChangeUserStatusDialog.json
@@ -1,6 +1,5 @@
 {
   "ChangeUserStatusDialog": "De gebruikers met de '{{ userStatus }}' status zullen worden {{ status }}.",
   "ChangeUserStatusDialogHeader": "Wijzig gebruikersstatus",
-  "ChangeUserStatusDialogMessage": "U kunt de status voor de DocSpace-eigenaar en voor uzelf niet veranderen.",
-  "ChangeUsersStatusButton": "Wijzig gebruikersstatus"
+  "ChangeUserStatusDialogMessage": "U kunt de status voor de DocSpace-eigenaar en voor uzelf niet veranderen."
 }
diff --git a/packages/client/public/locales/pl/ChangeUserStatusDialog.json b/packages/client/public/locales/pl/ChangeUserStatusDialog.json
index 9d9a5db110..d992e1f33a 100644
--- a/packages/client/public/locales/pl/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/pl/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Zmień status użytkownika",
   "ChangeUserStatusDialogMessage": "Nie możesz zmienić swojego statusu, ani statusu właściciela DocSpace.",
   "ChangeUsersActiveStatus": "aktywny",
-  "ChangeUsersDisableStatus": "nieaktywny",
-  "ChangeUsersStatusButton": "Zmień status użytkownika"
+  "ChangeUsersDisableStatus": "nieaktywny"
 }
diff --git a/packages/client/public/locales/pt-BR/ChangeUserStatusDialog.json b/packages/client/public/locales/pt-BR/ChangeUserStatusDialog.json
index b356f89ec8..5773347110 100644
--- a/packages/client/public/locales/pt-BR/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/pt-BR/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Alterar status",
   "ChangeUserStatusDialogMessage": "Você não pode mudar o status para o proprietário do DocSpace e para você mesmo.",
   "ChangeUsersActiveStatus": "abilitado",
-  "ChangeUsersDisableStatus": "desabilitado",
-  "ChangeUsersStatusButton": "Alterar status de usuário"
+  "ChangeUsersDisableStatus": "desabilitado"
 }
diff --git a/packages/client/public/locales/pt/ChangeUserStatusDialog.json b/packages/client/public/locales/pt/ChangeUserStatusDialog.json
index f520aa46d7..4af9e1bf95 100644
--- a/packages/client/public/locales/pt/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/pt/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Alterar estado",
   "ChangeUserStatusDialogMessage": "Não pode alterar o estado para o dono do DocSpace e para si próprio.",
   "ChangeUsersActiveStatus": "ativado",
-  "ChangeUsersDisableStatus": "desabilitado",
-  "ChangeUsersStatusButton": "Alterar estado de utilizador"
+  "ChangeUsersDisableStatus": "desabilitado"
 }
diff --git a/packages/client/public/locales/ro/ChangeUserStatusDialog.json b/packages/client/public/locales/ro/ChangeUserStatusDialog.json
index dd2cee3294..ea43c1b6a3 100644
--- a/packages/client/public/locales/ro/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/ro/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Schimbați statutul utilizatorului",
   "ChangeUserStatusDialogMessage": "Nu puteți schimba statutul posesorului portalului și nici al dumneavoastră.",
   "ChangeUsersActiveStatus": "activat",
-  "ChangeUsersDisableStatus": "desactivat",
-  "ChangeUsersStatusButton": "Schimbați statutul utilizatorului"
+  "ChangeUsersDisableStatus": "desactivat"
 }
diff --git a/packages/client/public/locales/ru/ChangeUserStatusDialog.json b/packages/client/public/locales/ru/ChangeUserStatusDialog.json
index 89228235e9..472c070ace 100644
--- a/packages/client/public/locales/ru/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/ru/ChangeUserStatusDialog.json
@@ -3,6 +3,5 @@
   "ChangeUserStatusDialogHeader": "Изменение статуса",
   "ChangeUserStatusDialogMessage": "Вы не можете изменить статус владельца DocSpace и свой собственный статус.",
   "ChangeUsersActiveStatus": "разблокированы",
-  "ChangeUsersDisableStatus": "заблокированы",
-  "ChangeUsersStatusButton": "Изменить статус пользователя"
+  "ChangeUsersDisableStatus": "заблокированы"
 }
diff --git a/packages/client/public/locales/sk/ChangeUserStatusDialog.json b/packages/client/public/locales/sk/ChangeUserStatusDialog.json
index 135aa61b76..9c9f89a568 100644
--- a/packages/client/public/locales/sk/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/sk/ChangeUserStatusDialog.json
@@ -2,6 +2,5 @@
   "ChangeUserStatusDialog": "Používatelia so stavom '{{ userStatus }}' budú {{ status }}.",
   "ChangeUserStatusDialogHeader": "Zmeniť stav",
   "ChangeUserStatusDialogMessage": "Nemôžete zmeniť svoj stav a stav vlastníka DocSpace.",
-  "ChangeUsersActiveStatus": "aktivovaný",
-  "ChangeUsersStatusButton": "Zmeniť stav používateľa"
+  "ChangeUsersActiveStatus": "aktivovaný"
 }
diff --git a/packages/client/public/locales/sl/ChangeUserStatusDialog.json b/packages/client/public/locales/sl/ChangeUserStatusDialog.json
index 7b8e0ad1de..5d7fce1471 100644
--- a/packages/client/public/locales/sl/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/sl/ChangeUserStatusDialog.json
@@ -1,6 +1,5 @@
 {
   "ChangeUserStatusDialog": "Uporabniki z '{{ userStatus }}' statusom bodo {{ status }}.",
   "ChangeUserStatusDialogHeader": "Spremeni status",
-  "ChangeUserStatusDialogMessage": "Status lastnika DocSpace in svojega statusa ne morete spremeniti.",
-  "ChangeUsersStatusButton": "Spremeni status uporabnika"
+  "ChangeUserStatusDialogMessage": "Status lastnika DocSpace in svojega statusa ne morete spremeniti."
 }
diff --git a/packages/client/public/locales/tr/ChangeUserStatusDialog.json b/packages/client/public/locales/tr/ChangeUserStatusDialog.json
index d96dc7e6d6..255c9adf61 100644
--- a/packages/client/public/locales/tr/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/tr/ChangeUserStatusDialog.json
@@ -1,6 +1,5 @@
 {
   "ChangeUserStatusDialog": "'{{ userStatus }} durumuna sahip kullanıcılar {{ status }} olacak.",
   "ChangeUserStatusDialogHeader": "Kullanıcı durumunu değiştir",
-  "ChangeUserStatusDialogMessage": "DocSpace sahibi ve kendiniz için durumu değiştiremezsiniz.",
-  "ChangeUsersStatusButton": "Kullanıcı durumunu değiştir"
+  "ChangeUserStatusDialogMessage": "DocSpace sahibi ve kendiniz için durumu değiştiremezsiniz."
 }
diff --git a/packages/client/public/locales/uk-UA/ChangeUserStatusDialog.json b/packages/client/public/locales/uk-UA/ChangeUserStatusDialog.json
index f1526aad0a..fab9673b49 100644
--- a/packages/client/public/locales/uk-UA/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/uk-UA/ChangeUserStatusDialog.json
@@ -1,6 +1,5 @@
 {
   "ChangeUserStatusDialog": "Користувача зі статусом '{{ userStatus }}' буде {{ status }}.",
   "ChangeUserStatusDialogHeader": "Змінити статус",
-  "ChangeUserStatusDialogMessage": "Ви не можете змінити статус власника DocSpace та свій статус.",
-  "ChangeUsersStatusButton": "Змінити статус користувача"
+  "ChangeUserStatusDialogMessage": "Ви не можете змінити статус власника DocSpace та свій статус."
 }
diff --git a/packages/client/public/locales/vi/ChangeUserStatusDialog.json b/packages/client/public/locales/vi/ChangeUserStatusDialog.json
index 799802dea3..0e2cd85a13 100644
--- a/packages/client/public/locales/vi/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/vi/ChangeUserStatusDialog.json
@@ -1,5 +1,4 @@
 {
   "ChangeUserStatusDialog": "Người dùng có trạng thái '{{ userStatus }}' sẽ bị {{ status }}.",
-  "ChangeUserStatusDialogHeader": "Thay đổi trạng thái người dùng",
-  "ChangeUsersStatusButton": "Thay đổi trạng thái người dùng"
+  "ChangeUserStatusDialogHeader": "Thay đổi trạng thái người dùng"
 }
diff --git a/packages/client/public/locales/zh-CN/ChangeUserStatusDialog.json b/packages/client/public/locales/zh-CN/ChangeUserStatusDialog.json
index 492d3b15a8..c90a088577 100644
--- a/packages/client/public/locales/zh-CN/ChangeUserStatusDialog.json
+++ b/packages/client/public/locales/zh-CN/ChangeUserStatusDialog.json
@@ -1,5 +1,4 @@
 {
   "ChangeUserStatusDialog": "带有‘{{ userStatus }}’状态的用户将‘{{ userStatus }}",
-  "ChangeUserStatusDialogHeader": "变更用户状态",
-  "ChangeUsersStatusButton": "变更用户状态"
+  "ChangeUserStatusDialogHeader": "变更用户状态"
 }
diff --git a/packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js b/packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js
index aefaad219b..152b070996 100644
--- a/packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js
+++ b/packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js
@@ -100,7 +100,7 @@ class ChangeUserStatusDialogComponent extends React.Component {
         <ModalDialog.Footer>
           <Button
             id="change-user-status-modal_submit"
-            label={t("ChangeUsersStatusButton")}
+            label={t("Common:ChangeButton")}
             size="normal"
             primary
             scale
diff --git a/packages/client/src/pages/FormGallery/StyledGallery.js b/packages/client/src/pages/FormGallery/StyledGallery.js
index 5b542d6835..dea8269d09 100644
--- a/packages/client/src/pages/FormGallery/StyledGallery.js
+++ b/packages/client/src/pages/FormGallery/StyledGallery.js
@@ -57,6 +57,9 @@ const StyledInfoPanelToggleWrapper = styled.div`
   margin-left: auto;
 
   display: ${(props) => (props.isInfoPanelVisible ? "none" : "flex")};
+  align-items: center;
+  justify-content: center;
+
   @media ${tablet} {
     display: none;
   }
@@ -68,6 +71,8 @@ const StyledInfoPanelToggleWrapper = styled.div`
     align-items: center;
     justify-content: center;
     border-radius: 50%;
+    margin-bottom: 1px;
+
     background-color: ${(props) =>
       props.isInfoPanelVisible
         ? props.theme.infoPanel.sectionHeaderToggleBgActive
diff --git a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
index 31a069a84f..0c65ecbd9d 100644
--- a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
+++ b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
@@ -67,6 +67,8 @@ const FilesTileContainer = ({
 
       const { width } = node.getBoundingClientRect();
 
+      if (width === 0) return;
+
       const size = thumbnails1280x720 ? "1280x720" : getThumbSize(width);
 
       const widthWithoutPadding = width - 32;
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
index 01d9e7a8ef..7a3f59314c 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
@@ -16,9 +16,9 @@ import { DNSSettingsTooltip } from "../sub-components/common-tooltips";
 import { StyledSettingsComponent, StyledScrollbar } from "./StyledSettings";
 import { setDocumentTitle } from "SRC_DIR/helpers/utils";
 import LoaderCustomization from "../sub-components/loaderCustomization";
-import Textarea from "@docspace/components/textarea";
 import withLoading from "SRC_DIR/HOCs/withLoading";
 import Badge from "@docspace/components/badge";
+
 const DNSSettings = (props) => {
   const {
     t,
@@ -108,10 +108,10 @@ const DNSSettings = (props) => {
         labelText={`${t("YourCurrentDomain")}`}
         isVertical={true}
       >
-        <Textarea
+        <TextInput
           id="textInputContainerDNSSettings"
           className="dns-textarea"
-          heightTextArea={30}
+          scale={true}
           tabIndex={8}
           isDisabled={true}
           value={location.hostname}
diff --git a/packages/client/src/pages/PortalSettings/categories/data-management/backup/StyledBackup.js b/packages/client/src/pages/PortalSettings/categories/data-management/backup/StyledBackup.js
index 0d51b9e3fe..652b782581 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-management/backup/StyledBackup.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-management/backup/StyledBackup.js
@@ -5,7 +5,12 @@ import {
 } from "../../../utils/commonSettingsStyles";
 import globalColors from "@docspace/components/utils/globalColors";
 import { isMobileOnly } from "react-device-detect";
-import { hugeMobile, tablet, mobile } from "@docspace/components/utils/device";
+import {
+  hugeMobile,
+  tablet,
+  mobile,
+  smallTablet,
+} from "@docspace/components/utils/device";
 
 const linkColor = globalColors.black;
 
@@ -239,6 +244,10 @@ const StyledRestoreBackup = styled.div`
   .restore-backup_input {
     margin: 16px 0;
     max-width: ${INPUT_LENGTH};
+
+    @media ${smallTablet} {
+      max-width: none;
+    }
   }
   .restore-description {
     margin-bottom: 24px;
@@ -250,7 +259,9 @@ const StyledRestoreBackup = styled.div`
     margin-bottom: 16px;
   }
   .restore-backup_button {
-    ${isMobileOnly && "width:100%"}
+    @media ${smallTablet} {
+      width: 100%;
+    }
   }
   ${(props) => !props.isEnableRestore && UnavailableStyles}
 `;
diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/index.js b/packages/client/src/pages/PortalSettings/categories/delete-data/index.js
index 97c03cf568..00059dc714 100644
--- a/packages/client/src/pages/PortalSettings/categories/delete-data/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/delete-data/index.js
@@ -10,7 +10,7 @@ import { combineUrl } from "@docspace/common/utils";
 import config from "../../../../../package.json";
 
 const DeleteData = (props) => {
-  const { t, history, isNotPaidPeriod } = props;
+  const { t, history, isNotPaidPeriod, tReady } = props;
 
   const [currentTab, setCurrentTab] = useState(0);
   const [isLoading, setIsLoading] = useState(false);
@@ -45,7 +45,7 @@ const DeleteData = (props) => {
     );
   };
 
-  if (!isLoading) return <DeleteDataLoader />;
+  if (!isLoading || !tReady) return <DeleteDataLoader />;
   return isNotPaidPeriod ? (
     <PortalDeletionSection />
   ) : (
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js b/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
index 067f86a9f4..d548ba0bd5 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
@@ -12,6 +12,15 @@ import Link from "@docspace/components/link";
 import toastr from "@docspace/components/toast/toastr";
 import ModalDialogContainer from "./modalDialogContainer";
 import { showLoader, hideLoader } from "@docspace/common/utils";
+import { hugeMobile } from "@docspace/components/utils/device";
+import styled from "styled-components";
+
+const StyledBox = styled(Box)`
+  padding: 20px 0 8px;
+  @media ${hugeMobile} {
+    padding-top: 0;
+  }
+`;
 
 class ConsumerModalDialog extends React.Component {
   constructor(props) {
@@ -85,7 +94,7 @@ class ConsumerModalDialog extends React.Component {
 
   thirdPartyServicesUrl = () => {
     switch (this.props.selectedConsumer.name) {
-      case "docuSign":
+      case "docusign" || "docuSign":
         return this.props.docuSignUrl;
       case "dropbox":
         return this.props.dropboxUrl;
@@ -151,7 +160,7 @@ class ConsumerModalDialog extends React.Component {
   );
 
   supportTeamDescription = (
-    <Box paddingProp="20px 0 8px">
+    <StyledBox>
       <Trans
         t={this.props.t}
         i18nKey="ThirdPartyBottomDescription"
@@ -168,7 +177,7 @@ class ConsumerModalDialog extends React.Component {
           Support Team
         </Link>
       </Trans>
-    </Box>
+    </StyledBox>
   );
 
   render() {
@@ -231,7 +240,7 @@ class ConsumerModalDialog extends React.Component {
           <Button
             primary
             size="normal"
-            label={isLoading ? t("Common:Sending") : t("Common:Connect")}
+            label={isLoading ? t("Common:Sending") : t("Common:Enable")}
             isLoading={isLoading}
             isDisabled={isLoading}
             scale
diff --git a/packages/client/src/pages/Wizard/StyledWizard.js b/packages/client/src/pages/Wizard/StyledWizard.js
index bd774339d6..317f857e74 100644
--- a/packages/client/src/pages/Wizard/StyledWizard.js
+++ b/packages/client/src/pages/Wizard/StyledWizard.js
@@ -46,6 +46,10 @@ export const StyledContent = styled.div`
   margin: 0 auto;
   -webkit-box-orient: vertical;
   -webkit-box-direction: normal;
+
+  @media ${hugeMobile} {
+    min-height: 100%;
+  }
 `;
 
 export const WizardContainer = styled.div`
@@ -61,8 +65,7 @@ export const WizardContainer = styled.div`
   }
 
   @media ${hugeMobile} {
-    margin-top: 32px;
-    width: calc(100% - 32px);
+    margin: 32px auto;
   }
 
   .docspace-logo {
@@ -74,6 +77,10 @@ export const WizardContainer = styled.div`
 
   .welcome-text {
     padding-bottom: 32px;
+
+    @media ${hugeMobile} {
+      max-width: 343px;
+    }
   }
 
   .form-header {
diff --git a/packages/client/src/pages/Wizard/index.js b/packages/client/src/pages/Wizard/index.js
index 5b94933f0e..a03592a87d 100644
--- a/packages/client/src/pages/Wizard/index.js
+++ b/packages/client/src/pages/Wizard/index.js
@@ -280,7 +280,12 @@ const Wizard = (props) => {
       <StyledContent>
         <WizardContainer>
           <DocspaceLogo className="docspace-logo" />
-          <Text fontWeight={700} fontSize="23px" className="welcome-text">
+          <Text
+            as="div"
+            fontWeight={700}
+            fontSize="23px"
+            className="welcome-text"
+          >
             {t("WelcomeTitle")}
           </Text>
           <FormWrapper>
@@ -407,6 +412,7 @@ const Wizard = (props) => {
                 {t("Timezone")}
               </Text>
               <ComboBox
+                textOverflow
                 withoutPadding
                 directionY="both"
                 options={timezones}
diff --git a/packages/common/utils/index.ts b/packages/common/utils/index.ts
index afdd386d3c..46592e806b 100644
--- a/packages/common/utils/index.ts
+++ b/packages/common/utils/index.ts
@@ -433,38 +433,29 @@ export const frameCallCommand = (commandName: string, commandData: any) => {
   );
 };
 
-export const getConvertedSize = (t, size) => {
-  let sizeNames;
+export const getConvertedSize = (t, bytes) => {
+  let power = 0,
+    resultSize = bytes;
 
-  if (size < 0) return `${8 + " " + t("Common:Exabyte")}`;
+  const sizeNames = [
+    t("Common:Bytes"),
+    t("Common:Kilobyte"),
+    t("Common:Megabyte"),
+    t("Common:Gigabyte"),
+    t("Common:Terabyte"),
+    t("Common:Petabyte"),
+    t("Common:Exabyte"),
+  ];
 
-  if (size < 1024 * 1024) {
-    sizeNames = [
-      t("Common:Megabyte"),
-      t("Common:Gigabyte"),
-      t("Common:Terabyte"),
-    ];
-  } else {
-    sizeNames = [
-      t("Common:Bytes"),
-      t("Common:Kilobyte"),
-      t("Common:Megabyte"),
-      t("Common:Gigabyte"),
-      t("Common:Terabyte"),
-      t("Common:Petabyte"),
-      t("Common:Exabyte"),
-    ];
+  if (bytes <= 0) return `${"0" + " " + t("Common:Bytes")}`;
+
+  if (bytes >= 1024) {
+    power = Math.floor(Math.log(bytes) / Math.log(1024));
+    power = power < sizeNames.length ? power : sizeNames.length - 1;
+    resultSize = parseFloat((bytes / Math.pow(1024, power)).toFixed(2));
   }
 
-  const bytes = size;
-
-  if (bytes == 0) return `${"0" + " " + t("Common:Bytes")}`;
-
-  const i = Math.floor(Math.log(bytes) / Math.log(1024));
-
-  return (
-    parseFloat((bytes / Math.pow(1024, i)).toFixed(2)) + " " + sizeNames[i]
-  );
+  return resultSize + " " + sizeNames[power];
 };
 
 export const getBgPattern = (colorSchemeId: number | undefined) => {
diff --git a/packages/components/badge/styled-badge.js b/packages/components/badge/styled-badge.js
index dfa207bf49..8b721b7a76 100644
--- a/packages/components/badge/styled-badge.js
+++ b/packages/components/badge/styled-badge.js
@@ -20,7 +20,7 @@ const StyledBadge = styled.div`
   line-height: ${(props) => props.theme.badge.lineHeight};
   cursor: pointer;
   overflow: ${(props) => props.theme.badge.overflow};
-
+  flex-shrink: 0;
   &:hover {
     ${(props) => !props.noHover && hoveredCss};
   }
diff --git a/packages/components/combobox/index.js b/packages/components/combobox/index.js
index 2639c179df..5cd20b6e48 100644
--- a/packages/components/combobox/index.js
+++ b/packages/components/combobox/index.js
@@ -51,7 +51,8 @@ class ComboBox extends React.Component {
       isDisabled ||
       disableItemClick ||
       isLoading ||
-      (disableIconClick && e && e.target.closest(".optionalBlock"))
+      (disableIconClick && e && e.target.closest(".optionalBlock")) ||
+      e?.target.classList.contains("nav-thumb-vertical")
     )
       return;
 
@@ -233,6 +234,7 @@ class ComboBox extends React.Component {
                     displaySelectedOption &&
                     option.label === selectedOption.label;
 
+                  const isSelected = option.label === selectedOption.label;
                   return (
                     <DropDownItem
                       {...option}
@@ -243,6 +245,7 @@ class ComboBox extends React.Component {
                       fillIcon={fillIcon}
                       isModern={noBorder}
                       isActive={isActive}
+                      isSelected={isSelected}
                     />
                   );
                 })}
diff --git a/packages/components/drop-down-item/index.js b/packages/components/drop-down-item/index.js
index 40dddf6af8..ce1ba3fc27 100644
--- a/packages/components/drop-down-item/index.js
+++ b/packages/components/drop-down-item/index.js
@@ -24,6 +24,8 @@ const DropDownItem = (props) => {
     withoutIcon,
     noHover,
     height,
+    isSelected,
+    isActiveDescendant,
   } = props;
 
   const onClickAction = (e) => {
@@ -38,6 +40,8 @@ const DropDownItem = (props) => {
       onClick={onClickAction}
       disabled={disabled}
       isActive={isActive}
+      isSelected={isSelected}
+      isActiveDescendant={isActiveDescendant}
     >
       {icon && (
         <IconWrapper className="drop-down-icon">
@@ -102,6 +106,8 @@ DropDownItem.propTypes = {
   isActive: PropTypes.bool,
   withoutIcon: PropTypes.bool,
   isModern: PropTypes.bool,
+  isActiveDescendant: PropTypes.bool,
+  isSelected: PropTypes.bool,
 };
 
 DropDownItem.defaultProps = {
diff --git a/packages/components/drop-down-item/styled-drop-down-item.js b/packages/components/drop-down-item/styled-drop-down-item.js
index 3eded36c9e..6d2ac4424e 100644
--- a/packages/components/drop-down-item/styled-drop-down-item.js
+++ b/packages/components/drop-down-item/styled-drop-down-item.js
@@ -84,11 +84,13 @@ const StyledDropdownItem = styled.div`
   ${itemTruncate}
 
   &:hover {
-    background-color: ${(props) =>
-      props.noHover
-        ? props.theme.dropDownItem.backgroundColor
-        : props.theme.dropDownItem.hoverBackgroundColor};
-    text-align: left;
+    ${(props) =>
+      !props.noHover &&
+      css`
+        background-color: ${(props) =>
+          props.theme.dropDownItem.hoverBackgroundColor};
+        text-align: left;
+      `}
   }
 
   ${(props) =>
@@ -121,7 +123,23 @@ const StyledDropdownItem = styled.div`
     padding: ${(props) => props.theme.dropDownItem.tabletPadding};
   }
 
-  ${(props) => props.disabled && disabledAndHeaderStyle}
+  ${(props) =>
+    props.isActiveDescendant &&
+    !props.disabled &&
+    css`
+      background-color: ${(props) =>
+        props.theme.dropDownItem.hoverBackgroundColor};
+      text-align: left;
+    `}
+
+  ${(props) => props.disabled && !props.isSelected && disabledAndHeaderStyle}
+
+  ${(props) =>
+    ((props.disabled && props.isSelected) || props.isActive) &&
+    css`
+      background-color: ${(props) =>
+        props.theme.dropDownItem.selectedBackgroundColor};
+    `}
 
   .submenu-arrow {
     margin-left: auto;
@@ -133,13 +151,6 @@ const StyledDropdownItem = styled.div`
       `}
   }
 
-  ${(props) =>
-    props.isActive &&
-    css`
-      background-color: ${(props) =>
-        props.theme.dropDownItem.hoverBackgroundColor} !important;
-    `}
-
   @media (max-width: 500px) {
     max-width: 100vw;
   }
diff --git a/packages/components/drop-down/VirtualList.tsx b/packages/components/drop-down/VirtualList.tsx
new file mode 100644
index 0000000000..bbacc38ac8
--- /dev/null
+++ b/packages/components/drop-down/VirtualList.tsx
@@ -0,0 +1,142 @@
+import React, {
+  NamedExoticComponent,
+  ReactElement,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { VariableSizeList } from "react-window";
+import Scrollbar from "@docspace/components/scrollbar";
+import CustomScrollbarsVirtualList from "../scrollbar/custom-scrollbars-virtual-list";
+
+type VirtualListProps = {
+  width: number;
+  theme: unknown;
+  isOpen: boolean;
+  itemCount: number;
+  maxHeight: number;
+  calculatedHeight: number;
+  isNoFixedHeightOptions: boolean;
+  cleanChildren: ReactElement[];
+  children: ReactElement[];
+  Row: NamedExoticComponent<object>;
+
+  getItemSize: (index: number) => number;
+};
+
+function VirtualList({
+  Row,
+  width,
+  theme,
+  isOpen,
+  children,
+  itemCount,
+  maxHeight,
+  cleanChildren,
+  calculatedHeight,
+  isNoFixedHeightOptions,
+  getItemSize,
+}: VirtualListProps) {
+  const ref = useRef<VariableSizeList>(null);
+
+  const activeIndex = useMemo(() => {
+    let foundIndex = -1;
+    React.Children.forEach(cleanChildren, (child, index) => {
+      if (child.props.disabled) foundIndex = index;
+    });
+    return foundIndex;
+  }, [cleanChildren]);
+
+  const [currentIndex, setCurrentIndex] = useState(activeIndex);
+  const currentIndexRef = useRef<number>(activeIndex);
+
+  useEffect(() => {
+    if (isOpen && maxHeight) {
+      window.addEventListener("keydown", onKeyDown);
+    }
+
+    return () => {
+      window.removeEventListener("keydown", onKeyDown);
+
+      if (itemCount > 0 && ref.current) {
+        setCurrentIndex(activeIndex);
+        currentIndexRef.current = activeIndex;
+
+        ref.current.scrollToItem(activeIndex, "smart");
+      }
+    };
+  }, [isOpen, activeIndex, maxHeight]);
+
+  const onKeyDown = useCallback(
+    (event: KeyboardEvent) => {
+      if (!ref.current || !isOpen) return;
+
+      event.preventDefault();
+
+      let index = currentIndexRef.current;
+
+      switch (event.code) {
+        case "ArrowDown":
+          index++;
+          break;
+        case "ArrowUp":
+          index--;
+          break;
+        case "Enter":
+          children[index]?.props?.onClick();
+          break;
+        default:
+          return;
+      }
+
+      if (index < 0 || index >= React.Children.count(children)) return;
+
+      setCurrentIndex(index);
+      currentIndexRef.current = index;
+      ref.current.scrollToItem(index, "smart");
+    },
+    [isOpen]
+  );
+
+  const handleMouseMove = useCallback((index: number) => {
+    if (currentIndexRef.current === index) return;
+
+    setCurrentIndex(index);
+    currentIndexRef.current = index;
+  }, []);
+
+  if (!maxHeight) return cleanChildren ? cleanChildren : children;
+
+  return (
+    <>
+      {isNoFixedHeightOptions ? (
+        //@ts-ignore
+        <Scrollbar style={{ height: maxHeight }} stype="mediumBlack">
+          {cleanChildren}
+        </Scrollbar>
+      ) : (
+        <VariableSizeList
+          ref={ref}
+          width={width}
+          itemCount={itemCount}
+          itemSize={getItemSize}
+          height={calculatedHeight}
+          itemData={{
+            children: cleanChildren,
+            theme: theme,
+            activeIndex,
+            activedescendant: currentIndex,
+            handleMouseMove,
+          }}
+          outerElementType={CustomScrollbarsVirtualList}
+        >
+          {Row}
+        </VariableSizeList>
+      )}
+    </>
+  );
+}
+
+export default VirtualList;
diff --git a/packages/components/drop-down/index.js b/packages/components/drop-down/index.js
index 89451a7e44..af7b2c96bd 100644
--- a/packages/components/drop-down/index.js
+++ b/packages/components/drop-down/index.js
@@ -1,21 +1,21 @@
 import React, { memo } from "react";
 import PropTypes from "prop-types";
-import { VariableSizeList } from "react-window";
+
 import onClickOutside from "react-onclickoutside";
 import { isMobile } from "react-device-detect";
 import Portal from "../portal";
 import DomHelpers from "../utils/domHelpers";
 
-import CustomScrollbarsVirtualList from "../scrollbar/custom-scrollbars-virtual-list";
 import DropDownItem from "../drop-down-item";
 import Backdrop from "../backdrop";
 import StyledDropdown from "./styled-drop-down";
-import Scrollbar from "@docspace/components/scrollbar";
-
+import VirtualList from "./VirtualList";
 /* eslint-disable react/prop-types, react/display-name */
 
 const Row = memo(({ data, index, style }) => {
-  const option = data.children[index];
+  const { children, theme, activedescendant, handleMouseMove } = data;
+
+  const option = children[index];
 
   const separator = option?.props?.isSeparator
     ? { width: `calc(100% - 32px)`, height: `1px` }
@@ -24,10 +24,15 @@ const Row = memo(({ data, index, style }) => {
 
   return (
     <DropDownItem
-      theme={data.theme}
+      theme={theme}
       // eslint-disable-next-line react/prop-types
       {...option?.props}
+      noHover
       style={newStyle}
+      onMouseMove={() => {
+        handleMouseMove(index);
+      }}
+      isActiveDescendant={activedescendant === index}
     />
   );
 });
@@ -250,6 +255,7 @@ class DropDown extends React.PureComponent {
       theme,
       isMobileView,
       isNoFixedHeightOptions,
+      open,
     } = this.props;
     const { directionX, directionY, width, manualY } = this.state;
 
@@ -282,30 +288,22 @@ class DropDown extends React.PureComponent {
         isExternalLink={this.props.isExternalLink}
         isPersonal={this.props.isPersonal}
         isMobileView={isMobileView}
+        itemCount={itemCount}
         {...dropDownMaxHeightProp}
       >
-        {maxHeight ? (
-          isNoFixedHeightOptions ? (
-            <Scrollbar style={{ height: maxHeight }} stype="mediumBlack">
-              {cleanChildren}
-            </Scrollbar>
-          ) : (
-            <VariableSizeList
-              height={calculatedHeight}
-              width={width}
-              itemSize={getItemSize}
-              itemCount={itemCount}
-              itemData={{ children: cleanChildren, theme: theme }}
-              outerElementType={CustomScrollbarsVirtualList}
-            >
-              {Row}
-            </VariableSizeList>
-          )
-        ) : cleanChildren ? (
-          cleanChildren
-        ) : (
-          children
-        )}
+        <VirtualList
+          Row={Row}
+          theme={theme}
+          width={width}
+          itemCount={itemCount}
+          maxHeight={maxHeight}
+          cleanChildren={cleanChildren}
+          calculatedHeight={calculatedHeight}
+          isNoFixedHeightOptions={isNoFixedHeightOptions}
+          getItemSize={getItemSize}
+          children={children}
+          isOpen={open}
+        />
       </StyledDropdown>
     );
   }
diff --git a/packages/components/drop-down/styled-drop-down.js b/packages/components/drop-down/styled-drop-down.js
index 996b28635b..30b65c3d53 100644
--- a/packages/components/drop-down/styled-drop-down.js
+++ b/packages/components/drop-down/styled-drop-down.js
@@ -58,11 +58,7 @@ const StyledDropdown = styled.div`
   box-shadow: ${(props) => props.theme.dropDown.boxShadow};
   -moz-box-shadow: ${(props) => props.theme.dropDown.boxShadow};
   -webkit-box-shadow: ${(props) => props.theme.dropDown.boxShadow};
-  padding: ${(props) =>
-    !props.maxHeight &&
-    props.children &&
-    props.children.length > 1 &&
-    `4px 0px`};
+  padding: ${(props) => !props.maxHeight && props.itemCount > 1 && `4px 0px`};
   ${(props) =>
     props.columnCount &&
     `
diff --git a/packages/components/scrollbar/custom-scrollbars-virtual-list.js b/packages/components/scrollbar/custom-scrollbars-virtual-list.js
index 84ca8da6e4..c1be308177 100644
--- a/packages/components/scrollbar/custom-scrollbars-virtual-list.js
+++ b/packages/components/scrollbar/custom-scrollbars-virtual-list.js
@@ -4,10 +4,14 @@ import Scrollbar from "../scrollbar";
 
 export class CustomScrollbars extends React.Component {
   refSetter = (scrollbarsRef, forwardedRef) => {
-    if (scrollbarsRef) {
-      forwardedRef(scrollbarsRef.view);
+    const isFuntion = typeof forwardedRef === "function";
+
+    const ref = scrollbarsRef?.view ?? null;
+
+    if (isFuntion) {
+      forwardedRef(ref);
     } else {
-      forwardedRef(null);
+      forwardedRef = ref;
     }
   };
 
@@ -23,9 +27,7 @@ export class CustomScrollbars extends React.Component {
     //console.log("CustomScrollbars", this.props);
     return (
       <Scrollbar
-        ref={(scrollbarsRef) =>
-          this.refSetter.bind(this, scrollbarsRef, forwardedRef)
-        }
+        ref={(scrollbarsRef) => this.refSetter(scrollbarsRef, forwardedRef)}
         style={{ ...style, overflow: "hidden" }}
         onScroll={onScroll}
         stype={stype}
diff --git a/packages/components/themes/base.js b/packages/components/themes/base.js
index 8e6ed6c988..9d8755a3f9 100644
--- a/packages/components/themes/base.js
+++ b/packages/components/themes/base.js
@@ -1394,6 +1394,7 @@ const Base = {
     backgroundColor: white,
     hoverBackgroundColor: grayLight,
     hoverDisabledBackgroundColor: white,
+    selectedBackgroundColor: lightHover,
     fontWeight: "600",
     fontSize: "13px",
     width: "100%",
diff --git a/packages/components/themes/dark.js b/packages/components/themes/dark.js
index bb4a197afc..79475e1898 100644
--- a/packages/components/themes/dark.js
+++ b/packages/components/themes/dark.js
@@ -1384,6 +1384,7 @@ const Dark = {
     backgroundColor: black,
     hoverBackgroundColor: "#3D3D3D",
     hoverDisabledBackgroundColor: black,
+    selectedBackgroundColor: "#282828",
     fontWeight: "600",
     fontSize: "13px",
     width: "100%",
diff --git a/products/ASC.Files/Core/Core/ThumbnailSettings.cs b/products/ASC.Files/Core/Core/ThumbnailSettings.cs
index db0c44ddab..2b2008fa8f 100644
--- a/products/ASC.Files/Core/Core/ThumbnailSettings.cs
+++ b/products/ASC.Files/Core/Core/ThumbnailSettings.cs
@@ -115,13 +115,21 @@ public class ThumbnailSettings
         set => _maxDegreeOfParallelism = value;
     }
 
-    private long? _availableFileSize;
-    public long? AvailableFileSize
+    private long? _maxImageFileSize;
+    public long? MaxImageFileSize
     {
-        get => _availableFileSize ?? 100L * 1024L * 1024L;
-        set => _availableFileSize = value;
+        get => _maxImageFileSize ?? 30L * 1024L * 1024L;
+        set => _maxImageFileSize = value;
     }
 
+    private long? _maxVideoFileSize;
+    public long? MaxVideoFileSize
+    {
+        get => _maxVideoFileSize ?? 1000L * 1024L * 1024L;
+        set => _maxVideoFileSize = value;
+    }
+
+
     private int? _attemptsLimit;
     public int? AttemptsLimit
     {
diff --git a/products/ASC.Files/Service/Thumbnail/Builder.cs b/products/ASC.Files/Service/Thumbnail/Builder.cs
index e64ad6562c..c4228bd689 100644
--- a/products/ASC.Files/Service/Thumbnail/Builder.cs
+++ b/products/ASC.Files/Service/Thumbnail/Builder.cs
@@ -132,9 +132,7 @@ public class Builder<T>
                 return;
             }
 
-            var ext = FileUtility.GetFileExtension(file.Title);
-
-            if (!CanCreateThumbnail(ext) || file.Encrypted || file.RootFolderType == FolderType.TRASH || file.ContentLength > _config.AvailableFileSize)
+            if (!CanCreateThumbnail(file))
             {
                 file.ThumbnailStatus = Core.Thumbnail.NotRequired;
 
@@ -145,21 +143,19 @@ public class Builder<T>
 
             await fileDao.SetThumbnailStatusAsync(file, Core.Thumbnail.Creating);
 
+            var ext = FileUtility.GetFileExtension(file.Title);
+
             if (IsVideo(ext))
             {
                 await MakeThumbnailFromVideo(fileDao, file);
             }
+            else if (IsImage(ext))
+            {
+                await MakeThumbnailFromImage(fileDao, file);
+            }
             else
             {
-
-                if (IsImage(ext))
-                {
-                    await MakeThumbnailFromImage(fileDao, file);
-                }
-                else
-                {
-                    await MakeThumbnailFromDocs(fileDao, file);
-                }
+                await MakeThumbnailFromDocs(fileDao, file);
             }
 
             await fileDao.SetThumbnailStatusAsync(file, Core.Thumbnail.Created);
@@ -341,6 +337,17 @@ public class Builder<T>
         _logger.DebugMakeThumbnail4(file.Id.ToString());
     }
 
+    public bool CanCreateThumbnail(File<T> file)
+    {
+        var ext = FileUtility.GetFileExtension(file.Title);
+
+        if (!CanCreateThumbnail(ext) || file.Encrypted || file.RootFolderType == FolderType.TRASH) return false;
+        if (IsVideo(ext) && file.ContentLength > _config.MaxVideoFileSize) return false;
+        if (IsImage(ext) && file.ContentLength > _config.MaxImageFileSize) return false;
+
+        return true;
+    }
+
     private bool CanCreateThumbnail(string extention)
     {
         return _config.FormatsArray.Contains(extention) || IsVideo(extention) || IsImage(extention);