diff --git a/e2e/process-services/pages/task-filters-demo.page.ts b/e2e/process-services/pages/task-filters-demo.page.ts
index 91d2d747617..875f7a5001d 100644
--- a/e2e/process-services/pages/task-filters-demo.page.ts
+++ b/e2e/process-services/pages/task-filters-demo.page.ts
@@ -43,7 +43,7 @@ export class TaskFiltersDemoPage {
         return new TaskFiltersPage(this.involvedTask);
     }
 
-    customTaskFilter(filterName: string): TaskFiltersPage {
+      customTaskFilter(filterName: string): TaskFiltersPage {
         return new TaskFiltersPage($(`button[data-automation-id="${filterName}_filter"]`));
     }
 
diff --git a/e2e/process-services/pages/tasks-list.page.ts b/e2e/process-services/pages/tasks-list.page.ts
index d7a8411ea45..5d34a40ddd3 100644
--- a/e2e/process-services/pages/tasks-list.page.ts
+++ b/e2e/process-services/pages/tasks-list.page.ts
@@ -21,6 +21,8 @@ import { browser, $, $$ } from 'protractor';
 export class TasksListPage {
 
     taskList = $('adf-tasklist');
+    selectedTab = $('[data-automation-id="navigation-bar"] .mdc-tab--active .mdc-tab__text-label');
+    taskTab = $$('[data-automation-id="navigation-bar"] .mdc-tab__text-label').first();
     noTasksFound = $$('.adf-empty-content__title').first();
     dataTable = new DataTableComponentPage(this.taskList);
 
@@ -61,4 +63,11 @@ export class TasksListPage {
         return BrowserActions.getText(this.noTasksFound);
     }
 
+    async selectTaskTab() {
+        const currentTab = await BrowserActions.getText(this.selectedTab);
+        if(currentTab && currentTab.toLowerCase().trim() !== 'tasks') {
+            await BrowserActions.click(this.taskTab);
+        }
+    }
+
 }
diff --git a/e2e/process-services/tasks/task-filters-sorting.e2e.ts b/e2e/process-services/tasks/task-filters-sorting.e2e.ts
index bb15df7f5cb..09844dbc148 100644
--- a/e2e/process-services/tasks/task-filters-sorting.e2e.ts
+++ b/e2e/process-services/tasks/task-filters-sorting.e2e.ts
@@ -95,6 +95,7 @@ describe('Task Filters Sorting', () => {
         await userFiltersUtil.createUserTaskFilter(newFilter);
 
         await browser.refresh();
+        await tasksListPage.selectTaskTab();
         await taskFiltersDemoPage.customTaskFilter(newFilter.name).clickTaskFilter();
 
         await expect(await tasksListPage.getDataTable().contentInPosition(1)).toBe(tasks[2].name);
diff --git a/lib/content-services/src/lib/social/rating.component.scss b/lib/content-services/src/lib/social/rating.component.scss
index 68761316c84..5c094c75d28 100644
--- a/lib/content-services/src/lib/social/rating.component.scss
+++ b/lib/content-services/src/lib/social/rating.component.scss
@@ -24,7 +24,7 @@ $adf-average-star-color: #808080;
         width: 25px;
 
         /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-        .mat-list-item-content {
+        .mdc-list-item__content {
             padding: 0 !important;
         }
 
diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss
index a96bbfdbe57..c8aec160f63 100644
--- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss
+++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss
@@ -94,7 +94,7 @@ adf-tags-creator {
                 }
 
                 /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-                .mat-list-item-content-reverse {
+                .mdc-list-item__content-reverse {
                     padding: 0 6px;
 
                     .mat-pseudo-checkbox {
diff --git a/lib/content-services/src/lib/version-manager/version-list.component.scss b/lib/content-services/src/lib/version-manager/version-list.component.scss
index 138557796e0..abeac7f33d5 100644
--- a/lib/content-services/src/lib/version-manager/version-list.component.scss
+++ b/lib/content-services/src/lib/version-manager/version-list.component.scss
@@ -1,7 +1,15 @@
 .adf-version-list {
-    /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-    .mat-list-item-content {
+    .mdc-list-item__content {
         border-bottom: 1px solid #d8d8d8;
+
+        span {
+            display: flex;
+            align-items: center;
+        }
+
+        p.mat-line {
+            display: flex;
+        }
     }
 
     &-item-version {
diff --git a/lib/content-services/src/lib/version-manager/version-manager.component.scss b/lib/content-services/src/lib/version-manager/version-manager.component.scss
index dc229be552f..2e918087512 100644
--- a/lib/content-services/src/lib/version-manager/version-manager.component.scss
+++ b/lib/content-services/src/lib/version-manager/version-manager.component.scss
@@ -1,16 +1,15 @@
 adf-version-manager {
-    .mat-mdc-list .mat-3-line {
+    .mat-mdc-list {
         height: auto !important;
         width: 100% !important;
     }
 
-    /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-    .mat-list-item-content {
+    .mdc-list-item__content {
         padding: 16px 0 !important;
     }
 }
 
-.adf-version-list-item-comment.mat-line {
+.adf-version-list-item-comment .mat-line {
     height: 100%;
     word-break: break-all;
     white-space: unset !important;
diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.scss b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.scss
index e87e3de87e2..a5b34019916 100644
--- a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.scss
+++ b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.scss
@@ -14,7 +14,7 @@
     }
 
     /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-    .mat-nav-list .mat-mdc-list-item .mat-list-item-content {
+    .mat-nav-list .mat-mdc-list-item .mdc-list-item__content {
         line-height: 48px;
     }
 
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.scss b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.scss
index 53023b26d91..12da81e3652 100644
--- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.scss
+++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.scss
@@ -98,7 +98,7 @@
 
     &-attach-files-row {
         /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-        div.mat-list-item-content {
+        div.mdc-list-item__content {
             cursor: pointer;
         }
 
@@ -109,7 +109,7 @@
 
     &-attach-selected-file-row {
         /* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */
-        div.mat-list-item-content {
+        div.mdc-list-item__content {
             .adf-datatable-selected {
                 color: var(--theme-primary-color);
                 padding-right: 6px;
diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.html b/lib/process-services/src/lib/task-list/components/start-task.component.html
index 5de418d095f..27bc5d5b3b4 100644
--- a/lib/process-services/src/lib/task-list/components/start-task.component.html
+++ b/lib/process-services/src/lib/task-list/components/start-task.component.html
@@ -33,7 +33,7 @@
                     </mat-error>
                 </mat-form-field>
             </div>
-            <div class="input-row">
+            <div class="adf-input-row">
                 <mat-form-field>
                     <input
                         matInput
diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.scss b/lib/process-services/src/lib/task-list/components/start-task.component.scss
index b176f081f0a..a69171f0ca3 100644
--- a/lib/process-services/src/lib/task-list/components/start-task.component.scss
+++ b/lib/process-services/src/lib/task-list/components/start-task.component.scss
@@ -20,7 +20,8 @@
         flex-direction: column;
         display: flex;
 
-        .adf-task-name, .adf-task-description, .input-row {
+        .adf-task-name,
+        .adf-task-description {
             display: flex;
             margin-bottom: 10px;
 
@@ -29,7 +30,7 @@
             }
         }
 
-        .input-row {
+        .adf-input-row {
             @include layout-bp(lt-md) {
                 flex-direction: column;
             }
@@ -94,7 +95,6 @@ adf-start-task {
     }
 
     .adf {
-        /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
         &-start-task-input-container .mat-mdc-text-field-wrapper {
             padding-top: 8px;
         }
diff --git a/lib/testing/src/lib/protractor/core/pages/material/toggle.page.ts b/lib/testing/src/lib/protractor/core/pages/material/toggle.page.ts
index f94824b1a62..c6bb17abf25 100644
--- a/lib/testing/src/lib/protractor/core/pages/material/toggle.page.ts
+++ b/lib/testing/src/lib/protractor/core/pages/material/toggle.page.ts
@@ -22,7 +22,7 @@ export class TogglePage {
 
     async enableToggle(toggle: ElementFinder): Promise<void> {
         const check = await BrowserActions.getAttribute(toggle, 'class');
-        if (check.indexOf('mdc-switch--unselected') < 0) {
+        if (check.indexOf('mat-mdc-slide-toggle-checked') < 0) {
             await BrowserActions.click(toggle);
         }
     }