diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index e1ac0e8e..860ce10e 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -8,7 +8,7 @@
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=d36b3eb20b4899f2d899",
     "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~6fce3876.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~6fce3876.js?id=3dc49e837aec52b13e76",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.js?id=f2b55e546b918c1df018",
-    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.js?id=24d8fd0e8adbeb99743d",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.js?id=35e4681bc1b7641bfb8e",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~f312a84e.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~f312a84e.js?id=004c11df35e63517608d",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=0e511f0ceaac7257bf25",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=f3bc2f8030f1dd06472a",
@@ -37,7 +37,7 @@
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1e02112873d0b86eb1ac",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=dc4aa33310fc98be6749",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a547f8b4e9a83935a777",
-    "/chunks/files.js": "/chunks/files.js?id=1f6ab74c3e479d2c26c5",
+    "/chunks/files.js": "/chunks/files.js?id=8ebd994024ba61c1e829",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks~ad7e36b9.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks~ad7e36b9.js?id=be2d7938bf33c26784fd",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~b068369d.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~b068369d.js?id=e04827456ff09a9c4c4d",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~ab58556a.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~ab58556a.js?id=afa7d2dd8e1cc9c5947c",
@@ -48,7 +48,7 @@
     "/chunks/homepage.js": "/chunks/homepage.js?id=6f2aac612b4c6eaabf61",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=a5b0819b57321599f235",
     "/chunks/invoices.js": "/chunks/invoices.js?id=f0360ddfb0f1e1a9058b",
-    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=2066c19bd694455393fd",
+    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=6872e52f17b4b424ca41",
     "/chunks/not-found.js": "/chunks/not-found.js?id=8e5c99340188c2a7b215",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=3d194f15e25dec1c54d3",
     "/chunks/pages.js": "/chunks/pages.js?id=bfd9a2e2c52e60ed025e",
@@ -58,12 +58,12 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=17469545c5b6a16c3bbf",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=0dd0a5efe0e3cb511c48",
     "/chunks/plans.js": "/chunks/plans.js?id=5a3c28288952fcad96e5",
-    "/chunks/platform.js": "/chunks/platform.js?id=f1ea2c4c10886cf88169",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=58ad6eacba7492064785",
+    "/chunks/platform.js": "/chunks/platform.js?id=fb5cf8097281b78ce520",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=55a2d0fef1b90550bc8c",
     "/chunks/profile.js": "/chunks/profile.js?id=658aa03af778cc2cc100",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=ddb7be518c092ed392ca",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=4b176796d100a2b24d71",
-    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=e473b4223b1b7cf6919b",
+    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=71774768a5fd92da354c",
     "/chunks/settings.js": "/chunks/settings.js?id=354397b01623d73650d1",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=0656db2b76eaa0de2c58",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=29fbd676788295256ffe",
@@ -83,7 +83,7 @@
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=2802cde66f7d12ec8442",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=5dbfd83cfacad270a636",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=721e855dff920e5e6996",
-    "/chunks/team-folders.js": "/chunks/team-folders.js?id=9fcb3a94c6627b168d0a",
+    "/chunks/team-folders.js": "/chunks/team-folders.js?id=7ce1c2d563d466ad1c7e",
     "/chunks/trash.js": "/chunks/trash.js?id=b098bf0e2f2df3e67539",
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=8879f5c458f08648405a",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e365ae16373be9dbd458",
@@ -163,5 +163,99 @@
     "/js/main.f012b26dec662f6298a8.hot-update.js": "/js/main.f012b26dec662f6298a8.hot-update.js",
     "/js/main.ed07c1e13edc3f9c5f51.hot-update.js": "/js/main.ed07c1e13edc3f9c5f51.hot-update.js",
     "/js/main.a805c66ddbda4c82cdd0.hot-update.js": "/js/main.a805c66ddbda4c82cdd0.hot-update.js",
-    "/js/main.39adb83424afaf87eec6.hot-update.js": "/js/main.39adb83424afaf87eec6.hot-update.js"
+    "/js/main.39adb83424afaf87eec6.hot-update.js": "/js/main.39adb83424afaf87eec6.hot-update.js",
+    "/js/main.0192ea72f3a10d53cc16.hot-update.js": "/js/main.0192ea72f3a10d53cc16.hot-update.js",
+    "/js/main.998025ed54185a134abb.hot-update.js": "/js/main.998025ed54185a134abb.hot-update.js",
+    "/js/main.568862b08e2b5f3b71a1.hot-update.js": "/js/main.568862b08e2b5f3b71a1.hot-update.js",
+    "/js/main.7c4995f00a000f9330d4.hot-update.js": "/js/main.7c4995f00a000f9330d4.hot-update.js",
+    "/js/main.68c4846dd9ac7d517044.hot-update.js": "/js/main.68c4846dd9ac7d517044.hot-update.js",
+    "/js/main.e15dfcae675ae8817f75.hot-update.js": "/js/main.e15dfcae675ae8817f75.hot-update.js",
+    "/js/main.e107f370c5fc4ad48ac4.hot-update.js": "/js/main.e107f370c5fc4ad48ac4.hot-update.js",
+    "/js/main.1eb74bdf988379d975d7.hot-update.js": "/js/main.1eb74bdf988379d975d7.hot-update.js",
+    "/js/main.144981acfb50ca0fb3b4.hot-update.js": "/js/main.144981acfb50ca0fb3b4.hot-update.js",
+    "/js/main.ca3cbe2ddcf4106ae770.hot-update.js": "/js/main.ca3cbe2ddcf4106ae770.hot-update.js",
+    "/js/main.880e69b78730ebe3d241.hot-update.js": "/js/main.880e69b78730ebe3d241.hot-update.js",
+    "/js/main.248cff0a68d63460a1eb.hot-update.js": "/js/main.248cff0a68d63460a1eb.hot-update.js",
+    "/js/main.e9f47d61dbd99e247fd9.hot-update.js": "/js/main.e9f47d61dbd99e247fd9.hot-update.js",
+    "/js/main.6cf7b5fec4af92fedeaa.hot-update.js": "/js/main.6cf7b5fec4af92fedeaa.hot-update.js",
+    "/js/main.16ecde7878feb31c8f25.hot-update.js": "/js/main.16ecde7878feb31c8f25.hot-update.js",
+    "/js/main.b3718891cbd152539938.hot-update.js": "/js/main.b3718891cbd152539938.hot-update.js",
+    "/js/main.22c3f39fbf2946ca6eda.hot-update.js": "/js/main.22c3f39fbf2946ca6eda.hot-update.js",
+    "/js/main.e521c033a5ea8096b024.hot-update.js": "/js/main.e521c033a5ea8096b024.hot-update.js",
+    "/js/main.acf0d5e1f23743dd7962.hot-update.js": "/js/main.acf0d5e1f23743dd7962.hot-update.js",
+    "/js/main.01d3626009c64c2cacbc.hot-update.js": "/js/main.01d3626009c64c2cacbc.hot-update.js",
+    "/js/main.561e3eff93844bf83b7d.hot-update.js": "/js/main.561e3eff93844bf83b7d.hot-update.js",
+    "/js/main.ac13f901113a2e7e68f0.hot-update.js": "/js/main.ac13f901113a2e7e68f0.hot-update.js",
+    "/js/main.79fa5719ead636defb4d.hot-update.js": "/js/main.79fa5719ead636defb4d.hot-update.js",
+    "/chunks/platform~chunks/shared.f956733d5e6fbfec3fe7.hot-update.js": "/chunks/platform~chunks/shared.f956733d5e6fbfec3fe7.hot-update.js",
+    "/chunks/platform~chunks/shared.db2c443e9f94bbf51d7c.hot-update.js": "/chunks/platform~chunks/shared.db2c443e9f94bbf51d7c.hot-update.js",
+    "/chunks/platform~chunks/shared.c7ec7f2f1e5d21562ed9.hot-update.js": "/chunks/platform~chunks/shared.c7ec7f2f1e5d21562ed9.hot-update.js",
+    "/chunks/platform~chunks/shared.4e81b1a5cef3347f71a7.hot-update.js": "/chunks/platform~chunks/shared.4e81b1a5cef3347f71a7.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.faaf0e72ac33c02825d4.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.faaf0e72ac33c02825d4.hot-update.js",
+    "/chunks/files.f922d2876601686968f9.hot-update.js": "/chunks/files.f922d2876601686968f9.hot-update.js",
+    "/chunks/files.7cb7d91655647f399a87.hot-update.js": "/chunks/files.7cb7d91655647f399a87.hot-update.js",
+    "/chunks/files.e17552f54f116bae912d.hot-update.js": "/chunks/files.e17552f54f116bae912d.hot-update.js",
+    "/chunks/files.6a246e878b15b71a8e70.hot-update.js": "/chunks/files.6a246e878b15b71a8e70.hot-update.js",
+    "/chunks/files.22aaed8f3a80c07e405a.hot-update.js": "/chunks/files.22aaed8f3a80c07e405a.hot-update.js",
+    "/chunks/files.27792c527323e88bc8d0.hot-update.js": "/chunks/files.27792c527323e88bc8d0.hot-update.js",
+    "/js/main.49add5cf3e6dc2b48a0b.hot-update.js": "/js/main.49add5cf3e6dc2b48a0b.hot-update.js",
+    "/js/main.bcef81a4cf99dcceb764.hot-update.js": "/js/main.bcef81a4cf99dcceb764.hot-update.js",
+    "/js/main.acb533e17c8475e87cdd.hot-update.js": "/js/main.acb533e17c8475e87cdd.hot-update.js",
+    "/js/main.eed73e10bc48ddd70f77.hot-update.js": "/js/main.eed73e10bc48ddd70f77.hot-update.js",
+    "/js/main.06f03f5764345d4a21ae.hot-update.js": "/js/main.06f03f5764345d4a21ae.hot-update.js",
+    "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~0919ded8.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~0919ded8.js?id=e08424c8b2e29269c282",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~6dc4969c.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~6dc4969c.js?id=52a5d33ca4b4749dd679",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~8d246649.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~8d246649.js?id=5e36dcf07975aa1955fb",
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~860e9aef.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~860e9aef.js?id=285952e7d81a73c1b366",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~9b5759a9.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~9b5759a9.js?id=eb26643e072aa1f2b4b5",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=854ed8a5f3a883f6d4c5",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js?id=537cbf03cc03f01380c4",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js?id=5216516ba11c29601c91",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js?id=546e98c6fc4cdd36e616",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=aef71525addb9d3b83fd",
+    "/chunks/files~chunks/shared/files.js": "/chunks/files~chunks/shared/files.js?id=5e3e9744678568ca2f0c",
+    "/chunks/team-folders.06f03f5764345d4a21ae.hot-update.js": "/chunks/team-folders.06f03f5764345d4a21ae.hot-update.js",
+    "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~7a7e849f.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~7a7e849f.js?id=84e471b380a972e986e6",
+    "/chunks/my-shared-items.f783d8ad2a82146c77b5.hot-update.js": "/chunks/my-shared-items.f783d8ad2a82146c77b5.hot-update.js",
+    "/chunks/platform~chunks/shared.b6c017a7b7e457401bf9.hot-update.js": "/chunks/platform~chunks/shared.b6c017a7b7e457401bf9.hot-update.js",
+    "/chunks/platform~chunks/shared.166de2a7a2da239a2b99.hot-update.js": "/chunks/platform~chunks/shared.166de2a7a2da239a2b99.hot-update.js",
+    "/chunks/platform~chunks/shared.c5f5d480ce49dcc125c9.hot-update.js": "/chunks/platform~chunks/shared.c5f5d480ce49dcc125c9.hot-update.js",
+    "/chunks/platform~chunks/shared.16133b676b567f1474a5.hot-update.js": "/chunks/platform~chunks/shared.16133b676b567f1474a5.hot-update.js",
+    "/chunks/platform~chunks/shared.2a39f88726f3f55c8452.hot-update.js": "/chunks/platform~chunks/shared.2a39f88726f3f55c8452.hot-update.js",
+    "/js/main.c2600843f14a62d517e6.hot-update.js": "/js/main.c2600843f14a62d517e6.hot-update.js",
+    "/js/main.d192f0865aa3702dc417.hot-update.js": "/js/main.d192f0865aa3702dc417.hot-update.js",
+    "/js/main.b2abbc8fded37ef0ccd5.hot-update.js": "/js/main.b2abbc8fded37ef0ccd5.hot-update.js",
+    "/js/main.32a2642e2f0743e251f6.hot-update.js": "/js/main.32a2642e2f0743e251f6.hot-update.js",
+    "/js/main.d76330e66e98b0b65840.hot-update.js": "/js/main.d76330e66e98b0b65840.hot-update.js",
+    "/js/main.029935345ec8485099f4.hot-update.js": "/js/main.029935345ec8485099f4.hot-update.js",
+    "/js/main.04dbfbcb2c443818167d.hot-update.js": "/js/main.04dbfbcb2c443818167d.hot-update.js",
+    "/js/main.5cd9148663a7fbeeac49.hot-update.js": "/js/main.5cd9148663a7fbeeac49.hot-update.js",
+    "/js/main.ac3012e59834c00aa23c.hot-update.js": "/js/main.ac3012e59834c00aa23c.hot-update.js",
+    "/chunks/files.49154ead38fb05798405.hot-update.js": "/chunks/files.49154ead38fb05798405.hot-update.js",
+    "/chunks/my-shared-items.49154ead38fb05798405.hot-update.js": "/chunks/my-shared-items.49154ead38fb05798405.hot-update.js",
+    "/chunks/recent-uploads.49154ead38fb05798405.hot-update.js": "/chunks/recent-uploads.49154ead38fb05798405.hot-update.js",
+    "/chunks/team-folders.49154ead38fb05798405.hot-update.js": "/chunks/team-folders.49154ead38fb05798405.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.d3a41605ecbe74c28019.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.d3a41605ecbe74c28019.hot-update.js",
+    "/chunks/platform.12fafdd84c04f2b88356.hot-update.js": "/chunks/platform.12fafdd84c04f2b88356.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.c4db66385423981524fb.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.c4db66385423981524fb.hot-update.js",
+    "/chunks/platform.c4db66385423981524fb.hot-update.js": "/chunks/platform.c4db66385423981524fb.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.62c0f3811ec843f59681.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.62c0f3811ec843f59681.hot-update.js",
+    "/chunks/platform.c9221a5e6b90570c1953.hot-update.js": "/chunks/platform.c9221a5e6b90570c1953.hot-update.js",
+    "/chunks/platform.4db4c04d1b2b316c2b32.hot-update.js": "/chunks/platform.4db4c04d1b2b316c2b32.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.315248dcd43a21d4000a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.315248dcd43a21d4000a.hot-update.js",
+    "/chunks/platform.8c34cb0f2793d70a539d.hot-update.js": "/chunks/platform.8c34cb0f2793d70a539d.hot-update.js",
+    "/chunks/platform.457134f0bb878df84f5a.hot-update.js": "/chunks/platform.457134f0bb878df84f5a.hot-update.js",
+    "/js/main.433adc0e9e4f1bc43673.hot-update.js": "/js/main.433adc0e9e4f1bc43673.hot-update.js",
+    "/chunks/platform.433adc0e9e4f1bc43673.hot-update.js": "/chunks/platform.433adc0e9e4f1bc43673.hot-update.js",
+    "/chunks/platform.a3f1af0938c4bab27e7b.hot-update.js": "/chunks/platform.a3f1af0938c4bab27e7b.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.26bb21f0b822ff9ffc79.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.26bb21f0b822ff9ffc79.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.59fa441750de75e9c8ed.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks/trash.59fa441750de75e9c8ed.hot-update.js",
+    "/chunks/platform.7ad8ec156050e58bcb2c.hot-update.js": "/chunks/platform.7ad8ec156050e58bcb2c.hot-update.js",
+    "/chunks/platform.fce1c2fc5cf4e3499def.hot-update.js": "/chunks/platform.fce1c2fc5cf4e3499def.hot-update.js",
+    "/js/main.c8ca1d82013403f826d9.hot-update.js": "/js/main.c8ca1d82013403f826d9.hot-update.js",
+    "/js/main.5781ee11ac8379c8b993.hot-update.js": "/js/main.5781ee11ac8379c8b993.hot-update.js",
+    "/js/main.7b0ef05ce2fd1b14f906.hot-update.js": "/js/main.7b0ef05ce2fd1b14f906.hot-update.js",
+    "/js/main.3ddd10693cfa7c583e89.hot-update.js": "/js/main.3ddd10693cfa7c583e89.hot-update.js",
+    "/js/main.91e88a521ed74d7f84da.hot-update.js": "/js/main.91e88a521ed74d7f84da.hot-update.js",
+    "/js/main.589af031992d24fa8329.hot-update.js": "/js/main.589af031992d24fa8329.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/FileItemList.vue b/resources/js/components/FilesView/FileItemList.vue
index 8306ba37..8922c22e 100644
--- a/resources/js/components/FilesView/FileItemList.vue
+++ b/resources/js/components/FilesView/FileItemList.vue
@@ -311,7 +311,7 @@ export default {
 
         // Change item name
         events.$on('change:name', item => {
-            if (this.item.data.id === item.data.id) this.itemName = item.data.attributes.name
+            if (this.item.data.id === item.id) this.itemName = item.name
         })
     }
 }
diff --git a/resources/js/components/Others/Forms/CopyShareLink.vue b/resources/js/components/Others/Forms/CopyShareLink.vue
index 217127ff..5287c907 100644
--- a/resources/js/components/Others/Forms/CopyShareLink.vue
+++ b/resources/js/components/Others/Forms/CopyShareLink.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="inline-wrapper icon-append copy-input" :class="size">
-        <input ref="sel" :value="item.data.relationships.shared.link" id="link-input" type="text" class="input-text" readonly>
+        <input ref="sel" :value="item.data.relationships.shared.data.attributes.link" id="link-input" type="text" class="input-text" readonly>
         <div class="multi-icon">
             <div @click="copyUrl" class="icon-item group hover-bg-theme-100">
                 <link-icon v-if="! isCopiedLink" size="14" class="group-hover-text-theme hover-text-theme"/>
diff --git a/resources/js/components/Others/MoveItemPopup.vue b/resources/js/components/Others/MoveItemPopup.vue
index 738dc80a..858bc17e 100644
--- a/resources/js/components/Others/MoveItemPopup.vue
+++ b/resources/js/components/Others/MoveItemPopup.vue
@@ -19,7 +19,7 @@
 							  :subtitle="this.clipboard.length + ' ' + $tc('file_detail.items', this.clipboard.length)"
 							  v-if="clipboard.length > 1 && !isSelectedItem" />
                     
-                <TreeMenu :disabled-by-id="pickedItem" :depth="1" :nodes="items" v-for="items in navigation" :key="items.data.id" />
+                <TreeMenu :disabled-by-id="pickedItem" :depth="1" :nodes="items" v-for="items in navigation" :key="items.id" />
             </div>
         </PopupContent>
 
@@ -88,7 +88,7 @@
 				if (!this.selectedFolder) return
 
 				// Prevent to move items to the same parent
-				if (isArray(this.selectedFolder) && this.clipboard.find(item => item.parent_id === this.selectedFolder.data.id)) return
+				if (isArray(this.selectedFolder) && this.clipboard.find(item => item.parent_id === this.selectedFolder.id)) return
 
 				// Move item
 				if (!this.isSelectedItem) {
@@ -110,7 +110,7 @@
 		mounted() {
 			events.$on('pick-folder', folder => {
 
-				if (folder.data.id === this.pickedItem.data.id) {
+				if (folder.id === this.pickedItem.data.id) {
 					this.selectedFolder = undefined
 
 				} else if (!folder.id && folder.location === 'base') {
diff --git a/resources/js/components/Others/ShareCreatePopup.vue b/resources/js/components/Others/ShareCreatePopup.vue
index 21b03a7e..4a9fdb52 100644
--- a/resources/js/components/Others/ShareCreatePopup.vue
+++ b/resources/js/components/Others/ShareCreatePopup.vue
@@ -207,7 +207,9 @@ export default {
                     // End loading
                     this.isGeneratedShared = true
 
-                    this.$store.commit('UPDATE_SHARED_ITEM', response.data.data.attributes)
+                    this.$store.commit('UPDATE_SHARED_ITEM', response.data)
+
+					this.pickedItem.data.relationships.shared = response.data
                 })
                 .catch(() => {
                     events.$emit('alert:open', {
diff --git a/resources/js/components/Others/ShareEditPopup.vue b/resources/js/components/Others/ShareEditPopup.vue
index c289e29c..8639e639 100644
--- a/resources/js/components/Others/ShareEditPopup.vue
+++ b/resources/js/components/Others/ShareEditPopup.vue
@@ -44,7 +44,7 @@
 						</div>
 					</div>
 
-					<ActionButton v-if="(pickedItem.data.relationships.shared.protected && canChangePassword) && shareOptions.isProtected" @click.native="changePassword" class="change-password">
+					<ActionButton v-if="(pickedItem.data.relationships.shared.data.attributes.protected && canChangePassword) && shareOptions.isProtected" @click.native="changePassword" class="change-password">
                         {{ $t('popup_share_edit.change_pass') }}
                     </ActionButton>
 
@@ -315,11 +315,11 @@
 
                 // Store shared options
                 this.shareOptions = {
-                    id: args.item.data.relationships.shared.id,
-                    token: args.item.data.relationships.shared.token,
-                    expiration: args.item.data.relationships.shared.expire_in,
-                    isProtected: args.item.data.relationships.shared.protected,
-                    permission: args.item.data.relationships.shared.permission,
+                    id: args.item.data.relationships.shared.data.id,
+                    token: args.item.data.relationships.shared.data.attributes.token,
+                    expiration: args.item.data.relationships.shared.data.attributes.expire_in,
+                    isProtected: args.item.data.relationships.shared.data.attributes.protected,
+                    permission: args.item.data.relationships.shared.data.attributes.permission,
                     password: undefined,
                 }
 
@@ -327,7 +327,7 @@
                     this.sendToRecipientsMenu = true
                     this.isEmailSended = false
 
-                this.canChangePassword = args.item.data.relationships.shared.is_protected
+                this.canChangePassword = args.item.data.relationships.shared.data.attributes.protected
             })
 
             events.$on('popup:close', () => {
diff --git a/resources/js/components/Others/TreeMenu.vue b/resources/js/components/Others/TreeMenu.vue
index e50b90ae..847daee7 100644
--- a/resources/js/components/Others/TreeMenu.vue
+++ b/resources/js/components/Others/TreeMenu.vue
@@ -1,6 +1,6 @@
 <template>
     <!--Folder Icon-->
-    <div class="folder-item-wrapper" :class="{'is-inactive': disabledById && disabledById.id === nodes.id || !disableId} ">
+    <div class="folder-item-wrapper" :class="{'is-inactive': disabledById && disabledById.data.id === nodes.id || !disableId} ">
 
         <div class="folder-item text-theme dark-text-theme" :class="{'is-selected': isSelected}" @click="getFolder" :style="indent">
             <chevron-right-icon @click.stop="showTree" size="17" class="icon-arrow" :class="{'is-opened': isVisible, 'is-visible': nodes.folders.length !== 0}"/>
@@ -39,7 +39,7 @@
                 let canBeShow = true
                 if(this.clipboard.includes(this.disabledById)){
                     this.clipboard.map(item => {
-                        if(item.id === this.nodes.id) {
+                        if(item.data.id === this.nodes.id) {
                             canBeShow = false
                         }
                     })
@@ -66,7 +66,7 @@
         mounted() {
 
             // Show first location
-            if (this.depth == 1)
+            if (this.depth === 1)
                 this.isVisible = true
 
             // Select clicked folder
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index 13daec02..ef7d5806 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -160,13 +160,6 @@ const mutations = {
         })
     },
     CHANGE_ITEM_NAME(state, updatedFile) {
-
-        // Rename filename in clipboard
-        if (state.clipboard && state.clipboard.data.id === updatedFile.data.id) {
-            state.clipboard = updatedFile
-        }
-
-        // Rename item name in data view
         state.entries.find(item => {
             if (item.data.id === updatedFile.data.id) {
                 item.data.attributes.name = updatedFile.data.attributes.name
@@ -177,7 +170,9 @@ const mutations = {
     },
     UPDATE_SHARED_ITEM(state, data) {
         state.entries.find(item => {
-            if (item.data.id === data.item_id) item.shared = data
+            if (item.data.id === data.data.attributes.item_id) {
+                item.data.relationships.shared = data
+            }
         })
     },
     ADD_NEW_FOLDER(state, folder) {
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index ac867656..dfc91328 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -60,7 +60,7 @@ const actions = {
 
         axios
             .post(route, {
-                to_id: to_item.data.id ? to_item.data.id : null,
+                to_id: to_item.id ? to_item.id : null,
                 items: itemsToMove
             })
             .then(() => {
@@ -70,7 +70,8 @@ const actions = {
 
                     if (item.type === 'folder')
                         dispatch('getAppData')
-                    if (getters.currentFolder.location === 'public')
+
+                    if (Vue.prototype.$isThisRoute(router.currentRoute, ['Public']))
                         dispatch('getFolderTree')
                 })
             })
@@ -100,7 +101,7 @@ const actions = {
 
                 // Set focus on new folder name
                 setTimeout(() => {
-                    events.$emit('newFolder:focus', response.data.id)
+                    events.$emit('newFolder:focus', response.data.data.id)
                 }, 10)
 
                 if (Vue.prototype.$isThisRoute(router.currentRoute, ['Public']))
@@ -322,13 +323,12 @@ const actions = {
                 items: itemsToDelete
             })
             .then(() => {
-
                 itemsToDelete.forEach(data => {
 
                     // If is folder, update app data
-                    if (data.data.type === 'folder') {
+                    if (data.type === 'folder') {
 
-                        if (data.data.id === getters.currentFolder.data.id) {
+                        if (data.id === getters.currentFolder.data.id) {
 
                             if (getters.currentFolder.location === 'public') {
                                 dispatch('browseShared')
@@ -345,7 +345,7 @@ const actions = {
                     dispatch('getAppData')
 
             })
-            .catch(() => Vue.prototype.$isSomethingWrong())
+            //.catch(() => Vue.prototype.$isSomethingWrong())
     },
     emptyTrash: ({commit, getters}) => {
 
diff --git a/resources/js/store/modules/sharing.js b/resources/js/store/modules/sharing.js
index 916250c9..9a8822d5 100644
--- a/resources/js/store/modules/sharing.js
+++ b/resources/js/store/modules/sharing.js
@@ -77,8 +77,8 @@ const actions = {
                 items = getters.clipboard
             }
 
-            items.forEach(data => {
-                tokens.push(data.shared.token)
+            items.forEach(item => {
+                tokens.push(item.data.relationships.shared.data.attributes.token)
             })
 
             axios
@@ -91,12 +91,12 @@ const actions = {
                     items.forEach(item => {
 
                         // Remove item from file browser
-                        if ( getters.currentFolder && getters.currentFolder.location === 'shared' ) {
-                            commit('REMOVE_ITEM', item.id)
+                        if ( getters.currentFolder && Vue.prototype.$isThisRoute(router.currentRoute, ['MySharedItems']) ) {
+                            commit('REMOVE_ITEM', item.data.id)
                         }
 
                         // Flush shared data
-                        commit('FLUSH_SHARED', item.id)
+                        commit('FLUSH_SHARED', item.data.id)
                         commit('CLIPBOARD_CLEAR')
                     })
                     resolve(true)
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index 985029d8..a960cb1e 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -56,14 +56,13 @@ const actions = {
         if (!folder)
             items = context.getters.clipboard
 
-        items.forEach((data) => {
-            if (data.type === 'folder') {
+        items.forEach((item) => {
 
-                if (context.getters.user.data.relationships.favourites.data.attributes.folders.find(folder => folder.id === data.id)) return
+            if (item.data.type === 'folder') {
 
-                addFavourites.push({
-                    id: data.id
-                })
+                if (context.getters.user.data.relationships.favourites.data.attributes.folders.find(folder => folder.id === item.data.id)) return
+
+                addFavourites.push({id: item.data.id})
             }
         })
 
@@ -98,7 +97,7 @@ const actions = {
         commit('REMOVE_ITEM_FROM_FAVOURITES', folder)
 
         axios
-            .post(getters.api + '/folders/favourites/' + folder.id, {
+            .post(getters.api + '/folders/favourites/' + folder.data.id, {
                 _method: 'delete'
             })
             .catch(() => {
@@ -136,7 +135,7 @@ const mutations = {
         state.user.data.relationships.settings.data.attributes.avatar = avatar
     },
     REMOVE_ITEM_FROM_FAVOURITES(state, item) {
-        state.user.data.relationships.favourites.data.attributes.folders = state.user.data.relationships.favourites.data.attributes.folders.filter(folder => folder.id !== item.id)
+        state.user.data.relationships.favourites.data.attributes.folders = state.user.data.relationships.favourites.data.attributes.folders.filter(folder => folder.id !== item.data.id)
     },
     UPDATE_NAME_IN_FAVOURITES(state, data) {
         state.user.data.relationships.favourites.data.attributes.folders.find(folder => {
diff --git a/resources/js/views/FileView/Files.vue b/resources/js/views/FileView/Files.vue
index 58addf22..97f16236 100644
--- a/resources/js/views/FileView/Files.vue
+++ b/resources/js/views/FileView/Files.vue
@@ -11,7 +11,7 @@
 				<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 			</OptionGroup>
 			<OptionGroup v-if="item">
-				<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+				<Option @click.native="$shareFileOrFolder(item)" :title="item.data.relationships.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 				<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="users" />
 			</OptionGroup>
 
@@ -53,7 +53,7 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+					<Option @click.native="$shareFileOrFolder(item)" :title="item.data.relationships.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 					<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="user-plus" />
 				</OptionGroup>
 				<OptionGroup>
@@ -156,10 +156,10 @@
 				return this.user && this.user.data.attributes.storage.used <= 100
 			},
 			isFolder() {
-				return this.item && this.item.type === 'folder'
+				return this.item && this.item.data.type === 'folder'
 			},
 			isInFavourites() {
-				return this.favourites.find((el) => el.data.id === this.item.data.id)
+				return this.favourites.find((el) => el.id === this.item.data.id)
 			},
 			hasFile() {
 				return this.clipboard.find(item => item.data.type !== 'folder')
@@ -185,10 +185,7 @@
 		methods: {
 			addToFavourites() {
 				// Check if folder is in favourites and then add/remove from favourites
-				if (
-					this.favourites &&
-					!this.favourites.find(el => el.data.id === this.item.data.id)
-				) {
+				if (this.favourites && !this.favourites.find(el => el.id === this.item.data.id)) {
 					// Add to favourite folder that is not selected
 					if (!this.clipboard.includes(this.item)) {
 						this.$store.dispatch('addToFavourites', this.item)
diff --git a/resources/js/views/FileView/MySharedItems.vue b/resources/js/views/FileView/MySharedItems.vue
index 1dcce3ee..9070c62d 100644
--- a/resources/js/views/FileView/MySharedItems.vue
+++ b/resources/js/views/FileView/MySharedItems.vue
@@ -10,7 +10,7 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+					<Option @click.native="$shareFileOrFolder(item)" :title="item.data.relationships.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
@@ -137,10 +137,7 @@
 		methods: {
 			addToFavourites() {
 				// Check if folder is in favourites and then add/remove from favourites
-				if (
-					this.favourites &&
-					!this.favourites.find(el => el.id === this.item.id)
-				) {
+				if (this.favourites && !this.favourites.find(el => el.id === this.item.data.id)) {
 					// Add to favourite folder that is not selected
 					if (!this.clipboard.includes(this.item)) {
 						this.$store.dispatch('addToFavourites', this.item)
@@ -153,7 +150,7 @@
 				} else {
 					this.$store.dispatch('removeFromFavourites', this.item)
 				}
-			}
+			},
 		},
 		created() {
 			this.$store.dispatch('getMySharedItems')
diff --git a/resources/js/views/FileView/RecentUploads.vue b/resources/js/views/FileView/RecentUploads.vue
index 2d47ba96..51da20e0 100644
--- a/resources/js/views/FileView/RecentUploads.vue
+++ b/resources/js/views/FileView/RecentUploads.vue
@@ -8,7 +8,7 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+					<Option @click.native="$shareFileOrFolder(item)" :title="item.data.relationships.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
diff --git a/resources/js/views/FileView/TeamFolders.vue b/resources/js/views/FileView/TeamFolders.vue
index a9a797bd..6f5990a4 100644
--- a/resources/js/views/FileView/TeamFolders.vue
+++ b/resources/js/views/FileView/TeamFolders.vue
@@ -11,7 +11,7 @@
 				<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 			</OptionGroup>
 			<OptionGroup v-if="item">
-				<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+				<Option @click.native="$shareFileOrFolder(item)" :title="item.data.relationships.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 				<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="users" />
 			</OptionGroup>
 
@@ -53,7 +53,7 @@
 					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 				</OptionGroup>
 				<OptionGroup>
-					<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+					<Option @click.native="$shareFileOrFolder(item)" :title="item.data.relationships.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 					<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Edit Team Members')" icon="users" />
 				</OptionGroup>
 				<OptionGroup>
@@ -185,10 +185,7 @@
 		methods: {
 			addToFavourites() {
 				// Check if folder is in favourites and then add/remove from favourites
-				if (
-					this.favourites &&
-					!this.favourites.find(el => el.id === this.item.id)
-				) {
+				if (this.favourites && !this.favourites.find(el => el.id === this.item.data.id)) {
 					// Add to favourite folder that is not selected
 					if (!this.clipboard.includes(this.item)) {
 						this.$store.dispatch('addToFavourites', this.item)
@@ -202,6 +199,7 @@
 					this.$store.dispatch('removeFromFavourites', this.item)
 				}
 			},
+			},
 			createFolder() {
 				events.$emit('popup:open', {name: 'create-folder'})
 			},
diff --git a/src/Domain/Browsing/Controllers/BrowseFolderController.php b/src/Domain/Browsing/Controllers/BrowseFolderController.php
index 82e66f8f..5a72838b 100644
--- a/src/Domain/Browsing/Controllers/BrowseFolderController.php
+++ b/src/Domain/Browsing/Controllers/BrowseFolderController.php
@@ -2,6 +2,7 @@
 
 namespace Domain\Browsing\Controllers;
 
+use DB;
 use Domain\Files\Resources\FilesCollection;
 use Domain\Folders\Resources\FolderCollection;
 use Domain\Folders\Resources\FolderResource;
diff --git a/src/Domain/Files/Resources/FileResource.php b/src/Domain/Files/Resources/FileResource.php
index 5e13dc95..76be286a 100644
--- a/src/Domain/Files/Resources/FileResource.php
+++ b/src/Domain/Files/Resources/FileResource.php
@@ -15,6 +15,7 @@ class FileResource extends JsonResource
      */
     public function toArray($request)
     {
+        // TODO: optimize created_at/updated_at conversion because of performance issue
         return [
             'data' => [
                 'id'            => $this->id,
diff --git a/src/Domain/Folders/Actions/UpdateFolderPropertyAction.php b/src/Domain/Folders/Actions/UpdateFolderPropertyAction.php
index 3b1ad999..fc48d009 100644
--- a/src/Domain/Folders/Actions/UpdateFolderPropertyAction.php
+++ b/src/Domain/Folders/Actions/UpdateFolderPropertyAction.php
@@ -15,7 +15,7 @@ class UpdateFolderPropertyAction
         $folder = Folder::find($id);
 
         // Set default folder icon
-        if ($request->emoji === 'default') {
+        if ($request->input('emoji') === 'default') {
             $folder->update([
                 'emoji' => null,
                 'color' => null,
diff --git a/src/Domain/Folders/Controllers/CreateFolderController.php b/src/Domain/Folders/Controllers/CreateFolderController.php
index 3c419ba5..90b4ddca 100644
--- a/src/Domain/Folders/Controllers/CreateFolderController.php
+++ b/src/Domain/Folders/Controllers/CreateFolderController.php
@@ -2,6 +2,7 @@
 namespace Domain\Folders\Controllers;
 
 use Auth;
+use Domain\Folders\Resources\FolderResource;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use Domain\Folders\Actions\CreateFolderAction;
@@ -30,6 +31,6 @@ class CreateFolderController extends Controller
         // CreateFolder
         $folder = ($this->createFolder)($request);
 
-        return response($folder, 201);
+        return response(new FolderResource($folder), 201);
     }
 }
diff --git a/src/Domain/Folders/Resources/FolderResource.php b/src/Domain/Folders/Resources/FolderResource.php
index e4cc42b2..ea8cea8c 100644
--- a/src/Domain/Folders/Resources/FolderResource.php
+++ b/src/Domain/Folders/Resources/FolderResource.php
@@ -11,6 +11,7 @@ class FolderResource extends JsonResource
 {
     public function toArray($request): array
     {
+        // TODO: optimize created_at/updated_at conversion because of performance issue
         return [
             'data' => [
                 'id'            => $this->id,
diff --git a/src/Domain/Items/Actions/RenameFileOrFolderAction.php b/src/Domain/Items/Actions/RenameFileOrFolderAction.php
index dee97ba8..73121047 100644
--- a/src/Domain/Items/Actions/RenameFileOrFolderAction.php
+++ b/src/Domain/Items/Actions/RenameFileOrFolderAction.php
@@ -1,7 +1,8 @@
 <?php
 namespace Domain\Items\Actions;
 
-use Illuminate\Database\Eloquent\Model;
+use Domain\Files\Resources\FileResource;
+use Domain\Folders\Resources\FolderResource;
 use Domain\Items\Requests\RenameItemRequest;
 
 class RenameFileOrFolderAction
@@ -12,7 +13,8 @@ class RenameFileOrFolderAction
     public function __invoke(
         RenameItemRequest $request,
         string $id,
-    ): Model {
+    ): FolderResource|FileResource|array {
+
         // Get item
         $item = get_item($request->input('type'), $id);
 
@@ -21,7 +23,11 @@ class RenameFileOrFolderAction
             'name' => $request->input('name'),
         ]);
 
+        if ($request->input('type') === 'folder') {
+            return new FolderResource($item);
+        }
+
         // Return updated item
-        return $item;
+        return new FileResource($item);
     }
 }
diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
index d803eceb..7bd5c100 100644
--- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
@@ -3,6 +3,8 @@ namespace Domain\Items\Controllers;
 
 use Auth;
 use App\Http\Controllers\Controller;
+use Domain\Files\Resources\FileResource;
+use Domain\Folders\Resources\FolderResource;
 use Illuminate\Database\Eloquent\Model;
 use Domain\Items\Requests\RenameItemRequest;
 use Domain\Items\Actions\RenameFileOrFolderAction;
@@ -24,7 +26,7 @@ class RenameFileOrFolderController extends Controller
     public function __invoke(
         RenameItemRequest $request,
         string $id,
-    ): Model | array {
+    ): FileResource|FolderResource|array {
         if (is_demo_account(Auth::user()->email)) {
             return ($this->fakeRenameFileOrFolder)($request, $id);
         }