From d93d963a8d3dbcff3db2d1439a406c172091cd1f Mon Sep 17 00:00:00 2001
From: Diogo Bastos <50139916+DiogoABastos@users.noreply.github.com>
Date: Mon, 5 Jan 2026 11:35:10 +0000
Subject: [PATCH] AAE-41024 Add adf-icon to content-services lib (#11496)

* AAE-41024 Add adf-icon to content-services lib

* AAE-41024 Fix attribute
---
 .../lib/breadcrumb/breadcrumb.component.html  | 12 ++----
 .../lib/breadcrumb/breadcrumb.component.ts    |  4 +-
 .../dropdown-breadcrumb.component.html        |  4 +-
 .../dropdown-breadcrumb.component.ts          |  4 +-
 .../categories-management.component.html      |  2 +-
 .../categories-management.component.ts        |  4 +-
 .../content-metadata-card.component.html      |  2 +-
 .../content-metadata-card.component.ts        |  4 +-
 .../content-metadata-header.component.ts      |  6 +--
 .../content-metadata.component.html           | 24 +++++------
 .../content-metadata.component.ts             |  4 +-
 ...content-node-selector-panel.component.html |  8 ++--
 .../content-node-selector-panel.component.ts  |  4 +-
 .../content-node-selector.component.html      |  5 +--
 .../content-node-selector.component.ts        |  5 +--
 .../content-node-share.dialog.html            | 12 +++---
 .../content-node-share.dialog.ts              |  5 +--
 .../components/document-list.component.html   |  2 +-
 .../components/document-list.component.ts     |  4 +-
 .../add-permission-dialog.component.html      |  4 +-
 .../add-permission-dialog.component.ts        | 10 +++--
 .../add-permission-panel.component.html       |  6 +--
 .../add-permission-panel.component.ts         |  4 +-
 .../permission-container.component.html       |  2 +-
 .../permission-container.component.ts         |  4 +-
 .../permission-list.component.html            |  9 ++--
 .../permission-list.component.ts              | 10 +++--
 .../user-icon-column.component.ts             |  7 ++--
 .../search-check-list.component.html          |  6 +--
 .../search-check-list.component.ts            |  5 +--
 ...rch-chip-autocomplete-input.component.html |  2 +-
 ...earch-chip-autocomplete-input.component.ts |  4 +-
 .../search-chip-list.component.html           |  2 +-
 .../search-chip-list.component.ts             |  4 +-
 .../search-facet-field.component.html         | 10 ++---
 .../search-facet-field.component.ts           |  5 +--
 .../search-facet-chip-tabbed.component.html   |  4 +-
 .../search-facet-chip-tabbed.component.ts     |  4 +-
 .../search-facet-chip.component.html          |  4 +-
 .../search-facet-chip.component.ts            |  4 +-
 .../search-filter-menu-card.component.html    |  2 +-
 .../search-filter-menu-card.component.ts      |  4 +-
 .../search-widget-chip.component.html         |  2 +-
 .../search-widget-chip.component.ts           |  4 +-
 .../search-form/search-form.component.html    |  2 +-
 .../search-form/search-form.component.ts      |  4 +-
 .../search-radio/search-radio.component.html  |  4 +-
 .../search-radio/search-radio.component.ts    |  4 +-
 .../search-text/search-text.component.html    |  2 +-
 .../search-text/search-text.component.ts      |  4 +-
 .../tag-actions/tag-actions.component.html    |  2 +-
 .../tag/tag-actions/tag-actions.component.ts  | 10 +++--
 .../lib/tag/tag-list/tag-list.component.html  |  4 +-
 .../lib/tag/tag-list/tag-list.component.ts    |  5 +--
 .../components/tree-view.component.html       |  4 +-
 .../components/tree-view.component.ts         |  4 +-
 .../lib/tree/components/tree.component.html   |  2 +-
 .../src/lib/tree/components/tree.component.ts | 10 +++--
 .../file-uploading-dialog.component.html      |  5 +--
 .../file-uploading-dialog.component.ts        |  5 +--
 .../file-uploading-list-row.component.html    | 41 +++++--------------
 .../file-uploading-list-row.component.ts      |  5 +--
 .../components/upload-button.component.html   |  6 +--
 .../components/upload-button.component.ts     |  5 +--
 .../version-list.component.html               |  4 +-
 .../version-manager/version-list.component.ts | 10 +++--
 .../components/alfresco-viewer.component.html |  4 +-
 .../components/alfresco-viewer.component.ts   |  4 +-
 68 files changed, 176 insertions(+), 211 deletions(-)

diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.html b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.html
index 5b4fabdf08..f3c44b5e38 100644
--- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.html
+++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.html
@@ -13,12 +13,8 @@
         [attr.aria-label]="'BREADCRUMB.ARIA-LABEL.DROPDOWN' | translate"
     >
         <div class="adf-breadcrumb-dropdown-trigger-icon">
-            <mat-icon [class.adf-isRoot]="!hasPreviousNodes()">folder</mat-icon>
-            <mat-icon
-                [class.adf-isRoot]="!hasPreviousNodes()"
-                class="adf-breadcrumb-dropdown-trigger-arrow"
-                >arrow_drop_down</mat-icon
-            >
+            <mat-icon [class.adf-isRoot]="!hasPreviousNodes()" adf-icon="folder" />
+            <mat-icon [class.adf-isRoot]="!hasPreviousNodes()" class="adf-breadcrumb-dropdown-trigger-arrow" adf-icon="arrow_drop_down" />
         </div>
     </button>
 
@@ -60,9 +56,7 @@
             {{ (selectedRowItemsCount < 1 ? item.name : 'BREADCRUMB.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }}
         </div>
 
-        <mat-icon class="adf-breadcrumb-item-chevron" *ngIf="!last">
-            chevron_right
-        </mat-icon>
+        <mat-icon class="adf-breadcrumb-item-chevron" *ngIf="!last" adf-icon="chevron_right" />
     </div>
 </nav>
 
diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts
index 56fdd84a37..e60437fdfa 100644
--- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts
+++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.ts
@@ -20,13 +20,13 @@ import { MatSelect, MatSelectModule } from '@angular/material/select';
 import { Node, PathElement } from '@alfresco/js-api';
 import { DocumentListComponent } from '../document-list/components/document-list.component';
 import { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
 import { TranslatePipe } from '@ngx-translate/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-breadcrumb',
-    imports: [CommonModule, MatIconModule, TranslatePipe, MatSelectModule],
+    imports: [CommonModule, IconModule, TranslatePipe, MatSelectModule],
     templateUrl: './breadcrumb.component.html',
     styleUrls: ['./breadcrumb.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.html b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.html
index a6fc572ae3..27d46ffaa6 100644
--- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.html
+++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.html
@@ -11,10 +11,10 @@
         [attr.aria-haspopup]="hasPreviousNodes() ? 'true' : null"
         [attr.aria-expanded]="dropdown?.panelOpen || false"
         data-automation-id="dropdown-breadcrumb-trigger">
-        <mat-icon class="adf-dropdown-breadcrumb-icon" [class.adf-isRoot]="!hasPreviousNodes()">folder</mat-icon>
+        <mat-icon class="adf-dropdown-breadcrumb-icon" [class.adf-isRoot]="!hasPreviousNodes()" adf-icon="folder" />
     </button>
 
-    <mat-icon class="adf-dropdown-breadcrumb-icon adf-dropdown-breadcrumb-item-chevron">chevron_right</mat-icon>
+    <mat-icon class="adf-dropdown-breadcrumb-icon adf-dropdown-breadcrumb-item-chevron" adf-icon="chevron_right" />
 
     <div class="adf-dropdown-breadcrumb-path">
         <mat-select
diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts
index 4ac206a4be..3af9adc3bb 100644
--- a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts
+++ b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.ts
@@ -20,12 +20,12 @@ import { MatSelect, MatSelectModule } from '@angular/material/select';
 import { PathElement, Node } from '@alfresco/js-api';
 import { BreadcrumbComponent } from './breadcrumb.component';
 import { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
 import { TranslatePipe } from '@ngx-translate/core';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-dropdown-breadcrumb',
-    imports: [CommonModule, MatIconModule, MatSelectModule, TranslatePipe],
+    imports: [CommonModule, IconModule, MatSelectModule, TranslatePipe],
     templateUrl: './dropdown-breadcrumb.component.html',
     styleUrls: ['./dropdown-breadcrumb.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.html b/lib/content-services/src/lib/category/categories-management/categories-management.component.html
index f0c8d0a594..fa72d2f7d8 100644
--- a/lib/content-services/src/lib/category/categories-management/categories-management.component.html
+++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.html
@@ -20,7 +20,7 @@
                 (click)="removeCategory(category)"
                 [attr.title]="removeCategoryTitle | translate"
                 [disabled]="disableRemoval">
-                <mat-icon>remove</mat-icon>
+                <mat-icon adf-icon="remove" />
             </button>
         </span>
     </div>
diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
index bd58cb230c..940e894149 100644
--- a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
+++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
@@ -39,10 +39,10 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { AutoFocusDirective } from '../../directives';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { IconModule } from '@alfresco/adf-core';
 
 interface CategoryNameControlErrors {
     duplicatedExistingCategory?: boolean;
@@ -62,7 +62,7 @@ interface CategoryNameControlErrors {
         ReactiveFormsModule,
         MatFormFieldModule,
         MatButtonModule,
-        MatIconModule,
+        IconModule,
         MatListModule,
         MatProgressSpinnerModule
     ],
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html
index a237bfe327..4543218772 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html
@@ -21,7 +21,7 @@
                 [attr.title]="'CORE.METADATA.ACTIONS.EDIT_ASPECTS' | translate"
                 [attr.aria-label]="'CORE.METADATA.ACCESSIBILITY.EDIT_ASPECTS' | translate"
                 data-automation-id="meta-data-card-edit-aspect">
-                <mat-icon>menu</mat-icon>
+                <mat-icon adf-icon="menu" />
             </button>
         </div>
     </mat-card-footer>
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
index 6488b801ba..aebfdfa231 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.ts
@@ -26,12 +26,12 @@ import { CommonModule } from '@angular/common';
 import { MatCardModule } from '@angular/material/card';
 import { ContentMetadataComponent } from '../content-metadata/content-metadata.component';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { TranslatePipe } from '@ngx-translate/core';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-content-metadata-card',
-    imports: [CommonModule, MatCardModule, ContentMetadataComponent, MatButtonModule, MatIconModule, TranslatePipe],
+    imports: [CommonModule, MatCardModule, ContentMetadataComponent, MatButtonModule, IconModule, TranslatePipe],
     templateUrl: './content-metadata-card.component.html',
     styleUrls: ['./content-metadata-card.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata-header.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata-header.component.ts
index 0df9b38a1a..89c1f715a0 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata-header.component.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata-header.component.ts
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
+import { IconModule } from '@alfresco/adf-core';
 import { CommonModule } from '@angular/common';
 import { Component, Input, ViewEncapsulation } from '@angular/core';
 import { MatExpansionModule } from '@angular/material/expansion';
-import { MatIconModule } from '@angular/material/icon';
 import { TranslatePipe } from '@ngx-translate/core';
 
 @Component({
     standalone: true,
-    imports: [CommonModule, MatIconModule, MatExpansionModule, TranslatePipe],
+    imports: [CommonModule, IconModule, MatExpansionModule, TranslatePipe],
     selector: 'adf-content-metadata-header',
     encapsulation: ViewEncapsulation.None,
     styles: [
@@ -46,7 +46,7 @@ import { TranslatePipe } from '@ngx-translate/core';
     ],
     template: `
         <ng-container>
-            <mat-icon>{{ expanded ? 'expand_more' : 'chevron_right' }}</mat-icon>
+            <mat-icon [adf-icon]="expanded ? 'expand_more' : 'chevron_right'" />
             <mat-panel-title *ngIf="title" class="adf-metadata-properties-title" [title]="title | translate">{{ title | translate }}</mat-panel-title>
             <ng-content />
         </ng-container>
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
index 13c3add61f..7bcb260a28 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
@@ -22,7 +22,7 @@
                     [attr.aria-label]="'CORE.METADATA.ACCESSIBILITY.EDIT' | translate: { sectionName: ('CORE.METADATA.BASIC.HEADER' | translate) }"
                     data-automation-id="meta-data-general-info-edit"
                     class="adf-edit-icon-buttons">
-                    <mat-icon>mode_edit</mat-icon>
+                    <mat-icon adf-icon="mode_edit" />
                 </button>
                 <div *ngIf="isPanelEditing(DefaultPanels.PROPERTIES)" class="adf-metadata-action-buttons">
                     <button
@@ -31,7 +31,7 @@
                         (click)="cancelGroupEditing(DefaultPanels.PROPERTIES, $event)"
                         data-automation-id="reset-metadata"
                         class="adf-metadata-action-buttons-clear">
-                        <mat-icon>clear</mat-icon>
+                        <mat-icon adf-icon="clear" />
                     </button>
                     <button
                         mat-icon-button
@@ -40,7 +40,7 @@
                         color="primary"
                         data-automation-id="save-general-info-metadata"
                         [disabled]="!hasMetadataChanged || invalidProperties.size > 0">
-                        <mat-icon>check</mat-icon>
+                        <mat-icon adf-icon="check" />
                     </button>
                 </div>
             </adf-content-metadata-header>
@@ -77,7 +77,7 @@
                         [attr.aria-label]="'CORE.METADATA.ACCESSIBILITY.EDIT' | translate: { sectionName: ('METADATA.BASIC.TAGS' | translate) }"
                         data-automation-id="showing-tag-input-button"
                         class="adf-edit-icon-buttons">
-                        <mat-icon>mode_edit</mat-icon>
+                        <mat-icon adf-icon="mode_edit" />
                     </button>
                     <div *ngIf="isPanelEditing(DefaultPanels.TAGS)" class="adf-metadata-action-buttons">
                         <button
@@ -86,7 +86,7 @@
                             (click)="cancelGroupEditing(DefaultPanels.TAGS, $event)"
                             data-automation-id="reset-tags-metadata"
                             class="adf-metadata-action-buttons-clear">
-                            <mat-icon>clear</mat-icon>
+                            <mat-icon adf-icon="clear" />
                         </button>
                         <button
                             mat-icon-button
@@ -95,7 +95,7 @@
                             color="primary"
                             data-automation-id="save-tags-metadata"
                             [disabled]="!hasMetadataChanged">
-                            <mat-icon>check</mat-icon>
+                            <mat-icon adf-icon="check" />
                         </button>
                     </div>
                 </adf-content-metadata-header>
@@ -141,7 +141,7 @@
                         [attr.aria-label]="'CORE.METADATA.ACCESSIBILITY.EDIT' | translate: { sectionName: ('CATEGORIES_MANAGEMENT.CATEGORIES_TITLE' | translate) }"
                         data-automation-id="meta-data-categories-edit"
                         class="adf-categories-button adf-edit-icon-buttons">
-                        <mat-icon>mode_edit</mat-icon>
+                        <mat-icon adf-icon="mode_edit" />
                     </button>
                     <div *ngIf="isPanelEditing(DefaultPanels.CATEGORIES)" class="adf-metadata-action-buttons">
                         <button
@@ -150,7 +150,7 @@
                             (click)="cancelGroupEditing(DefaultPanels.CATEGORIES, $event)"
                             data-automation-id="reset-metadata"
                             class="adf-metadata-action-buttons-clear">
-                            <mat-icon>clear</mat-icon>
+                            <mat-icon adf-icon="clear" />
                         </button>
                         <button
                             mat-icon-button
@@ -159,7 +159,7 @@
                             color="primary"
                             data-automation-id="save-categories-metadata"
                             [disabled]="!hasMetadataChanged">
-                            <mat-icon>check</mat-icon>
+                            <mat-icon adf-icon="check" />
                         </button>
                     </div>
                 </adf-content-metadata-header>
@@ -223,7 +223,7 @@
                             data-automation-id="meta-data-card-toggle-edit"
                             class="adf-edit-icon-buttons"
                             (click)="toggleGroupEditing(group.title, $event)">
-                            <mat-icon>mode_edit</mat-icon>
+                            <mat-icon adf-icon="mode_edit" />
                         </button>
                         <div class="adf-metadata-action-buttons" *ngIf="group.editable && isPanelEditing(group.title)">
                             <button
@@ -232,7 +232,7 @@
                                 (click)="cancelGroupEditing(group.title, $event)"
                                 data-automation-id="reset-metadata"
                                 class="adf-metadata-action-buttons-clear">
-                                <mat-icon>clear</mat-icon>
+                                <mat-icon adf-icon="clear" />
                             </button>
                             <button
                                 mat-icon-button
@@ -241,7 +241,7 @@
                                 color="primary"
                                 data-automation-id="save-metadata"
                                 [disabled]="!hasMetadataChanged || invalidProperties.size > 0">
-                                <mat-icon>check</mat-icon>
+                                <mat-icon adf-icon="check" />
                             </button>
                         </div>
                     </adf-content-metadata-header>
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
index ac333ae76a..964da9c7cf 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts
@@ -25,6 +25,7 @@ import {
     CardViewItem,
     Chip,
     DynamicChipListComponent,
+    IconModule,
     NotificationService,
     TranslationService,
     UpdateNotification
@@ -44,7 +45,6 @@ import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { MatChipsModule } from '@angular/material/chips';
 import { MatExpansionModule } from '@angular/material/expansion';
-import { MatIconModule } from '@angular/material/icon';
 import { DynamicExtensionComponent } from '@alfresco/adf-extensions';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { TagsCreatorComponent } from '../../../tag';
@@ -69,7 +69,7 @@ enum DefaultPanels {
         ContentMetadataHeaderComponent,
         MatButtonModule,
         TranslatePipe,
-        MatIconModule,
+        IconModule,
         MatChipsModule,
         CategoriesManagementComponent,
         DynamicExtensionComponent,
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.html b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.html
index 9be81f942e..51ad02eab5 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.html
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.html
@@ -23,7 +23,7 @@
             [attr.aria-label]="'COMMON.CLEAR' | translate"
             [attr.title]="'COMMON.CLEAR' | translate"
         >
-            <mat-icon class="adf-content-node-selector-content-input-icon">clear</mat-icon>
+            <mat-icon class="adf-content-node-selector-content-input-icon" adf-icon="clear" />
         </button>
 
         <mat-icon
@@ -31,8 +31,8 @@
             matSuffix
             class="adf-content-node-selector-content-input-icon"
             data-automation-id="content-node-selector-search-icon"
-            >search
-        </mat-icon>
+            adf-icon="search"
+        />
     </mat-form-field>
     <adf-sites-dropdown
         *ngIf="showDropdownSiteList"
@@ -47,7 +47,7 @@
         data-automation-id="adf-toggle-search-panel-button"
         mat-icon-button
         (click)="toggleSearchPanel()">
-        <mat-icon>filter_list</mat-icon>
+        <mat-icon adf-icon="filter_list" />
         {{ 'SEARCH.SEARCH_HEADER.TITLE' | translate }}
     </button>
     <div class="adf-content-node-selector-search-panel-container">
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts
index b7ecbe0387..f238c27f88 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.ts
@@ -22,6 +22,7 @@ import {
     DataColumnListComponent,
     DataSorting,
     HighlightDirective,
+    IconModule,
     InfinitePaginationComponent,
     PaginatedComponent,
     ShowHeaderMode,
@@ -47,7 +48,6 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { MatInputModule } from '@angular/material/input';
 import { AutoFocusDirective } from '../../directives/auto-focus.directive';
 import { NodeCounterDirective } from '../../directives/node-counter.directive';
-import { MatIconModule } from '@angular/material/icon';
 import { DropdownSitesComponent } from '../site-dropdown/sites-dropdown.component';
 import { MatButtonModule } from '@angular/material/button';
 import { NameLocationCellComponent } from '../name-location-cell/name-location-cell.component';
@@ -69,7 +69,7 @@ export const defaultValidation = () => true;
         MatInputModule,
         ReactiveFormsModule,
         AutoFocusDirective,
-        MatIconModule,
+        IconModule,
         DropdownSitesComponent,
         MatButtonModule,
         ToolbarTitleComponent,
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
index 68899669b0..43c53c78f1 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.html
@@ -23,10 +23,7 @@
                     </adf-toolbar>
                     <ng-template mat-tab-label>
                         {{ 'NODE_SELECTOR.UPLOAD_FROM_DEVICE' | translate }}
-                        <mat-icon *ngIf="hasUploadError()"
-                                  data-automation-id="adf-content-node-selector-disabled-tab-info-icon"
-                                  title="{{ getWarningMessage() | translate }}">info
-                        </mat-icon>
+                        <mat-icon *ngIf="hasUploadError()" data-automation-id="adf-content-node-selector-disabled-tab-info-icon" title="{{ getWarningMessage() | translate }}" adf-icon="info" />
                     </ng-template>
                 </div>
                 <div class="adf-content-node-selector-local-upload-content">
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
index 776630b4ac..702d2349fe 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.ts
@@ -17,7 +17,7 @@
 
 import { Component, DestroyRef, inject, Inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
-import { EmptyListComponent, NotificationService, ToolbarComponent, ToolbarTitleComponent, TranslationService } from '@alfresco/adf-core';
+import { EmptyListComponent, IconModule, NotificationService, ToolbarComponent, ToolbarTitleComponent, TranslationService } from '@alfresco/adf-core';
 import { Node } from '@alfresco/js-api';
 import { AllowableOperationsEnum } from '../common/models/allowable-operations.enum';
 import { ContentService } from '../common/services/content.service';
@@ -31,7 +31,6 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { TranslatePipe } from '@ngx-translate/core';
 import { DropdownBreadcrumbComponent } from '../breadcrumb/dropdown-breadcrumb.component';
 import { NodeCounterDirective } from '../directives/node-counter.directive';
-import { MatIconModule } from '@angular/material/icon';
 import { UploadDragAreaComponent } from '../upload/components/upload-drag-area.component';
 import { FileUploadingDialogComponent } from '../upload/components/file-uploading-dialog.component';
 import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel/content-node-selector-panel.component';
@@ -50,7 +49,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
         ToolbarComponent,
         DropdownBreadcrumbComponent,
         NodeCounterDirective,
-        MatIconModule,
+        IconModule,
         UploadDragAreaComponent,
         FileUploadingDialogComponent,
         EmptyListComponent,
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
index 210d7ae1d3..3d414aad9e 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.html
@@ -8,13 +8,13 @@
                 aria-level="1">
                 {{ 'SHARE.DIALOG-TITLE' | translate }} {{ fileName }}
             </div>
-            <mat-icon mat-dialog-close class="adf-share-link__close adf-share-link__icon">close</mat-icon>
+            <mat-icon mat-dialog-close class="adf-share-link__close adf-share-link__icon" adf-icon="close" />
         </div>
         <mat-dialog-content class="adf-share-link--dialog-content">
             <hr class="adf-share-link__separation-line" />
             <form [formGroup]="form" class="adf-share-link__form">
                 <div class="adf-share-link--row adf-share-link--row-sharable">
-                    <mat-icon class="adf-share-link__icon">timer</mat-icon>
+                    <mat-icon class="adf-share-link__icon" adf-icon="timer" />
                     <div class="adf-share-link__label adf-sharable-link">{{ 'SHARE.LINK-EXPIRY-DATE' | translate }}
                     </div>
                     <mat-slide-toggle
@@ -91,15 +91,15 @@
                         [adf-clipboard]
                         [attr.aria-label]="'SHARE.COPY_BUTTON_LABEL' | translate"
                         [target]="sharedLinkInput"
-                        tabindex="0">
-                        content_copy
-                    </mat-icon>
+                        tabindex="0"
+                        adf-icon="content_copy"
+                    />
                 </mat-form-field>
                 <p class="adf-share-link__warn adf-share-link__para" *ngIf="isLinkWithExpiryDate">
                     {{ 'SHARE.LINK-WITH-EXPIRY-SETTINGS' | translate }}
                 </p>
                 <div class="adf-share-link--row">
-                    <mat-icon class="adf-share-link__icon">public</mat-icon>
+                    <mat-icon class="adf-share-link__icon" adf-icon="public" />
                     <p
                         class="adf-share-link__info adf-sharable-link adf-share-link__public-content adf-share-link__para">
                         {{ 'SHARE.PUBLIC-CONTENT' | translate }}
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
index 74f641d448..22f9188016 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.ts
@@ -22,13 +22,12 @@ import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angula
 import { ContentService } from '../common/services/content.service';
 import { SharedLinksApiService } from './services/shared-links-api.service';
 import { SharedLinkBodyCreate } from '@alfresco/js-api';
-import { ClipboardDirective, ConfirmDialogComponent } from '@alfresco/adf-core';
+import { ClipboardDirective, ConfirmDialogComponent, IconModule } from '@alfresco/adf-core';
 import { ContentNodeShareSettings } from './content-node-share.settings';
 import { RenditionService } from '../common/services/rendition.service';
 import { add, endOfDay, format, isBefore } from 'date-fns';
 import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatInputModule } from '@angular/material/input';
@@ -44,7 +43,7 @@ interface SharedDialogFormProps {
     imports: [
         CommonModule,
         TranslatePipe,
-        MatIconModule,
+        IconModule,
         MatDialogModule,
         ReactiveFormsModule,
         MatSlideToggleModule,
diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.html b/lib/content-services/src/lib/document-list/components/document-list.component.html
index 6bfa1572b4..4da58e75f3 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.html
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.html
@@ -61,7 +61,7 @@
     <adf-no-permission-template>
         <ng-template>
             <div class="adf-no-permission__template" *ngIf="!customNoPermissionsTemplate">
-                <mat-icon>error</mat-icon>
+                <mat-icon adf-icon="error" />
                 <p class="adf-no-permission__template--text">{{ 'ADF-DOCUMENT-LIST.NO_PERMISSION' | translate }}</p>
             </div>
             <ng-content select="adf-custom-no-permission-template, no-permission-content" />
diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.ts b/lib/content-services/src/lib/document-list/components/document-list.component.ts
index 57759acea9..3b9415e007 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.ts
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.ts
@@ -34,6 +34,7 @@ import {
     DataTableSchema,
     DataTableService,
     EmptyListComponent,
+    IconModule,
     LoadingContentTemplateDirective,
     MainMenuDataTableTemplateDirective,
     NoContentTemplateDirective,
@@ -82,7 +83,6 @@ import { NodeEntityEvent, NodeEntryEvent } from './node.event';
 import { CommonModule } from '@angular/common';
 import { FilterHeaderComponent } from './filter-header/filter-header.component';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -99,7 +99,7 @@ const BYTES_TO_MB_CONVERSION_VALUE = 1048576;
         EmptyListComponent,
         TranslatePipe,
         NoPermissionTemplateDirective,
-        MatIconModule,
+        IconModule,
         LoadingContentTemplateDirective,
         MatProgressSpinnerModule,
         MainMenuDataTableTemplateDirective,
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.html b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.html
index 02739aae06..3b5a0b3c2b 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.html
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.html
@@ -10,7 +10,7 @@
         <button mat-button (click)="enableSearch()" class="adf-search-user-button">
             {{ "PERMISSION_MANAGER.ADD-PERMISSION.SEARCH" | translate }}
             <span class="adf-toolbar--spacer"></span>
-            <mat-icon iconPositionEnd>search</mat-icon>
+            <mat-icon iconPositionEnd adf-icon="search" />
         </button>
 
         <div class="adf-new-permission-table">
@@ -66,7 +66,7 @@
                                     [attr.aria-label]="'PERMISSION_MANAGER.ADD-PERMISSION.REMOVE_USER_GROUP' | translate"
                                     [attr.title]="'PERMISSION_MANAGER.ADD-PERMISSION.REMOVE_USER_GROUP' | translate"
                                     data-automation-id="adf-delete-permission-button">
-                                <mat-icon>highlight_off</mat-icon>
+                                <mat-icon adf-icon="highlight_off" />
                             </button>
                         </ng-template>
                     </data-column>
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts
index 653909ebe5..35b20e91a2 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.ts
@@ -23,8 +23,7 @@ import { MemberModel } from '../../models/member.model';
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { TranslatePipe } from '@ngx-translate/core';
-import { DataColumnComponent, DataColumnListComponent, DataTableComponent, DateColumnHeaderComponent } from '@alfresco/adf-core';
-import { MatIconModule } from '@angular/material/icon';
+import { DataColumnComponent, DataColumnListComponent, DataTableComponent, DateColumnHeaderComponent, IconModule } from '@alfresco/adf-core';
 import { AddPermissionPanelComponent } from './add-permission-panel.component';
 import { UserIconColumnComponent } from '../user-icon-column/user-icon-column.component';
 import { UserNameColumnComponent } from '../user-name-column/user-name-column.component';
@@ -41,7 +40,7 @@ import { UserRoleColumnComponent } from '../user-role-column/user-role-column.co
         DataColumnListComponent,
         DataColumnComponent,
         DateColumnHeaderComponent,
-        MatIconModule,
+        IconModule,
         AddPermissionPanelComponent,
         UserIconColumnComponent,
         UserNameColumnComponent,
@@ -58,7 +57,10 @@ export class AddPermissionDialogComponent {
     private existingMembers: PermissionElement[] = [];
     currentSelection: NodeEntry[] = [];
 
-    constructor(@Inject(MAT_DIALOG_DATA) public data: AddPermissionDialogData, private dialogRef: MatDialogRef<AddPermissionDialogComponent>) {
+    constructor(
+        @Inject(MAT_DIALOG_DATA) public data: AddPermissionDialogData,
+        private dialogRef: MatDialogRef<AddPermissionDialogComponent>
+    ) {
         this.existingMembers = this.data.node.permissions.locallySet || [];
     }
 
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html
index fbb47a1c45..cbe0bbbf5f 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html
@@ -21,12 +21,10 @@
         [attr.aria-label]="'COMMON.CLEAR' | translate"
         [attr.title]="'COMMON.CLEAR' | translate"
     >
-        <mat-icon class="adf-permission-search-icon">clear</mat-icon>
+        <mat-icon class="adf-permission-search-icon" adf-icon="clear" />
     </button>
 
-    <mat-icon *ngIf="searchedWord?.length === 0" class="adf-permission-search-icon" data-automation-id="adf-permission-search-icon" matSuffix
-        >search
-    </mat-icon>
+    <mat-icon *ngIf="searchedWord?.length === 0" class="adf-permission-search-icon" data-automation-id="adf-permission-search-icon" adf-icon="search" matSuffix />
 </mat-form-field>
 
 <div *ngIf="searchedWord?.length === 0" class="adf-permission-start-message" id="adf-add-permission-type-search">
diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts
index bac101dabd..a965af3dd8 100644
--- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.ts
@@ -28,9 +28,9 @@ import { CommonModule } from '@angular/common';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { UserIconColumnComponent } from '../user-icon-column/user-icon-column.component';
 import { MatIconButton } from '@angular/material/button';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-add-permission-panel',
@@ -40,7 +40,7 @@ import { MatIconButton } from '@angular/material/button';
         MatInputModule,
         TranslatePipe,
         ReactiveFormsModule,
-        MatIconModule,
+        IconModule,
         MatListModule,
         UserIconColumnComponent,
         SearchComponent,
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.html b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.html
index fe72a32eed..ec473854ca 100644
--- a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.html
+++ b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.html
@@ -62,7 +62,7 @@
                         (keydown.enter)="removePermission($event, entry.row.obj)"
                         [attr.data-automation-id]="'adf-delete-permission-button-' + entry.row.obj.authorityId"
                         [attr.aria-label]="'PERMISSION_MANAGER.ACTION.DELETE' | translate">
-                    <mat-icon>delete_outline</mat-icon>
+                    <mat-icon adf-icon="delete_outline" />
                 </button>
             </ng-template>
         </data-column>
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.ts b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.ts
index e8594753d3..08d947d533 100644
--- a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.ts
@@ -26,11 +26,11 @@ import {
     DataTableComponent,
     DateColumnHeaderComponent,
     EmptyContentComponent,
+    IconModule,
     NoContentTemplateDirective
 } from '@alfresco/adf-core';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { UserIconColumnComponent } from '../user-icon-column/user-icon-column.component';
 import { UserNameColumnComponent } from '../user-name-column/user-name-column.component';
 import { NodePathColumnComponent } from '../node-path-column/node-path-column.component';
@@ -46,7 +46,7 @@ import { UserRoleColumnComponent } from '../user-role-column/user-role-column.co
         TranslatePipe,
         DateColumnHeaderComponent,
         MatButtonModule,
-        MatIconModule,
+        IconModule,
         NoContentTemplateDirective,
         EmptyContentComponent,
         UserIconColumnComponent,
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html
index 87164fa6ae..dc2b1987e4 100644
--- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html
+++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.html
@@ -5,7 +5,7 @@
 
     <ng-container *ngIf="permissionList.error$ | async">
         <div class="adf-no-permission__template" id="adf-permission-manager-error">
-            <mat-icon color="warn">error</mat-icon>
+            <mat-icon color="warn" adf-icon="error" />
             <p class="adf-no-permission__template--text">{{ 'PERMISSION_MANAGER.ERROR.NOT-FOUND'| translate }}</p>
         </div>
     </ng-container>
@@ -46,8 +46,7 @@
                 #popOver="adfPopOver"
                 *ngIf="model.node.permissions.isInheritanceEnabled">
                 {{ (popOver.open ? 'PERMISSION_MANAGER.LABELS.HIDE' : 'PERMISSION_MANAGER.LABELS.SHOW') | translate }}
-                <mat-icon class="adf-permission-visibility-toggle-icon" iconPositionEnd>
-                    {{ popOver.open ? 'keyboard_arrow_up' : 'keyboard_arrow_down' }} </mat-icon>
+                <mat-icon class="adf-permission-visibility-toggle-icon" [adf-icon]="popOver.open ? 'keyboard_arrow_up' : 'keyboard_arrow_down'" iconPositionEnd />
             </button>
         </div>
 
@@ -77,7 +76,7 @@
                         (click)="openAddPermissionDialog()"
                         class="adf-add-permission-button"
                         data-automation-id="adf-add-permission-button">
-                        <mat-icon>person_add_outline</mat-icon>
+                        <mat-icon adf-icon="person_add_outline" />
                     </button>
 
                     <button
@@ -86,7 +85,7 @@
                         [disabled]="!selectedPermissions?.length"
                         (click)="deleteSelection()"
                         data-automation-id="adf-delete-selected-permission">
-                        <mat-icon>delete_outline</mat-icon>
+                        <mat-icon adf-icon="delete_outline" />
                     </button>
                 </ng-container>
             </section>
diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts
index e02650f5ab..c5195b6063 100644
--- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ObjectDataRow } from '@alfresco/adf-core';
+import { IconModule, ObjectDataRow } from '@alfresco/adf-core';
 import { PermissionElement } from '@alfresco/js-api';
 import { Component, DestroyRef, EventEmitter, inject, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { PermissionDisplayModel } from '../../models/permission.model';
@@ -23,7 +23,6 @@ import { PermissionListService } from './permission-list.service';
 import { CommonModule } from '@angular/common';
 import { MatCardModule } from '@angular/material/card';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatIconModule } from '@angular/material/icon';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
@@ -38,7 +37,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
         CommonModule,
         MatCardModule,
         MatProgressSpinnerModule,
-        MatIconModule,
+        IconModule,
         MatSlideToggleModule,
         TranslatePipe,
         MatButtonModule,
@@ -72,7 +71,10 @@ export class PermissionListComponent implements OnInit {
         return this._updatePermissionsAllowed;
     }
 
-    constructor(public readonly permissionList: PermissionListService, private readonly contentService: ContentService) {
+    constructor(
+        public readonly permissionList: PermissionListService,
+        private readonly contentService: ContentService
+    ) {
         this.error = this.permissionList.errored;
         this.update = this.permissionList.updated;
     }
diff --git a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts
index 42457f2af3..cfebe82eda 100644
--- a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts
+++ b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.ts
@@ -15,24 +15,23 @@
  * limitations under the License.
  */
 
-import { InitialUsernamePipe, User } from '@alfresco/adf-core';
+import { IconModule, InitialUsernamePipe, User } from '@alfresco/adf-core';
 import { Group, NodeEntry } from '@alfresco/js-api';
 import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { NodePermissionService } from '../../services/node-permission.service';
 import { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
 import { TranslatePipe } from '@ngx-translate/core';
 
 @Component({
     selector: 'adf-user-icon-column',
-    imports: [CommonModule, MatIconModule, InitialUsernamePipe, TranslatePipe],
+    imports: [CommonModule, IconModule, InitialUsernamePipe, TranslatePipe],
     template: `
         @if (!isSelected) {
             <div class="adf-cell-value" [attr.id]="group ? 'group-icon' : 'person-icon'">
                 @if (displayText$ | async; as user) {
                     @if (group) {
-                        <mat-icon class="adf-group-icon">people_alt_outline</mat-icon>
+                        <mat-icon class="adf-group-icon" adf-icon="people_alt_outline" />
                         <span class="cdk-visually-hidden">{{ 'USER_ICON.GROUP_ICON_ALT' | translate }}</span>
                     } @else {
                         <div [outerHTML]="user | usernameInitials: 'adf-people-initial'"></div>
diff --git a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.html b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.html
index 0147b1c74b..e8bd5ca0df 100644
--- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.html
+++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.html
@@ -24,18 +24,18 @@
     <button mat-icon-button
         title="{{ 'SEARCH.FILTER.ACTIONS.CLEAR-ALL' | translate }}"
         (click)="clear()">
-        <mat-icon>clear</mat-icon>
+        <mat-icon adf-icon="clear" />
     </button>
     <button mat-icon-button
         *ngIf="options.canShowLessItems"
         title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-LESS' | translate }}"
         (click)="options.showLessItems()">
-        <mat-icon>keyboard_arrow_up</mat-icon>
+        <mat-icon adf-icon="keyboard_arrow_up" />
     </button>
     <button mat-icon-button
         *ngIf="options.canShowMoreItems"
         title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-MORE' | translate }}"
         (click)="options.showMoreItems()">
-        <mat-icon>keyboard_arrow_down</mat-icon>
+        <mat-icon adf-icon="keyboard_arrow_down" />
     </button>
 </div>
diff --git a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
index e796e2c69f..1a6d1c867d 100644
--- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
+++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts
@@ -21,13 +21,12 @@ import { SearchWidget } from '../../models/search-widget.interface';
 import { SearchWidgetSettings } from '../../models/search-widget-settings.interface';
 import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
 import { SearchFilterList } from '../../models/search-filter-list.model';
-import { TranslationService } from '@alfresco/adf-core';
+import { IconModule, TranslationService } from '@alfresco/adf-core';
 import { ReplaySubject } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 export interface SearchListOption {
@@ -38,7 +37,7 @@ export interface SearchListOption {
 
 @Component({
     selector: 'adf-search-check-list',
-    imports: [CommonModule, MatCheckboxModule, TranslatePipe, MatButtonModule, MatIconModule],
+    imports: [CommonModule, MatCheckboxModule, TranslatePipe, MatButtonModule, IconModule],
     templateUrl: './search-check-list.component.html',
     styleUrls: ['./search-check-list.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html
index c3ff99b3e0..ee6dc4c65a 100644
--- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html
+++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html
@@ -13,7 +13,7 @@
                 class="adf-option-chips-delete-button adf-autocomplete-added-option-chips-delete-button"
                 [title]="'SEARCH.FILTER.BUTTONS.REMOVE' | translate"
             >
-                <mat-icon class="adf-option-chips-delete-icon adf-autocomplete-added-option-chips-delete-icon">close</mat-icon>
+                <mat-icon class="adf-option-chips-delete-icon adf-autocomplete-added-option-chips-delete-icon" adf-icon="close" />
             </button>
         </mat-chip-row>
         <input
diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts
index 547a7257be..cb811d0655 100644
--- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts
+++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts
@@ -39,12 +39,12 @@ import { AutocompleteOption } from '../../models/autocomplete-option.interface';
 import { CommonModule } from '@angular/common';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-chip-autocomplete-input',
-    imports: [CommonModule, MatFormFieldModule, MatChipsModule, TranslatePipe, MatIconModule, ReactiveFormsModule, MatAutocompleteModule],
+    imports: [CommonModule, MatFormFieldModule, MatChipsModule, TranslatePipe, IconModule, ReactiveFormsModule, MatAutocompleteModule],
     templateUrl: './search-chip-autocomplete-input.component.html',
     styleUrls: ['./search-chip-autocomplete-input.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.html b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.html
index c8c90313ad..fd6a9c138e 100644
--- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.html
+++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.html
@@ -17,7 +17,7 @@
             [removable]="true"
             (removed)="facetFiltersService.unselectFacetBucket(selection.field, selection.bucket)">
             {{ (selection.bucket.display || selection.bucket.label) | translate }}
-            <mat-icon class="adf-search-chip-list-item-remove" matChipRemove>cancel</mat-icon>
+            <mat-icon class="adf-search-chip-list-item-remove" adf-icon="cancel" matChipRemove />
         </mat-chip-option>
     </ng-container>
 </mat-chip-listbox>
diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts
index 37e6af550f..3295d4cea7 100644
--- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts
+++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts
@@ -21,11 +21,11 @@ import { SearchFacetFiltersService } from '../../services/search-facet-filters.s
 import { CommonModule } from '@angular/common';
 import { MatChipsModule } from '@angular/material/chips';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-chip-list',
-    imports: [CommonModule, MatChipsModule, TranslatePipe, MatIconModule],
+    imports: [CommonModule, MatChipsModule, TranslatePipe, IconModule],
     templateUrl: './search-chip-list.component.html',
     styleUrls: ['./search-chip-list.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html
index 64ce93d059..d890a02638 100644
--- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html
+++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html
@@ -2,7 +2,7 @@
     <div class="adf-facet-result-filter">
         <div class="adf-facet-search-container">
             <button mat-icon-button class="adf-facet-search-icon" tabindex="-1">
-                <mat-icon class="adf-search-field-icon">search</mat-icon>
+                <mat-icon class="adf-search-field-icon" adf-icon="search" />
             </button>
             <mat-form-field class="adf-facet-search-field" subscriptSizing="dynamic">
                 <input
@@ -18,7 +18,7 @@
                     [attr.title]="'SEARCH.FILTER.BUTTONS.CLEAR' | translate"
                     (click)="field.buckets.filterText = ''"
                 >
-                    <mat-icon role="button" [attr.aria-label]="'SEARCH.FILTER.BUTTONS.CLEAR' | translate">clear</mat-icon>
+                    <mat-icon role="button" [attr.aria-label]="'SEARCH.FILTER.BUTTONS.CLEAR' | translate" adf-icon="clear" />
                 </button>
             </mat-form-field>
         </div>
@@ -55,7 +55,7 @@
             title="{{ 'SEARCH.FILTER.ACTIONS.CLEAR-ALL' | translate }}"
             (click)="resetSelectedBuckets(field)"
         >
-            <mat-icon>clear</mat-icon>
+            <mat-icon adf-icon="clear" />
         </button>
         <button
             mat-icon-button
@@ -63,7 +63,7 @@
             (click)="field.buckets.showLessItems()"
             title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-LESS' | translate }}"
         >
-            <mat-icon>keyboard_arrow_up</mat-icon>
+            <mat-icon adf-icon="keyboard_arrow_up" />
         </button>
         <button
             mat-icon-button
@@ -71,7 +71,7 @@
             (click)="field.buckets.showMoreItems()"
             title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-MORE' | translate }}"
         >
-            <mat-icon>keyboard_arrow_down</mat-icon>
+            <mat-icon adf-icon="keyboard_arrow_down" />
         </button>
     </div>
 </div>
diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts
index 9ba5f0948f..55cbc2d3be 100644
--- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts
+++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.ts
@@ -22,11 +22,10 @@ import { FacetFieldBucket } from '../../models/facet-field-bucket.interface';
 import { SearchQueryBuilderService } from '../../services/search-query-builder.service';
 import { SearchFacetFiltersService } from '../../services/search-facet-filters.service';
 import { FacetWidget } from '../../models/facet-widget.interface';
-import { TranslationService } from '@alfresco/adf-core';
+import { IconModule, TranslationService } from '@alfresco/adf-core';
 import { Subject } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { TranslatePipe } from '@ngx-translate/core';
@@ -34,7 +33,7 @@ import { FormsModule } from '@angular/forms';
 
 @Component({
     selector: 'adf-search-facet-field',
-    imports: [CommonModule, MatButtonModule, MatIconModule, MatFormFieldModule, MatInputModule, TranslatePipe, FormsModule, MatCheckboxModule],
+    imports: [CommonModule, MatButtonModule, IconModule, MatFormFieldModule, MatInputModule, TranslatePipe, FormsModule, MatCheckboxModule],
     templateUrl: './search-facet-field.component.html',
     styleUrls: ['./search-facet-field.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html
index 5dfef14889..b600be65d0 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.html
@@ -17,9 +17,9 @@
         &nbsp; {{ displayValue | translate }}
     </span>
     <ng-template #showAny><span class="adf-search-filter-ellipsis adf-filter-value">&nbsp;{{ 'SEARCH.FILTER.ANY' | translate }}</span></ng-template>
-    <mat-icon class="adf-search-filter-chip-icon" *ngIf="isPopulated; else disabledIcon">{{ chipIcon }}</mat-icon>
+    <mat-icon class="adf-search-filter-chip-icon" *ngIf="isPopulated; else disabledIcon" [adf-icon]="chipIcon" />
     <ng-template #disabledIcon>
-        <mat-icon>remove</mat-icon>
+        <mat-icon adf-icon="remove" />
     </ng-template>
 </mat-chip>
 
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts
index 836f325143..6b1cd10a88 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts
@@ -23,10 +23,10 @@ import { Subject } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { MatChipsModule } from '@angular/material/chips';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { SearchFacetTabbedContentComponent } from './search-facet-tabbed-content.component';
 import { MatButtonModule } from '@angular/material/button';
 import { SearchFilterMenuCardComponent } from '../search-filter-menu-card/search-filter-menu-card.component';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-facet-chip-tabbed',
@@ -35,7 +35,7 @@ import { SearchFilterMenuCardComponent } from '../search-filter-menu-card/search
         MatChipsModule,
         MatMenuModule,
         TranslatePipe,
-        MatIconModule,
+        IconModule,
         SearchFacetTabbedContentComponent,
         MatButtonModule,
         SearchFilterMenuCardComponent
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.html
index 0000febc2c..107c8d56fd 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.html
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.html
@@ -19,9 +19,9 @@
         &nbsp; {{ displayValue | translate }}
     </span>
     <ng-template #showAny><span class="adf-search-filter-ellipsis adf-filter-value">&nbsp;{{ 'SEARCH.FILTER.ANY' | translate }}</span></ng-template>
-    <mat-icon *ngIf="isPopulated(); else disabledIcon">{{ chipIcon }}</mat-icon>
+    <mat-icon *ngIf="isPopulated(); else disabledIcon" [adf-icon]="chipIcon" />
     <ng-template #disabledIcon>
-        <mat-icon>remove</mat-icon>
+        <mat-icon adf-icon="remove" />
     </ng-template>
 </mat-chip>
 
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.ts
index 88c567dcfd..053166e566 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.ts
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.ts
@@ -23,9 +23,9 @@ import { SearchFacetFieldComponent } from '../../search-facet-field/search-facet
 import { CommonModule } from '@angular/common';
 import { MatChipsModule } from '@angular/material/chips';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { SearchFilterMenuCardComponent } from '../search-filter-menu-card/search-filter-menu-card.component';
 import { MatButtonModule } from '@angular/material/button';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-facet-chip',
@@ -34,7 +34,7 @@ import { MatButtonModule } from '@angular/material/button';
         MatChipsModule,
         MatMenuModule,
         TranslatePipe,
-        MatIconModule,
+        IconModule,
         SearchFilterMenuCardComponent,
         MatButtonModule,
         SearchFacetFieldComponent
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.html
index c44c824abd..c2f3f8ab13 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.html
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.html
@@ -6,7 +6,7 @@
             aria-hidden="false"
             (click)="onClose()"
             [title]="'SEARCH.FILTER.BUTTONS.CLOSE' | translate">
-            <mat-icon>close</mat-icon>
+            <mat-icon adf-icon="close" />
         </button>
     </div>
 
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.ts
index 1d52711823..5e6d43e857 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.ts
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.ts
@@ -19,12 +19,12 @@ import { Component, EventEmitter, Output, ViewEncapsulation } from '@angular/cor
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { MatDividerModule } from '@angular/material/divider';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-filter-menu-card',
-    imports: [CommonModule, MatButtonModule, TranslatePipe, MatIconModule, MatDividerModule],
+    imports: [CommonModule, MatButtonModule, TranslatePipe, IconModule, MatDividerModule],
     templateUrl: './search-filter-menu-card.component.html',
     styleUrls: ['./search-filter-menu-card.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html
index 6e5b3e4d23..3ff2b8a118 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html
@@ -16,7 +16,7 @@
         &nbsp;{{ displayValue | translate }}
     </span>
     <ng-template #showAny><span class="adf-search-filter-ellipsis adf-filter-value">&nbsp;{{ 'SEARCH.FILTER.ANY' | translate }}</span></ng-template>
-    <mat-icon class="adf-search-filter-chip-icon">{{ chipIcon }}</mat-icon>
+    <mat-icon class="adf-search-filter-chip-icon" [adf-icon]="chipIcon" />
 </mat-chip>
 
 <mat-menu #menu="matMenu" class="adf-search-widget-extra-width" backdropClass="adf-search-filter-chip-menu" [class]="'adf-search-filter-chip-menu-panel adf-search-filter-chip-menu-panel-' + category.id" (closed)="onClosed()">
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts
index 65b8717704..e94e06c99d 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts
@@ -23,10 +23,10 @@ import { SearchWidgetContainerComponent } from '../../search-widget-container/se
 import { CommonModule } from '@angular/common';
 import { MatChipsModule } from '@angular/material/chips';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { SearchFilterMenuCardComponent } from '../search-filter-menu-card/search-filter-menu-card.component';
 import { MatButtonModule } from '@angular/material/button';
 import { first } from 'rxjs/operators';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-widget-chip',
@@ -35,7 +35,7 @@ import { first } from 'rxjs/operators';
         MatChipsModule,
         MatMenuModule,
         TranslatePipe,
-        MatIconModule,
+        IconModule,
         SearchFilterMenuCardComponent,
         SearchWidgetContainerComponent,
         MatButtonModule
diff --git a/lib/content-services/src/lib/search/components/search-form/search-form.component.html b/lib/content-services/src/lib/search/components/search-form/search-form.component.html
index f2af1ddd60..8bc957d618 100644
--- a/lib/content-services/src/lib/search/components/search-form/search-form.component.html
+++ b/lib/content-services/src/lib/search/components/search-form/search-form.component.html
@@ -21,7 +21,7 @@
                 [matMenuTriggerRestoreFocus]="true">
 
             <span class="adf-search-form-title">{{ getSelected(forms) | translate }}</span>
-            <mat-icon [class.adf-search-form-icon-selected]="menuTrigger.menuOpen" iconPositionEnd class="adf-search-form-icon">expand_more</mat-icon>
+            <mat-icon [class.adf-search-form-icon-selected]="menuTrigger.menuOpen" class="adf-search-form-icon" adf-icon="expand_more" iconPositionEnd />
         </button>
 
         <mat-menu #menu="matMenu" class="adf-search-form-menu">
diff --git a/lib/content-services/src/lib/search/components/search-form/search-form.component.ts b/lib/content-services/src/lib/search/components/search-form/search-form.component.ts
index 0660689f22..0255b63424 100644
--- a/lib/content-services/src/lib/search/components/search-form/search-form.component.ts
+++ b/lib/content-services/src/lib/search/components/search-form/search-form.component.ts
@@ -22,11 +22,11 @@ import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatMenuModule } from '@angular/material/menu';
-import { MatIconModule } from '@angular/material/icon';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-form',
-    imports: [CommonModule, MatButtonModule, TranslatePipe, MatMenuModule, MatIconModule],
+    imports: [CommonModule, MatButtonModule, TranslatePipe, MatMenuModule, IconModule],
     templateUrl: './search-form.component.html',
     styleUrls: ['./search-form.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.html b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.html
index b94574f416..00993387fa 100644
--- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.html
+++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.html
@@ -17,12 +17,12 @@
         *ngIf="options.canShowLessItems"
         title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-LESS' | translate }}"
         (click)="options.showLessItems()">
-        <mat-icon>keyboard_arrow_up</mat-icon>
+        <mat-icon adf-icon="keyboard_arrow_up" />
     </button>
     <button mat-icon-button
         *ngIf="options.canShowMoreItems"
         title="{{ 'SEARCH.FILTER.ACTIONS.SHOW-MORE' | translate }}"
         (click)="options.showMoreItems()">
-        <mat-icon>keyboard_arrow_down</mat-icon>
+        <mat-icon adf-icon="keyboard_arrow_down" />
     </button>
 </div>
diff --git a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
index 452b7322ba..6802fc8863 100644
--- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
+++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
@@ -28,7 +28,7 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
+import { IconModule } from '@alfresco/adf-core';
 
 export interface SearchRadioOption {
     name: string;
@@ -37,7 +37,7 @@ export interface SearchRadioOption {
 
 @Component({
     selector: 'adf-search-radio',
-    imports: [CommonModule, MatRadioModule, FormsModule, TranslatePipe, MatButtonModule, MatIconModule],
+    imports: [CommonModule, MatRadioModule, FormsModule, TranslatePipe, MatButtonModule, IconModule],
     templateUrl: './search-radio.component.html',
     styleUrls: ['./search-radio.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/search/components/search-text/search-text.component.html b/lib/content-services/src/lib/search/components/search-text/search-text.component.html
index bb49fc9907..e1b106bf6c 100644
--- a/lib/content-services/src/lib/search/components/search-text/search-text.component.html
+++ b/lib/content-services/src/lib/search/components/search-text/search-text.component.html
@@ -14,6 +14,6 @@
         class="adf-search-text-form-field-clear-button"
         [attr.aria-label]="'SEARCH.FILTER.ACTIONS.CLEAR' | translate"
         [attr.title]="'SEARCH.FILTER.ACTIONS.CLEAR' | translate">
-        <mat-icon>close</mat-icon>
+        <mat-icon adf-icon="close" />
     </button>
 </mat-form-field>
diff --git a/lib/content-services/src/lib/search/components/search-text/search-text.component.ts b/lib/content-services/src/lib/search/components/search-text/search-text.component.ts
index 649e444892..6d704128b6 100644
--- a/lib/content-services/src/lib/search/components/search-text/search-text.component.ts
+++ b/lib/content-services/src/lib/search/components/search-text/search-text.component.ts
@@ -27,12 +27,12 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { MatInputModule } from '@angular/material/input';
 import { MatButtonModule } from '@angular/material/button';
 import { FormsModule } from '@angular/forms';
-import { MatIconModule } from '@angular/material/icon';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-search-text',
-    imports: [CommonModule, MatFormFieldModule, TranslatePipe, MatInputModule, MatButtonModule, FormsModule, MatIconModule],
+    imports: [CommonModule, MatFormFieldModule, TranslatePipe, MatInputModule, MatButtonModule, FormsModule, IconModule],
     templateUrl: './search-text.component.html',
     styleUrls: ['./search-text.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.html b/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.html
index cffaf73d58..5d15a82fb5 100644
--- a/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.html
+++ b/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.html
@@ -9,7 +9,7 @@
             (click)="removeTag(currentEntry.entry.id)"
         >
             <div class="adf-tag-actions-delete-text" id="tag_name_{{ currentEntry.entry.tag }}">{{ currentEntry.entry.tag }}</div>
-            <mat-icon class="adf-tag-actions-delete-icon">delete</mat-icon>
+            <mat-icon class="adf-tag-actions-delete-icon" adf-icon="delete" />
         </div>
     </mat-list-item>
 </mat-list>
diff --git a/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.ts b/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.ts
index 8cc531dd16..60a78f1e23 100644
--- a/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.ts
+++ b/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.ts
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-import { TranslationService } from '@alfresco/adf-core';
+import { IconModule, TranslationService } from '@alfresco/adf-core';
 import { Component, DestroyRef, EventEmitter, inject, Input, OnChanges, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { TagService } from '../services/tag.service';
 import { TagPaging } from '@alfresco/js-api';
 import { CommonModule } from '@angular/common';
 import { MatListModule } from '@angular/material/list';
-import { MatIconModule } from '@angular/material/icon';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { TranslatePipe } from '@ngx-translate/core';
@@ -36,7 +35,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
     selector: 'adf-tag-node-actions-list',
-    imports: [CommonModule, MatListModule, MatIconModule, MatFormFieldModule, MatInputModule, TranslatePipe, FormsModule, MatButtonModule],
+    imports: [CommonModule, MatListModule, IconModule, MatFormFieldModule, MatInputModule, TranslatePipe, FormsModule, MatButtonModule],
     templateUrl: './tag-actions.component.html',
     styleUrls: ['./tag-actions.component.scss'],
     encapsulation: ViewEncapsulation.None,
@@ -66,7 +65,10 @@ export class TagActionsComponent implements OnChanges, OnInit {
 
     private readonly destroyRef = inject(DestroyRef);
 
-    constructor(private tagService: TagService, private translateService: TranslationService) {}
+    constructor(
+        private tagService: TagService,
+        private translateService: TranslationService
+    ) {}
 
     ngOnInit() {
         this.tagService.refresh.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => this.refreshTag());
diff --git a/lib/content-services/src/lib/tag/tag-list/tag-list.component.html b/lib/content-services/src/lib/tag/tag-list/tag-list.component.html
index 03d7772a11..03b8632f79 100644
--- a/lib/content-services/src/lib/tag/tag-list/tag-list.component.html
+++ b/lib/content-services/src/lib/tag/tag-list/tag-list.component.html
@@ -13,7 +13,7 @@
         data-automation-id="show-fewer-tags"
         mat-icon-button
         (click)="loadLessTags()">
-        <mat-icon>keyboard_arrow_up</mat-icon>
+        <mat-icon adf-icon="keyboard_arrow_up" />
     </button>
     <button
         *ngIf="pagination.hasMoreItems"
@@ -21,6 +21,6 @@
         data-automation-id="show-more-tags"
         mat-icon-button
         (click)="loadMoreTags()">
-        <mat-icon>keyboard_arrow_down</mat-icon>
+        <mat-icon adf-icon="keyboard_arrow_down" />
     </button>
 </div>
diff --git a/lib/content-services/src/lib/tag/tag-list/tag-list.component.ts b/lib/content-services/src/lib/tag/tag-list/tag-list.component.ts
index f2daf5a447..72fd335e11 100644
--- a/lib/content-services/src/lib/tag/tag-list/tag-list.component.ts
+++ b/lib/content-services/src/lib/tag/tag-list/tag-list.component.ts
@@ -17,12 +17,11 @@
 
 import { Component, EventEmitter, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { TagService } from '../services/tag.service';
-import { PaginationModel } from '@alfresco/adf-core';
+import { IconModule, PaginationModel } from '@alfresco/adf-core';
 import { TagEntry } from '@alfresco/js-api';
 import { CommonModule } from '@angular/common';
 import { MatChipsModule } from '@angular/material/chips';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 /**
@@ -30,7 +29,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
  */
 @Component({
     selector: 'adf-tag-list',
-    imports: [CommonModule, MatChipsModule, MatButtonModule, MatIconModule],
+    imports: [CommonModule, MatChipsModule, MatButtonModule, IconModule],
     templateUrl: './tag-list.component.html',
     styleUrls: ['./tag-list.component.scss'],
     encapsulation: ViewEncapsulation.None,
diff --git a/lib/content-services/src/lib/tree-view/components/tree-view.component.html b/lib/content-services/src/lib/tree-view/components/tree-view.component.html
index d29cf21a47..e53bd61f40 100644
--- a/lib/content-services/src/lib/tree-view/components/tree-view.component.html
+++ b/lib/content-services/src/lib/tree-view/components/tree-view.component.html
@@ -28,9 +28,7 @@
                           }
             "
         >
-            <mat-icon class="adf-tree-view-icon">
-                {{ treeControl.isExpanded(treeNode) ? 'folder_open' : 'folder' }}
-            </mat-icon>
+            <mat-icon class="adf-tree-view-icon" [adf-icon]="treeControl.isExpanded(treeNode) ? 'folder_open' : 'folder'" />
         </button>
         <span
             class="adf-tree-view-label"
diff --git a/lib/content-services/src/lib/tree-view/components/tree-view.component.ts b/lib/content-services/src/lib/tree-view/components/tree-view.component.ts
index c148e5d7f8..fa75db5828 100644
--- a/lib/content-services/src/lib/tree-view/components/tree-view.component.ts
+++ b/lib/content-services/src/lib/tree-view/components/tree-view.component.ts
@@ -24,12 +24,12 @@ import { NodeEntry } from '@alfresco/js-api';
 import { CommonModule } from '@angular/common';
 import { MatTreeModule } from '@angular/material/tree';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { TranslatePipe } from '@ngx-translate/core';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-tree-view-list',
-    imports: [CommonModule, MatTreeModule, MatButtonModule, MatIconModule, TranslatePipe],
+    imports: [CommonModule, MatTreeModule, MatButtonModule, IconModule, TranslatePipe],
     templateUrl: './tree-view.component.html',
     styleUrls: ['./tree-view.component.scss']
 })
diff --git a/lib/content-services/src/lib/tree/components/tree.component.html b/lib/content-services/src/lib/tree/components/tree.component.html
index bb38c407a7..fff1f21f30 100644
--- a/lib/content-services/src/lib/tree/components/tree.component.html
+++ b/lib/content-services/src/lib/tree/components/tree.component.html
@@ -94,7 +94,7 @@
                     <button mat-icon-button
                             [matMenuTriggerFor]="menu"
                             [attr.id]="'action_menu_right_' + node.id">
-                        <mat-icon>more_vert</mat-icon>
+                        <mat-icon adf-icon="more_vert" />
                     </button>
                     <mat-menu #menu="matMenu">
                         <ng-template
diff --git a/lib/content-services/src/lib/tree/components/tree.component.ts b/lib/content-services/src/lib/tree/components/tree.component.ts
index 52b730deb6..8588af712d 100644
--- a/lib/content-services/src/lib/tree/components/tree.component.ts
+++ b/lib/content-services/src/lib/tree/components/tree.component.ts
@@ -31,7 +31,7 @@ import {
 import { BehaviorSubject, merge, Observable, Subject } from 'rxjs';
 import { TreeNode, TreeNodeType } from '../models/tree-node.interface';
 import { TreeService } from '../services/tree.service';
-import { ContextMenuDirective, IconComponent, PaginationModel, UserPreferencesService } from '@alfresco/adf-core';
+import { ContextMenuDirective, IconComponent, IconModule, PaginationModel, UserPreferencesService } from '@alfresco/adf-core';
 import { SelectionChange, SelectionModel } from '@angular/cdk/collections';
 import { TreeResponse } from '../models/tree-response.interface';
 import { MatCheckbox, MatCheckboxModule } from '@angular/material/checkbox';
@@ -43,7 +43,6 @@ import { MatTreeModule } from '@angular/material/tree';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatButtonModule } from '@angular/material/button';
 import { MatMenuModule } from '@angular/material/menu';
-import { MatIconModule } from '@angular/material/icon';
 
 @Component({
     selector: 'adf-tree',
@@ -57,7 +56,7 @@ import { MatIconModule } from '@angular/material/icon';
         ContextMenuDirective,
         MatCheckboxModule,
         MatMenuModule,
-        MatIconModule
+        IconModule
     ],
     templateUrl: './tree.component.html',
     styleUrls: ['./tree.component.scss'],
@@ -116,7 +115,10 @@ export class TreeComponent<T extends TreeNode> implements OnInit, OnDestroy {
     public loadingRoot$: Observable<boolean>;
     public treeNodesSelection = new SelectionModel<T>(true, [], true, (node1: T, node2: T) => node1.id === node2.id);
 
-    constructor(public treeService: TreeService<T>, private userPreferenceService: UserPreferencesService) {}
+    constructor(
+        public treeService: TreeService<T>,
+        private userPreferenceService: UserPreferencesService
+    ) {}
 
     set contextMenuSource(contextMenuSource: T) {
         this._contextMenuSource = contextMenuSource;
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.html b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.html
index 4cd1591174..f2b4c23d17 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.html
+++ b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.html
@@ -16,10 +16,7 @@
             [disabled]="isConfirmation"
             [attr.aria-expanded]="!isDialogMinimized"
             (click)="toggleMinimized()">
-            <mat-icon
-                class="adf-upload-dialog__header-button-icon">
-                    {{ isDialogMinimized ? 'keyboard_arrow_up' : 'keyboard_arrow_down' }}
-            </mat-icon>
+            <mat-icon class="adf-upload-dialog__header-button-icon" [adf-icon]="isDialogMinimized ? 'keyboard_arrow_up' : 'keyboard_arrow_down'" />
         </button>
 
         <span
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts
index 06f6b9c6fd..aa4db94a32 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts
+++ b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { UserPreferencesService } from '@alfresco/adf-core';
+import { IconModule, UserPreferencesService } from '@alfresco/adf-core';
 import {
     ChangeDetectorRef,
     Component,
@@ -41,14 +41,13 @@ import { FileUploadCompleteEvent, FileUploadDeleteEvent } from '../../common/eve
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { FileUploadingListRowComponent } from './file-uploading-list-row.component';
 import { A11yModule } from '@angular/cdk/a11y';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
     selector: 'adf-file-uploading-dialog',
-    imports: [CommonModule, MatButtonModule, TranslatePipe, MatIconModule, FileUploadingListComponent, FileUploadingListRowComponent, A11yModule],
+    imports: [CommonModule, MatButtonModule, TranslatePipe, IconModule, FileUploadingListComponent, FileUploadingListRowComponent, A11yModule],
     templateUrl: './file-uploading-dialog.component.html',
     styleUrls: ['./file-uploading-dialog.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.html b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.html
index c47a8e1d11..e01774ee7c 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.html
+++ b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.html
@@ -1,7 +1,5 @@
 <div class="adf-file-uploading-row" [attr.aria-label]="file.name + ' ' + file.status">
-    <mat-icon *ngIf="mimeType === 'default'" matListItemIcon class="adf-file-uploading-row__type">
-        insert_drive_file
-    </mat-icon>
+    <mat-icon *ngIf="mimeType === 'default'" matListItemIcon class="adf-file-uploading-row__type" adf-icon="insert_drive_file" />
 
     <adf-icon *ngIf="mimeType !== 'default'" value="adf:{{ mimeType }}" />
 
@@ -35,10 +33,7 @@
             {{ file.progress.loaded | adfFileSize }} / {{ file.progress.total | adfFileSize }}
         </span>
 
-        <mat-icon *ngIf="toggleIcon.isToggled"
-            class="adf-file-uploading-row__action adf-file-uploading-row__action--cancel">
-            clear
-        </mat-icon>
+        <mat-icon *ngIf="toggleIcon.isToggled" class="adf-file-uploading-row__action adf-file-uploading-row__action--cancel" adf-icon="clear" />
     </div>
 
     <button mat-icon-button
@@ -49,10 +44,7 @@
         [attr.aria-label]="'ADF_FILE_UPLOAD.ARIA-LABEL.UPLOAD_SUCCESSFUL' | translate: { file: file.name }"
         title="{{ 'ADF_FILE_UPLOAD.BUTTON.UPLOAD_SUCCESSFUL' | translate }}">
 
-        <mat-icon
-            class="adf-file-uploading-row__status adf-file-uploading-row__status--done">
-            check_circle
-        </mat-icon>
+        <mat-icon class="adf-file-uploading-row__status adf-file-uploading-row__status--done" adf-icon="check_circle" />
     </button>
 
     <div
@@ -60,11 +52,7 @@
         class="adf-file-uploading-row__file-version"
         [attr.aria-label]="'ADF_FILE_UPLOAD.STATUS.FILE_DONE_STATUS' | translate"
         >
-        <mat-icon
-            matListItemIcon
-            class="adf-file-uploading-row__status--done">
-            check_circle
-        </mat-icon>
+        <mat-icon class="adf-file-uploading-row__status--done" adf-icon="check_circle" matListItemIcon />
     </div>
 
     <button
@@ -77,28 +65,21 @@
         class="adf-file-uploading-row__group"
         title="{{ 'ADF_FILE_UPLOAD.BUTTON.STOP_FILE' | translate }}"
         [attr.aria-label]="'ADF_FILE_UPLOAD.ARIA-LABEL.STOP_FILE' | translate: { file: file.name }">
-        <mat-icon
-            *ngIf="!toggleIconCancel.isToggled"
-            class="adf-file-uploading-row__status adf-file-uploading-row__status--pending">
-            schedule
-        </mat-icon>
+        <mat-icon *ngIf="!toggleIconCancel.isToggled" class="adf-file-uploading-row__status adf-file-uploading-row__status--pending" adf-icon="schedule" />
 
-        <mat-icon
-            *ngIf="toggleIconCancel.isToggled"
-            class="adf-file-uploading-row__action adf-file-uploading-row__action--remove">
-            remove_circle
-        </mat-icon>
+        <mat-icon *ngIf="toggleIconCancel.isToggled" class="adf-file-uploading-row__action adf-file-uploading-row__action--remove" adf-icon="remove_circle" />
     </button>
 
     <div
         role="status"
         *ngIf="isUploadError()"
         class="adf-file-uploading-row__block adf-file-uploading-row__status--error">
-        <mat-icon matListItemIcon
+        <mat-icon
             [attr.aria-label]="'ADF_FILE_UPLOAD.ARIA-LABEL.UPLOAD_FILE_ERROR' | translate: { error: file.errorCode | adfFileUploadError }"
-            [title]="file.errorCode | adfFileUploadError">
-            report_problem
-        </mat-icon>
+            [title]="file.errorCode | adfFileUploadError"
+            adf-icon="report_problem"
+            matListItemIcon
+        />
     </div>
 
     <div
diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts
index 8c9684aaee..464a2c092d 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts
+++ b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.ts
@@ -18,9 +18,8 @@
 import { FileModel, FileUploadStatus } from '../../common/models/file.model';
 import { Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
-import { FileSizePipe, IconComponent } from '@alfresco/adf-core';
+import { FileSizePipe, IconComponent, IconModule } from '@alfresco/adf-core';
 import { MatChipsModule } from '@angular/material/chips';
 import { TranslatePipe } from '@ngx-translate/core';
 import { ToggleIconDirective } from '../directives/toggle-icon.directive';
@@ -31,7 +30,7 @@ import { FileUploadErrorPipe } from '../pipes/file-upload-error.pipe';
     selector: 'adf-file-uploading-list-row',
     imports: [
         CommonModule,
-        MatIconModule,
+        IconModule,
         MatListModule,
         IconComponent,
         MatChipsModule,
diff --git a/lib/content-services/src/lib/upload/components/upload-button.component.html b/lib/content-services/src/lib/upload/components/upload-button.component.html
index c3e39b3f61..4b7ea3f14b 100644
--- a/lib/content-services/src/lib/upload/components/upload-button.component.html
+++ b/lib/content-services/src/lib/upload/components/upload-button.component.html
@@ -16,7 +16,7 @@
                 (change)="onFilesAdded($event)"
                 (click)="onClickUploadButton()"/>
             <label tabindex="0" (keydown.enter)="onClickUploadButton()" for="upload-single-file" class="adf-upload-button-label">
-                <mat-icon class="adf-upload-button-icon">file_upload</mat-icon>
+                <mat-icon class="adf-upload-button-icon" adf-icon="file_upload" />
                 <span id="upload-single-file-label" *ngIf="!staticTitle">
                     {{ 'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate }}</span>
                 <span id="upload-single-file-label-static" *ngIf="staticTitle">
@@ -37,7 +37,7 @@
                 [title]="tooltip"
                 (change)="onFilesAdded($event)"/>
             <label for="upload-multiple-files" class="adf-upload-button-label">
-                <mat-icon class="adf-upload-button-icon">file_upload</mat-icon>
+                <mat-icon class="adf-upload-button-icon" adf-icon="file_upload" />
                 <span id="upload-multiple-file-label" *ngIf="!staticTitle">
                     {{ 'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate }}</span>
                 <span id="upload-multiple-file-label-static" *ngIf="staticTitle">
@@ -60,7 +60,7 @@
             [title]="tooltip"
             (change)="onDirectoryAdded($event)"/>
         <label for="uploadFolder" data-automation-id="uploadFolder" class="adf-upload-button-label">
-            <mat-icon class="adf-upload-button-icon">file_upload</mat-icon>
+            <mat-icon class="adf-upload-button-icon" adf-icon="file_upload" />
             <span id="uploadFolder-label" *ngIf="!staticTitle">
                 {{ 'FILE_UPLOAD.BUTTON.UPLOAD_FOLDER' | translate }}</span>
             <span id="uploadFolder-label-static" *ngIf="staticTitle">
diff --git a/lib/content-services/src/lib/upload/components/upload-button.component.ts b/lib/content-services/src/lib/upload/components/upload-button.component.ts
index 4bedbbbd36..5e5b706baf 100644
--- a/lib/content-services/src/lib/upload/components/upload-button.component.ts
+++ b/lib/content-services/src/lib/upload/components/upload-button.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FileUtils } from '@alfresco/adf-core';
+import { FileUtils, IconModule } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewEncapsulation, inject } from '@angular/core';
 import { NodesApiService } from '../../common/services/nodes-api.service';
 import { ContentService } from '../../common/services/content.service';
@@ -27,11 +27,10 @@ import { UploadBase } from './base-upload/upload-base';
 import { CommonModule } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 
 @Component({
     selector: 'adf-upload-button',
-    imports: [CommonModule, MatButtonModule, TranslatePipe, MatIconModule],
+    imports: [CommonModule, MatButtonModule, TranslatePipe, IconModule],
     templateUrl: './upload-button.component.html',
     styleUrls: ['./upload-button.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/content-services/src/lib/version-manager/version-list.component.html b/lib/content-services/src/lib/version-manager/version-list.component.html
index f2d546aa4e..37f9028423 100644
--- a/lib/content-services/src/lib/version-manager/version-list.component.html
+++ b/lib/content-services/src/lib/version-manager/version-list.component.html
@@ -4,7 +4,7 @@
     <cdk-virtual-scroll-viewport #viewport itemSize="88" class="adf-version-list-viewport" [minBufferPx]="440" [maxBufferPx]="528">
         <mat-list-item class="adf-version-list-item"
                        *cdkVirtualFor="let version of versionsDataSource; let idx = index; let latestVersion = first">
-            <mat-icon class="adf-version-list-icon" matListItemIcon>insert_drive_file</mat-icon>
+            <mat-icon class="adf-version-list-icon" adf-icon="insert_drive_file" matListItemIcon />
             <div class="adf-version-list-content">
                 <div class="adf-version-list-item-details">
                     <p class="adf-version-list-item-line adf-version-list-item-name"
@@ -62,7 +62,7 @@
                             [matMenuTriggerFor]="versionMenu"
                             [id]="'adf-version-list-action-menu-button-' + version.entry.id"
                             title="{{ 'ADF_VERSION_LIST.MANAGE_VERSION_OPTIONS' | translate }}">
-                        <mat-icon>more_vert</mat-icon>
+                        <mat-icon adf-icon="more_vert" />
                     </button>
                 </ng-container>
             </div>
diff --git a/lib/content-services/src/lib/version-manager/version-list.component.ts b/lib/content-services/src/lib/version-manager/version-list.component.ts
index 3b0b4365c8..eb50dbe6a4 100644
--- a/lib/content-services/src/lib/version-manager/version-list.component.ts
+++ b/lib/content-services/src/lib/version-manager/version-list.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ConfirmDialogComponent } from '@alfresco/adf-core';
+import { ConfirmDialogComponent, IconModule } from '@alfresco/adf-core';
 import { AlfrescoApiService } from '../services/alfresco-api.service';
 import { Component, DestroyRef, EventEmitter, inject, Input, OnChanges, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core';
 import { ContentApi, ContentPagingQuery, Node, NodeEntry, NodesApi, VersionEntry, VersionsApi } from '@alfresco/js-api';
@@ -29,7 +29,6 @@ import { CdkFixedSizeVirtualScroll, CdkVirtualForOf, CdkVirtualScrollViewport }
 import { CommonModule } from '@angular/common';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { MatListModule } from '@angular/material/list';
-import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
@@ -37,7 +36,10 @@ import { VersionCompatibilityDirective } from '../version-compatibility';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 export class VersionListDataSource extends InfiniteScrollDatasource<VersionEntry> {
-    constructor(private versionsApi: VersionsApi, private node: Node) {
+    constructor(
+        private versionsApi: VersionsApi,
+        private node: Node
+    ) {
         super();
     }
 
@@ -58,7 +60,7 @@ export class VersionListDataSource extends InfiniteScrollDatasource<VersionEntry
         CdkVirtualScrollViewport,
         CdkFixedSizeVirtualScroll,
         CdkVirtualForOf,
-        MatIconModule,
+        IconModule,
         MatMenuModule,
         TranslatePipe,
         MatButtonModule,
diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html
index 197f61020c..7e822bda20 100644
--- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html
+++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html
@@ -63,7 +63,7 @@
                 data-automation-id="adf-toolbar-download"
                 [adfNodeDownload]="nodeEntry"
                 [version]="versionEntry">
-            <mat-icon>file_download</mat-icon>
+            <mat-icon adf-icon="file_download" />
         </button>
 
         <button id="adf-alfresco-viewer-print"
@@ -73,7 +73,7 @@
                 title="{{ 'ADF_VIEWER.ACTIONS.PRINT' | translate }}"
                 data-automation-id="adf-toolbar-print"
                 (click)="onPrintContent($event)">
-            <mat-icon>print</mat-icon>
+            <mat-icon adf-icon="print" />
         </button>
     </adf-viewer-toolbar-custom-actions>
 </adf-viewer>
diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts
index 6cdf309bd3..72d0acf30c 100644
--- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts
+++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts
@@ -33,6 +33,7 @@ import {
 } from '@angular/core';
 import {
     CloseButtonPosition,
+    IconModule,
     Track,
     VIEWER_DIRECTIVES,
     ViewerComponent,
@@ -56,13 +57,12 @@ import { NodeActionsService } from '../../document-list';
 import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { NodeDownloadDirective } from '../../directives';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
     selector: 'adf-alfresco-viewer',
-    imports: [CommonModule, TranslatePipe, MatButtonModule, MatIconModule, ...VIEWER_DIRECTIVES, NodeDownloadDirective],
+    imports: [CommonModule, TranslatePipe, MatButtonModule, IconModule, ...VIEWER_DIRECTIVES, NodeDownloadDirective],
     templateUrl: './alfresco-viewer.component.html',
     styleUrls: ['./alfresco-viewer.component.scss'],
     host: { class: 'adf-alfresco-viewer' },