diff --git a/docs/content-services/components/search.component.md b/docs/content-services/components/search.component.md
index f6fa7cc0a4..2751d776cb 100644
--- a/docs/content-services/components/search.component.md
+++ b/docs/content-services/components/search.component.md
@@ -96,7 +96,7 @@ However, you can use a more complex template if necessary:
                 class="adf-search-autocomplete-item"
                 (click)="elementClicked(item)"
                 (keyup.enter)="elementClicked(item)">
-                <mat-icon mat-list-icon>
+                <mat-icon matListItemLine>
                     <img [src]="getMimeTypeIcon(item)" />
                 </mat-icon>
                     <h4 mat-line id="result_name_{{idx}}"
diff --git a/e2e/search/search-component.e2e.ts b/e2e/search/search-component.e2e.ts
index 0c1ad7eff4..8d1a943139 100644
--- a/e2e/search/search-component.e2e.ts
+++ b/e2e/search/search-component.e2e.ts
@@ -157,7 +157,7 @@ describe('Search component - Search Bar', () => {
 
     it('[C260256] Should display file/folder in search suggestion when typing first characters', async () => {
         await openSearchBar();
-        await searchBarPage.enterTextAndPressEnter(firstFolderModel.shortName);
+        await searchBarPage.enterText(firstFolderModel.shortName);
 
         await searchBarPage.resultTableContainsRow(firstFolderModel.name);
 
diff --git a/lib/content-services/src/lib/search/components/search-control.component.html b/lib/content-services/src/lib/search/components/search-control.component.html
index 587a5dbc29..71b072eb62 100644
--- a/lib/content-services/src/lib/search/components/search-control.component.html
+++ b/lib/content-services/src/lib/search/components/search-control.component.html
@@ -30,20 +30,20 @@
                     (keyup.enter)="elementClicked(item)"
                     (touchend)="elementClicked(item)">
                     <!-- This is a comment -->
-                    <mat-icon mat-list-icon>
+                    <mat-icon matListItemLine>
                         <img [alt]="getMimeType(item)" [src]="getMimeTypeIcon(item)"/>
                     </mat-icon>
-                    <h4 mat-line id="result_name_{{idx}}"
+                    <h4 matListItemTitle id="result_name_{{idx}}"
                         *ngIf="highlight; else elseBlock"
                         class="adf-search-fixed-text"
                         [innerHtml]="item.entry.name | highlight: searchTerm">
                         {{ item?.entry.name }}
                     </h4>
                     <ng-template #elseBlock>
-                        <h4 class="adf-search-fixed-text" mat-line id="result_name_{{idx}}"
+                        <h4 class="adf-search-fixed-text" matListItemTitle id="result_name_{{idx}}"
                             [innerHtml]="item.entry.name"></h4>
                     </ng-template>
-                    <p mat-line class="adf-search-fixed-text"> {{item?.entry.createdByUser.displayName}} </p>
+                    <p matListItemLine class="adf-search-fixed-text"> {{item?.entry.createdByUser.displayName}} </p>
                 </mat-list-item>
                 <mat-list-item id="search_no_result"
                             data-automation-id="search_no_result_found"
@@ -53,7 +53,7 @@
                         *ngIf="isNoSearchTemplatePresent() else defaultNoResult">
                     </ng-content>
                     <ng-template #defaultNoResult>
-                        <p mat-line class="adf-search-fixed-text">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm:
+                        <p matListItemLine class="adf-search-fixed-text">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm:
                             searchTerm} }}</p>
                     </ng-template>
                 </mat-list-item>
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 89628d342a..dfb6fb5bbc 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
@@ -17,8 +17,8 @@
             [attr.aria-expanded]="!isDialogMinimized"
             (click)="toggleMinimized()">
             <mat-icon
+                matListItemLine
                 class="adf-upload-dialog__header-button-icon"
-                mat-list-icon
                 title="{{ (isDialogMinimized ? 'ADF_FILE_UPLOAD.BUTTON.MAXIMIZE': 'ADF_FILE_UPLOAD.BUTTON.MINIMIZE') | translate }}">
                     {{ isDialogMinimized ? 'keyboard_arrow_up' : 'keyboard_arrow_down' }}
             </mat-icon>
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 81f6709f4c..ee92b8b129 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,5 +1,5 @@
 <div class="adf-file-uploading-row">
-    <mat-icon *ngIf="mimeType === 'default'" mat-list-icon class="adf-file-uploading-row__type">
+    <mat-icon *ngIf="mimeType === 'default'" matListItemLine class="adf-file-uploading-row__type">
         insert_drive_file
     </mat-icon>
 
@@ -61,7 +61,7 @@
         [attr.aria-label]="'ADF_FILE_UPLOAD.STATUS.FILE_DONE_STATUS' | translate"
         >
         <mat-icon
-            mat-list-icon
+            matListItemLine
             class="adf-file-uploading-row__status--done">
             check_circle
         </mat-icon>
@@ -94,7 +94,7 @@
         role="status"
         *ngIf="isUploadError()"
         class="adf-file-uploading-row__block adf-file-uploading-row__status--error">
-        <mat-icon mat-list-icon
+        <mat-icon matListItemLine
             [attr.aria-label]="'ADF_FILE_UPLOAD.ARIA-LABEL.UPLOAD_FILE_ERROR' | translate: { error: file.errorCode | adfFileUploadError }"
             [title]="file.errorCode | adfFileUploadError">
             report_problem
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 572b7946b7..5f3970abb0 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
@@ -2,18 +2,18 @@
                   color="accent"></mat-progress-bar>
 <mat-list class="adf-version-list adf-version-list-element" [hidden]="isLoading">
     <cdk-virtual-scroll-viewport #viewport itemSize="88" class="adf-version-list-viewport">
-        <mat-list-item class="adf-version-list-item"
-                       *cdkVirtualFor="let version of versionsDataSource; let idx = index; let latestVersion = first">
-            <mat-icon mat-list-icon>insert_drive_file</mat-icon>
-            <p mat-line class="adf-version-list-item-line adf-version-list-item-name"
+        <mat-list-item class="adf-version-list-item" *cdkVirtualFor="let version of versionsDataSource; let idx = index; let latestVersion = first">
+            <mat-icon matListItemLine>insert_drive_file</mat-icon>
+            <p matListItemLine class="adf-version-list-item-line adf-version-list-item-name"
                [id]="'adf-version-list-item-name-' + version.entry.id">{{ version.entry.name }}</p>
-            <p mat-line>
+            <p matListItemLine>
                 <span class="adf-version-list-item-line adf-version-list-item-version"
                       [id]="'adf-version-list-item-version-' + version.entry.id">{{ version.entry.id }}</span> -
                 <span class="adf-version-list-item-line adf-version-list-item-date"
                       [id]="'adf-version-list-item-date-' + version.entry.id">{{ version.entry.modifiedAt | date }}</span>
             </p>
-            <p mat-line
+            <p
+                matListItemLine
                [id]="'adf-version-list-item-comment-' + version.entry.id"
                class="adf-version-list-item-comment"
                *ngIf="showComments"
diff --git a/lib/core/src/lib/notifications/components/notification-history.component.html b/lib/core/src/lib/notifications/components/notification-history.component.html
index 861767a6f2..2132b7dfa6 100644
--- a/lib/core/src/lib/notifications/components/notification-history.component.html
+++ b/lib/core/src/lib/notifications/components/notification-history.component.html
@@ -44,26 +44,20 @@
                              matListAvatar
                              [outerHTML]="notification.initiator | usernameInitials : 'adf-notification-initiator-pic'"></div>
                         <ng-template #no_avatar>
-                            <mat-icon mat-list-icon
-                                      class="adf-notification-history-menu-initiator">{{ notification.icon }}
-                            </mat-icon>
+                            <mat-icon matListItemLine
+                                      class="adf-notification-history-menu-initiator">{{notification.icon}}</mat-icon>
                         </ng-template>
                         <p class="adf-notification-history-menu-text adf-notification-history-menu-message"
                            *ngFor="let message of notification.messages"
-                           mat-line
-                           [matTooltip]="message"
-                           matTooltipShowDelay="{{ 1000 }}">
-                            {{ message }}
-                        </p>
-                        <p class="adf-notification-history-menu-text adf-notification-history-menu-date" mat-line>
-                            {{ notification.datetime | adfTimeAgo }}
-                        </p>
+                           matListItemLine [matTooltip]="message" matTooltipShowDelay="1000">{{ message }}</p>
+                        <p class="adf-notification-history-menu-text adf-notification-history-menu-date"
+                           matListItemLine> {{notification.datetime | adfTimeAgo}} </p>
                     </mat-list-item>
                 </ng-container>
                 <ng-template #empty_list_template>
                     <mat-list-item id="adf-notification-history-component-no-message"
                                    class="adf-notification-history-menu-no-message">
-                        <p mat-line>{{ 'NOTIFICATIONS.NO_MESSAGE' | translate }}</p>
+                        <p matListItemLine>{{ 'NOTIFICATIONS.NO_MESSAGE' | translate }}</p>
                     </mat-list-item>
                 </ng-template>
             </mat-list>
diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.html b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.html
index 4a2b9fc593..73707c2730 100644
--- a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.html
+++ b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.html
@@ -6,7 +6,7 @@
             *ngFor="let report of reports; let idx = index"
             [class.adf-active]="currentReport === report">
             <span [attr.id]="'report-list-' + idx" class="adf-activiti-filters__label">
-                <mat-icon mat-list-icon
+                <mat-icon matListItemLine
                     [attr.data-automation-id]="report.name + '_filter'"
                     class="adf-activiti-filters__entry-icon">assignment</mat-icon>
                 <span class="adf-text">{{report.name}}</span>
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.html b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.html
index 8567d4d588..822d4c2da8 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.html
@@ -2,17 +2,16 @@
     <table mat-table [dataSource]="uploadedFiles" class="adf-properties-table adf-file-properties-table mat-elevation-z0" *ngIf="hasFile">
         <ng-container matColumnDef="icon">
             <th mat-header-cell *matHeaderCellDef></th>
-            <td mat-cell class="adf-file-properties-table-cell" *matCellDef="let element">
-                <mat-icon mat-list-icon class="adf-datatable-selected"
-                          *ngIf="selectedNode && element.id === selectedNode.id" (click)="onRowClicked(element)">
+            <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>
-                <img mat-list-icon class="adf-attach-widget__icon"
-                     *ngIf="!selectedNode || element.id !== selectedNode.id" [id]="'file-'+element?.id+'-icon'"
-                     (click)="onRowClicked(element)"
-                     (keyup.enter)="onRowClicked(element)"
-                     [src]="element.content ? getIcon(element.content.mimeType) : getIcon(element['mimeType'])"
-                     [alt]="mimeTypeIcon" role="button" tabindex="0" />
+                <img matListItemLine class="adf-attach-widget__icon"
+                    *ngIf="!selectedNode || element.id !== selectedNode.id" [id]="'file-'+element?.id+'-icon'"
+                    (click)="onRowClicked(element)"
+                    [src]="element.content ? getIcon(element.content.mimeType) : getIcon(element['mimeType'])"
+                    [alt]="mimeTypeIcon" role="button" tabindex="0" />
             </td>
         </ng-container>
 
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/upload-cloud.widget.html b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/upload-cloud.widget.html
index b753875a45..da6b5d0091 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/upload-cloud.widget.html
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/upload-cloud.widget.html
@@ -6,7 +6,7 @@
         <div>
             <mat-list *ngIf="hasFile">
                 <mat-list-item class="adf-upload-files-row" *ngFor="let file of uploadedFiles">
-                    <img mat-list-icon class="adf-upload-widget__icon" [id]="'file-'+file.id+'-icon'"
+                    <img matListItemLine class="adf-upload-widget__icon" [id]="'file-'+file.id+'-icon'"
                         [src]="getIcon(file.content.mimeType)" [alt]="mimeTypeIcon" (click)="fileClicked(file)"
                         (keyup.enter)="fileClicked(file)" role="button" tabindex="0" />
                     <span class="adf-upload-widget__button" matLine id="{{'file-'+file.id}}" (click)="fileClicked(file)" (keyup.enter)="fileClicked(file)"
diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.html b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.html
index 2920c72171..c1112d1fba 100644
--- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.html
+++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.html
@@ -56,35 +56,19 @@
 <div data-automation-id="adf-attach-widget-readonly-list">
     <mat-list *ngIf="hasFile">
         <mat-list-item class="adf-attach-files-row" *ngFor="let file of field.value">
-            <img
-                mat-list-icon
-                class="adf-attach-widget__icon"
-                [id]="'file-' + file.id + '-icon'"
-                [src]="file.content ? getIcon(file.content.mimeType) : getIcon(file.mimeType)"
-                [alt]="mimeTypeIcon"
-                (click)="onAttachFileClicked(file)"
-                (keyup.enter)="onAttachFileClicked(file)"
-                [attr.aria-label]="file.name"
-                role="button"
-                tabindex="0"
-            />
-            <span
-                matLine
-                id="{{ 'file-' + file.id }}"
-                (click)="onAttachFileClicked(file)"
-                [matTooltip]="file.name"
-                (keyup.enter)="onAttachFileClicked(file)"
-                tabindex="0"
-                role="button"
-                class="adf-file"
-                >{{ file.name }}</span
-            >
-            <button
-                id="{{ 'file-' + file.id + '-option-menu' }}"
-                mat-icon-button
-                [matMenuTriggerFor]="fileActionMenu"
-                [attr.aria-label]="'ADF_PROCESS_LIST.DETAILS.BUTTON.FILE_OPTION_MENU' | translate"
-            >
+            <img matListItemLine class="adf-attach-widget__icon"
+                 [id]="'file-'+file.id+'-icon'"
+                 [src]="file.content ? getIcon(file.content.mimeType) : getIcon(file.mimeType)"
+                 [alt]="mimeTypeIcon"
+                 (click)="onAttachFileClicked(file)"
+                 (keyup.enter)="onAttachFileClicked(file)"
+                 role="img"
+                 [attr.aria-label]="file.name"
+                 tabindex="0"/>
+            <span matLine id="{{'file-'+file.id}}" (click)="onAttachFileClicked(file)" [matTooltip]="file.name" (keyup.enter)="onAttachFileClicked(file)"
+                  tabindex="0" class="adf-file">{{file.name}}</span>
+            <button id="{{'file-'+file.id+'-option-menu'}}" mat-icon-button [matMenuTriggerFor]="fileActionMenu"
+                    [attr.aria-label]="'ADF_PROCESS_LIST.DETAILS.BUTTON.FILE_OPTION_MENU' | translate">
                 <mat-icon>more_vert</mat-icon>
             </button>
             <mat-menu #fileActionMenu="matMenu" xPosition="before">
diff --git a/lib/process-services/src/lib/form/widgets/upload/upload.widget.html b/lib/process-services/src/lib/form/widgets/upload/upload.widget.html
index 34033b0f6d..96d10586e8 100644
--- a/lib/process-services/src/lib/form/widgets/upload/upload.widget.html
+++ b/lib/process-services/src/lib/form/widgets/upload/upload.widget.html
@@ -4,34 +4,18 @@
         <div>
             <mat-list *ngIf="hasFile">
                 <mat-list-item class="adf-upload-files-row" *ngFor="let file of field.value">
-                    <img
-                        mat-list-icon
-                        class="adf-upload-widget__icon"
-                        [id]="'file-'+file.id+'-icon'"
-                        [src]="getIcon(file.mimeType)"
-                        [alt]="mimeTypeIcon"
-                        (click)="fileClicked(file)"
-                        (keyup.enter)="fileClicked(file)"
-                        tabindex="0"
-                        role="button"
-                    />
-                    <span
-                        matLine
-                        id="{{'file-'+file.id}}"
-                        (click)="fileClicked(file)"
-                        (keyup.enter)="fileClicked(file)"
-                        role="button"
-                        tabindex="0"
-                        class="adf-file"
-                        >{{file.name}}</span
-                    >
-                    <button
-                        *ngIf="!field.readOnly"
-                        mat-icon-button
-                        [id]="'file-'+file.id+'-remove'"
-                        (click)="removeFile(file);"
-                        (keyup.enter)="removeFile(file);"
-                    >
+                    <img matListItemLine class="adf-upload-widget__icon"
+                         [id]="'file-'+file.id+'-icon'"
+                         [src]="getIcon(file.mimeType)"
+                         [alt]="mimeTypeIcon"
+                         (click)="fileClicked(file)"
+                         (keyup.enter)="fileClicked(file)"
+                         role="button"
+                         tabindex="0"/>
+                    <span matLine id="{{'file-'+file.id}}" (click)="fileClicked(file)" (keyup.enter)="fileClicked(file)"
+                          role="button" tabindex="0" class="adf-file">{{file.name}}</span>
+                    <button *ngIf="!field.readOnly" mat-icon-button [id]="'file-'+file.id+'-remove'"
+                            (click)="removeFile(file);" (keyup.enter)="removeFile(file);">
                         <mat-icon class="mat-24">highlight_off</mat-icon>
                     </button>
                 </mat-list-item>
diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html
index 1149c07fd1..5c6ff84289 100644
--- a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html
+++ b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.html
@@ -14,7 +14,7 @@
 <div class="menu-container" *ngIf="activeTasks?.length > 0" data-automation-id="active-tasks">
     <mat-list>
         <mat-list-item class="process-tasks__task-item" *ngFor="let task of activeTasks" (click)="clickTask(task)">
-                <mat-icon mat-list-icon>assignment</mat-icon>
+                <mat-icon matListItemLine>assignment</mat-icon>
                 <h3 matLine>{{task.name || 'Nameless task'}}</h3>
                 <span matLine>
                     {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }}
@@ -36,7 +36,7 @@
     <div class="menu-container" data-automation-id="start-form">
         <mat-list>
             <mat-list-item class="process-tasks__task-item" (click)="clickStartTask()">
-                <mat-icon mat-list-icon>assignment</mat-icon>
+                <mat-icon matListItemLine>assignment</mat-icon>
                 <h3 matLine>{{ 'ADF_PROCESS_LIST.DETAILS.LABELS.START_FORM'|translate }}</h3>
                 <span matLine>
                     {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(processInstanceDetails.startedBy), created: getFormatDate(processInstanceDetails.started, 'mediumDate') } }}
@@ -56,7 +56,7 @@
 <div class="menu-container" *ngIf="completedTasks?.length > 0" data-automation-id="completed-tasks">
     <mat-list>
         <mat-list-item class="process-tasks__task-item" *ngFor="let task of completedTasks" (click)="clickTask(task)">
-            <mat-icon mat-list-icon>assignment</mat-icon>
+            <mat-icon matListItemLine>assignment</mat-icon>
             <h3 matLine>{{task.name || 'Nameless task'}}</h3>
             <span matLine>
                 {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }}