diff --git a/src/components/config/channels/whatsapp/components/tabs/AccountTab.vue b/src/components/config/channels/whatsapp/components/tabs/AccountTab.vue
index 79f286bf..5d7d3442 100644
--- a/src/components/config/channels/whatsapp/components/tabs/AccountTab.vue
+++ b/src/components/config/channels/whatsapp/components/tabs/AccountTab.vue
@@ -11,7 +11,7 @@
             <unnnic-button
               class="account-tab__content__info__templates__buttons__button"
               @click="navigateToTemplates"
-              type="secondary"
+              type="alternative"
               size="small"
               scheme="feedback-green"
             >
diff --git a/src/components/whatsAppCatalogs/List.vue b/src/components/whatsAppCatalogs/List.vue
index 9b0c3ae7..3c61b0ab 100644
--- a/src/components/whatsAppCatalogs/List.vue
+++ b/src/components/whatsAppCatalogs/List.vue
@@ -297,7 +297,6 @@
     flex-direction: column;
     flex: 1;
     overflow: hidden;
-    margin-top: $unnnic-spacing-lg;
 
     &__header {
       display: flex;
@@ -333,6 +332,8 @@
       flex-direction: column;
       flex: 1;
       gap: $unnnic-spacing-md;
+      overflow: auto;
+      padding-right: $unnnic-spacing-xs;
     }
 
     &__pagination {
diff --git a/src/views/whatsAppCatalogs/Base.vue b/src/views/whatsAppCatalogs/Base.vue
index c7ffdeba..2ee1b719 100644
--- a/src/views/whatsAppCatalogs/Base.vue
+++ b/src/views/whatsAppCatalogs/Base.vue
@@ -53,6 +53,8 @@
   .whatsapp-catalogs-base {
     display: flex;
     flex-direction: column;
-    height: 100%;
+    gap: $unnnic-spacing-lg;
+    height: 100vh;
+    overflow: hidden;
   }
 </style>
diff --git a/src/views/whatsAppCatalogs/List.vue b/src/views/whatsAppCatalogs/List.vue
index 1bfb0929..cc790854 100644
--- a/src/views/whatsAppCatalogs/List.vue
+++ b/src/views/whatsAppCatalogs/List.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="whatsapp-catalogs">
-    <div v-if="$route.name === 'WhatsApp Catalogs List'">
-      <List />
-    </div>
+    <List v-if="$route.name === 'WhatsApp Catalogs List'" />
+
     <router-view v-else />
   </div>
 </template>
@@ -17,3 +16,11 @@
     },
   };
 </script>
+
+<styles scoped lang="scss">
+.whatsapp-catalogs {
+  display: flex;
+  overflow: hidden;
+  height: 100%;
+}
+</styles>
diff --git a/tests/unit/specs/components/config/channels/whatsapp/components/tabs/__snapshots__/AccountTab.spec.js.snap b/tests/unit/specs/components/config/channels/whatsapp/components/tabs/__snapshots__/AccountTab.spec.js.snap
index 102ac6c6..b1af6032 100644
--- a/tests/unit/specs/components/config/channels/whatsapp/components/tabs/__snapshots__/AccountTab.spec.js.snap
+++ b/tests/unit/specs/components/config/channels/whatsapp/components/tabs/__snapshots__/AccountTab.spec.js.snap
@@ -9,9 +9,9 @@ exports[`whatsapp/components/tabs/AccountTab.vue should be rendered properly 1`]
           <div class="account-tab__content__info__templates__buttons__title">
             Templates
           </div>
-          <unnnicbutton-stub type="secondary" size="small" scheme="feedback-green" class="account-tab__content__info__templates__buttons__button">
+          <unnnic-button-next type="secondary" size="small" scheme="feedback-green" class="account-tab__content__info__templates__buttons__button">
             See my templates
-          </unnnicbutton-stub>
+          </unnnic-button-next>
         </div>
         <div class="account-tab__content__info__templates__buttons">
           <div class="account-tab__content__info__templates__buttons__title">