diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less
index 2e5b4784a..9550df5c4 100644
--- a/apps/common/mobile/resources/less/common-ios.less
+++ b/apps/common/mobile/resources/less/common-ios.less
@@ -41,6 +41,10 @@
     --f7-toggle-inactive-color: @background-menu-divider;
     --f7-actions-button-border-color: @background-menu-divider;
     --f7-popover-bg-color: @background-primary;
+    --f7-dialog-bg-color-rgb: @background-secondary;
+    --f7-dialog-title-text-color: @text-normal;
+    --f7-dialog-text-color: @text-normal;
+    --f7-dialog-border-divider-color: @background-menu-divider;
 
     // Main Toolbar
     #editor-navbar.navbar .right a + a,
@@ -378,12 +382,12 @@
 
     .button-fill {
         color: @brandColor;
-        background-color: @fill-white;
+        background-color: @background-primary;
     }
 
     .button-red {
         color: @text-error;
-        background-color: @fill-white;
+        background-color: @background-primary;
     }
 
     .buttons-list {
@@ -427,7 +431,8 @@
     }
 
     .dialog {
-        background-color: rgba(var(--f7-dialog-bg-color-rgb), 1);
+        // background-color: rgba(var(--f7-dialog-bg-color-rgb), 1);
+        background-color: var(--f7-dialog-bg-color-rgb);
     }
 
     #color-picker {
@@ -586,7 +591,7 @@
         height: 57px;
         line-height: 57px;
         font-size: 20px;
-        color: @brandColor;
+        color: @text-normal;
         white-space: normal;
         text-overflow: ellipsis;
     }
diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less
index 9c58b27f6..674595847 100644
--- a/apps/common/mobile/resources/less/common-material.less
+++ b/apps/common/mobile/resources/less/common-material.less
@@ -7,7 +7,6 @@
     @darkGrey: #757575;
     @text-normal: var(--text-normal);
     @brand-text-on-brand: var(--brand-text-on-brand);
-
     @touchColor: rgba(255,255,255,0.1);
 
     --f7-navbar-shadow-image: none;
@@ -19,7 +18,7 @@
     --f7-navbar-height: 56px;
 
     --f7-subnavbar-bg-color: @toolbar-background;
-    --f7-subnavbar-link-color: @fill-white;
+    --f7-subnavbar-link-color: @toolbar-icons;
     --f7-subnavbar-text-color: @fill-white;
     --f7-subnavbar-height: 56px;
 
@@ -32,6 +31,13 @@
     --f7-link-highlight-color: transparent;
     --f7-link-touch-ripple-color: @touchColor;
 
+    --f7-actions-bg-color: @background-secondary;
+    --f7-popover-bg-color: @background-secondary;
+
+    --f7-dialog-bg-color: @background-secondary;
+    --f7-dialog-text-color: @text-secondary;
+    --f7-dialog-title-text-color: @text-normal;
+
     .button {
         --f7-touch-ripple-color: transparent;
     }
@@ -79,6 +85,8 @@
         --f7-list-item-border-color: @background-menu-divider;
         --f7-list-chevron-icon-color: @text-tertiary;
         --f7-toggle-inactive-color: @background-menu-divider;
+        --f7-actions-button-text-color: @text-normal;
+        --f7-input-text-color: @text-normal;
     }
 
     .add-popup {
@@ -146,7 +154,6 @@
 
     .button-fill {
         color: @brand-text-on-brand;
-        // background-color: @brandColor;
         background-color: transparent;
     }
 
@@ -226,12 +233,11 @@
                 color: @fill-white;
                 i.icon {
                     opacity: 1;
-                    background-color: @fill-white;
+                    // background-color: @fill-white;
                 }
             }
         }
         .tab-link-highlight {
-            // --f7-tabbar-link-active-border-color: rgba(255,255,255,0.5);
             --f7-tabbar-link-active-border-color: @toolbar-icons;
             position: absolute;
             left: 0;
@@ -302,7 +308,6 @@
                             &.active {
                                 color: @fill-white;
                                 background-color: @brandColor;
-                                // background-color: fade(@brandColor, 20%);
                                 i.icon {
                                     background-color: @fill-white;
                                 }
@@ -538,7 +543,9 @@
         cursor: pointer;
         line-height: 48px;
         font-size: 16px;
-        color: rgba(0,0,0,.87);
+        // color: rgba(0,0,0,.87);
+        color: @text-normal;
+        // color: var(--f7-actions-button-text-color, );
     }
 
     @media (min-width: 496px) {
diff --git a/apps/common/mobile/resources/less/icons.less b/apps/common/mobile/resources/less/icons.less
index 9fa830713..ac7a718c2 100644
--- a/apps/common/mobile/resources/less/icons.less
+++ b/apps/common/mobile/resources/less/icons.less
@@ -5,17 +5,17 @@ i.icon {
     &.icon-paste {
         width: 24px;
         height: 24px;
-        .encoded-svg-uncolored-mask('<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M5 2H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10 8H23V23H10V8Z" /><path d="M5 0H14V5H5V0Z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M21 12H12V11H21V12Z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M21 16H12V15H21V16Z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M21 20H12V19H21V20Z" /></svg>');
+        .encoded-svg-mask('<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M5 2H0V20H9V24H24V7H19V2H14V3H18V7H9V19H1V3H5V2ZM10 8H23V23H10V8Z" /><path d="M5 0H14V5H5V0Z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M21 12H12V11H21V12Z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M21 16H12V15H21V16Z" /><path fill-rule="evenodd" clip-rule="evenodd" d="M21 20H12V19H21V20Z" /></svg>', @text-normal);
     }
     &.icon-copy {
         width: 24px;
         height: 24px;
-        .encoded-svg-uncolored-mask('<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M1 1H15V7H16V0H0V17H8V16H1V1Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M23 8H9V23H23V8ZM8 7V24H24V7H8Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M13 5H3V4H13V5Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8 9H3V8H8V9Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8 13H3V12H8V13Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 12H11V11H21V12Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 16H11V15H21V16Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 20H11V19H21V20Z"/></svg>');
+        .encoded-svg-mask('<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M1 1H15V7H16V0H0V17H8V16H1V1Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M23 8H9V23H23V8ZM8 7V24H24V7H8Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M13 5H3V4H13V5Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8 9H3V8H8V9Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M8 13H3V12H8V13Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 12H11V11H21V12Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 16H11V15H21V16Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M21 20H11V19H21V20Z"/></svg>', @text-normal);
     }
     &.icon-cut {
         width: 24px;
         height: 24px;
-        .encoded-svg-uncolored-mask('<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#cut)"><path fill-rule="evenodd" clip-rule="evenodd" d="M3.22427 22.2702C4.51527 23.1269 6.52738 22.7183 7.6592 21.0127C8.79101 19.3071 8.38572 17.2943 7.09472 16.4376C5.80372 15.5809 3.79161 15.9896 2.65979 17.6952C1.52798 19.4008 1.93328 21.4136 3.22427 22.2702ZM2.67135 23.1035C4.51208 24.325 7.11827 23.6364 8.49243 21.5656C9.8666 19.4948 9.48837 16.8259 7.64764 15.6044C5.80691 14.3829 3.20072 15.0714 1.82656 17.1422C0.452398 19.2131 0.830625 21.882 2.67135 23.1035Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20.9158 22.2702C19.6248 23.1269 17.6127 22.7183 16.4809 21.0127C15.349 19.3071 15.7543 17.2943 17.0453 16.4376C18.3363 15.5809 20.3484 15.9896 21.4803 17.6952C22.6121 19.4008 22.2068 21.4136 20.9158 22.2702ZM21.4687 23.1035C19.628 24.325 17.0218 23.6364 15.6476 21.5656C14.2735 19.4948 14.6517 16.8259 16.4924 15.6044C18.3331 14.3829 20.9393 15.0714 22.3135 17.1422C23.6877 19.2131 23.3094 21.882 21.4687 23.1035Z"/><path d="M16.4924 15.6044L13.9037 12.4737L19.9552 0.675715C20.0693 0.446914 19.9552 0.172352 19.727 0.0808313C19.4416 -0.0106892 19.0993 0.0808312 18.9851 0.263872L12.0233 11.4212L5.17562 0.263872C5.06149 0.035071 4.71911 -0.0564496 4.43379 0.035071C4.14847 0.126592 4.03434 0.401153 4.14847 0.629955L10.2001 12.4279L7.64761 15.6044L9.2292 18L12.0233 13.4804L14.9108 18L16.4924 15.6044Z"/></g><defs><clipPath id="cut"><rect width="24" height="24"/></clipPath></defs></svg>');
+        .encoded-svg-mask('<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#cut)"><path fill-rule="evenodd" clip-rule="evenodd" d="M3.22427 22.2702C4.51527 23.1269 6.52738 22.7183 7.6592 21.0127C8.79101 19.3071 8.38572 17.2943 7.09472 16.4376C5.80372 15.5809 3.79161 15.9896 2.65979 17.6952C1.52798 19.4008 1.93328 21.4136 3.22427 22.2702ZM2.67135 23.1035C4.51208 24.325 7.11827 23.6364 8.49243 21.5656C9.8666 19.4948 9.48837 16.8259 7.64764 15.6044C5.80691 14.3829 3.20072 15.0714 1.82656 17.1422C0.452398 19.2131 0.830625 21.882 2.67135 23.1035Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20.9158 22.2702C19.6248 23.1269 17.6127 22.7183 16.4809 21.0127C15.349 19.3071 15.7543 17.2943 17.0453 16.4376C18.3363 15.5809 20.3484 15.9896 21.4803 17.6952C22.6121 19.4008 22.2068 21.4136 20.9158 22.2702ZM21.4687 23.1035C19.628 24.325 17.0218 23.6364 15.6476 21.5656C14.2735 19.4948 14.6517 16.8259 16.4924 15.6044C18.3331 14.3829 20.9393 15.0714 22.3135 17.1422C23.6877 19.2131 23.3094 21.882 21.4687 23.1035Z"/><path d="M16.4924 15.6044L13.9037 12.4737L19.9552 0.675715C20.0693 0.446914 19.9552 0.172352 19.727 0.0808313C19.4416 -0.0106892 19.0993 0.0808312 18.9851 0.263872L12.0233 11.4212L5.17562 0.263872C5.06149 0.035071 4.71911 -0.0564496 4.43379 0.035071C4.14847 0.126592 4.03434 0.401153 4.14847 0.629955L10.2001 12.4279L7.64761 15.6044L9.2292 18L12.0233 13.4804L14.9108 18L16.4924 15.6044Z"/></g><defs><clipPath id="cut"><rect width="24" height="24"/></clipPath></defs></svg>', @text-normal);
     }
     &.icon-prev:after, &.icon-next:after {
         content: none;
diff --git a/apps/common/mobile/resources/less/ios/comments.less b/apps/common/mobile/resources/less/ios/comments.less
index 9bcca5565..cde7c1f88 100644
--- a/apps/common/mobile/resources/less/ios/comments.less
+++ b/apps/common/mobile/resources/less/ios/comments.less
@@ -2,6 +2,9 @@
   .wrap-comment {
     height: calc(100% - 60px);
     background-color: @background-tertiary;
+    .comment-date {
+      color: @text-secondary;
+    }
   }
   .add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog {
     .wrap-textarea {
diff --git a/apps/common/mobile/resources/less/material/comments.less b/apps/common/mobile/resources/less/material/comments.less
index aff51e2f5..98bd8ec3a 100644
--- a/apps/common/mobile/resources/less/material/comments.less
+++ b/apps/common/mobile/resources/less/material/comments.less
@@ -2,6 +2,9 @@
   .wrap-comment {
     height: calc(100% - 72px);
     background-color: @background-tertiary;
+    .comment-date {
+      color: @text-secondary;
+    }
   }
   .add-comment-popup, .add-reply-popup, .add-comment-dialog, .add-reply-dialog {
     .wrap-textarea {
diff --git a/apps/common/mobile/resources/less/material/contextmenu.less b/apps/common/mobile/resources/less/material/contextmenu.less
index 95476f42a..a1a6a9daa 100644
--- a/apps/common/mobile/resources/less/material/contextmenu.less
+++ b/apps/common/mobile/resources/less/material/contextmenu.less
@@ -19,7 +19,7 @@
             }
 
             .list-button {
-                color: #212121;
+                color: @text-normal;
             }
 
             //.item-link {
diff --git a/apps/common/mobile/resources/less/material/icons.less b/apps/common/mobile/resources/less/material/icons.less
index b5fe07c8b..6768ae033 100644
--- a/apps/common/mobile/resources/less/material/icons.less
+++ b/apps/common/mobile/resources/less/material/icons.less
@@ -3,7 +3,7 @@
 .device-android {
     i.icon {
         &.icon_mask {
-            background-color: black;
+            background-color: @text-normal;
         }
         &.icon-logo {
             width: 100px;
diff --git a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
index dfdbd0e32..d00f01ace 100644
--- a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
+++ b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
@@ -144,7 +144,7 @@ const PageLink = props => {
             </List>
             <List className="buttons-list">
                 <ListButton title={_t.textInsert}
-                            className={`button-fill button-raised${typeLink === 1 && link.length < 1 && ' disabled'}`}
+                            className={`button-fill button-raised ${typeLink === 1 && link.length < 1 && ' disabled'}`}
                             onClick={() => {
                                 props.onInsertLink(typeLink, (typeLink === 1 ?
                                     {url: link, display: stateDisplay, tip: screenTip, displayDisabled: displayDisabled } :