diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..c57d0b4c243f45eed8e04603e29c073fedc79f16
--- /dev/null
+++ b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.html
@@ -0,0 +1,24 @@
+<span
+  id="request-status-badge-complete"
+  class="badge badge-pill badge-success py-2"
+  *ngIf="capabilityRequest.state === 'Complete'"
+  ><span id="request-status-badge-txt-complete">{{ capabilityRequest.state.toUpperCase() }}</span>
+</span>
+<span
+  id="request-status-badge-running"
+  class="badge badge-pill badge-primary py-2"
+  *ngIf="capabilityRequest.state === 'Submitted'"
+  ><span id="request-status-badge-txt-running">{{ capabilityRequest.state.toUpperCase() }}</span>
+</span>
+<span
+  id="request-status-badge-ready"
+  class="badge badge-pill badge-secondary py-2"
+  *ngIf="capabilityRequest.state === 'Created'"
+  ><span id="request-status-badge-txt-ready">{{ capabilityRequest.state.toUpperCase() }}</span>
+</span>
+<span
+  id="request-status-badge-failed"
+  class="badge badge-pill badge-danger py-2"
+  *ngIf="capabilityRequest.state === 'Failed'"
+  ><span id="request-status-badge-txt-failed">{{ capabilityRequest.state.toUpperCase() }}</span>
+</span>
diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.scss b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.scss
similarity index 100%
rename from apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.scss
rename to apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.scss
diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.spec.ts b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.spec.ts
similarity index 100%
rename from apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.spec.ts
rename to apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.spec.ts
diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.ts b/apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.ts
similarity index 100%
rename from apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.ts
rename to apps/web/src/app/workspaces/components/capability-request/components/status-badges/status-badge.component.ts
diff --git a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.html b/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.html
deleted file mode 100644
index ca37d17750f5988807795e3cc89393b85d2d05eb..0000000000000000000000000000000000000000
--- a/apps/web/src/app/workspaces/components/capability-request/components/status-buttons/status-badge.component.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<span
-  id="request-status-badge-complete"
-  class="badge badge-pill badge-success py-2"
-  *ngIf="capabilityRequest.state === 'Complete'"
-  ><span class="fas fa-check"></span
-  ><span id="request-status-badge-txt-complete" class="pl-2">{{
-    capabilityRequest.state.toUpperCase()
-  }}</span>
-</span>
-<span
-  id="request-status-badge-running"
-  class="badge badge-pill badge-primary py-2"
-  *ngIf="capabilityRequest.state === 'Submitted'"
-  ><span class="fas fa-play"></span
-  ><span id="request-status-badge-txt-running" class="pl-2">{{
-    capabilityRequest.state.toUpperCase()
-  }}</span>
-</span>
-<span
-  id="request-status-badge-ready"
-  class="badge badge-pill badge-secondary py-2"
-  *ngIf="capabilityRequest.state === 'Created'"
-  ><span class="fas fa-dot-circle"></span
-  ><span id="request-status-badge-txt-ready" class="pl-2">{{
-    capabilityRequest.state.toUpperCase()
-  }}</span>
-</span>
-<span
-  id="request-status-badge-failed"
-  class="badge badge-pill badge-danger py-2"
-  *ngIf="capabilityRequest.state === 'Failed'"
-  ><span class="fas fa-times"></span
-  ><span id="request-status-badge-txt-failed" class="pl-2">{{
-    capabilityRequest.state.toUpperCase()
-  }}</span>
-</span>