diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less
index 1fdd09e1a0..ac9bfdaebd 100644
--- a/apps/common/mobile/resources/less/common.less
+++ b/apps/common/mobile/resources/less/common.less
@@ -124,62 +124,63 @@
         }
     }
 }
-// Bullets, numbers and multilevels
-    .bullets,
-    .numbers,
-    .multilevels {
-        .list{
-            margin: 5px;
-            ul {
-                background: none;
-                &:before, &:after {
-                    display: none;
-                }
-                display: flex;
-                justify-content: space-around;
-                width: 100%;
-                margin-top: 10px;
-                padding:  0 5px;
 
-                li {
-                    width: 70px;
-                    height: 70px;
-                    border: 1px solid @gray;
-                    html.pixel-ratio-2 & {
-                        border: 0.5px solid @gray;
-                    }
-                    html.pixel-ratio-3 & {
-                        border: 0.33px solid @gray;
-                    }
-        
-                    .thumb {
+// Bullets, numbers and multilevels
+
+.bullets,
+.numbers,
+.multilevels {
+    .list {
+        margin: 0;
+        ul {
+            background: none;
+            &:before, &:after {
+                display: none;
+            }
+            display: flex;
+            justify-content: space-around;
+            width: 100%;
+            padding: 5px;
+
+            li {
+                width: 70px;
+                height: 70px;
+                border: 1px solid @gray;
+                html.pixel-ratio-2 & {
+                    border: 0.5px solid @gray;
+                }
+                html.pixel-ratio-3 & {
+                    border: 0.33px solid @gray;
+                }
+    
+                .thumb {
+                    width: 100%;
+                    height: 100%;
+                    background-color: @fill-white;
+                    background-size: cover;
+    
+                    label {
                         width: 100%;
-                        height: 100%;
-                        background-color: @fill-white;
-                        background-size: cover;
-        
-                        label {
-                            width: 100%;
-                            text-align: center;
-                            position: absolute;
-                            top: 34%;
-                            color: @fill-black;
-                        }
+                        text-align: center;
+                        position: absolute;
+                        top: 34%;
+                        color: @fill-black;
                     }
                 }
             }
         }
-        
-        .row.list .item-content {
-            padding-left: 0;
-            min-height: 68px;
-            .item-inner{
-                padding: 0;
-                &:after {
-                    display: none;
-                }
+    }
+    
+    .row.list .item-content {
+        padding-left: 0;
+        min-height: 68px;
+        .item-inner{
+            padding: 0;
+            &:after {
+                display: none;
             }
         }
+    }
 }
 
 .popover__titled .popover-inner{
@@ -195,6 +196,14 @@
     }
 }
 
+.popover .list + .list {
+    margin-top: 0;
+}
+
+.popover .list:first-child li:first-child, .popover .list:first-child li:first-child a, .popover .list:first-child li:first-child > label, .popover .list:last-child li:last-child, .popover .list:last-child li:last-child a, .popover .list:last-child li:last-child > label {
+    border-radius: 0;
+}
+
 .shapes {
     li {
         width: 70px;
diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
index a569c98dd5..2130f74072 100644
--- a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
+++ b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
@@ -227,7 +227,7 @@ class ContextMenu extends ContextMenuController {
         } else {
             const { t } = this.props;
             const _t = t("ContextMenu", {returnObjects: true});
-            const { canViewComments, canCoAuthoring, canComments } = this.props;
+            const { canViewComments, canCoAuthoring, canComments, dataDoc } = this.props;
 
             const api = Common.EditorApi.get();
             const stack = api.getSelectedElements();
diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less
index 0d74a8bc74..bd4c09afb8 100644
--- a/apps/documenteditor/mobile/src/less/app.less
+++ b/apps/documenteditor/mobile/src/less/app.less
@@ -239,3 +239,9 @@
         color: @brandColor;
     }
 }
+
+.calendar-sheet {
+    .calendar-month-picker, .calendar-year-picker {
+        border-top: 1px solid var(--background-menu-divider);
+    }
+}
diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
index b38ce1be0a..7299327b0e 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
@@ -207,11 +207,7 @@ const PageBullets = observer(props => {
                             <ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) && 
                                 (storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
                                 onClick={() => {
-                                    if (bullet.type === -1) {
-                                        storeTextSettings.resetBullets(-1);
-                                    } else {
-                                        storeTextSettings.resetBullets(bullet.type);
-                                    }
+                                    storeTextSettings.resetBullets(bullet.type);
                                     props.onBullet(bullet.type);
                                 }}>
                                 {bullet.thumb.length < 1 ?
@@ -256,11 +252,7 @@ const PageNumbers = observer(props => {
                         <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) && 
                             (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
                             onClick={() => {
-                                if (number.type === -1) {
-                                    storeTextSettings.resetNumbers(-1);
-                                } else {
-                                    storeTextSettings.resetNumbers(number.type);
-                                }
+                                storeTextSettings.resetNumbers(number.type);
                                 props.onNumber(number.type);
                             }}>
                             {number.thumb.length < 1 ?
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
index e6bcb068cb..8fae5157ff 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
@@ -490,7 +490,7 @@ const PageAdditionalFormatting = props => {
     )
 };
 
-const PageBullets = props => {
+const PageBullets = observer(props => {
     const { t } = useTranslation();
     const _t = t('View.Edit', {returnObjects: true});
     const bulletArrays = [
@@ -525,11 +525,8 @@ const PageBullets = props => {
                             <ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) && 
                                 (storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
                                 onClick={() => {
-                                    if (bullet.type === -1) {
-                                        storeTextSettings.resetBullets(-1);
-                                    }
-                                    props.onBullet(bullet.type)
-                                    props.f7router.back();
+                                    storeTextSettings.resetBullets(bullet.type);
+                                    props.onBullet(bullet.type);
                                 }}>
                                 {bullet.thumb.length < 1 ?
                                     <Icon className="thumb" style={{position: 'relative'}}>
@@ -543,9 +540,9 @@ const PageBullets = props => {
             ))}
         </View>
     )
-};
+});
 
-const PageNumbers = props => {
+const PageNumbers = observer(props => {
     const { t } = useTranslation();
     const _t = t('View.Edit', {returnObjects: true});
     const numberArrays = [
@@ -573,7 +570,7 @@ const PageNumbers = props => {
         return null;
     }
 
-    return(
+    return (
         <View className='numbers dataview'>
             {numberArrays.map((numbers, index) => (
                 <List className="row" style={{listStyle: 'none'}} key={'numbers-' + index}>
@@ -581,11 +578,8 @@ const PageNumbers = props => {
                         <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) && 
                             (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
                             onClick={() => {
-                                if (number.type === -1) {
-                                    storeTextSettings.resetNumbers(-1);
-                                }
-                                props.onNumber(number.type)
-                                props.f7router.back();
+                                storeTextSettings.resetNumbers(number.type);
+                                props.onNumber(number.type);
                             }}>
                             {number.thumb.length < 1 ?
                                 <Icon className="thumb" style={{position: 'relative'}}>
@@ -599,7 +593,7 @@ const PageNumbers = props => {
             ))}
         </View>
     )
-};
+});
 
 const PageBulletsAndNumbers = props => {
     const { t } = useTranslation();