diff --git a/packages/components/progress-stepper/src/ProgressStepper.styles.ts b/packages/components/progress-stepper/src/ProgressStepper.styles.ts
index ec11d9b016..0eadf06f34 100644
--- a/packages/components/progress-stepper/src/ProgressStepper.styles.ts
+++ b/packages/components/progress-stepper/src/ProgressStepper.styles.ts
@@ -1,13 +1,16 @@
 import { css } from 'emotion';
 
-export const getStyles = () => {
+export const getStyles = ({ isInline }) => {
   return {
     horizontalList: css({
-      display: 'grid',
-      gridAutoFlow: 'column dense',
+      display: isInline ? 'inline-grid' : 'grid',
+      gridAutoFlow: 'column',
+      overflow: 'hidden',
+      overflowX: 'auto',
+      counterReset: 'step',
       gridAutoColumns: '1fr',
-      margin: 0,
       padding: 0,
+      margin: 0,
     }),
     verticalList: (numberOfSteps: number) =>
       css({
diff --git a/packages/components/progress-stepper/src/ProgressStepper.tsx b/packages/components/progress-stepper/src/ProgressStepper.tsx
index b3225c85f3..45f18f12c9 100644
--- a/packages/components/progress-stepper/src/ProgressStepper.tsx
+++ b/packages/components/progress-stepper/src/ProgressStepper.tsx
@@ -21,6 +21,10 @@ export interface ProgressStepperProps extends CommonProps, MarginProps {
    * @default 0
    */
   activeStep?: number;
+  /**
+   * Sets display:inline-grid
+   */
+  isInline?: boolean;
   /**
    * Label to be used on aria-label for the nav element
    */
@@ -39,8 +43,9 @@ function _ProgressStepper(
     activeStep = 0,
     testId,
     ariaLabel,
+    isInline,
   } = props;
-  const styles = getStyles();
+  const styles = getStyles({ isInline });
   const hydratedTestId =
     testId || `cf-ui-progress-stepper-${orientation}-${stepStyle}`;
 
diff --git a/packages/components/progress-stepper/src/Step/Step.styles.ts b/packages/components/progress-stepper/src/Step/Step.styles.ts
index 0f86c2fc4b..39b0a01e9b 100644
--- a/packages/components/progress-stepper/src/Step/Step.styles.ts
+++ b/packages/components/progress-stepper/src/Step/Step.styles.ts
@@ -5,43 +5,43 @@ export const getStyles = () => {
   return {
     horizontalListItem: (isBeforeActiveStep: boolean, isActive: boolean) =>
       css({
-        margin: 0,
-        padding: 0,
         display: 'grid',
-        gap: `${tokens.spacingXs} 0`,
-        gridTemplateColumns: '1fr 24px 1fr',
-        gridTemplateRows: '24px',
-        gridTemplateAreas: `
-        "divider-before circle divider-after"
-        "label label label"
-        `,
+        gridTemplateColumns: 'auto',
+        gridTemplateRows: '40px 1fr',
+        placeItems: 'center',
+        textAlign: 'center',
         '&::before': {
-          position: 'relative',
-          top: '50%',
-          display: 'block',
-          content: '""',
+          gridColumnStart: 1,
+          gridRowStart: 1,
           height: '2px',
+          width: '100%',
+          content: '""',
+          marginInlineStart: '-100%',
           backgroundColor:
             isBeforeActiveStep || isActive
               ? tokens.colorPrimary
               : tokens.gray300,
-          gridArea: 'divider-before',
-          transition: `background-color ${tokens.transitionDurationLong} ${tokens.transitionEasingDefault}`,
         },
+
+        '&:first-child::before': {
+          content: 'none',
+        },
+
         '&::after': {
+          content: 'counter(step)',
+          counterIncrement: 'step',
+          zIndex: 1,
           position: 'relative',
-          top: '50%',
-          display: 'block',
-          content: '""',
-          height: '2px',
-          backgroundColor: isBeforeActiveStep
-            ? tokens.colorPrimary
-            : tokens.gray300,
-          transition: `background-color ${tokens.transitionDurationLong} ${tokens.transitionEasingDefault}`,
-          gridArea: 'divider-after',
+          gridColumnStart: 1,
+          gridRowStart: 1,
+          display: 'grid',
+          height: '24px',
+          width: '24px',
+          placeItems: 'center',
+          placeSelf: 'center',
+          borderRadius: '50%',
+          backgroundColor: tokens.colorPrimary,
         },
-        '&:first-child::before': { visibility: 'hidden' },
-        '&:last-child::after': { visibility: 'hidden' },
       }),
     verticalListItem: (isBeforeActiveStep: boolean, isActive: boolean) =>
       css({
@@ -102,7 +102,6 @@ export const getStyles = () => {
       gridArea: 'circle',
     }),
     horizontalLabel: css({
-      gridArea: 'label',
       textAlign: 'center',
       color: tokens.gray900,
     }),
@@ -118,25 +117,137 @@ export const getStyles = () => {
     incompleteLabel: css({
       color: tokens.gray700,
     }),
+    incomplete: css({
+      '& p': {
+        color: tokens.gray700,
+      },
+      '&::after': {
+        content: 'counter(step)',
+        counterIncrement: 'step',
+        color: tokens.gray600,
+        fontWeight: tokens.fontWeightDemiBold,
+        backgroundColor: tokens.colorWhite,
+        border: `2px solid ${tokens.gray300}`,
+        borderRadius: '50%',
+      },
+    }),
+    incompleteIcon: css({
+      '& p': {
+        color: tokens.gray700,
+      },
+      color: tokens.colorPrimary,
+      borderColor: tokens.colorPrimary,
+      '&::after': {
+        content: "''",
+        backgroundColor: tokens.colorWhite,
+        border: `2px solid ${tokens.gray300}`,
+        borderRadius: '50%',
+      },
+    }),
     active: css({
+      '&::after': {
+        content: 'counter(step)',
+        counterIncrement: 'step',
+        color: tokens.colorPrimary,
+        fontWeight: tokens.fontWeightDemiBold,
+        backgroundColor: tokens.colorWhite,
+        border: `2px solid ${tokens.colorPrimary}`,
+        borderRadius: '50%',
+      },
+    }),
+    activeVertical: css({
       color: tokens.colorPrimary,
       borderColor: tokens.colorPrimary,
     }),
+    activeIcon: css({
+      borderColor: tokens.colorPrimary,
+      '&::after': {
+        content: "''",
+        backgroundColor: tokens.colorWhite,
+        border: `2px solid ${tokens.colorPrimary}`,
+        borderRadius: '50%',
+      },
+    }),
     disabled: css({
+      '& p': {
+        color: tokens.gray500,
+      },
+      '&::after': {
+        content: 'counter(step)',
+        counterIncrement: 'step',
+        color: tokens.gray500,
+        fontWeight: tokens.fontWeightDemiBold,
+        backgroundColor: tokens.colorWhite,
+        border: `2px solid ${tokens.gray200}`,
+        borderRadius: '50%',
+      },
+    }),
+    disabledVertical: css({
       color: tokens.gray500,
       borderColor: tokens.gray200,
     }),
+    disabledIcon: css({
+      '& p': {
+        color: tokens.gray500,
+      },
+      '&::after': {
+        content: "''",
+        backgroundColor: tokens.colorWhite,
+        border: `2px solid ${tokens.gray200}`,
+        borderRadius: '50%',
+      },
+    }),
     complete: css({
+      '&::after': {
+        content: 'counter(step)',
+        counterIncrement: 'step',
+        color: tokens.colorWhite,
+        fontWeight: tokens.fontWeightDemiBold,
+      },
+    }),
+    completeVertical: css({
       color: tokens.colorWhite,
       borderColor: tokens.colorPrimary,
       backgroundColor: tokens.colorPrimary,
     }),
+    completeIcon: css({
+      '&::after': {
+        content: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23ffffff' viewBox='0 0 250 200'%3E%3Cpath d='M229.66,77.66l-128,128a8,8,0,0,1-11.32,0l-56-56a8,8,0,0,1,11.32-11.32L96,188.69,218.34,66.34a8,8,0,0,1,11.32,11.32Z'%3E%3C/path%3E%3C/svg%3E")`,
+      },
+    }),
     error: css({
+      '&::after': {
+        content: 'counter(step)',
+        counterIncrement: 'step',
+        color: tokens.colorWhite,
+        fontWeight: tokens.fontWeightDemiBold,
+        backgroundColor: tokens.colorNegative,
+      },
+    }),
+    errorVertical: css({
       color: tokens.colorWhite,
       borderColor: tokens.colorNegative,
       backgroundColor: tokens.colorNegative,
     }),
+    errorIcon: css({
+      '&::after': {
+        content: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23ffffff' viewBox='0 0 255 180'%3E%3Cpath d='M205.66,194.34a8,8,0,0,1-11.32,11.32L128,139.31,61.66,205.66a8,8,0,0,1-11.32-11.32L116.69,128,50.34,61.66A8,8,0,0,1,61.66,50.34L128,116.69l66.34-66.35a8,8,0,0,1,11.32,11.32L139.31,128Z'%3E%3C/path%3E%3C/svg%3E");`,
+        backgroundColor: tokens.colorNegative,
+      },
+    }),
     warning: css({
+      '& svg': {
+        height: '18px',
+      },
+      '&::after': {
+        content: 'counter(step)',
+        counterIncrement: 'step',
+        color: tokens.colorWhite,
+        fontWeight: tokens.fontWeightDemiBold,
+        backgroundColor: tokens.colorWarning,
+      },
+    }),
+    warningVertical: css({
       color: tokens.colorWhite,
       borderColor: tokens.colorWarning,
       backgroundColor: tokens.colorWarning,
@@ -144,5 +255,11 @@ export const getStyles = () => {
         height: '18px',
       },
     }),
+    warningIcon: css({
+      '&::after': {
+        content: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23ffffff' viewBox='0 0 250 200'%3E%3Cpath d='M236.8,188.09,149.35,36.22h0a24.76,24.76,0,0,0-42.7,0L19.2,188.09a23.51,23.51,0,0,0,0,23.72A24.35,24.35,0,0,0,40.55,224h174.9a24.35,24.35,0,0,0,21.33-12.19A23.51,23.51,0,0,0,236.8,188.09ZM222.93,203.8a8.5,8.5,0,0,1-7.48,4.2H40.55a8.5,8.5,0,0,1-7.48-4.2,7.59,7.59,0,0,1,0-7.72L120.52,44.21a8.75,8.75,0,0,1,15,0l87.45,151.87A7.59,7.59,0,0,1,222.93,203.8ZM120,144V104a8,8,0,0,1,16,0v40a8,8,0,0,1-16,0Zm20,36a12,12,0,1,1-12-12A12,12,0,0,1,140,180Z'%3E%3C/path%3E%3C/svg%3E")`,
+        backgroundColor: tokens.colorWarning,
+      },
+    }),
   };
 };
diff --git a/packages/components/progress-stepper/src/Step/Step.tsx b/packages/components/progress-stepper/src/Step/Step.tsx
index eb264f1d36..556ecd6a4c 100644
--- a/packages/components/progress-stepper/src/Step/Step.tsx
+++ b/packages/components/progress-stepper/src/Step/Step.tsx
@@ -68,45 +68,76 @@ function _Step(props: StepProps, ref: React.Ref<HTMLLIElement>) {
     }
   };
 
-  return (
+  const renderHorizontalStep = () => (
     <li
-      className={
-        orientation === 'horizontal'
-          ? styles.horizontalListItem(isBeforeActiveStep, isActiveStep)
-          : styles.verticalListItem(isBeforeActiveStep, isActiveStep)
-      }
+      className={cx(
+        styles.horizontalListItem(isBeforeActiveStep, isActiveStep),
+        {
+          [styles.incomplete]: state === 'incomplete',
+          [styles.active]: state === 'active',
+          [styles.disabled]: state === 'disabled',
+          [styles.complete]: state === 'complete',
+          [styles.error]: state === 'error',
+          [styles.warning]: state === 'warning',
+          [styles.incompleteIcon]:
+            state === 'incomplete' && stepStyle === 'icon',
+          [styles.activeIcon]: state === 'active' && stepStyle === 'icon',
+          [styles.disabledIcon]: state === 'disabled' && stepStyle === 'icon',
+          [styles.completeIcon]: state === 'complete' && stepStyle === 'icon',
+          [styles.errorIcon]: state === 'error' && stepStyle === 'icon',
+          [styles.warningIcon]: state === 'warning' && stepStyle === 'icon',
+        },
+      )}
+      ref={ref}
+      data-test-id={`cf-ui-step-${state}`}
+      aria-label={`Step ${stepNumberToDisplay} ${state}`}
+    >
+      <p
+        className={
+          orientation === 'horizontal'
+            ? styles.horizontalLabel
+            : styles.verticalLabel
+        }
+      >
+        {labelText}
+      </p>
+    </li>
+  );
+
+  const renderVerticalStep = () => (
+    <li
+      className={styles.verticalListItem(isBeforeActiveStep, isActiveStep)}
       ref={ref}
       data-test-id={`cf-ui-step-${state}`}
       aria-label={`Step ${stepNumberToDisplay} ${state}`}
     >
       <span
         className={cx(styles.listItemContent, {
-          [styles.active]: state === 'active',
-          [styles.disabled]: state === 'disabled',
-          [styles.complete]: state === 'complete',
-          [styles.error]: state === 'error',
-          [styles.warning]: state === 'warning',
+          [styles.activeVertical]: state === 'active',
+          [styles.disabledVertical]: state === 'disabled',
+          [styles.completeVertical]: state === 'complete',
+          [styles.errorVertical]: state === 'error',
+          [styles.warningVertical]: state === 'warning',
         })}
       >
         {renderStep()}
       </span>
       {labelText && (
         <p
-          className={cx(
-            orientation === 'horizontal'
-              ? styles.horizontalLabel
-              : styles.verticalLabel,
-            {
-              [styles.incompleteLabel]: state === 'incomplete',
-              [styles.disabledLabel]: state === 'disabled',
-            },
-          )}
+          className={cx(styles.verticalLabel, {
+            [styles.incompleteLabel]: state === 'incomplete',
+            [styles.disabledLabel]: state === 'disabled',
+          })}
         >
           {labelText}
         </p>
       )}
     </li>
   );
+
+  return orientation === 'horizontal'
+    ? renderHorizontalStep()
+    : renderVerticalStep();
 }
 
 export const Step = React.forwardRef(_Step);