diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 1e49520a..91448741 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -11,8 +11,8 @@
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js?id=f3da1167c5f8c0239987",
     "/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=481af22bd60333fd4ce1",
     "/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=90270d0c5aeb5c50dacf",
-    "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=61e970ffb679245686c3",
+    "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=c93d93c96f9924e4517d",
+    "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=38c415adc5cb370e7e12",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=02b6620b94dc282ba692",
     "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=16daae21d6ae3cfcb4e4",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6190b5814fdd1bcaa3e7",
@@ -68,14 +68,14 @@
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=4c9656de6fa221022bf5",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=22f629caf127051898e9",
-    "/chunks/settings.js": "/chunks/settings.js?id=f4ef977ad78eea09af55",
+    "/chunks/settings.js": "/chunks/settings.js?id=29665dce3fe050b9e53f",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=cacac1c92fcaa4f21f69",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=5a69146b6daf08cff500",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=68dafd28e0eff002bf5f",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=3a88e55341d1f1ffe12d",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=c1a4036392db4eea190f",
     "/chunks/settings-storage~chunks/user-storage.js": "/chunks/settings-storage~chunks/user-storage.js?id=947b35a202481d0b8a4b",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=79c40cbf27626159ae6e",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=e6f0b8bae90c122a019d",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=e67e12955133c57194d1",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
     "/chunks/shared.js": "/chunks/shared.js?id=6230d050545cd1bd9b87",
@@ -95,7 +95,7 @@
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=28dce4872f5b8c5e95f8",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=8bd237c632018a537d76",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=7ee9b84ffed9bf544997",
-    "/chunks/user.js": "/chunks/user.js?id=1a89d96454562e0bd29d",
+    "/chunks/user.js": "/chunks/user.js?id=3af74e89129b91a48e5e",
     "/chunks/user-create.js": "/chunks/user-create.js?id=e88511a44794a13905a7",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=ce3ff1769cb97e99427b",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=6d798cc57ea2ae5c924f",
@@ -288,5 +288,23 @@
     "/chunks/settings.ec5d925d1840a1349108.hot-update.js": "/chunks/settings.ec5d925d1840a1349108.hot-update.js",
     "/chunks/settings-subscription.891f703a125d1e5e6d33.hot-update.js": "/chunks/settings-subscription.891f703a125d1e5e6d33.hot-update.js",
     "/chunks/settings-subscription.c0b49f95cfe19f5ec063.hot-update.js": "/chunks/settings-subscription.c0b49f95cfe19f5ec063.hot-update.js",
-    "/chunks/settings-subscription.eab320d68a645b75d39a.hot-update.js": "/chunks/settings-subscription.eab320d68a645b75d39a.hot-update.js"
+    "/chunks/settings-subscription.eab320d68a645b75d39a.hot-update.js": "/chunks/settings-subscription.eab320d68a645b75d39a.hot-update.js",
+    "/chunks/user.e2a588442b30115b8faa.hot-update.js": "/chunks/user.e2a588442b30115b8faa.hot-update.js",
+    "/chunks/settings-subscription.9807993b24215c0a8698.hot-update.js": "/chunks/settings-subscription.9807993b24215c0a8698.hot-update.js",
+    "/chunks/settings-subscription.b85e306050cab23416fd.hot-update.js": "/chunks/settings-subscription.b85e306050cab23416fd.hot-update.js",
+    "/chunks/settings-subscription.21a3ece8446c70e014e7.hot-update.js": "/chunks/settings-subscription.21a3ece8446c70e014e7.hot-update.js",
+    "/chunks/admin~chunks/platform.33bb5b6e68093bebca7d.hot-update.js": "/chunks/admin~chunks/platform.33bb5b6e68093bebca7d.hot-update.js",
+    "/chunks/settings.33bb5b6e68093bebca7d.hot-update.js": "/chunks/settings.33bb5b6e68093bebca7d.hot-update.js",
+    "/chunks/settings.e0ed07769e41a6c183ca.hot-update.js": "/chunks/settings.e0ed07769e41a6c183ca.hot-update.js",
+    "/chunks/settings-subscription.90770b59a0e2431ae6cf.hot-update.js": "/chunks/settings-subscription.90770b59a0e2431ae6cf.hot-update.js",
+    "/chunks/settings-subscription.cc8c3d79ee810a4cae74.hot-update.js": "/chunks/settings-subscription.cc8c3d79ee810a4cae74.hot-update.js",
+    "/chunks/settings-subscription.5114a86b65db84598225.hot-update.js": "/chunks/settings-subscription.5114a86b65db84598225.hot-update.js",
+    "/chunks/settings-subscription.790aa05deb165fc7ed83.hot-update.js": "/chunks/settings-subscription.790aa05deb165fc7ed83.hot-update.js",
+    "/chunks/settings-subscription.70b1d6b730400158fce2.hot-update.js": "/chunks/settings-subscription.70b1d6b730400158fce2.hot-update.js",
+    "/chunks/settings-subscription.351eeb1771f81eb3c051.hot-update.js": "/chunks/settings-subscription.351eeb1771f81eb3c051.hot-update.js",
+    "/chunks/settings-subscription.09128a06dc6b8f953e8f.hot-update.js": "/chunks/settings-subscription.09128a06dc6b8f953e8f.hot-update.js",
+    "/chunks/settings-subscription.2d2377ef6c3afe3b2372.hot-update.js": "/chunks/settings-subscription.2d2377ef6c3afe3b2372.hot-update.js",
+    "/chunks/settings-subscription.fbdb601f69743346e1ac.hot-update.js": "/chunks/settings-subscription.fbdb601f69743346e1ac.hot-update.js",
+    "/chunks/settings-subscription.1b49f84be4621400e601.hot-update.js": "/chunks/settings-subscription.1b49f84be4621400e601.hot-update.js",
+    "/chunks/settings-subscription.b1058a810eac3ba8b2ff.hot-update.js": "/chunks/settings-subscription.b1058a810eac3ba8b2ff.hot-update.js"
 }
diff --git a/resources/js/views/Admin/Users/User.vue b/resources/js/views/Admin/Users/User.vue
index ea1bfce6..fbf8491c 100644
--- a/resources/js/views/Admin/Users/User.vue
+++ b/resources/js/views/Admin/Users/User.vue
@@ -59,7 +59,9 @@
             Spinner,
         },
         computed: {
-            ...mapGetters(['config']),
+            ...mapGetters([
+				'config'
+			]),
             admin() {
                 return this.$store.getters.user ? this.$store.getters.user : undefined
             },
@@ -74,7 +76,7 @@
 						route: 'UserDetail',
 					},
 					{
-						title: this.$t('admin_page_user.tabs.storage'),
+						title: this.$t('Storage'),
 						route: 'UserStorage',
 					},
 					{
diff --git a/resources/js/views/Profile.vue b/resources/js/views/Profile.vue
index edfcc98d..65eee958 100644
--- a/resources/js/views/Profile.vue
+++ b/resources/js/views/Profile.vue
@@ -4,6 +4,8 @@
         <FilePreview />
 		<Spotlight />
 
+		<ConfirmPopup />
+
 		<!--2FA popups-->
 		<TwoFactorRecoveryCodesPopup />
 		<TwoFactorSetupPopup />
@@ -70,6 +72,7 @@
 </template>
 
 <script>
+	import ConfirmPopup from "../components/Others/Popup/ConfirmPopup";
     import FilePreview from '/resources/js/components/FilePreview/FilePreview'
 	import Spotlight from '/resources/js/components/Spotlight/Spotlight'
 	import TwoFactorRecoveryCodesPopup from '/resources/js/components/Others/TwoFactorRecoveryCodesPopup'
@@ -85,6 +88,7 @@
 	export default {
         name: 'Settings',
         components: {
+			ConfirmPopup,
 			CardNavigation,
 			FilePreview,
 			Spotlight,
diff --git a/resources/js/views/User/Subscription.vue b/resources/js/views/User/Subscription.vue
index 59092d59..93bef770 100644
--- a/resources/js/views/User/Subscription.vue
+++ b/resources/js/views/User/Subscription.vue
@@ -28,7 +28,7 @@
 			</div>
 
 			<div class="flex space-x-4 mt-8">
-				<ButtonBase class="popup-button" button-style="secondary">
+				<ButtonBase @click.native="cancelSubscriptionConfirmation" :loading="isCancelling" class="popup-button" button-style="secondary">
 					{{ $t('Cancel Subscription') }}
 				</ButtonBase>
 				<ButtonBase @click.native="$openUpgradeOptions" class="popup-button" button-style="theme">
@@ -83,29 +83,28 @@
 			return {
 				subscription: undefined,
 				limitations: [],
-				isConfirmedCancel: false,
-				isConfirmedResume: false,
-				isDeleting: false,
-				isResuming: false,
 				isLoading: true,
+				isCancelling: false,
 			}
 		},
 		methods: {
+			cancelSubscriptionConfirmation() {
+				events.$emit('confirm:open', {
+					title: this.$t('Are you sure you want to cancel subscription?'),
+					message: this.$t("You'll continue to have access to the features you've paid for until the end of your billing cycle."),
+					action: {
+						operation: 'cancel-subscription',
+					}
+				})
+			},
 			cancelSubscription() {
 
-				// Set confirm button
-				if (!this.isConfirmedCancel) {
-					this.isConfirmedCancel = true
-					return
-				}
-
 				// Start deleting spinner button
-				this.isDeleting = true
-				this.isLoading = true
+				this.isCancelling = true
 
-				// Send delete request
+				// Send post request
 				axios
-					.post('/api/user/subscription/cancel')
+					.post('/api/subscription/cancel')
 					.then(() => {
 
 						// Update user data
@@ -113,70 +112,19 @@
 							this.fetchSubscriptionDetail()
 						})
 
-						events.$emit('alert:open', {
-							emoji: '👍',
-							title: this.$t('popup_subscription_cancel.title'),
-							message: this.$t('popup_subscription_cancel.message'),
-							buttonStyle: 'theme',
-							button: this.$t('popup_subscription_cancel.button')
+						events.$emit('toaster', {
+							type: 'success',
+							message: this.$t('popup_subscription_cancel.title'),
 						})
 					})
 					.catch(() => {
-						events.$emit('alert:open', {
-							title: this.$t('popup_error.title'),
-							message: this.$t('popup_error.message'),
+						events.$emit('toaster', {
+							type: 'danger',
+							message: this.$t('popup_error.title'),
 						})
 					})
 					.finally(() => {
-
-						// End deleting spinner button
-						this.isDeleting = false
-						this.isLoading = false
-						this.isConfirmedCancel = false
-					})
-			},
-			resumeSubscription() {
-
-				// Set confirm button
-				if (!this.isConfirmedResume) {
-					this.isConfirmedResume = true
-					return
-				}
-
-				// Start deleting spinner button
-				this.isResuming = true
-				this.isLoading = true
-
-				// Send delete request
-				axios
-					.post('/api/user/subscription/resume')
-					.then(() => {
-
-						// Update user data
-						this.$store.dispatch('getAppData').then(() => {
-							this.fetchSubscriptionDetail()
-						})
-
-						events.$emit('alert:open', {
-							emoji: '👍',
-							title: this.$t('popup_subscription_resumed.title'),
-							message: this.$t('popup_subscription_resumed.message'),
-							buttonStyle: 'theme',
-							button: this.$t('popup_subscription_resumed.button')
-						})
-					})
-					.catch(() => {
-						events.$emit('alert:open', {
-							title: this.$t('popup_error.title'),
-							message: this.$t('popup_error.message'),
-						})
-					})
-					.finally(() => {
-
-						// End deleting spinner button
-						this.isResuming = false
-						this.isLoading = false
-						this.isConfirmedResume = false
+						this.isCancelling = false
 					})
 			},
 			fetchSubscriptionDetail() {
@@ -225,6 +173,11 @@
 		},
 		created() {
 			this.fetchSubscriptionDetail()
+
+			events.$on('action:confirmed', data => {
+				if (data.operation === 'cancel-subscription')
+					this.cancelSubscription()
+			})
 		}
 	}
 </script>