diff --git a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss
index 0bde6fb206..9b03c2306e 100644
--- a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss
+++ b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss
@@ -1,10 +1,4 @@
-@use '../../../mat-selectors.scss' as ms;
-
 adf-search-filter-tabbed {
-    #{ms.$mat-tab-header} {
-        margin-top: 0;
-    }
-
     .adf-search-tab-label-active {
         border-bottom: 1px solid var(--mat-sys-primary);
     }
diff --git a/lib/content-services/src/lib/version-manager/version-upload.component.scss b/lib/content-services/src/lib/version-manager/version-upload.component.scss
index e4b2737893..2b66dd99df 100644
--- a/lib/content-services/src/lib/version-manager/version-upload.component.scss
+++ b/lib/content-services/src/lib/version-manager/version-upload.component.scss
@@ -1,3 +1,4 @@
+@use '@angular/material' as mat;
 @use '../mat-selectors.scss' as ms;
 
 .adf-version-upload {
@@ -6,15 +7,18 @@
         width: 100%;
         float: right;
 
+        // Infix padding via the public token API (was overriding .mat-mdc-form-field-infix).
+        @include mat.form-field-overrides(
+            (
+                filled-with-label-container-padding-top: 12px,
+                filled-with-label-container-padding-bottom: 0
+            )
+        );
+
         #{ms.$mat-floating-label} {
             padding-bottom: 10px;
         }
 
-        #{ms.$mat-form-field-infix} {
-            padding-top: 12px;
-            padding-bottom: 0;
-        }
-
         .adf-new-version-text-area {
             resize: none;
         }
diff --git a/lib/core/src/lib/form/components/form-renderer.component.scss b/lib/core/src/lib/form/components/form-renderer.component.scss
index 3745898c3e..528b9a87d4 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.scss
+++ b/lib/core/src/lib/form/components/form-renderer.component.scss
@@ -144,11 +144,6 @@
         }
     }
 
-    #{ms.$mat-grid-tile} {
-        overflow: visible;
-        width: 80%;
-    }
-
     adf-form-field,
     mat-form-field {
         width: 100%;
@@ -165,13 +160,8 @@
             overflow: hidden;
         }
 
-        & #{ms.$mat-card-header-text} {
-            margin: 0;
-        }
-
         & #{ms.$mat-tab-body-content} {
             overflow: hidden;
-            padding-top: 0;
         }
 
         // Tab active-indicator thickness via the public token API.
diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.scss b/lib/core/src/lib/info-drawer/info-drawer.component.scss
index 46165d6ee7..0eb31091d5 100644
--- a/lib/core/src/lib/info-drawer/info-drawer.component.scss
+++ b/lib/core/src/lib/info-drawer/info-drawer.component.scss
@@ -48,10 +48,6 @@
                         }
                     }
 
-                    #{ms.$mat-tab-body} {
-                        overflow-y: hidden;
-                    }
-
                     #{ms.$mat-tab-body-content} {
                         /* stylelint-disable */
                         overflow: auto;
diff --git a/lib/process-services/src/lib/form/start-form/start-form.component.scss b/lib/process-services/src/lib/form/start-form/start-form.component.scss
index dd0da5648d..783090eb80 100644
--- a/lib/process-services/src/lib/form/start-form/start-form.component.scss
+++ b/lib/process-services/src/lib/form/start-form/start-form.component.scss
@@ -10,10 +10,6 @@
         overflow: hidden;
     }
 
-    & #{ms.$mat-card-header-text} {
-        margin: 0;
-    }
-
     & #{ms.$mat-tab-body-content} {
         overflow: hidden;
     }
diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.scss b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.scss
index b9ff10585f..2afd882101 100644
--- a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.scss
+++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.scss
@@ -1,5 +1,3 @@
-@use '../../../styles/mat-selectors' as ms;
-
 .adf {
     &-attach-folder-widget-container {
         margin-bottom: 15px;
@@ -27,10 +25,6 @@
 
     &-attach-folder-files-row {
         padding-left: 8px;
-
-        #{ms.$mat-line} {
-            margin-bottom: 0;
-        }
     }
 
     &-attach-folder-result {