diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.html b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
index 547e3cc5bf..5dd9545714 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.html
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.html
@@ -71,6 +71,7 @@
                                 "
                                 [attr.aria-sort]="col.sortable ? (getAriaSort(col) | translate) : null"
                                 cdkDrag
+                                cdkDragPreviewClass="adf-datatable-drag-preview"
                                 cdkDragLockAxis="x"
                                 (cdkDragStarted)="isDraggingHeaderColumn = true"
                                 (cdkDragDropped)="onDropHeaderColumn($event)"
@@ -246,6 +247,7 @@
                     <adf-datatable-row
                         *ngFor="let row of data.getRows(); let idx = index"
                         cdkDrag
+                        cdkDragPreviewClass="adf-datatable-drag-preview"
                         [cdkDragDisabled]="!enableDragRows"
                         (cdkDragDropped)="onDragDrop($event)"
                         (cdkDragStarted)="onDragStart()"
diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
index f684b0062e..1d7935ee0c 100644
--- a/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/src/lib/datatable/components/datatable/datatable.component.scss
@@ -69,7 +69,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
 }
 
 .adf-datatable-list,
-#{ms.$cdk-drag-preview} {
+.adf-datatable-drag-preview {
     display: flex;
     flex-direction: column;
     background-color: var(--mat-sys-surface);
@@ -139,6 +139,33 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
                 outline: 1px solid var(--mat-sys-primary);
             }
         }
+
+        &:focus-within,
+        &:hover {
+            .adf-datatable-actions-menu .adf-datatable-hide-actions-without-hover {
+                visibility: visible;
+            }
+        }
+
+        .adf-datatable-actions-menu {
+            margin-left: auto;
+            justify-content: end;
+            padding-right: 15px;
+
+            &:focus-visible,
+            &:focus-within {
+                .adf-datatable-hide-actions-without-hover {
+                    visibility: visible;
+                }
+            }
+
+            &-provided {
+                /* stylelint-disable declaration-no-important */
+                max-width: 100px !important;
+                justify-content: center;
+                padding-right: 0;
+            }
+        }
     }
 
     .adf-blur-datatable-body {
@@ -338,35 +365,6 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
         }
     }
 
-    .adf-datatable-row {
-        &:focus-within,
-        &:hover {
-            .adf-datatable-actions-menu .adf-datatable-hide-actions-without-hover {
-                visibility: visible;
-            }
-        }
-
-        .adf-datatable-actions-menu {
-            margin-left: auto;
-            justify-content: end;
-            padding-right: 15px;
-
-            &:focus-visible,
-            &:focus-within {
-                .adf-datatable-hide-actions-without-hover {
-                    visibility: visible;
-                }
-            }
-
-            &-provided {
-                /* stylelint-disable declaration-no-important */
-                max-width: 100px !important;
-                justify-content: center;
-                padding-right: 0;
-            }
-        }
-    }
-
     .adf-datatable-checkbox {
         display: flex;
         justify-content: center;
@@ -655,7 +653,7 @@ $data-table-cell-min-width-file-size: $data-table-cell-min-width-1 !default;
     }
 }
 
-#{ms.$cdk-drag-preview} {
+.adf-datatable-drag-preview {
     min-height: $data-table-row-height;
     display: flex;
     flex-direction: row;
diff --git a/lib/core/src/lib/notifications/components/notification-history.component.scss b/lib/core/src/lib/notifications/components/notification-history.component.scss
index 3e469da7ba..2170cd6636 100644
--- a/lib/core/src/lib/notifications/components/notification-history.component.scss
+++ b/lib/core/src/lib/notifications/components/notification-history.component.scss
@@ -140,10 +140,12 @@ $notification-item-height: 72px;
     }
 }
 
-#{ms.$mat-menu-panel}.adf-notification-history-menu.adf-notification-history-menu-panel {
+.adf-notification-history-menu.adf-notification-history-menu-panel {
     min-width: 320px;
     max-height: 500px;
 
+    // .mat-mdc-menu-content is a Material-generated child of the panel;
+    // there is no ADF-owned element/token to target it, so it stays.
     #{ms.$mat-menu-content} {
         padding: 0;
     }
diff --git a/lib/core/src/lib/styles/_mat-selectors.scss b/lib/core/src/lib/styles/_mat-selectors.scss
index 131a1cd724..297b00488d 100644
--- a/lib/core/src/lib/styles/_mat-selectors.scss
+++ b/lib/core/src/lib/styles/_mat-selectors.scss
@@ -59,7 +59,6 @@ $mat-evolution-chip-text-label: '.mdc-evolution-chip__text-label';
 $mat-evolution-chip-graphic: '.mdc-evolution-chip__graphic';
 $mat-select-trigger: '.mat-mdc-select-trigger';
 $mat-button-base: '.mat-mdc-button-base';
-$cdk-drag-preview: '.cdk-drag-preview';
 $mat-snackbar: '.mdc-snackbar';
 $mat-snack-bar-container: '.mat-mdc-snack-bar-container';
 $mat-snackbar-label: '.mdc-snackbar__label';
diff --git a/lib/process-services/src/lib/app-list/apps-list.component.html b/lib/process-services/src/lib/app-list/apps-list.component.html
index bb072c588c..760c2b69ef 100644
--- a/lib/process-services/src/lib/app-list/apps-list.component.html
+++ b/lib/process-services/src/lib/app-list/apps-list.component.html
@@ -35,7 +35,7 @@
 
 <ng-container *ngIf="isLoading(); else empty">
     <div class="adf-app-list-spinner">
-        <mat-progress-spinner mode="indeterminate" />
+        <mat-progress-spinner class="adf-app-list-spinner-progress" mode="indeterminate" />
     </div>
 </ng-container>
 
diff --git a/lib/process-services/src/lib/app-list/apps-list.component.scss b/lib/process-services/src/lib/app-list/apps-list.component.scss
index b843651b18..d8aaa1f8a6 100644
--- a/lib/process-services/src/lib/app-list/apps-list.component.scss
+++ b/lib/process-services/src/lib/app-list/apps-list.component.scss
@@ -1,5 +1,4 @@
 @use 'sass:map';
-@use '../styles/mat-selectors' as ms;
 @use '../styles/flex' as flex;
 
 .adf-app-list-item {
@@ -57,7 +56,7 @@ $tile-themes: (
     flex-direction: column;
     height: 85vh;
 
-    #{ms.$mat-progress-spinner} {
+    .adf-app-list-spinner-progress {
         margin: 0 auto;
     }
 }
diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.scss b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.scss
index ea238539b8..58abc8bcff 100644
--- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.scss
+++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.scss
@@ -1,20 +1,18 @@
 @use '../../../styles/mat-selectors' as ms;
 
 .adf-attach-file-widget-dialog {
-    #{ms.$mat-dialog-actions} {
+    // Targets the <mat-dialog-actions class="adf-login-dialog-actions"> element directly.
+    .adf-login-dialog-actions {
         display: flex;
         justify-content: flex-end;
+        margin-left: -25px;
+        margin-right: -25px;
+        padding-right: 25px;
 
         button {
             text-transform: uppercase;
         }
     }
-
-    .adf-login-dialog-actions {
-        margin-left: -25px;
-        margin-right: -25px;
-        padding-right: 25px;
-    }
 }
 
 #{ms.$mat-dialog-surface} {
diff --git a/lib/process-services/src/lib/styles/mat-selectors.scss b/lib/process-services/src/lib/styles/mat-selectors.scss
index 614dcca018..e7badc9eff 100644
--- a/lib/process-services/src/lib/styles/mat-selectors.scss
+++ b/lib/process-services/src/lib/styles/mat-selectors.scss
@@ -1,6 +1,5 @@
 /* Variables in this file are used in the Angular Material library. Do not modify them unless you know what you are doing. */
 
-$mat-progress-spinner: '.mat-mdc-progress-spinner';
 $mat-card: '.mat-mdc-card';
 $mat-card-header-text: '.mat-mdc-card-header-text';
 $mat-card-content: '.mat-mdc-card-content';
@@ -13,7 +12,6 @@ $mat-form-field-wrapper: '.mat-mdc-text-field-wrapper';
 $mat-button: '.mat-mdc-button';
 $mat-button-label: '.mdc-button__label';
 $mat-input-element: '.mat-mdc-input-element';
-$mat-dialog-actions: '.mat-mdc-dialog-actions';
 $mat-line: '.mat-line';
 $mat-select-value-text: '.mat-mdc-select-value-text';
 $mat-form-field-label: '.mat-mdc-floating-label';