diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index e4d45c1df..37923cf62 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -140,17 +140,20 @@ export default {
             if (!routeName) {
                 return null
             }
-            if (['manage-messenger', 'manage-project'].includes(routeName)) {
-                return '#f8f8f8'
-            }
-            if (routeName.startsWith('manage-setting')) {
+            if (['manage-messenger', 'manage-project'].includes(routeName) || routeName.startsWith('manage-setting')) {
                 return '#f8f8f8'
             }
             return null
         },
 
-        navigationColor({statusColor, mobileTabbar}) {
-            return statusColor || (mobileTabbar ? '#f8f8f8' : null)
+        navigationColor({routeName, mobileTabbar}) {
+            if (!routeName) {
+                return null
+            }
+            if (['manage-messenger', 'manage-project', 'manage-setting'].includes(routeName)) {
+                return '#f8f8f8'
+            }
+            return mobileTabbar ? '#f8f8f8' : null
         },
 
         rootStyle() {
diff --git a/resources/assets/js/components/DrawerOverlay/index.vue b/resources/assets/js/components/DrawerOverlay/index.vue
index e43ca106e..58f1a36dc 100644
--- a/resources/assets/js/components/DrawerOverlay/index.vue
+++ b/resources/assets/js/components/DrawerOverlay/index.vue
@@ -10,7 +10,9 @@
         :beforeClose="beforeClose"
         fullscreen
         :class-name="modalClass">
-        <slot v-if="isFullscreen" />
+        <div v-if="isFullscreen" class="overlay-body">
+            <slot/>
+        </div>
         <DrawerOverlayView v-else
             :placement="transitionName"
             :size="size"
diff --git a/resources/assets/sass/components/drawer-overlay.scss b/resources/assets/sass/components/drawer-overlay.scss
index 139f14e16..a18558265 100644
--- a/resources/assets/sass/components/drawer-overlay.scss
+++ b/resources/assets/sass/components/drawer-overlay.scss
@@ -27,8 +27,8 @@
         height: 100%;
         max-width: 100%;
         max-height: 100%;
-        z-index: 2;
         position: relative;
+        z-index: 2;
 
         .overlay-close {
             flex-shrink: 0;
@@ -116,6 +116,23 @@
     }
 }
 
+
+.common-drawer-modal {
+    .ivu-modal-fullscreen {
+        background-color: #ffffff;
+    }
+
+    .overlay-body {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        height: 100%;
+        max-width: 100%;
+        max-height: 100%;
+        position: relative;
+    }
+}
+
 .drawer-slide-bottom-enter-active {
     transition: all .2s ease;
 }
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index b60537692..24ec956b7 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -293,15 +293,6 @@ body {
                 padding-bottom: 35px;
             }
 
-            &.ivu-modal-fullscreen {
-                top: 0;
-                padding-bottom: 0;
-                .ivu-modal-content {
-                    border-radius: 0;
-                    box-shadow: none;
-                }
-            }
-
             .ivu-modal-header,
             .ivu-modal-footer {
                 border-color: transparent;
@@ -372,9 +363,9 @@ body {
             }
 
             .ivu-modal-content {
-                border-radius: 18px;
                 margin-top: var(--status-bar-height);
                 margin-bottom: var(--navigation-bar-height);
+                border-radius: 18px;
 
                 .ivu-modal-close {
                     .ivu-icon-ios-close {
@@ -391,6 +382,16 @@ body {
                     }
                 }
             }
+
+            &.ivu-modal-fullscreen {
+                top: 0;
+                padding-bottom: 0;
+
+                .ivu-modal-content {
+                    border-radius: 0;
+                    box-shadow: none;
+                }
+            }
         }
 
         .ivu-modal-confirm {
@@ -821,16 +822,19 @@ body {
         &.common-drawer-overlay {
             overflow: hidden;
         }
-        &.common-drawer-modal{
-            .ivu-modal-body{
+
+        &.common-drawer-modal {
+            .ivu-modal-body {
                 padding: 0 !important;
-                .dialog-wrapper{
-                    &.inde-list{
+
+                .dialog-wrapper {
+                    &.inde-list {
                         border-radius: 0
                     }
                 }
             }
-            .ivu-modal-close{
+
+            .ivu-modal-close {
                 z-index: 3;
             }
         }
diff --git a/resources/assets/sass/pages/components/dialog-modal.scss b/resources/assets/sass/pages/components/dialog-modal.scss
index 7f4b8e726..9a53cee82 100644
--- a/resources/assets/sass/pages/components/dialog-modal.scss
+++ b/resources/assets/sass/pages/components/dialog-modal.scss
@@ -15,6 +15,10 @@ body {
                         overflow: hidden;
                     }
                 }
+
+                &.ivu-modal-fullscreen {
+                    background-color: #f8f8f8;
+                }
             }
         }
 
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 56bac52c6..53c44bda9 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -955,6 +955,7 @@
                                     > video {
                                         width: 100%;
                                         height: 100%;
+                                        border-radius: 6px;
                                     }
 
                                     .file-play {