diff --git a/src/app/facility_manager/facility.application.component.html b/src/app/facility_manager/facility.application.component.html
index 27a1d266bb..16905252f6 100644
--- a/src/app/facility_manager/facility.application.component.html
+++ b/src/app/facility_manager/facility.application.component.html
@@ -923,40 +923,12 @@
 						<ng-container *ngFor="let application of applications_history">
 							<ng-container *ngIf="application?.project_application_date_submitted">
 								<tr>
-									<td>
-										<span
-											*ngIf="application?.project_application_openstack_project"
-											style="font-size: 20px"
-											class="project-openstack_plain_white_redbg"
-											data-toggle="tooltip"
-											title="This is an Openstack project"
-										>
-											<span class="path1"></span>
-											<span class="path2"></span>
-										</span>
-										<span
-											*ngIf="!application?.project_application_openstack_project"
-											style="font-size: 20px"
-											class="project-simpleVM_Logo_bluebg"
-											data-toggle="tooltip"
-											title="This is a Simple VM project"
-										>
-											<span class="path1"></span>
-											<span class="path2"></span>
-											<span class="path3"></span>
-											<span class="path4"></span>
-											<span class="path5"></span>
-										</span>
-										<span
-											style="margin-left: 12px"
-											class="badge badge-warning"
-											data-toggle="tooltip"
-											data-placement="auto"
-											title="This application uses sensitive data"
-											*ngIf="application?.project_application_person_related_data"
-											><span style="font-size: 15px"> <i class="fas fa-fingerprint"></i></span>
-										</span>
-									</td>
+      <td>
+                                            <app-application-badges
+                                                    [application]="application"></app-application-badges>
+
+
+                                        </td>
 									<td>{{ application?.project_application_name }}</td>
 									<td>{{ application?.project_application_shortname }}</td>
 									<td>{{ application?.project_application_date_submitted }}</td>