diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 998430be..9a900165 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -29,7 +29,7 @@
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a2eed5073e52410cab54",
     "/chunks/files.js": "/chunks/files.js?id=b738eb9054e663cc32b7",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=b646ec02fb9d6a497e74",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=5599570714caa0767318",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=9c391425374e06048419",
     "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=47ade53389e84dd64310",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=d5e39543eeb619cb5513",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=be9304e6ba2c61b6cab3",
@@ -75,36 +75,52 @@
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=c001bef2d6d5171cb359",
     "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c",
-    "/js/main.ca5620f86f480d0f5394.hot-update.js": "/js/main.ca5620f86f480d0f5394.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.ca5620f86f480d0f5394.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ca5620f86f480d0f5394.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.7804736ea0e1a35f82a8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7804736ea0e1a35f82a8.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.da92be8e8c83f54be91a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.da92be8e8c83f54be91a.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.9c3c3cf133612b1077c6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9c3c3cf133612b1077c6.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.c7928462db8b6d8d8923.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c7928462db8b6d8d8923.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.f1a0492c6dfc169bae03.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f1a0492c6dfc169bae03.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.e20de182bda56b40f512.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e20de182bda56b40f512.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.97418ced795bd0d35ab7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.97418ced795bd0d35ab7.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.86909252ac1ab37beba0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.86909252ac1ab37beba0.hot-update.js",
-    "/js/main.b900dd3a01121f3a3af0.hot-update.js": "/js/main.b900dd3a01121f3a3af0.hot-update.js",
-    "/js/main.1680b2900bb6a92fd3f7.hot-update.js": "/js/main.1680b2900bb6a92fd3f7.hot-update.js",
-    "/js/main.3a62dbdbd8e7f3a1a45d.hot-update.js": "/js/main.3a62dbdbd8e7f3a1a45d.hot-update.js",
-    "/js/main.a57853684d17d67c12c8.hot-update.js": "/js/main.a57853684d17d67c12c8.hot-update.js",
-    "/js/main.52d5aa46e5debf2577fc.hot-update.js": "/js/main.52d5aa46e5debf2577fc.hot-update.js",
-    "/js/main.90bca3053b67a1727321.hot-update.js": "/js/main.90bca3053b67a1727321.hot-update.js",
-    "/js/main.cda9dbae46671f2bde16.hot-update.js": "/js/main.cda9dbae46671f2bde16.hot-update.js",
-    "/js/main.497db309375244d8e7bc.hot-update.js": "/js/main.497db309375244d8e7bc.hot-update.js",
-    "/js/main.2e71f522820bb2b64108.hot-update.js": "/js/main.2e71f522820bb2b64108.hot-update.js",
-    "/js/main.623870fa7b4bfcbcb8bb.hot-update.js": "/js/main.623870fa7b4bfcbcb8bb.hot-update.js",
-    "/js/main.c44e8cf13f2f4aab93e8.hot-update.js": "/js/main.c44e8cf13f2f4aab93e8.hot-update.js",
-    "/js/main.60707afcf8fcb8c796a7.hot-update.js": "/js/main.60707afcf8fcb8c796a7.hot-update.js",
-    "/js/main.936826e252cb0f3ba479.hot-update.js": "/js/main.936826e252cb0f3ba479.hot-update.js",
-    "/js/main.a35dada3bfa81877ba62.hot-update.js": "/js/main.a35dada3bfa81877ba62.hot-update.js",
-    "/js/main.9f748344c4b7f48cd879.hot-update.js": "/js/main.9f748344c4b7f48cd879.hot-update.js",
-    "/js/main.cc7bac9d97c1d9215825.hot-update.js": "/js/main.cc7bac9d97c1d9215825.hot-update.js",
-    "/js/main.25e5a20db82a255ed7d8.hot-update.js": "/js/main.25e5a20db82a255ed7d8.hot-update.js",
-    "/js/main.268e01e2707ba913b54a.hot-update.js": "/js/main.268e01e2707ba913b54a.hot-update.js",
-    "/js/main.2a50a80f76caea55a33a.hot-update.js": "/js/main.2a50a80f76caea55a33a.hot-update.js",
-    "/js/main.ade42529098f9d0de662.hot-update.js": "/js/main.ade42529098f9d0de662.hot-update.js",
-    "/js/main.f79e25758f970137eb5d.hot-update.js": "/js/main.f79e25758f970137eb5d.hot-update.js",
-    "/js/main.efbfa4aa474d3c507790.hot-update.js": "/js/main.efbfa4aa474d3c507790.hot-update.js"
+    "/js/main.45e6d8cb43e754b99382.hot-update.js": "/js/main.45e6d8cb43e754b99382.hot-update.js",
+    "/js/main.abfc7c1aa09d43ac1b28.hot-update.js": "/js/main.abfc7c1aa09d43ac1b28.hot-update.js",
+    "/js/main.25d848d89aef1dd5db69.hot-update.js": "/js/main.25d848d89aef1dd5db69.hot-update.js",
+    "/js/main.27e04d29795b7f85e522.hot-update.js": "/js/main.27e04d29795b7f85e522.hot-update.js",
+    "/js/main.b29e1073784c8c7d2f1b.hot-update.js": "/js/main.b29e1073784c8c7d2f1b.hot-update.js",
+    "/js/main.5a6e763080e0e0acd4d7.hot-update.js": "/js/main.5a6e763080e0e0acd4d7.hot-update.js",
+    "/js/main.cb0b1cf133396a5c22e3.hot-update.js": "/js/main.cb0b1cf133396a5c22e3.hot-update.js",
+    "/js/main.7d6431c053bcd0c51ea2.hot-update.js": "/js/main.7d6431c053bcd0c51ea2.hot-update.js",
+    "/js/main.92f90e4bfd69cdd17502.hot-update.js": "/js/main.92f90e4bfd69cdd17502.hot-update.js",
+    "/js/main.0bbafc27b31b48062354.hot-update.js": "/js/main.0bbafc27b31b48062354.hot-update.js",
+    "/js/main.3f446feec1f2d2aeb3bd.hot-update.js": "/js/main.3f446feec1f2d2aeb3bd.hot-update.js",
+    "/js/main.1e5bc03758a762a7125b.hot-update.js": "/js/main.1e5bc03758a762a7125b.hot-update.js",
+    "/js/main.a87f0ff1e2c944eac191.hot-update.js": "/js/main.a87f0ff1e2c944eac191.hot-update.js",
+    "/js/main.5fb7fd8c39d09a226cc8.hot-update.js": "/js/main.5fb7fd8c39d09a226cc8.hot-update.js",
+    "/js/main.8149e425904782585d07.hot-update.js": "/js/main.8149e425904782585d07.hot-update.js",
+    "/js/main.a2deb2ab8b721fff62c9.hot-update.js": "/js/main.a2deb2ab8b721fff62c9.hot-update.js",
+    "/js/main.346a346430a952896fc7.hot-update.js": "/js/main.346a346430a952896fc7.hot-update.js",
+    "/js/main.a6cd08cea139687b40ff.hot-update.js": "/js/main.a6cd08cea139687b40ff.hot-update.js",
+    "/js/main.b513de16be8d4356cb07.hot-update.js": "/js/main.b513de16be8d4356cb07.hot-update.js",
+    "/js/main.40a96ad0d269bbfc9434.hot-update.js": "/js/main.40a96ad0d269bbfc9434.hot-update.js",
+    "/js/main.57fc4c7ae8d82271641a.hot-update.js": "/js/main.57fc4c7ae8d82271641a.hot-update.js",
+    "/js/main.78f6c7613506ce90c2a8.hot-update.js": "/js/main.78f6c7613506ce90c2a8.hot-update.js",
+    "/js/main.bda5b6b6d0da95a90d5e.hot-update.js": "/js/main.bda5b6b6d0da95a90d5e.hot-update.js",
+    "/js/main.45ec39ba35e97530c9e6.hot-update.js": "/js/main.45ec39ba35e97530c9e6.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.1559434a308ee0017f5a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.1559434a308ee0017f5a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.54f9de6b4fe34e72eb56.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.54f9de6b4fe34e72eb56.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.c37a85ca62968507bb7c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c37a85ca62968507bb7c.hot-update.js",
+    "/js/main.9dd79bfa6976b15fd5e5.hot-update.js": "/js/main.9dd79bfa6976b15fd5e5.hot-update.js",
+    "/js/main.adf07792404116ffed80.hot-update.js": "/js/main.adf07792404116ffed80.hot-update.js",
+    "/js/main.a1512c7265fffe18d990.hot-update.js": "/js/main.a1512c7265fffe18d990.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.c9491df047222c99eed6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c9491df047222c99eed6.hot-update.js",
+    "/js/main.ecd3c8284219b42bdf81.hot-update.js": "/js/main.ecd3c8284219b42bdf81.hot-update.js",
+    "/js/main.984fb8cc675a8b7002f3.hot-update.js": "/js/main.984fb8cc675a8b7002f3.hot-update.js",
+    "/js/main.916a5d980467f070c75a.hot-update.js": "/js/main.916a5d980467f070c75a.hot-update.js",
+    "/js/main.696108a5057c4b4c671c.hot-update.js": "/js/main.696108a5057c4b4c671c.hot-update.js",
+    "/js/main.520c80bdae5ed555cc34.hot-update.js": "/js/main.520c80bdae5ed555cc34.hot-update.js",
+    "/js/main.7a0b6c8f68db687e0785.hot-update.js": "/js/main.7a0b6c8f68db687e0785.hot-update.js",
+    "/js/main.be2709d6740a73d3ce37.hot-update.js": "/js/main.be2709d6740a73d3ce37.hot-update.js",
+    "/js/main.d0c1132837afe8109235.hot-update.js": "/js/main.d0c1132837afe8109235.hot-update.js",
+    "/js/main.981e7cc9653540e2f318.hot-update.js": "/js/main.981e7cc9653540e2f318.hot-update.js",
+    "/js/main.0506f38951f9e029fd5d.hot-update.js": "/js/main.0506f38951f9e029fd5d.hot-update.js",
+    "/js/main.a20889d07721edaba0dd.hot-update.js": "/js/main.a20889d07721edaba0dd.hot-update.js",
+    "/js/main.cad3bb3ee8499b72450b.hot-update.js": "/js/main.cad3bb3ee8499b72450b.hot-update.js",
+    "/js/main.7b943fbed972cb2d0158.hot-update.js": "/js/main.7b943fbed972cb2d0158.hot-update.js",
+    "/js/main.7d94259620cc26245f64.hot-update.js": "/js/main.7d94259620cc26245f64.hot-update.js",
+    "/js/main.400373027cca6ff0a6bd.hot-update.js": "/js/main.400373027cca6ff0a6bd.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.f10905f3115727ed6b8a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f10905f3115727ed6b8a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.ccaea1007c3887960b07.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ccaea1007c3887960b07.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/FileItemGrid.vue b/resources/js/components/FilesView/FileItemGrid.vue
index 6195b361..05b7c536 100644
--- a/resources/js/components/FilesView/FileItemGrid.vue
+++ b/resources/js/components/FilesView/FileItemGrid.vue
@@ -58,7 +58,7 @@
                 </div>
             </div>
 
-            <span @click.stop="showItemActions" class="show-actions" v-if="$isMobile() && ! ( $checkPermission('visitor') && isFolder || multiSelectMode ) && canShowMobileOptions">
+            <span @click.stop="showItemActions" class="show-actions" v-if="$isMobile() && ! multiSelectMode && canShowMobileOptions">
                 <FontAwesomeIcon icon="ellipsis-h" class="icon-action"></FontAwesomeIcon>
             </span>
         </div>
diff --git a/resources/js/components/FilesView/FileItemList.vue b/resources/js/components/FilesView/FileItemList.vue
index ff4cd314..84909afb 100644
--- a/resources/js/components/FilesView/FileItemList.vue
+++ b/resources/js/components/FilesView/FileItemList.vue
@@ -62,7 +62,7 @@
 
             <!--Show item actions-->
             <transition name="slide-from-right">
-                <div class="actions" v-if="$isMobile() && !($checkPermission('visitor') && isFolder || mobileMultiSelect)">
+                <div class="actions" v-if="$isMobile() && ! mobileMultiSelect">
                     <span @click.stop="showItemActions" class="show-actions">
                         <FontAwesomeIcon icon="ellipsis-v" class="icon-action"></FontAwesomeIcon>
                     </span>
diff --git a/resources/js/components/FilesView/MobileMenu.vue b/resources/js/components/FilesView/MobileMenu.vue
index 56cb57e9..9f46e0b3 100644
--- a/resources/js/components/FilesView/MobileMenu.vue
+++ b/resources/js/components/FilesView/MobileMenu.vue
@@ -29,8 +29,8 @@
                             </li>
                         </ul>
 
-                        <ul class="menu-option-group" v-if="!isFolder">
-                            <li class="menu-option" @click="downloadItem">
+                        <ul class="menu-option-group" >
+                            <li class="menu-option" @click="downloadItem" v-if="!isFolder">
                                 <div class="icon">
                                     <download-cloud-icon size="17"></download-cloud-icon>
                                 </div>
@@ -38,6 +38,15 @@
                                     {{ $t('context_menu.download') }}
                                 </div>
                             </li>
+
+                             <li class="menu-option" @click="downloadFolder" v-if="isFolder">
+                                <div class="icon">
+                                    <paperclip-icon size="17"></paperclip-icon>
+                                </div>
+                                <div class="text-label">
+                                   {{ $t('context_menu.zip_folder') }}
+                                </div>
+                            </li>
                         </ul>
                     </div>
 
@@ -98,6 +107,15 @@
                                     {{ $t('context_menu.download') }}
                                 </div>
                             </li>
+
+                             <li class="menu-option" @click="downloadFolder" v-if="isFolder">
+                                <div class="icon">
+                                    <paperclip-icon size="17"></paperclip-icon>
+                                </div>
+                                <div class="text-label">
+                                    {{ $t('context_menu.zip_folder') }}
+                                </div>
+                            </li>
                         </ul>
                     </div>
 
@@ -166,6 +184,15 @@
                                     {{ $t('context_menu.download') }}
                                 </div>
                             </li>
+
+                            <li class="menu-option" @click="downloadFolder" v-if="isFolder">
+                                <div class="icon">
+                                    <paperclip-icon size="17"></paperclip-icon>
+                                </div>
+                                <div class="text-label">
+                                    {{ $t('context_menu.zip_folder') }}
+                                </div>
+                            </li>
                         </ul>
                     </div>
 
@@ -207,6 +234,15 @@
                                     {{ $t('context_menu.download') }}
                                 </div>
                             </li>
+
+                             <li class="menu-option" @click="downloadFolder" v-if="isFolder">
+                                <div class="icon">
+                                    <paperclip-icon size="17"></paperclip-icon>
+                                </div>
+                                <div class="text-label">
+                                    {{ $t('context_menu.zip_folder') }}
+                                </div>
+                            </li>
                         </ul>
                     </div>
 
@@ -221,6 +257,15 @@
                                     {{ $t('context_menu.download') }}
                                 </div>
                             </li>
+
+                            <li class="menu-option" @click="downloadFolder" v-if="isFolder">
+                                <div class="icon">
+                                    <paperclip-icon size="17"></paperclip-icon>
+                                </div>
+                                <div class="text-label">
+                                    {{ $t('context_menu.zip_folder') }}
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -239,6 +284,7 @@ import {
     CornerDownRightIcon,
     DownloadCloudIcon,
     FolderPlusIcon,
+    PaperclipIcon,
     LifeBuoyIcon,
     Trash2Icon,
     Edit2Icon,
@@ -256,6 +302,7 @@ export default {
         CornerDownRightIcon,
         DownloadCloudIcon,
         FolderPlusIcon,
+        PaperclipIcon,
         ThumbnailItem,
         LifeBuoyIcon,
         Trash2Icon,
@@ -297,6 +344,9 @@ export default {
         }
     },
     methods: {
+        downloadFolder(){
+            this.$store.dispatch( 'downloadFolder' , this.fileInfoDetail[0] )
+        },
         moveItem() {
             events.$emit('popup:open', { name: 'move', item: [this.fileInfoDetail[0]] })
         },
diff --git a/resources/js/components/Others/ThumbnailItem.vue b/resources/js/components/Others/ThumbnailItem.vue
index fa57ed34..6c609da2 100644
--- a/resources/js/components/Others/ThumbnailItem.vue
+++ b/resources/js/components/Others/ThumbnailItem.vue
@@ -5,13 +5,13 @@
         <div class="icon-item">
 
             <!--If is file or image, then link item-->
-            <span v-if="isFile" class="file-icon-text">{{ item.mimetype }}</span>
+            <span v-if="isFile || (isImage && !item.thumbnail) " class="file-icon-text">{{ item.mimetype }}</span>
 
             <!--Folder thumbnail-->
-            <FontAwesomeIcon v-if="isFile" class="file-icon" icon="file"/>
+            <FontAwesomeIcon v-if="isFile || (isImage && !item.thumbnail)" class="file-icon" :class="{'file-icon-mobile' : $isMobile()}" icon="file"/>
 
             <!--Image thumbnail-->
-            <img v-if="isImage" class="image" :src="item.thumbnail" :alt="item.name"/>
+            <img v-if="isImage && item.thumbnail" class="image" :src="item.thumbnail" :alt="item.name"/>
 
             <!--Else show only folder icon-->
             <FolderIcon v-if="isFolder" :item="item" :folder-icon="setFolderIcon" location="thumbnail-item" class="folder" />
@@ -175,6 +175,13 @@
                 }
             }
 
+            .icon-item .file-icon-mobile {
+                path {
+                    fill: $dark_mode_background !important;
+                    // stroke: ;
+                }
+            }
+
             .item-name {
                 .name {
                     color: $dark_mode_text_primary;