diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 441759a6..dcb66507 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -34,7 +34,7 @@
     "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=65ee559ca803555be568",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=55135fff8801bdf735c4",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=2cf7518289765027a590",
-    "/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=f2305bd9f2fbf4fd55e6",
+    "/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=b168c187bef89955172b",
     "/chunks/database.js": "/chunks/database.js?id=18549b910ac0b115d2f1",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6c86916c6c6f679fa86b",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=253ce639751cc8799458",
@@ -51,7 +51,7 @@
     "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=ea129760157c8e44f324",
     "/chunks/not-found.js": "/chunks/not-found.js?id=034287ee0ecb036320d3",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=b0235e76cbd41a62a331",
-    "/chunks/pages.js": "/chunks/pages.js?id=10510081613e26cb3d84",
+    "/chunks/pages.js": "/chunks/pages.js?id=dfcc3f3955d14f41860d",
     "/chunks/plan.js": "/chunks/plan.js?id=052940a7395f559b7c60",
     "/chunks/plan-create.js": "/chunks/plan-create.js?id=c1ad8299871917f21f8e",
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=a4db8cc9a98a81eed8d1",
@@ -100,7 +100,7 @@
     "/chunks/user-password.js": "/chunks/user-password.js?id=ce6c12a5b038f5481bd1",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=0e46d73f77f2778bb395",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=9af6308cdf06b91d0f9f",
-    "/chunks/users.js": "/chunks/users.js?id=90f7cc304d20dd44f0a2",
+    "/chunks/users.js": "/chunks/users.js?id=19fad0b439bc53b68d22",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js?id=ee89932f7ee76e74483e",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js?id=8163e0eab55c50f8afb8",
     "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js?id=37ce1e1ab9968c100712",
@@ -1437,5 +1437,77 @@
     "/chunks/user-storage.36cc97142e239b8568c8.hot-update.js": "/chunks/user-storage.36cc97142e239b8568c8.hot-update.js",
     "/chunks/user-storage.cbfa5d5fe70295f3d34b.hot-update.js": "/chunks/user-storage.cbfa5d5fe70295f3d34b.hot-update.js",
     "/chunks/user-storage.8a4b74d427eab10bf6bb.hot-update.js": "/chunks/user-storage.8a4b74d427eab10bf6bb.hot-update.js",
-    "/chunks/user-storage.b0b32719a5d0f3e6b6cf.hot-update.js": "/chunks/user-storage.b0b32719a5d0f3e6b6cf.hot-update.js"
+    "/chunks/user-storage.b0b32719a5d0f3e6b6cf.hot-update.js": "/chunks/user-storage.b0b32719a5d0f3e6b6cf.hot-update.js",
+    "/chunks/users.67901fd3b343a95c377d.hot-update.js": "/chunks/users.67901fd3b343a95c377d.hot-update.js",
+    "/chunks/users.1dcbd223342a07afafcd.hot-update.js": "/chunks/users.1dcbd223342a07afafcd.hot-update.js",
+    "/chunks/users.65b36f866f3e81678d40.hot-update.js": "/chunks/users.65b36f866f3e81678d40.hot-update.js",
+    "/chunks/users.9be2e80285b054489a06.hot-update.js": "/chunks/users.9be2e80285b054489a06.hot-update.js",
+    "/chunks/users.2c684476376633378c0e.hot-update.js": "/chunks/users.2c684476376633378c0e.hot-update.js",
+    "/chunks/users.d557ec614911d55931a3.hot-update.js": "/chunks/users.d557ec614911d55931a3.hot-update.js",
+    "/chunks/users.33ae95ececa83bcd7716.hot-update.js": "/chunks/users.33ae95ececa83bcd7716.hot-update.js",
+    "/chunks/users.e434710a25786d1b07cc.hot-update.js": "/chunks/users.e434710a25786d1b07cc.hot-update.js",
+    "/chunks/users.8c38dc65e67a02d2627b.hot-update.js": "/chunks/users.8c38dc65e67a02d2627b.hot-update.js",
+    "/chunks/users.678c04448e2ee9a8002a.hot-update.js": "/chunks/users.678c04448e2ee9a8002a.hot-update.js",
+    "/chunks/users.d3ac2b0cc4de4c68417f.hot-update.js": "/chunks/users.d3ac2b0cc4de4c68417f.hot-update.js",
+    "/chunks/users.2deb02950fec7cf136b7.hot-update.js": "/chunks/users.2deb02950fec7cf136b7.hot-update.js",
+    "/chunks/users.aa18442aaa9a9735d6fe.hot-update.js": "/chunks/users.aa18442aaa9a9735d6fe.hot-update.js",
+    "/chunks/users.8bb8d4bfc6555232a9f0.hot-update.js": "/chunks/users.8bb8d4bfc6555232a9f0.hot-update.js",
+    "/chunks/users.5701a962a4fbb4d6b5b6.hot-update.js": "/chunks/users.5701a962a4fbb4d6b5b6.hot-update.js",
+    "/chunks/users.ae5e6678362e6637c4ac.hot-update.js": "/chunks/users.ae5e6678362e6637c4ac.hot-update.js",
+    "/chunks/users.a919bf423f2cba1534d2.hot-update.js": "/chunks/users.a919bf423f2cba1534d2.hot-update.js",
+    "/chunks/users.41c80549e7385a545b77.hot-update.js": "/chunks/users.41c80549e7385a545b77.hot-update.js",
+    "/chunks/users.fa49cad28b0fb3c7fb5d.hot-update.js": "/chunks/users.fa49cad28b0fb3c7fb5d.hot-update.js",
+    "/chunks/users.9859a23d10c22ed05b3c.hot-update.js": "/chunks/users.9859a23d10c22ed05b3c.hot-update.js",
+    "/chunks/users.54b5bf68c1a500209a49.hot-update.js": "/chunks/users.54b5bf68c1a500209a49.hot-update.js",
+    "/chunks/users.577d169975900e965d05.hot-update.js": "/chunks/users.577d169975900e965d05.hot-update.js",
+    "/chunks/users.8f43bf3493079fe6d192.hot-update.js": "/chunks/users.8f43bf3493079fe6d192.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.205c12561f626b09a16b.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.205c12561f626b09a16b.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.9d3911171c6c8f73d52b.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.9d3911171c6c8f73d52b.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.f9080584895a011b4d45.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.f9080584895a011b4d45.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.c72867836eacbf07034b.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.c72867836eacbf07034b.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.b5438acd8c73498c1a27.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.b5438acd8c73498c1a27.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.e6b7c12c2ee98c5c434a.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.e6b7c12c2ee98c5c434a.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.68f999e1cc286f85f472.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.68f999e1cc286f85f472.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.9ff0095860ef4ebb1195.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.9ff0095860ef4ebb1195.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.252945d0e14eeede7508.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.252945d0e14eeede7508.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.ff091272ee634925cfa7.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.ff091272ee634925cfa7.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.60b770fbea477306d0b8.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.60b770fbea477306d0b8.hot-update.js",
+    "/chunks/users.47bf321ace1b69177748.hot-update.js": "/chunks/users.47bf321ace1b69177748.hot-update.js",
+    "/chunks/users.bd84789e93c678b69f01.hot-update.js": "/chunks/users.bd84789e93c678b69f01.hot-update.js",
+    "/chunks/users.4cb6beea736e82487c95.hot-update.js": "/chunks/users.4cb6beea736e82487c95.hot-update.js",
+    "/chunks/users.3f8d10a0c5c2031b01ef.hot-update.js": "/chunks/users.3f8d10a0c5c2031b01ef.hot-update.js",
+    "/chunks/users.57dc898f22dc5d9a32d1.hot-update.js": "/chunks/users.57dc898f22dc5d9a32d1.hot-update.js",
+    "/chunks/users.c846ad8432d76f6b1667.hot-update.js": "/chunks/users.c846ad8432d76f6b1667.hot-update.js",
+    "/chunks/pages.5e3aef430bb91dbb1f0e.hot-update.js": "/chunks/pages.5e3aef430bb91dbb1f0e.hot-update.js",
+    "/chunks/pages.6d0132689e6dedfc3721.hot-update.js": "/chunks/pages.6d0132689e6dedfc3721.hot-update.js",
+    "/chunks/users.b919b33363adc572aa4c.hot-update.js": "/chunks/users.b919b33363adc572aa4c.hot-update.js",
+    "/chunks/pages.cbed52ed07f33c6966c6.hot-update.js": "/chunks/pages.cbed52ed07f33c6966c6.hot-update.js",
+    "/chunks/users.363531f72eefaf2f0a5a.hot-update.js": "/chunks/users.363531f72eefaf2f0a5a.hot-update.js",
+    "/chunks/users.43c8efa855f3d235092b.hot-update.js": "/chunks/users.43c8efa855f3d235092b.hot-update.js",
+    "/chunks/users.963fb116cb69a212e151.hot-update.js": "/chunks/users.963fb116cb69a212e151.hot-update.js",
+    "/chunks/users.d62f01272e5c85d521dd.hot-update.js": "/chunks/users.d62f01272e5c85d521dd.hot-update.js",
+    "/chunks/users.363f119639e01cc0111c.hot-update.js": "/chunks/users.363f119639e01cc0111c.hot-update.js",
+    "/chunks/users.9003a908f30dc0996f03.hot-update.js": "/chunks/users.9003a908f30dc0996f03.hot-update.js",
+    "/chunks/users.68bd0d4816e031d83630.hot-update.js": "/chunks/users.68bd0d4816e031d83630.hot-update.js",
+    "/chunks/users.3fb4cffe7b128cdb34f4.hot-update.js": "/chunks/users.3fb4cffe7b128cdb34f4.hot-update.js",
+    "/chunks/users.7806ba6d36c5d4d742cf.hot-update.js": "/chunks/users.7806ba6d36c5d4d742cf.hot-update.js",
+    "/chunks/users.14c49f74de8cf6476181.hot-update.js": "/chunks/users.14c49f74de8cf6476181.hot-update.js",
+    "/chunks/users.35695924dd58acaa96f6.hot-update.js": "/chunks/users.35695924dd58acaa96f6.hot-update.js",
+    "/chunks/users.2e22d6a738267ca90fdf.hot-update.js": "/chunks/users.2e22d6a738267ca90fdf.hot-update.js",
+    "/chunks/pages.a0d665ade3039d460934.hot-update.js": "/chunks/pages.a0d665ade3039d460934.hot-update.js",
+    "/chunks/pages.cda0fa9bbfdc429a9914.hot-update.js": "/chunks/pages.cda0fa9bbfdc429a9914.hot-update.js",
+    "/chunks/users.5c023252c67d7114fabd.hot-update.js": "/chunks/users.5c023252c67d7114fabd.hot-update.js",
+    "/chunks/users.d54f1135f04ca2f1ab7d.hot-update.js": "/chunks/users.d54f1135f04ca2f1ab7d.hot-update.js",
+    "/chunks/users.b0e7f05bccec77c0330a.hot-update.js": "/chunks/users.b0e7f05bccec77c0330a.hot-update.js",
+    "/chunks/users.d855ed5851b345745a7d.hot-update.js": "/chunks/users.d855ed5851b345745a7d.hot-update.js",
+    "/chunks/users.a530105b245af9b3082d.hot-update.js": "/chunks/users.a530105b245af9b3082d.hot-update.js",
+    "/chunks/users.133b29a20b1c2ee433ed.hot-update.js": "/chunks/users.133b29a20b1c2ee433ed.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.7bf817a3071e0f11fb1a.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.7bf817a3071e0f11fb1a.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.9cc4230e552d34bc4ac7.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.9cc4230e552d34bc4ac7.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.bd480c788d29a7434e1c.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.bd480c788d29a7434e1c.hot-update.js",
+    "/chunks/pages.35021a2996346464162e.hot-update.js": "/chunks/pages.35021a2996346464162e.hot-update.js",
+    "/chunks/pages.ed3168fbc9fb29240c2a.hot-update.js": "/chunks/pages.ed3168fbc9fb29240c2a.hot-update.js",
+    "/chunks/pages.abae00f1c2a44698b730.hot-update.js": "/chunks/pages.abae00f1c2a44698b730.hot-update.js",
+    "/chunks/pages.c740ee4bcddc55967983.hot-update.js": "/chunks/pages.c740ee4bcddc55967983.hot-update.js",
+    "/chunks/users.65eb11620508e831009f.hot-update.js": "/chunks/users.65eb11620508e831009f.hot-update.js"
 }
diff --git a/resources/js/components/Others/Tables/DatatableWrapper.vue b/resources/js/components/Others/Tables/DatatableWrapper.vue
index 38f81e93..50f874f7 100644
--- a/resources/js/components/Others/Tables/DatatableWrapper.vue
+++ b/resources/js/components/Others/Tables/DatatableWrapper.vue
@@ -8,17 +8,17 @@
 						v-for="(column, index) in columns"
 						@click="sort(column.field, column.sortable)"
 						:key="index"
-						:class="{ 'sortable': column.sortable }"
+						:class="{ 'sortable': column.sortable, 'text-right': (Object.values(columns).length - 1) === index }"
 						v-if="! column.hidden"
 					>
-						<span class="text-theme dark-text-theme text-xs">
+						<span class="text-gray-400 dark-text-theme text-xs">
 							{{ column.label }}
 						</span>
 
 						<chevron-up-icon
 							v-if="column.sortable"
 							:class="{ 'arrow-down': filter.sort === 'ASC' }"
-							class="inline-block vue-feather text-gray-500"
+							class="inline-block vue-feather text-gray-300"
 							size="12"
 						/>
 					</th>
diff --git a/resources/js/views/Admin/Pages.vue b/resources/js/views/Admin/Pages.vue
index 93820074..12c472fc 100644
--- a/resources/js/views/Admin/Pages.vue
+++ b/resources/js/views/Admin/Pages.vue
@@ -6,24 +6,24 @@
 					<template slot-scope="{ row }">
 						<tr>
 							<td class="py-4">
-								<router-link :to="{name: 'PageEdit', params: {slug: row.data.attributes.slug}}" class="cell-item" tag="div">
-									<span>{{ row.data.attributes.title }}</span>
+								<router-link :to="{name: 'PageEdit', params: {slug: row.data.attributes.slug}}" class="text-sm font-bold cursor-pointer" tag="div">
+									{{ row.data.attributes.title }}
 								</router-link>
 							</td>
 							<td>
-								<span class="cell-item">
+								<span class="text-sm font-bold">
 									{{ row.data.attributes.slug }}
 								</span>
 							</td>
 							<td>
-								<span class="cell-item">
+								<span class="text-sm font-bold">
 									<SwitchInput @input="changeStatus($event, row.data.attributes.slug)" class="switch" :state="row.data.attributes.visibility"/>
 								</span>
 							</td>
 							<td>
-								<div class="action-icons">
-									<router-link :to="{name: 'PageEdit', params: {slug: row.data.attributes.slug}}">
-										<Edit2Icon size="15" class="icon icon-edit" />
+								<div class="flex space-x-2 w-full justify-end">
+									<router-link class="flex items-center justify-center w-8 h-8 rounded-md hover:bg-green-100 bg-light-background transition-colors" :to="{name: 'PageEdit', params: {slug: row.data.attributes.slug}}">
+										<Edit2Icon size="15" class="opacity-75" />
 									</router-link>
 								</div>
 							</td>
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index c7e5e5b9..8164a97f 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -1,76 +1,74 @@
 <template>
     <div>
-		<div class="card shadow-card">
-
-			<div class="mb-6">
-				<router-link :to="{name: 'UserCreate'}">
-					<MobileActionButton icon="user-plus">
-						{{ $t('admin_page_user.create_user.submit') }}
-					</MobileActionButton>
-				</router-link>
-			</div>
-
+        <div class="card shadow-card">
+            <div class="mb-6">
+                <router-link :to="{name: 'UserCreate'}">
+                    <MobileActionButton icon="user-plus">
+                        {{ $t('admin_page_user.create_user.submit') }}
+                    </MobileActionButton>
+                </router-link>
+            </div>
 			<!--Datatable-->
-			<DatatableWrapper @init="isLoading = false" api="/api/admin/users" :paginator="true" :columns="columns" class="table table-users">
-                    <template slot-scope="{ row }">
-                        <tr>
-                            <td class="py-3">
-                                <router-link :to="{name: 'UserDetail', params: {id: row.data.id}}">
-                                    <DatatableCellImage
-										:member="row"
-										:title="row.data.relationships.settings.data.attributes.name"
-										:description="row.data.attributes.email"
-									/>
+            <DatatableWrapper @init="isLoading = false" api="/api/admin/users" :paginator="true" :columns="columns" class="table table-users">
+                <template slot-scope="{ row }">
+                    <tr>
+                        <td class="py-3">
+                            <router-link :to="{name: 'UserDetail', params: {id: row.data.id}}">
+                                <DatatableCellImage
+									:member="row"
+									:title="row.data.relationships.settings.data.attributes.name"
+									:description="row.data.attributes.email"
+								/>
+                            </router-link>
+                        </td>
+                        <td>
+                            <ColorLabel :color="getRoleColor(row.data.attributes.role)">
+                                {{ row.data.attributes.role }}
+                            </ColorLabel>
+                        </td>
+                        <td v-if="config.isSaaS">
+                            <span class="text-sm font-bold" v-if="row.data.attributes.subscription">
+                            	{{ $t('global.premium') }}
+                            </span>
+                            <span class="text-sm font-bold" v-else>
+                            	{{ $t('global.free') }}
+                            </span>
+                        </td>
+                        <td>
+                            <span v-if="row.data.attributes.storage.capacity !== 0" class="text-sm font-bold">
+                            	{{ row.data.attributes.storage.used_formatted }}
+                            </span>
+                            <span v-if="row.data.attributes.storage.capacity == 0" class="text-sm font-bold">
+                            	-
+                            </span>
+                        </td>
+                        <td v-if="config.storageLimit">
+                            <span v-if="row.data.attributes.storage.capacity !== 0" class="text-sm font-bold">
+                            	{{ row.data.attributes.storage.capacity_formatted }}
+                            </span>
+                            <span v-if="row.data.attributes.storage.capacity == 0" class="text-sm font-bold">
+                            	-
+                            </span>
+                        </td>
+                        <td>
+                            <span class="text-sm font-bold">
+                            	{{ row.data.attributes.created_at }}
+                            </span>
+                        </td>
+                        <td>
+                            <div class="flex space-x-2 w-full justify-end">
+                                <router-link class="flex items-center justify-center w-8 h-8 rounded-md hover:bg-green-100 bg-light-background transition-colors" :to="{name: 'UserDetail', params: {id: row.data.id}}">
+                                    <Edit2Icon size="15" class="opacity-75" />
                                 </router-link>
-                            </td>
-                            <td>
-                                <ColorLabel :color="getRoleColor(row.data.attributes.role)">
-                                    {{ row.data.attributes.role }}
-                                </ColorLabel>
-                            </td>
-                            <td v-if="config.isSaaS">
-                                <span class="cell-item" v-if="row.data.attributes.subscription">
-                                    {{ $t('global.premium') }}
-                                </span>
-                                <span class="cell-item" v-else>
-                                    {{ $t('global.free') }}
-                                </span>
-                            </td>
-                            <td>
-                                <span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
-                                    {{ row.data.attributes.storage.used_formatted }}
-                                </span>
-                                <span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
-                                    -
-                                </span>
-                            </td>
-                            <td v-if="config.storageLimit">
-                                <span v-if="row.data.attributes.storage.capacity !== 0" class="cell-item">
-                                    {{ row.data.attributes.storage.capacity_formatted }}
-                                </span>
-                                <span v-if="row.data.attributes.storage.capacity == 0" class="cell-item">
-                                    -
-                                </span>
-                            </td>
-                            <td>
-                                <span class="cell-item">
-                                    {{ row.data.attributes.created_at }}
-                                </span>
-                            </td>
-                            <td>
-                                <div class="action-icons">
-                                    <router-link :to="{name: 'UserDetail', params: {id: row.data.id}}">
-                                        <Edit2Icon size="15" class="icon icon-edit" />
-                                    </router-link>
-                                    <router-link :to="{name: 'UserDelete', params: {id: row.data.id}}">
-                                        <Trash2Icon size="15" class="icon icon-trash" />
-                                    </router-link>
-                                </div>
-                            </td>
-                        </tr>
-                    </template>
-                </DatatableWrapper>
-		</div>
+                                <router-link class="flex items-center justify-center w-8 h-8 rounded-md hover:bg-red-100 bg-light-background transition-colors" :to="{name: 'UserDelete', params: {id: row.data.id}}">
+                                    <Trash2Icon size="15" class="opacity-75" />
+                                </router-link>
+                            </div>
+                        </td>
+                    </tr>
+                </template>
+            </DatatableWrapper>
+        </div>
         <div id="loader" v-if="isLoading">
             <Spinner></Spinner>
         </div>
diff --git a/src/App/Users/Resources/UserResource.php b/src/App/Users/Resources/UserResource.php
index 56761fcf..b0633b4e 100644
--- a/src/App/Users/Resources/UserResource.php
+++ b/src/App/Users/Resources/UserResource.php
@@ -27,7 +27,7 @@ class UserResource extends JsonResource
                     'two_factor_authentication' => $this->two_factor_secret ? true : false,
                     'folders'                   => $this->folder_tree,
                     'storage'                   => $this->storage,
-                    'created_at'                => format_date($this->created_at, '%d. %B. %Y'),
+                    'created_at'                => format_date($this->created_at, '%d. %b. %Y'),
                     'updated_at'                => format_date($this->updated_at, '%d. %B. %Y'),
                 ],
                 'relationships' => [