diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index fb76c4a3..fa33869a 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,7 +2,7 @@
     "/js/main.js": "/js/main.js",
     "/css/app.css": "/css/app.css",
     "/css/tailwind.css": "/css/tailwind.css",
-    "/chunks/admin.js": "/chunks/admin.js?id=9cd48b7dbccd9d558e4b",
+    "/chunks/admin.js": "/chunks/admin.js?id=4b4e84e35766f830978f",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=6e28465565ea92af804f",
     "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunk~9f5cf693.js?id=b315e8dcb5e79c1c8e7c",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app~f4e3acb1.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app~f4e3acb1.js?id=08ee54ab4c19d49dc342",
@@ -12,8 +12,8 @@
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=9535568da44844c1bf50",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=510e6c1b1017a73a40a6",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=354c892546e5c369a749",
-    "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=30e106dacad45945a1f8",
-    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=b1c1c9d66cc4e2332330",
+    "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=7c1f56dddcaa83704a70",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=569fc87108cddd41874d",
     "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=afeba4ebd13af7e995be",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=de219ada9218e395d85f",
     "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~45d16af9.js": "/chunks/app-appearance~chunks/app-email~chunks/app-index~chunks/app-others~chunks/payments/billings~c~45d16af9.js?id=a4b9a9a416c656f4d95d",
@@ -43,7 +43,7 @@
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=cb6691f996a6ea765b4d",
     "/chunks/files.js": "/chunks/files.js?id=f0a4d97bafb958087749",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=c3a515572a3152fa1c9c",
-    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=fd09338f95a63dfa9f95",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=a7eb59ca6cf0f668e86b",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js?id=95a21dc98f0b9a5ba0cb",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7fe909d93242299552ec",
     "/chunks/homepage.js": "/chunks/homepage.js?id=6a14173a7751010222ed",
@@ -56,7 +56,7 @@
     "/chunks/pages.js": "/chunks/pages.js?id=fc74b3c4250317f9955f",
     "/chunks/payments.js": "/chunks/payments.js?id=56a633689fc98ab71b92",
     "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=ddeb484509e788db1eda",
-    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=cab5d58684a2c8c2a147",
+    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=2ae059b694da0f255e47",
     "/chunks/plan.js": "/chunks/plan.js?id=fc9e9e0b9bac63514475",
     "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=75b6e639a1fb66d34f10",
     "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=22a5c4fb60a77b72cd4e",
@@ -64,15 +64,15 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=7f623c8a4002f17eecef",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=7eff560fea52770a642f",
     "/chunks/plans.js": "/chunks/plans.js?id=293e7e8d59da542a9710",
-    "/chunks/platform.js": "/chunks/platform.js?id=5b05f0ef5b8df962a8b6",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=f2482a3da405def52168",
+    "/chunks/platform.js": "/chunks/platform.js?id=1cd6e357b28006f2c0d0",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=eb52b5029ab2132cc7a8",
     "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js": "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js?id=ca9ca67afd5839597647",
     "/chunks/profile.js": "/chunks/profile.js?id=8688d9c7ff850e6989e6",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=a81388efd770d51f8a9c",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=d9af0efad2af2679954b",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=8577d4c771602671b38a",
-    "/chunks/settings.js": "/chunks/settings.js?id=d43d99bf7a6bdbe4f526",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=9da02abf646fe0b340ce",
+    "/chunks/settings.js": "/chunks/settings.js?id=878db4aace652942be5b",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=1ac00b8ab720794abdea",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=84f35e2124d825cc5039",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=aafc9cd6aa47b01bc25a",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
@@ -996,5 +996,40 @@
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.998598cbd6ffd995fc5a.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.998598cbd6ffd995fc5a.hot-update.js",
     "/chunks/platform.d870aa094afeffd63278.hot-update.js": "/chunks/platform.d870aa094afeffd63278.hot-update.js",
     "/chunks/platform.be84aee525596aa323da.hot-update.js": "/chunks/platform.be84aee525596aa323da.hot-update.js",
-    "/chunks/platform.7d69abf812255d2e05e3.hot-update.js": "/chunks/platform.7d69abf812255d2e05e3.hot-update.js"
+    "/chunks/platform.7d69abf812255d2e05e3.hot-update.js": "/chunks/platform.7d69abf812255d2e05e3.hot-update.js",
+    "/chunks/admin.7a1ad7b58c1e5e925d31.hot-update.js": "/chunks/admin.7a1ad7b58c1e5e925d31.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings.7a1ad7b58c1e5e925d31.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.7a1ad7b58c1e5e925d31.hot-update.js",
+    "/chunks/platform.7a1ad7b58c1e5e925d31.hot-update.js": "/chunks/platform.7a1ad7b58c1e5e925d31.hot-update.js",
+    "/chunks/platform~chunks/shared.7a1ad7b58c1e5e925d31.hot-update.js": "/chunks/platform~chunks/shared.7a1ad7b58c1e5e925d31.hot-update.js",
+    "/chunks/settings.7a1ad7b58c1e5e925d31.hot-update.js": "/chunks/settings.7a1ad7b58c1e5e925d31.hot-update.js",
+    "/chunks/settings-password.7a1ad7b58c1e5e925d31.hot-update.js": "/chunks/settings-password.7a1ad7b58c1e5e925d31.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.3f826d9f67492f0ff39b.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.3f826d9f67492f0ff39b.hot-update.js",
+    "/chunks/platform.3f826d9f67492f0ff39b.hot-update.js": "/chunks/platform.3f826d9f67492f0ff39b.hot-update.js",
+    "/chunks/platform~chunks/shared.3f826d9f67492f0ff39b.hot-update.js": "/chunks/platform~chunks/shared.3f826d9f67492f0ff39b.hot-update.js",
+    "/chunks/platform~chunks/shared.d6415928de50531a4f17.hot-update.js": "/chunks/platform~chunks/shared.d6415928de50531a4f17.hot-update.js",
+    "/chunks/platform.6a69d8a0cdcb05984033.hot-update.js": "/chunks/platform.6a69d8a0cdcb05984033.hot-update.js",
+    "/chunks/platform.42e6beab4b5d91790216.hot-update.js": "/chunks/platform.42e6beab4b5d91790216.hot-update.js",
+    "/chunks/platform~chunks/shared.02dc27a1c9514a30c4af.hot-update.js": "/chunks/platform~chunks/shared.02dc27a1c9514a30c4af.hot-update.js",
+    "/chunks/platform~chunks/shared.d9e9f94e2299419ea606.hot-update.js": "/chunks/platform~chunks/shared.d9e9f94e2299419ea606.hot-update.js",
+    "/chunks/admin.54d9bdf248e10495526c.hot-update.js": "/chunks/admin.54d9bdf248e10495526c.hot-update.js",
+    "/chunks/platform.54d9bdf248e10495526c.hot-update.js": "/chunks/platform.54d9bdf248e10495526c.hot-update.js",
+    "/chunks/settings.54d9bdf248e10495526c.hot-update.js": "/chunks/settings.54d9bdf248e10495526c.hot-update.js",
+    "/chunks/platform.ae0438d56fbb022035e7.hot-update.js": "/chunks/platform.ae0438d56fbb022035e7.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.7eb5bb02086b17d6ef6c.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.7eb5bb02086b17d6ef6c.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.928d434bc772b786b716.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.928d434bc772b786b716.hot-update.js",
+    "/chunks/platform~chunks/shared.f5e9ba682bbe6f04c1f4.hot-update.js": "/chunks/platform~chunks/shared.f5e9ba682bbe6f04c1f4.hot-update.js",
+    "/chunks/platform~chunks/shared.4a53bf21c2322fb2447b.hot-update.js": "/chunks/platform~chunks/shared.4a53bf21c2322fb2447b.hot-update.js",
+    "/chunks/platform~chunks/shared.0991d3e7495f2234f10a.hot-update.js": "/chunks/platform~chunks/shared.0991d3e7495f2234f10a.hot-update.js",
+    "/chunks/platform~chunks/shared.ca7281d0a475fe160bb9.hot-update.js": "/chunks/platform~chunks/shared.ca7281d0a475fe160bb9.hot-update.js",
+    "/chunks/platform~chunks/shared.b2405790c8e575a5aeb6.hot-update.js": "/chunks/platform~chunks/shared.b2405790c8e575a5aeb6.hot-update.js",
+    "/chunks/platform~chunks/shared.f0a80b9f14d7550a971e.hot-update.js": "/chunks/platform~chunks/shared.f0a80b9f14d7550a971e.hot-update.js",
+    "/chunks/platform~chunks/shared.e64859a75374f7de40e0.hot-update.js": "/chunks/platform~chunks/shared.e64859a75374f7de40e0.hot-update.js",
+    "/chunks/settings.abaa6032f8f402074a5f.hot-update.js": "/chunks/settings.abaa6032f8f402074a5f.hot-update.js",
+    "/chunks/payments/settings.8ecdd2a290760cd9f143.hot-update.js": "/chunks/payments/settings.8ecdd2a290760cd9f143.hot-update.js",
+    "/chunks/settings.8ecdd2a290760cd9f143.hot-update.js": "/chunks/settings.8ecdd2a290760cd9f143.hot-update.js",
+    "/chunks/settings.28ebea8b0f99e243b80a.hot-update.js": "/chunks/settings.28ebea8b0f99e243b80a.hot-update.js",
+    "/chunks/platform~chunks/shared.ea85f5cfae919a076286.hot-update.js": "/chunks/platform~chunks/shared.ea85f5cfae919a076286.hot-update.js",
+    "/chunks/platform~chunks/shared.84634b8388c060112c1b.hot-update.js": "/chunks/platform~chunks/shared.84634b8388c060112c1b.hot-update.js",
+    "/chunks/platform~chunks/shared.bad4a30908dd6677cf57.hot-update.js": "/chunks/platform~chunks/shared.bad4a30908dd6677cf57.hot-update.js",
+    "/chunks/platform~chunks/shared.7344fdb67d1d2c382527.hot-update.js": "/chunks/platform~chunks/shared.7344fdb67d1d2c382527.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/MobileContextMenu.vue b/resources/js/components/FilesView/MobileContextMenu.vue
index 02b739ba..76fbdf20 100644
--- a/resources/js/components/FilesView/MobileContextMenu.vue
+++ b/resources/js/components/FilesView/MobileContextMenu.vue
@@ -1,6 +1,6 @@
 <template>
     <MenuMobile name="file-menu">
-        <ThumbnailItem class="item-thumbnail" :item="clipboard[0]" info="metadata" />
+        <ThumbnailItem class="mb-5" :item="clipboard[0]" info="metadata" />
 
 		<MenuMobileGroup v-if="$slots.default">
 			<slot></slot>
diff --git a/resources/js/components/Others/CreateFolderPopup.vue b/resources/js/components/Others/CreateFolderPopup.vue
index 74a1b820..960a77fa 100644
--- a/resources/js/components/Others/CreateFolderPopup.vue
+++ b/resources/js/components/Others/CreateFolderPopup.vue
@@ -26,13 +26,13 @@
         <!--Actions-->
         <PopupActions>
             <ButtonBase
-                    class="popup-button"
+                    class="w-full"
                     @click.native="$closePopup()"
                     button-style="secondary"
             >{{ $t('popup_move_item.cancel') }}
             </ButtonBase>
             <ButtonBase
-                    class="popup-button"
+                    class="w-full"
                     @click.native="createFolder"
                     button-style="theme"
             >{{ $t('popup_create_folder.title') }}
diff --git a/resources/js/components/Others/CreateLanguage.vue b/resources/js/components/Others/CreateLanguage.vue
index 173f3f47..88128cec 100644
--- a/resources/js/components/Others/CreateLanguage.vue
+++ b/resources/js/components/Others/CreateLanguage.vue
@@ -8,7 +8,7 @@
         <PopupContent>
 
             <!--Form to set sharing-->
-            <ValidationObserver @submit.prevent="createLanguage" ref="createForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+            <ValidationObserver @submit.prevent="createLanguage" ref="createForm" v-slot="{ invalid }" tag="form">
 				<ValidationProvider tag="div" mode="passive" name="Language Locale" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('select_locale')" :error="errors[0]">
 						<SelectInput v-model="form.locale" :options="locales" :placeholder="$t('select_language_locale')" :isError="errors[0]" />
@@ -25,14 +25,14 @@
         <!--Actions-->
         <PopupActions>
             <ButtonBase
-                class="popup-button"
+                class="w-full"
                 @click.native="$closePopup()"
                 button-style="secondary"
             >
                 {{ $t('global.cancel') }}
             </ButtonBase>
             <ButtonBase
-                class="popup-button"
+                class="w-full"
                 @click.native="createLanguage"
                 button-style="theme"
                 :loading="isLoading"
diff --git a/resources/js/components/Others/CreatePersonaTokenPopup.vue b/resources/js/components/Others/CreatePersonaTokenPopup.vue
index 5a8ec907..811d8504 100644
--- a/resources/js/components/Others/CreatePersonaTokenPopup.vue
+++ b/resources/js/components/Others/CreatePersonaTokenPopup.vue
@@ -4,7 +4,7 @@
         <PopupHeader :title="$t('popup_personal_token.title')" icon="key" />
 
         <PopupContent>
-             <ValidationObserver v-if="! token" @submit.prevent="createTokenForm" ref="createToken" v-slot="{ invalid }" tag="form" class="form-wrapper">
+             <ValidationObserver v-if="! token" @submit.prevent="createTokenForm" ref="createToken" v-slot="{ invalid }" tag="form">
 
                 <ValidationProvider tag="div" mode="passive" name="Token Name" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('popup_personal_token.label')" :error="errors[0]" :is-last="true">
@@ -14,7 +14,7 @@
 
             </ValidationObserver>
 
-			<AppInputText v-if="token" :title="$t('popup_personal_token.your_token')" class="form-wrapper" :is-last="true">
+			<AppInputText v-if="token" :title="$t('popup_personal_token.your_token')" :is-last="true">
 				<CopyInput size="small" :str="token['plainTextToken']" />
 
 				<InfoBox style="margin-bottom: 0; margin-top: 20px">
@@ -26,14 +26,14 @@
 
         <PopupActions v-if="! token">
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="$closePopup()"
 				button-style="secondary"
 			>
                 {{ $t('global.cancel') }}
             </ButtonBase>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="createTokenForm"
 				button-style="theme"
 				:loading="isLoading"
@@ -45,7 +45,7 @@
 
         <PopupActions v-if="token">
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="closePopup"
 				button-style="theme"
 			>
diff --git a/resources/js/components/Others/Forms/CopyInput.vue b/resources/js/components/Others/Forms/CopyInput.vue
index 81889c06..069cb848 100644
--- a/resources/js/components/Others/Forms/CopyInput.vue
+++ b/resources/js/components/Others/Forms/CopyInput.vue
@@ -1,6 +1,6 @@
 <template>
     <div @click="copyUrl" class="flex items-center relative">
-        <input ref="sel" :value="str" :id="id" type="text" class="pr-8 focus-border-theme input-dark" readonly>
+        <input ref="sel" :value="str" :id="id" type="text" class="pr-10 focus-border-theme input-dark" readonly>
 
 		<!--Copy icon-->
         <div class="absolute right-0 px-4">
diff --git a/resources/js/components/Others/MoveItemPopup.vue b/resources/js/components/Others/MoveItemPopup.vue
index c6612ae7..dfa9102a 100644
--- a/resources/js/components/Others/MoveItemPopup.vue
+++ b/resources/js/components/Others/MoveItemPopup.vue
@@ -11,28 +11,30 @@
 
 			<!--Folder tree-->
             <div v-if="! isLoadingTree && navigation">
-                <ThumbnailItem v-if="clipboard.length < 2 || isSelectedItem" class="item-thumbnail" :item="pickedItem" info="location" />
+                <ThumbnailItem v-if="clipboard.length < 2 || isSelectedItem" class="mb-5" :item="pickedItem" info="location" />
 
-                <TitlePreview class="multiple-selected"
-							  icon="check-square"
-							  :title="$t('file_detail.selected_multiple')"
-							  :subtitle="this.clipboard.length + ' ' + $tc('file_detail.items', this.clipboard.length)"
-							  v-if="clipboard.length > 1 && !isSelectedItem" />
+                <TitlePreview
+					class="mb-4"
+					icon="check-square"
+					:title="$t('file_detail.selected_multiple')"
+					: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.id" />
+                <TreeMenu class="-mx-4" :disabled-by-id="pickedItem" :depth="1" :nodes="items" v-for="items in navigation" :key="items.id" />
             </div>
         </PopupContent>
 
 		<!--Actions-->
         <PopupActions>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="$closePopup()"
 				button-style="secondary"
 			>{{ $t('popup_move_item.cancel') }}
             </ButtonBase>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="moveItem"
 				:button-style="selectedFolder ? 'theme' : 'secondary'"
 			>{{ $t('popup_move_item.submit') }}
@@ -165,17 +167,3 @@
 		}
 	}
 </script>
-
-<style scoped lang="scss">
-@import '/resources/sass/vuefilemanager/_variables';
-@import '/resources/sass/vuefilemanager/_mixins';
-
-.item-thumbnail {
-	margin-bottom: 20px;
-}
-
-.multiple-selected {
-	padding: 0 20px;;
-	margin-bottom: 20px;
-}
-</style>
diff --git a/resources/js/components/Others/Popup/ConfirmPopup.vue b/resources/js/components/Others/Popup/ConfirmPopup.vue
index 486bfebb..61870490 100644
--- a/resources/js/components/Others/Popup/ConfirmPopup.vue
+++ b/resources/js/components/Others/Popup/ConfirmPopup.vue
@@ -13,13 +13,13 @@
             <ButtonBase
                     @click.native="closePopup"
                     button-style="secondary"
-                    class="popup-button"
+                    class="w-full"
             >{{ $t('global.cancel') }}
             </ButtonBase>
             <ButtonBase
                     @click.native="confirm"
                     :button-style="buttonColor"
-                    class="popup-button"
+                    class="w-full"
             >{{ $t('global.confirm_action') }}
             </ButtonBase>
         </PopupActions>
diff --git a/resources/js/components/Others/Popup/PopupActions.vue b/resources/js/components/Others/Popup/PopupActions.vue
index a694a67b..3e213818 100644
--- a/resources/js/components/Others/Popup/PopupActions.vue
+++ b/resources/js/components/Others/Popup/PopupActions.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="actions flex items-center space-x-4 md:p-6 p-4">
+    <div class="actions flex items-center space-x-4 px-6 py-4 pb-6">
         <slot></slot>
     </div>
 </template>
diff --git a/resources/js/components/Others/RenameItemPopup.vue b/resources/js/components/Others/RenameItemPopup.vue
index 103c4fd4..f6323200 100644
--- a/resources/js/components/Others/RenameItemPopup.vue
+++ b/resources/js/components/Others/RenameItemPopup.vue
@@ -7,10 +7,10 @@
         <PopupContent>
 
             <!--Item Thumbnail-->
-            <ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata" :setFolderIcon="folderIcon" />
+            <ThumbnailItem class="mb-5" :item="pickedItem" info="metadata" :setFolderIcon="folderIcon" />
 
             <!--Form to set sharing-->
-            <ValidationObserver @submit.prevent="changeName" ref="renameForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+            <ValidationObserver @submit.prevent="changeName" ref="renameForm" v-slot="{ invalid }" tag="form">
 
                 <!--Set password-->
                 <ValidationProvider tag="div" mode="passive" name="Name" rules="required" v-slot="{ errors }">
@@ -34,10 +34,10 @@
 
         <!--Actions-->
         <PopupActions>
-            <ButtonBase class="popup-button" @click.native="$closePopup()" button-style="secondary">
+            <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary">
                 {{ $t('popup_move_item.cancel') }}
             </ButtonBase>
-            <ButtonBase class="popup-button" @click.native="changeName" button-style="theme">
+            <ButtonBase class="w-full" @click.native="changeName" button-style="theme">
                 {{ $t('popup_share_edit.save') }}
             </ButtonBase>
         </PopupActions>
@@ -183,10 +183,6 @@ export default {
     }
 }
 
-.item-thumbnail {
-    margin-bottom: 20px;
-}
-
 .dark {
     .close-icon-wrapper {
         &:hover {
diff --git a/resources/js/components/Others/SelectSingleChargeMethodPopup.vue b/resources/js/components/Others/SelectSingleChargeMethodPopup.vue
index a174df17..47011cd7 100644
--- a/resources/js/components/Others/SelectSingleChargeMethodPopup.vue
+++ b/resources/js/components/Others/SelectSingleChargeMethodPopup.vue
@@ -54,7 +54,7 @@
 
         <PopupActions>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="$closePopup()"
 				button-style="secondary"
 			>
diff --git a/resources/js/components/Others/ShareCreatePopup.vue b/resources/js/components/Others/ShareCreatePopup.vue
index 5c5a737e..af7cbe56 100644
--- a/resources/js/components/Others/ShareCreatePopup.vue
+++ b/resources/js/components/Others/ShareCreatePopup.vue
@@ -7,10 +7,10 @@
         <PopupContent>
 
             <!--Item Thumbnail-->
-            <ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata" />
+            <ThumbnailItem class="mb-5" :item="pickedItem" info="metadata" />
 
             <!--Form to set sharing-->
-            <ValidationObserver v-if="! isGeneratedShared" @submit.prevent ref="shareForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+            <ValidationObserver v-if="! isGeneratedShared" @submit.prevent ref="shareForm" v-slot="{ invalid }" tag="form">
 
                 <!--Permission Select-->
 				<ValidationProvider v-if="isFolder" tag="div" mode="passive" name="Permission" rules="required" v-slot="{ errors }">
@@ -66,10 +66,10 @@
 
         <!--Actions-->
         <PopupActions>
-            <ButtonBase v-if="! isGeneratedShared" class="popup-button" @click.native="$closePopup()" button-style="secondary">
+            <ButtonBase v-if="! isGeneratedShared" class="w-full" @click.native="$closePopup()" button-style="secondary">
                 {{ $t('popup_move_item.cancel') }}
             </ButtonBase>
-            <ButtonBase class="popup-button" @click.native="submitShareOptions" button-style="theme" :loading="isLoading" :disabled="isLoading">
+            <ButtonBase class="w-full" @click.native="submitShareOptions" button-style="theme" :loading="isLoading" :disabled="isLoading">
                 {{ submitButtonText }}
             </ButtonBase>
         </PopupActions>
@@ -247,20 +247,3 @@ export default {
     }
 }
 </script>
-
-<style scoped lang="scss">
-@import "resources/sass/vuefilemanager/_inapp-forms.scss";
-@import '/resources/sass/vuefilemanager/_forms';
-
-.input-wrapper {
-
-    &.password {
-        margin-top: -10px;
-    }
-}
-
-.item-thumbnail {
-    margin-bottom: 20px;
-}
-
-</style>
diff --git a/resources/js/components/Others/ShareEditPopup.vue b/resources/js/components/Others/ShareEditPopup.vue
index dd5b8869..8b2aaf61 100644
--- a/resources/js/components/Others/ShareEditPopup.vue
+++ b/resources/js/components/Others/ShareEditPopup.vue
@@ -33,7 +33,7 @@
 				<!--Item Thumbnail-->
 				<ThumbnailItem class="mb-4" :item="pickedItem" info="metadata" />
 
-				<ValidationObserver @submit.prevent v-slot="{ invalid }" ref="shareEmail" tag="form" class="px-5">
+				<ValidationObserver @submit.prevent v-slot="{ invalid }" ref="shareEmail" tag="form">
 					<ValidationProvider tag="div" mode="passive" name="Email" rules="required" v-slot="{ errors }">
 						<AppInputText title="Share with" :error="errors[0]" :is-last="true">
 							<MultiEmailInput rules="required" v-model="emails" :label="$t('shared_form.label_send_to_recipients')" />
@@ -73,7 +73,7 @@
 					<CopyShareLink :item="pickedItem" />
 				</AppInputText>
 
-				<ValidationObserver @submit.prevent ref="shareForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+				<ValidationObserver @submit.prevent ref="shareForm" v-slot="{ invalid }" tag="form">
 
 					<!--Permission Select-->
 					<ValidationProvider v-if="isFolder" tag="div" mode="passive" name="Permission" rules="required" v-slot="{ errors }">
diff --git a/resources/js/components/Others/TwoFactorRecoveryCodesPopup.vue b/resources/js/components/Others/TwoFactorRecoveryCodesPopup.vue
index 8536e3c5..769ed109 100644
--- a/resources/js/components/Others/TwoFactorRecoveryCodesPopup.vue
+++ b/resources/js/components/Others/TwoFactorRecoveryCodesPopup.vue
@@ -35,7 +35,7 @@
 
         <PopupActions>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="$closePopup()"
 				button-style="theme"
 			>
diff --git a/resources/js/components/Others/TwoFactorSetupPopup.vue b/resources/js/components/Others/TwoFactorSetupPopup.vue
index 2393c8c5..2a43812e 100644
--- a/resources/js/components/Others/TwoFactorSetupPopup.vue
+++ b/resources/js/components/Others/TwoFactorSetupPopup.vue
@@ -4,7 +4,7 @@
         <PopupHeader :title="$t('popup_2fa.title')" icon="edit" />
 
         <PopupContent>
-             <ValidationObserver @submit.prevent="confirmPassword" v-if="! qrCode" ref="passwordForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+             <ValidationObserver @submit.prevent="confirmPassword" v-if="! qrCode" ref="passwordForm" v-slot="{ invalid }" tag="form">
                 <ValidationProvider tag="div" mode="passive" name="Password" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('popup_2fa.input_label')" :error="errors[0]" :is-last="true">
 						<input v-model="password" :class="{'border-red': errors[0]}" type="password" ref="input" class="focus-border-theme input-dark" :placeholder="$t('page_sign_in.placeholder_password')">
@@ -25,14 +25,14 @@
 
         <PopupActions v-if="! qrCode">
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="$closePopup()"
 				button-style="secondary"
 			>
                 {{ $t('global.cancel') }}
             </ButtonBase>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="confirmPassword"
 				button-style="theme"
 				:loading="isLoading"
@@ -44,7 +44,7 @@
 
         <PopupActions v-if="qrCode">
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="closeQrCodePopup"
 				:button-style="closeQrButtonStyle"
 			>
@@ -201,7 +201,6 @@ export default {
 @import '/resources/sass/vuefilemanager/_forms';
 
 .qr-code-wrapper {
-	padding: 0 20px;
 
 	.qr-code {
 		display: flex;
diff --git a/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue b/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
index 8b6068e2..b01d4c5f 100644
--- a/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
+++ b/resources/js/components/Subscription/SelectPlanSubscriptionPopup.vue
@@ -71,7 +71,7 @@
 
 			<PopupActions>
 				<ButtonBase
-					class="popup-button"
+					class="w-full"
 					@click.native="$closePopup()"
 					button-style="secondary"
 				>
@@ -110,13 +110,13 @@
 			<!--Actions-->
 			<PopupActions>
 				<ButtonBase
-					class="popup-button"
+					class="w-full"
 					@click.native="$closePopup()"
 					button-style="secondary"
 				>{{ $t('popup_move_item.cancel') }}
 				</ButtonBase>
 				<ButtonBase
-					class="popup-button"
+					class="w-full"
 					:button-style="buttonStyle"
 					@click.native="isPaymentOptionPage = true"
 				>{{ $t('Upgrade Account') }}
diff --git a/resources/js/components/Teams/CreateTeamFolderPopup.vue b/resources/js/components/Teams/CreateTeamFolderPopup.vue
index b75ded47..cd8ea370 100644
--- a/resources/js/components/Teams/CreateTeamFolderPopup.vue
+++ b/resources/js/components/Teams/CreateTeamFolderPopup.vue
@@ -8,10 +8,10 @@
         <PopupContent>
 
 			<!--Item Thumbnail-->
-            <ThumbnailItem v-if="! isNewFolderTeamCreation" class="item-thumbnail" :item="item" info="metadata" />
+            <ThumbnailItem v-if="! isNewFolderTeamCreation" class="mb-5" :item="item" info="metadata" />
 
 			<!--Form to set team folder-->
-            <ValidationObserver @submit.prevent="createTeamFolder" ref="teamFolderForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+            <ValidationObserver @submit.prevent="createTeamFolder" ref="teamFolderForm" v-slot="{ invalid }" tag="form">
 
                 <!--Set folder name-->
                 <ValidationProvider v-if="isNewFolderTeamCreation" tag="div" mode="passive" name="Name" rules="required" v-slot="{ errors }">
@@ -60,13 +60,13 @@
 		<!--Actions-->
         <PopupActions>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="$closePopup()"
 				button-style="secondary"
 			>{{ $t('popup_move_item.cancel') }}
             </ButtonBase>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="createTeamFolder"
 				button-style="theme"
 				:loading="isLoading"
diff --git a/resources/js/components/Teams/EditTeamFolderPopup.vue b/resources/js/components/Teams/EditTeamFolderPopup.vue
index ec0927c9..37d7d295 100644
--- a/resources/js/components/Teams/EditTeamFolderPopup.vue
+++ b/resources/js/components/Teams/EditTeamFolderPopup.vue
@@ -8,10 +8,10 @@
         <PopupContent>
 
 			<!--Item Thumbnail-->
-            <ThumbnailItem class="item-thumbnail" :item="item" info="metadata" />
+            <ThumbnailItem class="mb-5" :item="item" info="metadata" />
 
 			<!--Form to set team folder-->
-            <ValidationObserver @submit.prevent="updateTeamFolder" ref="teamFolderForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+            <ValidationObserver @submit.prevent="updateTeamFolder" ref="teamFolderForm" v-slot="{ invalid }" tag="form">
 
                 <!--Add Member-->
 				<ValidationProvider tag="div" mode="passive" name="Email" v-slot="{ errors }">
@@ -49,13 +49,13 @@
 		<!--Actions-->
         <PopupActions>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="$closePopup()"
 				button-style="secondary"
 			>{{ $t('popup_move_item.cancel') }}
             </ButtonBase>
             <ButtonBase
-				class="popup-button"
+				class="w-full"
 				@click.native="updateTeamFolder"
 				:button-style="isDisabledSubmit ? 'secondary' : 'theme'"
 				:loading="isLoading"
diff --git a/resources/js/views/User/Password.vue b/resources/js/views/User/Password.vue
index 239631aa..d915fd57 100644
--- a/resources/js/views/User/Password.vue
+++ b/resources/js/views/User/Password.vue
@@ -10,7 +10,7 @@
                 <SwitchInput @click.native.prevent.stop="open2faPopup" class="switch" :state="user.data.attributes.two_factor_authentication" />
             </AppInputSwitch>
             <AppInputSwitch v-if="user && user.data.attributes.two_factor_authentication" :title="$t('popup_2fa.codes_title')" :description="$t('popup_2fa.codes_info')" :is-last="true">
-                <ButtonBase class="popup-button" button-style="secondary" @click.native="showRecoveryCodes">
+                <ButtonBase class="w-full" button-style="secondary" @click.native="showRecoveryCodes">
                     {{ $t('popup_2fa.codes_button') }}
                 </ButtonBase>
             </AppInputSwitch>