From 42ec931e1d09d77a77aebb6140f16db96cdcdb5e Mon Sep 17 00:00:00 2001
From: SergeyEzhin <sergey.ezhin@onlyoffice.com>
Date: Sat, 20 Apr 2024 14:33:06 +0300
Subject: [PATCH 1/7] [DE PE SSE mobile] Fix Bug 66088

---
 apps/documenteditor/mobile/src/view/add/Add.jsx   |  1 -
 .../mobile/src/view/add/AddingPage.jsx            | 10 +++++++++-
 .../mobile/src/view/add/Add.jsx                   |  1 -
 .../mobile/src/view/add/AddingPage.jsx            | 13 +++++++++++--
 .../spreadsheeteditor/mobile/src/view/add/Add.jsx |  1 -
 .../mobile/src/view/add/AddingPage.jsx            | 15 ++++++++++++---
 6 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/add/Add.jsx b/apps/documenteditor/mobile/src/view/add/Add.jsx
index 5bfdd48011..7284631c2e 100644
--- a/apps/documenteditor/mobile/src/view/add/Add.jsx
+++ b/apps/documenteditor/mobile/src/view/add/Add.jsx
@@ -15,7 +15,6 @@ const routes = [
     {
         path: '/adding-page/',
         component: AddingPage,
-        keepAlive: true
     },
     // Image
     {
diff --git a/apps/documenteditor/mobile/src/view/add/AddingPage.jsx b/apps/documenteditor/mobile/src/view/add/AddingPage.jsx
index 09151c44ef..e66c79fe4c 100644
--- a/apps/documenteditor/mobile/src/view/add/AddingPage.jsx
+++ b/apps/documenteditor/mobile/src/view/add/AddingPage.jsx
@@ -49,9 +49,11 @@ const AddLayoutContent = ({ tabs }) => {
     )
 };
 
-const AddingPage = inject("storeFocusObjects", "storeTableSettings")(observer(props => {
+const AddingPage = inject("storeFocusObjects", "storeTableSettings", "storeApplicationSettings")(observer(props => {
     const mainContext = useContext(MainContext);
     const showPanels = mainContext.showPanels;
+    const storeApplicationSettings = props.storeApplicationSettings;
+    const directionMode = storeApplicationSettings.directionMode;
     const storeFocusObjects = props.storeFocusObjects;
     const storeTableSettings = props.storeTableSettings;
     const { t } = useTranslation();
@@ -65,6 +67,12 @@ const AddingPage = inject("storeFocusObjects", "storeTableSettings")(observer(pr
         f7.tab.show('#add-other', false);
     }, []);
 
+    useEffect(() => {
+        if(directionMode === 'rtl') {
+            tabs.reverse();
+        }
+    }, [directionMode])
+
     let needDisable = false,
         canAddTable = true,
         canAddImage = true,
diff --git a/apps/presentationeditor/mobile/src/view/add/Add.jsx b/apps/presentationeditor/mobile/src/view/add/Add.jsx
index 219acdd181..fdf6f193ae 100644
--- a/apps/presentationeditor/mobile/src/view/add/Add.jsx
+++ b/apps/presentationeditor/mobile/src/view/add/Add.jsx
@@ -15,7 +15,6 @@ const routes = [
     {
         path: '/adding-page/',
         component: AddingPage,
-        keepAlive: true
     },
     // Image
     {
diff --git a/apps/presentationeditor/mobile/src/view/add/AddingPage.jsx b/apps/presentationeditor/mobile/src/view/add/AddingPage.jsx
index 27215a97db..44ec47d308 100644
--- a/apps/presentationeditor/mobile/src/view/add/AddingPage.jsx
+++ b/apps/presentationeditor/mobile/src/view/add/AddingPage.jsx
@@ -1,6 +1,7 @@
 import React, { useContext, useEffect } from 'react';
 import { Page, Navbar, NavRight, NavTitle, Link, Icon, Tabs, Tab, f7 } from 'framework7-react';
 import { useTranslation } from 'react-i18next';
+import { observer, inject } from "mobx-react";
 import { Device } from '../../../../../common/mobile/utils/device';
 import AddSlideController from "../../controller/add/AddSlide";
 import AddShapeController from "../../controller/add/AddShape";
@@ -39,10 +40,12 @@ const AddLayoutContent = ({ tabs }) => {
     )
 };
 
-const AddingPage = () => {
+const AddingPage = inject("storeApplicationSettings")(observer(props => {
     const { t } = useTranslation();
     const _t = t('View.Add', {returnObjects: true});
     const api = Common.EditorApi.get();
+    const storeApplicationSettings = props.storeApplicationSettings;
+    const directionMode = storeApplicationSettings.directionMode;
     const countPages = api.getCountPages();
     const mainContext = useContext(MainContext);
     const showPanels = mainContext.showPanels;
@@ -51,6 +54,12 @@ const AddingPage = () => {
     useEffect(() => {
         f7.tab.show('#add-other', false);
     }, []);
+
+    useEffect(() => {
+        if(directionMode === 'rtl') {
+            tabs.reverse();
+        }
+    }, [directionMode])
     
     if (!showPanels && countPages) {
         tabs.push({
@@ -105,6 +114,6 @@ const AddingPage = () => {
             <AddLayoutContent tabs={tabs} />
         </Page>
     )
-};
+}));
 
 export default AddingPage;
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/src/view/add/Add.jsx b/apps/spreadsheeteditor/mobile/src/view/add/Add.jsx
index 3d506e7578..dfcc6b8ae5 100644
--- a/apps/spreadsheeteditor/mobile/src/view/add/Add.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/add/Add.jsx
@@ -16,7 +16,6 @@ const routes = [
     {
         path: '/adding-page/',
         component: AddingPage,
-        keepAlive: true
     },
     // Functions
     {
diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddingPage.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddingPage.jsx
index f31e2f8811..c83d3ce284 100644
--- a/apps/spreadsheeteditor/mobile/src/view/add/AddingPage.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/add/AddingPage.jsx
@@ -1,5 +1,6 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { Page, Navbar, NavTitle, NavRight, Link, Icon, Tabs, Tab, f7 } from 'framework7-react';
+import { observer, inject } from "mobx-react";
 import { useTranslation } from 'react-i18next';
 import { AddChartController } from "../../controller/add/AddChart";
 import { AddFunctionController } from "../../controller/add/AddFunction";
@@ -43,15 +44,23 @@ const AddLayoutContent = ({ tabs }) => {
     )
 };
 
-const AddingPage = () => {
+const AddingPage = inject("storeApplicationSettings")(observer(props => {
     const { t } = useTranslation();
     const _t = t('View.Add', {returnObjects: true});
     const mainContext = useContext(MainContext);
     const addingContext = useContext(AddingContext);
+    const storeApplicationSettings = props.storeApplicationSettings;
+    const directionMode = storeApplicationSettings.directionMode;
     // const wsLock = mainContext.wsLock;
     const wsProps = mainContext.wsProps;
     const showPanels = addingContext.showPanels;
     const tabs = [];
+
+    useEffect(() => {
+        if(directionMode === 'rtl') {
+            tabs.reverse();
+        }
+    }, [directionMode])
     
     if(!wsProps.Objects) {
         if(!showPanels) {
@@ -125,6 +134,6 @@ const AddingPage = () => {
             <AddLayoutContent tabs={tabs} />
         </Page>
     )
-};
+}));
 
 export default AddingPage;
\ No newline at end of file

From 3973951711c35d3fa93defd74625bb6ef1ded12c Mon Sep 17 00:00:00 2001
From: SergeyEzhin <sergey.ezhin@onlyoffice.com>
Date: Sat, 20 Apr 2024 16:35:52 +0300
Subject: [PATCH 2/7] [DE mobile] Fix Bug 65883

---
 apps/common/mobile/resources/less/common-material.less | 10 ++++++++++
 apps/common/mobile/resources/less/material/icons.less  |  5 +++++
 apps/documenteditor/mobile/src/view/DropdownList.jsx   |  6 +++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less
index f1386fbc3a..c0dda2bc99 100644
--- a/apps/common/mobile/resources/less/common-material.less
+++ b/apps/common/mobile/resources/less/common-material.less
@@ -749,4 +749,14 @@
         background-color: @brand-secondary;
         margin-left: 8px;
     }
+
+    .dropdown-list {
+        .icon-radio {
+            display: none;
+        }
+
+        input[type="radio"]:checked + .icon-radio {
+            display: inline-block;
+        }
+    }
 }
diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less
index c513fc5b56..9bfe0a0823 100644
--- a/apps/common/mobile/resources/less/material/icons.less
+++ b/apps/common/mobile/resources/less/material/icons.less
@@ -36,6 +36,11 @@
             height: 24px;
             .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M11.8827 9.00494H12.0235C12.8365 9.00494 13.5402 9.30206 14.1343 9.8963C14.7285 10.4905 15.0256 11.1942 15.0256 12.0074V12.1951L11.8827 9.00494ZM7.56716 9.80247C7.1919 10.5531 7.00426 11.2881 7.00426 12.0074C7.00426 13.3835 7.48898 14.572 8.45842 15.5728C9.45913 16.5424 10.6475 17.0272 12.0235 17.0272C12.7427 17.0272 13.4776 16.8395 14.2281 16.4642L12.6802 14.916C12.43 14.9786 12.2111 15.0099 12.0235 15.0099C11.2104 15.0099 10.5068 14.7128 9.91258 14.1185C9.31841 13.5243 9.02132 12.8206 9.02132 12.0074C9.02132 11.8198 9.05259 11.6008 9.11514 11.3506L7.56716 9.80247ZM2.03198 4.26667L3.29851 3L21.0299 20.7333L19.7633 22C19.607 21.8436 19.1066 21.3588 18.2623 20.5457C17.4492 19.7325 16.8237 19.107 16.3859 18.6691C15.0412 19.2321 13.5871 19.5136 12.0235 19.5136C9.55295 19.5136 7.31699 18.8255 5.31557 17.4494C3.31414 16.0733 1.87562 14.2593 1 12.0074C1.78181 10.0683 3.03269 8.4107 4.75267 7.03457C4.3774 6.65926 3.84577 6.12757 3.15778 5.43951C2.50107 4.75144 2.1258 4.36049 2.03198 4.26667ZM12.0235 6.98765C11.398 6.98765 10.7882 7.11276 10.194 7.36296L8.03625 5.20494C9.25586 4.7358 10.5849 4.50123 12.0235 4.50123C14.494 4.50123 16.7143 5.1893 18.6844 6.56543C20.6859 7.94156 22.1244 9.75556 23 12.0074C22.2495 13.8527 21.108 15.4321 19.5757 16.7457L16.6674 13.837C16.9176 13.2428 17.0426 12.6329 17.0426 12.0074C17.0426 10.6313 16.5423 9.45844 15.5416 8.48889C14.5721 7.48807 13.3994 6.98765 12.0235 6.98765Z"/></svg>', @text-secondary);
         }
+        &.icon-radio {
+            width: 24px;
+            height: 24px;
+            .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9 16L4 11L3 12L9 18L20 7L19 6L9 16Z" /></svg>', @brandColor);
+        }
     }
     .navbar {
         i.icon {
diff --git a/apps/documenteditor/mobile/src/view/DropdownList.jsx b/apps/documenteditor/mobile/src/view/DropdownList.jsx
index 712c34bbc0..d1126f7aa2 100644
--- a/apps/documenteditor/mobile/src/view/DropdownList.jsx
+++ b/apps/documenteditor/mobile/src/view/DropdownList.jsx
@@ -106,15 +106,15 @@ const PageDropdownList = props => {
                 </Navbar>
                 {props.isComboBox ?
                     <>
-                        <List>
-                            <ListItem radio checked={enteredValue} title={enteredValue || t('Edit.textEnterYourOption')} onClick={customOptionClickHandler}></ListItem>
+                        <List className="dropdown-list">
+                            <ListItem radio radioIcon="end" checked={enteredValue.length} title={enteredValue || t('Edit.textEnterYourOption')} name="custom-option" onClick={customOptionClickHandler}></ListItem> 
                         </List>
                         <BlockTitle>{t('Edit.textChooseAnItem')}</BlockTitle>
                     </>
                 : null}
                 <List className="dropdown-list">
                     {listItems.length && listItems.map((item, index) => (
-                        <ListItem radio checked={item.value === curValue && !enteredValue} key={index} className={'no-indicator ' + (index === 0 ? 'dropdown-list__placeholder' : '')} title={item.caption} onClick={() => props.onChangeItemList(item.value)}></ListItem>
+                        <ListItem radioIcon="end" radio checked={item.value === curValue && !enteredValue} key={index} name="dropdown-option" className={'no-indicator ' + (index === 0 ? 'dropdown-list__placeholder' : '')} title={item.caption} onClick={() => props.onChangeItemList(item.value)}></ListItem>
                     ))}
                 </List>
             </Page>

From 3fab4e712a2ee4ea1f28265f74dba824bf778e3d Mon Sep 17 00:00:00 2001
From: SergeyEzhin <sergey.ezhin@onlyoffice.com>
Date: Mon, 22 Apr 2024 20:07:46 +0300
Subject: [PATCH 3/7] [DE mobile] Correct opening of custom option in dropdown
 list

---
 apps/common/mobile/resources/less/common.less |  6 +++++
 .../mobile/src/controller/DropdownList.jsx    |  2 +-
 .../mobile/src/view/DropdownList.jsx          | 23 ++++++++++---------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less
index 000f4db5d1..735f9d9d17 100644
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@@ -1068,6 +1068,12 @@ input[type="number"]::-webkit-inner-spin-button {
     height: 100%;
 }
 
+.dropdown-list-popup {
+    height: 260px;
+    bottom: 0;
+    top: auto;
+}
+
 .dropdown-list {
     &__placeholder  {
         opacity: 0.6;
diff --git a/apps/documenteditor/mobile/src/controller/DropdownList.jsx b/apps/documenteditor/mobile/src/controller/DropdownList.jsx
index 1fd8e98905..040bcacb4d 100644
--- a/apps/documenteditor/mobile/src/controller/DropdownList.jsx
+++ b/apps/documenteditor/mobile/src/controller/DropdownList.jsx
@@ -72,7 +72,7 @@ class DropdownListController extends Component {
 
     closeModal() {
         if(Device.isPhone) {
-            f7.sheet.close('#dropdown-list-sheet', true);
+            f7.popup.close('#dropdown-list-popup', true);
         } else {
             f7.popover.close('#dropdown-list-popover', true);
         }
diff --git a/apps/documenteditor/mobile/src/view/DropdownList.jsx b/apps/documenteditor/mobile/src/view/DropdownList.jsx
index d1126f7aa2..1b04171b38 100644
--- a/apps/documenteditor/mobile/src/view/DropdownList.jsx
+++ b/apps/documenteditor/mobile/src/view/DropdownList.jsx
@@ -1,5 +1,5 @@
 import React, { Component, useEffect, useState } from 'react';
-import { f7, Page, Navbar, List, ListItem, Popover, View, Link, Sheet, Icon, NavRight, BlockTitle, NavLeft } from "framework7-react";
+import { f7, Page, Navbar, List, ListItem, Popover, View, Link, Sheet, Icon, NavRight, BlockTitle, NavLeft, Popup } from "framework7-react";
 import { Device } from '../../../../common/mobile/utils/device';
 import { useTranslation } from 'react-i18next';
 
@@ -28,13 +28,6 @@ const PageCustomOptionList = props => {
     )
 }
 
-const routes = [
-    {
-        path: '/custom-option/',
-        component: PageCustomOptionList
-    }
-]
-
 const PageDropdownList = props => {
     const listItems = props.listItems;
     const curValue = props.curValue;
@@ -122,6 +115,13 @@ const PageDropdownList = props => {
     );
 };
 
+const routes = [
+    {
+        path: '/custom-option/',
+        component: PageCustomOptionList
+    }
+]
+
 class DropdownListView extends Component {
     constructor(props) {
         super(props);
@@ -130,7 +130,7 @@ class DropdownListView extends Component {
     render() {
         return (
             Device.isPhone ? 
-                <Sheet id="dropdown-list-sheet" closeByBackdropClick={true} swipeToClose={true} onSheetClosed={() => this.props.closeModal()}> 
+                <Popup id="dropdown-list-popup" className="dropdown-list-popup" closeByOutsideClick={true} swipeToClose={true} onPopupClosed={() => this.props.closeModal()}> 
                     <PageDropdownList
                         listItems={this.props.listItems}
                         onChangeItemList={this.props.onChangeItemList}
@@ -139,8 +139,9 @@ class DropdownListView extends Component {
                         onAddItem={this.props.onAddItem}
                         curValue={this.props.curValue}
                         enteredValue={this.props.enteredValue}
+                        style={{height: '260px'}}
                     />
-                </Sheet>
+                </Popup>
             : 
                 <Popover id="dropdown-list-popover" className="popover__titled" closeByOutsideClick={true} onPopoverClosed={() => this.props.closeModal()}>
                     <PageDropdownList
@@ -163,7 +164,7 @@ class DropdownListView extends Component {
 const DropdownList = props => {
     useEffect(() => {
         if(Device.isPhone) {
-            f7.sheet.open('#dropdown-list-sheet', true);
+            f7.popup.open('#dropdown-list-popup', true);
         } else {
             f7.popover.open('#dropdown-list-popover', '#dropdown-list-target');
         }

From 41ea213afb2d1595defc902fa1efdf6b374c4c69 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <sergey.ezhin@onlyoffice.com>
Date: Tue, 23 Apr 2024 14:21:04 +0300
Subject: [PATCH 4/7] [common] Correct styles for rtl

---
 apps/common/mobile/resources/less/common-rtl.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/common/mobile/resources/less/common-rtl.less b/apps/common/mobile/resources/less/common-rtl.less
index 46893aef55..0edd0e992e 100644
--- a/apps/common/mobile/resources/less/common-rtl.less
+++ b/apps/common/mobile/resources/less/common-rtl.less
@@ -204,8 +204,9 @@
         margin-right: 20px;
     }
 
-    .list li.no-indicator .item-link .item-inner {
+    .view .list li.no-indicator .item-link .item-inner {
         padding-right: 0;
+        padding-left: 15px;
     }
 
     // Dialog with password

From 58ca2cae5e1000d3324134e429904bda4fdb6352 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <sergey.ezhin@onlyoffice.com>
Date: Tue, 23 Apr 2024 15:12:25 +0300
Subject: [PATCH 5/7] [DE mobile] Added changing color theme for oform and
 docxf formats

---
 apps/documenteditor/mobile/src/controller/Main.jsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx
index c96ae2e0ab..d01e06e939 100644
--- a/apps/documenteditor/mobile/src/controller/Main.jsx
+++ b/apps/documenteditor/mobile/src/controller/Main.jsx
@@ -220,11 +220,19 @@ class MainController extends Component {
                     }
                 }
 
-                let type = data.doc ? /^(?:(pdf))$/.exec(data.doc.fileType) : false;
+                const fileType = data?.doc.fileType;
+                const isFormType = /^(pdf|docxf|oform)$/.test(fileType);
+                const isPDF = fileType === 'pdf';
 
-                if (type && typeof type[1] === 'string') {
+                if(isFormType) {
                     this.changeEditorBrandColorForPdf();
-                    (this.permissions.fillForms===undefined) && (this.permissions.fillForms = (this.permissions.edit!==false));
+                }
+
+                if(isPDF) {
+                    if(this.permissions.fillForms === undefined) {
+                        this.permissions.fillForms = this.permissions.edit !== false;
+                    }
+
                     this.permissions.edit = this.permissions.review = this.permissions.comment = false;
                 }
 

From e1952ed022373f36aee1657d403bc37f4086a1d7 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <sergey.ezhin@onlyoffice.com>
Date: Tue, 23 Apr 2024 15:53:12 +0300
Subject: [PATCH 6/7] [common] Correct logos sizes and dropdown list styles

---
 apps/common/mobile/resources/less/common.less      |  8 ++++++--
 apps/common/mobile/resources/less/ios/icons.less   |  2 +-
 .../mobile/resources/less/material/icons.less      | 14 +++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less
index 735f9d9d17..8e93dfbcdd 100644
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@@ -22,14 +22,17 @@
 
 .navbar.main-navbar {
     height: 0;
+
     &.navbar-with-logo {
         height: 26px;
     }
+
     .navbar-inner {
         display: flex;
         justify-content: center;
-        padding-top: 7px;
+        padding: 0;
     }
+
     .navbar-bg {
         &:before, &:after {
             content: none;
@@ -55,9 +58,10 @@
     display: flex;
     justify-content: center;
     align-items: center;
+    height: 100%;
 
     .custom-logo-image {
-        max-height: 14px;
+        max-height: 20px;
         height: auto;
         width: auto;
     }
diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less
index de738420d2..cb26e112f9 100644
--- a/apps/common/mobile/resources/less/ios/icons.less
+++ b/apps/common/mobile/resources/less/ios/icons.less
@@ -14,7 +14,7 @@
         }
         &.icon-logo {
             width: 100px;
-            height: 14px;
+            height: 20px;
             background: ~"url(@{common-image-path}/header/logo-ios.svg)" no-repeat center;
         }
         &.icon-prev {
diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less
index 9bfe0a0823..cfda917d90 100644
--- a/apps/common/mobile/resources/less/material/icons.less
+++ b/apps/common/mobile/resources/less/material/icons.less
@@ -7,7 +7,7 @@
         }
         &.icon-logo {
             width: 100px;
-            height: 14px;
+            height: 20px;
             background: ~"url(@{common-image-path}/header/logo-android.svg) no-repeat center";
         }
         &.icon-prev {
@@ -36,10 +36,14 @@
             height: 24px;
             .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M11.8827 9.00494H12.0235C12.8365 9.00494 13.5402 9.30206 14.1343 9.8963C14.7285 10.4905 15.0256 11.1942 15.0256 12.0074V12.1951L11.8827 9.00494ZM7.56716 9.80247C7.1919 10.5531 7.00426 11.2881 7.00426 12.0074C7.00426 13.3835 7.48898 14.572 8.45842 15.5728C9.45913 16.5424 10.6475 17.0272 12.0235 17.0272C12.7427 17.0272 13.4776 16.8395 14.2281 16.4642L12.6802 14.916C12.43 14.9786 12.2111 15.0099 12.0235 15.0099C11.2104 15.0099 10.5068 14.7128 9.91258 14.1185C9.31841 13.5243 9.02132 12.8206 9.02132 12.0074C9.02132 11.8198 9.05259 11.6008 9.11514 11.3506L7.56716 9.80247ZM2.03198 4.26667L3.29851 3L21.0299 20.7333L19.7633 22C19.607 21.8436 19.1066 21.3588 18.2623 20.5457C17.4492 19.7325 16.8237 19.107 16.3859 18.6691C15.0412 19.2321 13.5871 19.5136 12.0235 19.5136C9.55295 19.5136 7.31699 18.8255 5.31557 17.4494C3.31414 16.0733 1.87562 14.2593 1 12.0074C1.78181 10.0683 3.03269 8.4107 4.75267 7.03457C4.3774 6.65926 3.84577 6.12757 3.15778 5.43951C2.50107 4.75144 2.1258 4.36049 2.03198 4.26667ZM12.0235 6.98765C11.398 6.98765 10.7882 7.11276 10.194 7.36296L8.03625 5.20494C9.25586 4.7358 10.5849 4.50123 12.0235 4.50123C14.494 4.50123 16.7143 5.1893 18.6844 6.56543C20.6859 7.94156 22.1244 9.75556 23 12.0074C22.2495 13.8527 21.108 15.4321 19.5757 16.7457L16.6674 13.837C16.9176 13.2428 17.0426 12.6329 17.0426 12.0074C17.0426 10.6313 16.5423 9.45844 15.5416 8.48889C14.5721 7.48807 13.3994 6.98765 12.0235 6.98765Z"/></svg>', @text-secondary);
         }
-        &.icon-radio {
-            width: 24px;
-            height: 24px;
-            .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9 16L4 11L3 12L9 18L20 7L19 6L9 16Z" /></svg>', @brandColor);
+    }
+    .dropdown-list {
+        i.icon {
+            &.icon-radio {
+                width: 24px;
+                height: 24px;
+                .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9 16L4 11L3 12L9 18L20 7L19 6L9 16Z" /></svg>', @brandColor);
+            }
         }
     }
     .navbar {

From e6f86568231762e265eb6583b71d072c25f41923 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <sergey.ezhin@onlyoffice.com>
Date: Thu, 25 Apr 2024 10:17:01 +0300
Subject: [PATCH 7/7] [common] Changing logo icon

---
 .../resources/img/header/logo-android.svg     | 28 +++++++++----------
 .../mobile/resources/img/header/logo-ios.svg  | 19 +++++++++----
 .../mobile/resources/less/ios/icons.less      |  2 ++
 .../mobile/resources/less/material/icons.less |  1 +
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/apps/common/mobile/resources/img/header/logo-android.svg b/apps/common/mobile/resources/img/header/logo-android.svg
index 4db5c3e753..bdc0289415 100644
--- a/apps/common/mobile/resources/img/header/logo-android.svg
+++ b/apps/common/mobile/resources/img/header/logo-android.svg
@@ -1,15 +1,15 @@
-<svg width="100" height="14" viewBox="0 0 100 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20.0149 6.48201C19.959 5.79068 20.0611 5.0957 20.3134 4.44954C20.5658 3.80338 20.9618 3.22293 21.4717 2.75199C22.4021 1.92114 23.6137 1.47408 24.8615 1.50116C26.0997 1.47534 27.3009 1.92391 28.2183 2.75479C28.7177 3.23878 29.1043 3.82664 29.3506 4.47661C29.5969 5.12659 29.6969 5.82276 29.6435 6.51568C29.6972 7.20401 29.5972 7.89564 29.3507 8.54068C29.1042 9.18571 28.7175 9.76806 28.2183 10.2457C27.2979 11.0717 26.0988 11.5195 24.8615 11.4993C23.6157 11.5143 22.4085 11.0676 21.4731 10.2457C20.9648 9.76636 20.5701 9.1797 20.3178 8.52855C20.0655 7.8774 19.962 7.17821 20.0149 6.48201ZM22.1052 6.48201C22.0366 7.36424 22.2586 8.2447 22.7374 8.98927C23.0867 9.47357 23.5885 9.82682 24.1626 9.99245C24.2771 10.0259 24.3948 10.0468 24.5138 10.0549C24.6086 10.0549 24.7358 10.0865 24.8306 10.0865C24.9485 10.0904 25.0665 10.0798 25.1818 10.0549C25.3011 10.0496 25.4192 10.0286 25.533 9.99245C26.0978 9.82508 26.589 9.47144 26.9266 8.98927C27.3973 8.25268 27.6189 7.38464 27.5588 6.51288C27.6235 5.64069 27.4016 4.77122 26.9266 4.03648C26.589 3.55431 26.0978 3.20067 25.533 3.0333C25.4186 2.99986 25.3008 2.97892 25.1818 2.97086C25.0554 2.97086 24.9599 2.93929 24.8306 2.93929C24.724 2.93256 24.617 2.94323 24.5138 2.97086C24.3948 2.97892 24.2771 2.99985 24.1626 3.0333C23.5925 3.20713 23.093 3.55868 22.7374 4.03648C22.2389 4.74885 22.0144 5.61693 22.1052 6.48131V6.48201Z" fill="white"/>
-<path d="M30.6865 1.59473H33.2854L36.7055 7.738L37.2119 9.05407H37.2435L37.2119 7.33042V1.59473H39.2068V11.3733H36.6079L33.1878 4.9796L32.6814 3.88241H32.6533L32.6849 5.60606V11.3733H30.6865V1.59473Z" fill="white"/>
-<path d="M41.7406 1.59473H43.767V9.7121H47.6935V11.3733H41.7406V1.59473Z" fill="white"/>
-<path d="M46.6934 1.59473H49.005L51.0315 5.01117L51.3483 5.70077H51.3799L51.7311 5.01117L53.7877 1.59473H55.8781L52.3316 7.39285V11.3733H50.3368V7.36199L46.6934 1.59473Z" fill="white"/>
-<path d="M56.3649 6.48201C56.309 5.79068 56.4111 5.0957 56.6635 4.44954C56.9159 3.80338 57.3119 3.22292 57.8217 2.75199C58.7522 1.92114 59.9638 1.47408 61.2116 1.50116C62.4498 1.47534 63.6509 1.92391 64.5684 2.75479C65.0678 3.23878 65.4543 3.82664 65.7006 4.47661C65.947 5.12659 66.047 5.82276 65.9936 6.51568C66.0472 7.204 65.9472 7.89564 65.7008 8.54068C65.4543 9.18571 65.0675 9.76806 64.5684 10.2457C63.648 11.0717 62.4488 11.5196 61.2116 11.4993C59.9648 11.5197 58.7557 11.0724 57.8231 10.2457C57.3208 9.76193 56.93 9.17457 56.6782 8.52456C56.4264 7.87455 56.3194 7.17751 56.3649 6.48201ZM58.4553 6.48201C58.3867 7.36424 58.6087 8.2447 59.0875 8.98927C59.4305 9.47981 59.9348 9.83478 60.5127 9.99245C60.6271 10.0259 60.7449 10.0468 60.8639 10.0549C60.9587 10.0549 61.0858 10.0865 61.1807 10.0865C61.2986 10.0918 61.4168 10.0812 61.5319 10.0549C61.6512 10.0496 61.7693 10.0286 61.8831 9.99245C62.4478 9.82508 62.9391 9.47144 63.2767 8.98927C63.7473 8.25265 63.9689 7.38464 63.9088 6.51287C63.9736 5.64069 63.7516 4.77122 63.2767 4.03648C62.9391 3.55431 62.4478 3.20067 61.8831 3.0333C61.7686 2.99986 61.6509 2.97892 61.5319 2.97086C61.4054 2.97086 61.3099 2.93929 61.1807 2.93929C61.0741 2.93256 60.9671 2.94322 60.8639 2.97086C60.7449 2.97892 60.6271 2.99985 60.5127 3.0333C59.9425 3.20713 59.4431 3.55868 59.0875 4.03648C58.603 4.75524 58.3799 5.61814 58.4553 6.48131V6.48201Z" fill="white"/>
-<path d="M67.373 1.59473H72.9151V3.22437H69.403V5.60957H72.7598V7.27078H69.403V11.3768H67.373V1.59473Z" fill="white"/>
-<path d="M74.3172 1.59473H79.8592V3.22437H76.3471V5.60957H79.704V7.27078H76.3471V11.3768H74.3172V1.59473Z" fill="white"/>
-<path d="M81.153 11.3733V1.59473H83.1794V11.3733H81.153Z" fill="white"/>
-<path d="M92.8108 1.81254V3.50533C92.4613 3.37879 92.1008 3.28485 91.734 3.22472C91.3256 3.15985 90.9127 3.12841 90.4992 3.13071C90.0507 3.1014 89.6014 3.17354 89.1847 3.34177C88.7681 3.51 88.3948 3.76998 88.0927 4.10233C87.5102 4.76849 87.2044 5.63174 87.2379 6.51558C87.2028 7.36904 87.4839 8.20546 88.0274 8.865C88.3102 9.18731 88.6619 9.44199 89.0566 9.61018C89.4512 9.77836 89.8787 9.85575 90.3074 9.83661C90.6586 9.83661 91.0042 9.80504 91.4158 9.77418C91.8503 9.71406 92.2753 9.59829 92.6802 9.42973L92.8066 11.0909C92.7241 11.1275 92.6394 11.1589 92.553 11.1849C92.4266 11.2165 92.2994 11.2474 92.1414 11.279C91.8878 11.3414 91.571 11.373 91.191 11.4354C90.811 11.467 90.431 11.4978 90.0194 11.4978H89.7026C88.5515 11.4203 87.4543 10.9815 86.5678 10.2442C86.0696 9.78582 85.6824 9.22024 85.4355 8.59028C85.1886 7.96033 85.0884 7.28252 85.1426 6.60818C85.1032 5.92392 85.2068 5.23897 85.4467 4.59683C85.6866 3.95469 86.0576 3.3694 86.5362 2.87816C87.5604 1.96499 88.9039 1.49209 90.2751 1.5621C90.6867 1.5621 91.0667 1.5621 91.3835 1.59367C91.7347 1.62523 92.0487 1.68767 92.3971 1.75011C92.4603 1.78167 92.5551 1.78167 92.6191 1.81254C92.6483 1.79718 92.6808 1.78915 92.7139 1.78915C92.7469 1.78915 92.7795 1.79718 92.8087 1.81254H92.8108Z" fill="white"/>
-<path d="M94.1096 1.59473H100V3.13037H96.1044V5.57519H99.6516V7.07997H96.1044V9.83768H99.9993V11.3733H94.1096V1.59473Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12556 13.8272L0.367848 10.9422C-0.122616 10.6903 -0.122616 10.3012 0.367848 10.0725L2.37233 9.06696L6.10392 10.9436C6.3808 11.0683 6.67805 11.1325 6.9783 11.1325C7.27856 11.1325 7.5758 11.0683 7.85268 10.9436L11.5849 9.06696L13.5894 10.0739C14.0799 10.3258 14.0799 10.7149 13.5894 10.9436L7.8317 13.8286C7.28337 14.0571 6.6752 14.0571 6.12687 13.8286L6.12556 13.8272Z" fill="white" fill-opacity="0.5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12556 10.2803L0.367848 7.39525C-0.122616 7.14334 -0.122616 6.75422 0.367848 6.52553L2.32971 5.54041L6.12556 7.44029C6.40244 7.56494 6.69968 7.62914 6.99994 7.62914C7.30019 7.62914 7.59744 7.56494 7.87432 7.44029L11.6702 5.54041L13.632 6.52553C14.1225 6.77744 14.1225 7.16656 13.632 7.39525L7.87432 10.2803C7.59744 10.4049 7.30019 10.4691 6.99994 10.4691C6.69968 10.4691 6.40244 10.4049 6.12556 10.2803Z" fill="white" fill-opacity="0.75"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.12567 6.82577L0.367955 3.94217C-0.122509 3.69026 -0.122509 3.30114 0.367955 3.07245L6.12567 0.188852C6.40255 0.0642006 6.69979 0 7.00005 0C7.3003 0 7.59755 0.0642006 7.87442 0.188852L13.6321 3.07386C14.1226 3.32577 14.1226 3.71489 13.6321 3.94358L7.87442 6.82858C7.31102 7.0575 6.68907 7.0575 6.12567 6.82858V6.82577Z" fill="white"/>
+<svg width="109" height="20" viewBox="0 0 109 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.6635 4.75171C29.1195 4.75171 26.6197 6.2365 26.6197 9.86282C26.6197 13.4891 29.1195 14.9739 31.6635 14.9739C34.2075 14.9739 36.7073 13.4891 36.7073 9.86282C36.7073 6.2365 34.2075 4.75171 31.6635 4.75171ZM31.6635 6.17939C32.4429 6.17939 34.5016 6.47921 34.5016 9.86282C34.5016 13.2464 32.4429 13.5462 31.6635 13.5462C30.8841 13.5462 28.8254 13.2464 28.8254 9.86282C28.8254 6.47921 30.8841 6.17939 31.6635 6.17939Z" fill="white"/>
+<path d="M38.4038 4.86592V14.8597H40.4919V8.97766L40.4478 7.20733H40.4919L41.0066 8.32092L44.5946 14.8597H47.3004V4.86592H45.2122V10.748L45.2564 12.5183H45.2122L44.6682 11.162L41.1095 4.86592H38.4038Z" fill="white"/>
+<path d="M49.3608 4.86592V14.8597H55.5369V13.175H51.4489V4.86592H49.3608Z" fill="white"/>
+<path d="M53.7723 4.86592L57.5662 10.7765V14.8597H59.6543V10.8051L63.36 4.86592H61.1542L59.022 8.37803L58.6691 9.06332H58.625L58.3015 8.37803L56.1839 4.86592H53.7723Z" fill="white"/>
+<path d="M68.2251 4.75171C65.6811 4.75171 63.1812 6.2365 63.1812 9.86282C63.1812 13.4891 65.6811 14.9739 68.2251 14.9739C70.769 14.9739 73.2689 13.4891 73.2689 9.86282C73.2689 6.2365 70.769 4.75171 68.2251 4.75171ZM68.2251 6.17939C69.0044 6.17939 71.0631 6.47921 71.0631 9.86282C71.0631 13.2464 69.0044 13.5462 68.2251 13.5462C67.4457 13.5462 65.387 13.2464 65.387 9.86282C65.387 6.47921 67.4457 6.17939 68.2251 6.17939Z" fill="white"/>
+<path d="M74.9654 4.86592V14.8597H77.0535V10.6195H80.5533V8.97766H77.0535V6.55059H80.7298V4.86592H74.9654Z" fill="white"/>
+<path d="M82.203 4.86592V14.8597H84.2911V10.6195H87.7909V8.97766H84.2911V6.55059H87.9674V4.86592H82.203Z" fill="white"/>
+<path d="M89.4407 14.8597H91.5288V4.86592H89.4407V14.8597Z" fill="white"/>
+<path d="M101.105 12.8467C100.59 13.0751 99.8699 13.2893 98.9582 13.2893C97.1053 13.2893 95.429 12.3042 95.429 9.89137C95.429 7.84978 96.7965 6.43638 99.1052 6.43638C99.8846 6.43638 100.546 6.57914 101.149 6.80757L101.237 5.09435C100.458 4.85165 99.7669 4.75171 98.9582 4.75171C95.7231 4.75171 93.2232 6.47921 93.2232 9.91993C93.2232 13.5605 96.0172 14.9739 98.5758 14.9739C99.3993 14.9739 100.326 14.8454 101.237 14.5456L101.105 12.8467Z" fill="white"/>
+<path d="M102.853 4.86592V14.8597H109V13.0894H104.941V10.5338H108.632V8.89199H104.941V6.63625H109V4.86592H102.853Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M9.38088 19.7549L0.563343 15.6374C-0.187781 15.2779 -0.187781 14.7224 0.563343 14.3956L3.63315 12.9578L9.34822 15.6374C10.0993 15.9969 11.3077 15.9969 12.0261 15.6374L17.7412 12.9578L20.811 14.3956C21.5621 14.7551 21.5621 15.3106 20.811 15.6374L11.9935 19.7549C11.3077 20.0817 10.0993 20.0817 9.38088 19.7549Z" fill="white"/>
+<path opacity="0.75" fill-rule="evenodd" clip-rule="evenodd" d="M9.3523 14.6595L0.561626 10.5373C-0.187209 10.1774 -0.187209 9.62119 0.561626 9.29402L3.55697 7.88721L9.3523 10.6027C10.1011 10.9626 11.3058 10.9626 12.0221 10.6027L17.8174 7.88721L20.8127 9.29402C21.5616 9.6539 21.5616 10.2101 20.8127 10.5373L12.0221 14.6595C11.2732 15.0194 10.0686 15.0194 9.3523 14.6595Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.3523 9.61731L0.561626 5.55434C-0.187209 5.19964 -0.187209 4.65146 0.561626 4.329L9.3523 0.266028C10.1011 -0.088676 11.3058 -0.088676 12.0221 0.266028L20.8127 4.329C21.5616 4.6837 21.5616 5.23188 20.8127 5.55434L12.0221 9.61731C11.2732 9.93977 10.0686 9.93977 9.3523 9.61731Z" fill="white"/>
 </svg>
diff --git a/apps/common/mobile/resources/img/header/logo-ios.svg b/apps/common/mobile/resources/img/header/logo-ios.svg
index 9f32dc5641..20c4d28cba 100644
--- a/apps/common/mobile/resources/img/header/logo-ios.svg
+++ b/apps/common/mobile/resources/img/header/logo-ios.svg
@@ -1,6 +1,15 @@
-<svg width="100" height="14" viewBox="0 0 100 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M20.313 4.45a4.574 4.574 0 0 0-.298 2.032 4.682 4.682 0 0 0 1.458 3.764 5.042 5.042 0 0 0 3.389 1.253 4.906 4.906 0 0 0 3.356-1.253 4.664 4.664 0 0 0 1.425-3.73 4.729 4.729 0 0 0-1.425-3.761A4.85 4.85 0 0 0 24.861 1.5a4.929 4.929 0 0 0-3.39 1.251 4.578 4.578 0 0 0-1.158 1.698Zm2.424 4.54a4.054 4.054 0 0 1-.632-2.508 3.609 3.609 0 0 1 .632-2.446 2.8 2.8 0 0 1 1.426-1.003 1.65 1.65 0 0 1 .35-.062.985.985 0 0 1 .318-.032 1.2 1.2 0 0 1 .177.016c.056.008.11.016.174.016.119.008.237.029.351.062a2.604 2.604 0 0 1 1.394 1.003c.475.735.697 1.605.632 2.477a4.08 4.08 0 0 1-.632 2.476 2.604 2.604 0 0 1-1.394 1.003 1.36 1.36 0 0 1-.351.063 1.439 1.439 0 0 1-.51.016 1.196 1.196 0 0 0-.158-.016 1.652 1.652 0 0 1-.351-.063 2.67 2.67 0 0 1-1.426-1.003Zm10.548-7.395h-2.598v9.778h1.998V5.606l-.032-1.724h.028l.507 1.098 3.42 6.393h2.599V1.595h-1.995V7.33l.032 1.724h-.032l-.507-1.316-3.42-6.143Zm8.455 0h2.027v8.117h3.926v1.661H41.74V1.595Zm7.265 0h-2.312l3.644 5.767v4.011h1.995v-3.98l3.546-5.798h-2.09L51.73 5.01l-.351.69h-.032l-.316-.69-2.027-3.416Zm7.359 4.887a4.573 4.573 0 0 1 1.457-3.73 4.93 4.93 0 0 1 3.39-1.25 4.85 4.85 0 0 1 3.357 1.253 4.734 4.734 0 0 1 1.425 3.76 4.66 4.66 0 0 1-1.425 3.73 4.906 4.906 0 0 1-3.357 1.254 4.985 4.985 0 0 1-3.388-1.253 4.794 4.794 0 0 1-1.459-3.764Zm2.09 0a4.054 4.054 0 0 0 .633 2.507c.343.49.847.846 1.425 1.003.115.034.233.055.352.063.047 0 .102.008.158.016a1.312 1.312 0 0 0 .51-.016 1.36 1.36 0 0 0 .35-.063 2.605 2.605 0 0 0 1.394-1.003 4.08 4.08 0 0 0 .632-2.476 4.014 4.014 0 0 0-.632-2.477 2.605 2.605 0 0 0-1.393-1.003 1.65 1.65 0 0 0-.352-.062 1.17 1.17 0 0 1-.173-.016 1.22 1.22 0 0 0-.178-.016.985.985 0 0 0-.316.032 1.649 1.649 0 0 0-.352.062 2.79 2.79 0 0 0-1.425 1.003 3.787 3.787 0 0 0-.632 2.446Zm14.461-4.887h-5.542v9.782h2.03V7.27h3.357V5.61h-3.357V3.224h3.512v-1.63Zm1.402 0h5.542v1.63h-3.512V5.61h3.357v1.66h-3.357v4.107h-2.03V1.595Zm6.836 0v9.778h2.027V1.595h-2.027Zm11.657.218v1.692c-.35-.126-.71-.22-1.076-.28a7.601 7.601 0 0 0-1.235-.094 2.99 2.99 0 0 0-2.407.971 3.467 3.467 0 0 0-.855 2.414 3.47 3.47 0 0 0 .79 2.349 2.861 2.861 0 0 0 2.28.972c.297 0 .59-.023.923-.049l.185-.014c.435-.06.86-.176 1.265-.344l.126 1.66a2.16 2.16 0 0 1-.253.095 8.414 8.414 0 0 1-.412.094c-.164.04-.355.068-.572.1-.118.016-.245.034-.378.056-.38.032-.76.063-1.172.063h-.317a5.478 5.478 0 0 1-3.135-1.254 4.458 4.458 0 0 1-1.425-3.636 4.936 4.936 0 0 1 1.394-3.73 5.219 5.219 0 0 1 3.739-1.316c.411 0 .791 0 1.108.032.301.027.575.077.867.13l.147.026c.032.016.072.024.112.032.039.008.078.015.11.03a.204.204 0 0 1 .19 0h.001Zm7.19-.218h-5.89v9.778H100V9.838h-3.896V7.08h3.547V5.575h-3.547V3.13H100V1.595Z" fill="#333"/>
-    <path d="M6.126 13.827.368 10.942c-.49-.252-.49-.64 0-.87l2.004-1.005 3.732 1.877a2.127 2.127 0 0 0 1.749 0l3.732-1.877 2.004 1.007c.49.252.49.64 0 .87l-5.757 2.885a2.206 2.206 0 0 1-1.705 0l-.001-.002Z" fill="#FF6F3D"/>
-    <path d="M6.126 10.28.368 7.395c-.49-.252-.49-.64 0-.87L2.33 5.54l3.796 1.9a2.128 2.128 0 0 0 1.748 0l3.796-1.9 1.962.986c.49.251.49.64 0 .87L7.874 10.28a2.129 2.129 0 0 1-1.748 0Z" fill="#95C038"/>
-    <path d="M6.126 6.826.368 3.942c-.49-.252-.49-.64 0-.87L6.126.19a2.128 2.128 0 0 1 1.748 0l5.758 2.885c.49.252.49.64 0 .87L7.874 6.829a2.312 2.312 0 0 1-1.748 0v-.003Z" fill="#5DC0E8"/>
+<svg width="109" height="20" viewBox="0 0 109 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.33433 19.7549L0.560547 15.6374C-0.186849 15.2779 -0.186849 14.7224 0.560547 14.3956L3.61512 12.9578L9.30183 15.6374C10.0492 15.9969 11.2516 15.9969 11.9665 15.6374L17.6532 12.9578L20.7077 14.3956C21.4551 14.7551 21.4551 15.3106 20.7077 15.6374L11.934 19.7549C11.2516 20.0817 10.0492 20.0817 9.33433 19.7549Z" fill="#FF6F3D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.30589 14.6595L0.558839 10.5372C-0.18628 10.1774 -0.18628 9.62118 0.558839 9.29402L3.53932 7.88721L9.30589 10.6027C10.051 10.9626 11.2497 10.9626 11.9624 10.6027L17.729 7.88721L20.7095 9.29402C21.4546 9.6539 21.4546 10.2101 20.7095 10.5372L11.9624 14.6595C11.2173 15.0194 10.0186 15.0194 9.30589 14.6595Z" fill="#95C038"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.30589 9.6173L0.558839 5.55433C-0.18628 5.19963 -0.18628 4.65145 0.558839 4.32899L9.30589 0.266028C10.051 -0.0886759 11.2497 -0.0886759 11.9624 0.266028L20.7095 4.32899C21.4546 4.6837 21.4546 5.23188 20.7095 5.55433L11.9624 9.6173C11.2173 9.93976 10.0186 9.93976 9.30589 9.6173Z" fill="#5DC0E8"/>
+<path d="M31.6042 4.88892C29.0728 4.88892 26.5854 6.37371 26.5854 10C26.5854 13.6263 29.0728 15.1111 31.6042 15.1111C34.1355 15.1111 36.623 13.6263 36.623 10C36.623 6.37371 34.1355 4.88892 31.6042 4.88892ZM31.6042 6.3166C32.3797 6.3166 34.4282 6.61641 34.4282 10C34.4282 13.3836 32.3797 13.6834 31.6042 13.6834C30.8287 13.6834 28.7802 13.3836 28.7802 10C28.7802 6.61641 30.8287 6.3166 31.6042 6.3166Z" fill="#333333"/>
+<path d="M38.311 5.00313V14.9969H40.3888V9.11486L40.3449 7.34453H40.3888L40.9009 8.45812L44.4711 14.9969H47.1634V5.00313H45.0857V10.8852L45.1296 12.6555H45.0857L44.5443 11.2992L41.0033 5.00313H38.311Z" fill="#333333"/>
+<path d="M49.2136 5.00313V14.9969H55.3591V13.3122H51.2914V5.00313H49.2136Z" fill="#333333"/>
+<path d="M53.6033 5.00313L57.3783 10.9137V14.9969H59.4561V10.9423L63.1434 5.00313H60.9486L58.8269 8.51523L58.4757 9.20052H58.4319L58.1099 8.51523L56.0029 5.00313H53.6033Z" fill="#333333"/>
+<path d="M67.9843 4.88892C65.453 4.88892 62.9655 6.37371 62.9655 10C62.9655 13.6263 65.453 15.1111 67.9843 15.1111C70.5157 15.1111 73.0031 13.6263 73.0031 10C73.0031 6.37371 70.5157 4.88892 67.9843 4.88892ZM67.9843 6.3166C68.7598 6.3166 70.8083 6.61641 70.8083 10C70.8083 13.3836 68.7598 13.6834 67.9843 13.6834C67.2088 13.6834 65.1603 13.3836 65.1603 10C65.1603 6.61641 67.2088 6.3166 67.9843 6.3166Z" fill="#333333"/>
+<path d="M74.6912 5.00313V14.9969H76.7689V10.7567H80.2514V9.11486H76.7689V6.6878H80.427V5.00313H74.6912Z" fill="#333333"/>
+<path d="M81.8929 5.00313V14.9969H83.9707V10.7567H87.4531V9.11486H83.9707V6.6878H87.6287V5.00313H81.8929Z" fill="#333333"/>
+<path d="M89.0946 14.9969H91.1724V5.00313H89.0946V14.9969Z" fill="#333333"/>
+<path d="M100.701 12.9839C100.189 13.2123 99.4721 13.4265 98.5649 13.4265C96.7213 13.4265 95.0532 12.4414 95.0532 10.0286C95.0532 7.98699 96.414 6.57358 98.7112 6.57358C99.4867 6.57358 100.145 6.71635 100.745 6.94478L100.833 5.23156C100.057 4.98885 99.3697 4.88892 98.5649 4.88892C95.3458 4.88892 92.8584 6.61641 92.8584 10.0571C92.8584 13.6977 95.6385 15.1111 98.1845 15.1111C99.0039 15.1111 99.9257 14.9826 100.833 14.6828L100.701 12.9839Z" fill="#333333"/>
+<path d="M102.441 5.00313V14.9969H108.557V13.2266H104.518V10.671H108.191V9.0292H104.518V6.77346H108.557V5.00313H102.441Z" fill="#333333"/>
 </svg>
diff --git a/apps/common/mobile/resources/less/ios/icons.less b/apps/common/mobile/resources/less/ios/icons.less
index cb26e112f9..cc2e505a3c 100644
--- a/apps/common/mobile/resources/less/ios/icons.less
+++ b/apps/common/mobile/resources/less/ios/icons.less
@@ -5,6 +5,7 @@
         i.icon {
             &.icon-logo {
                 background: ~"url(@{common-image-path}/header/logo-android.svg)" no-repeat center;
+                background-size: contain;
             }
         }
     }
@@ -16,6 +17,7 @@
             width: 100px;
             height: 20px;
             background: ~"url(@{common-image-path}/header/logo-ios.svg)" no-repeat center;
+            background-size: contain;
         }
         &.icon-prev {
             width: 22px;
diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less
index cfda917d90..74e02fd9b8 100644
--- a/apps/common/mobile/resources/less/material/icons.less
+++ b/apps/common/mobile/resources/less/material/icons.less
@@ -9,6 +9,7 @@
             width: 100px;
             height: 20px;
             background: ~"url(@{common-image-path}/header/logo-android.svg) no-repeat center";
+            background-size: contain;
         }
         &.icon-prev {
             width: 20px;