diff --git a/modules/ui/src/app/pages/certificates/certificates.component.scss b/modules/ui/src/app/pages/certificates/certificates.component.scss
index da30d5440..d22ae0b62 100644
--- a/modules/ui/src/app/pages/certificates/certificates.component.scss
+++ b/modules/ui/src/app/pages/certificates/certificates.component.scss
@@ -25,11 +25,13 @@
 }
 
 .content-certificates {
-  margin: 8px 24px;
-  border-bottom: 1px solid colors.$outline-variant;
+  margin: 2px 18px 0;
   overflow-y: scroll;
   height: max-content;
-  max-height: calc(100vh - 344px);
+  max-height: calc(
+    100vh - #{variables.$settings-top} - #{variables.$certificate-button-height}
+  );
+  padding: 0 6px 6px;
 }
 
 .certificates-button-container {
diff --git a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
index 8572cb36f..8dfc82584 100644
--- a/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
+++ b/modules/ui/src/app/pages/certificates/components/certificates-table/certificates-table.component.scss
@@ -29,6 +29,10 @@
       row-item-outline-color: colors.$outline-variant,
     )
   );
+
+  ::ng-deep .mdc-data-table__row:last-child .mat-mdc-cell {
+    border-bottom: 1px solid colors.$outline-variant;
+  }
 }
 
 ::ng-deep .delete-certificate app-simple-dialog {
@@ -94,7 +98,9 @@
 }
 
 .certificates-content-empty {
-  height: calc(100vh - 344px);
+  height: calc(
+    100vh - #{variables.$settings-top} - #{variables.$certificate-button-height}
+  );
 }
 
 .empty-data-cell {
diff --git a/modules/ui/src/styles.scss b/modules/ui/src/styles.scss
index 8c0604ea0..6dccfb0c6 100644
--- a/modules/ui/src/styles.scss
+++ b/modules/ui/src/styles.scss
@@ -386,12 +386,40 @@ body #main {
     .setting-drawer-content {
       max-height: calc(100vh - #{variables.$settings-top-with-callout});
     }
+
+    .content-certificates {
+      max-height: calc(
+        100vh - #{variables.$settings-top-with-callout} -
+          #{variables.$certificate-button-height}
+      );
+    }
+
+    .certificates-content-empty {
+      height: calc(
+        100vh - #{variables.$settings-top-with-callout} -
+          #{variables.$certificate-button-height}
+      );
+    }
   }
 
   &:has(.app-callout-container > app-callout + app-callout) {
     .setting-drawer-content {
       max-height: calc(100vh - #{variables.$settings-top-with-two-callouts});
     }
+
+    .content-certificates {
+      max-height: calc(
+        100vh - #{variables.$settings-top-with-two-callouts} -
+          #{variables.$certificate-button-height}
+      );
+    }
+
+    .certificates-content-empty {
+      height: calc(
+        100vh - #{variables.$settings-top-with-two-callouts} -
+          #{variables.$certificate-button-height}
+      );
+    }
   }
 }
 
@@ -403,6 +431,20 @@ body #main {
           100vh - #{variables.$settings-top-with-callout} - 20px
         );
       }
+
+      .content-certificates {
+        max-height: calc(
+          100vh - #{variables.$settings-top-with-callout} -
+            #{variables.$certificate-button-height} - 20px
+        );
+      }
+
+      .certificates-content-empty {
+        height: calc(
+          100vh - #{variables.$settings-top-with-callout} -
+            #{variables.$certificate-button-height} - 20px
+        );
+      }
     }
 
     &:has(
@@ -415,6 +457,20 @@ body #main {
           100vh - #{variables.$settings-top-with-two-callouts} - 20px
         );
       }
+
+      .content-certificates {
+        max-height: calc(
+          100vh - #{variables.$settings-top-with-two-callouts} -
+            #{variables.$certificate-button-height} - 20px
+        );
+      }
+
+      .certificates-content-empty {
+        height: calc(
+          100vh - #{variables.$settings-top-with-two-callouts} -
+            #{variables.$certificate-button-height} - 20px
+        );
+      }
     }
   }
 }
@@ -427,6 +483,20 @@ body #main {
           100vh - #{variables.$settings-top-with-callout} - 20px
         );
       }
+
+      .content-certificates {
+        max-height: calc(
+          100vh - #{variables.$settings-top-with-callout} -
+            #{variables.$certificate-button-height} - 20px
+        );
+      }
+
+      .certificates-content-empty {
+        height: calc(
+          100vh - #{variables.$settings-top-with-callout} -
+            #{variables.$certificate-button-height} - 20px
+        );
+      }
     }
 
     &:has(.app-callout-container > app-callout + app-callout) {
@@ -435,6 +505,20 @@ body #main {
           100vh - #{variables.$settings-top-with-two-callouts} - 40px
         );
       }
+
+      .content-certificates {
+        max-height: calc(
+          100vh - #{variables.$settings-top-with-two-callouts} -
+            #{variables.$certificate-button-height} - 40px
+        );
+      }
+
+      .certificates-content-empty {
+        height: calc(
+          100vh - #{variables.$settings-top-with-two-callouts} -
+            #{variables.$certificate-button-height} - 40px
+        );
+      }
     }
   }
 }
diff --git a/modules/ui/src/theming/variables.scss b/modules/ui/src/theming/variables.scss
index b2a44b99c..2526a6ea8 100644
--- a/modules/ui/src/theming/variables.scss
+++ b/modules/ui/src/theming/variables.scss
@@ -24,6 +24,7 @@ $reports-table-header-size: 32px;
 $settings-top: 260px;
 $settings-top-with-callout: 340px;
 $settings-top-with-two-callouts: 410px;
+$certificate-button-height: 90px;
 
 // nav variables
 $nav-button-height: 32px;