diff --git a/src/Server.UI/Pages/Contacts/Contacts.razor b/src/Server.UI/Pages/Contacts/Contacts.razor
index eade205be..fe8186d03 100644
--- a/src/Server.UI/Pages/Contacts/Contacts.razor
+++ b/src/Server.UI/Pages/Contacts/Contacts.razor
@@ -15,11 +15,6 @@
 @inject IStringLocalizer<Contacts> L
 @attribute [Authorize(Policy = Permissions.Contacts.View)]
 <PageTitle>@Title</PageTitle>
-<style>
-    .mud-table-toolbar {
-        height: 120px !important;
-    }
-</style>
 
 <MudDataGrid ServerData="@(ServerReload)"
              FixedHeader="true"
diff --git a/src/Server.UI/Pages/Documents/Documents.razor b/src/Server.UI/Pages/Documents/Documents.razor
index 1c151f8db..1fffe944e 100644
--- a/src/Server.UI/Pages/Documents/Documents.razor
+++ b/src/Server.UI/Pages/Documents/Documents.razor
@@ -189,11 +189,6 @@
     </PagerContent>
 </MudDataGrid>
 
-<style>
-    .mud-table-toolbar {
-        height: 120px !important;
-    }
-</style>
 
 @code {
     [CascadingParameter] protected Task<AuthenticationState> AuthState { get; set; } = default!;
diff --git a/src/Server.UI/Pages/Identity/Roles/Roles.razor b/src/Server.UI/Pages/Identity/Roles/Roles.razor
index 94a1dd6ad..42a343983 100644
--- a/src/Server.UI/Pages/Identity/Roles/Roles.razor
+++ b/src/Server.UI/Pages/Identity/Roles/Roles.razor
@@ -159,12 +159,6 @@
 
 <PermissionsDrawer OnAssignAllChanged="OnAssignAllChangedHandler" Waiting="@_processing" OnOpenChanged="OnOpenChangedHandler" Open="_showPermissionsDrawer" Permissions="_permissions" OnAssignChanged="OnAssignChangedHandler"></PermissionsDrawer>
 
-<style>
-    .mud-table-toolbar {
-        height: 120px !important;
-    }
-</style>
-
 @code {
     [CascadingParameter] private Task<AuthenticationState> AuthState { get; set; } = default!;
     private RoleManager<ApplicationRole> RoleManager = null!;
diff --git a/src/Server.UI/Pages/Identity/Users/Users.razor b/src/Server.UI/Pages/Identity/Users/Users.razor
index fbc3f96cd..796efa15a 100644
--- a/src/Server.UI/Pages/Identity/Users/Users.razor
+++ b/src/Server.UI/Pages/Identity/Users/Users.razor
@@ -243,15 +243,8 @@
     </PagerContent>
 </MudDataGrid>
 
-
-
 <PermissionsDrawer OnAssignAllChanged="OnAssignAllChangedHandler" Waiting="@_processing" OnOpenChanged="OnOpenChangedHandler" Open="_showPermissionsDrawer" Permissions="_permissions" OnAssignChanged="OnAssignChangedHandler"></PermissionsDrawer>
 
-<style>
-    .mud-table-toolbar {
-        height: 120px !important;
-    }
-</style>
 
 @code {
     [CascadingParameter] private Task<AuthenticationState> AuthState { get; set; } = default!;
diff --git a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
index a5fd94303..c8710d5e1 100644
--- a/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
+++ b/src/Server.UI/Pages/PicklistSets/PicklistSets.razor
@@ -123,11 +123,6 @@
     </PagerContent>
 </MudDataGrid>
 
-<style>
-    .mud-table-toolbar {
-    height: 120px !important;
-    }
-</style>
 
 @code {
     [CascadingParameter] private Task<AuthenticationState> AuthState { get; set; } = default!;
diff --git a/src/Server.UI/Pages/Products/Products.razor b/src/Server.UI/Pages/Products/Products.razor
index b8f712c7f..bc1847737 100644
--- a/src/Server.UI/Pages/Products/Products.razor
+++ b/src/Server.UI/Pages/Products/Products.razor
@@ -176,10 +176,6 @@
         --fancybox-bg: rgba(24, 24, 27, 0.85);
         z-index: 9999;
     }
-
-    .mud-table-toolbar {
-        height: 120px !important;
-    }
 </style>
 
 @code {
diff --git a/src/Server.UI/Pages/SystemManagement/AuditTrails.razor b/src/Server.UI/Pages/SystemManagement/AuditTrails.razor
index 40cda5a88..2d075d069 100644
--- a/src/Server.UI/Pages/SystemManagement/AuditTrails.razor
+++ b/src/Server.UI/Pages/SystemManagement/AuditTrails.razor
@@ -139,12 +139,6 @@
     </PagerContent>
 </MudDataGrid>
 
-<style>
-    .mud-table-toolbar {
-        height: 120px !important;
-    }
-</style>
-
 @code
 {
     public string Title { get; private set; } = "Audit Trails";
diff --git a/src/Server.UI/Pages/SystemManagement/Logs.razor b/src/Server.UI/Pages/SystemManagement/Logs.razor
index 32e111690..dc5c8c7c8 100644
--- a/src/Server.UI/Pages/SystemManagement/Logs.razor
+++ b/src/Server.UI/Pages/SystemManagement/Logs.razor
@@ -128,11 +128,6 @@
     </PagerContent>
 </MudDataGrid>
 
-<style>
-    .mud-table-toolbar {
-    height: 120px !important;
-    }
-</style>
 
 @code
 {
diff --git a/src/Server.UI/Pages/Tenants/Tenants.razor b/src/Server.UI/Pages/Tenants/Tenants.razor
index ead3cb458..db889cb2c 100644
--- a/src/Server.UI/Pages/Tenants/Tenants.razor
+++ b/src/Server.UI/Pages/Tenants/Tenants.razor
@@ -116,12 +116,6 @@
     </PagerContent>
 </MudDataGrid>
 
-<style>
-    .mud-table-toolbar {
-        height: 120px !important;
-    }
-</style>
-
 @code
 {
     [CascadingParameter] private Task<AuthenticationState> AuthState { get; set; } = default!;
diff --git a/src/Server.UI/wwwroot/css/app.css b/src/Server.UI/wwwroot/css/app.css
index 6b9df9791..acf326369 100644
--- a/src/Server.UI/wwwroot/css/app.css
+++ b/src/Server.UI/wwwroot/css/app.css
@@ -78,7 +78,26 @@
     height: 1.125rem;
 }
 
+.mud-table.mud-data-grid .mud-toolbar {
+    height: auto !important;
+    padding: 1rem
+}
+
+
+.mud-table.mud-data-grid .mud-toolbar-gutters {
+    height: auto !important;
+    padding: 1rem
+}
 
+.mud-table.mud-data-grid .mud-table-toolbar {
+    height: auto !important;
+    padding: 1rem
+}
+
+.mud-table.mud-data-grid .mud-table-pagination-toolbar {
+    height: auto !important;
+    padding: 0rem !important;
+}
 .blazor-error-boundary {
     background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
     padding: 1rem 1rem 1rem 3.7rem;