diff --git a/config/language-translations.php b/config/language-translations.php
index cec8ce17..38b63e32 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -734,5 +734,6 @@ return [
         'popup.share.password_description'                   => 'Protect your item by your custom password.',
         'sharelink.share_via_email'                          => 'Share Link on Emails',
         'sharelink.copy_embed'                               => 'Copy Web Insert Code',
+        'popup.move_into_team_disclaimer'                    => 'Your folder <b class="text-theme dark-text-theme">will be moved</b> into Team Folders.',
     ],
 ];
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 01955487..e23e40d3 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,71 +1,71 @@
 {
     "/js/main.js": "/js/main.js",
     "/css/app.css": "/css/app.css",
-    "/chunks/admin.js": "/chunks/admin.js?id=3b2c8797026a9f440134",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=caa530fac8a887b06ee9",
+    "/chunks/admin.js": "/chunks/admin.js?id=7505786e8726a71c7674",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=4cc6855e612a14ea2d21",
     "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=91adf6625e49f0b93731",
     "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~39825672.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~39825672.js?id=6c16b40191c43d6bd8ee",
     "/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/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=2d893fdcf54f0c3577ff",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=c4764a39a8045b039a47",
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared/file-browser.js?id=6632ba96ef28b8ec0c98",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=6ecc8cc8a2134eb223b5",
-    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=e53677f5e4c55455d110",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a80b8af62fd725c60bdb",
     "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=673ff118200894d37cd5",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=a3bbf1c6df1466a50680",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=5f8d3e698c1fd5b9b5a5",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=055d17c4463d3ef30218",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=fd6936cca8f3b8b4de9a",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=23e7404558f1fca267cc",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=aa4583be75530f696097",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=c1e21919fcca87c62bc8",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=a67e47dc107351f25e64",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=accc81efed3d56cb7448",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=e1c1ca4488078212c450",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=2f99fabc15f18e7cb3ef",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=23692134bf84a24eae3e",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=f5e16020dc4ca6ce1593",
     "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js?id=202a18d809f2b528c866",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/p~98b23ba6.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/p~98b23ba6.js?id=9f9ebe286a608c25d8ab",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~0d12a0aa.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~0d12a0aa.js?id=94a3e04716b70d182885",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=2a866a6473fe677318c9",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=2a599c5428d29d973b65",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=fb24bb0f122b9c966c99",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=162b0e23fffc3b703623",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=10130ece72610f242434",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=1b5fd8c94efc4a058561",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=9956e3317642b9afaa24",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=bbe5fcf2fe77643666b4",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=77b73b2a6614cea1730e",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=a567e984d15ca97eb5c1",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=455572e9ac6417b7e2bd",
     "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=a964545445eef7615f9f",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=2338d4d370e7c259be4a",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=c5f1d6723d7a412a1b2a",
     "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=6fdeb3af6356206511e5",
-    "/chunks/database.js": "/chunks/database.js?id=f2a7578fbdd406dbe862",
+    "/chunks/database.js": "/chunks/database.js?id=0e8ed0811b95a0209d04",
     "/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=c934a108e4753d3cf57e",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a547f8b4e9a83935a777",
     "/chunks/files.js": "/chunks/files.js?id=fff72b719465c16db9ca",
-    "/chunks/files~chunks/platform~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared/file-browser.js?id=86c9de67aa5bed3e30a9",
+    "/chunks/files~chunks/platform~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared/file-browser.js?id=4f6f927aee4e04c2daa7",
     "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=7242f90e77f7484eb6d8",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js?id=08b44ab83e2bdc02904b",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js?id=a831ffd52ccae7b0b983",
     "/chunks/files~chunks/settings-subscription~chunks/shared/file-browser~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared/file-browser~chunks/user-subscription.js?id=c5ec9502bcfad35c502e",
-    "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=c31eb6f1a30168f60946",
+    "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=c6d617911a067670f46f",
     "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared/file-browser~chunks/shared/single-file.js?id=405a76566fbfd86d809b",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=61fb98fd41324af9cfea",
     "/chunks/homepage.js": "/chunks/homepage.js?id=6f2aac612b4c6eaabf61",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=45e17844668e393073e2",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=a5b0819b57321599f235",
     "/chunks/invoices.js": "/chunks/invoices.js?id=f0360ddfb0f1e1a9058b",
     "/chunks/not-found.js": "/chunks/not-found.js?id=8e5c99340188c2a7b215",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=ce49e7cb1ec17b65f4cd",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=3d194f15e25dec1c54d3",
     "/chunks/pages.js": "/chunks/pages.js?id=bfd9a2e2c52e60ed025e",
     "/chunks/plan.js": "/chunks/plan.js?id=464cf3c8bc0652d81260",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=fd4879f55aa1907613e8",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=c21f9b9bd34157e62364",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=5985ab9f52c65eff7441",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=61fdb752ac9e8c387c9d",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=6f75494464a5fa405124",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=9033520b60aa02557aaa",
+    "/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=87e131e4e78ce4875dcf",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=5495aa03bf10f3ffacfd",
-    "/chunks/profile.js": "/chunks/profile.js?id=5ddfe22334111147102b",
+    "/chunks/platform.js": "/chunks/platform.js?id=dc293e851c6101e9dd7d",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=3434322e91f37e1887a6",
+    "/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/settings.js": "/chunks/settings.js?id=a5f98589830f2f55a7bb",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=bbfe809e2b1111db62d7",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=0c6f07906bc7710b4250",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=fe289d8184ea6bfe81b0",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=c76b70fa53142cba0dea",
+    "/chunks/settings.js": "/chunks/settings.js?id=a1e5e739768b788a043a",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=0656db2b76eaa0de2c58",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=29fbd676788295256ffe",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=418026e26cb256bcaaa8",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=3e899b925247d473a5bb",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=31581f755a45c24a8184",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=51b246c660e78c9263b5",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=680f99e2021f19ff1af8",
@@ -76,20 +76,20 @@
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=b733dc84cd8e05a8f6f3",
     "/chunks/sign-in.js": "/chunks/sign-in.js?id=d5eed76acdad4d2c0b9b",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=f092210474e42bfd4525",
-    "/chunks/status-check.js": "/chunks/status-check.js?id=8a4bcbb7b60ee36da4e2",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=379e0ff120ab0698d51d",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=b4d7e58382b7c5221789",
+    "/chunks/status-check.js": "/chunks/status-check.js?id=b7d0389078014db8a563",
+    "/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/upgrade-billing.js": "/chunks/upgrade-billing.js?id=a9f79b48a110efb73760",
+    "/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",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=1a1a378ba65d89703578",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=fc8183dc546683a9b60f",
     "/chunks/user.js": "/chunks/user.js?id=3bc9f72a474f639b72a6",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=f086c8514bfec2325cd6",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=455aa8a0c4fdabcf53de",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=f39add23267a0ac7b928",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=8c6f3fc0adab7b3fba27",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=46fb89342eac2822ad99",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=15d37876ff6ced0e4ddf",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=d698148cb724a76d03cb",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=85b59be6a8a7e5a26205",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=0ed713bf7a647ef8e914",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=7d42e2b07f0300e10a92",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=c1d7146688cb0847e04e",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=d33938bfd4f970807301",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=05df25220335d40c6173",
     "/chunks/users.js": "/chunks/users.js?id=a81a3279b008ec766290",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~25aaad73.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~25aaad73.js?id=0de519ac9b2c2754e0c2",
@@ -356,5 +356,137 @@
     "/chunks/platform.2c489ede4dda79c0d120.hot-update.js": "/chunks/platform.2c489ede4dda79c0d120.hot-update.js",
     "/chunks/platform.f5918ead8db062e9b3bf.hot-update.js": "/chunks/platform.f5918ead8db062e9b3bf.hot-update.js",
     "/chunks/platform.92915c95fcd8b26aa95c.hot-update.js": "/chunks/platform.92915c95fcd8b26aa95c.hot-update.js",
-    "/js/main.30a8c3ed2221b6c15df4.hot-update.js": "/js/main.30a8c3ed2221b6c15df4.hot-update.js"
+    "/js/main.30a8c3ed2221b6c15df4.hot-update.js": "/js/main.30a8c3ed2221b6c15df4.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.532cd3433d65ad1cd515.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.532cd3433d65ad1cd515.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.5b64fca3975700fcece5.hot-update.js": "/chunks/files~chunks/shared/file-browser.5b64fca3975700fcece5.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.b3ffc5db072023806720.hot-update.js": "/chunks/files~chunks/shared/file-browser.b3ffc5db072023806720.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.b75b8476da5824d2048a.hot-update.js": "/chunks/files~chunks/shared/file-browser.b75b8476da5824d2048a.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.66fb73c840182ea16e31.hot-update.js": "/chunks/files~chunks/shared/file-browser.66fb73c840182ea16e31.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.188c2d72c7273808a5a3.hot-update.js": "/chunks/files~chunks/shared/file-browser.188c2d72c7273808a5a3.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.ac1a5c0e4bad54b0077a.hot-update.js": "/chunks/admin~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.ac1a5c0e4bad54b0077a.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.ac1a5c0e4bad54b0077a.hot-update.js": "/chunks/files~chunks/shared/file-browser.ac1a5c0e4bad54b0077a.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.4e5959cb8c5a7e9f1e3d.hot-update.js": "/chunks/files~chunks/shared/file-browser.4e5959cb8c5a7e9f1e3d.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.a70d1cfe5ac4ef4fd024.hot-update.js": "/chunks/files~chunks/shared/file-browser.a70d1cfe5ac4ef4fd024.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.9c3c5e1673e9d92d6609.hot-update.js": "/chunks/files~chunks/shared/file-browser.9c3c5e1673e9d92d6609.hot-update.js",
+    "/js/main.7ca1bb49272a69867f36.hot-update.js": "/js/main.7ca1bb49272a69867f36.hot-update.js",
+    "/js/main.1bd695de36f7ba26758f.hot-update.js": "/js/main.1bd695de36f7ba26758f.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.d237752dc781ccb10d7c.hot-update.js": "/chunks/files~chunks/shared/file-browser.d237752dc781ccb10d7c.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.069053723b34ed51e570.hot-update.js": "/chunks/files~chunks/shared/file-browser.069053723b34ed51e570.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.31f1613877a7116d3311.hot-update.js": "/chunks/files~chunks/shared/file-browser.31f1613877a7116d3311.hot-update.js",
+    "/chunks/platform.5527e624fc6419e9d6cd.hot-update.js": "/chunks/platform.5527e624fc6419e9d6cd.hot-update.js",
+    "/chunks/platform.a58e9d42bd39a9f3a736.hot-update.js": "/chunks/platform.a58e9d42bd39a9f3a736.hot-update.js",
+    "/chunks/platform.d97cad5f4bce9a30997c.hot-update.js": "/chunks/platform.d97cad5f4bce9a30997c.hot-update.js",
+    "/chunks/platform.f98511f5ce53f2665f98.hot-update.js": "/chunks/platform.f98511f5ce53f2665f98.hot-update.js",
+    "/chunks/platform.b162e3489b0c0a62494c.hot-update.js": "/chunks/platform.b162e3489b0c0a62494c.hot-update.js",
+    "/chunks/platform.85ff862d3482a02405ec.hot-update.js": "/chunks/platform.85ff862d3482a02405ec.hot-update.js",
+    "/chunks/platform.cb9b9b06fa295cd783cf.hot-update.js": "/chunks/platform.cb9b9b06fa295cd783cf.hot-update.js",
+    "/chunks/platform.663bfad321a308a5da6b.hot-update.js": "/chunks/platform.663bfad321a308a5da6b.hot-update.js",
+    "/chunks/platform.dceafb270d63267b746f.hot-update.js": "/chunks/platform.dceafb270d63267b746f.hot-update.js",
+    "/chunks/platform.dce6d0832b2a2e014957.hot-update.js": "/chunks/platform.dce6d0832b2a2e014957.hot-update.js",
+    "/chunks/platform.e49c94f77217f9b783ed.hot-update.js": "/chunks/platform.e49c94f77217f9b783ed.hot-update.js",
+    "/chunks/platform.6ea0e49e599b7df4dd4d.hot-update.js": "/chunks/platform.6ea0e49e599b7df4dd4d.hot-update.js",
+    "/chunks/platform.24f7c849978d10ae233c.hot-update.js": "/chunks/platform.24f7c849978d10ae233c.hot-update.js",
+    "/chunks/platform.a71096094efaf9682fa9.hot-update.js": "/chunks/platform.a71096094efaf9682fa9.hot-update.js",
+    "/chunks/platform.3fe205a853e9b8d681eb.hot-update.js": "/chunks/platform.3fe205a853e9b8d681eb.hot-update.js",
+    "/chunks/platform.223723254ff7c7ff9c63.hot-update.js": "/chunks/platform.223723254ff7c7ff9c63.hot-update.js",
+    "/chunks/platform.b5a05682ca08d4e71af5.hot-update.js": "/chunks/platform.b5a05682ca08d4e71af5.hot-update.js",
+    "/chunks/platform.99db3d7df4e29b327dd0.hot-update.js": "/chunks/platform.99db3d7df4e29b327dd0.hot-update.js",
+    "/chunks/platform.36ed96eeaa1d1879695e.hot-update.js": "/chunks/platform.36ed96eeaa1d1879695e.hot-update.js",
+    "/chunks/platform.43607a6355d8d721be08.hot-update.js": "/chunks/platform.43607a6355d8d721be08.hot-update.js",
+    "/chunks/platform.1dc6da7caceb217e1f3e.hot-update.js": "/chunks/platform.1dc6da7caceb217e1f3e.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.6df9d0cd291780a309f6.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.6df9d0cd291780a309f6.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.c87a78537861acbc26dc.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.c87a78537861acbc26dc.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d9f2a4180f4a597b7eae.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d9f2a4180f4a597b7eae.hot-update.js",
+    "/chunks/platform.2e10ef6513838ebf1813.hot-update.js": "/chunks/platform.2e10ef6513838ebf1813.hot-update.js",
+    "/chunks/platform.b35f45672c4f00354105.hot-update.js": "/chunks/platform.b35f45672c4f00354105.hot-update.js",
+    "/chunks/platform.8401fedaf35661b454ca.hot-update.js": "/chunks/platform.8401fedaf35661b454ca.hot-update.js",
+    "/chunks/platform.e4ebd1c8ab2529e4f723.hot-update.js": "/chunks/platform.e4ebd1c8ab2529e4f723.hot-update.js",
+    "/chunks/platform.83f78ad606f9e4bce261.hot-update.js": "/chunks/platform.83f78ad606f9e4bce261.hot-update.js",
+    "/chunks/platform.4ba911907175cd292362.hot-update.js": "/chunks/platform.4ba911907175cd292362.hot-update.js",
+    "/chunks/platform.966da50db6d25101a915.hot-update.js": "/chunks/platform.966da50db6d25101a915.hot-update.js",
+    "/chunks/platform.d2e3c10740ca8388a4a8.hot-update.js": "/chunks/platform.d2e3c10740ca8388a4a8.hot-update.js",
+    "/chunks/admin.37a296e138c4c563c524.hot-update.js": "/chunks/admin.37a296e138c4c563c524.hot-update.js",
+    "/chunks/admin-account.37a296e138c4c563c524.hot-update.js": "/chunks/admin-account.37a296e138c4c563c524.hot-update.js",
+    "/chunks/app-appearance.37a296e138c4c563c524.hot-update.js": "/chunks/app-appearance.37a296e138c4c563c524.hot-update.js",
+    "/chunks/app-billings.37a296e138c4c563c524.hot-update.js": "/chunks/app-billings.37a296e138c4c563c524.hot-update.js",
+    "/chunks/app-email.37a296e138c4c563c524.hot-update.js": "/chunks/app-email.37a296e138c4c563c524.hot-update.js",
+    "/chunks/app-index.37a296e138c4c563c524.hot-update.js": "/chunks/app-index.37a296e138c4c563c524.hot-update.js",
+    "/chunks/app-language.37a296e138c4c563c524.hot-update.js": "/chunks/app-language.37a296e138c4c563c524.hot-update.js",
+    "/chunks/app-others.37a296e138c4c563c524.hot-update.js": "/chunks/app-others.37a296e138c4c563c524.hot-update.js",
+    "/chunks/app-payments.37a296e138c4c563c524.hot-update.js": "/chunks/app-payments.37a296e138c4c563c524.hot-update.js",
+    "/chunks/app-setup.37a296e138c4c563c524.hot-update.js": "/chunks/app-setup.37a296e138c4c563c524.hot-update.js",
+    "/chunks/billings-detail.37a296e138c4c563c524.hot-update.js": "/chunks/billings-detail.37a296e138c4c563c524.hot-update.js",
+    "/chunks/contact-us.37a296e138c4c563c524.hot-update.js": "/chunks/contact-us.37a296e138c4c563c524.hot-update.js",
+    "/chunks/database.37a296e138c4c563c524.hot-update.js": "/chunks/database.37a296e138c4c563c524.hot-update.js",
+    "/chunks/environment-setup.37a296e138c4c563c524.hot-update.js": "/chunks/environment-setup.37a296e138c4c563c524.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared/file-browser.37a296e138c4c563c524.hot-update.js": "/chunks/files~chunks/platform~chunks/shared/file-browser.37a296e138c4c563c524.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.37a296e138c4c563c524.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.37a296e138c4c563c524.hot-update.js",
+    "/chunks/installation-disclaimer.37a296e138c4c563c524.hot-update.js": "/chunks/installation-disclaimer.37a296e138c4c563c524.hot-update.js",
+    "/chunks/page-edit.37a296e138c4c563c524.hot-update.js": "/chunks/page-edit.37a296e138c4c563c524.hot-update.js",
+    "/chunks/plan-create.37a296e138c4c563c524.hot-update.js": "/chunks/plan-create.37a296e138c4c563c524.hot-update.js",
+    "/chunks/plan-delete.37a296e138c4c563c524.hot-update.js": "/chunks/plan-delete.37a296e138c4c563c524.hot-update.js",
+    "/chunks/plan-settings.37a296e138c4c563c524.hot-update.js": "/chunks/plan-settings.37a296e138c4c563c524.hot-update.js",
+    "/chunks/plan-subscribers.37a296e138c4c563c524.hot-update.js": "/chunks/plan-subscribers.37a296e138c4c563c524.hot-update.js",
+    "/chunks/platform.37a296e138c4c563c524.hot-update.js": "/chunks/platform.37a296e138c4c563c524.hot-update.js",
+    "/chunks/platform~chunks/shared.37a296e138c4c563c524.hot-update.js": "/chunks/platform~chunks/shared.37a296e138c4c563c524.hot-update.js",
+    "/chunks/profile.37a296e138c4c563c524.hot-update.js": "/chunks/profile.37a296e138c4c563c524.hot-update.js",
+    "/chunks/settings.37a296e138c4c563c524.hot-update.js": "/chunks/settings.37a296e138c4c563c524.hot-update.js",
+    "/chunks/settings-create-payment-methods.37a296e138c4c563c524.hot-update.js": "/chunks/settings-create-payment-methods.37a296e138c4c563c524.hot-update.js",
+    "/chunks/settings-invoices.37a296e138c4c563c524.hot-update.js": "/chunks/settings-invoices.37a296e138c4c563c524.hot-update.js",
+    "/chunks/settings-password.37a296e138c4c563c524.hot-update.js": "/chunks/settings-password.37a296e138c4c563c524.hot-update.js",
+    "/chunks/settings-payment-methods.37a296e138c4c563c524.hot-update.js": "/chunks/settings-payment-methods.37a296e138c4c563c524.hot-update.js",
+    "/chunks/status-check.37a296e138c4c563c524.hot-update.js": "/chunks/status-check.37a296e138c4c563c524.hot-update.js",
+    "/chunks/stripe-credentials.37a296e138c4c563c524.hot-update.js": "/chunks/stripe-credentials.37a296e138c4c563c524.hot-update.js",
+    "/chunks/subscription-plans.37a296e138c4c563c524.hot-update.js": "/chunks/subscription-plans.37a296e138c4c563c524.hot-update.js",
+    "/chunks/upgrade-billing.37a296e138c4c563c524.hot-update.js": "/chunks/upgrade-billing.37a296e138c4c563c524.hot-update.js",
+    "/chunks/upgrade-plan.37a296e138c4c563c524.hot-update.js": "/chunks/upgrade-plan.37a296e138c4c563c524.hot-update.js",
+    "/chunks/user-create.37a296e138c4c563c524.hot-update.js": "/chunks/user-create.37a296e138c4c563c524.hot-update.js",
+    "/chunks/user-delete.37a296e138c4c563c524.hot-update.js": "/chunks/user-delete.37a296e138c4c563c524.hot-update.js",
+    "/chunks/user-detail.37a296e138c4c563c524.hot-update.js": "/chunks/user-detail.37a296e138c4c563c524.hot-update.js",
+    "/chunks/user-invoices.37a296e138c4c563c524.hot-update.js": "/chunks/user-invoices.37a296e138c4c563c524.hot-update.js",
+    "/chunks/user-password.37a296e138c4c563c524.hot-update.js": "/chunks/user-password.37a296e138c4c563c524.hot-update.js",
+    "/chunks/user-storage.37a296e138c4c563c524.hot-update.js": "/chunks/user-storage.37a296e138c4c563c524.hot-update.js",
+    "/chunks/platform.18eade2bbb6bc94b6da5.hot-update.js": "/chunks/platform.18eade2bbb6bc94b6da5.hot-update.js",
+    "/chunks/platform.5c2177973c1facf82e23.hot-update.js": "/chunks/platform.5c2177973c1facf82e23.hot-update.js",
+    "/chunks/platform.03f97382465122feac5c.hot-update.js": "/chunks/platform.03f97382465122feac5c.hot-update.js",
+    "/chunks/platform.1a344a1b263b172576a1.hot-update.js": "/chunks/platform.1a344a1b263b172576a1.hot-update.js",
+    "/chunks/platform.6ddb8a6209e3d24bedb2.hot-update.js": "/chunks/platform.6ddb8a6209e3d24bedb2.hot-update.js",
+    "/chunks/platform.cdedb78da0110c890067.hot-update.js": "/chunks/platform.cdedb78da0110c890067.hot-update.js",
+    "/chunks/platform.c8e056c5e26a9d572a91.hot-update.js": "/chunks/platform.c8e056c5e26a9d572a91.hot-update.js",
+    "/chunks/platform.f9635f4c9a61a108f92a.hot-update.js": "/chunks/platform.f9635f4c9a61a108f92a.hot-update.js",
+    "/chunks/platform.bba03319d640246ede43.hot-update.js": "/chunks/platform.bba03319d640246ede43.hot-update.js",
+    "/chunks/platform.5b0442617f890a61b827.hot-update.js": "/chunks/platform.5b0442617f890a61b827.hot-update.js",
+    "/chunks/platform.f5de384052ee60476632.hot-update.js": "/chunks/platform.f5de384052ee60476632.hot-update.js",
+    "/chunks/platform.44165c74a653fc298058.hot-update.js": "/chunks/platform.44165c74a653fc298058.hot-update.js",
+    "/chunks/platform.54b32b1c955a88fd5d31.hot-update.js": "/chunks/platform.54b32b1c955a88fd5d31.hot-update.js",
+    "/chunks/platform.3709afe0147ec4de0f80.hot-update.js": "/chunks/platform.3709afe0147ec4de0f80.hot-update.js",
+    "/chunks/platform.06aaf0f992425ca12e08.hot-update.js": "/chunks/platform.06aaf0f992425ca12e08.hot-update.js",
+    "/chunks/platform.723eca76c9450696ae26.hot-update.js": "/chunks/platform.723eca76c9450696ae26.hot-update.js",
+    "/chunks/platform.987a7863098f3560461b.hot-update.js": "/chunks/platform.987a7863098f3560461b.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.61d1f6910dcee8d40fec.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.61d1f6910dcee8d40fec.hot-update.js",
+    "/chunks/platform.2e0cc1228bff6c5253b0.hot-update.js": "/chunks/platform.2e0cc1228bff6c5253b0.hot-update.js",
+    "/chunks/platform.612f00185b20cf77a5d6.hot-update.js": "/chunks/platform.612f00185b20cf77a5d6.hot-update.js",
+    "/chunks/platform.2ca40e995f09ebe6cca2.hot-update.js": "/chunks/platform.2ca40e995f09ebe6cca2.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.a0ce7941e57ec2f9805d.hot-update.js": "/chunks/files~chunks/shared/file-browser.a0ce7941e57ec2f9805d.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.99f8421b4ebefc8338bd.hot-update.js": "/chunks/files~chunks/shared/file-browser.99f8421b4ebefc8338bd.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.2503c33bee09f3c2ace8.hot-update.js": "/chunks/files~chunks/shared/file-browser.2503c33bee09f3c2ace8.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.548ebabe37d71a8919da.hot-update.js": "/chunks/files~chunks/shared/file-browser.548ebabe37d71a8919da.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.cc3ec9f7e0a7cfd25882.hot-update.js": "/chunks/files~chunks/shared/file-browser.cc3ec9f7e0a7cfd25882.hot-update.js",
+    "/chunks/platform.c2497d2b3e8402542152.hot-update.js": "/chunks/platform.c2497d2b3e8402542152.hot-update.js",
+    "/chunks/platform.d1e669551ecb6fbc1eb7.hot-update.js": "/chunks/platform.d1e669551ecb6fbc1eb7.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.3121e7dfaa31f2a1a540.hot-update.js": "/chunks/files~chunks/shared/file-browser.3121e7dfaa31f2a1a540.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.dbe45e81f108ccf5e4f4.hot-update.js": "/chunks/files~chunks/shared/file-browser.dbe45e81f108ccf5e4f4.hot-update.js",
+    "/js/main.a0e146c8ab5ceeb05454.hot-update.js": "/js/main.a0e146c8ab5ceeb05454.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.02361443ac9881f3f4e5.hot-update.js": "/chunks/files~chunks/shared/file-browser.02361443ac9881f3f4e5.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.2cdc87613b9f8abdd45b.hot-update.js": "/chunks/files~chunks/shared/file-browser.2cdc87613b9f8abdd45b.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.9020a46173f08f9912b4.hot-update.js": "/chunks/files~chunks/shared/file-browser.9020a46173f08f9912b4.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.caf0b33334b238fee196.hot-update.js": "/chunks/files~chunks/shared/file-browser.caf0b33334b238fee196.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.9338a8c14690cb76733e.hot-update.js": "/chunks/files~chunks/shared/file-browser.9338a8c14690cb76733e.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.05c6243decb925833cc6.hot-update.js": "/chunks/files~chunks/shared/file-browser.05c6243decb925833cc6.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.d398e332b2dfb11ea8dd.hot-update.js": "/chunks/files~chunks/shared/file-browser.d398e332b2dfb11ea8dd.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.1934d686e2cd707d4bd2.hot-update.js": "/chunks/files~chunks/shared/file-browser.1934d686e2cd707d4bd2.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.c8f0db529275a19ba38c.hot-update.js": "/chunks/files~chunks/shared/file-browser.c8f0db529275a19ba38c.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.d6c24d8424d91d246f89.hot-update.js": "/chunks/files~chunks/shared/file-browser.d6c24d8424d91d246f89.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.aa726d5bb2a006448f85.hot-update.js": "/chunks/files~chunks/shared/file-browser.aa726d5bb2a006448f85.hot-update.js",
+    "/chunks/files~chunks/shared/file-browser.1e164fa79415fc2233ee.hot-update.js": "/chunks/files~chunks/shared/file-browser.1e164fa79415fc2233ee.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index e524464d..21c62c64 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -82,10 +82,14 @@
             <OptionGroup v-if="item && isMultiSelectContextMenu">
                 <Option @click.native="$renameFileOrFolder(item)" :title="$t('context_menu.rename')" icon="rename" />
                 <Option @click.native="$moveFileOrFolder(item)" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item" />
-                <Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
                 <Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
+            <OptionGroup v-if="item && isMultiSelectContextMenu">
+                <Option @click.native="$shareFileOrFolder(item)" :title="item.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>
+
             <OptionGroup v-if="item && isMultiSelectContextMenu ">
                 <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
                 <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
diff --git a/resources/js/components/FilesView/DesktopToolbar.vue b/resources/js/components/FilesView/DesktopToolbar.vue
index ad57df27..e9ab99ca 100644
--- a/resources/js/components/FilesView/DesktopToolbar.vue
+++ b/resources/js/components/FilesView/DesktopToolbar.vue
@@ -28,6 +28,9 @@
 						<PopoverItem name="desktop-create" side="left">
 							<OptionGroup>
 								<OptionUpload :class="{'is-inactive': canUploadInView || !hasCapacity }" :title="$t('actions.upload')" />
+							</OptionGroup>
+							<OptionGroup>
+								<Option @click.stop.native="$createTeamFolder" :title="$t('Create Team Folder')" icon="users" />
 								<Option @click.stop.native="createFolder" :class="{'is-inactive': canCreateFolderInView }" :title="$t('actions.create_folder')" icon="folder-plus" />
 							</OptionGroup>
 						</PopoverItem>
@@ -43,13 +46,13 @@
 						<PopoverItem name="team-folder" side="left">
 							<TeamFolderPreview />
 							<OptionGroup>
-								<Option :title="$t('Edit Members')" icon="rename" />
-								<Option :title="$t('Dissolve Team')" icon="trash" />
+								<Option @click.native="$updateTeamFolder(clipboard[0])" :title="$t('Edit Members')" icon="rename" />
+								<Option @click.native="dissolveTeamFolder(clipboard[0])" :title="$t('Dissolve Team')" icon="trash" />
 							</OptionGroup>
 						</PopoverItem>
 					</PopoverWrapper>
 
-					<ToolbarButton v-if="false" @click.native="shareItem" :class="{'is-inactive': ! canCreateTeamFolderInView }" source="user-plus" :action="$t('actions.convert_into_team_folder')" />
+					<ToolbarButton v-if="false" @click.native="$createTeamFolder" source="user-plus" :action="$t('actions.convert_into_team_folder')" />
 					<ToolbarButton @click.native="shareItem" :class="{'is-inactive': canShareInView }" source="share" :action="$t('actions.share')" />
 				</ToolbarGroup>
 
@@ -205,6 +208,16 @@
 			showSortingMenu() {
 				events.$emit('popover:open', 'desktop-sorting')
 			},
+			dissolveTeamFolder() {
+				events.$emit('confirm:open', {
+					title: this.$t('Are you sure you want to dissolve this team?'),
+					message: this.$t('All team members will lose access to your files and existing folder will be moved into your "Files" section.'),
+					action: {
+						id: 'token.id',
+						operation: 'dissolve-team-folder'
+					}
+				})
+			},
 			goBack() {
 				let previousFolder = last(this.browseHistory)
 
diff --git a/resources/js/components/FilesView/Option.vue b/resources/js/components/FilesView/Option.vue
index 4b46403b..11da9935 100644
--- a/resources/js/components/FilesView/Option.vue
+++ b/resources/js/components/FilesView/Option.vue
@@ -22,6 +22,7 @@
             <upload-cloud-icon v-if="icon === 'upload-cloud'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <users-icon v-if="icon === 'users'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <user-icon v-if="icon === 'user'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <user-plus-icon v-if="icon === 'user-plus'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <settings-icon v-if="icon === 'settings'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <power-icon v-if="icon === 'power'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
             <lock-icon v-if="icon === 'lock'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
@@ -48,6 +49,7 @@
 <script>
 import AlphabetIcon from '/resources/js/components/FilesView/Icons/AlphabetIcon'
 import {
+	UserPlusIcon,
 	ArrowUpIcon,
 	ArrowDownIcon,
     ChevronRightIcon,
@@ -92,6 +94,7 @@ import {
             'icon'
         ],
         components: {
+			UserPlusIcon,
 			ArrowUpIcon,
 			ArrowDownIcon,
             BoxIcon,
diff --git a/resources/js/components/Others/CreateFolderPopup.vue b/resources/js/components/Others/CreateFolderPopup.vue
index 06549ff1..a5c257f3 100644
--- a/resources/js/components/Others/CreateFolderPopup.vue
+++ b/resources/js/components/Others/CreateFolderPopup.vue
@@ -10,7 +10,7 @@
             <!--Form to set sharing-->
             <ValidationObserver @submit.prevent="createFolder" ref="createForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
 
-                <!--Set password-->
+                <!--Set folder name-->
                 <ValidationProvider tag="div" mode="passive" class="input-wrapper password" name="Title" rules="required" v-slot="{ errors }">
                     <label class="input-label">{{ $t('popup_create_folder.label') }}:</label>
                     <input v-model="name" :class="{'is-error': errors[0]}" type="text" ref="input" :placeholder="$t('popup_create_folder.placeholder')">
diff --git a/resources/js/components/Teams/Components/TeamMemberList.vue b/resources/js/components/Teams/Components/TeamMemberList.vue
index 22c581ed..bc987b4b 100644
--- a/resources/js/components/Teams/Components/TeamMemberList.vue
+++ b/resources/js/components/Teams/Components/TeamMemberList.vue
@@ -1,6 +1,6 @@
 <template>
 	<ul class="member-list">
-		<li v-for="(member, i) in members" :key="i" class="member-item">
+		<li v-if="Object.values(members).length > 0" v-for="(member, i) in members" :key="i" class="member-item">
 			<div @click="deleteMember(member)" class="terminate">
 				<x-icon size="14" class="close-icon" />
 			</div>
@@ -17,6 +17,9 @@
 				<PermissionToggleButton @input="updateMemberPermission(member, $event)" :item="member" />
 			</div>
 		</li>
+		<li v-if="Object.values(members).length === 0">
+			<p class="input-help">{{ $t('Please add some member into your Team Folder.') }}</p>
+		</li>
 	</ul>
 </template>
 
@@ -65,6 +68,8 @@
 
 	.member-list {
 		margin-bottom: 20px;
+		max-height: 270px;
+		overflow-y: scroll;
 	}
 
 	.member-item {
diff --git a/resources/js/components/Teams/CreateTeamFolderPopup.vue b/resources/js/components/Teams/CreateTeamFolderPopup.vue
index 6dbfb010..c8c5674c 100644
--- a/resources/js/components/Teams/CreateTeamFolderPopup.vue
+++ b/resources/js/components/Teams/CreateTeamFolderPopup.vue
@@ -8,22 +8,34 @@
         <PopupContent>
 
 			<!--Item Thumbnail-->
-            <ThumbnailItem class="item-thumbnail" :item="item" info="metadata" />
+            <ThumbnailItem v-if="! isNewFolderTeamCreation" class="item-thumbnail" :item="item" info="metadata" />
 
             <!--Form to set team folder-->
             <ValidationObserver @submit.prevent="createTeamFolder" ref="teamFolderForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
 
+                <!--Set folder name-->
+                <ValidationProvider v-if="isNewFolderTeamCreation" tag="div" mode="passive" class="input-wrapper password" name="Name" rules="required" v-slot="{ errors }">
+                    <label class="input-label">{{ $t('popup_create_folder.label') }}:</label>
+                    <input v-model="name" :class="{'is-error': errors[0]}" type="text" ref="input" :placeholder="$t('popup_create_folder.placeholder')">
+                    <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+                </ValidationProvider>
+
                 <!--Add Member-->
-				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Email" rules="required" v-slot="{ errors }">
+				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Email" v-slot="{ errors }">
 					<label class="input-label">{{ $t('Add Member') }}:</label>
-					<input @keypress.enter.stop="addMember" v-model="email" :class="{'is-error': errors[0]}" type="email" class="focus-border-theme" :placeholder="$t('Type member email...')">
+					<input @keypress.enter.stop.prevent="addMember" v-model="email" :class="{'is-error': errors[0]}" type="email" class="focus-border-theme" :placeholder="$t('Type member email...')">
 					<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
 				</ValidationProvider>
 
-				<TeamMemberList v-model="members" />
+				<!--Member list-->
+				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Members" rules="required" v-slot="{ errors }">
+					<label class="input-label">{{ $t('Your Members') }}:</label>
+					<span v-if="errors[0]" class="error-message" style="margin-top: -5px">{{ $t('Please add at least one member.') }}</span>
+					<TeamMemberList v-model="members" />
+				</ValidationProvider>
 
-				<InfoBox style="margin-bottom: 0">
-					<p v-html="$t('Your folder will be moved into Team Folders.')"></p>
+				<InfoBox v-if="! isNewFolderTeamCreation" style="margin-bottom: 0">
+					<p v-html="$t('popup.move_into_team_disclaimer')"></p>
 				</InfoBox>
             </ValidationObserver>
 
@@ -41,6 +53,8 @@
                     class="popup-button"
                     @click.native="createTeamFolder"
                     button-style="theme"
+					:loading="isLoading"
+					:disabled="isLoading"
             >{{ popupSubmit }}
             </ButtonBase>
         </PopupActions>
@@ -59,6 +73,7 @@
     import {required} from 'vee-validate/dist/rules'
 	import InfoBox from "../Others/Forms/InfoBox";
     import {events} from '/resources/js/bus'
+	import axios from "axios";
 
     export default {
         name: 'CreateTeamFolderPopup',
@@ -82,6 +97,9 @@
 			popupSubmit() {
                 return this.item ? this.$t('Move & Invite Members') : this.$t('Create Team Folder')
             },
+			isNewFolderTeamCreation() {
+				return ! this.item
+			}
         },
         data() {
             return {
@@ -108,17 +126,36 @@
 						permission: 'can-view-and-download',
 					},
 				],
-                item: {
-					type: 'folder',
-					name: 'Shared Folder',
-					created_at: '19. Feb. 2020 at 08:53',
-				},
-				email: undefined
+                item: undefined,
+                name: undefined,
+				email: undefined,
+				isLoading: false,
             }
         },
         methods: {
-            createTeamFolder() {
+            async createTeamFolder() {
+				const isValid = await this.$refs.teamFolderForm.validate()
 
+				if (!isValid) return
+
+				this.isLoading = true
+
+				let route = this.name ? `/api/teams` : `/api/teams/${this.item.id}`
+
+				axios
+					.post(route, {
+						name: this.name,
+						members: this.members,
+					})
+					.then(response => {
+
+					})
+					.catch(() => this.$isSomethingWrong())
+					.finally(() => {
+						this.isLoading = false
+						this.name = undefined
+						this.members = undefined
+					})
             },
 			addMember() {
             	let email = this.email.match(/^[^\s@]+@[^\s@]+\.[^\s@]+$/)[0]
@@ -132,7 +169,6 @@
 				this.$refs.teamFolderForm.reset()
 
             	this.members.push({
-					id: Math.floor(Math.random() * 10000000),
 					email: this.email,
 					avatar: '/assets/images/default-avatar.png',
 					permission: 'can-edit',
@@ -142,12 +178,22 @@
 			}
         },
         mounted() {
-            events.$on('popup:open', item => {
+            events.$on('popup:open', args => {
+                if (args.name !== 'create-team-folder') return
 
-                if (name !== 'create-team-folder') return
-
-				this.item = item
+				if (args.item) {
+					this.item = args.item[0]
+				}
             })
+
+			events.$on('popup:close', () => {
+				setTimeout(() => {
+					this.email = undefined
+					this.name = undefined
+					this.item = undefined
+					this.members = []
+				}, 150)
+			})
         }
     }
 </script>
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index ab2dfea9..4b15b077 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -15,6 +15,14 @@ const Helpers = {
             events.$emit('popup:open', {name: 'move', item: [entry]})
         }
 
+        Vue.prototype.$createTeamFolder = function (entry) {
+            events.$emit('popup:open', {name: 'create-team-folder'})
+        }
+
+        Vue.prototype.$updateTeamFolder = function (entry) {
+            events.$emit('popup:open', {name: 'create-team-folder', item: [entry]})
+        }
+
         Vue.prototype.$deleteFileOrFolder = function (entry) {
             if (!this.$store.getters.clipboard.includes(entry)) {
                 this.$store.dispatch('deleteItem', entry)
diff --git a/resources/sass/vuefilemanager/_forms.scss b/resources/sass/vuefilemanager/_forms.scss
index 312b04a4..bd480bb3 100644
--- a/resources/sass/vuefilemanager/_forms.scss
+++ b/resources/sass/vuefilemanager/_forms.scss
@@ -86,13 +86,14 @@
     }
   }
 
-  .input-help {
-    @include font-size(12);
-    color: $text-muted;
-    line-height: 1.35;
-    padding-top: 10px;
-    display: block;
-  }
+}
+
+.input-help {
+  @include font-size(12);
+  color: $text-muted;
+  line-height: 1.35;
+  padding-top: 10px;
+  display: block;
 }
 
 .single-line-form {