diff --git a/packages/core-components/src/components/Status/Status.tsx b/packages/core-components/src/components/Status/Status.tsx
index f3bdf4e0f2..ffe01cdb1b 100644
--- a/packages/core-components/src/components/Status/Status.tsx
+++ b/packages/core-components/src/components/Status/Status.tsx
@@ -19,11 +19,11 @@ import Typography from '@material-ui/core/Typography';
 import classNames from 'classnames';
 import React, { PropsWithChildren } from 'react';
 
-import CheckCircleIcon from '@material-ui/icons/CheckCircle';
+import CheckIcon from '@material-ui/icons/Check';
 import WarningIcon from '@material-ui/icons/Warning';
 import ErrorIcon from '@material-ui/icons/Error';
 import HighlightOffIcon from '@material-ui/icons/HighlightOff';
-import WatchLaterIcon from '@material-ui/icons/WatchLater';
+import ScheduleIcon from '@material-ui/icons/Schedule';
 import DirectionsRunIcon from '@material-ui/icons/DirectionsRun';
 
 export type StatusClassKey =
@@ -90,7 +90,7 @@ export function StatusOK(props: PropsWithChildren<{}>) {
       aria-label={!props.children ? 'Ok' : undefined}
       role={!props.children ? 'img' : undefined}
     >
-      <CheckCircleIcon style={{ fontSize: '1rem' }} />
+      <CheckIcon style={{ fontSize: '1rem' }} />
       <Typography component="span" {...props} />
     </div>
   );
@@ -132,7 +132,7 @@ export function StatusPending(props: PropsWithChildren<{}>) {
       aria-label={!props.children ? 'Pending' : undefined}
       role={!props.children ? 'img' : undefined}
     >
-      <WatchLaterIcon style={{ fontSize: '1rem' }} />
+      <ScheduleIcon style={{ fontSize: '1rem' }} />
       <Typography component="span" {...props} />
     </div>
   );
diff --git a/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.test.tsx b/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.test.tsx
index 0801a34b48..2a9f8f88e2 100644
--- a/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.test.tsx
+++ b/plugins/xcmetrics/src/components/StatusIcon/StatusIcon.test.tsx
@@ -24,19 +24,19 @@ describe('StatusIcon', () => {
     let rendered = await renderInTestApp(
       <StatusIcon buildStatus="succeeded" />,
     );
-    expect(rendered.getByLabelText('Status ok')).toBeInTheDocument();
+    expect(rendered.getByLabelText('Ok')).toBeInTheDocument();
 
     rendered = await renderInTestApp(<StatusIcon buildStatus="failed" />);
-    expect(rendered.getByLabelText('Status error')).toBeInTheDocument();
+    expect(rendered.getByLabelText('Error')).toBeInTheDocument();
 
     rendered = await renderInTestApp(<StatusIcon buildStatus="stopped" />);
-    expect(rendered.getByLabelText('Status warning')).toBeInTheDocument();
+    expect(rendered.getByLabelText('Warning')).toBeInTheDocument();
   });
 
   it('should render invalid statuses', async () => {
     const rendered = await renderInTestApp(
       <StatusIcon buildStatus={'invalid' as BuildStatus} />,
     );
-    expect(rendered.getByLabelText('Status aborted')).toBeInTheDocument();
+    expect(rendered.getByLabelText('Aborted')).toBeInTheDocument();
   });
 });