diff --git a/ui/components/component-library/icon/README.mdx b/ui/components/component-library/icon/README.mdx
index 0cd319058..cb82b7995 100644
--- a/ui/components/component-library/icon/README.mdx
+++ b/ui/components/component-library/icon/README.mdx
@@ -110,9 +110,9 @@ Some examples of `Icon` with `Text` using [Box](/docs/components-ui-box--default
 ```jsx
 import {
   AlignItems,
-  DISPLAY,
+  Display,
   IconColor,
-  FLEX_DIRECTION,
+  FlexDirection,
   BorderColor,
   BorderRadius,
 } from '../../../helpers/constants/design-system';
@@ -121,8 +121,8 @@ import Box from '../../ui/box/box';
 
 import { IconName, Icon, IconSize, Text, Label } from '../../component-library';
 
-<Box display={DISPLAY.FLEX} flexDirection={FLEX_DIRECTION.COLUMN} gap={4}>
-  <Box display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+<Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={4}>
+  <Box display={Display.Flex} alignItems={AlignItems.center}>
     <Icon
       name={IconName.Check}
       color={IconColor.successDefault}
@@ -132,7 +132,7 @@ import { IconName, Icon, IconSize, Text, Label } from '../../component-library';
   </Box>
   <Box
     as="button"
-    display={DISPLAY.FLEX}
+    display={Display.Flex}
     alignItems={AlignItems.center}
     borderRadius={BorderRadius.pill}
     backgroundColor={BackgroundColor.primaryMuted}
@@ -149,7 +149,7 @@ import { IconName, Icon, IconSize, Text, Label } from '../../component-library';
   </Box>
   <Box
     as="button"
-    display={DISPLAY.FLEX}
+    display={Display.Flex}
     alignItems={AlignItems.center}
     padding={4}
     borderColor={BorderColor.borderMuted}
diff --git a/ui/components/component-library/icon/icon.stories.tsx b/ui/components/component-library/icon/icon.stories.tsx
index f6214d071..aa24122c7 100644
--- a/ui/components/component-library/icon/icon.stories.tsx
+++ b/ui/components/component-library/icon/icon.stories.tsx
@@ -1,14 +1,14 @@
 import React, { useState } from 'react';
-import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { StoryFn, Meta } from '@storybook/react';
 
 import {
   AlignItems,
-  DISPLAY,
+  Display,
   IconColor,
-  FLEX_DIRECTION,
+  FlexDirection,
   JustifyContent,
   TextVariant,
-  FLEX_WRAP,
+  FlexWrap,
   TextAlign,
   BackgroundColor,
   BorderColor,
@@ -48,9 +48,9 @@ export default {
     color: IconColor.inherit,
     size: IconSize.Md,
   },
-} as ComponentMeta<typeof Icon>;
+} as Meta<typeof Icon>;
 
-export const DefaultStory: ComponentStory<typeof Icon> = (args) => {
+export const DefaultStory: StoryFn<typeof Icon> = (args) => {
   const [search, setSearch] = useState('');
   const iconList = Object.keys(IconName)
     .filter(
@@ -74,7 +74,7 @@ export const DefaultStory: ComponentStory<typeof Icon> = (args) => {
         Icon search
       </Text>
       <Box
-        display={DISPLAY.GRID}
+        display={Display.Grid}
         gap={2}
         style={{
           gridTemplateColumns: 'repeat(auto-fill, minmax(180px, 1fr))',
@@ -82,8 +82,8 @@ export const DefaultStory: ComponentStory<typeof Icon> = (args) => {
       >
         <Box
           style={{ gridColumnStart: 1, gridColumnEnd: 3 }}
-          display={DISPLAY.FLEX}
-          flexDirection={FLEX_DIRECTION.COLUMN}
+          display={Display.Flex}
+          flexDirection={FlexDirection.Column}
         >
           {/* TODO replace with FormTextField */}
           <Label htmlFor="icon-search">IconName</Label>
@@ -99,7 +99,7 @@ export const DefaultStory: ComponentStory<typeof Icon> = (args) => {
       </Box>
       {iconList.length > 0 ? (
         <Box
-          display={DISPLAY.GRID}
+          display={Display.Grid}
           gap={2}
           style={{
             gridTemplateColumns: 'repeat(auto-fill, minmax(180px, 1fr))',
@@ -110,8 +110,8 @@ export const DefaultStory: ComponentStory<typeof Icon> = (args) => {
               <Box
                 borderColor={BorderColor.borderMuted}
                 borderRadius={BorderRadius.MD}
-                display={DISPLAY.FLEX}
-                flexDirection={FLEX_DIRECTION.COLUMN}
+                display={Display.Flex}
+                flexDirection={FlexDirection.Column}
                 alignItems={AlignItems.center}
                 justifyContent={JustifyContent.center}
                 padding={4}
@@ -169,16 +169,16 @@ export const DefaultStory: ComponentStory<typeof Icon> = (args) => {
 };
 DefaultStory.storyName = 'Default';
 
-export const Name: ComponentStory<typeof Icon> = (args) => (
+export const Name: StoryFn<typeof Icon> = (args) => (
   <>
-    <Box display={DISPLAY.FLEX} flexWrap={FLEX_WRAP.WRAP} gap={2}>
+    <Box display={Display.Flex} flexWrap={FlexWrap.Wrap} gap={2}>
       {Object.keys(IconName).map((item) => {
         return (
           <Box
             borderColor={BorderColor.borderMuted}
             borderRadius={BorderRadius.MD}
-            display={DISPLAY.FLEX}
-            flexDirection={FLEX_DIRECTION.COLUMN}
+            display={Display.Flex}
+            flexDirection={FlexDirection.Column}
             alignItems={AlignItems.center}
             justifyContent={JustifyContent.center}
             padding={4}
@@ -192,10 +192,10 @@ export const Name: ComponentStory<typeof Icon> = (args) => (
   </>
 );
 
-export const SizeStory: ComponentStory<typeof Icon> = (args) => (
+export const SizeStory: StoryFn<typeof Icon> = (args) => (
   <>
     <Box
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.baseline}
       gap={1}
       marginBottom={4}
@@ -242,78 +242,78 @@ export const SizeStory: ComponentStory<typeof Icon> = (args) => (
 );
 SizeStory.storyName = 'Size';
 
-export const ColorStory: ComponentStory<typeof Icon> = (args) => (
-  <Box display={DISPLAY.FLEX} alignItems={AlignItems.baseline}>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+export const ColorStory: StoryFn<typeof Icon> = (args) => (
+  <Box display={Display.Flex} alignItems={AlignItems.baseline}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.inherit} />
     </Box>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.iconDefault} />
     </Box>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.iconAlternative} />
     </Box>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.iconMuted} />
     </Box>
     <Box
       padding={1}
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.center}
       backgroundColor={BackgroundColor.overlayDefault}
     >
       <Icon {...args} color={IconColor.overlayInverse} />
     </Box>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.primaryDefault} />
     </Box>
     <Box
       padding={1}
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.center}
       backgroundColor={BackgroundColor.primaryDefault}
     >
       <Icon {...args} color={IconColor.primaryInverse} />
     </Box>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.errorDefault} />
     </Box>
     <Box
       padding={1}
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.center}
       backgroundColor={BackgroundColor.errorDefault}
     >
       <Icon {...args} color={IconColor.errorInverse} />
     </Box>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.successDefault} />
     </Box>
     <Box
       padding={1}
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.center}
       backgroundColor={BackgroundColor.successDefault}
     >
       <Icon {...args} color={IconColor.successInverse} />
     </Box>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.warningDefault} />
     </Box>
     <Box
       padding={1}
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.center}
       backgroundColor={BackgroundColor.warningDefault}
     >
       <Icon {...args} color={IconColor.warningInverse} />
     </Box>
-    <Box padding={1} display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+    <Box padding={1} display={Display.Flex} alignItems={AlignItems.center}>
       <Icon {...args} color={IconColor.infoDefault} />
     </Box>
     <Box
       padding={1}
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.center}
       backgroundColor={BackgroundColor.infoDefault}
     >
@@ -324,8 +324,8 @@ export const ColorStory: ComponentStory<typeof Icon> = (args) => (
 ColorStory.storyName = 'Color';
 
 export const LayoutAndSpacing = () => (
-  <Box display={DISPLAY.FLEX} flexDirection={FLEX_DIRECTION.COLUMN} gap={4}>
-    <Box display={DISPLAY.FLEX} alignItems={AlignItems.center}>
+  <Box display={Display.Flex} flexDirection={FlexDirection.Column} gap={4}>
+    <Box display={Display.Flex} alignItems={AlignItems.center}>
       <Icon
         name={IconName.Check}
         color={IconColor.successDefault}
@@ -335,7 +335,7 @@ export const LayoutAndSpacing = () => (
     </Box>
     <Box
       as="button"
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.center}
       borderRadius={BorderRadius.pill}
       backgroundColor={BackgroundColor.primaryMuted}
@@ -352,7 +352,7 @@ export const LayoutAndSpacing = () => (
     </Box>
     <Box
       as="button"
-      display={DISPLAY.FLEX}
+      display={Display.Flex}
       alignItems={AlignItems.center}
       padding={4}
       borderColor={BorderColor.borderMuted}
diff --git a/ui/components/component-library/icon/icon.tsx b/ui/components/component-library/icon/icon.tsx
index 1140aae3f..d4dbd7d92 100644
--- a/ui/components/component-library/icon/icon.tsx
+++ b/ui/components/component-library/icon/icon.tsx
@@ -3,7 +3,7 @@ import classnames from 'classnames';
 
 import Box from '../../ui/box/box';
 
-import { IconColor, DISPLAY } from '../../../helpers/constants/design-system';
+import { IconColor, Display } from '../../../helpers/constants/design-system';
 
 import { IconProps, IconSize } from './icon.types';
 
@@ -18,7 +18,7 @@ export const Icon = ({
   <Box
     className={classnames(className, 'mm-icon', `mm-icon--size-${size}`)}
     as="span"
-    display={DISPLAY.INLINE_BLOCK}
+    display={Display.InlineBlock}
     color={color}
     style={{
       /**