diff --git a/build/install/OneClickInstall/install-Debian/install-preq.sh b/build/install/OneClickInstall/install-Debian/install-preq.sh
index ca18596d0a..94c171c505 100644
--- a/build/install/OneClickInstall/install-Debian/install-preq.sh
+++ b/build/install/OneClickInstall/install-Debian/install-preq.sh
@@ -42,7 +42,7 @@ curl https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
 echo "deb https://artifacts.elastic.co/packages/${ELASTIC_DIST}.x/apt stable main" | tee /etc/apt/sources.list.d/elastic-${ELASTIC_DIST}.x.list
 
 # add nodejs repo
-curl -sL https://deb.nodesource.com/setup_12.x | bash - 
+curl -sL https://deb.nodesource.com/setup_14.x | bash - 
 
 #add yarn repo
 curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
@@ -56,16 +56,16 @@ rm packages-microsoft-prod.deb
 #install kafka
 PRODUCT_DIR="/var/www/${product}"
 if [ "$(ls "$PRODUCT_DIR/services/kafka" 2> /dev/null)" == "" ]; then
-	mkdir -p ${PRODUCT_DIR}/services/
-	if ! cat /etc/passwd | grep -q "kafka"; then
-		adduser --quiet --home ${PRODUCT_DIR}/services/kafka --system kafka
+	mkdir -p ${PRODUCT_DIR}/services/kafka/
+	if ! cat /etc/passwd | grep -q "onlyoffice"; then
+		adduser --quiet --home ${PRODUCT_DIR} --system --group onlyoffice
 	fi
 	cd ${PRODUCT_DIR}/services/kafka
 	KAFKA_VERSION=$(curl https://downloads.apache.org/kafka/ | grep -Eo '3.1.[0-9]' | tail -1)
 	KAFKA_ARCHIVE=$(curl https://downloads.apache.org/kafka/$KAFKA_VERSION/ | grep -Eo "kafka_2.[0-9][0-9]-$KAFKA_VERSION.tgz" | tail -1)
 	curl https://downloads.apache.org/kafka/$KAFKA_VERSION/$KAFKA_ARCHIVE -O
 	tar xzf $KAFKA_ARCHIVE --strip 1 && rm -rf $KAFKA_ARCHIVE
-	chown -R kafka ${PRODUCT_DIR}/services/kafka/
+	chown -R onlyoffice ${PRODUCT_DIR}/services/kafka/
 	cd -
 fi
 
@@ -76,14 +76,13 @@ Requires=network.target remote-fs.target
 After=network.target remote-fs.target
 [Service]
 Type=simple
-User=kafka
+User=onlyoffice
 ExecStart=/bin/sh -c '${PRODUCT_DIR}/services/kafka/bin/zookeeper-server-start.sh ${PRODUCT_DIR}/services/kafka/config/zookeeper.properties > ${PRODUCT_DIR}/services/kafka/zookeeper.log 2>&1'
 ExecStop=${PRODUCT_DIR}/services/kafka/bin/zookeeper-server-stop.sh
 Restart=on-abnormal
 [Install]
 WantedBy=multi-user.target
 END
-systemctl start zookeeper
 fi
 
 if [ ! -e /lib/systemd/system/kafka.service ]; then
@@ -93,14 +92,13 @@ Requires=zookeeper.service
 After=zookeeper.service
 [Service]
 Type=simple
-User=kafka
+User=onlyoffice
 ExecStart=/bin/sh -c '${PRODUCT_DIR}/services/kafka/bin/kafka-server-start.sh ${PRODUCT_DIR}/services/kafka/config/server.properties > ${PRODUCT_DIR}/services/kafka/kafka.log 2>&1'
 ExecStop=${PRODUCT_DIR}/services/kafka/bin/kafka-server-stop.sh
 Restart=on-abnormal
 [Install]
 WantedBy=multi-user.target
 END
-systemctl start kafka
 fi
 
 if ! dpkg -l | grep -q "mysql-server"; then
@@ -154,7 +152,7 @@ apt-get install -o DPkg::options::="--force-confnew" -yq \
 				g++ \
 				make \
 				yarn \
-				dotnet-sdk-5.0 \
+				dotnet-sdk-6.0 \
 				mysql-server \
 				mysql-client \
 				postgresql \
diff --git a/build/install/OneClickInstall/install-Docker.sh b/build/install/OneClickInstall/install-Docker.sh
index a27af48856..fd6ac695f9 100644
--- a/build/install/OneClickInstall/install-Docker.sh
+++ b/build/install/OneClickInstall/install-Docker.sh
@@ -63,6 +63,7 @@ MYSQL_USER=""
 MYSQL_PASSWORD=""
 MYSQL_ROOT_PASSWORD=""
 MYSQL_HOST=""
+DATABASE_MIGRATION="true"
 
 ZOO_PORT=""
 ZOO_HOST=""
@@ -290,6 +291,13 @@ while [ "$1" != "" ]; do
 				shift
 			fi
 		;;
+		
+		-dbm | --databasemigration )
+			if [ "$2" != "" ]; then
+				DATABASE_MIGRATION=$2
+				shift
+			fi
+		;;
 
 		-? | -h | --help )
 			echo "  Usage: bash $HELP_TARGET [PARAMETER] [[PARAMETER], ...]"
@@ -320,6 +328,7 @@ while [ "$1" != "" ]; do
 			echo "      -ep, --externalport               external appserver port (default value 8092)"
 			echo "      -mk, --machinekey                 setting for core.machinekey"
 			echo "      -ls, --local_scripts              run the installation from local scripts"
+			echo "      -dbm, --databasemigration         database migration (true|false)"
 			echo "      -?, -h, --help                    this help"
 			echo
 			echo "    Install all the components without document server:"
@@ -538,6 +547,7 @@ install_docker_compose () {
 		rm get-pip.py
 	fi	
 
+	python3 -m pip install --upgrade pip
 	python3 -m pip install docker-compose
 	sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
 
@@ -790,7 +800,6 @@ download_files () {
 	fi
 
 	svn export --force https://github.com/ONLYOFFICE/${PRODUCT}/branches/${GIT_BRANCH}/build/install/docker/ ${BASE_DIR}
-	svn export --force https://github.com/ONLYOFFICE/CommunityServer/branches/master/build/sql/ ${BASE_DIR}/config/ #Download SQL scripts
 
 	reconfigure STATUS ${STATUS}
 }
@@ -822,6 +831,7 @@ install_mysql_server () {
 	reconfigure MYSQL_PASSWORD ${MYSQL_PASSWORD}
 	reconfigure MYSQL_ROOT_PASSWORD ${MYSQL_ROOT_PASSWORD}
 	reconfigure MYSQL_HOST ${MYSQL_HOST}
+	reconfigure DATABASE_MIGRATION ${DATABASE_MIGRATION}
 
 	docker-compose -f $BASE_DIR/db.yml up -d
 }
diff --git a/build/install/OneClickInstall/install-RedHat/install-app.sh b/build/install/OneClickInstall/install-RedHat/install-app.sh
index 08a73fb2a6..8e98f97d18 100644
--- a/build/install/OneClickInstall/install-RedHat/install-app.sh
+++ b/build/install/OneClickInstall/install-RedHat/install-app.sh
@@ -140,13 +140,14 @@ if rpm -q "firewalld"; then
 fi
 
 { ${package_manager} check-update ${package_sysname}-${product}; APPSERVER_CHECK_UPDATE=$?; } || true
-if [[ $APPSERVER_CHECK_UPDATE -eq $UPDATE_AVAILABLE_CODE ]]; then
-	APPSERVER_NEED_UPDATE="true"
-fi
-
 if [ "$APPSERVER_INSTALLED" = "false" ]; then
-	${package_manager} install -y ${package_sysname}-${product} 
-elif [ "$APPSERVER_NEED_UPDATE" = "true" ]; then
+	${package_manager} install -y ${package_sysname}-${product}
+	${product}-configuration.sh \
+		-mysqlh ${MYSQL_SERVER_HOST} \
+		-mysqld ${MYSQL_SERVER_DB_NAME} \
+		-mysqlu ${MYSQL_SERVER_USER} \
+		-mysqlp ${MYSQL_ROOT_PASS}
+elif [[ $APPSERVER_CHECK_UPDATE -eq $UPDATE_AVAILABLE_CODE ]]; then
 	ENVIRONMENT="$(cat /lib/systemd/system/${product}-api.service | grep -oP 'ENVIRONMENT=\K.*')"
 	USER_CONNECTIONSTRING=$(json -f /etc/onlyoffice/${product}/appsettings.$ENVIRONMENT.json ConnectionStrings.default.connectionString)
 	MYSQL_SERVER_HOST=$(echo $USER_CONNECTIONSTRING | grep -oP 'Server=\K.*' | grep -o '^[^;]*')
@@ -156,34 +157,12 @@ elif [ "$APPSERVER_NEED_UPDATE" = "true" ]; then
 	MYSQL_ROOT_PASS=$(echo $USER_CONNECTIONSTRING | grep -oP 'Password=\K.*' | grep -o '^[^;]*')
 
 	${package_manager} -y update ${package_sysname}-${product}
-fi
-
-if [ "${APPSERVER_INSTALLED}" = "false" ] || [ "$APPSERVER_NEED_UPDATE" = "true" ]; then
-expect << EOF
-	set timeout -1
-	log_user 1
-
-	if { "${UPDATE}" == "true" } {
-		spawn ${product}-configuration.sh -e ${ENVIRONMENT}
-	} else {
-		spawn ${product}-configuration.sh
-	}
-
-	expect -re "Database host:"
-	send "\025$MYSQL_SERVER_HOST\r"
-
-	expect -re "Database name:"
-	send "\025$MYSQL_SERVER_DB_NAME\r"
-
-	expect -re "Database user:"
-	send "\025$MYSQL_SERVER_USER\r"
-
-	expect -re "Database password:"
-	send "\025$MYSQL_ROOT_PASS\r"
-
-	expect eof	
-EOF
-	APPSERVER_INSTALLED="true";
+	${product}-configuration.sh \
+		-e ${ENVIRONMENT} \
+		-mysqlh ${MYSQL_SERVER_HOST} \
+		-mysqld ${MYSQL_SERVER_DB_NAME} \
+		-mysqlu ${MYSQL_SERVER_USER} \
+		-mysqlp ${MYSQL_ROOT_PASS}
 fi
 
 echo ""
diff --git a/build/install/OneClickInstall/install-RedHat/install-preq.sh b/build/install/OneClickInstall/install-RedHat/install-preq.sh
index 7267fb1633..e6db97e879 100644
--- a/build/install/OneClickInstall/install-RedHat/install-preq.sh
+++ b/build/install/OneClickInstall/install-RedHat/install-preq.sh
@@ -62,7 +62,7 @@ rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-$REV.noarch.r
 rpm -ivh https://rpms.remirepo.net/enterprise/remi-release-$REV.rpm || true
 
 #add nodejs repo
-curl -sL https://rpm.nodesource.com/setup_12.x | bash - || true
+curl -sL https://rpm.nodesource.com/setup_14.x | bash - || true
 
 #add yarn
 curl -sL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo || true
@@ -183,7 +183,7 @@ ${package_manager} -y install epel-release \
 			gcc-c++ \
 			make \
 			yarn \
-			dotnet-sdk-5.0 \
+			dotnet-sdk-6.0 \
 			elasticsearch-${ELASTIC_VERSION} --enablerepo=elasticsearch \
 			mysql-server \
 			nginx \
@@ -207,4 +207,4 @@ if [ ! -e /usr/bin/json ]; then
 fi
 
 systemctl daemon-reload
-package_services="rabbitmq-server postgresql redis supervisord nginx kafka mysqld"
+package_services="rabbitmq-server postgresql redis supervisord nginx mysqld"
diff --git a/build/install/common/appserver-configuration.sh b/build/install/common/appserver-configuration.sh
index 4cdf8c1b98..4d3540a4cd 100644
--- a/build/install/common/appserver-configuration.sh
+++ b/build/install/common/appserver-configuration.sh
@@ -92,7 +92,7 @@ while [ "$1" != "" ]; do
 
 		-zkp | --zookeeperport )
 			if [ "$2" != "" ]; then
-				ZOOKEEPER_HOST=$2
+				ZOOKEEPER_PORT=$2
 				shift
 			fi
 		;;
@@ -208,30 +208,26 @@ install_json() {
 		chown onlyoffice:onlyoffice $USER_CONF
 	
 		set_core_machinekey
-		$JSON_USERCONF "this.core={'base-domain': \"$APP_HOST\", 'machinekey': \"$CORE_MACHINEKEY\" }" \
+		$JSON_USERCONF "this.core={'base-domain': \"$APP_HOST\", 'machinekey': \"$CORE_MACHINEKEY\", \
+		'products': { 'folder': '/var/www/appserver/products', 'subfolder': 'server'} }" \
 		-e "this.urlshortener={ 'path': '../ASC.UrlShortener/index.js' }" -e "this.thumb={ 'path': '../ASC.Thumbnails/' }" \
 		-e "this.socket={ 'path': '../ASC.Socket.IO/' }" -e "this.ssoauth={ 'path': '../ASC.SsoAuth/' }" >/dev/null 2>&1
-		$JSON $APP_DIR/appsettings.json -e "this.core.products.subfolder='server'" >/dev/null 2>&1
-		$JSON $APP_DIR/appsettings.services.json -e "this.core={ 'products': { 'folder': '../../products', 'subfolder': 'server'} }" >/dev/null 2>&1
-		
 	fi
 }
 
 restart_services() {
 	echo -n "Restarting services... "
 
-	sed -i "s/Type=.*/Type=simple/" $SYSTEMD_DIR/${PRODUCT}-calendar.service >/dev/null 2>&1 #Fix non-start of service
 	sed -i "s/ENVIRONMENT=.*/ENVIRONMENT=$ENVIRONMENT/" $SYSTEMD_DIR/${PRODUCT}*.service >/dev/null 2>&1
 	systemctl daemon-reload
 
 	for SVC in nginx ${MYSQL_PACKAGE} ${PRODUCT}-api ${PRODUCT}-api-system ${PRODUCT}-urlshortener ${PRODUCT}-thumbnails \
 	${PRODUCT}-socket ${PRODUCT}-studio-notify ${PRODUCT}-notify ${PRODUCT}-people-server ${PRODUCT}-files \
 	${PRODUCT}-files-services ${PRODUCT}-studio ${PRODUCT}-backup ${PRODUCT}-storage-encryption \
-	${PRODUCT}-storage-migration ${PRODUCT}-projects-server ${PRODUCT}-telegram-service ${PRODUCT}-crm \
-	${PRODUCT}-calendar ${PRODUCT}-mail elasticsearch kafka zookeeper
+	${PRODUCT}-storage-migration ${PRODUCT}-telegram-service elasticsearch $KAFKA_SERVICE $ZOOKEEPER_SERVICE
 	do
-		systemctl enable $SVC.service >/dev/null 2>&1
-		systemctl restart $SVC.service
+		systemctl enable $SVC >/dev/null 2>&1
+		systemctl restart $SVC
 	done
 	echo "OK"
 }
@@ -242,10 +238,27 @@ input_db_params(){
     local def_DB_NAME=$(echo $user_connectionString | grep -oP 'Database=\K.*' | grep -o '^[^;]*')
     local def_DB_USER=$(echo $user_connectionString | grep -oP 'User ID=\K.*' | grep -o '^[^;]*')
 
-	if [ -z $def_DB_HOST ] && [ -z $DB_HOST ]; then read -e -p "Database host: " -i "$DB_HOST" DB_HOST; fi
-	if [ -z $def_DB_NAME ] && [ -z $DB_NAME ]; then read -e -p "Database name: " -i "$DB_NAME" DB_NAME; fi
-	if [ -z $def_DB_USER ] && [ -z $DB_USER ]; then read -e -p "Database user: " -i "$DB_USER" DB_USER; fi
-	if [ -z $DB_PWD ]; then read -e -p "Database password: " -i "$DB_PWD" DB_PWD; fi
+	if [ -z $def_DB_HOST ] && [ -z $DB_HOST ]; then 
+		read -e -p "Database host: " -i "$DB_HOST" DB_HOST;
+	else
+		DB_HOST=${DB_HOST:-$def_DB_HOST}
+	fi
+
+	if [ -z $def_DB_NAME ] && [ -z $DB_NAME ]; then 
+		read -e -p "Database name: " -i "$DB_NAME" DB_NAME; 
+	else
+		DB_NAME=${DB_NAME:-$def_DB_NAME}
+	fi
+
+	if [ -z $def_DB_USER ] && [ -z $DB_USER ]; then 
+		read -e -p "Database user: " -i "$DB_USER" DB_USER; 
+	else
+		DB_USER=${DB_USER:-$def_DB_USER}
+	fi
+
+	if [ -z $DB_PWD ]; then 
+		read -e -p "Database password: " -i "$DB_PWD" -s DB_PWD; 
+	fi
 }
 
 establish_mysql_conn(){
@@ -267,8 +280,16 @@ establish_mysql_conn(){
 
     #Save db settings in .json
 	$JSON_USERCONF "this.ConnectionStrings={'default': {'connectionString': \
-	\"Server=$DB_HOST;Port=$DB_PORT;Database=$DB_NAME;User ID=$DB_USER;Password=$DB_PWD;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none\"}}" >/dev/null 2>&1
+	\"Server=$DB_HOST;Port=$DB_PORT;Database=$DB_NAME;User ID=$DB_USER;Password=$DB_PWD;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;AllowPublicKeyRetrieval=true;Connection Timeout=30;Maximum Pool Size=300\"}}" >/dev/null 2>&1
 
+	change_mysql_config
+
+	#Enable database migration
+	$JSON_USERCONF "this.migration={'enabled': \"true\"}" >/dev/null 2>&1
+
+	#Fixing appserver-backup startup error \ Adding backup_backup and backup_schedule tables
+	$MYSQL -D "$DB_NAME" -e 'CREATE TABLE IF NOT EXISTS `backup_backup` ( `id` char(38) NOT NULL, `tenant_id` int(11) NOT NULL, `is_scheduled` int(1) NOT NULL, `name` varchar(255) NOT NULL, `storage_type` int(11) NOT NULL, `storage_base_path` varchar(255) DEFAULT NULL, `storage_path` varchar(255) NOT NULL, `created_on` datetime NOT NULL, `expires_on` datetime NOT NULL DEFAULT "0001-01-01 00:00:00", `storage_params` TEXT NULL, `hash` char(64) NOT NULL, PRIMARY KEY (`id`), KEY `tenant_id` (`tenant_id`), KEY `expires_on` (`expires_on`), KEY `is_scheduled` (`is_scheduled`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;' >/dev/null 2>&1
+	$MYSQL -D "$DB_NAME" -e 'CREATE TABLE IF NOT EXISTS `backup_schedule` ( `tenant_id` int(11) NOT NULL, `backup_mail` int(11) NOT NULL DEFAULT "0", `cron` varchar(255) NOT NULL, `backups_stored` int(11) NOT NULL, `storage_type` int(11) NOT NULL, `storage_base_path` varchar(255) DEFAULT NULL, `last_backup_time` datetime NOT NULL, `storage_params` TEXT NULL, PRIMARY KEY (`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;' >/dev/null 2>&1
 	echo "OK"
 }
 
@@ -376,47 +397,6 @@ change_mysql_config(){
 	systemctl restart ${MYSQL_PACKAGE} >/dev/null 2>&1
 }
 
-execute_mysql_script(){
-
-	change_mysql_config
-
-    while ! $MYSQL -e ";" >/dev/null 2>&1; do
-    	sleep 1
-	done
-    
-    if [ "$DB_USER" = "root" ] && [ ! "$(mysql -V | grep ' 5.5.')" ]; then
-	   # allow connect via mysql_native_password with root and empty password
-	   $MYSQL -D "mysql" -e "update user set plugin='mysql_native_password' where user='root';ALTER USER '${DB_USER}'@'localhost' IDENTIFIED WITH mysql_native_password BY '${DB_PWD}';" >/dev/null 2>&1
-	fi
-
-	#Checking the quantity of the tables created in the db
-    DB_TABLES_COUNT=$($MYSQL --silent --skip-column-names -e "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema='${DB_NAME}'"); 
-    
-	local SQL_DIR="/var/www/${PRODUCT}/sql"
-    if [ "${DB_TABLES_COUNT}" -eq "0" ]; then
-
-		echo -n "Installing MYSQL database... "
-
-		#Adding data to the db
-		sed -i -e '1 s/^/SET SQL_MODE='ALLOW_INVALID_DATES';\n/;' $SQL_DIR/onlyoffice.sql #Fix a bug related to an incorrect date
-		$MYSQL -e "CREATE DATABASE IF NOT EXISTS $DB_NAME CHARACTER SET utf8 COLLATE 'utf8_general_ci';" >/dev/null 2>&1
-		echo 'CREATE TABLE IF NOT EXISTS `Tenants` ( `id` varchar(200) NOT NULL, `Status` varchar(200) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8;' >> $SQL_DIR/onlyoffice.sql #Fix non-existent tables Tenants
-		$MYSQL "$DB_NAME" < "$SQL_DIR/createdb.sql" >/dev/null 2>&1
-		$MYSQL "$DB_NAME" < "$SQL_DIR/onlyoffice.sql" >/dev/null 2>&1
-		$MYSQL "$DB_NAME" < "$SQL_DIR/onlyoffice.data.sql" >/dev/null 2>&1
-		$MYSQL "$DB_NAME" < "$SQL_DIR/onlyoffice.resources.sql" >/dev/null 2>&1
-		for i in $(ls $SQL_DIR/*upgrade*.sql); do
-			$MYSQL "$DB_NAME" < ${i} >/dev/null 2>&1
-		done
-	else
-		echo -n "Upgrading MySQL database... "
-		for i in $(ls $SQL_DIR/*upgrade*.sql); do
-			$MYSQL "$DB_NAME" < ${i} >/dev/null 2>&1
-		done
-    fi
-    echo "OK"
-}
-
 setup_nginx(){
 	echo -n "Configuring nginx... "
 	
@@ -443,7 +423,6 @@ setup_nginx(){
 					PORTS+=('5002') #ASC.People
 					PORTS+=('5008') #ASC.Files/client
 					PORTS+=('5013') #ASC.Files/editor
-					PORTS+=('5014') #ASC.CRM
 					setsebool -P httpd_can_network_connect on
 				;;
 				disabled)
@@ -549,8 +528,6 @@ change_elasticsearch_config(){
 	if [ -d /etc/elasticsearch/ ]; then 
 		chmod g+ws /etc/elasticsearch/
 	fi
-
-	systemctl start elasticsearch
 }
 
 setup_elasticsearch() {
@@ -566,7 +543,8 @@ setup_elasticsearch() {
 
 setup_kafka() {
 
-	KAFKA_SERVICE=$(systemctl list-units --no-legend "*kafka*" | cut -f1 -d' ')
+	KAFKA_SERVICE=$(systemctl list-unit-files --no-legend "*kafka*" | grep -oE '[^ ]+.service')
+	ZOOKEEPER_SERVICE=$(systemctl list-unit-files --no-legend "*zookeeper*" | grep -oE '[^ ]+.service')
 
 	if [ -n ${KAFKA_SERVICE} ]; then
 
@@ -582,7 +560,9 @@ setup_kafka() {
 		sed -i "s/bootstrap.servers=.*/bootstrap.servers=${KAFKA_HOST}:${KAFKA_PORT}/g" $KAFKA_CONF/connect-standalone.properties
 		sed -i "s/logger.kafka.controller=.*,/logger.kafka.controller=INFO,/g" $KAFKA_CONF/log4j.properties
 		sed -i "s/logger.state.change.logger=.*,/logger.state.change.logger=INFO,/g" $KAFKA_CONF/log4j.properties
-		echo "log4j.logger.kafka.producer.async.DefaultEventHandler=INFO, kafkaAppender" >> $KAFKA_CONF/log4j.properties
+		if ! grep -q "DefaultEventHandler" $KAFKA_CONF/log4j.properties; then
+			echo "log4j.logger.kafka.producer.async.DefaultEventHandler=INFO, kafkaAppender" >> $KAFKA_CONF/log4j.properties
+		fi
 		
 		#Save kafka parameters in .json
 		$JSON_USERCONF "this.kafka={'BootstrapServers': \"${KAFKA_HOST}:${KAFKA_PORT}\"}" >/dev/null 2>&1
@@ -607,7 +587,6 @@ install_json
 if $PACKAGE_MANAGER mysql-client >/dev/null 2>&1 || $PACKAGE_MANAGER mysql-community-client >/dev/null 2>&1; then
     input_db_params
     establish_mysql_conn || exit $?
-    execute_mysql_script || exit $?
 fi 
 
 if $PACKAGE_MANAGER nginx >/dev/null 2>&1; then
diff --git a/build/install/common/systemd/build.sh b/build/install/common/systemd/build.sh
index 0c091776e8..cb34a9c1a9 100644
--- a/build/install/common/systemd/build.sh
+++ b/build/install/common/systemd/build.sh
@@ -39,6 +39,7 @@ LOG_DIR="/var/log/onlyoffice/${PRODUCT}"
 DOTNET_RUN="/usr/share/dotnet/dotnet"
 APP_URLS="http://0.0.0.0"
 ENVIRONMENT=" --ENVIRONMENT=production"
+CORE=" --core:products:folder=${BASE_DIR}/products --core:products:subfolder=server"
 
 SERVICE_NAME=(
 	api
@@ -55,11 +56,7 @@ SERVICE_NAME=(
 	backup
 	storage-encryption
 	storage-migration
-	projects-server
 	telegram-service
-	crm
-	calendar
-	mail
 	ssoauth
 	)
 
@@ -94,13 +91,11 @@ reassign_values (){
 		SERVICE_PORT="5006"
 		WORK_DIR="${BASE_DIR}/services/ASC.Studio.Notify/"
 		EXEC_FILE="ASC.Studio.Notify.dll"
-		CORE=" --core:products:folder=${BASE_DIR}/products --core:products:subfolder=server "
 	;;
 	notify )
 		SERVICE_PORT="5005"
 		WORK_DIR="${BASE_DIR}/services/ASC.Notify/"
 		EXEC_FILE="ASC.Notify.dll"
-		CORE=" --core:products:folder=${BASE_DIR}/products --core:products:subfolder=server "
 	;;
 	people-server )
 		SERVICE_PORT="5004"
@@ -116,7 +111,6 @@ reassign_values (){
 		SERVICE_PORT="5009"
 		WORK_DIR="${BASE_DIR}/products/ASC.Files/service/"
 		EXEC_FILE="ASC.Files.Service.dll"
-		CORE=" --core:products:folder=${BASE_DIR}/products --core:products:subfolder=server"
 	;;
 	studio )
 		SERVICE_PORT="5003"
@@ -127,7 +121,6 @@ reassign_values (){
 		SERVICE_PORT="5012"
 		WORK_DIR="${BASE_DIR}/services/ASC.Data.Backup/"
 		EXEC_FILE="ASC.Data.Backup.dll"
-		CORE=" --core:products:folder=${BASE_DIR}/products --core:products:subfolder=server"
 	;;
 	storage-migration )
 		SERVICE_PORT="5018"
@@ -139,31 +132,11 @@ reassign_values (){
 		WORK_DIR="${BASE_DIR}/services/ASC.Data.Storage.Encryption/"
 		EXEC_FILE="ASC.Data.Storage.Encryption.dll"
 	;;
-	projects-server )
-		SERVICE_PORT="5020"
-		WORK_DIR="${BASE_DIR}/products/ASC.Projects/server/"
-		EXEC_FILE="ASC.Projects.dll"
-	;;
 	telegram-service )
 		SERVICE_PORT="51702"
 		WORK_DIR="${BASE_DIR}/services/ASC.TelegramService/"
 		EXEC_FILE="ASC.TelegramService.dll"
 	;;
-	crm )
-		SERVICE_PORT="5021"
-		WORK_DIR="${BASE_DIR}/products/ASC.CRM/server/"
-		EXEC_FILE="ASC.CRM.dll"
-	;;
-	calendar )
-		SERVICE_PORT="5023"
-		WORK_DIR="${BASE_DIR}/products/ASC.Calendar/server/"
-		EXEC_FILE="ASC.Calendar.dll"
-	;;
-	mail )
-		SERVICE_PORT="5022"
-		WORK_DIR="${BASE_DIR}/products/ASC.Mail/server/"
-		EXEC_FILE="ASC.Mail.dll"
-	;;
 	ssoauth )
 		SERVICE_PORT="9833"
 		WORK_DIR="${BASE_DIR}/services/ASC.SsoAuth.Svc/"
@@ -173,7 +146,6 @@ reassign_values (){
   SERVICE_NAME="$1"
   EXEC_START="${DOTNET_RUN} ${WORK_DIR}${EXEC_FILE} --urls=${APP_URLS}:${SERVICE_PORT} --pathToConf=${PATH_TO_CONF} \
   --'\$STORAGE_ROOT'=${STORAGE_ROOT} --log:dir=${LOG_DIR} --log:name=${SERVICE_NAME}${CORE}${ENVIRONMENT}"
-  CORE=""
 }
 
 write_to_file () {
diff --git a/build/install/deb/debian/appserver-common.install b/build/install/deb/debian/appserver-common.install
index 2c53bbc427..8f41fea17d 100644
--- a/build/install/deb/debian/appserver-common.install
+++ b/build/install/deb/debian/appserver-common.install
@@ -1,3 +1,2 @@
 ../../../config/*.json      etc/onlyoffice/appserver
 ../../../config/*.config    etc/onlyoffice/appserver
-../docker/config/*.sql      var/www/appserver/sql
diff --git a/build/install/deb/debian/appserver-common.postinst b/build/install/deb/debian/appserver-common.postinst
index 1c95e29968..9169e836f4 100644
--- a/build/install/deb/debian/appserver-common.postinst
+++ b/build/install/deb/debian/appserver-common.postinst
@@ -18,4 +18,4 @@ if ! cat /etc/passwd | grep -q "nginx:"; then
 fi
 
 usermod -aG onlyoffice,nginx onlyoffice
-chown onlyoffice:onlyoffice /var/log/onlyoffice/appserver /var/www/appserver /etc/onlyoffice/appserver
+chown -R onlyoffice:onlyoffice /var/log/onlyoffice/appserver /var/www/appserver /etc/onlyoffice/appserver
diff --git a/build/install/deb/debian/appserver-proxy.install b/build/install/deb/debian/appserver-proxy.install
index 3029cec2c4..2296cf6f16 100644
--- a/build/install/deb/debian/appserver-proxy.install
+++ b/build/install/deb/debian/appserver-proxy.install
@@ -1,17 +1,9 @@
 ## COPY PUBLIC ##
-../../../config/nginx/onlyoffice*.conf          etc/nginx/conf.d
-../../../config/nginx/includes/onlyoffice*.conf etc/nginx/includes
-../../../public/*                               var/www/appserver/public
-../../../public/images/*                        var/www/appserver/public/images
-../../../public/offline/*                       var/www/appserver/public/offline
-../../../public/thirdparty/*                    var/www/appserver/public/thirdparty
-../../../products/ASC.Calendar/Client/dist/*    var/www/appserver/products/ASC.Calendar/client
-../../../products/ASC.CRM/Client/dist/*         var/www/appserver/products/ASC.CRM/client
-../../../products/ASC.Projects/Client/dist/*    var/www/appserver/products/ASC.Projects/client
-../../../products/ASC.Calendar/Client/dist/*    var/www/appserver/products/ASC.Calendar/client
-../../../products/ASC.People/Client/dist/*      var/www/appserver/products/ASC.People/client
-../../../products/ASC.Mail/Client/dist/*        var/www/appserver/products/ASC.Mail/client
-../../../products/ASC.Files/Client/dist/*       var/www/appserver/products/ASC.Files/client
-../../../web/ASC.Web.Editor/dist/*              var/www/appserver/products/ASC.Files/editor
-../../../web/ASC.Web.Client/dist/*              var/www/appserver/studio/client
-../../../web/ASC.Web.Login/dist/*               var/www/appserver/studio/login
+../../../config/nginx/onlyoffice*.conf                etc/nginx/conf.d
+../../../config/nginx/includes/onlyoffice*.conf       etc/nginx/includes
+../../../build/deploy/public/*                        var/www/appserver/public
+../../../build/deploy/products/ASC.People/client/*    var/www/appserver/products/ASC.People/client
+../../../build/deploy/products/ASC.Files/client/*     var/www/appserver/products/ASC.Files/client
+../../../build/deploy/products/ASC.Files/editor/*     var/www/appserver/products/ASC.Files/editor
+../../../build/deploy/studio/client/*                 var/www/appserver/studio/client
+../../../build/deploy/studio/login/*                  var/www/appserver/studio/login
diff --git a/build/install/deb/debian/changelog b/build/install/deb/debian/changelog
index 4cb67c6b24..8734d15afa 100644
--- a/build/install/deb/debian/changelog
+++ b/build/install/deb/debian/changelog
@@ -1,4 +1,4 @@
-appserver (0.1-10) unstable; urgency=medium
+appserver ({{package_header_tag_version}}) unstable; urgency=medium
 
   * Initial Release.
 
diff --git a/build/install/deb/debian/control b/build/install/deb/debian/control
index 0e6856265f..27ee5c86e4 100644
--- a/build/install/deb/debian/control
+++ b/build/install/deb/debian/control
@@ -2,34 +2,30 @@ Source: appserver
 Section: web
 Priority: optional
 Maintainer: onlyoffice
-Build-Depends: debhelper (>= 10), nodejs (>=10), dotnet-sdk-5.0, yarn
-Standards-Version: 0.1-10
+Build-Depends: debhelper (>= 10), nodejs (>=14), dotnet-sdk-6.0, yarn
+Standards-Version: {{package_header_tag_version}}
 Homepage: https://www.onlyoffice.com/
 Architecture: any
 
 Package: appserver
 Architecture: any
-Depends: appserver-api-system,
-         appserver-backup,
-         appserver-calendar,
-         appserver-crm,
-         appserver-storage-encryption,
-         appserver-files,
-         appserver-files-services,    
-         appserver-mail,
-         appserver-storage-migration,
-         appserver-notify,
-         appserver-people-server,
-         appserver-projects-server,
-         appserver-socket,
-         appserver-ssoauth,
-         appserver-studio-notify,
-         appserver-telegram-service,
-         appserver-thumbnails,
-         appserver-urlshortener,
-         appserver-api,
-         appserver-studio,
-         appserver-proxy
+Depends: appserver-api-system (= {{package_header_tag_version}}),
+         appserver-backup (= {{package_header_tag_version}}),
+         appserver-storage-encryption (= {{package_header_tag_version}}),
+         appserver-files (= {{package_header_tag_version}}),
+         appserver-files-services (= {{package_header_tag_version}}),    
+         appserver-storage-migration (= {{package_header_tag_version}}),
+         appserver-notify (= {{package_header_tag_version}}),
+         appserver-people-server (= {{package_header_tag_version}}),
+         appserver-socket (= {{package_header_tag_version}}),
+         appserver-ssoauth (= {{package_header_tag_version}}),
+         appserver-studio-notify (= {{package_header_tag_version}}),
+         appserver-telegram-service (= {{package_header_tag_version}}),
+         appserver-thumbnails (= {{package_header_tag_version}}),
+         appserver-urlshortener (= {{package_header_tag_version}}),
+         appserver-api (= {{package_header_tag_version}}),
+         appserver-studio (= {{package_header_tag_version}}),
+         appserver-proxy (= {{package_header_tag_version}})
 Description: Description
 
 Package: appserver-common
@@ -44,174 +40,138 @@ Description: Description
 
 Package: appserver-api-system
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-backup
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Description
-
-Package: appserver-calendar
-Architecture: any
-Depends: appserver-common,
- appserver-configuration,
- dotnet-sdk-5.0,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Description
-
-Package: appserver-crm
-Architecture: any
-Depends: appserver-common,
- appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-storage-encryption
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-files
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-files-services
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Description
-
-Package: appserver-mail
-Architecture: any
-Depends: appserver-common,
- appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-storage-migration
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-notify
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-people-server
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Description
-
-Package: appserver-projects-server
-Architecture: any
-Depends: appserver-common,
- appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-socket
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
- nodejs (>=10),
+ dotnet-sdk-6.0,
+ nodejs (>=14),
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-studio-notify
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-telegram-service
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-thumbnails
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
- nodejs (>=10),
+ dotnet-sdk-6.0,
+ nodejs (>=14),
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-urlshortener
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
- nodejs (>=10),
+ dotnet-sdk-6.0,
+ nodejs (>=14),
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-api
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
 
 Package: appserver-studio
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
+ dotnet-sdk-6.0,
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
@@ -223,10 +183,10 @@ Description: Description
 
 Package: appserver-ssoauth
 Architecture: any
-Depends: appserver-common,
+Depends: appserver-common (= {{package_header_tag_version}}),
  appserver-configuration,
- dotnet-sdk-5.0,
- nodejs (>=10),
+ dotnet-sdk-6.0,
+ nodejs (>=14),
  ${misc:Depends},
  ${shlibs:Depends}
 Description: Description
diff --git a/build/install/deb/debian/rules b/build/install/deb/debian/rules
index f2a3cf2632..84a2003778 100755
--- a/build/install/deb/debian/rules
+++ b/build/install/deb/debian/rules
@@ -42,8 +42,8 @@ override_dh_fixperms:
 	dh_fixperms
 
 override_dh_auto_install:
-	dh_installinit
-	dh_systemd_enable
+	dh_installinit --no-start
+	dh_systemd_enable --no-enable
 	dh_systemd_start --no-start
 
 override_dh_strip:
diff --git a/build/install/rpm/SPECS/appserver.spec b/build/install/rpm/SPECS/appserver.spec
index 7a1fd75c9f..cdc22cc99b 100644
--- a/build/install/rpm/SPECS/appserver.spec
+++ b/build/install/rpm/SPECS/appserver.spec
@@ -18,33 +18,28 @@ License:        AGPLv3
 Source0:        https://github.com/ONLYOFFICE/%{product}/archive/%GIT_BRANCH.tar.gz#/%{sourcename}.tar.gz
 Source1:        https://github.com/ONLYOFFICE/document-templates/archive/main/community-server.tar.gz#/document-templates-main-community-server.tar.gz
 Source2:        https://github.com/ONLYOFFICE/dictionaries/archive/master.tar.gz#/dictionaries-master.tar.gz
-Source3:        https://github.com/ONLYOFFICE/CommunityServer/archive/master.tar.gz#/CommunityServer-master.tar.gz
 
-BuildRequires:  nodejs >= 12.0
+BuildRequires:  nodejs >= 14.0
 BuildRequires:  yarn
-BuildRequires:  dotnet-sdk-5.0
+BuildRequires:  dotnet-sdk-6.0
 
-Requires:       %name-api-system
-Requires:       %name-calendar
-Requires:       %name-crm
-Requires:       %name-backup
-Requires:       %name-storage-encryption
-Requires:       %name-storage-migration
-Requires:       %name-files
-Requires:       %name-files-services
-Requires:       %name-mail
-Requires:       %name-notify
-Requires:       %name-people-server
-Requires:       %name-projects-server
-Requires:       %name-socket
-Requires:       %name-ssoauth
-Requires:       %name-studio-notify
-Requires:       %name-telegram-service
-Requires:       %name-thumbnails
-Requires:       %name-urlshortener
-Requires:       %name-api
-Requires:       %name-studio
-Requires:       %name-proxy
+Requires:       %name-api-system = %version-%release
+Requires:       %name-backup = %version-%release
+Requires:       %name-storage-encryption = %version-%release
+Requires:       %name-storage-migration = %version-%release
+Requires:       %name-files = %version-%release
+Requires:       %name-files-services = %version-%release
+Requires:       %name-notify = %version-%release
+Requires:       %name-people-server = %version-%release
+Requires:       %name-socket = %version-%release
+Requires:       %name-ssoauth = %version-%release
+Requires:       %name-studio-notify = %version-%release
+Requires:       %name-telegram-service = %version-%release
+Requires:       %name-thumbnails = %version-%release
+Requires:       %name-urlshortener = %version-%release
+Requires:       %name-api = %version-%release
+Requires:       %name-studio = %version-%release
+Requires:       %name-proxy = %version-%release
 
 %description
 App Server is a platform for building your own online office by connecting ONLYOFFICE modules packed as separate apps.
@@ -54,10 +49,9 @@ App Server is a platform for building your own online office by connecting ONLYO
 %prep
 
 rm -rf %{_rpmdir}/%{_arch}/%{name}-*
-%setup -b1 -b2 -b3 -n %{sourcename}
+%setup -b1 -b2 -n %{sourcename}
 mv -f %{_builddir}/document-templates-main-community-server/*  %{_builddir}/%{sourcename}/products/ASC.Files/Server/DocStore/
 mv -f %{_builddir}/dictionaries-master/*  %{_builddir}/%{sourcename}/common/Tests/Frontend.Translations.Tests/dictionaries/
-mv -f %{_builddir}/CommunityServer-master/build/sql/*  %{_builddir}/%{sourcename}/build/install/docker/config/
 
 %include build.spec
 
diff --git a/build/install/rpm/SPECS/files.spec b/build/install/rpm/SPECS/files.spec
index 342a30df85..c4f6f0eb41 100644
--- a/build/install/rpm/SPECS/files.spec
+++ b/build/install/rpm/SPECS/files.spec
@@ -6,26 +6,18 @@
 %{buildpath}/studio/api/
 %{buildpath}/products/ASC.People/server/ASC.People.dll
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-api.service
 %dir %{buildpath}/studio/
 %dir %{buildpath}/products/ASC.People/
 %dir %{buildpath}/products/ASC.People/server/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
 
 %files backup
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/services/ASC.Data.Backup/
 %{buildpath}/products/ASC.People/server/ASC.People.dll
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-backup.service
 %dir %{buildpath}/services/
 %dir %{buildpath}/products/
@@ -33,16 +25,11 @@
 %dir %{buildpath}/products/ASC.People/server/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
 
 %files common
 %defattr(-, onlyoffice, onlyoffice, -)
 %config %{_sysconfdir}/onlyoffice/%{product}/
 %{_var}/log/onlyoffice/%{product}/
-%{buildpath}/sql/
 %dir %{_sysconfdir}/onlyoffice/
 %dir %{_var}/log/onlyoffice/
 
@@ -51,26 +38,18 @@
 %{buildpath}/products/ASC.Files/service/
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
 %{buildpath}/products/ASC.People/server/ASC.People*.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-files-services.service
 %dir %{buildpath}/products/
 %dir %{buildpath}/products/ASC.People/
 %dir %{buildpath}/products/ASC.People/server
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
 
 %files notify
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/services/ASC.Notify/
 %{buildpath}/products/ASC.People/server/ASC.People.dll
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-notify.service
 %dir %{buildpath}/services/
 %dir %{buildpath}/products/
@@ -78,26 +57,16 @@
 %dir %{buildpath}/products/ASC.People/server/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
 
 %files files
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/products/ASC.Files/server/
 %{buildpath}/products/ASC.People/server/ASC.People.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-files.service
 %dir %{buildpath}/products/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.People/
 %dir %{buildpath}/products/ASC.People/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
 
 %files api-system
 %defattr(-, onlyoffice, onlyoffice, -)
@@ -115,26 +84,16 @@
 %{buildpath}/products/ASC.People/client/
 %{buildpath}/products/ASC.Files/client/
 %{buildpath}/products/ASC.Files/editor/
-%{buildpath}/products/ASC.CRM/client/
-%{buildpath}/products/ASC.Projects/client/
-%{buildpath}/products/ASC.Calendar/client/
-%{buildpath}/products/ASC.Mail/client/
 %dir %{buildpath}/studio/
 %dir %{buildpath}/products/
 %dir %{buildpath}/products/ASC.People/
 %dir %{buildpath}/products/ASC.Files/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Calendar/
-%dir %{buildpath}/products/ASC.Mail/
 
 %files studio-notify
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/services/ASC.Studio.Notify/
 %{buildpath}/products/ASC.People/server/ASC.People.dll
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-studio-notify.service
 %dir %{buildpath}/services/
 %dir %{buildpath}/products/
@@ -142,26 +101,16 @@
 %dir %{buildpath}/products/ASC.People/server/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
 
 %files people-server
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/products/ASC.People/server/
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-people-server.service
 %dir %{buildpath}/products/
 %dir %{buildpath}/products/ASC.People/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
 
 %files urlshortener
 %defattr(-, onlyoffice, onlyoffice, -)
@@ -183,23 +132,17 @@
 %{buildpath}/services/ASC.Socket.IO.Svc/
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
 %{buildpath}/products/ASC.People/server/ASC.People.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-socket.service
 %dir %{buildpath}/services/
 %dir %{buildpath}/products/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.People/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.Projects/
 
 %files studio
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/studio/server/
 %{buildpath}/products/ASC.People/server/ASC.People.dll
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-studio.service
 %dir %{buildpath}/studio/
 %dir %{buildpath}/products/
@@ -207,18 +150,12 @@
 %dir %{buildpath}/products/ASC.People/server/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
 
 %files storage-encryption
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/services/ASC.Data.Storage.Encryption/
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
 %{buildpath}/products/ASC.People/server/ASC.People.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-storage-encryption.service
 %dir %{buildpath}/services/
 %dir %{buildpath}/products/
@@ -226,49 +163,23 @@
 %dir %{buildpath}/products/ASC.Files/server
 %dir %{buildpath}/products/ASC.People/
 %dir %{buildpath}/products/ASC.People/server
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server
 
 %files storage-migration
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/services/ASC.Data.Storage.Migration/
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
 %{buildpath}/products/ASC.People/server/ASC.People.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-storage-migration.service
 %dir %{buildpath}/services/
 %dir %{buildpath}/products/
 %dir %{buildpath}/products/ASC.Files/
 %dir %{buildpath}/products/ASC.People/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.Projects/
-
-%files projects-server
-%defattr(-, onlyoffice, onlyoffice, -)
-%{buildpath}/products/ASC.Projects/server/
-%{buildpath}/products/ASC.Files/server/ASC.Files*.dll 
-%{buildpath}/products/ASC.People/server/ASC.People.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-/lib/systemd/system/%{product}-projects-server.service
-%dir %{buildpath}/products/
-%dir %{buildpath}/products/ASC.Files/
-%dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.People/
-%dir %{buildpath}/products/ASC.People/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
 
 %files telegram-service
 %defattr(-, onlyoffice, onlyoffice, -)
 %{buildpath}/services/ASC.TelegramService/
 %{buildpath}/products/ASC.Files/server/ASC.Files*.dll
 %{buildpath}/products/ASC.People/server/ASC.People.dll
-%{buildpath}/products/ASC.CRM/server/ASC.CRM*.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
 /lib/systemd/system/%{product}-telegram-service.service
 %dir %{buildpath}/services/
 %dir %{buildpath}/products/
@@ -276,38 +187,6 @@
 %dir %{buildpath}/products/ASC.Files/server/
 %dir %{buildpath}/products/ASC.People/
 %dir %{buildpath}/products/ASC.People/server/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.CRM/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
-
-%files crm
-%defattr(-, onlyoffice, onlyoffice, -)
-%{buildpath}/products/ASC.CRM/server/
-%{buildpath}/products/ASC.Files/server/ASC.Files*.dll
-%{buildpath}/products/ASC.People/server/ASC.People.dll
-%{buildpath}/products/ASC.Projects/server/ASC.Projects*.dll
-/lib/systemd/system/%{product}-crm.service
-%dir %{buildpath}/products/
-%dir %{buildpath}/products/ASC.CRM/
-%dir %{buildpath}/products/ASC.Files/
-%dir %{buildpath}/products/ASC.Files/server/
-%dir %{buildpath}/products/ASC.Projects/
-%dir %{buildpath}/products/ASC.Projects/server/
-
-%files calendar
-%defattr(-, onlyoffice, onlyoffice, -)
-%{buildpath}/products/ASC.Calendar/server/
-/lib/systemd/system/%{product}-calendar.service
-%dir %{buildpath}/products/
-%dir %{buildpath}/products/ASC.Calendar/
-
-%files mail
-%defattr(-, onlyoffice, onlyoffice, -)
-%{buildpath}/products/ASC.Mail/server/
-/lib/systemd/system/%{product}-mail.service
-%dir %{buildpath}/products/
-%dir %{buildpath}/products/ASC.Mail/
 
 %files ssoauth
 %defattr(-, onlyoffice, onlyoffice, -)
diff --git a/build/install/rpm/SPECS/install.spec b/build/install/rpm/SPECS/install.spec
index fb43d4df86..16ab97d805 100644
--- a/build/install/rpm/SPECS/install.spec
+++ b/build/install/rpm/SPECS/install.spec
@@ -7,20 +7,12 @@ mkdir -p "%{buildroot}%{_sysconfdir}/onlyoffice/%{product}/.private/"
 mkdir -p "%{buildroot}%{_sysconfdir}/onlyoffice/%{product}/data/"
 mkdir -p "%{buildroot}%{_var}/log/onlyoffice/%{product}/"
 mkdir -p "%{buildroot}/lib/systemd/system/"
-mkdir -p "%{buildroot}%{buildpath}/products/ASC.Calendar/client/"
-mkdir -p "%{buildroot}%{buildpath}/products/ASC.Calendar/server/"
-mkdir -p "%{buildroot}%{buildpath}/products/ASC.CRM/client/"
-mkdir -p "%{buildroot}%{buildpath}/products/ASC.CRM/server/"
 mkdir -p "%{buildroot}%{buildpath}/products/ASC.Files/client/"
 mkdir -p "%{buildroot}%{buildpath}/products/ASC.Files/editor/"
 mkdir -p "%{buildroot}%{buildpath}/products/ASC.Files/server/DocStore/"
 mkdir -p "%{buildroot}%{buildpath}/products/ASC.Files/service/"
-mkdir -p "%{buildroot}%{buildpath}/products/ASC.Mail/client/"
-mkdir -p "%{buildroot}%{buildpath}/products/ASC.Mail/server/"
 mkdir -p "%{buildroot}%{buildpath}/products/ASC.People/client/"
 mkdir -p "%{buildroot}%{buildpath}/products/ASC.People/server/"
-mkdir -p "%{buildroot}%{buildpath}/products/ASC.Projects/client/"
-mkdir -p "%{buildroot}%{buildpath}/products/ASC.Projects/server/"
 mkdir -p "%{buildroot}%{buildpath}/public/"
 mkdir -p "%{buildroot}%{buildpath}/services/ASC.Socket.IO/"
 mkdir -p "%{buildroot}%{buildpath}/services/ASC.Socket.IO.Svc/"
@@ -37,18 +29,13 @@ mkdir -p "%{buildroot}%{buildpath}/services/ASC.Thumbnails/"
 mkdir -p "%{buildroot}%{buildpath}/services/ASC.UrlShortener/"
 mkdir -p "%{buildroot}%{buildpath}/services/ASC.UrlShortener.Svc/"
 mkdir -p "%{buildroot}%{buildpath}/services/ASC.Thumbnails.Svc/"
-mkdir -p "%{buildroot}%{buildpath}/sql/"
 mkdir -p "%{buildroot}%{buildpath}/studio/api/"
 mkdir -p "%{buildroot}%{buildpath}/studio/client/"
 mkdir -p "%{buildroot}%{buildpath}/studio/login/"
 mkdir -p "%{buildroot}%{buildpath}/studio/server/"
-cp -rf %{_builddir}/%{sourcename}/publish/products/ASC.Calendar/server/* "%{buildroot}%{buildpath}/products/ASC.Calendar/server/"
-cp -rf %{_builddir}/%{sourcename}/publish/products/ASC.Mail/server/* "%{buildroot}%{buildpath}/products/ASC.Mail/server/"
-cp -rf %{_builddir}/%{sourcename}/publish/products/ASC.CRM/server/* "%{buildroot}%{buildpath}/products/ASC.CRM/server/"
 cp -rf %{_builddir}/%{sourcename}/publish/products/ASC.Files/server/* "%{buildroot}%{buildpath}/products/ASC.Files/server/"
 cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Files.Service/service/* "%{buildroot}%{buildpath}/products/ASC.Files/service/"
 cp -rf %{_builddir}/%{sourcename}/publish/products/ASC.People/server/* "%{buildroot}%{buildpath}/products/ASC.People/server/"
-cp -rf %{_builddir}/%{sourcename}/publish/products/ASC.Projects/server/* "%{buildroot}%{buildpath}/products/ASC.Projects/server/"
 cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.ApiSystem/service/* "%{buildroot}%{buildpath}/services/ASC.ApiSystem/"
 cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Data.Backup/service/* "%{buildroot}%{buildpath}/services/ASC.Data.Backup/"
 cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Notify/service/* "%{buildroot}%{buildpath}/services/ASC.Notify/"
@@ -67,19 +54,14 @@ cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.UrlShortener.Svc/service/
 cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Web.Api/service/* "%{buildroot}%{buildpath}/studio/api/"
 cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Web.Studio/service/* "%{buildroot}%{buildpath}/studio/server/"
 cp -rf %{_builddir}/%{sourcename}/build/install/common/systemd/modules/* "%{buildroot}/lib/systemd/system/"
-cp -rf %{_builddir}/%{sourcename}/build/install/docker/config/*.sql "%{buildroot}%{buildpath}/sql/"
 cp -rf %{_builddir}/%{sourcename}/build/install/common/%{product}-configuration.sh "%{buildroot}%{_bindir}/"
 cp -rf %{_builddir}/%{sourcename}/config/* "%{buildroot}%{_sysconfdir}/onlyoffice/%{product}/"
 cp -rf %{_builddir}/%{sourcename}/config/nginx/includes/onlyoffice*.conf "%{buildroot}%{_sysconfdir}/nginx/includes/"
 cp -rf %{_builddir}/%{sourcename}/config/nginx/onlyoffice*.conf "%{buildroot}%{_sysconfdir}/nginx/conf.d/"
-cp -rf %{_builddir}/%{sourcename}/products/ASC.CRM/Client/dist/* "%{buildroot}%{buildpath}/products/ASC.CRM/client/"
-cp -rf %{_builddir}/%{sourcename}/products/ASC.Files/Client/dist/* "%{buildroot}%{buildpath}/products/ASC.Files/client/"
+cp -rf %{_builddir}/%{sourcename}/build/deploy/products/ASC.Files/client/* "%{buildroot}%{buildpath}/products/ASC.Files/client/"
 cp -rf %{_builddir}/%{sourcename}/products/ASC.Files/Server/DocStore/* "%{buildroot}%{buildpath}/products/ASC.Files/server/DocStore/"
-cp -rf %{_builddir}/%{sourcename}/products/ASC.People/Client/dist/* "%{buildroot}%{buildpath}/products/ASC.People/client/"
-cp -rf %{_builddir}/%{sourcename}/products/ASC.Projects/Client/dist/* "%{buildroot}%{buildpath}/products/ASC.Projects/client/"
-cp -rf %{_builddir}/%{sourcename}/products/ASC.Calendar/Client/dist/* "%{buildroot}%{buildpath}/products/ASC.Calendar/client/"
-cp -rf %{_builddir}/%{sourcename}/products/ASC.Mail/Client/dist/* "%{buildroot}%{buildpath}/products/ASC.Mail/client/"
-cp -rf %{_builddir}/%{sourcename}/public/* "%{buildroot}%{buildpath}/public/"
-cp -rf %{_builddir}/%{sourcename}/web/ASC.Web.Client/dist/* "%{buildroot}%{buildpath}/studio/client/"
-cp -rf %{_builddir}/%{sourcename}/web/ASC.Web.Editor/dist/* "%{buildroot}%{buildpath}/products/ASC.Files/editor/"
-cp -rf %{_builddir}/%{sourcename}/web/ASC.Web.Login/dist/* "%{buildroot}%{buildpath}/studio/login/"
+cp -rf %{_builddir}/%{sourcename}/build/deploy/products/ASC.People/client/* "%{buildroot}%{buildpath}/products/ASC.People/client/"
+cp -rf %{_builddir}/%{sourcename}/build/deploy/public/* "%{buildroot}%{buildpath}/public/"
+cp -rf %{_builddir}/%{sourcename}/build/deploy/studio/client/* "%{buildroot}%{buildpath}/studio/client/"
+cp -rf %{_builddir}/%{sourcename}/build/deploy/products/ASC.Files/editor/* "%{buildroot}%{buildpath}/products/ASC.Files/editor/"
+cp -rf %{_builddir}/%{sourcename}/build/deploy/studio/login/* "%{buildroot}%{buildpath}/studio/login/"
\ No newline at end of file
diff --git a/build/install/rpm/SPECS/package.spec b/build/install/rpm/SPECS/package.spec
index 1df440a795..d23f4d3e31 100644
--- a/build/install/rpm/SPECS/package.spec
+++ b/build/install/rpm/SPECS/package.spec
@@ -1,8 +1,8 @@
 %package        backup
 Summary:        backup
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release 
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    backup
 
@@ -14,39 +14,39 @@ Group:          Applications/Internet
 %package        files-services
 Summary:        files-services
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    files-services
 
 %package        notify
 Summary:        notify
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    notify
 
 %package        files
 Summary:        files
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    files
 
 %package        api-system
 Summary:        api-system
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    api-system
 
 %package        proxy
 Summary:        proxy
 Group:          Applications/Internet
-Requires:       %name-common
+Requires:       %name-common  = %version-%release
 Requires:       nginx >= 1.9.5
 Requires:       mysql-community-client >= 5.7.0
 AutoReqProv:    no
@@ -55,24 +55,24 @@ AutoReqProv:    no
 %package        studio-notify
 Summary:        studio-notify
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    studio-notify
 
 %package        people-server
 Summary:        people-server
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    people-server
 
 %package        urlshortener
 Summary:        urlshortener
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 Requires:       nodejs >= 12.0
 AutoReqProv:    no
 %description    urlshortener
@@ -80,8 +80,8 @@ AutoReqProv:    no
 %package        socket
 Summary:        socket
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 Requires:       nodejs >= 12.0
 AutoReqProv:    no
 %description    socket
@@ -89,8 +89,8 @@ AutoReqProv:    no
 %package        thumbnails
 Summary:        thumbnails
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 Requires:       nodejs >= 12.0
 AutoReqProv:    no
 %description    thumbnails
@@ -98,80 +98,48 @@ AutoReqProv:    no
 %package        studio
 Summary:        studio
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    studio
 
-%package        crm
-Summary:        crm
-Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
-AutoReqProv:    no
-%description    crm
-
 %package        api
 Summary:        api
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    api
 
 %package        storage-encryption
 Summary:        storage-encryption
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    storage-encryption
 
 %package        storage-migration
 Summary:        storage-migration
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    storage-migration
 
-%package        projects-server
-Summary:        projects-server
-Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
-AutoReqProv:    no
-%description    projects-server
-
 %package        telegram-service
 Summary:        telegram-service
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 AutoReqProv:    no
 %description    telegram-service
 
-%package        calendar
-Summary:        calendar
-Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
-AutoReqProv:    no
-%description    calendar
-
-%package        mail
-Summary:        mail
-Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
-AutoReqProv:    no
-%description    mail
-
 %package        ssoauth
 Summary:        ssoauth
 Group:          Applications/Internet
-Requires:       %name-common
-Requires:       dotnet-sdk-5.0
+Requires:       %name-common  = %version-%release
+Requires:       dotnet-sdk-6.0
 Requires:       nodejs >= 12.0
 AutoReqProv:    no
 %description    ssoauth
diff --git a/config/appsettings.json b/config/appsettings.json
index 91d3f8fd52..5b96c7b1bb 100644
--- a/config/appsettings.json
+++ b/config/appsettings.json
@@ -87,7 +87,7 @@
         "viewed-media": [ ".aac", ".flac", ".m4a", ".mp3", ".oga", ".ogg", ".wav", ".f4v", ".m4v", ".mov", ".mp4", ".ogv", ".webm" ],
         "index": [ ".pptx", ".xlsx", ".docx" ],
 	    "oform": {
-			"url": "https://oforms.onlyoffice.com/data/reqdata.json",
+			"url": "https://cmsoforms.onlyoffice.com/api/oforms?populate=*",
 			"period": 60,
 			"ext": ".oform"
 		}
diff --git a/packages/asc-web-common/store/AuthStore.js b/packages/asc-web-common/store/AuthStore.js
index 54f8dd9631..ff4acc5103 100644
--- a/packages/asc-web-common/store/AuthStore.js
+++ b/packages/asc-web-common/store/AuthStore.js
@@ -328,8 +328,9 @@ class AuthStore {
   };
 
   getOforms = () => {
-    const culture =
-      this.userStore.user.cultureName || this.settingsStore.culture;
+    let culture = this.userStore.user.cultureName || this.settingsStore.culture;
+    culture = culture === "en-US" ? "en" : culture;
+
     return api.settings.getOforms(`${this.settingsStore.urlOforms}${culture}`);
   };
 }
diff --git a/packages/asc-web-common/store/SettingsStore.js b/packages/asc-web-common/store/SettingsStore.js
index 2531c0c941..b6f0ed3b34 100644
--- a/packages/asc-web-common/store/SettingsStore.js
+++ b/packages/asc-web-common/store/SettingsStore.js
@@ -116,6 +116,7 @@ class SettingsStore {
 
   tenantStatus = null;
   helpLink = null;
+  hotkeyPanelVisible = false;
 
   constructor() {
     makeAutoObservable(this);
@@ -470,6 +471,10 @@ class SettingsStore {
   setIsBurgerLoading = (isBurgerLoading) => {
     this.isBurgerLoading = isBurgerLoading;
   };
+
+  setHotkeyPanelVisible = (hotkeyPanelVisible) => {
+    this.hotkeyPanelVisible = hotkeyPanelVisible;
+  };
 }
 
 export default SettingsStore;
diff --git a/products/ASC.Files/Client/public/locales/az/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/az/HotkeysPanel.json
index 7349b33db5..626e855c95 100644
--- a/products/ASC.Files/Client/public/locales/az/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/az/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Qısayollar",
   "HotkeysActions": "Seçilmiş elementlər üzrə addımın atılması",
   "HotkeysActionsInPreview": "Digər hərəkətlər",
   "HotkeysApplicationActions": "Tətbiq hərəkətləri",
diff --git a/products/ASC.Files/Client/public/locales/bg/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/bg/HotkeysPanel.json
index 8c6872f885..cec4efd973 100644
--- a/products/ASC.Files/Client/public/locales/bg/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/bg/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Бързи клавиши",
   "HotkeysActions": "Вземане на действие по избрани елементи",
   "HotkeysActionsInPreview": "Други действия",
   "HotkeysApplicationActions": "Действия на приложението",
diff --git a/products/ASC.Files/Client/public/locales/cs/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/cs/HotkeysPanel.json
index 8e2aad22ce..804f0bce4b 100644
--- a/products/ASC.Files/Client/public/locales/cs/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/cs/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Klávesové zkratky",
   "HotkeysActions": "Provedení akce na vybraných položkách",
   "HotkeysActionsInPreview": "Ostatní akce",
   "HotkeysApplicationActions": "Akce aplikace",
diff --git a/products/ASC.Files/Client/public/locales/de/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/de/HotkeysPanel.json
index f108d32790..1af6f732fd 100644
--- a/products/ASC.Files/Client/public/locales/de/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/de/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Tastenkombinationen",
   "HotkeysActions": "Durchführung von Handlungen zu ausgewählten Elementen",
   "HotkeysActionsInPreview": "Sonstiges",
   "HotkeysApplicationActions": "Handlungen der Anwendung",
diff --git a/products/ASC.Files/Client/public/locales/el/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/el/HotkeysPanel.json
index 46e2dc9e31..23c44fa045 100644
--- a/products/ASC.Files/Client/public/locales/el/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/el/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Πλήκτρα συντόμευσης",
   "HotkeysActions": "Ανάληψη δράσης για επιλεγμένα στοιχεία",
   "HotkeysActionsInPreview": "Άλλες ενέργειες",
   "HotkeysApplicationActions": "Ενέργειες εφαρμογής",
diff --git a/products/ASC.Files/Client/public/locales/en/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/en/HotkeysPanel.json
index e369ce0b9c..ad386a9146 100644
--- a/products/ASC.Files/Client/public/locales/en/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/en/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Hotkeys",
   "HotkeysActions": "Taking action on selected items",
   "HotkeysActionsInPreview": "Other actions",
   "HotkeysApplicationActions": "Application actions",
diff --git a/products/ASC.Files/Client/public/locales/es/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/es/HotkeysPanel.json
index e2dc7cc054..49bcdd2883 100644
--- a/products/ASC.Files/Client/public/locales/es/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/es/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Atajos de teclado",
   "HotkeysActions": "Tomando medidas sobre los elementos seleccionados",
   "HotkeysActionsInPreview": "Otras acciones",
   "HotkeysApplicationActions": "Acciones de aplicación",
diff --git a/products/ASC.Files/Client/public/locales/fi/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/fi/HotkeysPanel.json
index b9a16d6884..ae9a21716c 100644
--- a/products/ASC.Files/Client/public/locales/fi/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/fi/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Pikanäppäimet",
   "HotkeysActions": "Toimintojen suoritus valituille kohteille",
   "HotkeysActionsInPreview": "Muut toiminnot",
   "HotkeysApplicationActions": "Sovellustoiminnot",
diff --git a/products/ASC.Files/Client/public/locales/fr/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/fr/HotkeysPanel.json
index 011075cbf6..de18f33dba 100644
--- a/products/ASC.Files/Client/public/locales/fr/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/fr/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Raccourcis clavier",
   "HotkeysActions": "Prise de mesures sur les éléments sélectionnés",
   "HotkeysActionsInPreview": "Autres actions",
   "HotkeysApplicationActions": "Actions d'application",
diff --git a/products/ASC.Files/Client/public/locales/it/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/it/HotkeysPanel.json
index 34966248f9..10773b87c4 100644
--- a/products/ASC.Files/Client/public/locales/it/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/it/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Tasti di scelta rapida",
   "HotkeysActions": "Intraprendere azioni sugli elementi selezionati",
   "HotkeysActionsInPreview": "Altre azioni",
   "HotkeysApplicationActions": "Azioni dell'applicazione",
diff --git a/products/ASC.Files/Client/public/locales/ja/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/ja/HotkeysPanel.json
index 6283c32bff..d7945d9cbc 100644
--- a/products/ASC.Files/Client/public/locales/ja/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/ja/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "ホットキー",
   "HotkeysActions": "選択されているアイテムに対するアクションを実行",
   "HotkeysActionsInPreview": "その他のアクション",
   "HotkeysApplicationActions": "アップ理ケーションのアクション",
diff --git a/products/ASC.Files/Client/public/locales/ko/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/ko/HotkeysPanel.json
index 8fa18bba7f..43a2bb58ce 100644
--- a/products/ASC.Files/Client/public/locales/ko/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/ko/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "단축키",
   "HotkeysActions": "선택된 항목에 작업 실행하기",
   "HotkeysActionsInPreview": "기타 작업",
   "HotkeysApplicationActions": "응용 프로그램 작업",
diff --git a/products/ASC.Files/Client/public/locales/lo/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/lo/HotkeysPanel.json
index 06ee625f19..9fac6adf3a 100644
--- a/products/ASC.Files/Client/public/locales/lo/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/lo/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "ປຸ່ມໃຊ້ປະຈຳ",
   "HotkeysActions": "ປະຕິບັດລາຍການທີ່ເລືອກ",
   "HotkeysActionsInPreview": "ການກະທໍາອື່ນໆ",
   "HotkeysApplicationActions": "ການປະຕິບັດຄໍາຮ້ອງສະຫມັກ",
diff --git a/products/ASC.Files/Client/public/locales/lv/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/lv/HotkeysPanel.json
index 245e27e2ec..5c619583ca 100644
--- a/products/ASC.Files/Client/public/locales/lv/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/lv/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Ātrie taustiņi",
   "HotkeysActions": "Notiek darbību veikšana ar atlasītajiem vienumiem",
   "HotkeysActionsInPreview": "Citas darbības",
   "HotkeysApplicationActions": "Programmas darbības",
diff --git a/products/ASC.Files/Client/public/locales/nl/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/nl/HotkeysPanel.json
index 271e0c8922..2abe87db26 100644
--- a/products/ASC.Files/Client/public/locales/nl/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/nl/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Sneltoetsen",
   "HotkeysActions": "Actie ondernemen op geselecteerde items",
   "HotkeysActionsInPreview": "Overige acties",
   "HotkeysApplicationActions": "Applicatie acties",
diff --git a/products/ASC.Files/Client/public/locales/pl/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/pl/HotkeysPanel.json
index fe1508010d..1983487578 100644
--- a/products/ASC.Files/Client/public/locales/pl/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/pl/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Skróty klawiaturowe",
   "HotkeysActions": "Wykonywanie akcji na zaznaczonych elementach",
   "HotkeysActionsInPreview": "Inne akcje",
   "HotkeysApplicationActions": "Akcje w aplikacji",
diff --git a/products/ASC.Files/Client/public/locales/pt-BR/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/pt-BR/HotkeysPanel.json
index 33fe703899..67dcc51e56 100644
--- a/products/ASC.Files/Client/public/locales/pt-BR/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/pt-BR/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Teclas de acesso",
   "HotkeysActions": "Executar ações nos itens selecionados",
   "HotkeysActionsInPreview": "Outras ações",
   "HotkeysApplicationActions": "Ações do aplicativo",
diff --git a/products/ASC.Files/Client/public/locales/pt/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/pt/HotkeysPanel.json
index ce0fcf8c0c..4b70ac63f8 100644
--- a/products/ASC.Files/Client/public/locales/pt/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/pt/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Teclas de atalho",
   "HotkeysActions": "A atuar sobre os itens selecionados",
   "HotkeysActionsInPreview": "Outras ações",
   "HotkeysApplicationActions": "Ações da Aplicação",
diff --git a/products/ASC.Files/Client/public/locales/ro/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/ro/HotkeysPanel.json
index 79f152cb8f..bfa6d9509a 100644
--- a/products/ASC.Files/Client/public/locales/ro/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/ro/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Comenzi rapide",
   "HotkeysActions": "Efectuarea acțiunilor asupra elementelor selectate",
   "HotkeysActionsInPreview": "Alte acțiuni",
   "HotkeysApplicationActions": "Acțiunile aplicației",
diff --git a/products/ASC.Files/Client/public/locales/ru/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/ru/HotkeysPanel.json
index eb59fc5f2b..7f40eb8843 100644
--- a/products/ASC.Files/Client/public/locales/ru/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/ru/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Горячие клавиши",
   "HotkeysActions": "Действия с выбранными объектами",
   "HotkeysActionsInPreview": "Прочие действия",
   "HotkeysApplicationActions": "Действия в приложении",
diff --git a/products/ASC.Files/Client/public/locales/sk/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/sk/HotkeysPanel.json
index 114520adb7..4fb552e29a 100644
--- a/products/ASC.Files/Client/public/locales/sk/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/sk/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Klávesové skratky",
   "HotkeysActions": "Vykonanie akcie pre vybraté položky",
   "HotkeysActionsInPreview": "Ďalšie akcie",
   "HotkeysApplicationActions": "Aplikačné akcie",
diff --git a/products/ASC.Files/Client/public/locales/sl/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/sl/HotkeysPanel.json
index 25895f26b6..6a0505772f 100644
--- a/products/ASC.Files/Client/public/locales/sl/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/sl/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Bližnjice",
   "HotkeysActions": "Ukrepanje za izbrane predmete",
   "HotkeysActionsInPreview": "Druge akcije",
   "HotkeysApplicationActions": "Akcije aplikacije",
diff --git a/products/ASC.Files/Client/public/locales/tr/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/tr/HotkeysPanel.json
index 61fe68e5cc..9a7fe6b6d4 100644
--- a/products/ASC.Files/Client/public/locales/tr/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/tr/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Kısayol tuşları",
   "HotkeysActions": "Seçilen öğeler üzerinde işlem yapılıyor",
   "HotkeysActionsInPreview": "Diğer eylemler",
   "HotkeysApplicationActions": "Uygulama işlemleri",
diff --git a/products/ASC.Files/Client/public/locales/uk/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/uk/HotkeysPanel.json
index 66d7120d4d..e3a77c7be3 100644
--- a/products/ASC.Files/Client/public/locales/uk/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/uk/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Сполучення клавіш",
   "HotkeysActions": "Виконання дії з вибраними елементами",
   "HotkeysActionsInPreview": "Інші дії",
   "HotkeysApplicationActions": "Дії програми",
diff --git a/products/ASC.Files/Client/public/locales/vi/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/vi/HotkeysPanel.json
index b3f81df534..f711f1b116 100644
--- a/products/ASC.Files/Client/public/locales/vi/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/vi/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "Phím tắt",
   "HotkeysActions": "Thực hiện hành động đối với các mục đã chọn",
   "HotkeysActionsInPreview": "Các hành động khác",
   "HotkeysApplicationActions": "Hành động của ứng dụng",
diff --git a/products/ASC.Files/Client/public/locales/zh-CN/HotkeysPanel.json b/products/ASC.Files/Client/public/locales/zh-CN/HotkeysPanel.json
index 2baf8e8aea..6cf29ea11b 100644
--- a/products/ASC.Files/Client/public/locales/zh-CN/HotkeysPanel.json
+++ b/products/ASC.Files/Client/public/locales/zh-CN/HotkeysPanel.json
@@ -1,5 +1,4 @@
 {
-  "Hotkeys": "快捷键",
   "HotkeysActions": "对选定的项目采取行动",
   "HotkeysActionsInPreview": "其他行动",
   "HotkeysApplicationActions": "应用行动",
diff --git a/products/ASC.Files/Client/src/HOCs/withContent.js b/products/ASC.Files/Client/src/HOCs/withContent.js
index 92c4a02d27..348f7d4181 100644
--- a/products/ASC.Files/Client/src/HOCs/withContent.js
+++ b/products/ASC.Files/Client/src/HOCs/withContent.js
@@ -118,7 +118,10 @@ export default function withContent(WrappedContent) {
                 })
               )
             )
-            .catch((err) => toastr.error(err))
+            .catch((err) => {
+              toastr.error(err);
+              this.completeAction(fileActionId);
+            })
             .finally(() => {
               clearTimeout(timerId);
               timerId = null;
@@ -136,7 +139,10 @@ export default function withContent(WrappedContent) {
                 })
               )
             )
-            .catch((err) => toastr.error(err))
+            .catch((err) => {
+              toastr.error(err);
+              this.completeAction(fileActionId);
+            })
             .finally(() => {
               clearTimeout(timerId);
               timerId = null;
@@ -244,7 +250,10 @@ export default function withContent(WrappedContent) {
             setCreatedItem({ id: createdFolderId, type: "folder" });
           })
           .then(() => this.completeAction(itemId))
-          .catch((e) => toastr.error(e))
+          .catch((e) => {
+            toastr.error(e);
+            this.completeAction(itemId);
+          })
           .finally(() => {
             const folderIds = [+itemId];
             createdFolderId && folderIds.push(createdFolderId);
@@ -318,7 +327,11 @@ export default function withContent(WrappedContent) {
               return open && openDocEditor(file.id, file.providerKey, tab);
             })
             .then(() => this.completeAction(itemId))
-            .catch((e) => toastr.error(e))
+            .catch((e) => {
+              toastr.error(e);
+              tab && tab.close();
+              this.completeAction(itemId);
+            })
             .finally(() => {
               const fileIds = [+itemId];
               createdFileId && fileIds.push(createdFileId);
@@ -351,7 +364,11 @@ export default function withContent(WrappedContent) {
               return open && openDocEditor(file.id, file.providerKey, tab);
             })
             .then(() => this.completeAction(itemId))
-            .catch((e) => toastr.error(e))
+            .catch((e) => {
+              toastr.error(e);
+              tab && tab.close();
+              this.completeAction(itemId);
+            })
             .finally(() => {
               const fileIds = [+itemId];
               createdFileId && fileIds.push(createdFileId);
diff --git a/products/ASC.Files/Client/src/HOCs/withHotkeys.js b/products/ASC.Files/Client/src/HOCs/withHotkeys.js
index 57bf1c5737..9e69c38c94 100644
--- a/products/ASC.Files/Client/src/HOCs/withHotkeys.js
+++ b/products/ASC.Files/Client/src/HOCs/withHotkeys.js
@@ -250,6 +250,7 @@ const withHotkeys = (Component) => {
 
   return inject(
     ({
+      auth,
       filesStore,
       dialogsStore,
       settingsStore,
@@ -287,7 +288,6 @@ const withHotkeys = (Component) => {
       } = hotkeyStore;
 
       const {
-        setHotkeyPanelVisible,
         setDeleteDialogVisible,
         setSelectFileDialogVisible,
         someDialogIsOpen,
@@ -299,6 +299,7 @@ const withHotkeys = (Component) => {
       } = filesActionsStore;
 
       const { visible: mediaViewerIsVisible } = mediaViewerDataStore;
+      const { setHotkeyPanelVisible } = auth.settingsStore;
 
       return {
         setSelected,
diff --git a/products/ASC.Files/Client/src/components/FilesPanels/index.js b/products/ASC.Files/Client/src/components/FilesPanels/index.js
index fab935d9b9..a77a628d77 100644
--- a/products/ASC.Files/Client/src/components/FilesPanels/index.js
+++ b/products/ASC.Files/Client/src/components/FilesPanels/index.js
@@ -110,7 +110,7 @@ const Panels = (props) => {
 };
 
 export default inject(
-  ({ dialogsStore, uploadDataStore, versionHistoryStore }) => {
+  ({ auth, dialogsStore, uploadDataStore, versionHistoryStore }) => {
     const {
       sharingPanelVisible,
       ownerPanelVisible,
@@ -132,11 +132,11 @@ export default inject(
       createMasterForm,
       selectFileDialogVisible,
       setSelectFileDialogVisible,
-      hotkeyPanelVisible,
     } = dialogsStore;
 
     const { uploadPanelVisible } = uploadDataStore;
     const { isVisible: versionHistoryPanelVisible } = versionHistoryStore;
+    const { hotkeyPanelVisible } = auth.settingsStore;
 
     return {
       sharingPanelVisible,
diff --git a/products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js b/products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js
index bf0b457e03..cee0faafdc 100644
--- a/products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js
+++ b/products/ASC.Files/Client/src/components/panels/HotkeysPanel/index.js
@@ -53,7 +53,7 @@ const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => {
       />
       <Aside className="hotkeys-panel" visible={visible} onClose={onClose}>
         <div className="hotkeys_header">
-          <Heading className="hotkeys_heading">{t("Hotkeys")}</Heading>
+          <Heading className="hotkeys_heading">{t("Common:Hotkeys")}</Heading>
         </div>
         <StyledScrollbar ref={scrollRef} stype="mediumBlack">
           <Heading className="hotkeys_sub-header">
@@ -130,11 +130,13 @@ const HotkeyPanel = ({ visible, setHotkeyPanelVisible, t, tReady }) => {
   );
 };
 
-export default inject(({ dialogsStore }) => {
-  const { hotkeyPanelVisible, setHotkeyPanelVisible } = dialogsStore;
+export default inject(({ auth }) => {
+  const { hotkeyPanelVisible, setHotkeyPanelVisible } = auth.settingsStore;
 
   return {
     visible: hotkeyPanelVisible,
     setHotkeyPanelVisible,
   };
-})(withTranslation(["HotkeysPanel", "Article"])(observer(HotkeyPanel)));
+})(
+  withTranslation(["HotkeysPanel", "Article", "Common"])(observer(HotkeyPanel))
+);
diff --git a/products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/views/Files/SingleItem.js b/products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/views/Files/SingleItem.js
index 6f9ad92e21..54ed5dd521 100644
--- a/products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/views/Files/SingleItem.js
+++ b/products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/views/Files/SingleItem.js
@@ -75,6 +75,13 @@ const SingleItem = (props) => {
         </Text>
       );
 
+      const replaceUnicode = (str) => {
+        const regex = /&#([0-9]{1,4});/gi;
+        return str.replace(regex, (match, numStr) =>
+          String.fromCharCode(+numStr)
+        );
+      };
+
       const parseAndFormatDate = (date) => {
         const locale = personal ? localStorage.getItem(LANGUAGE) : culture;
         const correctDate = getCorrectDate(locale, date);
@@ -117,9 +124,9 @@ const SingleItem = (props) => {
           id: "Owner",
           title: t("Common:Owner"),
           content: personal
-            ? styledText(item.createdBy?.displayName)
+            ? styledText(replaceUnicode(item.createdBy?.displayName))
             : styledLink(
-                item.createdBy?.displayName,
+                replaceUnicode(item.createdBy?.displayName),
                 item.createdBy?.profileUrl
               ),
         },
@@ -147,9 +154,9 @@ const SingleItem = (props) => {
           id: "LastModifiedBy",
           title: t("LastModifiedBy"),
           content: personal
-            ? styledText(item.updatedBy?.displayName)
+            ? styledText(replaceUnicode(item.updatedBy?.displayName))
             : styledLink(
-                item.updatedBy?.displayName,
+                replaceUnicode(item.updatedBy?.displayName),
                 item.updatedBy?.profileUrl
               ),
         },
diff --git a/products/ASC.Files/Client/src/pages/Home/MediaViewer/index.js b/products/ASC.Files/Client/src/pages/Home/MediaViewer/index.js
index 2a55c9834d..20543cf271 100644
--- a/products/ASC.Files/Client/src/pages/Home/MediaViewer/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/MediaViewer/index.js
@@ -31,7 +31,7 @@ const FilesMediaViewer = (props) => {
     expandedKeys,
     setScrollToItem,
     setCurrentId,
-    setSelection,
+    setBufferSelection,
   } = props;
 
   useEffect(() => {
@@ -126,7 +126,7 @@ const FilesMediaViewer = (props) => {
           setIsLoading(false);
           setFirstLoad(false);
           setScrollToItem({ id: previewFile.id, type: "file" });
-          setSelection([previewFile]);
+          setBufferSelection(previewFile);
           setToPreviewFile(null);
         });
     }
@@ -142,7 +142,7 @@ const FilesMediaViewer = (props) => {
 
       setScrollToItem({ id: currentMediaFileId, type: "file" });
       const targetFile = files.find((item) => item.id === currentMediaFileId);
-      if (targetFile) setSelection([targetFile]);
+      if (targetFile) setBufferSelection(targetFile);
 
       window.history.replaceState(null, null, url);
     }
@@ -189,7 +189,7 @@ export default inject(
       setIsLoading,
       setFirstLoad,
       setScrollToItem,
-      setSelection,
+      setBufferSelection,
     } = filesStore;
     const {
       visible,
@@ -225,7 +225,7 @@ export default inject(
       expandedKeys,
       setScrollToItem,
       setCurrentId,
-      setSelection,
+      setBufferSelection,
     };
   }
 )(
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
index 2ac612c471..89a991d15e 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
@@ -88,6 +88,7 @@ const FilesRowContainer = ({
     >
       {filesList.map((item, index) => (
         <SimpleFilesRow
+          id={`${item?.isFolder ? "folder" : "file"}_${item.id}`}
           key={`${item.id}_${index}`}
           item={item}
           sectionWidth={sectionWidth}
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
index 096b153d8b..a517c34151 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
@@ -220,6 +220,7 @@ const SimpleFilesRow = (props) => {
     isAdmin,
     getContextModel,
     showHotkeyBorder,
+    id,
   } = props;
 
   const withAccess = isAdmin || item.access === 0;
@@ -231,6 +232,7 @@ const SimpleFilesRow = (props) => {
 
   return (
     <StyledWrapper
+      id={id}
       className={`row-wrapper ${
         showHotkeyBorder
           ? "row-hotkey-border"
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
index a22870eb2b..eae1658db6 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
@@ -147,6 +147,7 @@ const Table = ({
       <TableBody>
         {filesList.map((item, index) => (
           <TableRow
+            id={`${item?.isFolder ? "folder" : "file"}_${item.id}`}
             key={`${item.id}_${index}`}
             item={item}
             index={index}
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
index dc3f869a4a..d362f839b8 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
@@ -270,6 +270,7 @@ const FilesTableRow = (props) => {
     getContextModel,
     showHotkeyBorder,
     tableColumns,
+    id,
   } = props;
   const { acceptBackground, background } = theme.dragAndDrop;
 
@@ -341,6 +342,7 @@ const FilesTableRow = (props) => {
 
   return (
     <StyledDragAndDrop
+      id={id}
       data-title={item.title}
       value={value}
       className={`files-item ${className} ${item.id}_${item.fileExst} ${
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
index bfc7268370..76e6353994 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
@@ -41,6 +41,7 @@ const FileTile = (props) => {
     onHideContextMenu,
     thumbSize,
     setSelection,
+    id,
   } = props;
 
   const temporaryExtension =
@@ -59,7 +60,7 @@ const FileTile = (props) => {
   );
 
   return (
-    <div ref={props.selectableRef}>
+    <div ref={props.selectableRef} id={id}>
       <DragAndDrop
         data-title={item.title}
         value={value}
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
index 517044360a..15a0c008ce 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
@@ -76,6 +76,7 @@ const FilesTileContainer = ({ filesList, t, sectionWidth }) => {
       {filesList.map((item, index) => {
         return index == 0 ? (
           <FileTile
+            id={`${item?.isFolder ? "folder" : "file"}_${item.id}`}
             key={`${item.id}_${index}`}
             item={item}
             sectionWidth={sectionWidth}
@@ -84,6 +85,7 @@ const FilesTileContainer = ({ filesList, t, sectionWidth }) => {
           />
         ) : (
           <FileTile
+            id={`${item?.isFolder ? "folder" : "file"}_${item.id}`}
             key={`${item.id}_${index}`}
             item={item}
             sectionWidth={sectionWidth}
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Body/index.js b/products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
index 6ea093c544..5bda4ba56b 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
@@ -74,9 +74,7 @@ const SectionBodyContent = (props) => {
     if (scrollToItem) {
       const { type, id } = scrollToItem;
 
-      const targetElement = document.querySelector(
-        `div[value='${type}_${id}_draggable']`
-      );
+      const targetElement = document.getElementById(`${type}_${id}`);
 
       if (!targetElement) return;
 
@@ -84,12 +82,12 @@ const SectionBodyContent = (props) => {
 
       if (!isInViewport || viewAs === "table") {
         const bodyScroll = isMobileOnly
-          ? document.querySelector("#customScrollBar > div")
+          ? document.querySelector("#customScrollBar > .scroll-body")
           : document.querySelector(".section-scroll");
 
         const count =
           filesList.findIndex((elem) => elem.id === scrollToItem.id) *
-          (isMobileOnly ? 57 : 48);
+          (isMobileOnly ? 57 : viewAs === "table" ? 40 : 48);
 
         bodyScroll.scrollTo(0, count);
       }
diff --git a/products/ASC.Files/Client/src/store/DialogsStore.js b/products/ASC.Files/Client/src/store/DialogsStore.js
index 8e39eb4c3c..3f60f0b9ea 100644
--- a/products/ASC.Files/Client/src/store/DialogsStore.js
+++ b/products/ASC.Files/Client/src/store/DialogsStore.js
@@ -25,7 +25,6 @@ class DialogsStore {
   selectFileDialogVisible = false;
   convertPasswordDialogVisible = false;
   isFolderActions = false;
-  hotkeyPanelVisible = false;
 
   removeItem = null;
   connectItem = null;
@@ -219,10 +218,6 @@ class DialogsStore {
     });
   };
 
-  setHotkeyPanelVisible = (hotkeyPanelVisible) => {
-    this.hotkeyPanelVisible = hotkeyPanelVisible;
-  };
-
   get someDialogIsOpen() {
     return (
       this.sharingPanelVisible ||
@@ -240,7 +235,7 @@ class DialogsStore {
       this.conflictResolveDialogVisible ||
       this.convertDialogVisible ||
       this.selectFileDialogVisible ||
-      this.hotkeyPanelVisible
+      this.authStore.settingsStore.hotkeyPanelVisible
     );
   }
 
diff --git a/products/ASC.Files/Client/src/store/FilesStore.js b/products/ASC.Files/Client/src/store/FilesStore.js
index ed31725c9b..eea685b69c 100644
--- a/products/ASC.Files/Client/src/store/FilesStore.js
+++ b/products/ASC.Files/Client/src/store/FilesStore.js
@@ -684,7 +684,7 @@ class FilesStore {
             );
 
             if (newItem) {
-              this.setSelection([newItem]);
+              this.setBufferSelection(newItem);
               this.setScrollToItem({
                 id: newItem.id,
                 type: this.createdItem.type,
diff --git a/public/locales/az/Common.json b/public/locales/az/Common.json
index 85893e22f8..d1d5bdde12 100644
--- a/public/locales/az/Common.json
+++ b/public/locales/az/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Baxın",
   "ViewWeb": "Veb versiyaya baxın",
-  "Warning": "Xəbərdarlıq"
+  "Warning": "Xəbərdarlıq",
+  "Hotkeys": "Qısayollar"
 }
diff --git a/public/locales/bg/Common.json b/public/locales/bg/Common.json
index b557089214..fdb8f3aef5 100644
--- a/public/locales/bg/Common.json
+++ b/public/locales/bg/Common.json
@@ -165,5 +165,6 @@
   "Video": "Видео",
   "View": "Преглед",
   "ViewWeb": "Отиди към уеб версия",
-  "Warning": "Внимание"
+  "Warning": "Внимание",
+  "Hotkeys": "Бързи клавиши"
 }
diff --git a/public/locales/cs/Common.json b/public/locales/cs/Common.json
index 94fb05e1ba..54071ca278 100644
--- a/public/locales/cs/Common.json
+++ b/public/locales/cs/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Zobrazit",
   "ViewWeb": "Zobrazit webovou verzi",
-  "Warning": "Varování"
+  "Warning": "Varování",
+  "Hotkeys": "Klávesové zkratky"
 }
diff --git a/public/locales/de/Common.json b/public/locales/de/Common.json
index 5c875584b7..d6c2fc9dae 100644
--- a/public/locales/de/Common.json
+++ b/public/locales/de/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Anzeigen",
   "ViewWeb": "Web-Version öffnen",
-  "Warning": "Warnung"
+  "Warning": "Warnung",
+  "Hotkeys": "Tastenkombinationen"
 }
diff --git a/public/locales/el/Common.json b/public/locales/el/Common.json
index c791192570..aac10ff06a 100644
--- a/public/locales/el/Common.json
+++ b/public/locales/el/Common.json
@@ -165,5 +165,6 @@
   "Video": "Βίντεο",
   "View": "Προβολή",
   "ViewWeb": "Προβολή διαδικτυακής έκδοσης",
-  "Warning": "Προειδοποίηση"
+  "Warning": "Προειδοποίηση",
+  "Hotkeys": "Πλήκτρα συντόμευσης"
 }
diff --git a/public/locales/en/Common.json b/public/locales/en/Common.json
index b55be58b3f..3dd90d0491 100644
--- a/public/locales/en/Common.json
+++ b/public/locales/en/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "View",
   "ViewWeb": "View web version",
-  "Warning": "Warning"
+  "Warning": "Warning",
+  "Hotkeys": "Hotkeys"
 }
diff --git a/public/locales/es/Common.json b/public/locales/es/Common.json
index e7566632ef..7318cbf0b0 100644
--- a/public/locales/es/Common.json
+++ b/public/locales/es/Common.json
@@ -165,5 +165,6 @@
   "Video": "Vídeo",
   "View": "Ver",
   "ViewWeb": "Ver versión web",
-  "Warning": "Advertencia"
+  "Warning": "Advertencia",
+  "Hotkeys": "Atajos de teclado"
 }
diff --git a/public/locales/fi/Common.json b/public/locales/fi/Common.json
index d5c1c228a6..5f16da6bbe 100644
--- a/public/locales/fi/Common.json
+++ b/public/locales/fi/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Näkymä",
   "ViewWeb": "Näytä verkkoversio",
-  "Warning": "Varoitus"
+  "Warning": "Varoitus",
+  "Hotkeys": "Pikanäppäimet"
 }
diff --git a/public/locales/fr/Common.json b/public/locales/fr/Common.json
index e265012b15..47e7922c98 100644
--- a/public/locales/fr/Common.json
+++ b/public/locales/fr/Common.json
@@ -165,5 +165,6 @@
   "Video": "Vidéo",
   "View": "Afficher",
   "ViewWeb": "Voir la version web",
-  "Warning": "Attention"
+  "Warning": "Attention",
+  "Hotkeys": "Raccourcis clavier"
 }
diff --git a/public/locales/it/Common.json b/public/locales/it/Common.json
index 825d089588..dd31884041 100644
--- a/public/locales/it/Common.json
+++ b/public/locales/it/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Visualizza",
   "ViewWeb": "Visualizza la versione web",
-  "Warning": "Avviso"
+  "Warning": "Avviso",
+  "Hotkeys": "Tasti di scelta rapida"
 }
diff --git a/public/locales/ja/Common.json b/public/locales/ja/Common.json
index b9ec73b134..4bdef4edf0 100644
--- a/public/locales/ja/Common.json
+++ b/public/locales/ja/Common.json
@@ -165,5 +165,6 @@
   "Video": "動画",
   "View": "ビュー",
   "ViewWeb": "ウェブ版を表示する",
-  "Warning": "警告"
+  "Warning": "警告",
+  "Hotkeys": "ホットキー"
 }
diff --git a/public/locales/ko/Common.json b/public/locales/ko/Common.json
index 0ea7f69169..26233486e8 100644
--- a/public/locales/ko/Common.json
+++ b/public/locales/ko/Common.json
@@ -165,5 +165,6 @@
   "Video": "동영상",
   "View": "보기",
   "ViewWeb": "웹 버전 보기",
-  "Warning": "경고"
+  "Warning": "경고",
+  "Hotkeys": "단축키"
 }
diff --git a/public/locales/lo/Common.json b/public/locales/lo/Common.json
index 08089ff17b..97c1bd2231 100644
--- a/public/locales/lo/Common.json
+++ b/public/locales/lo/Common.json
@@ -164,5 +164,6 @@
   "Video": "ວິດີໂອ",
   "View": "ມຸມມອງ",
   "ViewWeb": "ເປີດຜ່ານຫນ້າເວັບ",
-  "Warning": "ແຈ້ງເຕືອນ"
+  "Warning": "ແຈ້ງເຕືອນ",
+  "Hotkeys": "ປຸ່ມໃຊ້ປະຈຳ"
 }
diff --git a/public/locales/lv/Common.json b/public/locales/lv/Common.json
index 14933167e3..32748c6d72 100644
--- a/public/locales/lv/Common.json
+++ b/public/locales/lv/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Skatīt",
   "ViewWeb": "Skatīt tīmekļa versiju",
-  "Warning": "Brīdinājums"
+  "Warning": "Brīdinājums",
+  "Hotkeys": "Ātrie taustiņi"
 }
diff --git a/public/locales/nl/Common.json b/public/locales/nl/Common.json
index 45116e0fa8..d0a0c3be79 100644
--- a/public/locales/nl/Common.json
+++ b/public/locales/nl/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Bekijk",
   "ViewWeb": "Webversie bekijken",
-  "Warning": "Waarschuwing"
+  "Warning": "Waarschuwing",
+  "Hotkeys": "Sneltoetsen"
 }
diff --git a/public/locales/pl/Common.json b/public/locales/pl/Common.json
index 52f7905836..810723df09 100644
--- a/public/locales/pl/Common.json
+++ b/public/locales/pl/Common.json
@@ -165,5 +165,6 @@
   "Video": "Wideo",
   "View": "Podgląd",
   "ViewWeb": "Zobacz wersję internetową",
-  "Warning": "Ostrzeżenie"
+  "Warning": "Ostrzeżenie",
+  "Hotkeys": "Skróty klawiaturowe"
 }
diff --git a/public/locales/pt-BR/Common.json b/public/locales/pt-BR/Common.json
index 67c83b4ba4..25aa5c1831 100644
--- a/public/locales/pt-BR/Common.json
+++ b/public/locales/pt-BR/Common.json
@@ -165,5 +165,6 @@
   "Video": "Vídeo",
   "View": "Ver",
   "ViewWeb": "Veja a versão web",
-  "Warning": "Aviso"
+  "Warning": "Aviso",
+  "Hotkeys": "Teclas de acesso"
 }
diff --git a/public/locales/pt/Common.json b/public/locales/pt/Common.json
index 91b2f4f13e..3ef239bdb1 100644
--- a/public/locales/pt/Common.json
+++ b/public/locales/pt/Common.json
@@ -165,5 +165,6 @@
   "Video": "Vídeo",
   "View": "Ver",
   "ViewWeb": "Ver versão web",
-  "Warning": "Aviso"
+  "Warning": "Aviso",
+  "Hotkeys": "Teclas de atalho"
 }
diff --git a/public/locales/ro/Common.json b/public/locales/ro/Common.json
index 5bbb3b87ee..0987eefafa 100644
--- a/public/locales/ro/Common.json
+++ b/public/locales/ro/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Vizualizare",
   "ViewWeb": "Accesați versiunea online",
-  "Warning": "Avertisment"
+  "Warning": "Avertisment",
+  "Hotkeys": "Comenzi rapide"
 }
diff --git a/public/locales/ru/Common.json b/public/locales/ru/Common.json
index 0e1201636a..621f057d15 100644
--- a/public/locales/ru/Common.json
+++ b/public/locales/ru/Common.json
@@ -165,5 +165,6 @@
   "Video": "Видео",
   "View": "Просмотр",
   "ViewWeb": "Просмотреть веб-версию",
-  "Warning": "Внимание"
+  "Warning": "Внимание",
+  "Hotkeys": "Горячие клавиши"
 }
diff --git a/public/locales/sk/Common.json b/public/locales/sk/Common.json
index be0e8cc4cb..f3d7eb3ea0 100644
--- a/public/locales/sk/Common.json
+++ b/public/locales/sk/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Vyhliadka",
   "ViewWeb": "Zobraziť webovú verziu",
-  "Warning": "Upozornenie"
+  "Warning": "Upozornenie",
+  "Hotkeys": "Klávesové skratky"
 }
diff --git a/public/locales/sl/Common.json b/public/locales/sl/Common.json
index 31cc0e7a22..7631fd96d5 100644
--- a/public/locales/sl/Common.json
+++ b/public/locales/sl/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Ogled",
   "ViewWeb": "Ogled spletne verzije",
-  "Warning": "Opozorilo"
+  "Warning": "Opozorilo",
+  "Hotkeys": "Bližnjice"
 }
diff --git a/public/locales/tr/Common.json b/public/locales/tr/Common.json
index 2540d205db..0da3192998 100644
--- a/public/locales/tr/Common.json
+++ b/public/locales/tr/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Görüntüle",
   "ViewWeb": "Web sürümünü görüntüle",
-  "Warning": "Uyarı"
+  "Warning": "Uyarı",
+  "Hotkeys": "Kısayol tuşları"
 }
diff --git a/public/locales/uk/Common.json b/public/locales/uk/Common.json
index 65e8cb572a..ab0e4aff83 100644
--- a/public/locales/uk/Common.json
+++ b/public/locales/uk/Common.json
@@ -165,5 +165,6 @@
   "Video": "Відео",
   "View": "Переглянути",
   "ViewWeb": "Переглянути веб-версію",
-  "Warning": "Попередження"
+  "Warning": "Попередження",
+  "Hotkeys": "Сполучення клавіш"
 }
diff --git a/public/locales/vi/Common.json b/public/locales/vi/Common.json
index a755a77268..f78298c28b 100644
--- a/public/locales/vi/Common.json
+++ b/public/locales/vi/Common.json
@@ -165,5 +165,6 @@
   "Video": "Video",
   "View": "Xem",
   "ViewWeb": "Xem phiên bản web",
-  "Warning": "Cảnh báo"
+  "Warning": "Cảnh báo",
+  "Hotkeys": "Phím tắt"
 }
diff --git a/public/locales/zh-CN/Common.json b/public/locales/zh-CN/Common.json
index 61ba4b8c90..1aadce9046 100644
--- a/public/locales/zh-CN/Common.json
+++ b/public/locales/zh-CN/Common.json
@@ -165,5 +165,6 @@
   "Video": "视频",
   "View": "查看",
   "ViewWeb": "查看网页版",
-  "Warning": "警告"
+  "Warning": "警告",
+  "Hotkeys": "快捷键"
 }
diff --git a/web/ASC.Web.Client/public/images/logo/dark_doc_space.svg b/web/ASC.Web.Client/public/images/logo/dark_doc_space.svg
new file mode 100644
index 0000000000..da33357e4b
--- /dev/null
+++ b/web/ASC.Web.Client/public/images/logo/dark_doc_space.svg
@@ -0,0 +1,6 @@
+<svg width="211" height="24" viewBox="0 0 211 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1327 23.7059L0.668542 18.7649C-0.222847 18.3335 -0.222847 17.6669 0.668542 17.2747L4.31161 15.5493L11.0939 18.7649C11.9853 19.1963 13.4193 19.1963 14.2719 18.7649L21.0542 15.5493L24.6973 17.2747C25.5887 17.7061 25.5887 18.3727 24.6973 18.7649L14.2332 23.7059C13.4193 24.098 11.9853 24.098 11.1327 23.7059Z" fill="#FF6F3D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0988 17.5916L0.666506 12.6449C-0.222169 12.213 -0.222169 11.5456 0.666506 11.153L4.2212 9.46484L11.0988 12.7234C11.9874 13.1553 13.4171 13.1553 14.2671 12.7234L21.1447 9.46484L24.6993 11.153C25.588 11.5849 25.588 12.2523 24.6993 12.6449L14.2671 17.5916C13.3784 18.0235 11.9488 18.0235 11.0988 17.5916Z" fill="#95C038"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0988 11.5408L0.666506 6.6652C-0.222169 6.23956 -0.222169 5.58174 0.666506 5.19479L11.0988 0.319233C11.9874 -0.106411 13.4171 -0.106411 14.2671 0.319233L24.6993 5.19479C25.588 5.62044 25.588 6.27825 24.6993 6.6652L14.2671 11.5408C13.3784 11.9277 11.9488 11.9277 11.0988 11.5408Z" fill="#5DC0E8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M171.943 17.1235C172.717 16.5259 173.105 15.693 173.105 14.625C173.105 13.7949 172.864 13.1198 172.383 12.5996C171.907 12.0794 171.032 11.5924 169.76 11.1387C169.001 10.8675 168.437 10.6213 168.066 10.3999C167.701 10.173 167.441 9.92676 167.286 9.66113C167.131 9.38997 167.053 9.04411 167.053 8.62354C167.053 8.05355 167.264 7.60807 167.684 7.28711C168.105 6.96615 168.689 6.80566 169.436 6.80566C170.382 6.80566 171.356 7.01595 172.358 7.43652L172.798 6.20801C171.785 5.7653 170.675 5.54395 169.469 5.54395C168.312 5.54395 167.383 5.82064 166.68 6.37402C165.977 6.92741 165.626 7.67171 165.626 8.60693C165.626 9.49788 165.866 10.2201 166.348 10.7734C166.835 11.3268 167.643 11.8055 168.772 12.2095C169.58 12.4972 170.18 12.7546 170.573 12.9814C170.971 13.2083 171.254 13.4574 171.42 13.7285C171.591 13.9941 171.677 14.3372 171.677 14.7578C171.677 15.3942 171.439 15.8923 170.963 16.252C170.487 16.6061 169.779 16.7832 168.838 16.7832C168.263 16.7832 167.682 16.7223 167.095 16.6006C166.508 16.4788 165.966 16.3128 165.468 16.1025V17.4639C166.243 17.8346 167.35 18.02 168.788 18.02C170.116 18.02 171.168 17.7212 171.943 17.1235ZM144.039 16.2686C145.129 15.2061 145.674 13.6732 145.674 11.6699C145.674 9.79395 145.151 8.33301 144.105 7.28711C143.06 6.24121 141.593 5.71826 139.706 5.71826H135.987V17.854H139.349C141.391 17.854 142.954 17.3255 144.039 16.2686ZM142.985 8.14209C143.782 8.9445 144.18 10.137 144.18 11.7197C144.18 13.3411 143.757 14.5669 142.91 15.397C142.063 16.2215 140.799 16.6338 139.117 16.6338H137.398V6.93848H139.449C141.015 6.93848 142.194 7.33968 142.985 8.14209ZM154.743 16.7749C155.49 15.9393 155.864 14.7799 155.864 13.2969C155.864 11.8525 155.487 10.707 154.735 9.86035C153.988 9.01367 152.978 8.59033 151.705 8.59033C150.388 8.59033 149.359 9.00537 148.617 9.83545C147.876 10.66 147.505 11.8138 147.505 13.2969C147.505 14.2542 147.676 15.0898 148.019 15.8037C148.363 16.5176 148.85 17.0654 149.48 17.4473C150.111 17.8291 150.833 18.02 151.647 18.02C152.964 18.02 153.996 17.605 154.743 16.7749ZM149.63 15.9531C149.165 15.3444 148.933 14.459 148.933 13.2969C148.933 12.1237 149.162 11.241 149.622 10.6489C150.081 10.0568 150.761 9.76074 151.663 9.76074C152.577 9.76074 153.266 10.0623 153.73 10.6655C154.201 11.2632 154.436 12.1403 154.436 13.2969C154.436 14.4645 154.201 15.3527 153.73 15.9614C153.266 16.5646 152.582 16.8662 151.68 16.8662C150.778 16.8662 150.095 16.5618 149.63 15.9531ZM161.753 18.02C160.436 18.02 159.415 17.616 158.69 16.8081C157.971 15.9946 157.611 14.8464 157.611 13.3633C157.611 11.8415 157.976 10.6655 158.707 9.83545C159.443 9.00537 160.489 8.59033 161.845 8.59033C162.282 8.59033 162.719 8.63737 163.156 8.73145C163.593 8.82552 163.936 8.9362 164.185 9.06348L163.762 10.2339C163.458 10.1121 163.126 10.0125 162.766 9.93506C162.406 9.85205 162.088 9.81055 161.811 9.81055C159.963 9.81055 159.039 10.9893 159.039 13.3467C159.039 14.4645 159.263 15.3223 159.711 15.9199C160.165 16.5176 160.835 16.8164 161.72 16.8164C162.478 16.8164 163.256 16.6532 164.053 16.3267V17.5469C163.444 17.8623 162.677 18.02 161.753 18.02ZM179.443 18.02C178.85 18.02 178.308 17.9121 177.816 17.6963C177.329 17.4749 176.919 17.1374 176.587 16.6836H176.487C176.554 17.2148 176.587 17.7184 176.587 18.1943V21.938H175.209V8.75635H176.33L176.521 10.0015H176.587C176.941 9.50342 177.354 9.14372 177.824 8.92236C178.294 8.70101 178.834 8.59033 179.443 8.59033C180.649 8.59033 181.579 9.0026 182.232 9.82715C182.89 10.6517 183.219 11.8083 183.219 13.2969C183.219 14.791 182.885 15.9531 182.215 16.7832C181.551 17.6077 180.627 18.02 179.443 18.02ZM179.243 9.76074C178.314 9.76074 177.641 10.0181 177.226 10.5327C176.811 11.0474 176.598 11.8664 176.587 12.9897V13.2969C176.587 14.5752 176.8 15.491 177.226 16.0444C177.652 16.5923 178.336 16.8662 179.277 16.8662C180.062 16.8662 180.677 16.548 181.119 15.9116C181.568 15.2752 181.792 14.3981 181.792 13.2803C181.792 12.1458 181.568 11.277 181.119 10.6738C180.677 10.0651 180.051 9.76074 179.243 9.76074ZM190.786 16.5591L191.06 17.854H192.081V11.645C192.081 10.5825 191.818 9.81055 191.292 9.3291C190.772 8.84766 189.969 8.60693 188.885 8.60693C188.348 8.60693 187.811 8.67611 187.275 8.81445C186.743 8.9528 186.254 9.14372 185.805 9.38721L186.229 10.4414C187.186 9.97656 188.044 9.74414 188.802 9.74414C189.477 9.74414 189.967 9.91569 190.271 10.2588C190.581 10.5964 190.736 11.1221 190.736 11.8359V12.4004L189.192 12.4502C186.254 12.5387 184.784 13.5016 184.784 15.3389C184.784 16.1966 185.039 16.8579 185.548 17.3228C186.063 17.7876 186.771 18.02 187.673 18.02C188.348 18.02 188.91 17.9204 189.358 17.7212C189.812 17.5164 190.266 17.1291 190.719 16.5591H190.786ZM189.964 16.1772C189.477 16.6476 188.805 16.8828 187.947 16.8828C187.405 16.8828 186.981 16.7528 186.677 16.4927C186.378 16.2326 186.229 15.8535 186.229 15.3555C186.229 14.7191 186.469 14.2515 186.951 13.9526C187.438 13.6483 188.229 13.4767 189.325 13.438L190.703 13.3799V14.2017C190.703 15.0483 190.456 15.7069 189.964 16.1772ZM198.394 18.02C197.077 18.02 196.056 17.616 195.331 16.8081C194.611 15.9946 194.251 14.8464 194.251 13.3633C194.251 11.8415 194.617 10.6655 195.347 9.83545C196.083 9.00537 197.129 8.59033 198.485 8.59033C198.922 8.59033 199.359 8.63737 199.796 8.73145C200.234 8.82552 200.577 8.9362 200.826 9.06348L200.402 10.2339C200.098 10.1121 199.766 10.0125 199.406 9.93506C199.047 9.85205 198.728 9.81055 198.452 9.81055C196.603 9.81055 195.679 10.9893 195.679 13.3467C195.679 14.4645 195.903 15.3223 196.352 15.9199C196.805 16.5176 197.475 16.8164 198.36 16.8164C199.118 16.8164 199.896 16.6532 200.693 16.3267V17.5469C200.084 17.8623 199.318 18.02 198.394 18.02ZM203.345 16.7915C204.125 17.6105 205.188 18.02 206.533 18.02C207.147 18.02 207.67 17.973 208.102 17.8789C208.539 17.7904 209.001 17.641 209.488 17.4307V16.2021C208.53 16.6117 207.562 16.8164 206.582 16.8164C205.653 16.8164 204.931 16.5397 204.416 15.9863C203.907 15.4329 203.638 14.6222 203.611 13.5542H209.878V12.6826C209.878 11.4541 209.546 10.4663 208.882 9.71924C208.218 8.96663 207.316 8.59033 206.176 8.59033C204.958 8.59033 203.987 9.02197 203.262 9.88525C202.543 10.7485 202.183 11.9134 202.183 13.3799C202.183 14.8353 202.57 15.9725 203.345 16.7915ZM204.408 10.458C204.845 9.9821 205.429 9.74414 206.159 9.74414C206.879 9.74414 207.432 9.97656 207.819 10.4414C208.207 10.9007 208.4 11.5648 208.4 12.4336H203.644C203.721 11.5924 203.976 10.9339 204.408 10.458ZM32.2344 12C32.2344 7.64842 35.2011 5.86667 38.2201 5.86667C41.2391 5.86667 44.2058 7.64842 44.2058 12C44.2058 16.3516 41.2391 18.1333 38.2201 18.1333C35.2011 18.1333 32.2344 16.3516 32.2344 12ZM41.5882 12C41.5882 7.93966 39.145 7.57989 38.2201 7.57989C37.2952 7.57989 34.852 7.93966 34.852 12C34.852 16.0603 37.2952 16.4201 38.2201 16.4201C39.145 16.4201 41.5882 16.0603 41.5882 12ZM48.6972 17.9963H46.2191V6.00373H49.4301L53.6533 13.559L54.299 15.1866H54.3513L54.299 13.0622V6.00373H56.777V17.9963H53.566L49.308 10.1497L48.6972 8.81341H48.6448L48.6972 10.9378V17.9963ZM59.2222 17.9963H66.5517V15.9747H61.7003V6.00373H59.2222V17.9963ZM68.96 13.0965L64.4576 6.00373H67.3195L69.8325 10.2182L70.2164 11.0406H70.2688L70.6876 10.2182L73.218 6.00373H75.8357L71.438 13.1307V17.9963H68.96V13.0965ZM81.6093 5.86667C78.5902 5.86667 75.6236 7.64842 75.6236 12C75.6236 16.3516 78.5902 18.1333 81.6093 18.1333C84.6283 18.1333 87.595 16.3516 87.595 12C87.595 7.64842 84.6283 5.86667 81.6093 5.86667ZM81.6093 7.57989C82.5342 7.57989 84.9773 7.93966 84.9773 12C84.9773 16.0603 82.5342 16.4201 81.6093 16.4201C80.6844 16.4201 78.2412 16.0603 78.2412 12C78.2412 7.93966 80.6844 7.57989 81.6093 7.57989ZM92.0864 17.9963H89.6083V6.00373H96.4491V8.02533H92.0864V10.9378H96.2397V12.908H92.0864V17.9963ZM98.1975 17.9963H100.676V12.908H104.829V10.9378H100.676V8.02533H105.038V6.00373H98.1975V17.9963ZM109.265 17.9963H106.787V6.00373H109.265V17.9963ZM120.629 15.5806C120.019 15.8547 119.164 16.1117 118.082 16.1117C115.883 16.1117 113.893 14.9296 113.893 12.0343C113.893 9.58436 115.516 7.88827 118.256 7.88827C119.181 7.88827 119.966 8.05959 120.682 8.3337L120.786 6.27784C119.862 5.98659 119.041 5.86667 118.082 5.86667C114.242 5.86667 111.276 7.93966 111.276 12.0685C111.276 16.4372 114.591 18.1333 117.628 18.1333C118.605 18.1333 119.704 17.9791 120.786 17.6194L120.629 15.5806ZM129.999 17.9963H122.704V6.00373H129.999V8.12812H125.182V10.835H129.562V12.8052H125.182V15.8719H129.999V17.9963Z" fill="#333333"/>
+</svg>
diff --git a/web/ASC.Web.Client/public/images/logo/light_small_doc_space.svg b/web/ASC.Web.Client/public/images/logo/light_small_doc_space.svg
new file mode 100644
index 0000000000..2646d519c1
--- /dev/null
+++ b/web/ASC.Web.Client/public/images/logo/light_small_doc_space.svg
@@ -0,0 +1,16 @@
+<svg width="211" height="24" viewBox="0 0 211 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1327 23.7059L0.668542 18.7649C-0.222847 18.3335 -0.222847 17.6669 0.668542 17.2747L4.31161 15.5493L11.0939 18.7649C11.9853 19.1963 13.4193 19.1963 14.2719 18.7649L21.0542 15.5493L24.6973 17.2747C25.5887 17.7061 25.5887 18.3727 24.6973 18.7649L14.2332 23.7059C13.4193 24.098 11.9853 24.098 11.1327 23.7059Z" fill="#FF6F3D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0988 17.5916L0.666506 12.6449C-0.222169 12.213 -0.222169 11.5456 0.666506 11.153L4.2212 9.46484L11.0988 12.7234C11.9874 13.1553 13.4171 13.1553 14.2671 12.7234L21.1447 9.46484L24.6993 11.153C25.588 11.5849 25.588 12.2523 24.6993 12.6449L14.2671 17.5916C13.3784 18.0235 11.9488 18.0235 11.0988 17.5916Z" fill="#95C038"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0988 11.5408L0.666506 6.6652C-0.222169 6.23956 -0.222169 5.58174 0.666506 5.19479L11.0988 0.319233C11.9874 -0.106411 13.4171 -0.106411 14.2671 0.319233L24.6993 5.19479C25.588 5.62044 25.588 6.27825 24.6993 6.6652L14.2671 11.5408C13.3784 11.9277 11.9488 11.9277 11.0988 11.5408Z" fill="#5DC0E8"/>
+<path d="M38.2221 5.8667C35.203 5.8667 32.2363 7.64845 32.2363 12C32.2363 16.3516 35.203 18.1334 38.2221 18.1334C41.2411 18.1334 44.2078 16.3516 44.2078 12C44.2078 7.64845 41.2411 5.8667 38.2221 5.8667ZM38.2221 7.57992C39.147 7.57992 41.5901 7.9397 41.5901 12C41.5901 16.0604 39.147 16.4201 38.2221 16.4201C37.2971 16.4201 34.854 16.0604 34.854 12C34.854 7.9397 37.2971 7.57992 38.2221 7.57992Z" fill="white"/>
+<path d="M46.2211 6.00376V17.9963H48.6991V10.9378L48.6468 8.81344H48.6991L49.3099 10.1497L53.568 17.9963H56.779V6.00376H54.3009V13.0622L54.3533 15.1866H54.3009L53.6552 13.5591L49.4321 6.00376H46.2211Z" fill="white"/>
+<path d="M59.2242 6.00376V17.9963H66.5537V15.9747H61.7022V6.00376H59.2242Z" fill="white"/>
+<path d="M64.4595 6.00376L68.9619 13.0965V17.9963H71.44V13.1308L75.8376 6.00376H73.22L70.6896 10.2183L70.2707 11.0406H70.2184L69.8345 10.2183L67.3215 6.00376H64.4595Z" fill="white"/>
+<path d="M81.6112 5.8667C78.5922 5.8667 75.6255 7.64845 75.6255 12C75.6255 16.3516 78.5922 18.1334 81.6112 18.1334C84.6303 18.1334 87.597 16.3516 87.597 12C87.597 7.64845 84.6303 5.8667 81.6112 5.8667ZM81.6112 7.57992C82.5361 7.57992 84.9793 7.9397 84.9793 12C84.9793 16.0604 82.5361 16.4201 81.6112 16.4201C80.6863 16.4201 78.2432 16.0604 78.2432 12C78.2432 7.9397 80.6863 7.57992 81.6112 7.57992Z" fill="white"/>
+<path d="M89.6102 6.00376V17.9963H92.0883V12.908H96.2417V10.9378H92.0883V8.02536H96.4511V6.00376H89.6102Z" fill="white"/>
+<path d="M98.1995 6.00376V17.9963H100.678V12.908H104.831V10.9378H100.678V8.02536H105.04V6.00376H98.1995Z" fill="white"/>
+<path d="M106.789 17.9963H109.267V6.00376H106.789V17.9963Z" fill="white"/>
+<path d="M120.631 15.5807C120.021 15.8548 119.165 16.1118 118.083 16.1118C115.885 16.1118 113.895 14.9296 113.895 12.0343C113.895 9.58439 115.518 7.8883 118.258 7.8883C119.183 7.8883 119.968 8.05962 120.684 8.33374L120.788 6.27787C119.864 5.98662 119.043 5.8667 118.083 5.8667C114.244 5.8667 111.278 7.9397 111.278 12.0686C111.278 16.4373 114.593 18.1334 117.63 18.1334C118.607 18.1334 119.706 17.9792 120.788 17.6194L120.631 15.5807Z" fill="white"/>
+<path d="M122.706 6.00376V17.9963H130.001V15.8719H125.184V12.8052H129.564V10.835H125.184V8.12815H130.001V6.00376H122.706Z" fill="white"/>
+<path d="M145.618 11.6699C145.618 13.0368 145.369 14.1795 144.871 15.0981C144.373 16.0112 143.65 16.7002 142.704 17.165C141.763 17.6243 140.621 17.854 139.276 17.854H135.98V5.71826H139.641C140.875 5.71826 141.938 5.94515 142.829 6.39893C143.72 6.84717 144.406 7.514 144.887 8.39941C145.374 9.2793 145.618 10.3695 145.618 11.6699ZM144.132 11.7197C144.132 10.6296 143.949 9.73031 143.584 9.02197C143.224 8.31364 142.693 7.78792 141.99 7.44482C141.293 7.09619 140.438 6.92188 139.425 6.92188H137.392V16.6421H139.11C140.781 16.6421 142.035 16.2298 142.87 15.4053C143.711 14.5807 144.132 13.3522 144.132 11.7197ZM155.782 13.2886C155.782 14.0356 155.685 14.7025 155.492 15.2891C155.298 15.8757 155.018 16.3709 154.653 16.7749C154.288 17.1789 153.845 17.4888 153.325 17.7046C152.81 17.9149 152.227 18.02 151.574 18.02C150.965 18.02 150.406 17.9149 149.897 17.7046C149.393 17.4888 148.956 17.1789 148.585 16.7749C148.22 16.3709 147.935 15.8757 147.73 15.2891C147.531 14.7025 147.432 14.0356 147.432 13.2886C147.432 12.2925 147.6 11.4458 147.938 10.7485C148.275 10.0457 148.757 9.51172 149.382 9.14648C150.013 8.77572 150.763 8.59033 151.632 8.59033C152.462 8.59033 153.187 8.77572 153.807 9.14648C154.432 9.51725 154.916 10.054 155.259 10.7568C155.608 11.4541 155.782 12.298 155.782 13.2886ZM148.859 13.2886C148.859 14.019 148.956 14.6527 149.15 15.1895C149.344 15.7262 149.642 16.1413 150.046 16.4346C150.45 16.7279 150.97 16.8745 151.607 16.8745C152.238 16.8745 152.755 16.7279 153.159 16.4346C153.569 16.1413 153.87 15.7262 154.064 15.1895C154.258 14.6527 154.354 14.019 154.354 13.2886C154.354 12.5636 154.258 11.9383 154.064 11.4126C153.87 10.8813 153.571 10.4718 153.167 10.1841C152.763 9.89632 152.24 9.75244 151.599 9.75244C150.652 9.75244 149.958 10.0651 149.515 10.6904C149.078 11.3158 148.859 12.1818 148.859 13.2886ZM161.639 18.02C160.82 18.02 160.097 17.8512 159.472 17.5137C158.847 17.1761 158.36 16.6615 158.011 15.9697C157.662 15.278 157.488 14.4064 157.488 13.355C157.488 12.2537 157.671 11.3545 158.036 10.6572C158.407 9.95443 158.916 9.43424 159.563 9.09668C160.211 8.75911 160.947 8.59033 161.771 8.59033C162.225 8.59033 162.662 8.63737 163.083 8.73145C163.509 8.81999 163.858 8.93343 164.129 9.07178L163.714 10.2256C163.437 10.1149 163.116 10.0153 162.751 9.92676C162.391 9.83822 162.054 9.79395 161.738 9.79395C161.107 9.79395 160.582 9.92952 160.161 10.2007C159.746 10.4718 159.433 10.8703 159.223 11.396C159.018 11.9217 158.916 12.5692 158.916 13.3384C158.916 14.0744 159.015 14.7025 159.215 15.2227C159.419 15.7428 159.721 16.1413 160.119 16.418C160.523 16.6891 161.027 16.8247 161.63 16.8247C162.112 16.8247 162.546 16.7749 162.933 16.6753C163.321 16.5701 163.672 16.4484 163.988 16.3101V17.5386C163.683 17.6935 163.343 17.8125 162.967 17.8955C162.596 17.9785 162.153 18.02 161.639 18.02ZM173.032 14.625C173.032 15.3444 172.852 15.9587 172.492 16.4678C172.138 16.9714 171.64 17.356 170.998 17.6216C170.356 17.8872 169.601 18.02 168.732 18.02C168.272 18.02 167.838 17.9979 167.428 17.9536C167.019 17.9093 166.643 17.8457 166.3 17.7627C165.956 17.6797 165.655 17.5773 165.395 17.4556V16.1025C165.81 16.2741 166.316 16.4346 166.914 16.584C167.511 16.7279 168.137 16.7998 168.79 16.7998C169.399 16.7998 169.913 16.7196 170.334 16.5591C170.754 16.3931 171.073 16.1579 171.288 15.8535C171.51 15.5436 171.62 15.1729 171.62 14.7412C171.62 14.3262 171.529 13.9803 171.346 13.7036C171.164 13.4214 170.859 13.1668 170.433 12.9399C170.013 12.7075 169.437 12.4613 168.707 12.2012C168.192 12.0186 167.738 11.8193 167.345 11.6035C166.953 11.3822 166.623 11.1331 166.358 10.8564C166.092 10.5798 165.89 10.2588 165.752 9.89355C165.619 9.52832 165.552 9.11051 165.552 8.64014C165.552 7.99268 165.716 7.43929 166.042 6.97998C166.374 6.51514 166.831 6.16097 167.412 5.91748C167.998 5.66846 168.671 5.54395 169.429 5.54395C170.076 5.54395 170.674 5.60482 171.222 5.72656C171.775 5.84831 172.282 6.01156 172.741 6.21631L172.301 7.42822C171.864 7.24561 171.399 7.09342 170.907 6.97168C170.42 6.84993 169.916 6.78906 169.396 6.78906C168.876 6.78906 168.436 6.86654 168.076 7.02148C167.722 7.1709 167.451 7.38395 167.262 7.66064C167.074 7.93734 166.98 8.2666 166.98 8.64844C166.98 9.07454 167.069 9.42871 167.246 9.71094C167.428 9.99316 167.716 10.245 168.109 10.4663C168.508 10.6821 169.033 10.909 169.686 11.147C170.4 11.4071 171.006 11.6838 171.504 11.9771C172.002 12.2648 172.381 12.619 172.641 13.0396C172.901 13.4546 173.032 13.9831 173.032 14.625ZM179.411 8.59033C180.545 8.59033 181.45 8.98047 182.125 9.76074C182.8 10.541 183.138 11.7142 183.138 13.2803C183.138 14.3151 182.983 15.1839 182.673 15.8867C182.363 16.5895 181.926 17.1208 181.362 17.4805C180.803 17.8402 180.141 18.02 179.378 18.02C178.896 18.02 178.473 17.9564 178.108 17.8291C177.742 17.7018 177.43 17.5303 177.17 17.3145C176.91 17.0986 176.694 16.8634 176.522 16.6089H176.423C176.439 16.8247 176.459 17.0848 176.481 17.3892C176.508 17.6935 176.522 17.9591 176.522 18.186V21.9214H175.136V8.75635H176.273L176.456 10.1011H176.522C176.699 9.82438 176.915 9.57259 177.17 9.3457C177.424 9.11328 177.734 8.93066 178.099 8.79785C178.47 8.65951 178.907 8.59033 179.411 8.59033ZM179.17 9.75244C178.539 9.75244 178.03 9.87419 177.643 10.1177C177.261 10.3612 176.981 10.7264 176.804 11.2134C176.627 11.6948 176.533 12.3008 176.522 13.0312V13.2969C176.522 14.0661 176.605 14.7163 176.771 15.2476C176.943 15.7788 177.222 16.1828 177.61 16.4595C178.002 16.7362 178.528 16.8745 179.187 16.8745C179.751 16.8745 180.222 16.7223 180.598 16.418C180.974 16.1136 181.254 15.6903 181.436 15.1479C181.624 14.6001 181.718 13.972 181.718 13.2637C181.718 12.1901 181.508 11.3379 181.088 10.707C180.673 10.0706 180.033 9.75244 179.17 9.75244ZM188.778 8.60693C189.863 8.60693 190.668 8.85042 191.194 9.3374C191.72 9.82438 191.983 10.6019 191.983 11.6699V17.854H190.978L190.713 16.5093H190.646C190.392 16.8413 190.126 17.1208 189.849 17.3477C189.573 17.569 189.252 17.7378 188.886 17.854C188.527 17.9647 188.084 18.02 187.558 18.02C187.005 18.02 186.512 17.9232 186.081 17.7295C185.655 17.5358 185.317 17.2425 185.068 16.8496C184.824 16.4567 184.703 15.9587 184.703 15.3555C184.703 14.4479 185.062 13.7507 185.782 13.2637C186.501 12.7767 187.597 12.5111 189.069 12.4668L190.638 12.4004V11.8442C190.638 11.0584 190.469 10.5078 190.131 10.1924C189.794 9.87695 189.318 9.71924 188.704 9.71924C188.228 9.71924 187.774 9.78841 187.342 9.92676C186.911 10.0651 186.501 10.2284 186.114 10.4165L185.691 9.37061C186.1 9.16032 186.57 8.98047 187.102 8.83105C187.633 8.68164 188.192 8.60693 188.778 8.60693ZM190.621 13.3716L189.235 13.4297C188.101 13.474 187.301 13.6593 186.836 13.9858C186.371 14.3123 186.139 14.7744 186.139 15.3721C186.139 15.8923 186.296 16.2769 186.612 16.5259C186.927 16.7749 187.345 16.8994 187.865 16.8994C188.673 16.8994 189.335 16.6753 189.849 16.2271C190.364 15.7788 190.621 15.1064 190.621 14.21V13.3716ZM198.295 18.02C197.476 18.02 196.754 17.8512 196.129 17.5137C195.504 17.1761 195.017 16.6615 194.668 15.9697C194.319 15.278 194.145 14.4064 194.145 13.355C194.145 12.2537 194.328 11.3545 194.693 10.6572C195.064 9.95443 195.573 9.43424 196.22 9.09668C196.868 8.75911 197.604 8.59033 198.428 8.59033C198.882 8.59033 199.319 8.63737 199.74 8.73145C200.166 8.81999 200.515 8.93343 200.786 9.07178L200.371 10.2256C200.094 10.1149 199.773 10.0153 199.408 9.92676C199.048 9.83822 198.71 9.79395 198.395 9.79395C197.764 9.79395 197.238 9.92952 196.818 10.2007C196.403 10.4718 196.09 10.8703 195.88 11.396C195.675 11.9217 195.573 12.5692 195.573 13.3384C195.573 14.0744 195.672 14.7025 195.872 15.2227C196.076 15.7428 196.378 16.1413 196.776 16.418C197.18 16.6891 197.684 16.8247 198.287 16.8247C198.769 16.8247 199.203 16.7749 199.59 16.6753C199.978 16.5701 200.329 16.4484 200.645 16.3101V17.5386C200.34 17.6935 200 17.8125 199.624 17.8955C199.253 17.9785 198.81 18.02 198.295 18.02ZM206.136 8.59033C206.91 8.59033 207.574 8.76188 208.128 9.10498C208.681 9.44808 209.105 9.92952 209.398 10.5493C209.691 11.1636 209.838 11.883 209.838 12.7075V13.5625H203.554C203.571 14.6305 203.836 15.444 204.351 16.0029C204.866 16.5618 205.591 16.8413 206.526 16.8413C207.101 16.8413 207.61 16.7887 208.053 16.6836C208.496 16.5785 208.955 16.4235 209.431 16.2188V17.4307C208.972 17.6354 208.515 17.7848 208.061 17.8789C207.613 17.973 207.082 18.02 206.468 18.02C205.593 18.02 204.83 17.8429 204.177 17.4888C203.529 17.1291 203.026 16.6034 202.666 15.9116C202.306 15.2199 202.126 14.3732 202.126 13.3716C202.126 12.3921 202.29 11.5454 202.616 10.8315C202.948 10.1121 203.413 9.55876 204.011 9.17139C204.614 8.78402 205.322 8.59033 206.136 8.59033ZM206.119 9.71924C205.383 9.71924 204.796 9.95996 204.359 10.4414C203.922 10.9229 203.662 11.5952 203.579 12.4585H208.393C208.388 11.9162 208.302 11.4403 208.136 11.0308C207.976 10.6157 207.729 10.2948 207.397 10.0679C207.065 9.83545 206.639 9.71924 206.119 9.71924Z" fill="white"/>
+</svg>
diff --git a/web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js b/web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
index 5547c7efdf..d5737b45bb 100644
--- a/web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
+++ b/web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
@@ -76,6 +76,8 @@ const HeaderNav = ({
   buildVersionInfo,
   debugInfo,
   settingsModule,
+  setHotkeyPanelVisible,
+  currentProductId,
 }) => {
   const { t } = useTranslation(["NavMenu", "Common", "About"]);
   const [visibleAboutDialog, setVisibleAboutDialog] = useState(false);
@@ -95,6 +97,10 @@ const HeaderNav = ({
     }
   }, []);
 
+  const onHotkeysClick = useCallback(() => {
+    setHotkeyPanelVisible(true);
+  }, []);
+
   const onCloseDialog = () => setVisibleDialog(false);
   const onDebugClick = useCallback(() => {
     setVisibleDebugDialog(true);
@@ -131,6 +137,18 @@ const HeaderNav = ({
           }
         : null;
 
+    let hotkeys = null;
+    if (modules) {
+      const moduleIndex = modules.findIndex((m) => m.appName === "files");
+      if (moduleIndex !== -1 && modules[moduleIndex].id === currentProductId) {
+        hotkeys = {
+          key: "HotkeysBtn",
+          label: t("Common:Hotkeys"),
+          onClick: onHotkeysClick,
+        };
+      }
+    }
+
     const actions = [
       {
         key: "ProfileBtn",
@@ -148,6 +166,7 @@ const HeaderNav = ({
           target: "_self",
         }),
       },
+      hotkeys,
       {
         key: "AboutBtn",
         label: t("AboutCompanyTitle"),
@@ -171,7 +190,7 @@ const HeaderNav = ({
     }
 
     return actions;
-  }, [onProfileClick, onAboutClick, onLogoutClick]);
+  }, [onProfileClick, onAboutClick, onLogoutClick, currentProductId]);
   //console.log("HeaderNav render");
   return (
     <StyledNav className="profileMenuIcon hidingHeader">
@@ -241,6 +260,7 @@ export default withRouter(
       toggleArticleOpen,
       buildVersionInfo,
       debugInfo,
+      setHotkeyPanelVisible,
     } = settingsStore;
     const { user, userIsUpdate, setUserIsUpdate } = userStore;
     const modules = auth.availableModules;
@@ -264,6 +284,7 @@ export default withRouter(
       buildVersionInfo,
       debugInfo,
       settingsModule,
+      setHotkeyPanelVisible,
     };
   })(observer(HeaderNav))
 );
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/branding.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/branding.js
new file mode 100644
index 0000000000..d676a3f8b0
--- /dev/null
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/branding.js
@@ -0,0 +1,60 @@
+import React, { useState, useEffect } from "react";
+import { withTranslation } from "react-i18next";
+
+import { inject, observer } from "mobx-react";
+
+import withLoading from "../../../../../HOCs/withLoading";
+import Whitelabel from "./settingsBranding/whitelabel";
+import CompanyInfoSettings from "./settingsBranding/companyInfoSettings";
+import styled from "styled-components";
+import AdditionalResources from "./settingsBranding/additionalResources";
+
+const StyledComponent = styled.div`
+  width: 100%;
+  font-weight: 400;
+  font-size: 13px;
+
+  .header {
+    font-weight: 700;
+    font-size: 16px;
+    line-height: 22px;
+    padding-bottom: 16px;
+  }
+
+  .description {
+    padding-bottom: 16px;
+  }
+
+  .settings-block {
+    max-width: 433px;
+    padding-bottom: 32px;
+  }
+
+  .save-cancel-buttons {
+    padding-bottom: 24px;
+  }
+
+  .section-description {
+    color: #657077;
+    line-height: 20px;
+    padding-bottom: 20px;
+  }
+`;
+
+const Branding = (props) => {
+  return (
+    <StyledComponent>
+      <Whitelabel />
+      <div className="section-description">
+        Specify your company information, add links to external resources, and
+        email addresses displayed within the online office interface.
+      </div>
+      <CompanyInfoSettings />
+      <AdditionalResources />
+    </StyledComponent>
+  );
+};
+
+export default inject(({ auth, setup, common }) => {})(
+  withLoading(withTranslation(["Settings", "Common"])(observer(Branding)))
+);
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/index.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/index.js
index f19defd4d7..06435a43b2 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/index.js
@@ -7,7 +7,7 @@ import { combineUrl } from "@appserver/common/utils";
 import config from "../../../../../../package.json";
 import { inject, observer } from "mobx-react";
 import Customization from "./customization";
-import WhiteLabel from "./whitelabel";
+import Branding from "./branding";
 import withLoading from "../../../../../HOCs/withLoading";
 
 const SubmenuCommon = (props) => {
@@ -42,9 +42,9 @@ const SubmenuCommon = (props) => {
       content: <Customization />,
     },
     {
-      id: "whitelabel",
-      name: t("WhiteLabel"),
-      content: <WhiteLabel />,
+      id: "branding",
+      name: t("Branding"),
+      content: <Branding />,
     },
   ];
 
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/additionalResources.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/additionalResources.js
new file mode 100644
index 0000000000..74c552705c
--- /dev/null
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/additionalResources.js
@@ -0,0 +1,57 @@
+import React, { useState, useEffect } from "react";
+import { withTranslation } from "react-i18next";
+import SaveCancelButtons from "@appserver/components/save-cancel-buttons";
+import { inject, observer } from "mobx-react";
+import withLoading from "../../../../../../HOCs/withLoading";
+import styled from "styled-components";
+import Checkbox from "@appserver/components/checkbox";
+
+const StyledComponent = styled.div`
+  .branding-checkbox {
+    padding-bottom: 16px;
+  }
+`;
+
+const AdditionalResources = (props) => {
+  const { t } = props;
+  return (
+    <StyledComponent>
+      <div className="header">Additional resources</div>
+      <div className="description">
+        Choose whether you want to display links to additional resources in
+        Portal modules and sample files in Documents module.
+      </div>
+      <div className="settings-block">
+        <Checkbox
+          className="branding-checkbox"
+          label="Show Feedback & Support link"
+        />
+        <Checkbox className="branding-checkbox" label="Show sample documents" />
+        <Checkbox
+          className="branding-checkbox"
+          label="Show link to Video Guides"
+        />
+        <Checkbox
+          className="branding-checkbox"
+          label="Show link to Help Center"
+        />
+      </div>
+      <SaveCancelButtons
+        id="buttonsCompanyInfoSettings"
+        className="save-cancel-buttons"
+        // onSaveClick={onSavePortalRename}
+        // onCancelClick={onCancelPortalName}
+        saveButtonLabel={t("Common:SaveButton")}
+        cancelButtonLabel={t("Settings:RestoreDefaultButton")}
+        displaySettings={true}
+        // hasScroll={hasScroll}
+      />
+    </StyledComponent>
+  );
+};
+
+export default inject(({ auth, setup, common }) => {})(
+  withLoading(
+    withTranslation(["Settings", "Common"])(observer(AdditionalResources))
+  )
+);
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/companyInfoSettings.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/companyInfoSettings.js
new file mode 100644
index 0000000000..92de8a228d
--- /dev/null
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/companyInfoSettings.js
@@ -0,0 +1,81 @@
+import React, { useState, useEffect } from "react";
+import { withTranslation } from "react-i18next";
+
+import FieldContainer from "@appserver/components/field-container";
+import TextInput from "@appserver/components/text-input";
+import SaveCancelButtons from "@appserver/components/save-cancel-buttons";
+import { inject, observer } from "mobx-react";
+
+import withLoading from "../../../../../../HOCs/withLoading";
+import styled from "styled-components";
+
+const StyledComponent = styled.div``;
+
+const CompanyInfoSettings = (props) => {
+  const { t } = props;
+  return (
+    <StyledComponent>
+      <div className="header">Company info settings</div>
+      <div className="description">
+        This information will be displayed in the About this program window.
+      </div>
+      <div className="settings-block">
+        <FieldContainer
+          id="fieldContainerCompanyName"
+          className="field-container-width"
+          labelText="Company name:"
+          isVertical={true}
+        >
+          <TextInput id="textInputContainerCompanyName" scale={true} />
+        </FieldContainer>
+        <FieldContainer
+          id="fieldContainerEmail"
+          className="field-container-width"
+          labelText="Email:"
+          isVertical={true}
+        >
+          <TextInput id="textInputContainerEmail" scale={true} />
+        </FieldContainer>
+        <FieldContainer
+          id="fieldContainerPhone"
+          className="field-container-width"
+          labelText="Phone:"
+          isVertical={true}
+        >
+          <TextInput id="textInputContainerPhone" scale={true} />
+        </FieldContainer>
+        <FieldContainer
+          id="fieldContainerWebsite"
+          className="field-container-width"
+          labelText="Website:"
+          isVertical={true}
+        >
+          <TextInput id="textInputContainerWebsite" scale={true} />
+        </FieldContainer>
+        <FieldContainer
+          id="fieldContainerAddress"
+          className="field-container-width"
+          labelText="Address:"
+          isVertical={true}
+        >
+          <TextInput id="textInputContainerAddress" scale={true} />
+        </FieldContainer>
+      </div>
+      <SaveCancelButtons
+        id="buttonsCompanyInfoSettings"
+        className="save-cancel-buttons"
+        // onSaveClick={onSavePortalRename}
+        // onCancelClick={onCancelPortalName}
+        saveButtonLabel={t("Common:SaveButton")}
+        cancelButtonLabel={t("Settings:RestoreDefaultButton")}
+        displaySettings={true}
+      />
+    </StyledComponent>
+  );
+};
+
+export default inject(({ auth, setup, common }) => {})(
+  withLoading(
+    withTranslation(["Settings", "Common"])(observer(CompanyInfoSettings))
+  )
+);
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/whitelabel.js
similarity index 95%
rename from web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
rename to web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/whitelabel.js
index 4d22cd6e84..12a3285d52 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/settingsBranding/whitelabel.js
@@ -6,8 +6,7 @@ import FieldContainer from "@appserver/components/field-container";
 import Text from "@appserver/components/text";
 import Loader from "@appserver/components/loader";
 import Button from "@appserver/components/button";
-import toastr from "@appserver/components/toast/toastr";
-import Link from "@appserver/components/link";
+
 import TextInput from "@appserver/components/text-input";
 
 import { inject, observer } from "mobx-react";
@@ -22,10 +21,6 @@ const StyledComponent = styled.div`
     margin-left: 20px;
   }
 
-  .settings-block {
-    margin-bottom: 70px;
-  }
-
   .field-container {
     margin-top: 45px;
   }
@@ -250,7 +245,7 @@ const WhiteLabel = (props) => {
       fd.append("logoText", logoTextWhiteLabel);
 
       fd.append(`logo[${0}][key]`, 1);
-      fd.append(`logo[${0}][value]`, logoUrlsChange.src);
+      fd.append(`logo[${0}][value]`, logoUrlsChange[0].src);
 
       const data = new URLSearchParams(fd);
 
@@ -416,15 +411,27 @@ const WhiteLabel = (props) => {
                 {t("BrowserNoCanvasSupport")}
               </canvas>
             ) : (
-              <img
-                className="border-img logo-dark"
-                src={
-                  logoUrlsChange && logoUrlsChange.some((obj) => obj.id === "2")
-                    ? logoUrlsChange.find((obj) => obj.id === "2").src
-                    : logoUrlsWhiteLabel[1]
-                }
-                alt={t("LogoDark")}
-              />
+              // <img
+              //   className="border-img logo-dark"
+              //   src={
+              //     logoUrlsChange && logoUrlsChange.some((obj) => obj.id === "2")
+              //       ? logoUrlsChange.find((obj) => obj.id === "2").src
+              //       : logoUrlsWhiteLabel[1]
+              //   }
+              //   alt={t("LogoDark")}
+              // />
+
+              <div className="border-img logo-dark">
+                <object
+                  type="image/svg+xml"
+                  data={
+                    logoUrlsChange &&
+                    logoUrlsChange.some((obj) => obj.id === "2")
+                      ? logoUrlsChange.find((obj) => obj.id === "2").src
+                      : logoUrlsWhiteLabel[1]
+                  }
+                ></object>
+              </div>
             )}
           </div>
           {isPortalPaid && (
diff --git a/web/ASC.Web.Client/src/components/pages/Settings/index.js b/web/ASC.Web.Client/src/components/pages/Settings/index.js
index 6c5b8e1525..56c283d5cc 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/index.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/index.js
@@ -46,7 +46,11 @@ const RestoreBackup = lazy(() =>
   import("./categories/data-management/backup/restore-backup")
 );
 
-const WhiteLabel = lazy(() => import("./categories/common/whitelabel"));
+const WhiteLabel = lazy(() =>
+  import("./categories/common/settingsBranding/whitelabel")
+);
+
+const Branding = lazy(() => import("./categories/common/branding"));
 
 const PROXY_BASE_URL = combineUrl(AppServerConfig.proxyURL, "/settings");
 
@@ -54,7 +58,7 @@ const COMMON_URLS = [
   PROXY_BASE_URL,
   combineUrl(PROXY_BASE_URL, "/common"),
   combineUrl(PROXY_BASE_URL, "/common/customization"),
-  combineUrl(PROXY_BASE_URL, "/common/whitelabel"),
+  combineUrl(PROXY_BASE_URL, "/common/branding"),
 ];
 
 const CUSTOMIZATION_URLS = [
diff --git a/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs b/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
index dbaf2c10cf..686f000f1c 100644
--- a/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
+++ b/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
@@ -29,58 +29,58 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text.Json.Serialization;
-
+using System.Text.Json.Serialization;
+
 using ASC.Common;
 using ASC.Common.Logging;
 using ASC.Core;
 using ASC.Core.Common.Settings;
 using ASC.Core.Common.WhiteLabel;
-using ASC.Core.Tenants;
+using ASC.Core.Tenants;
 using ASC.Data.Storage;
 using ASC.Web.Core.Users;
 using ASC.Web.Core.Utility.Skins;
-
-using Microsoft.Extensions.Options;
-
-using SixLabors.ImageSharp;
-
-using TMResourceData;
-
-using UnknownImageFormatException = SixLabors.ImageSharp.UnknownImageFormatException;
-
+
+using Microsoft.Extensions.Options;
+
+using SixLabors.ImageSharp;
+
+using TMResourceData;
+
+using UnknownImageFormatException = SixLabors.ImageSharp.UnknownImageFormatException;
+
 namespace ASC.Web.Core.WhiteLabel
 {
     [Serializable]
     public class TenantWhiteLabelSettings : ISettings
     {
-        public const string DefaultLogoText = BaseWhiteLabelSettings.DefaultLogoText;
-
+        public const string DefaultLogoText = BaseWhiteLabelSettings.DefaultLogoText;
+
         #region Logos information: extension, isDefault, text for img auto generating
 
-        internal string LogoLightSmallExt { get; set; }
-
+        internal string LogoLightSmallExt { get; set; }
+
         [JsonPropertyName("DefaultLogoLightSmall")]
-        internal bool IsDefaultLogoLightSmall { get; set; }
+        internal bool IsDefaultLogoLightSmall { get; set; }
+
+        internal string LogoDarkExt { get; set; }
 
-        internal string LogoDarkExt { get; set; }
-
         [JsonPropertyName("DefaultLogoDark")]
-        internal bool IsDefaultLogoDark { get; set; }
+        internal bool IsDefaultLogoDark { get; set; }
+
+        internal string LogoFaviconExt { get; set; }
 
-        internal string LogoFaviconExt { get; set; }
-
         [JsonPropertyName("DefaultLogoFavicon")]
-        internal bool IsDefaultLogoFavicon { get; set; }
+        internal bool IsDefaultLogoFavicon { get; set; }
+
+        internal string LogoDocsEditorExt { get; set; }
 
-        internal string LogoDocsEditorExt { get; set; }
-
         [JsonPropertyName("DefaultLogoDocsEditor")]
-        internal bool IsDefaultLogoDocsEditor { get; set; }
-
-        internal string LogoDocsEditorEmbedExt;
-
-        [JsonPropertyName("DefaultLogoDocsEditorEmbed")]
+        internal bool IsDefaultLogoDocsEditor { get; set; }
+
+        internal string LogoDocsEditorEmbedExt;
+
+        [JsonPropertyName("DefaultLogoDocsEditorEmbed")]
         internal bool IsDefaultLogoDocsEditorEmbed { get; set; }
 
         public string LogoText { get; set; }
@@ -106,8 +106,8 @@ namespace ASC.Web.Core.WhiteLabel
         public static readonly Size logoLightSmallSize = new Size(284, 46);
         public static readonly Size logoDarkSize = new Size(432, 70);
         public static readonly Size logoFaviconSize = new Size(32, 32);
-        public static readonly Size logoDocsEditorSize = new Size(172, 40);
-        public static readonly Size logoDocsEditorEmbedSize = new Size(172, 40);
+        public static readonly Size logoDocsEditorSize = new Size(172, 40);
+        public static readonly Size logoDocsEditorEmbedSize = new Size(172, 40);
 
         #endregion
 
@@ -120,13 +120,13 @@ namespace ASC.Web.Core.WhiteLabel
                 LogoLightSmallExt = null,
                 LogoDarkExt = null,
                 LogoFaviconExt = null,
-                LogoDocsEditorExt = null,
+                LogoDocsEditorExt = null,
                 LogoDocsEditorEmbedExt = null,
 
                 IsDefaultLogoLightSmall = true,
                 IsDefaultLogoDark = true,
                 IsDefaultLogoFavicon = true,
-                IsDefaultLogoDocsEditor = true,
+                IsDefaultLogoDocsEditor = true,
                 IsDefaultLogoDocsEditorEmbed = true,
 
                 LogoText = null
@@ -148,7 +148,7 @@ namespace ASC.Web.Core.WhiteLabel
                 WhiteLabelLogoTypeEnum.LightSmall => IsDefaultLogoLightSmall,
                 WhiteLabelLogoTypeEnum.Dark => IsDefaultLogoDark,
                 WhiteLabelLogoTypeEnum.Favicon => IsDefaultLogoFavicon,
-                WhiteLabelLogoTypeEnum.DocsEditor => IsDefaultLogoDocsEditor,
+                WhiteLabelLogoTypeEnum.DocsEditor => IsDefaultLogoDocsEditor,
                 WhiteLabelLogoTypeEnum.DocsEditorEmbed => IsDefaultLogoDocsEditorEmbed,
                 _ => true,
             };
@@ -158,20 +158,20 @@ namespace ASC.Web.Core.WhiteLabel
         {
             switch (type)
             {
-                case WhiteLabelLogoTypeEnum.LightSmall:
-                    IsDefaultLogoLightSmall = value;
+                case WhiteLabelLogoTypeEnum.LightSmall:
+                    IsDefaultLogoLightSmall = value;
                     break;
-                case WhiteLabelLogoTypeEnum.Dark:
-                    IsDefaultLogoDark = value;
+                case WhiteLabelLogoTypeEnum.Dark:
+                    IsDefaultLogoDark = value;
                     break;
-                case WhiteLabelLogoTypeEnum.Favicon:
-                    IsDefaultLogoFavicon = value;
+                case WhiteLabelLogoTypeEnum.Favicon:
+                    IsDefaultLogoFavicon = value;
                     break;
-                case WhiteLabelLogoTypeEnum.DocsEditor:
-                    IsDefaultLogoDocsEditor = value;
+                case WhiteLabelLogoTypeEnum.DocsEditor:
+                    IsDefaultLogoDocsEditor = value;
                     break;
-                case WhiteLabelLogoTypeEnum.DocsEditorEmbed:
-                    IsDefaultLogoDocsEditorEmbed = value;
+                case WhiteLabelLogoTypeEnum.DocsEditorEmbed:
+                    IsDefaultLogoDocsEditorEmbed = value;
                     break;
             }
         }
@@ -183,7 +183,7 @@ namespace ASC.Web.Core.WhiteLabel
                 WhiteLabelLogoTypeEnum.LightSmall => LogoLightSmallExt,
                 WhiteLabelLogoTypeEnum.Dark => LogoDarkExt,
                 WhiteLabelLogoTypeEnum.Favicon => LogoFaviconExt,
-                WhiteLabelLogoTypeEnum.DocsEditor => LogoDocsEditorExt,
+                WhiteLabelLogoTypeEnum.DocsEditor => LogoDocsEditorExt,
                 WhiteLabelLogoTypeEnum.DocsEditorEmbed => LogoDocsEditorEmbedExt,
                 _ => "",
             };
@@ -192,28 +192,28 @@ namespace ASC.Web.Core.WhiteLabel
         internal void SetExt(WhiteLabelLogoTypeEnum type, string fileExt)
         {
             switch (type)
-            {
-                case WhiteLabelLogoTypeEnum.LightSmall:
-                    LogoLightSmallExt = fileExt;
+            {
+                case WhiteLabelLogoTypeEnum.LightSmall:
+                    LogoLightSmallExt = fileExt;
                     break;
-                case WhiteLabelLogoTypeEnum.Dark:
-                    LogoDarkExt = fileExt;
+                case WhiteLabelLogoTypeEnum.Dark:
+                    LogoDarkExt = fileExt;
                     break;
-                case WhiteLabelLogoTypeEnum.Favicon:
-                    LogoFaviconExt = fileExt;
+                case WhiteLabelLogoTypeEnum.Favicon:
+                    LogoFaviconExt = fileExt;
                     break;
-                case WhiteLabelLogoTypeEnum.DocsEditor:
-                    LogoDocsEditorExt = fileExt;
+                case WhiteLabelLogoTypeEnum.DocsEditor:
+                    LogoDocsEditorExt = fileExt;
                     break;
-                case WhiteLabelLogoTypeEnum.DocsEditorEmbed:
-                    LogoDocsEditorEmbedExt = fileExt;
+                case WhiteLabelLogoTypeEnum.DocsEditorEmbed:
+                    LogoDocsEditorEmbedExt = fileExt;
                     break;
             }
         }
 
         #endregion
     }
-
+
     [Scope]
     public class TenantWhiteLabelSettingsHelper
     {
@@ -224,7 +224,7 @@ namespace ASC.Web.Core.WhiteLabel
         private StorageFactory StorageFactory { get; }
         private WhiteLabelHelper WhiteLabelHelper { get; }
         private TenantManager TenantManager { get; }
-        private SettingsManager SettingsManager { get; }
+        private SettingsManager SettingsManager { get; }
         public IServiceProvider ServiceProvider { get; }
         private ILog Log { get; set; }
 
@@ -234,7 +234,7 @@ namespace ASC.Web.Core.WhiteLabel
             StorageFactory storageFactory,
             WhiteLabelHelper whiteLabelHelper,
             TenantManager tenantManager,
-            SettingsManager settingsManager,
+            SettingsManager settingsManager,
             IServiceProvider serviceProvider,
             IOptionsMonitor<ILog> option)
         {
@@ -243,51 +243,51 @@ namespace ASC.Web.Core.WhiteLabel
             StorageFactory = storageFactory;
             WhiteLabelHelper = whiteLabelHelper;
             TenantManager = tenantManager;
-            SettingsManager = settingsManager;
-            ServiceProvider = serviceProvider;
+            SettingsManager = settingsManager;
+            ServiceProvider = serviceProvider;
             Log = option.CurrentValue;
-        }
-
+        }
+
         #region Restore default
-
-        public bool IsDefault(TenantWhiteLabelSettings tenantWhiteLabelSettings)
-        {
-            var defaultSettings = tenantWhiteLabelSettings.GetDefault(ServiceProvider) as TenantWhiteLabelSettings;
-
-            if (defaultSettings == null) return false;
-
-            return tenantWhiteLabelSettings.LogoLightSmallExt == defaultSettings.LogoLightSmallExt &&
-                    tenantWhiteLabelSettings.LogoDarkExt == defaultSettings.LogoDarkExt &&
-                    tenantWhiteLabelSettings.LogoFaviconExt == defaultSettings.LogoFaviconExt &&
-                    tenantWhiteLabelSettings.LogoDocsEditorExt == defaultSettings.LogoDocsEditorExt &&
-                    tenantWhiteLabelSettings.LogoDocsEditorEmbedExt == defaultSettings.LogoDocsEditorEmbedExt &&
-
-                    tenantWhiteLabelSettings.IsDefaultLogoLightSmall == defaultSettings.IsDefaultLogoLightSmall &&
-                    tenantWhiteLabelSettings.IsDefaultLogoDark == defaultSettings.IsDefaultLogoDark &&
-                    tenantWhiteLabelSettings.IsDefaultLogoFavicon == defaultSettings.IsDefaultLogoFavicon &&
-                    tenantWhiteLabelSettings.IsDefaultLogoDocsEditor == defaultSettings.IsDefaultLogoDocsEditor &&
-                    tenantWhiteLabelSettings.IsDefaultLogoDocsEditorEmbed == defaultSettings.IsDefaultLogoDocsEditorEmbed &&
-
-                    tenantWhiteLabelSettings.LogoText == defaultSettings.LogoText;
-        }
+
+        public bool IsDefault(TenantWhiteLabelSettings tenantWhiteLabelSettings)
+        {
+            var defaultSettings = tenantWhiteLabelSettings.GetDefault(ServiceProvider) as TenantWhiteLabelSettings;
+
+            if (defaultSettings == null) return false;
+
+            return tenantWhiteLabelSettings.LogoLightSmallExt == defaultSettings.LogoLightSmallExt &&
+                    tenantWhiteLabelSettings.LogoDarkExt == defaultSettings.LogoDarkExt &&
+                    tenantWhiteLabelSettings.LogoFaviconExt == defaultSettings.LogoFaviconExt &&
+                    tenantWhiteLabelSettings.LogoDocsEditorExt == defaultSettings.LogoDocsEditorExt &&
+                    tenantWhiteLabelSettings.LogoDocsEditorEmbedExt == defaultSettings.LogoDocsEditorEmbedExt &&
+
+                    tenantWhiteLabelSettings.IsDefaultLogoLightSmall == defaultSettings.IsDefaultLogoLightSmall &&
+                    tenantWhiteLabelSettings.IsDefaultLogoDark == defaultSettings.IsDefaultLogoDark &&
+                    tenantWhiteLabelSettings.IsDefaultLogoFavicon == defaultSettings.IsDefaultLogoFavicon &&
+                    tenantWhiteLabelSettings.IsDefaultLogoDocsEditor == defaultSettings.IsDefaultLogoDocsEditor &&
+                    tenantWhiteLabelSettings.IsDefaultLogoDocsEditorEmbed == defaultSettings.IsDefaultLogoDocsEditorEmbed &&
+
+                    tenantWhiteLabelSettings.LogoText == defaultSettings.LogoText;
+        }
 
         public void RestoreDefault(TenantWhiteLabelSettings tenantWhiteLabelSettings, TenantLogoManager tenantLogoManager, int tenantId, IDataStore storage = null)
         {
             tenantWhiteLabelSettings.LogoLightSmallExt = null;
             tenantWhiteLabelSettings.LogoDarkExt = null;
             tenantWhiteLabelSettings.LogoFaviconExt = null;
-            tenantWhiteLabelSettings.LogoDocsEditorExt = null;
+            tenantWhiteLabelSettings.LogoDocsEditorExt = null;
             tenantWhiteLabelSettings.LogoDocsEditorEmbedExt = null;
 
             tenantWhiteLabelSettings.IsDefaultLogoLightSmall = true;
             tenantWhiteLabelSettings.IsDefaultLogoDark = true;
             tenantWhiteLabelSettings.IsDefaultLogoFavicon = true;
-            tenantWhiteLabelSettings.IsDefaultLogoDocsEditor = true;
+            tenantWhiteLabelSettings.IsDefaultLogoDocsEditor = true;
             tenantWhiteLabelSettings.IsDefaultLogoDocsEditorEmbed = true;
 
-            tenantWhiteLabelSettings.SetLogoText(null);
-
-            var store = storage ?? StorageFactory.GetStorage(tenantId.ToString(), moduleName);
+            tenantWhiteLabelSettings.SetLogoText(null);
+
+            var store = storage ?? StorageFactory.GetStorage(tenantId.ToString(), moduleName);
 
             try
             {
@@ -346,9 +346,9 @@ namespace ASC.Web.Core.WhiteLabel
             using (var memory = new MemoryStream(data))
             using (var image = Image.Load(memory))
             {
-                var logoFileName = BuildLogoFileName(type, logoFileExt, false);
-
-                memory.Seek(0, SeekOrigin.Begin);
+                var logoFileName = BuildLogoFileName(type, logoFileExt, false);
+
+                memory.Seek(0, SeekOrigin.Begin);
                 store.SaveAsync(logoFileName, memory).Wait();
             }
 
@@ -450,10 +450,10 @@ namespace ASC.Web.Core.WhiteLabel
 
             return type switch
             {
-                WhiteLabelLogoTypeEnum.LightSmall => general ? WebImageSupplier.GetAbsoluteWebPath("logo/light_small_general.svg") : WebImageSupplier.GetAbsoluteWebPath("logo/light_small.svg"),
-                WhiteLabelLogoTypeEnum.Dark => general ? WebImageSupplier.GetAbsoluteWebPath("logo/dark_general.png") : WebImageSupplier.GetAbsoluteWebPath("logo/dark.png"),
-                WhiteLabelLogoTypeEnum.DocsEditor => general ? WebImageSupplier.GetAbsoluteWebPath("logo/editor_logo_general.png") : WebImageSupplier.GetAbsoluteWebPath("logo/editor_logo.png"),
-                WhiteLabelLogoTypeEnum.DocsEditorEmbed => general ? WebImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed_general.png") : WebImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed.png"),
+                WhiteLabelLogoTypeEnum.LightSmall =>  WebImageSupplier.GetAbsoluteWebPath("logo/light_small_doc_space.svg"),
+                WhiteLabelLogoTypeEnum.Dark => WebImageSupplier.GetAbsoluteWebPath("logo/dark_doc_space.svg"),
+                WhiteLabelLogoTypeEnum.DocsEditor => general ? WebImageSupplier.GetAbsoluteWebPath("logo/editor_logo_general.png") : WebImageSupplier.GetAbsoluteWebPath("logo/editor_logo.png"),
+                WhiteLabelLogoTypeEnum.DocsEditorEmbed => general ? WebImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed_general.png") : WebImageSupplier.GetAbsoluteWebPath("logo/editor_logo_embed.png"),
                 WhiteLabelLogoTypeEnum.Favicon => general ? WebImageSupplier.GetAbsoluteWebPath("logo/favicon_general.ico") : WebImageSupplier.GetAbsoluteWebPath("logo/favicon.ico"),
                 _ => "",
             };
@@ -537,10 +537,10 @@ namespace ASC.Web.Core.WhiteLabel
                         general ? TenantWhiteLabelSettings.logoFaviconSize.Height / 2 : TenantWhiteLabelSettings.logoFaviconSize.Height),
                 WhiteLabelLogoTypeEnum.DocsEditor => new Size(
                         general ? TenantWhiteLabelSettings.logoDocsEditorSize.Width / 2 : TenantWhiteLabelSettings.logoDocsEditorSize.Width,
-                        general ? TenantWhiteLabelSettings.logoDocsEditorSize.Height / 2 : TenantWhiteLabelSettings.logoDocsEditorSize.Height),
-                WhiteLabelLogoTypeEnum.DocsEditorEmbed => new Size(
-                        general ? TenantWhiteLabelSettings.logoDocsEditorEmbedSize.Width / 2 : TenantWhiteLabelSettings.logoDocsEditorEmbedSize.Width,
-                        general ? TenantWhiteLabelSettings.logoDocsEditorEmbedSize.Height / 2 : TenantWhiteLabelSettings.logoDocsEditorEmbedSize.Height),
+                        general ? TenantWhiteLabelSettings.logoDocsEditorSize.Height / 2 : TenantWhiteLabelSettings.logoDocsEditorSize.Height),
+                WhiteLabelLogoTypeEnum.DocsEditorEmbed => new Size(
+                        general ? TenantWhiteLabelSettings.logoDocsEditorEmbedSize.Width / 2 : TenantWhiteLabelSettings.logoDocsEditorEmbedSize.Width,
+                        general ? TenantWhiteLabelSettings.logoDocsEditorEmbedSize.Height / 2 : TenantWhiteLabelSettings.logoDocsEditorEmbedSize.Height),
                 _ => new Size(0, 0),
             };
         }
@@ -554,7 +554,7 @@ namespace ASC.Web.Core.WhiteLabel
             try
             {
                 using var stream = new MemoryStream(data);
-                using var img = Image.Load(stream, out var format);
+                using var img = Image.Load(stream, out var format);
 
                 if (size != img.Size())
                 {
@@ -568,7 +568,7 @@ namespace ASC.Web.Core.WhiteLabel
 
                 //fileExt = CommonPhotoManager.GetImgFormatName(imgFormat);
 
-                using var stream2 = new MemoryStream(data);
+                using var stream2 = new MemoryStream(data);
                 store.SaveAsync(fileName, stream2).Wait();
             }
             catch (ArgumentException error)
@@ -591,32 +591,32 @@ namespace ASC.Web.Core.WhiteLabel
         }
 
         public void Save(TenantWhiteLabelSettings tenantWhiteLabelSettings, int tenantId, TenantLogoManager tenantLogoManager, bool restore = false)
-        {
-            SettingsManager.SaveForTenant(tenantWhiteLabelSettings, tenantId);
-
-            if (tenantId == Tenant.DEFAULT_TENANT)
-            {
-                AppliedTenants.Clear();
-            }
-            else
-            {
-                SetNewLogoText(tenantWhiteLabelSettings, tenantId, restore);
-                tenantLogoManager.RemoveMailLogoDataFromCache();
+        {
+            SettingsManager.SaveForTenant(tenantWhiteLabelSettings, tenantId);
+
+            if (tenantId == Tenant.DEFAULT_TENANT)
+            {
+                AppliedTenants.Clear();
+            }
+            else
+            {
+                SetNewLogoText(tenantWhiteLabelSettings, tenantId, restore);
+                tenantLogoManager.RemoveMailLogoDataFromCache();
             }
         }
 
         private void SetNewLogoText(TenantWhiteLabelSettings tenantWhiteLabelSettings, int tenantId, bool restore = false)
         {
-            WhiteLabelHelper.DefaultLogoText = TenantWhiteLabelSettings.DefaultLogoText;
-            var partnerSettings = SettingsManager.LoadForDefaultTenant<TenantWhiteLabelSettings>();
-
-            if (restore && string.IsNullOrEmpty(partnerSettings.GetLogoText(SettingsManager)))
-            {
-                WhiteLabelHelper.RestoreOldText(tenantId);
-            }
-            else
-            {
-                WhiteLabelHelper.SetNewText(tenantId, tenantWhiteLabelSettings.GetLogoText(SettingsManager));
+            WhiteLabelHelper.DefaultLogoText = TenantWhiteLabelSettings.DefaultLogoText;
+            var partnerSettings = SettingsManager.LoadForDefaultTenant<TenantWhiteLabelSettings>();
+
+            if (restore && string.IsNullOrEmpty(partnerSettings.GetLogoText(SettingsManager)))
+            {
+                WhiteLabelHelper.RestoreOldText(tenantId);
+            }
+            else
+            {
+                WhiteLabelHelper.SetNewText(tenantId, tenantWhiteLabelSettings.GetLogoText(SettingsManager));
             }
         }