diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index f302d9e9..8548ec99 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -88,5 +88,22 @@
     "/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.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"
 }
diff --git a/resources/js/components/FilesView/FolderIcon.vue b/resources/js/components/FilesView/FolderIcon.vue
index 2ca4b3fe..025ca6dd 100644
--- a/resources/js/components/FilesView/FolderIcon.vue
+++ b/resources/js/components/FilesView/FolderIcon.vue
@@ -7,7 +7,7 @@
         />
         <FontAwesomeIcon
             v-if="!emoji"
-            :class="[{ 'is-deleted': isDeleted }, 'folder-icon']"
+            :class="[{ 'is-deleted': isDeleted },{'default-color' : ! color && ! isDeleted}, 'folder-icon' ]"
             :style="{fill: color}"
             icon="folder"
         />
@@ -42,10 +42,10 @@
             color() {
                 // Return color if is changed from rename popup
                 if (this.folderIcon)
-                    return this.folderIcon.color ? this.folderIcon.color : '#00BC7E'
+                    return this.folderIcon.color ? this.folderIcon.color : false
 
                 // Return color if is already set
-                return this.item.icon_color ? this.item.icon_color : '#00BC7E'
+                return this.item.icon_color ? this.item.icon_color : false
             }
         }
     }
@@ -77,6 +77,19 @@
     }
 }
 
+.emoji-picker-preview {
+    &.is-apple .emoji-icon {
+        font-size: 22px;
+        line-height: 1.1;
+    }
+}
+
+.default-color {
+    path {
+        fill: $theme !important;
+    }
+}
+
 .folder-icon {
 
     path {
diff --git a/resources/js/components/Others/SetFolderIcon.vue b/resources/js/components/Others/SetFolderIcon.vue
index c150fab9..65f0b9df 100644
--- a/resources/js/components/Others/SetFolderIcon.vue
+++ b/resources/js/components/Others/SetFolderIcon.vue
@@ -446,6 +446,8 @@ export default {
         .emoji-preview {
             margin-left: 5px;
             margin-right: 10px;
+            width: 22px;
+            height: 22px;
         }
 
         .select-input-icon-wrapper {