diff --git a/modules/ui/src/app/pages/certificates/certificates.component.scss b/modules/ui/src/app/pages/certificates/certificates.component.scss
index d22ae0b62..ee891a214 100644
--- a/modules/ui/src/app/pages/certificates/certificates.component.scss
+++ b/modules/ui/src/app/pages/certificates/certificates.component.scss
@@ -20,17 +20,12 @@
 :host {
   display: flex;
   flex-direction: column;
-  height: 100%;
   flex: 1 0 auto;
 }
 
 .content-certificates {
   margin: 2px 18px 0;
-  overflow-y: scroll;
   height: max-content;
-  max-height: calc(
-    100vh - #{variables.$settings-top} - #{variables.$certificate-button-height}
-  );
   padding: 0 6px 6px;
 }
 
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 8dfc82584..92dd71355 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
@@ -98,9 +98,7 @@
 }
 
 .certificates-content-empty {
-  height: calc(
-    100vh - #{variables.$settings-top} - #{variables.$certificate-button-height}
-  );
+  min-height: 500px;
 }
 
 .empty-data-cell {
diff --git a/modules/ui/src/app/pages/general-settings/general-settings.component.scss b/modules/ui/src/app/pages/general-settings/general-settings.component.scss
index 0619d2cc8..b1873d29b 100644
--- a/modules/ui/src/app/pages/general-settings/general-settings.component.scss
+++ b/modules/ui/src/app/pages/general-settings/general-settings.component.scss
@@ -20,7 +20,6 @@
 :host {
   display: flex;
   flex-direction: column;
-  height: 100%;
   flex: 1 0 auto;
   padding: 6px 22px;
 }
@@ -28,7 +27,6 @@
 .setting-drawer-content {
   overflow-y: scroll;
   height: max-content;
-  max-height: calc(100vh - #{variables.$settings-top});
   padding: 10px;
 
   .setting-drawer-content-form-empty {
diff --git a/modules/ui/src/app/pages/settings/settings.component.scss b/modules/ui/src/app/pages/settings/settings.component.scss
index 07154d04a..b5c1d7770 100644
--- a/modules/ui/src/app/pages/settings/settings.component.scss
+++ b/modules/ui/src/app/pages/settings/settings.component.scss
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+:host {
+  overflow: auto;
+}
+
 .toolbar {
   height: auto;
   padding: 22px 0px 18px 32px;
diff --git a/modules/ui/src/styles.scss b/modules/ui/src/styles.scss
index 6dccfb0c6..bb1ff7288 100644
--- a/modules/ui/src/styles.scss
+++ b/modules/ui/src/styles.scss
@@ -381,146 +381,6 @@ body #main {
       margin-bottom: 0;
     }
   }
-
-  &:has(.app-callout-container > app-callout) {
-    .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}
-      );
-    }
-  }
-}
-
-@media only screen and (min-width: 880px) and (max-width: 1100px) {
-  body #main {
-    &:has(.app-callout-container > app-callout#outdated_devices_callout) {
-      .setting-drawer-content {
-        max-height: calc(
-          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#outdated_devices_callout
-      ) {
-      .setting-drawer-content {
-        max-height: calc(
-          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
-        );
-      }
-    }
-  }
-}
-
-@media (max-width: 880px) {
-  body #main {
-    &:has(.app-callout-container > app-callout) {
-      .setting-drawer-content {
-        max-height: calc(
-          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) {
-      .setting-drawer-content {
-        max-height: calc(
-          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
-        );
-      }
-    }
-  }
 }
 
 .text-nowrap {
diff --git a/modules/ui/src/theming/variables.scss b/modules/ui/src/theming/variables.scss
index 2526a6ea8..a9415a167 100644
--- a/modules/ui/src/theming/variables.scss
+++ b/modules/ui/src/theming/variables.scss
@@ -21,10 +21,6 @@ $corner-large: 16px;
 $corner-extra-large: 28px;
 $corner-medium: 12px;
 $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;