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 7a437f7add..87b245acd1 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'" matListItemLine class="adf-file-uploading-row__type">
+    <mat-icon *ngIf="mimeType === 'default'" matListItemIcon class="adf-file-uploading-row__type">
         insert_drive_file
     </mat-icon>
 
@@ -12,10 +12,10 @@
     </span>
 
     <span *ngIf="isUploadVersion()" class="adf-file-uploading-row__version" tabindex="0" >
-        <mat-chip-option color="primary"
+        <mat-chip color="primary"
             [attr.aria-label]="'ADF_FILE_UPLOAD.ARIA-LABEL.VERSION' | translate: { version:  versionNumber }"
-            [title]="'version' + versionNumber" [disabled]="true"
-        >{{ versionNumber }}</mat-chip-option>
+            [title]="'version' + versionNumber"
+        >{{ versionNumber }}</mat-chip>
     </span>
 
     <div
@@ -61,7 +61,7 @@
         [attr.aria-label]="'ADF_FILE_UPLOAD.STATUS.FILE_DONE_STATUS' | translate"
         >
         <mat-icon
-            matListItemLine
+            matListItemIcon
             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 matListItemLine
+        <mat-icon matListItemIcon
             [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/upload/components/file-uploading-list-row.component.scss b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.scss
index df0d821b26..fb16886a98 100644
--- a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.scss
+++ b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.scss
@@ -32,6 +32,7 @@ adf-file-uploading-list-row:not(:first-child) {
         line-height: 40px;
         height: 40px;
         align-items: center;
+        padding: 0 12px;
     }
 
     &__group--toggle {
@@ -48,6 +49,7 @@ adf-file-uploading-list-row:not(:first-child) {
 
     &__status--error {
         color: var(--theme-warn-color);
+        padding: 0 12px;
     }
 
     &__action--cancel {