From 98ce8d810c3ff08a73eb7f5c4d7d0c09fdbbea38 Mon Sep 17 00:00:00 2001
From: Diogo Bastos <50139916+DiogoABastos@users.noreply.github.com>
Date: Mon, 5 Jan 2026 11:35:32 +0000
Subject: [PATCH] AAE-41025 Add adf-icon to process-services-cloud lib (#11497)

---
 .../form/components/form-cloud.component.html |  6 +++---
 .../form/components/form-cloud.component.ts   |  4 ++--
 .../attach-file-cloud-widget.component.html   |  2 +-
 .../attach-file-cloud-widget.component.ts     |  6 +++---
 ...file-properties-table-cloud.component.html | 17 +++++++---------
 .../file-properties-table-cloud.component.ts  | 15 ++------------
 .../widgets/upload/upload-cloud.widget.html   |  4 ++--
 .../widgets/upload/upload-cloud.widget.ts     |  5 ++---
 .../components/group-cloud.component.html     | 18 +++++++----------
 .../group/components/group-cloud.component.ts |  4 ++--
 .../components/people-cloud.component.html    | 20 +++++++------------
 .../components/people-cloud.component.ts      |  5 ++---
 .../edit-process-filter-cloud.component.html  |  2 +-
 .../edit-process-filter-cloud.component.ts    |  5 ++---
 .../start-process-cloud.component.html        |  2 +-
 .../start-process-cloud.component.ts          |  4 ++--
 ...t-service-task-filter-cloud.component.html |  2 +-
 ...dit-service-task-filter-cloud.component.ts |  5 ++---
 .../edit-task-filter-cloud.component.html     |  2 +-
 .../edit-task-filter-cloud.component.ts       |  5 ++---
 20 files changed, 52 insertions(+), 81 deletions(-)

diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.html b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.html
index 06c14d8a80..b1592b1365 100644
--- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.html
@@ -35,7 +35,7 @@
                 title="{{ 'ADF_VIEWER.ACTIONS.CLOSE' | translate }}"
                 (click)="switchToDisplayMode()"
             >
-                <mat-icon>close</mat-icon>
+                <mat-icon adf-icon="close" />
             </button>
         </adf-toolbar>
 
@@ -64,12 +64,12 @@
                                     (click)="switchToDisplayMode('fullScreen')"
                                     [attr.data-automation-id]="'adf-cloud-form-fullscreen-button'"
                                 >
-                                    <mat-icon>fullscreen</mat-icon>
+                                    <mat-icon adf-icon="fullscreen" />
                                 </button>
                             </div>
                             <div *ngIf="showRefreshButton" class="adf-cloud-form-reload-button" [title]="'ADF_VIEWER.ACTIONS.FULLSCREEN' | translate">
                                 <button mat-icon-button (click)="onRefreshClicked()" [attr.aria-label]="'ADF_VIEWER.ACTIONS.FULLSCREEN' | translate">
-                                    <mat-icon>refresh</mat-icon>
+                                    <mat-icon adf-icon="refresh" />
                                 </button>
                             </div>
                             <span *ngIf="isTitleEnabled()" class="adf-cloud-form-title" [title]="form.taskName"
diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
index 7cc5e00333..53122af365 100644
--- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts
@@ -47,6 +47,7 @@ import {
     FormRendererComponent,
     FormService,
     FormValues,
+    IconModule,
     ToolbarComponent,
     ToolbarDividerComponent,
     UploadWidgetContentLinkModel,
@@ -65,7 +66,6 @@ import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
-import { MatIconModule } from '@angular/material/icon';
 import { A11yModule } from '@angular/cdk/a11y';
 
 export const FORM_CLOUD_FIELD_VALIDATORS_TOKEN = new InjectionToken<FormFieldValidator[]>('FORM_CLOUD_FIELD_VALIDATORS_TOKEN');
@@ -79,7 +79,7 @@ export const FORM_CLOUD_FIELD_VALIDATORS_TOKEN = new InjectionToken<FormFieldVal
         MatButtonModule,
         MatCardModule,
         FormRendererComponent,
-        MatIconModule,
+        IconModule,
         ToolbarDividerComponent,
         ToolbarComponent,
         A11yModule
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
index a0a43837a9..55358a39b7 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.html
@@ -14,7 +14,7 @@
                     [id]="field.id"
                     [title]="field.tooltip">
                         {{ 'FORM.FIELD.ATTACH' | translate }}
-                        <mat-icon class="adf-attach-widget__menu-upload__button__icon">{{getWidgetIcon()}}</mat-icon>
+                        <mat-icon class="adf-attach-widget__menu-upload__button__icon" [adf-icon]="getWidgetIcon()" />
                 </button>
             </div>
         </div>
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts
index 0f2edc3778..8d89d0157b 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts
@@ -25,7 +25,8 @@ import {
     AppConfigService,
     UploadWidgetContentLinkModel,
     DestinationFolderPath,
-    ErrorWidgetComponent
+    ErrorWidgetComponent,
+    IconModule
 } from '@alfresco/adf-core';
 import { Node, NodesApi, RelatedContentRepresentation } from '@alfresco/js-api';
 import { ContentCloudNodeSelectorService } from '../../../services/content-cloud-node-selector.service';
@@ -41,7 +42,6 @@ import {
 } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { FilePropertiesTableCloudComponent } from './file-properties-table/file-properties-table-cloud.component';
 import { MatButtonModule } from '@angular/material/button';
 
@@ -53,7 +53,7 @@ const VALID_ALIAS = [ALIAS_ROOT_FOLDER, ALIAS_USER_FOLDER, '-shared-'];
 
 @Component({
     selector: 'adf-cloud-attach-file-cloud-widget',
-    imports: [CommonModule, ErrorWidgetComponent, TranslatePipe, MatIconModule, FilePropertiesTableCloudComponent, MatButtonModule],
+    imports: [CommonModule, ErrorWidgetComponent, TranslatePipe, IconModule, FilePropertiesTableCloudComponent, MatButtonModule],
     templateUrl: './attach-file-cloud-widget.component.html',
     styleUrls: ['./attach-file-cloud-widget.component.scss'],
     encapsulation: ViewEncapsulation.None
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table/file-properties-table-cloud.component.html b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table/file-properties-table-cloud.component.html
index 2e0a940d2c..947b10ee50 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table/file-properties-table-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table/file-properties-table-cloud.component.html
@@ -3,10 +3,7 @@
         <ng-container matColumnDef="icon">
             <th mat-header-cell *matHeaderCellDef></th>
             <td class="adf-file-properties-table-cell" mat-cell *matCellDef="let element">
-                <mat-icon matListItemLine class="adf-datatable-selected"
-                    *ngIf="selectedNode && element.id === selectedNode.id" (click)="onRowClicked(element)">
-                    check_circle
-                </mat-icon>
+                <mat-icon matListItemLine class="adf-datatable-selected" *ngIf="selectedNode && element.id === selectedNode.id" (click)="onRowClicked(element)" adf-icon="check_circle" />
                 <img matListItemLine class="adf-attach-widget__icon"
                     *ngIf="!selectedNode || element.id !== selectedNode.id" [id]="'file-'+element?.id+'-icon'"
                     (click)="onRowClicked(element)"
@@ -49,39 +46,39 @@
                 <button id="{{'file-'+element?.id+'-option-menu'}}" mat-icon-button [matMenuTriggerFor]="fileActionMenu"
                         *ngIf="!!element.content?.mimeType"
                         [attr.aria-label]="'ADF_PROCESS_LIST.DETAILS.BUTTON.FILE_OPTION_MENU' | translate">
-                    <mat-icon>more_vert</mat-icon>
+                    <mat-icon adf-icon="more_vert" />
                 </button>
                 <mat-menu #fileActionMenu="matMenu" xPosition="before">
                     <button *ngIf="displayMenuOption('show') && !!element.content?.mimeType"
                             id="{{'file-'+element?.id+'-show-file'}}" mat-menu-item
                             (click)="onAttachFileClicked(element)">
-                        <mat-icon>visibility</mat-icon>
+                        <mat-icon adf-icon="visibility" />
                         <span>{{ 'FORM.FIELD.VIEW_FILE' | translate }}</span>
                     </button>
                     <button *ngIf="displayMenuOption('download') && !!element.content?.mimeType"
                             id="{{'file-'+element?.id+'-download-file'}}" mat-menu-item
                             (click)="downloadContent(element)">
-                        <mat-icon>file_download</mat-icon>
+                        <mat-icon adf-icon="file_download" />
                         <span>{{ 'FORM.FIELD.DOWNLOAD_FILE' | translate }}</span>
                     </button>
                     <button *ngIf="displayMenuOption('retrieveMetadata') && !!element.content?.mimeType"
                             id="{{'file-'+element?.id+'-retrieve-file-metadata'}}" mat-menu-item
                             (click)="contentModelFormFileHandler(element)">
-                        <mat-icon class="mat-24">low_priority</mat-icon>
+                        <mat-icon class="mat-24" adf-icon="low_priority" />
                         <span>{{ 'ADF_CLOUD_FORM_COMPONENT.RETRIEVE_METADATA' | translate }}</span>
                     </button>
                     <button *ngIf="!field.readOnly && displayMenuOption('remove')"
                             mat-menu-item
                             [id]="'file-'+element?.id+'-remove'"
                             (click)="onRemoveAttachFile(element);" (keyup.enter)="onRemoveAttachFile(element);">
-                        <mat-icon class="mat-24">highlight_off</mat-icon>
+                        <mat-icon class="mat-24" adf-icon="highlight_off" />
                         <span>{{ 'FORM.FIELD.REMOVE_FILE' | translate }}</span>
                     </button>
                     <div *ngIf="displayMenuOption('newVersion')">
                         <button [adf-upload]="true" [mode]="['click']"
                                 (upload-files)="onUploadNewFileVersion($event, element);"
                                 id="{{'file-'+ element?.id +'-upload-new-version'}}" mat-menu-item>
-                            <mat-icon class="mat-24">file_upload</mat-icon>
+                            <mat-icon class="mat-24" adf-icon="file_upload" />
                             <span>{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.TITLE' | translate }}</span>
                         </button>
                     </div>
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table/file-properties-table-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table/file-properties-table-cloud.component.ts
index 37fea7a48a..166eca49c9 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table/file-properties-table-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table/file-properties-table-cloud.component.ts
@@ -18,11 +18,10 @@
 /* eslint-disable @angular-eslint/component-selector */
 
 import { Component, EventEmitter, inject, Input, Output } from '@angular/core';
-import { LocalizedDatePipe, ThumbnailService, UploadDirective, DisplayableCMProperties } from '@alfresco/adf-core';
+import { LocalizedDatePipe, ThumbnailService, UploadDirective, DisplayableCMProperties, IconModule } from '@alfresco/adf-core';
 import { Node } from '@alfresco/js-api';
 import { NewVersionUploaderDialogData } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatButtonModule } from '@angular/material/button';
@@ -34,17 +33,7 @@ const RETRIEVE_METADATA_OPTION = 'retrieveMetadata';
 
 @Component({
     selector: 'adf-cloud-file-properties-table',
-    imports: [
-        CommonModule,
-        MatIconModule,
-        TranslatePipe,
-        MatMenuModule,
-        UploadDirective,
-        MatButtonModule,
-        MatTableModule,
-        MatLineModule,
-        MatListModule
-    ],
+    imports: [CommonModule, IconModule, TranslatePipe, MatMenuModule, UploadDirective, MatButtonModule, MatTableModule, MatLineModule, MatListModule],
     providers: [LocalizedDatePipe],
     templateUrl: './file-properties-table-cloud.component.html',
     styleUrls: ['./file-properties-table-cloud.component.scss']
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/upload/upload-cloud.widget.html b/lib/process-services-cloud/src/lib/form/components/widgets/upload/upload-cloud.widget.html
index e4522723ec..b49a35ba20 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/upload/upload-cloud.widget.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/upload/upload-cloud.widget.html
@@ -34,7 +34,7 @@
                         (click)="removeFile(file);"
                         (keyup.enter)="removeFile(file);"
                     >
-                        <mat-icon class="mat-24">highlight_off</mat-icon>
+                        <mat-icon class="mat-24" adf-icon="highlight_off" />
                     </button>
                 </mat-list-item>
             </mat-list>
@@ -42,7 +42,7 @@
 
         <div *ngIf="(!hasFile || multipleOption) && !field.readOnly">
             <button mat-raised-button color="primary" (click)="uploadFiles.click()" [title]="field.tooltip">
-                {{ 'FORM.FIELD.UPLOAD' | translate }}<mat-icon>file_upload</mat-icon>
+                {{ 'FORM.FIELD.UPLOAD' | translate }}<mat-icon adf-icon="file_upload" />
                 <input #uploadFiles [multiple]="multipleOption" type="file" [id]="field.form.nodeId" (change)="onFileChanged($event)" />
             </button>
         </div>
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/upload/upload-cloud.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/upload/upload-cloud.widget.ts
index 47ef6b20b6..0742d6f5aa 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/upload/upload-cloud.widget.ts
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/upload/upload-cloud.widget.ts
@@ -21,20 +21,19 @@ import { Component, ElementRef, EventEmitter, inject, OnInit, Output, ViewChild,
 import { Node } from '@alfresco/js-api';
 import { Observable, from } from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
-import { WidgetComponent, FormService, ThumbnailService, NotificationService, ErrorWidgetComponent } from '@alfresco/adf-core';
+import { WidgetComponent, FormService, ThumbnailService, NotificationService, ErrorWidgetComponent, IconModule } from '@alfresco/adf-core';
 import { ProcessCloudContentService } from '../../../services/process-cloud-content.service';
 import { FileSourceTypes, DestinationFolderPathType } from '../../../models/form-cloud-representation.model';
 import { VersionManagerUploadData } from '@alfresco/adf-content-services';
 import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { MatButtonModule } from '@angular/material/button';
 import { MatListModule } from '@angular/material/list';
 import { MatLineModule } from '@angular/material/core';
 
 @Component({
     selector: 'upload-cloud-widget',
-    imports: [CommonModule, TranslatePipe, ErrorWidgetComponent, MatIconModule, MatButtonModule, MatListModule, MatLineModule],
+    imports: [CommonModule, TranslatePipe, ErrorWidgetComponent, IconModule, MatButtonModule, MatListModule, MatLineModule],
     templateUrl: './upload-cloud.widget.html',
     styleUrls: ['./upload-cloud.widget.scss'],
     host: {
diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.html b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.html
index 003a41cd58..a591da9d68 100644
--- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.html
@@ -10,11 +10,7 @@
                 [disabled]="readOnly || isValidationLoading()"
                 title="{{ (group.readonly ? 'ADF_CLOUD_GROUPS.MANDATORY' : '') | translate }}">
                 {{group.name}}
-                <mat-icon
-                    *ngIf="!(group.readonly || readOnly)"
-                    matChipRemove [attr.data-automation-id]="'adf-cloud-group-chip-remove-icon-' + group.name">
-                    cancel
-                </mat-icon>
+                <mat-icon *ngIf="!(group.readonly || readOnly)" matChipRemove [attr.data-automation-id]="'adf-cloud-group-chip-remove-icon-' + group.name" adf-icon="cancel" />
             </mat-chip-row>
             <input [disabled]="readOnly || isValidationLoading()" matInput
                    [formControl]="searchGroupsControl"
@@ -61,29 +57,29 @@
 
     <div class="adf-error-container adf-error-messages-container">
         <mat-error *ngIf="hasPreselectError() &&  !isValidationLoading()" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_GROUPS.ERROR.NOT_FOUND' | translate }}</div>
         </mat-error>
         <mat-error *ngIf="searchGroupsControl.hasError('pattern')" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_PATTERN' | translate: { pattern: getValidationPattern() } }}</div>
             </mat-error>
         <mat-error *ngIf="searchGroupsControl.hasError('maxlength')" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MAX_LENGTH' | translate: { requiredLength: getValidationMaxLength() } }}</div>
         </mat-error>
         <mat-error *ngIf="searchGroupsControl.hasError('minlength')" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MIN_LENGTH' | translate: { requiredLength: getValidationMinLength() } }}</div>
         </mat-error>
         <mat-error *ngIf="(searchGroupsControl.hasError('required') || groupChipsCtrl.hasError('required')) && isDirty()"
             [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.REQUIRED' | translate }} </div>
         </mat-error>
         <mat-error *ngIf="searchGroupsControl.hasError('searchTypingError') && !this.isFocused"
             data-automation-id="invalid-groups-typing-error" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_GROUPS.ERROR.NOT_FOUND' | translate }}</div>
         </mat-error>
     </div>
diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts
index 7c9aecab3d..0cf25d3816 100644
--- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts
@@ -38,7 +38,6 @@ import { IdentityGroupModel } from '../models/identity-group.model';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 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 { MatProgressBarModule } from '@angular/material/progress-bar';
 import { MatSelectModule } from '@angular/material/select';
@@ -47,13 +46,14 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatInputModule } from '@angular/material/input';
 import { MatChipsModule } from '@angular/material/chips';
 import { IdentityGroupService } from '../services/identity-group.service';
+import { IconModule } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-cloud-group',
     imports: [
         CommonModule,
         TranslatePipe,
-        MatIconModule,
+        IconModule,
         MatFormFieldModule,
         MatProgressBarModule,
         MatSelectModule,
diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html
index d1a7671a8c..626f7f369a 100644
--- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html
@@ -20,13 +20,7 @@
                 [matTooltip]="showFullNameOnHover ? (user | fullName : true) : user.email"
             >
                 {{ user | fullName }}
-                <mat-icon
-                    matChipRemove
-                    *ngIf="!(user.readonly || readOnly)"
-                    [attr.data-automation-id]="'adf-people-cloud-chip-remove-icon-' + user.username"
-                >
-                    cancel
-                </mat-icon>
+                <mat-icon matChipRemove *ngIf="!(user.readonly || readOnly)" [attr.data-automation-id]="'adf-people-cloud-chip-remove-icon-' + user.username" adf-icon="cancel" />
             </mat-chip-row>
             <input
                 matInput
@@ -77,21 +71,21 @@
 
     <div class="adf-error-container adf-error-messages-container" *ngIf="showErrors">
         <mat-error *ngIf="hasPreselectError() && !isValidationLoading()" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName: validateUsersMessage } }}</div>
         </mat-error>
         <mat-error *ngIf="searchUserCtrl.hasError('pattern')" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_PATTERN' | translate : { pattern: getValidationPattern() } }}</div>
         </mat-error>
         <mat-error *ngIf="searchUserCtrl.hasError('maxlength')" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">
                 {{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MAX_LENGTH' | translate : { requiredLength: getValidationMaxLength() } }}
             </div>
         </mat-error>
         <mat-error *ngIf="searchUserCtrl.hasError('minlength')" [@transitionMessages]="subscriptAnimationState" class="adf-error">
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">
                 {{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MIN_LENGTH' | translate : { requiredLength: getValidationMinLength() } }}
             </div>
@@ -101,7 +95,7 @@
             [@transitionMessages]="subscriptAnimationState"
             class="adf-error"
         >
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.REQUIRED' | translate }}</div>
         </mat-error>
         <mat-error
@@ -110,7 +104,7 @@
             data-automation-id="invalid-users-typing-error"
             class="adf-error"
         >
-            <mat-icon class="adf-error-icon">error_outline</mat-icon>
+            <mat-icon class="adf-error-icon" adf-icon="error_outline" />
             <div class="adf-error-text">{{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName: searchedValue } }}</div>
         </mat-error>
     </div>
diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts
index 9553e88d6c..6251db507c 100644
--- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts
@@ -33,7 +33,7 @@ import {
 } from '@angular/core';
 import { BehaviorSubject, firstValueFrom, Observable } from 'rxjs';
 import { debounceTime, distinctUntilChanged, filter, mergeMap, switchMap, tap } from 'rxjs/operators';
-import { FullNamePipe, InitialUsernamePipe } from '@alfresco/adf-core';
+import { FullNamePipe, IconModule, InitialUsernamePipe } from '@alfresco/adf-core';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { ComponentSelectionMode } from '../../types';
 import { IdentityUserModel } from '../models/identity-user.model';
@@ -41,7 +41,6 @@ import { MatFormFieldAppearance, MatFormFieldModule, SubscriptSizing } from '@an
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
-import { MatIconModule } from '@angular/material/icon';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { MatSelectModule } from '@angular/material/select';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -55,7 +54,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
     imports: [
         CommonModule,
         TranslatePipe,
-        MatIconModule,
+        IconModule,
         MatFormFieldModule,
         MatProgressBarModule,
         MatSelectModule,
diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter/edit-process-filter-cloud.component.html b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter/edit-process-filter-cloud.component.html
index 66b70c8e47..4ffece95c1 100644
--- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter/edit-process-filter-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter/edit-process-filter-cloud.component.html
@@ -84,7 +84,7 @@
                             <div class="adf-edit-process-filter-date-error-container">
                                 <div *ngIf="hasError(processFilterProperty)">
                                     <div class="adf-error-text">{{'ADF_CLOUD_EDIT_PROCESS_FILTER.ERROR.DATE' | translate}}</div>
-                                    <mat-icon class="adf-error-icon">warning</mat-icon>
+                                    <mat-icon class="adf-error-icon" adf-icon="warning" />
                                 </div>
                             </div>
                         </mat-form-field>
diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter/edit-process-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter/edit-process-filter-cloud.component.ts
index cd9e71c133..9ba03bd775 100644
--- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter/edit-process-filter-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter/edit-process-filter-cloud.component.ts
@@ -29,7 +29,7 @@ import {
     ProcessFilterProperties,
     ProcessSortFilterProperty
 } from '../../models/process-filter-cloud.model';
-import { DateFnsUtils, IconComponent, TranslationService, UserPreferencesService } from '@alfresco/adf-core';
+import { DateFnsUtils, IconComponent, IconModule, TranslationService, UserPreferencesService } from '@alfresco/adf-core';
 import { ProcessFilterCloudService } from '../../services/process-filter-cloud.service';
 import { ProcessFilterDialogCloudComponent } from '../process-filter-dialog/process-filter-dialog-cloud.component';
 import { ProcessCloudService } from '../../../services/process-cloud.service';
@@ -47,7 +47,6 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatIconModule } from '@angular/material/icon';
 import { DateRangeFilterComponent } from '../../../../common/date-range-filter/date-range-filter.component';
 import { PeopleCloudComponent } from '../../../../people/components/people-cloud.component';
 
@@ -93,7 +92,7 @@ interface ProcessFilterFormProps {
         ReactiveFormsModule,
         MatInputModule,
         MatDatepickerModule,
-        MatIconModule,
+        IconModule,
         DateRangeFilterComponent,
         PeopleCloudComponent
     ],
diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.html b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.html
index 5293ce43d9..357d8029bf 100755
--- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.html
@@ -49,7 +49,7 @@
                                         mat-icon-button
                                         (click)="displayDropdown($event)"
                                     >
-                                        <mat-icon>arrow_drop_down</mat-icon>
+                                        <mat-icon adf-icon="arrow_drop_down" />
                                     </button>
                                 </div>
                                 @if (processDefinition.hasError('required')) {
diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts
index 78ddabbf49..09c4c619e2 100755
--- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.ts
@@ -34,6 +34,7 @@ import {
     ContentLinkModel,
     FormModel,
     FormOutcomeEvent,
+    IconModule,
     InplaceFormInputComponent,
     LocalizedDatePipe,
     TranslationService,
@@ -57,7 +58,6 @@ import { TranslatePipe } from '@ngx-translate/core';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatCardModule } from '@angular/material/card';
 import { MatButtonModule } from '@angular/material/button';
-import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatOptionModule } from '@angular/material/core';
 import { FormCloudComponent } from '../../../form/components/form-cloud.component';
@@ -81,7 +81,7 @@ const PROCESS_DEFINITION_IDENTIFIER_REG_EXP = /%{processdefinition}/i;
         MatCardModule,
         MatButtonModule,
         InplaceFormInputComponent,
-        MatIconModule,
+        IconModule,
         MatInputModule,
         MatOptionModule,
         MatAutocompleteModule,
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.html b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.html
index 921c5d73bd..be98245ff1 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.html
@@ -72,7 +72,7 @@
                             <div class="adf-edit-task-filter-date-error-container">
                                 <div *ngIf="hasError(taskFilterProperty)">
                                     <div class="adf-error-text">{{'ADF_TASK_LIST.START_TASK.FORM.ERROR.DATE'|translate}}</div>
-                                    <mat-icon class="adf-error-icon">warning</mat-icon>
+                                    <mat-icon class="adf-error-icon" adf-icon="warning" />
                                 </div>
                             </div>
                         </mat-form-field>
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.ts
index 1a332c48bf..8efcc61a55 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter/edit-service-task-filter-cloud.component.ts
@@ -25,14 +25,13 @@ import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatExpansionModule } from '@angular/material/expansion';
 import { MatButtonModule } from '@angular/material/button';
-import { IconComponent } from '@alfresco/adf-core';
+import { IconComponent, IconModule } from '@alfresco/adf-core';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatIconModule } from '@angular/material/icon';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { DateRangeFilterComponent } from '../../../../../common/date-range-filter/date-range-filter.component';
 import { PeopleCloudComponent } from '../../../../../people/components/people-cloud.component';
@@ -52,7 +51,7 @@ import { TaskAssignmentFilterCloudComponent } from '../../task-assignment-filter
         MatSelectModule,
         MatInputModule,
         MatDatepickerModule,
-        MatIconModule,
+        IconModule,
         MatCheckboxModule,
         DateRangeFilterComponent,
         PeopleCloudComponent,
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.html b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.html
index c679e22196..d4fae0bec1 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.html
@@ -72,7 +72,7 @@
                             <div class="adf-edit-task-filter-date-error-container">
                                 <div *ngIf="hasError(taskFilterProperty)">
                                     <div class="adf-error-text">{{'ADF_TASK_LIST.START_TASK.FORM.ERROR.DATE'|translate}}</div>
-                                    <mat-icon class="adf-error-icon">warning</mat-icon>
+                                    <mat-icon class="adf-error-icon" adf-icon="warning" />
                                 </div>
                             </div>
                         </mat-form-field>
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.ts
index d68486ba81..11c1bf6083 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter/edit-task-filter-cloud.component.ts
@@ -28,14 +28,13 @@ import { CommonModule } from '@angular/common';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MatExpansionModule } from '@angular/material/expansion';
 import { MatButtonModule } from '@angular/material/button';
-import { IconComponent } from '@alfresco/adf-core';
+import { IconComponent, IconModule } from '@alfresco/adf-core';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { ReactiveFormsModule } from '@angular/forms';
 import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatIconModule } from '@angular/material/icon';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { DateRangeFilterComponent } from '../../../../../common/date-range-filter/date-range-filter.component';
 import { PeopleCloudComponent } from '../../../../../people/components/people-cloud.component';
@@ -55,7 +54,7 @@ import { TaskAssignmentFilterCloudComponent } from '../../task-assignment-filter
         MatSelectModule,
         MatInputModule,
         MatDatepickerModule,
-        MatIconModule,
+        IconModule,
         MatCheckboxModule,
         DateRangeFilterComponent,
         PeopleCloudComponent,