diff --git a/frontend/src/__mocks__/mockWorkloadK8sResource.ts b/frontend/src/__mocks__/mockWorkloadK8sResource.ts
index 48850e432d..4a108d1934 100644
--- a/frontend/src/__mocks__/mockWorkloadK8sResource.ts
+++ b/frontend/src/__mocks__/mockWorkloadK8sResource.ts
@@ -76,7 +76,7 @@ const mockWorkloadStatusConditions: Record<WorkloadStatusType, WorkloadCondition
       type: 'Evicted',
     },
   ],
-  Succeeded: [
+  Complete: [
     {
       lastTransitionTime: '2024-03-18T19:15:28Z',
       message: 'Quota reserved in ClusterQueue cluster-queue',
@@ -124,9 +124,9 @@ const mockWorkloadStatusConditions: Record<WorkloadStatusType, WorkloadCondition
   ],
 };
 
-const mockWorkloadEmptySucceedCondition: Record<WorkloadStatusType.Succeeded, WorkloadCondition[]> =
+const mockWorkloadEmptyCompleteCondition: Record<WorkloadStatusType.Complete, WorkloadCondition[]> =
   {
-    [WorkloadStatusType.Succeeded]: [
+    [WorkloadStatusType.Complete]: [
       {
         lastTransitionTime: '2024-03-18T19:15:28Z',
         message: 'Quota reserved in ClusterQueue cluster-queue',
@@ -164,7 +164,7 @@ export const mockWorkloadK8sResource = ({
   namespace = 'test-project',
   ownerKind = WorkloadOwnerType.Job,
   ownerName,
-  mockStatus = WorkloadStatusType.Succeeded,
+  mockStatus = WorkloadStatusType.Complete,
   podSets = [],
   mockStatusEmptyWorkload = false,
 }: MockResourceConfigType): WorkloadKind => ({
@@ -203,8 +203,8 @@ export const mockWorkloadK8sResource = ({
   },
   status: {
     conditions: mockStatus
-      ? mockStatusEmptyWorkload
-        ? mockWorkloadEmptySucceedCondition[WorkloadStatusType.Succeeded]
+      ? mockStatusEmptyWorkload && mockStatus === WorkloadStatusType.Complete
+        ? mockWorkloadEmptyCompleteCondition[WorkloadStatusType.Complete]
         : mockWorkloadStatusConditions[mockStatus]
       : [],
   },
diff --git a/frontend/src/components/DocCardBadges.tsx b/frontend/src/components/DocCardBadges.tsx
index 6836cb8d92..239b8fc3d1 100644
--- a/frontend/src/components/DocCardBadges.tsx
+++ b/frontend/src/components/DocCardBadges.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Label, LabelGroup, Tooltip } from '@patternfly/react-core';
-import { SyncAltIcon, CheckCircleIcon, ExclamationCircleIcon } from '@patternfly/react-icons';
+import { InProgressIcon, CheckCircleIcon, ExclamationCircleIcon } from '@patternfly/react-icons';
 import { QuickStartContext, QuickStartContextValues } from '@patternfly/quickstarts';
 import { OdhDocument, OdhDocumentType } from '#~/types';
 import { getQuickStartCompletionStatus, CompletionStatusEnum } from '#~/utilities/quickStartUtils';
@@ -45,17 +45,17 @@ const DocCardBadges: React.FC<DocCardBadgesProps> = ({ odhDoc }) => {
         </Label>
       ) : null}
       {completionStatus === CompletionStatusEnum.InProgress ? (
-        <Label variant="outline" color="purple" icon={<SyncAltIcon />}>
+        <Label variant="outline" status="info" icon={<InProgressIcon />}>
           In Progress
         </Label>
       ) : null}
       {completionStatus === CompletionStatusEnum.Success ? (
-        <Label variant="outline" color="green" icon={<CheckCircleIcon />}>
+        <Label variant="outline" status="success" icon={<CheckCircleIcon />}>
           Complete
         </Label>
       ) : null}
       {completionStatus === CompletionStatusEnum.Failed ? (
-        <Label variant="outline" color="red" icon={<ExclamationCircleIcon />}>
+        <Label variant="outline" status="danger" icon={<ExclamationCircleIcon />}>
           Failed
         </Label>
       ) : null}
diff --git a/frontend/src/components/OdhExploreCardTypeBadge.tsx b/frontend/src/components/OdhExploreCardTypeBadge.tsx
index e2951dc464..e29431a8e3 100644
--- a/frontend/src/components/OdhExploreCardTypeBadge.tsx
+++ b/frontend/src/components/OdhExploreCardTypeBadge.tsx
@@ -28,7 +28,7 @@ const OdhExploreCardTypeBadge: React.FC<OdhExploreCardTypeBadgeProps> = ({
 
   return (
     <Tooltip content={content}>
-      <Label className={isDisabled ? 'pf-m-disabled' : undefined} tabIndex={0} variant="outline">
+      <Label className={isDisabled ? 'pf-m-disabled' : undefined} tabIndex={0}>
         {category}
       </Label>
     </Tooltip>
diff --git a/frontend/src/components/__tests__/DocCardBadges.spec.tsx b/frontend/src/components/__tests__/DocCardBadges.spec.tsx
new file mode 100644
index 0000000000..dbbba8735c
--- /dev/null
+++ b/frontend/src/components/__tests__/DocCardBadges.spec.tsx
@@ -0,0 +1,91 @@
+import * as React from 'react';
+import { render, screen } from '@testing-library/react';
+import { QuickStartContext } from '@patternfly/quickstarts';
+import { OdhDocument, OdhDocumentType } from '#~/types';
+import { CompletionStatusEnum } from '#~/utilities/quickStartUtils';
+import DocCardBadges from '#~/components/DocCardBadges';
+
+jest.mock('#~/utilities/quickStartUtils', () => ({
+  ...jest.requireActual('#~/utilities/quickStartUtils'),
+  getQuickStartCompletionStatus: jest.fn(),
+}));
+
+const mockGetQuickStartCompletionStatus = jest.mocked(
+  jest.requireMock<typeof import('#~/utilities/quickStartUtils')>('#~/utilities/quickStartUtils')
+    .getQuickStartCompletionStatus,
+);
+
+const createDoc = (
+  type: OdhDocumentType = OdhDocumentType.Documentation,
+  name = 'test-doc',
+  durationMinutes?: number,
+): OdhDocument =>
+  ({
+    metadata: { name },
+    spec: {
+      type,
+      displayName: 'Test Doc',
+      description: 'desc',
+      durationMinutes,
+    },
+  } as unknown as OdhDocument);
+
+const renderWithContext = (odhDoc: OdhDocument) => {
+  const contextValue = {
+    allQuickStarts: [{ metadata: { name: odhDoc.metadata.name }, spec: { tasks: [] }, status: {} }],
+    activeQuickStartID: '',
+    allQuickStartStates: {},
+    setActiveQuickStart: jest.fn(),
+    restartQuickStart: jest.fn(),
+    setQuickStartTaskNumber: jest.fn(),
+    setQuickStartTaskStatus: jest.fn(),
+    setAllQuickStartStates: jest.fn(),
+    getQuickStartForId: jest.fn(),
+  };
+
+  return render(
+    <QuickStartContext.Provider value={contextValue as never}>
+      <DocCardBadges odhDoc={odhDoc} />
+    </QuickStartContext.Provider>,
+  );
+};
+
+describe('DocCardBadges', () => {
+  beforeEach(() => {
+    mockGetQuickStartCompletionStatus.mockReturnValue(undefined);
+  });
+
+  it('should render documentation type label', () => {
+    renderWithContext(createDoc(OdhDocumentType.Documentation));
+    expect(screen.getByText('Documentation')).toBeInTheDocument();
+  });
+
+  it('should render duration label when duration is provided', () => {
+    renderWithContext(createDoc(OdhDocumentType.Documentation, 'doc', 15));
+    expect(screen.getByText('15 minutes')).toBeInTheDocument();
+  });
+
+  it('should render "In Progress" label with info status for in-progress quickstart', () => {
+    mockGetQuickStartCompletionStatus.mockReturnValue(CompletionStatusEnum.InProgress);
+    renderWithContext(createDoc(OdhDocumentType.QuickStart, 'qs-in-progress'));
+    const inProgressLabel = screen.getByText('In Progress').closest('.pf-v6-c-label');
+    expect(inProgressLabel).toHaveClass('pf-m-info');
+    expect(inProgressLabel).toHaveClass('pf-m-outline');
+  });
+
+  it('should render "Complete" label with success status for completed quickstart', () => {
+    mockGetQuickStartCompletionStatus.mockReturnValue(CompletionStatusEnum.Success);
+    renderWithContext(createDoc(OdhDocumentType.QuickStart, 'qs-complete'));
+    const completeLabel = screen.getByText('Complete').closest('.pf-v6-c-label');
+    expect(completeLabel).toHaveClass('pf-m-success');
+    expect(completeLabel).toHaveClass('pf-m-outline');
+  });
+
+  it('should render "Failed" label with danger status for failed quickstart', () => {
+    mockGetQuickStartCompletionStatus.mockReturnValue(CompletionStatusEnum.Failed);
+    renderWithContext(createDoc(OdhDocumentType.QuickStart, 'qs-failed'));
+    const failedLabel = screen.getByText('Failed').closest('.pf-v6-c-label');
+    expect(failedLabel).toHaveClass('pf-m-danger');
+    expect(failedLabel).toHaveClass('pf-m-outline');
+  });
+});
diff --git a/frontend/src/concepts/__tests__/StartNotebookModal.spec.tsx b/frontend/src/concepts/__tests__/StartNotebookModal.spec.tsx
index 764e7766b5..fb83ebdd85 100755
--- a/frontend/src/concepts/__tests__/StartNotebookModal.spec.tsx
+++ b/frontend/src/concepts/__tests__/StartNotebookModal.spec.tsx
@@ -122,7 +122,7 @@ describe('Start Notebook modal', () => {
 
     // Validate the header contents
     const header = screen.getByTestId('notebook-status-modal-header');
-    expect(header).toHaveTextContent('Workbench statusRunning');
+    expect(header).toHaveTextContent('Workbench statusReady');
 
     // Validate the steps
     const stepper = screen.getByTestId('notebook-startup-steps');
@@ -147,7 +147,7 @@ describe('Start Notebook modal', () => {
 
     // Validate the header contents
     const header = screen.getByTestId('notebook-status-modal-header');
-    expect(header).toHaveTextContent('Workbench statusRunning');
+    expect(header).toHaveTextContent('Workbench statusReady');
 
     // Validate the steps
     const stepper = screen.getByTestId('notebook-startup-steps');
diff --git a/frontend/src/concepts/distributedWorkloads/__tests__/utils.spec.ts b/frontend/src/concepts/distributedWorkloads/__tests__/utils.spec.ts
index ed5d59bae5..001a44ee08 100644
--- a/frontend/src/concepts/distributedWorkloads/__tests__/utils.spec.ts
+++ b/frontend/src/concepts/distributedWorkloads/__tests__/utils.spec.ts
@@ -33,7 +33,7 @@ describe('getStatusInfo', () => {
     testWorkloadStatus(WorkloadStatusType.Admitted, 'The workload is admitted');
     testWorkloadStatus(WorkloadStatusType.Running, 'The workload is running');
     testWorkloadStatus(WorkloadStatusType.Evicted, 'The workload is evicted');
-    testWorkloadStatus(WorkloadStatusType.Succeeded, 'Job finished successfully');
+    testWorkloadStatus(WorkloadStatusType.Complete, 'Job finished successfully');
     testWorkloadStatus(WorkloadStatusType.Failed, 'There was an error');
     testWorkloadStatus(null, 'No message'); // Falls back to Pending with no conditions
   });
@@ -41,15 +41,15 @@ describe('getStatusInfo', () => {
   it('provides correct info for completed workload', () => {
     const wl = mockWorkloadK8sResource({ k8sName: 'test-workload' });
     const info = getStatusInfo(wl);
-    expect(info.color).toBe('green');
+    expect(info.labelStatus).toBe('success');
     expect(info.message).toBe('Job finished successfully');
-    expect(info.status).toBe('Succeeded');
+    expect(info.status).toBe('Complete');
   });
   it('should return "Finished" when status is Succeeded and message is "No message"', () => {
     const wl = mockWorkloadK8sResource({
       k8sName: 'test-workload',
       mockStatusEmptyWorkload: true,
-      mockStatus: WorkloadStatusType.Succeeded,
+      mockStatus: WorkloadStatusType.Complete,
     });
     const info = getStatusInfo(wl);
     expect(getWorkloadStatusMessage(info)).toEqual('Finished');
@@ -61,7 +61,7 @@ describe('getStatusCounts', () => {
     const workloads = [
       mockWorkloadK8sResource({
         k8sName: 'test-workload',
-        mockStatus: WorkloadStatusType.Succeeded,
+        mockStatus: WorkloadStatusType.Complete,
       }),
       mockWorkloadK8sResource({
         k8sName: 'test-workload-2',
@@ -100,7 +100,7 @@ describe('getStatusCounts', () => {
       Pending: 2,
       Running: 2,
       Evicted: 1,
-      Succeeded: 1,
+      Complete: 1,
       Failed: 1,
     });
   });
diff --git a/frontend/src/concepts/distributedWorkloads/utils.tsx b/frontend/src/concepts/distributedWorkloads/utils.tsx
index 448d95f224..c632621fbf 100644
--- a/frontend/src/concepts/distributedWorkloads/utils.tsx
+++ b/frontend/src/concepts/distributedWorkloads/utils.tsx
@@ -6,8 +6,7 @@ import {
   InProgressIcon,
   CheckCircleIcon,
   ExclamationCircleIcon,
-  UploadIcon,
-  BanIcon,
+  CheckIcon,
 } from '@patternfly/react-icons';
 import { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';
 import {
@@ -42,7 +41,7 @@ export enum WorkloadStatusType {
   Admitted = 'Admitted',
   Running = 'Running',
   Evicted = 'Evicted',
-  Succeeded = 'Succeeded',
+  Complete = 'Complete',
   Failed = 'Failed',
 }
 
@@ -55,29 +54,30 @@ export type TopWorkloadUsageType = {
 export type WorkloadStatusInfo = {
   status: WorkloadStatusType;
   message: string;
-  color: LabelProps['color'];
+  color?: LabelProps['color'];
+  labelStatus?: LabelProps['status'];
   chartColor: string;
   icon: React.ComponentClass<SVGIconProps>;
 };
 
 export const WorkloadStatusColorAndIcon: Record<
   WorkloadStatusType,
-  Pick<WorkloadStatusInfo, 'color' | 'chartColor' | 'icon'>
+  Pick<WorkloadStatusInfo, 'color' | 'labelStatus' | 'chartColor' | 'icon'>
 > = {
   Pending: {
-    color: 'teal',
+    color: 'purple',
     chartColor: chartColorCyan.value,
     icon: PendingIcon,
   },
   Inadmissible: {
-    color: 'orangered',
+    labelStatus: 'warning',
     chartColor: chartColorGold.value,
     icon: ExclamationTriangleIcon,
   },
   Admitted: {
-    color: 'purple',
+    color: 'grey',
     chartColor: chartColorPurple.value,
-    icon: UploadIcon,
+    icon: CheckIcon,
   },
   Running: {
     color: 'blue',
@@ -85,17 +85,17 @@ export const WorkloadStatusColorAndIcon: Record<
     icon: InProgressIcon,
   },
   Evicted: {
-    color: 'grey',
+    labelStatus: 'warning',
     chartColor: chartColorBlack.value,
-    icon: BanIcon,
+    icon: ExclamationTriangleIcon,
   },
-  Succeeded: {
-    color: 'green',
+  Complete: {
+    labelStatus: 'success',
     chartColor: chartColorGreen.value,
     icon: CheckCircleIcon,
   },
   Failed: {
-    color: 'red',
+    labelStatus: 'danger',
     chartColor: chartColorRed.value,
     icon: ExclamationCircleIcon,
   },
@@ -106,7 +106,7 @@ export const getStatusInfo = (wl: WorkloadKind): WorkloadStatusInfo => {
   // Order matters here: The first matching condition in this order will be used for the current status.
   const statusesInEvalOrder: WorkloadStatusType[] = [
     WorkloadStatusType.Failed,
-    WorkloadStatusType.Succeeded,
+    WorkloadStatusType.Complete,
     WorkloadStatusType.Evicted,
     WorkloadStatusType.Inadmissible,
     WorkloadStatusType.Pending,
@@ -120,7 +120,7 @@ export const getStatusInfo = (wl: WorkloadKind): WorkloadStatusInfo => {
         type === 'Finished' &&
         /error|failed|rejected/.test(`${message} ${reason}`.toLowerCase()),
     ),
-    Succeeded: conditions?.find(
+    Complete: conditions?.find(
       ({ type, status, message, reason }) =>
         status === 'True' &&
         type === 'Finished' &&
@@ -154,7 +154,7 @@ export const getStatusCounts = (workloads: WorkloadKind[]): WorkloadStatusCounts
     Admitted: 0,
     Running: 0,
     Evicted: 0,
-    Succeeded: 0,
+    Complete: 0,
     Failed: 0,
   };
   workloads.forEach((wl) => {
@@ -271,7 +271,7 @@ export const getWorkloadStatusMessage = (statusInfo: WorkloadStatusInfo): string
   const DEFAULT_MESSAGE = 'No message';
   const SUCCESS_MESSAGE = 'Finished';
   const isSuccessWithNoMessage =
-    statusInfo.status === WorkloadStatusType.Succeeded && statusInfo.message === DEFAULT_MESSAGE;
+    statusInfo.status === WorkloadStatusType.Complete && statusInfo.message === DEFAULT_MESSAGE;
 
   return isSuccessWithNoMessage ? SUCCESS_MESSAGE : statusInfo.message;
 };
diff --git a/frontend/src/concepts/kueue/__tests__/index.spec.ts b/frontend/src/concepts/kueue/__tests__/index.spec.ts
index 90a7c47305..322d7e70a6 100644
--- a/frontend/src/concepts/kueue/__tests__/index.spec.ts
+++ b/frontend/src/concepts/kueue/__tests__/index.spec.ts
@@ -94,7 +94,7 @@ describe('getKueueWorkloadStatusWithMessage', () => {
     expect(result.status).toBe(KueueWorkloadStatus.Preempted);
   });
 
-  it('should return Succeeded when Finished with success reason', () => {
+  it('should return Complete when Finished with success reason', () => {
     const workload = workloadWithConditions([
       {
         type: 'Finished',
@@ -105,10 +105,10 @@ describe('getKueueWorkloadStatusWithMessage', () => {
       },
     ]);
     const result = getKueueWorkloadStatusWithMessage(workload);
-    expect(result.status).toBe(KueueWorkloadStatus.Succeeded);
+    expect(result.status).toBe(KueueWorkloadStatus.Complete);
   });
 
-  it('should return Succeeded when Finished with reason that matches neither failure nor success (fallback)', () => {
+  it('should return Complete when Finished with reason that matches neither failure nor success (fallback)', () => {
     const workload = workloadWithConditions([
       {
         type: 'Finished',
@@ -119,10 +119,10 @@ describe('getKueueWorkloadStatusWithMessage', () => {
       },
     ]);
     const result = getKueueWorkloadStatusWithMessage(workload);
-    expect(result.status).toBe(KueueWorkloadStatus.Succeeded);
+    expect(result.status).toBe(KueueWorkloadStatus.Complete);
   });
 
-  it('should return Succeeded when Finished with JobFinished reason (fallback)', () => {
+  it('should return Complete when Finished with JobFinished reason (fallback)', () => {
     const workload = workloadWithConditions([
       {
         type: 'Finished',
@@ -133,7 +133,7 @@ describe('getKueueWorkloadStatusWithMessage', () => {
       },
     ]);
     const result = getKueueWorkloadStatusWithMessage(workload);
-    expect(result.status).toBe(KueueWorkloadStatus.Succeeded);
+    expect(result.status).toBe(KueueWorkloadStatus.Complete);
   });
 
   it('should return Failed when Finished with timeout in message', () => {
@@ -182,7 +182,7 @@ describe('getKueueWorkloadStatusWithMessage', () => {
       },
     ]);
     const result = getKueueWorkloadStatusWithMessage(workload);
-    expect(result.status).toBe(KueueWorkloadStatus.Succeeded);
+    expect(result.status).toBe(KueueWorkloadStatus.Complete);
     expect(result.message).toContain('successfully');
   });
 
@@ -334,21 +334,18 @@ describe('getKueueStatusInfo', () => {
     const info = getKueueStatusInfo(KueueWorkloadStatus.Failed);
     expect(info.label).toBe('Failed');
     expect(info.status).toBe('danger');
-    expect(info.color).toBe('red');
   });
 
   it('should return correct info for Preempted', () => {
     const info = getKueueStatusInfo(KueueWorkloadStatus.Preempted);
     expect(info.label).toBe('Preempted');
     expect(info.status).toBe('warning');
-    expect(info.color).toBe('orange');
   });
 
   it('should return correct info for Inadmissible', () => {
     const info = getKueueStatusInfo(KueueWorkloadStatus.Inadmissible);
     expect(info.label).toBe('Inadmissible');
     expect(info.status).toBe('warning');
-    expect(info.color).toBe('orange');
   });
 
   it('should return correct info for Running', () => {
@@ -364,11 +361,10 @@ describe('getKueueStatusInfo', () => {
     expect(info.iconClassName).toBe('odh-u-spin');
   });
 
-  it('should return correct info for Succeeded', () => {
-    const info = getKueueStatusInfo(KueueWorkloadStatus.Succeeded);
+  it('should return correct info for Complete', () => {
+    const info = getKueueStatusInfo(KueueWorkloadStatus.Complete);
     expect(info.label).toBe('Complete');
     expect(info.status).toBe('success');
-    expect(info.color).toBe('green');
   });
 
   it('should return default for unknown status', () => {
diff --git a/frontend/src/concepts/kueue/index.ts b/frontend/src/concepts/kueue/index.ts
index 6e3d7162c4..d4081387f0 100644
--- a/frontend/src/concepts/kueue/index.ts
+++ b/frontend/src/concepts/kueue/index.ts
@@ -103,7 +103,7 @@ export const getKueueWorkloadStatusWithMessage = (
     { condition: Inadmissible, status: KueueWorkloadStatus.Inadmissible },
     { condition: Evicted, status: KueueWorkloadStatus.Preempted },
     { condition: Preempted, status: KueueWorkloadStatus.Preempted },
-    { condition: Succeeded, status: KueueWorkloadStatus.Succeeded },
+    { condition: Succeeded, status: KueueWorkloadStatus.Complete },
     { condition: Running, status: KueueWorkloadStatus.Running },
     { condition: Admitted, status: KueueWorkloadStatus.Admitted },
     { condition: Pending, status: KueueWorkloadStatus.Queued },
@@ -128,20 +128,17 @@ export const getKueueStatusInfo = (status: KueueWorkloadStatus): KueueStatusInfo
       return {
         label: 'Failed',
         status: 'danger',
-        color: 'red',
         IconComponent: ExclamationCircleIcon,
       };
     case KueueWorkloadStatus.Preempted:
       return {
         label: 'Preempted',
-        color: 'orange',
         status: 'warning',
         IconComponent: ExclamationTriangleIcon,
       };
     case KueueWorkloadStatus.Inadmissible:
       return {
         label: 'Inadmissible',
-        color: 'orange',
         status: 'warning',
         IconComponent: ExclamationTriangleIcon,
       };
@@ -154,11 +151,10 @@ export const getKueueStatusInfo = (status: KueueWorkloadStatus): KueueStatusInfo
         IconComponent: InProgressIcon,
         iconClassName: 'odh-u-spin',
       };
-    case KueueWorkloadStatus.Succeeded:
+    case KueueWorkloadStatus.Complete:
       return {
         label: 'Complete',
         status: 'success',
-        color: 'green',
         IconComponent: CheckCircleIcon,
       };
     default:
diff --git a/frontend/src/concepts/kueue/types.ts b/frontend/src/concepts/kueue/types.ts
index 6873ac88e0..63f95f52bd 100644
--- a/frontend/src/concepts/kueue/types.ts
+++ b/frontend/src/concepts/kueue/types.ts
@@ -8,7 +8,7 @@ export enum KueueWorkloadStatus {
   Inadmissible = 'Inadmissible',
   Running = 'Running',
   Admitted = 'Admitted',
-  Succeeded = 'Succeeded',
+  Complete = 'Complete',
 }
 
 export type KueueWorkloadStatusWithMessage = {
@@ -35,5 +35,5 @@ export const KUEUE_STATUSES_OVERRIDE_WORKBENCH: KueueWorkloadStatus[] = [
   KueueWorkloadStatus.Inadmissible,
   KueueWorkloadStatus.Failed,
   KueueWorkloadStatus.Preempted,
-  KueueWorkloadStatus.Succeeded,
+  KueueWorkloadStatus.Complete,
 ];
diff --git a/frontend/src/concepts/modelServing/ModelStatusIcon.tsx b/frontend/src/concepts/modelServing/ModelStatusIcon.tsx
index 91d65b8e56..74b5836219 100644
--- a/frontend/src/concepts/modelServing/ModelStatusIcon.tsx
+++ b/frontend/src/concepts/modelServing/ModelStatusIcon.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
 import { Icon, Label, LabelProps, Popover } from '@patternfly/react-core';
 import {
+  CheckCircleIcon,
   ExclamationCircleIcon,
   InProgressIcon,
   OffIcon,
   OutlinedQuestionCircleIcon,
-  PlayIcon,
-  SyncAltIcon,
 } from '@patternfly/react-icons';
 import { ModelDeploymentState } from '#~/pages/modelServing/screens/types';
 import { ToggleState } from '#~/components/StateActionToggle';
@@ -51,7 +50,7 @@ export const ModelStatusIcon: React.FC<ModelStatusIconProps> = ({
       return {
         label: 'Stopping',
         color: 'grey',
-        icon: <SyncAltIcon className="odh-u-spin" />,
+        icon: <InProgressIcon className="odh-u-spin" />,
         message: 'Model deployment is stopping.',
       };
     }
@@ -72,13 +71,19 @@ export const ModelStatusIcon: React.FC<ModelStatusIconProps> = ({
     // Only check the state if not stopped
     switch (state) {
       case ModelDeploymentState.LOADED:
-      case ModelDeploymentState.STANDBY:
         return {
-          label: 'Started',
+          label: 'Ready',
           status: 'success',
-          icon: <PlayIcon />,
+          icon: <CheckCircleIcon />,
           message: 'Model deployment is active.',
         };
+      case ModelDeploymentState.STANDBY:
+        return {
+          label: 'Starting',
+          color: 'blue',
+          icon: <InProgressIcon className="odh-u-spin" />,
+          message: 'Model deployment is starting.',
+        };
       case ModelDeploymentState.FAILED_TO_LOAD:
         return {
           label: 'Failed',
diff --git a/frontend/src/concepts/notebooks/NotebookStatusLabel.tsx b/frontend/src/concepts/notebooks/NotebookStatusLabel.tsx
index 8f0c29fc39..a0255cc299 100644
--- a/frontend/src/concepts/notebooks/NotebookStatusLabel.tsx
+++ b/frontend/src/concepts/notebooks/NotebookStatusLabel.tsx
@@ -1,11 +1,10 @@
 import * as React from 'react';
 import { Label, LabelProps } from '@patternfly/react-core';
 import {
+  CheckCircleIcon,
   ExclamationCircleIcon,
   InProgressIcon,
   OffIcon,
-  PlayIcon,
-  SyncAltIcon,
 } from '@patternfly/react-icons';
 import { EventStatus, NotebookStatus } from '#~/types';
 import { getKueueStatusInfo } from '#~/concepts/kueue';
@@ -44,14 +43,18 @@ const NotebookStatusLabel: React.FC<NotebookStateStatusProps> = ({
 
   const labelSettings = React.useMemo<StatusLabelSettings>(() => {
     if (isError) {
-      return { label: 'Failed', status: 'danger', icon: <ExclamationCircleIcon /> };
+      return {
+        label: 'Failed',
+        status: 'danger',
+        icon: <ExclamationCircleIcon />,
+      };
     }
 
     if (isStopping) {
       return {
         label: 'Stopping',
         color: 'grey',
-        icon: <SyncAltIcon className="odh-u-spin" />,
+        icon: <InProgressIcon className="odh-u-spin" />,
       };
     }
     if (kueueStatus?.status && KUEUE_STATUSES_OVERRIDE_WORKBENCH.includes(kueueStatus.status)) {
@@ -71,13 +74,22 @@ const NotebookStatusLabel: React.FC<NotebookStateStatusProps> = ({
       };
     }
     if (isRunning) {
-      return { label: 'Running', status: 'success', icon: <PlayIcon /> };
+      return {
+        label: 'Ready',
+        status: 'success',
+        icon: <CheckCircleIcon />,
+      };
     }
-    return { label: 'Stopped', color: 'grey', icon: <OffIcon /> };
+    return {
+      label: 'Stopped',
+      color: 'grey',
+      icon: <OffIcon />,
+    };
   }, [kueueStatus, isError, isRunning, isStarting, isStopping]);
 
   return (
     <Label
+      variant={onClick ? 'filled' : 'outline'}
       isCompact={isCompact}
       color={labelSettings.color}
       status={labelSettings.status}
diff --git a/frontend/src/concepts/notebooks/__tests__/NotebookStatusLabel.spec.tsx b/frontend/src/concepts/notebooks/__tests__/NotebookStatusLabel.spec.tsx
index ac15319d39..9f08c9ded2 100644
--- a/frontend/src/concepts/notebooks/__tests__/NotebookStatusLabel.spec.tsx
+++ b/frontend/src/concepts/notebooks/__tests__/NotebookStatusLabel.spec.tsx
@@ -5,9 +5,10 @@ import { KueueWorkloadStatus } from '#~/concepts/kueue/types';
 import NotebookStatusLabel from '#~/concepts/notebooks/NotebookStatusLabel';
 
 const getStatusLabel = () => screen.getByTestId('notebook-status-text').textContent;
+const getStatusLabelElement = () => screen.getByTestId('notebook-status-text');
 
 describe('NotebookStatusLabel', () => {
-  it('should show Failed when notebook has error status', () => {
+  it('should show Failed with danger status when notebook has error status', () => {
     render(
       <NotebookStatusLabel
         isStarting={false}
@@ -22,6 +23,7 @@ describe('NotebookStatusLabel', () => {
       />,
     );
     expect(getStatusLabel()).toBe('Failed');
+    expect(getStatusLabelElement()).toHaveClass('pf-m-danger');
   });
 
   it('should show Queued when isStarting and kueueStatus is Queued (kueue status takes precedence)', () => {
@@ -36,11 +38,12 @@ describe('NotebookStatusLabel', () => {
     expect(getStatusLabel()).toBe('Queued');
   });
 
-  it('should show Starting when isStarting and kueueStatus is null', () => {
+  it('should show Starting with blue color when isStarting and kueueStatus is null', () => {
     render(
       <NotebookStatusLabel isStarting isStopping={false} isRunning={false} kueueStatus={null} />,
     );
     expect(getStatusLabel()).toBe('Starting');
+    expect(getStatusLabelElement()).toHaveClass('pf-m-blue');
   });
 
   it('should show Starting when isStarting and kueueStatus is Running (Running not in override list)', () => {
@@ -65,15 +68,17 @@ describe('NotebookStatusLabel', () => {
       />,
     );
     expect(getStatusLabel()).toBe('Stopping');
+    expect(getStatusLabelElement()).not.toHaveClass('pf-m-success');
+    expect(getStatusLabelElement()).not.toHaveClass('pf-m-danger');
   });
 
-  it('should show Stopping when isStopping even if kueueStatus is Succeeded', () => {
+  it('should show Stopping when isStopping even if kueueStatus is Complete', () => {
     render(
       <NotebookStatusLabel
         isStarting={false}
         isStopping
         isRunning={false}
-        kueueStatus={{ status: KueueWorkloadStatus.Succeeded }}
+        kueueStatus={{ status: KueueWorkloadStatus.Complete }}
       />,
     );
     expect(getStatusLabel()).toBe('Stopping');
@@ -91,26 +96,28 @@ describe('NotebookStatusLabel', () => {
     expect(getStatusLabel()).toBe('Queued');
   });
 
-  it('should show Complete when not starting or stopping and kueueStatus is Succeeded', () => {
+  it('should show Complete with success status when kueueStatus is Complete', () => {
     render(
       <NotebookStatusLabel
         isStarting={false}
         isStopping={false}
         isRunning={false}
-        kueueStatus={{ status: KueueWorkloadStatus.Succeeded }}
+        kueueStatus={{ status: KueueWorkloadStatus.Complete }}
       />,
     );
     expect(getStatusLabel()).toBe('Complete');
+    expect(getStatusLabelElement()).toHaveClass('pf-m-success');
   });
 
-  it('should show Running when isRunning and no kueue override', () => {
+  it('should show Ready with success status when isRunning and no kueue override', () => {
     render(
       <NotebookStatusLabel isStarting={false} isStopping={false} isRunning kueueStatus={null} />,
     );
-    expect(getStatusLabel()).toBe('Running');
+    expect(getStatusLabel()).toBe('Ready');
+    expect(getStatusLabelElement()).toHaveClass('pf-m-success');
   });
 
-  it('should show Stopped when not starting, stopping, or running and no kueue status', () => {
+  it('should show Stopped with no semantic status when not starting, stopping, or running', () => {
     render(
       <NotebookStatusLabel
         isStarting={false}
@@ -120,5 +127,28 @@ describe('NotebookStatusLabel', () => {
       />,
     );
     expect(getStatusLabel()).toBe('Stopped');
+    expect(getStatusLabelElement()).not.toHaveClass('pf-m-success');
+    expect(getStatusLabelElement()).not.toHaveClass('pf-m-danger');
+    expect(getStatusLabelElement()).not.toHaveClass('pf-m-info');
+  });
+
+  it('should use outline variant when onClick is not provided', () => {
+    render(
+      <NotebookStatusLabel isStarting={false} isStopping={false} isRunning kueueStatus={null} />,
+    );
+    expect(getStatusLabelElement()).toHaveClass('pf-m-outline');
+  });
+
+  it('should use filled variant when onClick is provided', () => {
+    render(
+      <NotebookStatusLabel
+        isStarting={false}
+        isStopping={false}
+        isRunning
+        kueueStatus={null}
+        onClick={jest.fn()}
+      />,
+    );
+    expect(getStatusLabelElement()).not.toHaveClass('pf-m-outline');
   });
 });
diff --git a/frontend/src/concepts/pipelines/content/PipelineRunTypeLabel.tsx b/frontend/src/concepts/pipelines/content/PipelineRunTypeLabel.tsx
index aa9024f475..c8ef4f9a96 100644
--- a/frontend/src/concepts/pipelines/content/PipelineRunTypeLabel.tsx
+++ b/frontend/src/concepts/pipelines/content/PipelineRunTypeLabel.tsx
@@ -34,7 +34,12 @@ const PipelineRunTypeLabel: React.FC<PipelineRunTypeLabelProps> = ({
     {isModelRegistered && (
       <>
         {' '}
-        <Label color="green" isCompact={isCompact} data-testid="model-registered-label">
+        <Label
+          variant="outline"
+          status="success"
+          isCompact={isCompact}
+          data-testid="model-registered-label"
+        >
           Model registered
         </Label>
       </>
diff --git a/frontend/src/concepts/pipelines/content/__tests__/PipelineDetailsTitle.spec.tsx b/frontend/src/concepts/pipelines/content/__tests__/PipelineDetailsTitle.spec.tsx
new file mode 100644
index 0000000000..a3e5ef8881
--- /dev/null
+++ b/frontend/src/concepts/pipelines/content/__tests__/PipelineDetailsTitle.spec.tsx
@@ -0,0 +1,78 @@
+/* eslint-disable camelcase */
+import * as React from 'react';
+import { render, screen } from '@testing-library/react';
+import {
+  PipelineRunKF,
+  StorageStateKF,
+  RuntimeStateKF,
+  runtimeStateLabels,
+} from '#~/concepts/pipelines/kfTypes';
+import PipelineDetailsTitle from '#~/concepts/pipelines/content/pipelinesDetails/PipelineDetailsTitle';
+
+const createRun = (overrides: Partial<PipelineRunKF> = {}): PipelineRunKF => ({
+  created_at: '2023-09-05T16:23:25Z',
+  storage_state: StorageStateKF.AVAILABLE,
+  finished_at: '2023-09-05T16:24:34Z',
+  run_id: 'test-run-id',
+  display_name: 'test-run',
+  scheduled_at: '1970-01-01T00:00:00Z',
+  service_account: 'pipeline-runner',
+  state: RuntimeStateKF.SUCCEEDED,
+  experiment_id: 'experiment-id',
+  pipeline_version_reference: {
+    pipeline_id: 'pipeline-id',
+    pipeline_version_id: 'version-id',
+  },
+  runtime_config: { parameters: {}, pipeline_root: '' },
+  run_details: { pipeline_context_id: '', pipeline_run_context_id: '', task_details: [] },
+  recurring_run_id: '',
+  state_history: [],
+  ...overrides,
+});
+
+describe('PipelineDetailsTitle', () => {
+  it('should render the run display name', () => {
+    render(<PipelineDetailsTitle run={createRun({ display_name: 'My Pipeline Run' })} />);
+    expect(screen.getByText('My Pipeline Run')).toBeInTheDocument();
+  });
+
+  it('should render status icon with success status for succeeded run', () => {
+    render(
+      <PipelineDetailsTitle run={createRun({ state: RuntimeStateKF.SUCCEEDED })} statusIcon />,
+    );
+    const statusLabel = screen.getByTestId('status-icon');
+    expect(statusLabel).toHaveTextContent(runtimeStateLabels[RuntimeStateKF.SUCCEEDED]);
+    expect(statusLabel).toHaveClass('pf-m-success');
+    expect(statusLabel).toHaveClass('pf-m-outline');
+  });
+
+  it('should render status icon with danger status for failed run', () => {
+    render(<PipelineDetailsTitle run={createRun({ state: RuntimeStateKF.FAILED })} statusIcon />);
+    const statusLabel = screen.getByTestId('status-icon');
+    expect(statusLabel).toHaveTextContent(runtimeStateLabels[RuntimeStateKF.FAILED]);
+    expect(statusLabel).toHaveClass('pf-m-danger');
+  });
+
+  it('should render "Model registered" label with success status when isRegistered is true', () => {
+    render(<PipelineDetailsTitle run={createRun()} isRegistered />);
+    const modelLabels = screen.getAllByText('Model registered');
+    const modelLabel = modelLabels[0].closest('.pf-v6-c-label');
+    expect(modelLabel).toHaveClass('pf-m-success');
+    expect(modelLabel).toHaveClass('pf-m-outline');
+  });
+
+  it('should not render "Model registered" label when isRegistered is false', () => {
+    render(<PipelineDetailsTitle run={createRun()} />);
+    expect(screen.queryByText('Model registered')).not.toBeInTheDocument();
+  });
+
+  it('should render "Archived" label when run is archived', () => {
+    render(<PipelineDetailsTitle run={createRun({ storage_state: StorageStateKF.ARCHIVED })} />);
+    expect(screen.getByText('Archived')).toBeInTheDocument();
+  });
+
+  it('should not render status icon when statusIcon is false', () => {
+    render(<PipelineDetailsTitle run={createRun()} />);
+    expect(screen.queryByTestId('status-icon')).not.toBeInTheDocument();
+  });
+});
diff --git a/frontend/src/concepts/pipelines/content/__tests__/PipelineRunTypeLabel.spec.tsx b/frontend/src/concepts/pipelines/content/__tests__/PipelineRunTypeLabel.spec.tsx
new file mode 100644
index 0000000000..2a16b84da0
--- /dev/null
+++ b/frontend/src/concepts/pipelines/content/__tests__/PipelineRunTypeLabel.spec.tsx
@@ -0,0 +1,60 @@
+/* eslint-disable camelcase */
+import * as React from 'react';
+import { render, screen } from '@testing-library/react';
+import {
+  PipelineRunKF,
+  PipelineRecurringRunKF,
+  StorageStateKF,
+  RuntimeStateKF,
+} from '#~/concepts/pipelines/kfTypes';
+import PipelineRunTypeLabel from '#~/concepts/pipelines/content/PipelineRunTypeLabel';
+
+const baseRun: PipelineRunKF = {
+  created_at: '2023-09-05T16:23:25Z',
+  storage_state: StorageStateKF.AVAILABLE,
+  finished_at: '2023-09-05T16:24:34Z',
+  run_id: 'test-run-id',
+  display_name: 'test-run',
+  scheduled_at: '1970-01-01T00:00:00Z',
+  service_account: 'pipeline-runner',
+  state: RuntimeStateKF.SUCCEEDED,
+  experiment_id: 'experiment-id',
+  pipeline_version_reference: {
+    pipeline_id: 'pipeline-id',
+    pipeline_version_id: 'version-id',
+  },
+  runtime_config: { parameters: {}, pipeline_root: '' },
+  run_details: { pipeline_context_id: '', pipeline_run_context_id: '', task_details: [] },
+  recurring_run_id: '',
+  state_history: [],
+};
+
+const recurringRun: PipelineRecurringRunKF = {
+  ...baseRun,
+  recurring_run_id: 'recurring-run-id',
+} as unknown as PipelineRecurringRunKF;
+
+describe('PipelineRunTypeLabel', () => {
+  it('should render "One-off" label for a non-recurring run', () => {
+    render(<PipelineRunTypeLabel run={baseRun} />);
+    expect(screen.getByText('One-off')).toBeInTheDocument();
+  });
+
+  it('should render "Recurring" label for a recurring run', () => {
+    render(<PipelineRunTypeLabel run={recurringRun} />);
+    expect(screen.getByText('Recurring')).toBeInTheDocument();
+  });
+
+  it('should render "Model registered" label with success status when isModelRegistered is true', () => {
+    render(<PipelineRunTypeLabel run={baseRun} isModelRegistered />);
+    const modelLabel = screen.getByTestId('model-registered-label');
+    expect(modelLabel).toHaveTextContent('Model registered');
+    expect(modelLabel).toHaveClass('pf-m-success');
+    expect(modelLabel).toHaveClass('pf-m-outline');
+  });
+
+  it('should not render "Model registered" label when isModelRegistered is false', () => {
+    render(<PipelineRunTypeLabel run={baseRun} isModelRegistered={false} />);
+    expect(screen.queryByTestId('model-registered-label')).not.toBeInTheDocument();
+  });
+});
diff --git a/frontend/src/concepts/pipelines/content/__tests__/utils.spec.tsx b/frontend/src/concepts/pipelines/content/__tests__/utils.spec.tsx
index 927877e175..7e9bc8ce63 100644
--- a/frontend/src/concepts/pipelines/content/__tests__/utils.spec.tsx
+++ b/frontend/src/concepts/pipelines/content/__tests__/utils.spec.tsx
@@ -1,11 +1,13 @@
 /* eslint-disable camelcase*/
 import {
+  AngleDoubleRightIcon,
   BanIcon,
   CheckCircleIcon,
   ExclamationCircleIcon,
   InProgressIcon,
+  OutlinedQuestionCircleIcon,
+  PauseCircleIcon,
   PendingIcon,
-  QuestionCircleIcon,
 } from '@patternfly/react-icons';
 import React from 'react';
 import {
@@ -58,13 +60,12 @@ const createRun = (state: RuntimeStateKF | string): PipelineRunKF =>
 
 describe('computeRunStatus', () => {
   it('should check for run status when run status is undefined', () => {
-    const UNKNOWN_ICON = <QuestionCircleIcon />;
-    const UNKNOWN_STATUS = 'warning';
+    const UNKNOWN_ICON = <OutlinedQuestionCircleIcon />;
     const UNKNOWN_LABEL = '-';
     const runStatus = computeRunStatus(createRun('-'));
     expect(runStatus.label).toBe(UNKNOWN_LABEL);
     expect(runStatus.icon).toStrictEqual(UNKNOWN_ICON);
-    expect(runStatus.status).toBe(UNKNOWN_STATUS);
+    expect(runStatus.color).toBe('grey');
   });
 
   it('should check for Started run status', () => {
@@ -84,6 +85,7 @@ describe('computeRunStatus', () => {
     expect(runStatus.label).toBe(runtimeStateLabels[RuntimeStateKF.SUCCEEDED]);
     expect(runStatus.icon).toStrictEqual(<CheckCircleIcon />);
     expect(runStatus.status).toBe('success');
+    expect(runStatus.labelStatus).toBe('success');
   });
 
   it('should check for Failed run status', () => {
@@ -91,20 +93,53 @@ describe('computeRunStatus', () => {
     expect(runStatus.label).toBe(runtimeStateLabels[RuntimeStateKF.FAILED]);
     expect(runStatus.icon).toStrictEqual(<ExclamationCircleIcon />);
     expect(runStatus.status).toBe('danger');
+    expect(runStatus.labelStatus).toBe('danger');
     expect(runStatus.details).toBe(run.error?.message);
   });
 
+  it('should check for Skipped run status', () => {
+    const runStatus = computeRunStatus(createRun(RuntimeStateKF.SKIPPED));
+    expect(runStatus.label).toBe(runtimeStateLabels[RuntimeStateKF.SKIPPED]);
+    expect(runStatus.icon).toStrictEqual(<AngleDoubleRightIcon />);
+    expect(runStatus.status).toBe('success');
+    expect(runStatus.labelStatus).toBe('success');
+  });
+
+  it('should check for Canceling run status', () => {
+    const runStatus = computeRunStatus(createRun(RuntimeStateKF.CANCELING));
+    expect(runStatus.label).toBe(runtimeStateLabels[RuntimeStateKF.CANCELING]);
+    expect(runStatus.icon).toStrictEqual(<InProgressIcon />);
+    expect(runStatus.color).toBe('grey');
+  });
+
   it('should check for Canceled run status', () => {
     const runStatus = computeRunStatus(createRun(RuntimeStateKF.CANCELED));
     expect(runStatus.label).toBe(runtimeStateLabels[RuntimeStateKF.CANCELED]);
     expect(runStatus.icon).toStrictEqual(<BanIcon />);
+    expect(runStatus.color).toBe('grey');
+  });
+
+  it('should check for Paused run status', () => {
+    const runStatus = computeRunStatus(createRun(RuntimeStateKF.PAUSED));
+    expect(runStatus.label).toBe(runtimeStateLabels[RuntimeStateKF.PAUSED]);
+    expect(runStatus.icon).toStrictEqual(<PauseCircleIcon />);
+    expect(runStatus.color).toBe('grey');
+  });
+
+  it('should check for Pending run status color', () => {
+    const runStatus = computeRunStatus(createRun(RuntimeStateKF.PENDING));
+    expect(runStatus.color).toBe('purple');
+  });
+
+  it('should check for Running run status color', () => {
+    const runStatus = computeRunStatus(createRun(RuntimeStateKF.RUNNING));
+    expect(runStatus.color).toBe('blue');
   });
 
   it('should check for default run status', () => {
-    const UNKNOWN_ICON = <QuestionCircleIcon />;
-    const UNKNOWN_STATUS = 'warning';
+    const UNKNOWN_ICON = <OutlinedQuestionCircleIcon />;
     const runStatus = computeRunStatus(createRun('warning'));
-    expect(runStatus.status).toBe(UNKNOWN_STATUS);
+    expect(runStatus.color).toBe('grey');
     expect(runStatus.icon).toStrictEqual(UNKNOWN_ICON);
   });
 });
diff --git a/frontend/src/concepts/pipelines/content/pipelinesDetails/PipelineDetailsTitle.tsx b/frontend/src/concepts/pipelines/content/pipelinesDetails/PipelineDetailsTitle.tsx
index 95c7c43161..ad07ae5ce5 100644
--- a/frontend/src/concepts/pipelines/content/pipelinesDetails/PipelineDetailsTitle.tsx
+++ b/frontend/src/concepts/pipelines/content/pipelinesDetails/PipelineDetailsTitle.tsx
@@ -17,7 +17,7 @@ const PipelineDetailsTitle: React.FC<RecurringRunTitleProps> = ({
   pipelineRunLabel,
   isRegistered,
 }) => {
-  const { icon, label, color } = computeRunStatus(run);
+  const { icon, label, color, labelStatus } = computeRunStatus(run);
 
   const isArchived = run.storage_state === StorageStateKF.ARCHIVED;
 
@@ -35,19 +35,27 @@ const PipelineDetailsTitle: React.FC<RecurringRunTitleProps> = ({
         )}
         {statusIcon && (
           <SplitItem>
-            <Label color={color} icon={icon} data-testid="status-icon">
+            <Label
+              variant="outline"
+              color={color}
+              status={labelStatus}
+              icon={icon}
+              data-testid="status-icon"
+            >
               {label}
             </Label>
           </SplitItem>
         )}
         {isRegistered && (
           <SplitItem>
-            <Label color="green">Model registered</Label>
+            <Label variant="outline" status="success">
+              Model registered
+            </Label>
           </SplitItem>
         )}
         {isArchived && (
           <SplitItem>
-            <Label>Archived</Label>
+            <Label variant="outline">Archived</Label>
           </SplitItem>
         )}
       </Split>
diff --git a/frontend/src/concepts/pipelines/content/tables/pipelineRun/PipelineRunTableRowExperiment.tsx b/frontend/src/concepts/pipelines/content/tables/pipelineRun/PipelineRunTableRowExperiment.tsx
index 1b4864f054..1ab8a8861e 100644
--- a/frontend/src/concepts/pipelines/content/tables/pipelineRun/PipelineRunTableRowExperiment.tsx
+++ b/frontend/src/concepts/pipelines/content/tables/pipelineRun/PipelineRunTableRowExperiment.tsx
@@ -38,7 +38,9 @@ const PipelineRunTableRowExperiment: React.FC<PipelineRunTableRowExperimentProps
       </SplitItem>
       {isExperimentArchived && (
         <SplitItem>
-          <Label isCompact>Archived</Label>
+          <Label variant="outline" isCompact>
+            Archived
+          </Label>
         </SplitItem>
       )}
     </Split>
diff --git a/frontend/src/concepts/pipelines/content/tables/renderUtils.tsx b/frontend/src/concepts/pipelines/content/tables/renderUtils.tsx
index 340f4e903e..491e7fb450 100644
--- a/frontend/src/concepts/pipelines/content/tables/renderUtils.tsx
+++ b/frontend/src/concepts/pipelines/content/tables/renderUtils.tsx
@@ -16,7 +16,6 @@ import { ExclamationCircleIcon } from '@patternfly/react-icons';
 import { printSeconds, relativeDuration, relativeTime } from '#~/utilities/time';
 import {
   PipelineRunKF,
-  runtimeStateLabels,
   PipelineRecurringRunKF,
   RecurringRunStatus as RecurringRunStatusType,
   ExperimentKF,
@@ -42,30 +41,44 @@ export const RunStatus: RunUtil<{ hasNoLabel?: boolean; isCompact?: boolean }> =
   isCompact = true,
   run,
 }) => {
-  const { icon, status, color, label, details, createdAt } = computeRunStatus(run);
-  let tooltipContent: React.ReactNode = details;
-  let content = (
-    <Label color={color} icon={icon} isCompact={isCompact}>
-      {label}
-    </Label>
-  );
+  const { icon, status, color, labelStatus, label, details, createdAt } = computeRunStatus(run);
+  const tooltipContent: React.ReactNode = details;
 
-  if (hasNoLabel && !tooltipContent) {
-    content = (
+  if (hasNoLabel) {
+    const iconContent = (
       <Icon isInline status={status}>
         {icon}
       </Icon>
     );
 
-    // If we are just an icon with no tooltip -- make it the status for ease of understanding
-    tooltipContent = (
-      <Stack>
-        <StackItem>{`Status: ${runtimeStateLabels[run.state]}`}</StackItem>
-        <StackItem>{`Started: ${createdAt ?? ''}`}</StackItem>
-      </Stack>
+    return (
+      <Tooltip
+        content={
+          tooltipContent || (
+            <Stack>
+              <StackItem>{`Status: ${label}`}</StackItem>
+              <StackItem>{`Started: ${createdAt ?? ''}`}</StackItem>
+            </Stack>
+          )
+        }
+      >
+        {iconContent}
+      </Tooltip>
     );
   }
 
+  const content = (
+    <Label
+      variant={tooltipContent ? 'filled' : 'outline'}
+      color={color}
+      status={labelStatus}
+      icon={icon}
+      isCompact={isCompact}
+    >
+      {label}
+    </Label>
+  );
+
   if (tooltipContent) {
     return <Tooltip content={tooltipContent}>{content}</Tooltip>;
   }
diff --git a/frontend/src/concepts/pipelines/content/utils.tsx b/frontend/src/concepts/pipelines/content/utils.tsx
index 74025f2758..f01c55694d 100644
--- a/frontend/src/concepts/pipelines/content/utils.tsx
+++ b/frontend/src/concepts/pipelines/content/utils.tsx
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import {
+  AngleDoubleRightIcon,
   BanIcon,
   CheckCircleIcon,
   ExclamationCircleIcon,
   InProgressIcon,
+  OutlinedQuestionCircleIcon,
+  PauseCircleIcon,
   PendingIcon,
-  QuestionCircleIcon,
-  SyncAltIcon,
 } from '@patternfly/react-icons';
 import { Icon, LabelProps } from '@patternfly/react-core';
 import {
@@ -25,20 +26,21 @@ export type RunStatusDetails = {
   icon: React.ReactNode;
   label: PipelineRunKF['state'] | string;
   color?: LabelProps['color'];
+  labelStatus?: LabelProps['status'];
   status?: React.ComponentProps<typeof Icon>['status'];
   details?: string;
   createdAt?: string;
 };
 
-const UNKNOWN_ICON = <QuestionCircleIcon />;
-const UNKNOWN_STATUS = 'warning';
+const UNKNOWN_ICON = <OutlinedQuestionCircleIcon />;
 
 export const computeRunStatus = (run?: PipelineRunKF | null): RunStatusDetails => {
   if (!run) {
-    return { icon: UNKNOWN_ICON, status: UNKNOWN_STATUS, label: '-' };
+    return { icon: UNKNOWN_ICON, color: 'grey', label: '-' };
   }
   let icon: React.ReactNode;
   let status: React.ComponentProps<typeof Icon>['status'];
+  let labelStatus: LabelProps['status'];
   let details: string | undefined;
   let label: string;
   let color: LabelProps['color'];
@@ -50,6 +52,7 @@ export const computeRunStatus = (run?: PipelineRunKF | null): RunStatusDetails =
     case RuntimeStateKF.RUNTIME_STATE_UNSPECIFIED:
     case undefined:
       icon = <PendingIcon />;
+      color = 'purple';
       label = runtimeStateLabels[RuntimeStateKF.PENDING];
       break;
     case RuntimeStateKF.RUNNING:
@@ -58,43 +61,47 @@ export const computeRunStatus = (run?: PipelineRunKF | null): RunStatusDetails =
       label = runtimeStateLabels[RuntimeStateKF.RUNNING];
       break;
     case RuntimeStateKF.SKIPPED:
-      icon = <CheckCircleIcon />;
+      icon = <AngleDoubleRightIcon />;
+      status = 'success';
+      labelStatus = 'success';
       label = runtimeStateLabels[RuntimeStateKF.SKIPPED];
       break;
     case RuntimeStateKF.SUCCEEDED:
       icon = <CheckCircleIcon />;
       status = 'success';
-      color = 'green';
+      labelStatus = 'success';
       label = runtimeStateLabels[RuntimeStateKF.SUCCEEDED];
       break;
     case RuntimeStateKF.FAILED:
       icon = <ExclamationCircleIcon />;
       status = 'danger';
-      color = 'red';
+      labelStatus = 'danger';
       label = runtimeStateLabels[RuntimeStateKF.FAILED];
       details = run.error?.message;
       break;
     case RuntimeStateKF.CANCELING:
-      icon = <SyncAltIcon />;
+      icon = <InProgressIcon />;
+      color = 'grey';
       label = runtimeStateLabels[RuntimeStateKF.CANCELING];
       break;
     case RuntimeStateKF.CANCELED:
       icon = <BanIcon />;
-      color = 'orangered';
+      color = 'grey';
       label = runtimeStateLabels[RuntimeStateKF.CANCELED];
       break;
     case RuntimeStateKF.PAUSED:
-      icon = <BanIcon />;
+      icon = <PauseCircleIcon />;
+      color = 'grey';
       label = runtimeStateLabels[RuntimeStateKF.PAUSED];
       break;
     default:
       icon = UNKNOWN_ICON;
-      status = UNKNOWN_STATUS;
+      color = 'grey';
       label = run.state;
       details = run.state;
   }
 
-  return { icon, label, color, status, details, createdAt };
+  return { icon, label, color, labelStatus, status, details, createdAt };
 };
 
 export const getPipelineAndVersionDeleteString = (
diff --git a/frontend/src/concepts/pipelines/kfTypes.ts b/frontend/src/concepts/pipelines/kfTypes.ts
index d91fe57a75..74135c0b92 100644
--- a/frontend/src/concepts/pipelines/kfTypes.ts
+++ b/frontend/src/concepts/pipelines/kfTypes.ts
@@ -436,7 +436,7 @@ export const runtimeStateLabels = {
   [RuntimeStateKF.RUNTIME_STATE_UNSPECIFIED]: 'Unspecified',
   [RuntimeStateKF.PENDING]: 'Pending',
   [RuntimeStateKF.RUNNING]: 'Running',
-  [RuntimeStateKF.SUCCEEDED]: 'Succeeded',
+  [RuntimeStateKF.SUCCEEDED]: 'Complete',
   [RuntimeStateKF.SKIPPED]: 'Skipped',
   [RuntimeStateKF.FAILED]: 'Failed',
   [RuntimeStateKF.CANCELING]: 'Canceling',
diff --git a/frontend/src/concepts/topology/NodeStatusIcon.tsx b/frontend/src/concepts/topology/NodeStatusIcon.tsx
index 70d15cb289..464b111f94 100644
--- a/frontend/src/concepts/topology/NodeStatusIcon.tsx
+++ b/frontend/src/concepts/topology/NodeStatusIcon.tsx
@@ -1,63 +1,53 @@
 import React from 'react';
 import {
+  AngleDoubleRightIcon,
+  BanIcon,
   CheckCircleIcon,
   ExclamationCircleIcon,
-  BanIcon,
   InProgressIcon,
-  OutlinedWindowRestoreIcon,
   PendingIcon,
 } from '@patternfly/react-icons';
+import { RunStatus } from '@patternfly/react-topology';
 import { Icon, Tooltip } from '@patternfly/react-core';
-import { RuntimeStateKF, runtimeStateLabels } from '#~/concepts/pipelines/kfTypes';
+import { runtimeStateLabels, RuntimeStateKF } from '#~/concepts/pipelines/kfTypes';
 
-const NodeStatusIcon: React.FC<{ runStatus: RuntimeStateKF | string }> = ({ runStatus }) => {
+const NodeStatusIcon: React.FC<{ runStatus: RunStatus | string }> = ({ runStatus }) => {
   let icon: React.ReactNode;
   let status: React.ComponentProps<typeof Icon>['status'];
   let label: string;
 
   switch (runStatus) {
-    case runtimeStateLabels[RuntimeStateKF.PENDING]:
-    case runtimeStateLabels[RuntimeStateKF.RUNTIME_STATE_UNSPECIFIED]:
+    case RunStatus.Pending:
+    case RunStatus.Idle:
       icon = <PendingIcon />;
       label = runtimeStateLabels[RuntimeStateKF.PENDING];
       break;
-    case runtimeStateLabels[RuntimeStateKF.RUNNING]:
+    case RunStatus.Running:
+    case RunStatus.InProgress:
       icon = <InProgressIcon />;
       status = 'info';
       label = runtimeStateLabels[RuntimeStateKF.RUNNING];
       break;
-    case runtimeStateLabels[RuntimeStateKF.CACHED]:
-      icon = <OutlinedWindowRestoreIcon />;
+    case RunStatus.Skipped:
+      icon = <AngleDoubleRightIcon />;
       status = 'success';
-      label = runtimeStateLabels[RuntimeStateKF.CACHED];
-      break;
-    case runtimeStateLabels[RuntimeStateKF.SKIPPED]:
-      icon = <CheckCircleIcon />;
       label = runtimeStateLabels[RuntimeStateKF.SKIPPED];
       break;
-    case runtimeStateLabels[RuntimeStateKF.SUCCEEDED]:
+    case RunStatus.Succeeded:
       icon = <CheckCircleIcon />;
       status = 'success';
       label = runtimeStateLabels[RuntimeStateKF.SUCCEEDED];
       break;
-    case runtimeStateLabels[RuntimeStateKF.FAILED]:
+    case RunStatus.Failed:
+    case RunStatus.FailedToStart:
       icon = <ExclamationCircleIcon />;
       status = 'danger';
       label = runtimeStateLabels[RuntimeStateKF.FAILED];
       break;
-    case runtimeStateLabels[RuntimeStateKF.CANCELING]:
+    case RunStatus.Cancelled:
       icon = <BanIcon />;
-      label = runtimeStateLabels[RuntimeStateKF.CANCELING];
-      break;
-    case runtimeStateLabels[RuntimeStateKF.CANCELED]:
-      icon = <BanIcon />;
-      status = 'warning';
       label = runtimeStateLabels[RuntimeStateKF.CANCELED];
       break;
-    case runtimeStateLabels[RuntimeStateKF.PAUSED]:
-      icon = <BanIcon />;
-      label = runtimeStateLabels[RuntimeStateKF.PAUSED];
-      break;
     case undefined:
     default:
       icon = null;
diff --git a/frontend/src/concepts/topology/__tests__/NodeStatusIcon.spec.tsx b/frontend/src/concepts/topology/__tests__/NodeStatusIcon.spec.tsx
new file mode 100644
index 0000000000..36140dd378
--- /dev/null
+++ b/frontend/src/concepts/topology/__tests__/NodeStatusIcon.spec.tsx
@@ -0,0 +1,70 @@
+import * as React from 'react';
+import { render } from '@testing-library/react';
+import { RunStatus } from '@patternfly/react-topology';
+import NodeStatusIcon from '#~/concepts/topology/NodeStatusIcon';
+
+describe('NodeStatusIcon', () => {
+  it('should render icon for RunStatus.Pending', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.Pending} />);
+    expect(container.querySelector('.pf-v6-c-icon')).toBeInTheDocument();
+  });
+
+  it('should render icon for RunStatus.Idle', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.Idle} />);
+    expect(container.querySelector('.pf-v6-c-icon')).toBeInTheDocument();
+  });
+
+  it('should render with info status for RunStatus.Running', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.Running} />);
+    expect(container.querySelector('.pf-v6-c-icon__content')).toHaveClass('pf-m-info');
+  });
+
+  it('should render with info status for RunStatus.InProgress', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.InProgress} />);
+    expect(container.querySelector('.pf-v6-c-icon__content')).toHaveClass('pf-m-info');
+  });
+
+  it('should render with success status for RunStatus.Skipped', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.Skipped} />);
+    expect(container.querySelector('.pf-v6-c-icon__content')).toHaveClass('pf-m-success');
+  });
+
+  it('should render with success status for RunStatus.Succeeded', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.Succeeded} />);
+    expect(container.querySelector('.pf-v6-c-icon__content')).toHaveClass('pf-m-success');
+  });
+
+  it('should render with danger status for RunStatus.Failed', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.Failed} />);
+    expect(container.querySelector('.pf-v6-c-icon__content')).toHaveClass('pf-m-danger');
+  });
+
+  it('should render with danger status for RunStatus.FailedToStart', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.FailedToStart} />);
+    expect(container.querySelector('.pf-v6-c-icon__content')).toHaveClass('pf-m-danger');
+  });
+
+  it('should render with no status modifier for RunStatus.Cancelled', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.Cancelled} />);
+    const content = container.querySelector('.pf-v6-c-icon__content');
+    expect(content).not.toHaveClass('pf-m-info');
+    expect(content).not.toHaveClass('pf-m-success');
+    expect(content).not.toHaveClass('pf-m-danger');
+  });
+
+  it('should render with no status modifier for RunStatus.Pending', () => {
+    const { container } = render(<NodeStatusIcon runStatus={RunStatus.Pending} />);
+    const content = container.querySelector('.pf-v6-c-icon__content');
+    expect(content).not.toHaveClass('pf-m-info');
+    expect(content).not.toHaveClass('pf-m-success');
+    expect(content).not.toHaveClass('pf-m-danger');
+  });
+
+  it('should render with no status modifier for unknown status', () => {
+    const { container } = render(<NodeStatusIcon runStatus="unknown-status" />);
+    const content = container.querySelector('.pf-v6-c-icon__content');
+    expect(content).not.toHaveClass('pf-m-info');
+    expect(content).not.toHaveClass('pf-m-success');
+    expect(content).not.toHaveClass('pf-m-danger');
+  });
+});
diff --git a/frontend/src/pages/BYONImages/BYONImageHardwareProfiles.tsx b/frontend/src/pages/BYONImages/BYONImageHardwareProfiles.tsx
index d257cc35e1..92bef5f572 100644
--- a/frontend/src/pages/BYONImages/BYONImageHardwareProfiles.tsx
+++ b/frontend/src/pages/BYONImages/BYONImageHardwareProfiles.tsx
@@ -69,7 +69,6 @@ const BYONImageHardwareProfiles: React.FC<BYONImageHardwareProfilesProps> = ({
           >
             <Label
               color="blue"
-              variant="outline"
               render={({ className, content }) => (
                 <Link
                   to={`/settings/environment-setup/workbench-images/hardware-profile/create?${new URLSearchParams(
diff --git a/frontend/src/pages/distributedWorkloads/components/WorkloadStatusLabel.tsx b/frontend/src/pages/distributedWorkloads/components/WorkloadStatusLabel.tsx
index 5613ababf8..c2ee9d1467 100644
--- a/frontend/src/pages/distributedWorkloads/components/WorkloadStatusLabel.tsx
+++ b/frontend/src/pages/distributedWorkloads/components/WorkloadStatusLabel.tsx
@@ -6,7 +6,12 @@ import { getStatusInfo } from '#~/concepts/distributedWorkloads/utils';
 export const WorkloadStatusLabel: React.FC<{ workload: WorkloadKind }> = ({ workload }) => {
   const statusInfo = getStatusInfo(workload);
   return (
-    <Label color={statusInfo.color} icon={<statusInfo.icon />}>
+    <Label
+      variant="outline"
+      color={statusInfo.color}
+      status={statusInfo.labelStatus}
+      icon={<statusInfo.icon />}
+    >
       {statusInfo.status}
     </Label>
   );
diff --git a/frontend/src/pages/distributedWorkloads/global/projectMetrics/sections/TopResourceConsumingWorkloads.tsx b/frontend/src/pages/distributedWorkloads/global/projectMetrics/sections/TopResourceConsumingWorkloads.tsx
index 7183478512..5dc3d3bb98 100644
--- a/frontend/src/pages/distributedWorkloads/global/projectMetrics/sections/TopResourceConsumingWorkloads.tsx
+++ b/frontend/src/pages/distributedWorkloads/global/projectMetrics/sections/TopResourceConsumingWorkloads.tsx
@@ -139,7 +139,7 @@ export const TopResourceConsumingWorkloads: React.FC = () => {
     !topWorkloadsByUsage.memoryBytesUsed.totalUsage
   ) {
     const workloadStatuses = [];
-    if (workloads.data.some((wl) => getStatusInfo(wl).status === WorkloadStatusType.Succeeded)) {
+    if (workloads.data.some((wl) => getStatusInfo(wl).status === WorkloadStatusType.Complete)) {
       workloadStatuses.push('completed');
     }
     if (workloads.data.some((wl) => getStatusInfo(wl).status === WorkloadStatusType.Failed)) {
diff --git a/frontend/src/pages/modelServing/screens/ServingRuntimeVersionStatus.tsx b/frontend/src/pages/modelServing/screens/ServingRuntimeVersionStatus.tsx
index 3615cb8232..7576920b08 100644
--- a/frontend/src/pages/modelServing/screens/ServingRuntimeVersionStatus.tsx
+++ b/frontend/src/pages/modelServing/screens/ServingRuntimeVersionStatus.tsx
@@ -54,7 +54,7 @@ const ServingRuntimeVersionStatus: React.FC<ServingRuntimeVersionStatusProps> =
       >
         <Label
           data-testid="serving-runtime-version-status-label"
-          color={isOutdated ? 'yellow' : 'green'}
+          status={isOutdated ? 'warning' : 'success'}
           icon={isOutdated ? <ExclamationTriangleIcon /> : <CheckCircleIcon />}
           isCompact
         >
diff --git a/frontend/src/pages/pipelines/global/experiments/ExperimentPipelineRuns.tsx b/frontend/src/pages/pipelines/global/experiments/ExperimentPipelineRuns.tsx
index f24682f504..57a29e1344 100644
--- a/frontend/src/pages/pipelines/global/experiments/ExperimentPipelineRuns.tsx
+++ b/frontend/src/pages/pipelines/global/experiments/ExperimentPipelineRuns.tsx
@@ -36,7 +36,7 @@ const ExperimentPipelineRuns: PipelineCoreDetailsPageComponent = ({ breadcrumbPa
           <BreadcrumbItem>
             <Truncate content={experiment?.display_name || 'Loading...'} />
           </BreadcrumbItem>
-          {isExperimentArchived && <Label>Archived</Label>}
+          {isExperimentArchived && <Label variant="outline">Archived</Label>}
         </PipelineContextBreadcrumb>
       }
     >
diff --git a/frontend/src/pages/pipelines/global/experiments/artifacts/ArtifactDetails/ArtifactDetailsTitle.tsx b/frontend/src/pages/pipelines/global/experiments/artifacts/ArtifactDetails/ArtifactDetailsTitle.tsx
index fe186768b8..f39c60b3dd 100644
--- a/frontend/src/pages/pipelines/global/experiments/artifacts/ArtifactDetails/ArtifactDetailsTitle.tsx
+++ b/frontend/src/pages/pipelines/global/experiments/artifacts/ArtifactDetails/ArtifactDetailsTitle.tsx
@@ -17,7 +17,9 @@ const ArtifactDetailsTitle: React.FC<ArtifactDetailsTitleProps> = ({
       </SplitItem>
       {isArtifactModelRegistered && (
         <SplitItem>
-          <Label color="green">Registered</Label>
+          <Label variant="outline" color="green">
+            Registered
+          </Label>
         </SplitItem>
       )}
     </Split>
diff --git a/frontend/src/pages/pipelines/global/experiments/artifacts/ArtifactsTableRow.tsx b/frontend/src/pages/pipelines/global/experiments/artifacts/ArtifactsTableRow.tsx
index fbfd5d1c06..07c026c47d 100644
--- a/frontend/src/pages/pipelines/global/experiments/artifacts/ArtifactsTableRow.tsx
+++ b/frontend/src/pages/pipelines/global/experiments/artifacts/ArtifactsTableRow.tsx
@@ -31,7 +31,7 @@ const ArtifactsTableRow: React.FC<ArtifactsTableRowProps> = ({ artifact }) => {
           {isArtifactModelRegistered && (
             <>
               {' '}
-              <Label color="green" isCompact data-testid="model-registered-label">
+              <Label variant="outline" color="green" isCompact data-testid="model-registered-label">
                 Registered
               </Label>
             </>
diff --git a/frontend/src/pages/pipelines/global/experiments/executions/ExecutionStatus.tsx b/frontend/src/pages/pipelines/global/experiments/executions/ExecutionStatus.tsx
index a7e4e4dbab..01c352a4c1 100644
--- a/frontend/src/pages/pipelines/global/experiments/executions/ExecutionStatus.tsx
+++ b/frontend/src/pages/pipelines/global/experiments/executions/ExecutionStatus.tsx
@@ -6,8 +6,8 @@ import {
   CheckCircleIcon,
   ExclamationCircleIcon,
   InProgressIcon,
+  OutlinedQuestionCircleIcon,
   OutlinedWindowRestoreIcon,
-  PendingIcon,
 } from '@patternfly/react-icons';
 
 import { Execution } from '#~/third_party/mlmd';
@@ -19,27 +19,28 @@ type ExecutionStatusProps = {
 
 export const ExecutionStatus: React.FC<ExecutionStatusProps> = ({ status, isCompact }) => {
   let color: LabelProps['color'];
+  let statusProp: LabelProps['status'];
   let icon: React.ReactNode;
   let label: string;
 
   switch (status) {
     case Execution.State.COMPLETE:
-      color = 'green';
+      statusProp = 'success';
       icon = <CheckCircleIcon />;
       label = 'Complete';
       break;
     case Execution.State.CACHED:
-      color = 'green';
+      statusProp = 'success';
       icon = <OutlinedWindowRestoreIcon />;
       label = 'Cached';
       break;
     case Execution.State.CANCELED:
-      color = 'orangered';
+      color = 'grey';
       icon = <BanIcon />;
       label = 'Canceled';
       break;
     case Execution.State.FAILED:
-      color = 'red';
+      statusProp = 'danger';
       icon = <ExclamationCircleIcon />;
       label = 'Failed';
       break;
@@ -49,15 +50,17 @@ export const ExecutionStatus: React.FC<ExecutionStatusProps> = ({ status, isComp
       label = 'Running';
       break;
     case Execution.State.NEW:
-      icon = <PendingIcon />;
-      label = 'Pending';
+      color = 'purple';
+      label = 'New';
       break;
     default:
+      color = 'grey';
+      icon = <OutlinedQuestionCircleIcon />;
       label = 'Unknown';
   }
 
   return (
-    <Label color={color} icon={icon} isCompact={isCompact}>
+    <Label variant="outline" color={color} status={statusProp} icon={icon} isCompact={isCompact}>
       {label}
     </Label>
   );
diff --git a/frontend/src/pages/projects/screens/detail/storage/ClusterStorageTableRow.tsx b/frontend/src/pages/projects/screens/detail/storage/ClusterStorageTableRow.tsx
index fbd6f319a0..3ac8367b88 100644
--- a/frontend/src/pages/projects/screens/detail/storage/ClusterStorageTableRow.tsx
+++ b/frontend/src/pages/projects/screens/detail/storage/ClusterStorageTableRow.tsx
@@ -98,7 +98,7 @@ const ClusterStorageTableRow: React.FC<ClusterStorageTableRowProps> = ({
         ) : (
           <>
             {obj.notebookDisplayName ?? obj.name}{' '}
-            <Label isCompact color="green">
+            <Label isCompact variant="outline" status="success">
               Connected
             </Label>
           </>
diff --git a/frontend/src/pages/projects/screens/detail/storage/StorageTableRow.tsx b/frontend/src/pages/projects/screens/detail/storage/StorageTableRow.tsx
index f8dd15866b..a12b61813a 100644
--- a/frontend/src/pages/projects/screens/detail/storage/StorageTableRow.tsx
+++ b/frontend/src/pages/projects/screens/detail/storage/StorageTableRow.tsx
@@ -116,7 +116,7 @@ const StorageTableRow: React.FC<StorageTableRowProps> = ({
                       data-testid="storage-class-deleted"
                       isCompact
                       icon={<ExclamationTriangleIcon />}
-                      color="yellow"
+                      status="warning"
                     >
                       Deleted
                     </Label>
@@ -131,7 +131,7 @@ const StorageTableRow: React.FC<StorageTableRowProps> = ({
                         data-testid="storage-class-deprecated"
                         isCompact
                         icon={<ExclamationTriangleIcon />}
-                        color="yellow"
+                        status="warning"
                       >
                         Deprecated
                       </Label>
diff --git a/frontend/src/pages/projects/screens/spawner/imageSelector/ImageVersionSelector.tsx b/frontend/src/pages/projects/screens/spawner/imageSelector/ImageVersionSelector.tsx
index 655ccc009c..78f0769144 100644
--- a/frontend/src/pages/projects/screens/spawner/imageSelector/ImageVersionSelector.tsx
+++ b/frontend/src/pages/projects/screens/spawner/imageSelector/ImageVersionSelector.tsx
@@ -75,7 +75,8 @@ const ImageVersionSelector: React.FC<ImageVersionSelectorProps> = ({
                 <Label
                   data-testid="notebook-image-availability"
                   isCompact
-                  color="green"
+                  variant="outline"
+                  status="success"
                   icon={<CheckCircleIcon />}
                 >
                   Latest
diff --git a/packages/automl/frontend/src/app/components/AutomlRunsTable/AutomlRunsTableRow.tsx b/packages/automl/frontend/src/app/components/AutomlRunsTable/AutomlRunsTableRow.tsx
index 4fbf995754..4fd5e292e0 100644
--- a/packages/automl/frontend/src/app/components/AutomlRunsTable/AutomlRunsTableRow.tsx
+++ b/packages/automl/frontend/src/app/components/AutomlRunsTable/AutomlRunsTableRow.tsx
@@ -34,14 +34,15 @@ export const getStatusLabelProps = (
     return { status: 'danger' };
   }
   if (s === RUN_STATE.RUNNING || s.includes(RUN_STATE.RUNNING)) {
-    return { status: 'info' };
+    return { color: 'blue' };
   }
-  if (
-    s === RUN_STATE.INCOMPLETE ||
-    s === RUN_STATE.PENDING ||
-    s === RUN_STATE.PAUSED ||
-    s.includes(RUN_STATE.PENDING)
-  ) {
+  if (s === RUN_STATE.PENDING || s.includes(RUN_STATE.PENDING)) {
+    return { color: 'purple' };
+  }
+  if (s === RUN_STATE.SKIPPED || s.includes(RUN_STATE.SKIPPED)) {
+    return { status: 'success' };
+  }
+  if (s === RUN_STATE.INCOMPLETE) {
     return { status: 'warning' };
   }
   return { color: 'grey' };
@@ -63,7 +64,7 @@ const AutomlRunsTableRow: React.FC<AutomlRunsTableRowProps> = ({ run, namespace
     </Td>
     <Td dataLabel={automlRunsColumns[3].label}>
       {run.state ? (
-        <Label isCompact {...getStatusLabelProps(run.state)}>
+        <Label variant="outline" isCompact {...getStatusLabelProps(run.state)}>
           {run.state}
         </Label>
       ) : (
diff --git a/packages/automl/frontend/src/app/components/AutomlRunsTable/__tests__/AutomlRunsTableRow.spec.tsx b/packages/automl/frontend/src/app/components/AutomlRunsTable/__tests__/AutomlRunsTableRow.spec.tsx
index b980d7c094..3d6fe6837d 100644
--- a/packages/automl/frontend/src/app/components/AutomlRunsTable/__tests__/AutomlRunsTableRow.spec.tsx
+++ b/packages/automl/frontend/src/app/components/AutomlRunsTable/__tests__/AutomlRunsTableRow.spec.tsx
@@ -32,18 +32,18 @@ describe('getStatusLabelProps', () => {
     expect(getStatusLabelProps('CUSTOM_FAILED')).toEqual({ status: 'danger' });
   });
 
-  it('should return info status for RUNNING', () => {
-    expect(getStatusLabelProps('RUNNING')).toEqual({ status: 'info' });
-    expect(getStatusLabelProps('running')).toEqual({ status: 'info' });
+  it('should return blue color for RUNNING', () => {
+    expect(getStatusLabelProps('RUNNING')).toEqual({ color: 'blue' });
+    expect(getStatusLabelProps('running')).toEqual({ color: 'blue' });
   });
 
-  it('should return info status when state includes running', () => {
-    expect(getStatusLabelProps('STILL_RUNNING')).toEqual({ status: 'info' });
+  it('should return blue color when state includes running', () => {
+    expect(getStatusLabelProps('STILL_RUNNING')).toEqual({ color: 'blue' });
   });
 
-  it('should return warning status for PENDING', () => {
-    expect(getStatusLabelProps('PENDING')).toEqual({ status: 'warning' });
-    expect(getStatusLabelProps('pending')).toEqual({ status: 'warning' });
+  it('should return purple color for PENDING', () => {
+    expect(getStatusLabelProps('PENDING')).toEqual({ color: 'purple' });
+    expect(getStatusLabelProps('pending')).toEqual({ color: 'purple' });
   });
 
   it('should return warning status for INCOMPLETE', () => {
@@ -51,16 +51,17 @@ describe('getStatusLabelProps', () => {
     expect(getStatusLabelProps('incomplete')).toEqual({ status: 'warning' });
   });
 
-  it('should return warning status when state includes pending', () => {
-    expect(getStatusLabelProps('AWAITING_PENDING')).toEqual({ status: 'warning' });
+  it('should return purple color when state includes pending', () => {
+    expect(getStatusLabelProps('AWAITING_PENDING')).toEqual({ color: 'purple' });
   });
 
-  it('should return warning status for PAUSED', () => {
-    expect(getStatusLabelProps('PAUSED')).toEqual({ status: 'warning' });
+  it('should return grey color for PAUSED', () => {
+    expect(getStatusLabelProps('PAUSED')).toEqual({ color: 'grey' });
   });
 
-  it('should return grey color for SKIPPED', () => {
-    expect(getStatusLabelProps('SKIPPED')).toEqual({ color: 'grey' });
+  it('should return success status for SKIPPED', () => {
+    expect(getStatusLabelProps('SKIPPED')).toEqual({ status: 'success' });
+    expect(getStatusLabelProps('skipped')).toEqual({ status: 'success' });
   });
 
   it('should return grey color for CANCELLED', () => {
diff --git a/packages/autorag/frontend/src/app/components/AutoragRunsTable/AutoragRunsTableRow.tsx b/packages/autorag/frontend/src/app/components/AutoragRunsTable/AutoragRunsTableRow.tsx
index 03685f99b0..7d3ad20fdb 100644
--- a/packages/autorag/frontend/src/app/components/AutoragRunsTable/AutoragRunsTableRow.tsx
+++ b/packages/autorag/frontend/src/app/components/AutoragRunsTable/AutoragRunsTableRow.tsx
@@ -33,9 +33,12 @@ const getStatusLabelProps = (
     return { status: 'danger' };
   }
   if (s === RUN_STATE.RUNNING || s.includes(RUN_STATE.RUNNING)) {
-    return { status: 'info' };
+    return { color: 'blue' };
   }
-  if (s === RUN_STATE.INCOMPLETE || s === RUN_STATE.PENDING || s.includes(RUN_STATE.PENDING)) {
+  if (s === RUN_STATE.PENDING || s.includes(RUN_STATE.PENDING)) {
+    return { color: 'purple' };
+  }
+  if (s === RUN_STATE.INCOMPLETE) {
     return { status: 'warning' };
   }
   return { color: 'grey' };
@@ -57,7 +60,7 @@ const AutoragRunsTableRow: React.FC<AutoragRunsTableRowProps> = ({ run, namespac
     </Td>
     <Td dataLabel={autoragRunsColumns[3].label}>
       {run.state ? (
-        <Label isCompact {...getStatusLabelProps(run.state)}>
+        <Label variant="outline" isCompact {...getStatusLabelProps(run.state)}>
           {run.state}
         </Label>
       ) : (
diff --git a/packages/cypress/cypress/tests/e2e/dataScienceProjects/models/testDeployLLMDServing.cy.ts b/packages/cypress/cypress/tests/e2e/dataScienceProjects/models/testDeployLLMDServing.cy.ts
index 5159c9ce9e..9f8c6dd48a 100644
--- a/packages/cypress/cypress/tests/e2e/dataScienceProjects/models/testDeployLLMDServing.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/dataScienceProjects/models/testDeployLLMDServing.cy.ts
@@ -172,7 +172,7 @@ describe('A user can deploy an LLMD model', () => {
 
       cy.step('Verify the model Row');
       const llmdRow = modelServingGlobal.getDeploymentRow(modelName);
-      llmdRow.findStatusLabel(ModelStateLabel.STARTED).should('exist');
+      llmdRow.findStatusLabel(ModelStateLabel.READY).should('exist');
       llmdRow.findServingRuntime().should('have.text', servingRuntime);
       llmdRow.findKebab().click();
       inferenceServiceActions.findDeleteInferenceServiceAction().click();
@@ -219,7 +219,7 @@ describe('A user can deploy an LLMD model', () => {
       checkLLMInferenceServiceState(yamlEditorModelName, projectName, { checkReady: true });
 
       cy.step('Verify the model Row');
-      llmdRow.findStatusLabel(ModelStateLabel.STARTED).should('exist');
+      llmdRow.findStatusLabel(ModelStateLabel.READY).should('exist');
       llmdRow.findKebab().click();
       inferenceServiceActions.findEditInferenceServiceAction().click();
       modelServingWizard.findYAMLEditFallbackAlert().should('exist');
diff --git a/packages/cypress/cypress/tests/e2e/dataScienceProjects/models/testSingleModelAdminCreation.cy.ts b/packages/cypress/cypress/tests/e2e/dataScienceProjects/models/testSingleModelAdminCreation.cy.ts
index d35c192afe..f05964c6ea 100644
--- a/packages/cypress/cypress/tests/e2e/dataScienceProjects/models/testSingleModelAdminCreation.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/dataScienceProjects/models/testSingleModelAdminCreation.cy.ts
@@ -195,7 +195,7 @@ describe('Verify Admin Single Model Creation and Validation using the UI', () =>
       kServeRow
         .findStatusLabel()
         .invoke('text')
-        .should('match', new RegExp(`${ModelStateLabel.STARTING}|${ModelStateLabel.STARTED}`));
+        .should('match', new RegExp(`${ModelStateLabel.STARTING}|${ModelStateLabel.READY}`));
 
       //Verify external access still works after restart
       cy.step('Verify the model is still accessible externally after restart');
diff --git a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchControlSuite.cy.ts b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchControlSuite.cy.ts
index b5ba7fc554..aaa5825745 100644
--- a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchControlSuite.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchControlSuite.cy.ts
@@ -103,7 +103,7 @@ describe('Start, Stop, Launch and Delete a Workbench in RHOAI', () => {
           cy.step(`Wait for workbench ${workbenchName} to display a "Running" status`);
           const notebookRow = workbenchPage.getNotebookRow(workbenchName);
           notebookRow.findNotebookDescription(controlSuiteTestDescription);
-          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
           // Use the dynamic image name verification based on what was actually selected
           getImageStreamDisplayName(selectedImageStream).then((displayName) => {
@@ -118,7 +118,7 @@ describe('Start, Stop, Launch and Delete a Workbench in RHOAI', () => {
             // Restart workbench and confirm initiation
             cy.step('Restart workbench and validate it starts successfully');
             notebookRow.findNotebookStopToggle().click();
-            notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+            notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
             // Delete workbench
             cy.step('Delete workbench and confirm deleteion');
@@ -188,7 +188,7 @@ describe('Start, Stop, Launch and Delete a Workbench in RHOAI', () => {
           // Start the Workbench and validate it has started successfully
           cy.step('Restart the workbench and confirm the workbench has started successfully');
           workbenchStatusModal.findStartWorkbenchFooterButton().click();
-          workbenchStatusModal.getNotebookStatus(NotebookStatusLabel.Running, 120000);
+          workbenchStatusModal.getNotebookStatus(NotebookStatusLabel.Ready, 120000);
         },
       );
     },
diff --git a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchCreation.cy.ts b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchCreation.cy.ts
index 29defabe78..ed9e5e938a 100644
--- a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchCreation.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchCreation.cy.ts
@@ -115,7 +115,7 @@ describe('Create, Delete and Edit - Workbench Tests', () => {
           // Wait for workbench to run
           cy.step(`Wait for workbench ${workbenchName} to display a "Running" status`);
           const notebookRow = workbenchPage.getNotebookRow(workbenchName);
-          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
           // Use dynamic image name verification based on what was actually selected
           getImageStreamDisplayName(selectedImageStream).then((displayName) => {
diff --git a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchKueue.cy.ts b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchKueue.cy.ts
index 02a1d5d601..3897e22227 100644
--- a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchKueue.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchKueue.cy.ts
@@ -87,7 +87,7 @@ describe('Workbench Kueue Integration Tests', () => {
 
       cy.step('Wait for workbench to reach Running status');
       const notebookRow = workbenchPage.getNotebookRow(workbenchName);
-      notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 300000);
+      notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 300000);
 
       cy.step('Verify Kueue Workload CR exists and is admitted');
       verifyWorkloadAdmitted(projectName);
diff --git a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchStatus.cy.ts b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchStatus.cy.ts
index 02cfb81f88..6c5697f766 100644
--- a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchStatus.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchStatus.cy.ts
@@ -89,7 +89,7 @@ describe('Workbenches - status tests', () => {
           cy.step(`Wait for workbench ${workbenchName} to display a "Running" status`);
           const notebookRow = workbenchPage.getNotebookRow(workbenchName);
           notebookRow.findNotebookDescription(projectDescription);
-          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
           // Use dynamic image name verification based on what was actually selected
           getImageStreamDisplayName(selectedImageStream).then((displayName) => {
@@ -100,7 +100,7 @@ describe('Workbenches - status tests', () => {
               'Click on Running status, validate the Running status and navigate to the Progress tab',
             );
             notebookRow.findHaveNotebookStatusText().click();
-            workbenchStatusModal.getNotebookStatus(NotebookStatusLabel.Running);
+            workbenchStatusModal.getNotebookStatus(NotebookStatusLabel.Ready);
 
             // Click on the Events log and validate that successful list messages display.
             cy.step('Navigate to Events Tab and verify successful event messages are displayed');
diff --git a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchVariables.cy.ts b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchVariables.cy.ts
index 3f66690f7f..107cae2148 100644
--- a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchVariables.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/testWorkbenchVariables.cy.ts
@@ -97,7 +97,7 @@ describe('Workbenches - variable tests', () => {
           cy.step(`Wait for workbench ${workbenchName} to display a "Running" status`);
           const notebookRow = workbenchPage.getNotebookRow(workbenchName);
           notebookRow.findNotebookDescription(testData.wbVariablesTestDescription);
-          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
           // Use dynamic image name verification for first workbench
           getImageStreamDisplayName(selectedImageStream).then((displayName) => {
@@ -136,7 +136,7 @@ describe('Workbenches - variable tests', () => {
                 cy.step(`Wait for workbench ${workbenchName2} to display a "Running" status`);
                 const notebookRow2 = workbenchPage.getNotebookRow(workbenchName2);
                 notebookRow2.findNotebookDescription(testData.wbVariablesTestDescription);
-                notebookRow2.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+                notebookRow2.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
                 // Use dynamic image name verification for second workbench
                 getImageStreamDisplayName(selectedImageStream2).then((displayName2) => {
@@ -207,7 +207,7 @@ describe('Workbenches - variable tests', () => {
           cy.step(`Wait for workbench ${workbenchName} to display a "Running" status`);
           const notebookRow = workbenchPage.getNotebookRow(workbenchName);
           notebookRow.findNotebookDescription(testData.wbVariablesTestDescription);
-          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
           // Use dynamic image name verification for first workbench
           getImageStreamDisplayName(selectedImageStream).then((displayName) => {
@@ -246,7 +246,7 @@ describe('Workbenches - variable tests', () => {
                 cy.step(`Wait for workbench ${workbenchName2} to display a "Running" status`);
                 const notebookRow2 = workbenchPage.getNotebookRow(workbenchName2);
                 notebookRow2.findNotebookDescription(testData.wbVariablesTestDescription);
-                notebookRow2.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+                notebookRow2.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
                 // Use dynamic image name verification for second workbench
                 getImageStreamDisplayName(selectedImageStream2).then((displayName2) => {
diff --git a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/workbenches.cy.ts b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/workbenches.cy.ts
index 21ce45381b..bc5583d3ca 100644
--- a/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/workbenches.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/dataScienceProjects/workbenches/workbenches.cy.ts
@@ -137,7 +137,7 @@ describe('Workbench and PVSs tests', () => {
 
           cy.step(`Wait for Workbench ${workbenchName} to display a "Running" status`);
           const notebookRow = workbenchPage.getNotebookRow(workbenchName);
-          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+          notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
           // Use dynamic image name verification based on what was actually selected
           getImageStreamDisplayName(selectedImageStream).then((displayName) => {
diff --git a/packages/cypress/cypress/tests/e2e/settings/hardwareProfiles/testDeleteAppliedHardwareProfile.cy.ts b/packages/cypress/cypress/tests/e2e/settings/hardwareProfiles/testDeleteAppliedHardwareProfile.cy.ts
index d3d1e01742..4df0de38a2 100644
--- a/packages/cypress/cypress/tests/e2e/settings/hardwareProfiles/testDeleteAppliedHardwareProfile.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/settings/hardwareProfiles/testDeleteAppliedHardwareProfile.cy.ts
@@ -95,7 +95,7 @@ describe('Delete Hardware Profile applied to a resource', () => {
       cy.step(`Wait for workbench ${testData.workbenchName} to display a "Running" status`);
       const notebookRow = workbenchPage.getNotebookRow(testData.workbenchName);
       notebookRow.findNotebookDescription(projectDescription);
-      notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+      notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
       // Validate that the toleration applied earlier displays in the newly created pod
       cy.step('Validate the Tolerations for the pod include the applied toleration');
@@ -146,7 +146,7 @@ describe('Delete Hardware Profile applied to a resource', () => {
       cy.step('Verify workbench is still running after hardware profile deletion');
       const workbenchRow = workbenchPage.getNotebookRow(testData.workbenchName);
       workbenchRow.findNotebookDescription(projectDescription);
-      workbenchRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 30000);
+      workbenchRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 30000);
 
       // Verify the Hardware profile column shows "Deleted" badge
       cy.step(`Verify Hardware profile column shows "${testData.deletedStatusBadge}" badge`);
diff --git a/packages/cypress/cypress/tests/e2e/settings/hardwareProfiles/testWorkbenchTolerations.cy.ts b/packages/cypress/cypress/tests/e2e/settings/hardwareProfiles/testWorkbenchTolerations.cy.ts
index 72783aca0a..02e06912f8 100644
--- a/packages/cypress/cypress/tests/e2e/settings/hardwareProfiles/testWorkbenchTolerations.cy.ts
+++ b/packages/cypress/cypress/tests/e2e/settings/hardwareProfiles/testWorkbenchTolerations.cy.ts
@@ -98,7 +98,7 @@ describe('Workbenches - tolerations tests', () => {
       cy.step(`Wait for workbench ${testData.workbenchName} to display a "Running" status`);
       const notebookRow = workbenchPage.getNotebookRow(testData.workbenchName);
       notebookRow.findNotebookDescription(projectDescription);
-      notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+      notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
 
       // Validate that the toleration applied earlier displays in the newly created pod
       cy.step('Validate the Tolerations for the pod include the newly added toleration');
@@ -172,7 +172,7 @@ describe('Workbenches - tolerations tests', () => {
       cy.step(`Restart workbench ${testData.workbenchName} and validate it has been started`);
       const notebookRow = workbenchPage.getNotebookRow(testData.workbenchName);
       notebookRow.findNotebookStopToggle().click();
-      notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Running, 120000);
+      notebookRow.expectStatusLabelToBe(NotebookStatusLabel.Ready, 120000);
       cy.reload();
 
       // Validate that the toleration applied earlier still displays in the pod
diff --git a/packages/cypress/cypress/tests/mocked/distributedWorkloads/globalDistributedWorkloads.cy.ts b/packages/cypress/cypress/tests/mocked/distributedWorkloads/globalDistributedWorkloads.cy.ts
index 64c399bdc1..7624555154 100644
--- a/packages/cypress/cypress/tests/mocked/distributedWorkloads/globalDistributedWorkloads.cy.ts
+++ b/packages/cypress/cypress/tests/mocked/distributedWorkloads/globalDistributedWorkloads.cy.ts
@@ -79,7 +79,7 @@ const initIntercepts = ({
       k8sName: 'test-workload-finished',
       ownerKind: WorkloadOwnerType.Job,
       ownerName: 'test-workload-finished-job',
-      mockStatus: WorkloadStatusType.Succeeded,
+      mockStatus: WorkloadStatusType.Complete,
       podSets: [mockPodset, mockPodset],
     }),
     mockWorkloadK8sResource({
@@ -93,14 +93,14 @@ const initIntercepts = ({
       k8sName: 'test-workload-spinning-down-both',
       ownerKind: WorkloadOwnerType.RayCluster,
       ownerName: 'test-workload-spinning-down-both-rc',
-      mockStatus: WorkloadStatusType.Succeeded,
+      mockStatus: WorkloadStatusType.Complete,
       podSets: [mockPodset, mockPodset],
     }),
     mockWorkloadK8sResource({
       k8sName: 'test-workload-spinning-down-cpu-only',
       ownerKind: WorkloadOwnerType.RayCluster,
       ownerName: 'test-workload-spinning-down-cpu-only-rc',
-      mockStatus: WorkloadStatusType.Succeeded,
+      mockStatus: WorkloadStatusType.Complete,
       podSets: [mockPodset, mockPodset],
     }),
   ],
@@ -401,7 +401,7 @@ describe('Workload Status tab', () => {
 
     const statusOverview = globalDistributedWorkloads.findStatusOverviewCard();
     statusOverview.should('exist');
-    statusOverview.findByText('Succeeded: 3').should('exist');
+    statusOverview.findByText('Complete: 3').should('exist');
   });
 
   it('Should render the status overview chart with pending fallback statuses', () => {
diff --git a/packages/cypress/cypress/tests/mocked/modelServing/modelServingLlmd.cy.ts b/packages/cypress/cypress/tests/mocked/modelServing/modelServingLlmd.cy.ts
index 2c1936a216..2dc4949ed4 100644
--- a/packages/cypress/cypress/tests/mocked/modelServing/modelServingLlmd.cy.ts
+++ b/packages/cypress/cypress/tests/mocked/modelServing/modelServingLlmd.cy.ts
@@ -189,7 +189,7 @@ describe('Model Serving LLMD', () => {
         .findByTestId('api-protocol-label')
         .should('have.text', 'REST');
       row.findLastDeployed().should('have.text', '17 Mar 2023');
-      row.findStatusLabel('Started');
+      row.findStatusLabel('Ready');
 
       // expanded section of the row
       row.findToggleButton('llmd-serving').click();
diff --git a/packages/cypress/cypress/tests/mocked/modelServing/runtime/servingRuntimeList.cy.ts b/packages/cypress/cypress/tests/mocked/modelServing/runtime/servingRuntimeList.cy.ts
index a5fd96abd0..e83793bfeb 100644
--- a/packages/cypress/cypress/tests/mocked/modelServing/runtime/servingRuntimeList.cy.ts
+++ b/packages/cypress/cypress/tests/mocked/modelServing/runtime/servingRuntimeList.cy.ts
@@ -626,7 +626,7 @@ describe('Serving Runtime List', () => {
       projectDetails.visitSection('test-project', 'model-server');
 
       const kserveRow = modelServingSection.getKServeRow('test-model');
-      kserveRow.findStatusLabel(ModelStateLabel.STARTED);
+      kserveRow.findStatusLabel(ModelStateLabel.READY);
 
       const stoppedInferenceService = mockInferenceServiceK8sResource({
         name: 'test-model',
@@ -708,7 +708,7 @@ describe('Serving Runtime List', () => {
       kserveRow.findStateActionToggle().should('have.text', ModelStateToggleLabel.START).click();
       cy.reload();
       cy.wait(['@startModelPatch', '@getStartedModel']);
-      kserveRow.findStatusLabel(ModelStateLabel.STARTED);
+      kserveRow.findStatusLabel(ModelStateLabel.READY);
       kserveRow.findStateActionToggle().should('have.text', ModelStateToggleLabel.STOP);
     });
 
diff --git a/packages/cypress/cypress/tests/mocked/modelTraining/modelTraining.cy.ts b/packages/cypress/cypress/tests/mocked/modelTraining/modelTraining.cy.ts
index ff438806ca..e68758d958 100644
--- a/packages/cypress/cypress/tests/mocked/modelTraining/modelTraining.cy.ts
+++ b/packages/cypress/cypress/tests/mocked/modelTraining/modelTraining.cy.ts
@@ -302,7 +302,7 @@ const mockWorkloads = mockTrainJobs.map((job) => {
   if (jobStatus === TrainingJobState.FAILED) {
     workloadStatus = WorkloadStatusType.Failed;
   } else if (jobStatus === TrainingJobState.SUCCEEDED) {
-    workloadStatus = WorkloadStatusType.Succeeded;
+    workloadStatus = WorkloadStatusType.Complete;
   } else if (jobStatus === TrainingJobState.PENDING) {
     workloadStatus = WorkloadStatusType.Pending;
   } else if (jobStatus === TrainingJobState.PAUSED) {
diff --git a/packages/cypress/cypress/tests/mocked/modelTraining/modelTrainingPauseResume.cy.ts b/packages/cypress/cypress/tests/mocked/modelTraining/modelTrainingPauseResume.cy.ts
index 91bf7fac53..aebf13dc70 100644
--- a/packages/cypress/cypress/tests/mocked/modelTraining/modelTrainingPauseResume.cy.ts
+++ b/packages/cypress/cypress/tests/mocked/modelTraining/modelTrainingPauseResume.cy.ts
@@ -103,7 +103,7 @@ const mockWorkloads = mockTrainJobs.map((job) => {
   if (jobStatus === TrainingJobState.FAILED) {
     workloadStatus = WorkloadStatusType.Failed;
   } else if (jobStatus === TrainingJobState.SUCCEEDED) {
-    workloadStatus = WorkloadStatusType.Succeeded;
+    workloadStatus = WorkloadStatusType.Complete;
   } else if (jobStatus === TrainingJobState.PAUSED) {
     workloadStatus = WorkloadStatusType.Running;
     workloadSpec = { active: false };
diff --git a/packages/cypress/cypress/tests/mocked/projects/tabs/workbench.cy.ts b/packages/cypress/cypress/tests/mocked/projects/tabs/workbench.cy.ts
index aa2d4c4bb7..59f879ecf5 100644
--- a/packages/cypress/cypress/tests/mocked/projects/tabs/workbench.cy.ts
+++ b/packages/cypress/cypress/tests/mocked/projects/tabs/workbench.cy.ts
@@ -1194,7 +1194,7 @@ describe('Workbench page', () => {
     notebookRow.find().findByText('Test Image').should('exist');
     notebookRow.findProjectScopedLabel().should('exist');
     notebookRow.shouldHaveHardwareProfile('Small');
-    notebookRow.findHaveNotebookStatusText().should('have.text', 'Running');
+    notebookRow.findHaveNotebookStatusText().should('have.text', 'Ready');
     notebookRow.findNotebookRouteLink().should('not.have.attr', 'aria-disabled');
   });
 
@@ -1333,7 +1333,7 @@ describe('Workbench page', () => {
     const notebookRow = workbenchPage.getNotebookRow('Test Notebook');
     notebookRow.shouldHaveNotebookImageName('Test Image');
     notebookRow.shouldHaveHardwareProfile('Small');
-    notebookRow.findHaveNotebookStatusText().should('have.text', 'Running');
+    notebookRow.findHaveNotebookStatusText().should('have.text', 'Ready');
     notebookRow.findNotebookRouteLink().should('not.have.attr', 'aria-disabled');
 
     //Name sorting
@@ -2555,11 +2555,11 @@ describe('Workbench page', () => {
     );
     workbenchPage.visit('test-project');
     const notebookRow = workbenchPage.getNotebookRow('Test Notebook');
-    notebookRow.findHaveNotebookStatusText().should('have.text', 'Running');
+    notebookRow.findHaveNotebookStatusText().should('have.text', 'Ready');
     notebookRow.findHaveNotebookStatusText().click();
 
     workbenchStatusModal.find().should('be.visible');
-    workbenchStatusModal.getNotebookStatus('Running');
+    workbenchStatusModal.getNotebookStatus('Ready');
 
     workbenchStatusModal.findProgressTab().should('be.visible').click();
     workbenchStatusModal.findProgressSteps().should('exist');
@@ -2574,7 +2574,7 @@ describe('Workbench page', () => {
     initKueueEnabledForStatusModal();
     workbenchPage.visit('test-project');
     const notebookRow = workbenchPage.getNotebookRow('Test Notebook');
-    notebookRow.findHaveNotebookStatusText().should('have.text', 'Running');
+    notebookRow.findHaveNotebookStatusText().should('have.text', 'Ready');
     notebookRow.findHaveNotebookStatusText().click();
 
     workbenchStatusModal.find().should('be.visible');
@@ -2587,7 +2587,7 @@ describe('Workbench page', () => {
     initKueueEnabledForStatusModal();
     workbenchPage.visit('test-project');
     const notebookRow = workbenchPage.getNotebookRow('Test Notebook');
-    notebookRow.findHaveNotebookStatusText().should('have.text', 'Running');
+    notebookRow.findHaveNotebookStatusText().should('have.text', 'Ready');
     notebookRow.findHaveNotebookStatusText().click();
 
     workbenchStatusModal.find().should('be.visible');
diff --git a/packages/cypress/cypress/types.ts b/packages/cypress/cypress/types.ts
index 1b6a932023..85ae8e9092 100644
--- a/packages/cypress/cypress/types.ts
+++ b/packages/cypress/cypress/types.ts
@@ -529,7 +529,7 @@ export const AccessModeLabelMap: Record<AccessMode, string> = {
 };
 
 export enum NotebookStatusLabel {
-  Running = 'Running',
+  Ready = 'Ready',
   Starting = 'Starting',
   Stopping = 'Stopping',
   Stopped = 'Stopped',
diff --git a/packages/eval-hub/frontend/src/app/components/EvaluationStatusLabel.tsx b/packages/eval-hub/frontend/src/app/components/EvaluationStatusLabel.tsx
index 601a765839..89f55e6107 100644
--- a/packages/eval-hub/frontend/src/app/components/EvaluationStatusLabel.tsx
+++ b/packages/eval-hub/frontend/src/app/components/EvaluationStatusLabel.tsx
@@ -1,56 +1,57 @@
 import * as React from 'react';
-import { Icon, Label, Popover, Stack, StackItem } from '@patternfly/react-core';
+import { Icon, Label, LabelProps, Popover, Stack, StackItem } from '@patternfly/react-core';
 import {
+  BanIcon,
   CheckCircleIcon,
   ExclamationCircleIcon,
   InProgressIcon,
-  PausedIcon,
+  OffIcon,
   PendingIcon,
-  StopCircleIcon,
 } from '@patternfly/react-icons';
 import { EvaluationJobState } from '~/app/types';
 
 type StatusConfig = {
   label: string;
-  color: React.ComponentProps<typeof Label>['color'];
+  color?: LabelProps['color'];
+  status?: LabelProps['status'];
   icon: React.ReactNode;
 };
 
 const statusMap: Record<EvaluationJobState, StatusConfig> = {
   pending: {
     label: 'Pending',
-    color: 'grey',
+    color: 'purple',
     icon: <PendingIcon />,
   },
   running: {
-    label: 'In progress',
+    label: 'Running',
     color: 'blue',
     icon: <InProgressIcon />,
   },
   completed: {
-    label: 'Completed',
-    color: 'green',
+    label: 'Complete',
+    status: 'success',
     icon: <CheckCircleIcon />,
   },
   failed: {
     label: 'Failed',
-    color: 'red',
+    status: 'danger',
     icon: <ExclamationCircleIcon />,
   },
   cancelled: {
-    label: 'Cancelled',
+    label: 'Canceled',
     color: 'grey',
-    icon: <StopCircleIcon />,
+    icon: <BanIcon />,
   },
   stopping: {
     label: 'Stopping',
-    color: 'blue',
-    icon: <PausedIcon />,
+    color: 'grey',
+    icon: <InProgressIcon className="odh-u-spin" />,
   },
   stopped: {
     label: 'Stopped',
     color: 'grey',
-    icon: <StopCircleIcon />,
+    icon: <OffIcon />,
   },
 };
 
@@ -65,7 +66,9 @@ const EvaluationStatusLabel: React.FC<EvaluationStatusLabelProps> = ({ state, me
 
   const label = (
     <Label
+      variant="outline"
       color={config.color}
+      status={config.status}
       icon={<Icon isInline>{config.icon}</Icon>}
       data-testid={`status-label-${state}`}
       {...(hasPopover
diff --git a/packages/eval-hub/frontend/src/app/components/__tests__/EvaluationStatusLabel.spec.tsx b/packages/eval-hub/frontend/src/app/components/__tests__/EvaluationStatusLabel.spec.tsx
index 9c8f975b0d..2147731909 100644
--- a/packages/eval-hub/frontend/src/app/components/__tests__/EvaluationStatusLabel.spec.tsx
+++ b/packages/eval-hub/frontend/src/app/components/__tests__/EvaluationStatusLabel.spec.tsx
@@ -1,16 +1,23 @@
 import * as React from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
+import { LabelProps } from '@patternfly/react-core';
 import { EvaluationJobState } from '~/app/types';
 import EvaluationStatusLabel from '~/app/components/EvaluationStatusLabel';
 
-const EXPECTED_LABELS: Record<EvaluationJobState, string> = {
-  pending: 'Pending',
-  running: 'In progress',
-  completed: 'Completed',
-  failed: 'Failed',
-  cancelled: 'Cancelled',
-  stopping: 'Stopping',
-  stopped: 'Stopped',
+type ExpectedLabelConfig = {
+  text: string;
+  color?: LabelProps['color'];
+  status?: LabelProps['status'];
+};
+
+const EXPECTED_LABELS: Record<EvaluationJobState, ExpectedLabelConfig> = {
+  pending: { text: 'Pending', color: 'purple' },
+  running: { text: 'Running', color: 'blue' },
+  completed: { text: 'Complete', status: 'success' },
+  failed: { text: 'Failed', status: 'danger' },
+  cancelled: { text: 'Canceled', color: 'grey' },
+  stopping: { text: 'Stopping', color: 'grey' },
+  stopped: { text: 'Stopped', color: 'grey' },
 };
 
 describe('EvaluationStatusLabel', () => {
@@ -18,7 +25,9 @@ describe('EvaluationStatusLabel', () => {
 
   it.each(states)('should render the correct label for "%s" state', (state) => {
     render(<EvaluationStatusLabel state={state} />);
-    expect(screen.getByTestId(`status-label-${state}`)).toHaveTextContent(EXPECTED_LABELS[state]);
+    expect(screen.getByTestId(`status-label-${state}`)).toHaveTextContent(
+      EXPECTED_LABELS[state].text,
+    );
   });
 
   it.each(states)('should render a test id for "%s" state', (state) => {
@@ -26,6 +35,28 @@ describe('EvaluationStatusLabel', () => {
     expect(screen.getByTestId(`status-label-${state}`)).toBeInTheDocument();
   });
 
+  it.each(states)('should render the correct color or status class for "%s" state', (state) => {
+    render(<EvaluationStatusLabel state={state} />);
+    const label = screen.getByTestId(`status-label-${state}`);
+    const { color, status } = EXPECTED_LABELS[state];
+    if (status) {
+      expect(label).toHaveClass(`pf-m-${status}`);
+    } else if (color && color !== 'grey') {
+      expect(label).toHaveClass(`pf-m-${color}`);
+    }
+
+    if (!status && (!color || color === 'grey')) {
+      expect(label).not.toHaveClass('pf-m-success');
+      expect(label).not.toHaveClass('pf-m-danger');
+      expect(label).not.toHaveClass('pf-m-info');
+    }
+  });
+
+  it.each(states)('should render with outline variant for "%s" state', (state) => {
+    render(<EvaluationStatusLabel state={state} />);
+    expect(screen.getByTestId(`status-label-${state}`)).toHaveClass('pf-m-outline');
+  });
+
   it('should show a popover with the error message when failed label is clicked', () => {
     const errorMessage = 'Benchmark arc_easy failed with message: model not found';
     render(<EvaluationStatusLabel state="failed" message={errorMessage} />);
diff --git a/packages/gen-ai/frontend/src/app/AIAssets/components/AIModelTableRow.tsx b/packages/gen-ai/frontend/src/app/AIAssets/components/AIModelTableRow.tsx
index 2005c6ad4f..c21813e601 100644
--- a/packages/gen-ai/frontend/src/app/AIAssets/components/AIModelTableRow.tsx
+++ b/packages/gen-ai/frontend/src/app/AIAssets/components/AIModelTableRow.tsx
@@ -111,19 +111,28 @@ const AIModelTableRow: React.FC<AIModelTableRowProps> = ({
           <TruncatedText maxLines={2} content={model.usecase} />
         </Td>
         <Td dataLabel="Status">
-          {model.status === 'Running' ? (
-            <Label status="success" variant="outline">
-              Ready
-            </Label>
-          ) : model.status === 'Stop' ? (
-            <Label status="danger" variant="outline">
-              Inactive
-            </Label>
-          ) : (
-            <Label color="grey" icon={<OutlinedQuestionCircleIcon />}>
-              Unknown
-            </Label>
-          )}
+          {(() => {
+            switch (model.status) {
+              case 'Running':
+                return (
+                  <Label status="success" variant="outline">
+                    Ready
+                  </Label>
+                );
+              case 'Stop':
+                return (
+                  <Label status="danger" variant="outline">
+                    Inactive
+                  </Label>
+                );
+              default:
+                return (
+                  <Label variant="outline" color="grey" icon={<OutlinedQuestionCircleIcon />}>
+                    Unknown
+                  </Label>
+                );
+            }
+          })()}
         </Td>
         <Td dataLabel="Endpoints">
           {model.externalEndpoint || model.internalEndpoint ? (
diff --git a/packages/gen-ai/frontend/src/app/AIAssets/components/mcp/MCPServerStatus.tsx b/packages/gen-ai/frontend/src/app/AIAssets/components/mcp/MCPServerStatus.tsx
index 9fb329b293..b741def2df 100644
--- a/packages/gen-ai/frontend/src/app/AIAssets/components/mcp/MCPServerStatus.tsx
+++ b/packages/gen-ai/frontend/src/app/AIAssets/components/mcp/MCPServerStatus.tsx
@@ -23,19 +23,19 @@ const MCPServerStatus: React.FC<MCPServerStatusProps> = ({
     switch (status) {
       case 'connected':
         return (
-          <Label color="green" icon={<CheckCircleIcon />}>
+          <Label status="success" icon={<CheckCircleIcon />}>
             Active
           </Label>
         );
       case 'auth_required':
         return (
-          <Label color="yellow" icon={<InfoCircleIcon />}>
+          <Label status="warning" icon={<InfoCircleIcon />}>
             Token Required
           </Label>
         );
       case 'unreachable':
         return (
-          <Label color="red" icon={<ExclamationCircleIcon />}>
+          <Label status="danger" icon={<ExclamationCircleIcon />}>
             Error
           </Label>
         );
@@ -51,12 +51,7 @@ const MCPServerStatus: React.FC<MCPServerStatusProps> = ({
   if (isLoading || status === 'checking') {
     return (
       <Tooltip content="Checking connection status...">
-        <Label
-          color="teal"
-          variant="outline"
-          icon={<Spinner size="sm" />}
-          data-testid="mcp-server-status-badge"
-        >
+        <Label color="teal" icon={<Spinner size="sm" />} data-testid="mcp-server-status-badge">
           Loading
         </Label>
       </Tooltip>
diff --git a/packages/maas/frontend/src/app/pages/api-keys/allKeys/ApiKeysTableRow.tsx b/packages/maas/frontend/src/app/pages/api-keys/allKeys/ApiKeysTableRow.tsx
index 62799ace85..60a2f9e90d 100644
--- a/packages/maas/frontend/src/app/pages/api-keys/allKeys/ApiKeysTableRow.tsx
+++ b/packages/maas/frontend/src/app/pages/api-keys/allKeys/ApiKeysTableRow.tsx
@@ -1,11 +1,27 @@
 import * as React from 'react';
 import { ActionsColumn, Td, Tr } from '@patternfly/react-table';
-import { capitalize, Label } from '@patternfly/react-core';
+import { capitalize, Label, LabelProps } from '@patternfly/react-core';
+import { BanIcon, CheckCircleIcon, ExclamationCircleIcon } from '@patternfly/react-icons';
 import TableRowTitleDescription from '@odh-dashboard/internal/components/table/TableRowTitleDescription';
-import { APIKey, SubscriptionDetail } from '~/app/types/api-key';
+import { APIKey, APIKeyStatus, SubscriptionDetail } from '~/app/types/api-key';
 import { apiKeyColumns } from './columns';
 import SubscriptionCell from './SubscriptionCell';
 
+const getApiKeyStatusProps = (
+  status: APIKeyStatus,
+): { icon: React.ReactNode; status?: LabelProps['status']; color?: LabelProps['color'] } => {
+  switch (status) {
+    case 'active':
+      return { icon: <CheckCircleIcon />, status: 'success' };
+    case 'expired':
+      return { icon: <ExclamationCircleIcon />, status: 'danger' };
+    case 'revoked':
+      return { icon: <BanIcon />, color: 'grey' };
+    default:
+      return { icon: undefined, color: 'grey' };
+  }
+};
+
 const formatDate = (dateString: string): string => {
   const date = new Date(dateString);
   return date.toLocaleDateString('en-US', {
@@ -35,11 +51,7 @@ const ApiKeysTableRow: React.FC<ApiKeysTableRowProps> = ({
       />
     </Td>
     <Td dataLabel={apiKeyColumns[1].label}>
-      <Label
-        color={
-          apiKey.status === 'active' ? 'green' : apiKey.status === 'expired' ? 'red' : 'purple'
-        }
-      >
+      <Label variant="outline" {...getApiKeyStatusProps(apiKey.status)}>
         {capitalize(apiKey.status)}
       </Label>
     </Td>
diff --git a/packages/model-serving/src/components/deploymentWizard/types.ts b/packages/model-serving/src/components/deploymentWizard/types.ts
index 71c5473792..33ce2275fb 100644
--- a/packages/model-serving/src/components/deploymentWizard/types.ts
+++ b/packages/model-serving/src/components/deploymentWizard/types.ts
@@ -64,7 +64,7 @@ export enum ModelStateLabel {
   STOPPED = 'Stopped',
   STOPPING = 'Stopping',
   STARTING = 'Starting',
-  STARTED = 'Started',
+  READY = 'Ready',
   RUNNING = 'Running',
   FAILED_TO_LOAD = 'Failed to load',
 }
diff --git a/packages/model-serving/src/components/deployments/__tests__/DeploymentsTableRow.spec.tsx b/packages/model-serving/src/components/deployments/__tests__/DeploymentsTableRow.spec.tsx
index 40020bbfbd..da417abfa7 100644
--- a/packages/model-serving/src/components/deployments/__tests__/DeploymentsTableRow.spec.tsx
+++ b/packages/model-serving/src/components/deployments/__tests__/DeploymentsTableRow.spec.tsx
@@ -161,7 +161,7 @@ describe('DeploymentsTableRow', () => {
       </table>,
     );
 
-    expect(screen.getByText('Started')).toBeInTheDocument();
+    expect(screen.getByText('Ready')).toBeInTheDocument();
   });
 
   describe('Inference endpoints', () => {
diff --git a/packages/model-training/src/global/trainingJobList/__tests__/utils.spec.ts b/packages/model-training/src/global/trainingJobList/__tests__/utils.spec.ts
index 710c575f9f..9a3ae1d956 100644
--- a/packages/model-training/src/global/trainingJobList/__tests__/utils.spec.ts
+++ b/packages/model-training/src/global/trainingJobList/__tests__/utils.spec.ts
@@ -66,7 +66,6 @@ describe('getStatusInfo', () => {
     const result = getStatusInfo(TrainingJobState.SUCCEEDED);
     expect(result.label).toBe('Complete');
     expect(result.status).toBe('success');
-    expect(result.color).toBe('green');
     expect(result.alertTitle).toBe('Job Complete');
     expect(result.alertVariant).toBeDefined();
   });
@@ -75,7 +74,6 @@ describe('getStatusInfo', () => {
     const result = getStatusInfo(TrainingJobState.FAILED);
     expect(result.label).toBe('Failed');
     expect(result.status).toBe('danger');
-    expect(result.color).toBe('red');
     expect(result.alertTitle).toBe('Job Failed');
     expect(result.alertVariant).toBeDefined();
   });
@@ -103,7 +101,6 @@ describe('getStatusInfo', () => {
     const result = getStatusInfo(TrainingJobState.INADMISSIBLE);
     expect(result.label).toBe('Inadmissible');
     expect(result.status).toBe('warning');
-    expect(result.color).toBe('orange');
     expect(result.alertTitle).toBe('Job Inadmissible');
   });
 
@@ -111,7 +108,6 @@ describe('getStatusInfo', () => {
     const result = getStatusInfo(TrainingJobState.PREEMPTED);
     expect(result.label).toBe('Preempted');
     expect(result.status).toBe('warning');
-    expect(result.color).toBe('orange');
     expect(result.alertTitle).toBe('Job Preempted');
   });
 
@@ -130,7 +126,7 @@ describe('getStatusInfo', () => {
   it('should return correct info for UNKNOWN status', () => {
     const result = getStatusInfo(TrainingJobState.UNKNOWN);
     expect(result.label).toBe('Unknown');
-    expect(result.status).toBe('warning');
+    expect(result.color).toBe('grey');
   });
 });
 
diff --git a/packages/model-training/src/global/trainingJobList/components/TrainingJobStatus.tsx b/packages/model-training/src/global/trainingJobList/components/TrainingJobStatus.tsx
index 215ee8ac74..24c2a2f005 100644
--- a/packages/model-training/src/global/trainingJobList/components/TrainingJobStatus.tsx
+++ b/packages/model-training/src/global/trainingJobList/components/TrainingJobStatus.tsx
@@ -43,6 +43,7 @@ const TrainingJobStatus = ({
     <Flex direction={{ default: 'column' }} gap={{ default: 'gapXs' }}>
       <FlexItem>
         <Label
+          variant={onClick ? 'filled' : 'outline'}
           isCompact={isCompact}
           status={statusInfo.status}
           color={statusInfo.color}
diff --git a/packages/model-training/src/global/trainingJobList/utils.ts b/packages/model-training/src/global/trainingJobList/utils.ts
index 3fd6e8055c..3c1c1d4772 100644
--- a/packages/model-training/src/global/trainingJobList/utils.ts
+++ b/packages/model-training/src/global/trainingJobList/utils.ts
@@ -4,11 +4,12 @@ import {
   ExclamationCircleIcon,
   ExclamationTriangleIcon,
   InProgressIcon,
-  PendingIcon,
-  PlayIcon,
-  PauseIcon,
   OutlinedClockIcon,
+  OutlinedQuestionCircleIcon,
   PauseCircleIcon,
+  PauseIcon,
+  PendingIcon,
+  PlayIcon,
 } from '@patternfly/react-icons';
 import { AlertVariant, LabelProps } from '@patternfly/react-core';
 import { WorkloadCondition } from '@odh-dashboard/internal/k8sTypes';
@@ -73,7 +74,6 @@ export const getStatusInfo = (
       return {
         status: 'success',
         label: 'Complete',
-        color: 'green',
         IconComponent: CheckCircleIcon,
         alertTitle: 'Job Complete',
         alertVariant: AlertVariant.success,
@@ -82,7 +82,6 @@ export const getStatusInfo = (
       return {
         status: 'danger',
         label: 'Failed',
-        color: 'red',
         IconComponent: ExclamationCircleIcon,
         alertTitle: 'Job Failed',
         alertVariant: AlertVariant.danger,
@@ -132,7 +131,6 @@ export const getStatusInfo = (
     case TrainingJobState.PREEMPTED:
       return {
         label: 'Preempted',
-        color: 'orange',
         status: 'warning',
         IconComponent: ExclamationTriangleIcon,
         alertTitle: 'Job Preempted',
@@ -141,7 +139,6 @@ export const getStatusInfo = (
     case TrainingJobState.INADMISSIBLE:
       return {
         label: 'Inadmissible',
-        color: 'orange',
         status: 'warning',
         IconComponent: ExclamationTriangleIcon,
         alertTitle: 'Job Inadmissible',
@@ -156,8 +153,8 @@ export const getStatusInfo = (
     default:
       return {
         label: 'Unknown',
-        status: 'warning',
-        IconComponent: ExclamationCircleIcon,
+        color: 'grey',
+        IconComponent: OutlinedQuestionCircleIcon,
       };
   }
 };