diff --git a/lib/content-services/src/lib/mat-selectors.scss b/lib/content-services/src/lib/mat-selectors.scss
index ea3e440664..20ce3791fb 100644
--- a/lib/content-services/src/lib/mat-selectors.scss
+++ b/lib/content-services/src/lib/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-icon: '.mat-icon';
 $mat-focused: '.mat-focused';
 $mat-line: '.mat-line';
 $mat-tab-label: '.mat-mdc-tab';
diff --git a/lib/core/src/lib/form/components/form-renderer.component.html b/lib/core/src/lib/form/components/form-renderer.component.html
index 337ad73c58..716e4a5c51 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.html
+++ b/lib/core/src/lib/form/components/form-renderer.component.html
@@ -120,7 +120,7 @@
                                         [matTooltip]="'FORM.FORM_RENDERER.DELETE_ROW' | translate"
                                         (click)="displayDialogToRemoveRow(currentRootElement.field, rowIndex)"
                                     >
-                                        <mat-icon adf-icon="close" />
+                                        <mat-icon class="adf-grid-list-row-remove-button-icon" adf-icon="close" />
                                     </button>
                                 }
                             </div>
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 1760aa55b0..aa80c5be44 100644
--- a/lib/core/src/lib/form/components/form-renderer.component.scss
+++ b/lib/core/src/lib/form/components/form-renderer.component.scss
@@ -93,7 +93,7 @@
                 align-items: center;
                 justify-content: center;
 
-                #{ms.$mat-icon} {
+                .adf-grid-list-row-remove-button-icon {
                     display: flex;
                     justify-content: center;
                     align-items: center;
diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.html b/lib/core/src/lib/info-drawer/info-drawer.component.html
index bd8bfad276..12f046837d 100644
--- a/lib/core/src/lib/info-drawer/info-drawer.component.html
+++ b/lib/core/src/lib/info-drawer/info-drawer.component.html
@@ -18,7 +18,7 @@
                 class="adf-info-drawer-tab">
 
                 <ng-template mat-tab-label>
-                    <mat-icon *ngIf="contentBlock.icon" [adf-icon]="contentBlock.icon" />
+                    <mat-icon *ngIf="contentBlock.icon" class="adf-info-drawer-tab-icon" [adf-icon]="contentBlock.icon" />
                     <span *ngIf="contentBlock.label">{{ contentBlock.label | translate }}</span>
                 </ng-template>
 
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 d3b05aea8c..46165d6ee7 100644
--- a/lib/core/src/lib/info-drawer/info-drawer.component.scss
+++ b/lib/core/src/lib/info-drawer/info-drawer.component.scss
@@ -43,7 +43,7 @@
                     #{ms.$mat-tab-label-text} {
                         flex-grow: 1;
 
-                        #{ms.$mat-icon} + span {
+                        .adf-info-drawer-tab-icon + span {
                             padding-left: 5px;
                         }
                     }
diff --git a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.scss b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.scss
index b2a8f5d2fc..7081a5afcc 100644
--- a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.scss
+++ b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.scss
@@ -32,6 +32,8 @@
     }
 
     .adf-layout-container-sidenav {
+        // Icons here are projected by the consuming app via <ng-content>,
+        // so ADF cannot attach its own class to them.
         #{ms.$mat-icon} {
             vertical-align: sub;
         }
diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.html b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.html
index b247b0a31b..9e82d02a55 100644
--- a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.html
+++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.html
@@ -21,7 +21,7 @@
                 class="adf-attach-folder-menu-trigger"
             >
                 {{ 'FORM.FIELD.UPLOAD' | translate }}
-                <mat-icon>cloud_upload</mat-icon>
+                <mat-icon class="adf-attach-folder-menu-trigger-icon">cloud_upload</mat-icon>
             </button>
         </div>
     </div>
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 0e49abcf9a..b9ff10585f 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
@@ -42,7 +42,7 @@
         display: flex;
         flex-direction: row-reverse;
 
-        #{ms.$mat-icon} {
+        .adf-attach-folder-menu-trigger-icon {
             margin-left: 4px;
             margin-right: 0;
         }
diff --git a/lib/process-services/src/lib/styles/mat-selectors.scss b/lib/process-services/src/lib/styles/mat-selectors.scss
index d4c5d1dcbe..614dcca018 100644
--- a/lib/process-services/src/lib/styles/mat-selectors.scss
+++ b/lib/process-services/src/lib/styles/mat-selectors.scss
@@ -15,7 +15,6 @@ $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-icon: '.mat-icon';
 $mat-select-value-text: '.mat-mdc-select-value-text';
 $mat-form-field-label: '.mat-mdc-floating-label';
 $mat-form-field: '.mat-mdc-form-field';