diff --git a/client/web/admin/src/themes/corteza-base/custom.scss b/client/web/admin/src/themes/corteza-base/custom.scss
index fee90ccee..e9110150d 100644
--- a/client/web/admin/src/themes/corteza-base/custom.scss
+++ b/client/web/admin/src/themes/corteza-base/custom.scss
@@ -58,7 +58,7 @@ th {
 }
 
 // custom height for resource lists with buttons
-.custom-resource-height {
+.custom-resource-list-height {
   height: calc(100vh - 115px);
 }
 
diff --git a/client/web/admin/src/views/Automation/Session/List.vue b/client/web/admin/src/views/Automation/Session/List.vue
index 51ca4cea8..448276803 100644
--- a/client/web/admin/src/views/Automation/Session/List.vue
+++ b/client/web/admin/src/views/Automation/Session/List.vue
@@ -1,11 +1,9 @@
 <template>
   <b-container
     fluid="xl"
-    class="overflow-auto"
   >
     <c-content-header
       :title="$t('title')"
-      class="content-header"
     />
 
     <c-resource-list
@@ -26,8 +24,8 @@
         nextPagination: $t('admin:general.pagination.next'),
       }"
       sticky-header
-      class="h-100"
       hide-search
+      class="custom-resource-height"
     >
       <template #header>
         <c-resource-list-status-filter
diff --git a/client/web/admin/src/views/Automation/Workflow/List.vue b/client/web/admin/src/views/Automation/Workflow/List.vue
index d70046c9e..650a1c6fe 100644
--- a/client/web/admin/src/views/Automation/Workflow/List.vue
+++ b/client/web/admin/src/views/Automation/Workflow/List.vue
@@ -58,8 +58,8 @@
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
       }"
-      class="custom-resource-height"
       sticky-header
+      class="custom-resource-list-height"
       @search="filterList"
     >
       <template #header>
diff --git a/client/web/admin/src/views/Federation/Nodes/List.vue b/client/web/admin/src/views/Federation/Nodes/List.vue
index cf828976d..2ca698290 100644
--- a/client/web/admin/src/views/Federation/Nodes/List.vue
+++ b/client/web/admin/src/views/Federation/Nodes/List.vue
@@ -30,7 +30,6 @@
       :pagination="pagination"
       :sorting="sorting"
       :items="items"
-      class="custom-resource-height"
       :translations="{
         searchPlaceholder: $t('filterForm.query.placeholder'),
         notFound: $t('admin:general.notFound'),
@@ -43,6 +42,7 @@
       }"
       sticky-header
       hide-total
+      class="custom-resource-list-height"
       @search="filterList"
     >
       <template #actions="{ item }">
diff --git a/client/web/admin/src/views/System/Application/List.vue b/client/web/admin/src/views/System/Application/List.vue
index 7a178e628..092ceefbf 100644
--- a/client/web/admin/src/views/System/Application/List.vue
+++ b/client/web/admin/src/views/System/Application/List.vue
@@ -49,7 +49,6 @@
       :fields="fields"
       :items="items"
       :row-class="genericRowClass"
-      class="custom-resource-height"
       :translations="{
         searchPlaceholder: $t('filterForm.query.placeholder'),
         notFound: $t('admin:general.notFound'),
@@ -61,6 +60,7 @@
         nextPagination: $t('admin:general.pagination.next'),
       }"
       sticky-header
+      class="custom-resource-list-height"
       @search="filterList"
     >
       <template #header>
diff --git a/client/web/admin/src/views/System/AuthClient/List.vue b/client/web/admin/src/views/System/AuthClient/List.vue
index f42db4a1c..f37c3daf3 100644
--- a/client/web/admin/src/views/System/AuthClient/List.vue
+++ b/client/web/admin/src/views/System/AuthClient/List.vue
@@ -37,7 +37,6 @@
       :fields="fields"
       :items="items"
       :row-class="genericRowClass"
-      class="custom-resource-height"
       :translations="{
         searchPlaceholder: $t('filterForm.query.placeholder'),
         notFound: $t('admin:general.notFound'),
@@ -50,6 +49,7 @@
       }"
       sticky-header
       hide-search
+      class="custom-resource-list-height"
       @search="filterList"
     >
       <template #header>
diff --git a/client/web/admin/src/views/System/Queue/List.vue b/client/web/admin/src/views/System/Queue/List.vue
index 0dc0e9309..f18cac38b 100644
--- a/client/web/admin/src/views/System/Queue/List.vue
+++ b/client/web/admin/src/views/System/Queue/List.vue
@@ -40,7 +40,6 @@
       :fields="fields"
       :items="items"
       :row-class="genericRowClass"
-      class="custom-resource-height"
       :translations="{
         searchPlaceholder: $t('filterForm.handle.placeholder'),
         notFound: $t('admin:general.notFound'),
@@ -52,6 +51,7 @@
         nextPagination: $t('admin:general.pagination.next'),
       }"
       sticky-header
+      class="custom-resource-list-height"
       @search="filterList"
     >
       <template #header>
diff --git a/client/web/admin/src/views/System/Role/List.vue b/client/web/admin/src/views/System/Role/List.vue
index e0781476b..287f089a3 100644
--- a/client/web/admin/src/views/System/Role/List.vue
+++ b/client/web/admin/src/views/System/Role/List.vue
@@ -58,7 +58,6 @@
       :fields="fields"
       :items="items"
       :row-class="rowClass"
-      class="custom-resource-height"
       :translations="{
         searchPlaceholder: $t('filterForm.query.placeholder'),
         notFound: $t('admin:general.notFound'),
@@ -70,6 +69,7 @@
         nextPagination: $t('admin:general.pagination.next'),
       }"
       sticky-header
+      class="custom-resource-list-height"
       @search="filterList"
     >
       <template #header>
diff --git a/client/web/admin/src/views/System/SensitivityLevel/List.vue b/client/web/admin/src/views/System/SensitivityLevel/List.vue
index 61bebce1a..478564a93 100644
--- a/client/web/admin/src/views/System/SensitivityLevel/List.vue
+++ b/client/web/admin/src/views/System/SensitivityLevel/List.vue
@@ -27,7 +27,6 @@
       :fields="fields"
       :items="items"
       :row-class="genericRowClass"
-      class="custom-resource-height"
       :translations="{
         notFound: $t('admin:general.notFound'),
         noItems: $t('admin:general.resource-list.no-items'),
@@ -39,6 +38,7 @@
       }"
       sticky-header
       hide-search
+      class="custom-resource-list-height"
     >
       <template #header>
         <c-resource-list-status-filter
diff --git a/client/web/admin/src/views/System/Template/List.vue b/client/web/admin/src/views/System/Template/List.vue
index 8c44d2b0e..2f32b44de 100644
--- a/client/web/admin/src/views/System/Template/List.vue
+++ b/client/web/admin/src/views/System/Template/List.vue
@@ -69,7 +69,7 @@
         nextPagination: $t('admin:general.pagination.next'),
       }"
       sticky-header
-      class="custom-resource-height"
+      class="custom-resource-list-height"
       @search="filterList"
     >
       <template #header>
diff --git a/client/web/admin/src/views/System/User/List.vue b/client/web/admin/src/views/System/User/List.vue
index bb6d4f020..3a0f5080c 100644
--- a/client/web/admin/src/views/System/User/List.vue
+++ b/client/web/admin/src/views/System/User/List.vue
@@ -77,7 +77,7 @@
         nextPagination: $t('admin:general.pagination.next'),
       }"
       sticky-header
-      class="custom-resource-height"
+      class="custom-resource-list-height"
       @search="filterList"
     >
       <template #header>