diff --git a/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss b/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss
index 6d5505627..8b3bb0294 100644
--- a/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss
+++ b/projects/aca-content/src/lib/ui/overrides/adf-about.theme.scss
@@ -1,3 +1,4 @@
+@use '@angular/material' as mat;
 @use '../mat-selectors' as ms;
 
 @mixin adf-about-theme() {
@@ -19,12 +20,17 @@
 
       &.adf-about-panel {
         #{ms.$mat-expansion-panel} {
-          box-shadow: none;
           border-radius: 12px;
           margin: 24px;
           width: 95%;
           border: 1px solid var(--theme-about-panel-border-color);
         }
+
+        @include mat.expansion-overrides(
+          (
+            container-elevation-shadow: none
+          )
+        );
       }
     }
 
diff --git a/projects/aca-content/src/lib/ui/overrides/adf-style-fixes.theme.scss b/projects/aca-content/src/lib/ui/overrides/adf-style-fixes.theme.scss
index 1b6138046..cc7b34213 100644
--- a/projects/aca-content/src/lib/ui/overrides/adf-style-fixes.theme.scss
+++ b/projects/aca-content/src/lib/ui/overrides/adf-style-fixes.theme.scss
@@ -77,34 +77,42 @@
       )
     );
 
-    mat-expansion-panel.adf-content-metadata-panel {
-      border: 1px solid var(--adf-theme-foreground-divider-color);
-      /* stylelint-disable-next-line declaration-no-important */
-      border-radius: 4px !important;
-      box-shadow: none;
+    .adf-content-metadata-panel {
+      &:is(#{ms.$mat-expansion-panel}) {
+        border: 1px solid var(--adf-theme-foreground-divider-color);
+        /* stylelint-disable-next-line declaration-no-important */
+        border-radius: 4px !important;
 
-      .adf-metadata-properties-header {
-        padding: 0 12px;
+        .adf-metadata-properties-header {
+          padding: 0 12px;
 
-        /* stylelint-disable selector-class-pattern */
-        &.mat-expanded {
-          border-bottom: 1px solid var(--adf-theme-foreground-divider-color);
+          /* stylelint-disable selector-class-pattern */
+          &.mat-expanded {
+            border-bottom: 1px solid var(--adf-theme-foreground-divider-color);
+          }
+
+          /* stylelint-enable selector-class-pattern */
+        }
+
+        .adf-metadata-no-item-added {
+          margin-top: 16px;
+          font-size: 15px;
+        }
+
+        .adf-edit-icon-buttons {
+          @include mat.icon-overrides(
+            (
+              color: var(--adf-theme-foreground-text-color-064)
+            )
+          );
         }
-        /* stylelint-enable selector-class-pattern */
       }
 
-      .adf-metadata-no-item-added {
-        margin-top: 16px;
-        font-size: 15px;
-      }
-
-      .adf-edit-icon-buttons {
-        @include mat.icon-overrides(
-          (
-            color: var(--adf-theme-foreground-text-color-064)
-          )
-        );
-      }
+      @include mat.expansion-overrides(
+        (
+          container-elevation-shadow: none
+        )
+      );
     }
   }
 
@@ -308,13 +316,13 @@
         container-shape: 0,
         header-text-tracking: normal,
         header-description-color: var(--adf-theme-foreground-icon-color),
-        header-indicator-color: var(--adf-theme-foreground-text-color-054)
+        header-indicator-color: var(--adf-theme-foreground-text-color-054),
+        container-elevation-shadow: none
       )
     );
 
-    mat-expansion-panel {
+    #{ms.$mat-expansion-panel} {
       background-color: transparent;
-      box-shadow: none;
 
       .adf-aspect-property-table {
         @include mat.table-overrides(