diff --git a/demo-shell/src/app/components/activiti/activiti.component.html b/demo-shell/src/app/components/activiti/activiti.component.html
index b323fc645a..d623ab6ba9 100644
--- a/demo-shell/src/app/components/activiti/activiti.component.html
+++ b/demo-shell/src/app/components/activiti/activiti.component.html
@@ -66,7 +66,7 @@
                                            [taskId]="currentTaskId"
                                            [fieldValidators]="fieldValidators"
                                            (formCompleted)="onFormCompleted($event)"
-                                           (formContentClicked)="onFormContentClick($event)"
+                                           (formContentClicked)="onContentClick($event)"
                                            (taskCreated)="onTaskCreated($event)"
                                            (assignTask)="onAssignTask()"
                                            (taskDeleted)="onTaskDeleted($event)">
@@ -86,7 +86,8 @@
                     <mat-card>
                         <mat-card-content>
                             <adf-task-attachment-list
-                                [taskId]="currentTaskId">
+                                [taskId]="currentTaskId"
+                                (attachmentClick)="onContentClick($event)">
                             </adf-task-attachment-list>
                         </mat-card-content>
                     </mat-card>
@@ -172,10 +173,10 @@
                         <hr>
                     </div>
                     <mat-card>
-
                         <mat-card-content>
                             <adf-process-attachment-list
-                                [processInstanceId]="currentProcessInstanceId">
+                                [processInstanceId]="currentProcessInstanceId"
+                                (attachmentClick)="onContentClick($event)">
                             </adf-process-attachment-list>
                         </mat-card-content>
                     </mat-card>
diff --git a/demo-shell/src/app/components/activiti/activiti.component.ts b/demo-shell/src/app/components/activiti/activiti.component.ts
index 64b1bf8287..ace8ce4e13 100644
--- a/demo-shell/src/app/components/activiti/activiti.component.ts
+++ b/demo-shell/src/app/components/activiti/activiti.component.ts
@@ -388,7 +388,7 @@ export class ActivitiComponent implements AfterViewInit, OnDestroy, OnInit {
         }
     }
 
-    onFormContentClick(content: any): void {
+    onContentClick(content: any): void {
         this.fileShowed = true;
         this.content = content.contentBlob;
         this.contentName = content.name;
diff --git a/lib/process-services/attachment/process-attachment-list.component.html b/lib/process-services/attachment/process-attachment-list.component.html
index ed072cf7ca..456d650759 100644
--- a/lib/process-services/attachment/process-attachment-list.component.html
+++ b/lib/process-services/attachment/process-attachment-list.component.html
@@ -13,7 +13,7 @@
     </adf-empty-list>
 
     <data-columns>
-        <data-column key="icon" type="icon" srTitle="Thumbnail" [sortable]="false"></data-column>
+        <data-column key="icon" type="image" srTitle="ADF_PROCESS_LIST.PROPERTIES.THUMBNAIL" [sortable]="false"></data-column>
         <data-column key="name" type="text" title="{{'ADF_PROCESS_LIST.PROPERTIES.NAME' | translate}}" class="full-width ellipsis-cell" [sortable]="true"></data-column>
         <data-column key="created" type="date" format="shortDate" title="{{'ADF_PROCESS_LIST.PROPERTIES.CREATED' | translate}}"></data-column>
     </data-columns>
diff --git a/lib/process-services/attachment/task-attachment-list.component.html b/lib/process-services/attachment/task-attachment-list.component.html
index 2188fbbc14..fc3ab365b7 100644
--- a/lib/process-services/attachment/task-attachment-list.component.html
+++ b/lib/process-services/attachment/task-attachment-list.component.html
@@ -11,7 +11,7 @@
         </div>
     </adf-empty-list>
     <data-columns>
-        <data-column key="icon" type="icon" srTitle="ADF_TASK_LIST.PROPERTIES.THUMBNAIL" [sortable]="false"></data-column>
+        <data-column key="icon" type="image" srTitle="ADF_TASK_LIST.PROPERTIES.THUMBNAIL" [sortable]="false"></data-column>
         <data-column key="name" type="text" title="ADF_TASK_LIST.PROPERTIES.NAME" class="full-width ellipsis-cell" [sortable]="true"></data-column>
         <data-column key="created" type="date" format="shortDate" title="ADF_TASK_LIST.PROPERTIES.CREATED"></data-column>
     </data-columns>
diff --git a/lib/process-services/i18n/en.json b/lib/process-services/i18n/en.json
index db54c53469..31950e7ad7 100644
--- a/lib/process-services/i18n/en.json
+++ b/lib/process-services/i18n/en.json
@@ -176,6 +176,7 @@
     "PROPERTIES": {
       "PROCESS_NAME": "Process",
       "NAME": "Name",
+      "THUMBNAIL": "Thumbnail",
       "STATUS": "Status",
       "DUE_DATE": "Due Date",
       "DUE_DATE_DEFAULT": "No date",