diff --git a/packages/curve-ui-kit/src/themes/chip/mui-chip.ts b/packages/curve-ui-kit/src/themes/chip/mui-chip.ts
index e6733d51b..d2661bacf 100644
--- a/packages/curve-ui-kit/src/themes/chip/mui-chip.ts
+++ b/packages/curve-ui-kit/src/themes/chip/mui-chip.ts
@@ -7,7 +7,8 @@ import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
 import { handleBreakpoints, Responsive } from '@ui-kit/themes/basic-theme'
 import type { TypographyOptions } from '@mui/material/styles/createTypography'
 
-const invert = (color: DesignSystem['Color']) => color.Neutral[50]
+// note: the design system is using inverted themes for this color, there is no semantic colors for the clickable chips.
+const invertPrimary = (color: DesignSystem['Color']) => color.Neutral[50]
 
 const { Sizing, Spacing, IconSize } = SizesAndSpaces
 
@@ -32,6 +33,14 @@ const chipSizeClickable: Record<ChipSizes, Partial<ChipSizeDefinition>> = {
   extraLarge: { height: Sizing.xl },
 }
 
+/**
+ * Defines the MuiChip component.
+ * In Figma we have two different components "Badge" and "Chip" that are implemented here.
+ * - Figma's Badge component is the "Chip" clickable version.
+ * - Figma's Chip active color is implemented as "highlight" color. "active" is the color used in Figma's Chip component.
+ * - The MuiBadge component is attached to another component, so it cannot be used to implement the "badge" from Figma.
+ * - We do not use the "variant" prop for now.
+ */
 export const defineMuiChip = (
   { Chips, Color, Text: { TextColors }, Layer }: DesignSystem,
   typography: TypographyOptions,
@@ -57,15 +66,15 @@ export const defineMuiChip = (
       style: { borderColor: Layer[1].Outline },
     },
 
-    { props: { color: 'active' }, style: { backgroundColor: Color.Secondary[400], color: invert(Color) } },
+    { props: { color: 'active' }, style: { backgroundColor: Color.Secondary[400], color: invertPrimary(Color) } },
     { props: { color: 'warning' }, style: { backgroundColor: Color.Tertiary[200] } },
-    { props: { color: 'accent' }, style: { backgroundColor: Layer.Highlight.Fill, color: invert(Color) } },
+    { props: { color: 'accent' }, style: { backgroundColor: Layer.Highlight.Fill, color: invertPrimary(Color) } },
 
     // chip colors taken from design system variables
     {
       props: { color: 'highlight' },
       style: {
-        backgroundColor: invert(Color) || Chips.Current.Fill,
+        backgroundColor: invertPrimary(Color) || Chips.Current.Fill,
         color: Chips.Current.Label,
         borderColor: Chips.Current.Outline,
         '& .MuiChip-deleteIcon': {
diff --git a/packages/curve-ui-kit/src/themes/design/2_theme.ts b/packages/curve-ui-kit/src/themes/design/2_theme.ts
index fbce08eaa..29c7cfcee 100644
--- a/packages/curve-ui-kit/src/themes/design/2_theme.ts
+++ b/packages/curve-ui-kit/src/themes/design/2_theme.ts
@@ -199,7 +199,7 @@ export const createLightDesign = (Light: typeof plain.Light | typeof inverted.Li
   const Chips = {
     BorderRadius: {
       Clickable: 0,
-      NonClickable: '16px',
+      NonClickable: '100px',
     },
     Default: {
       Label: Text.TextColors.Secondary,
@@ -538,7 +538,7 @@ export const createDarkDesign = (Dark: typeof plain.Dark | typeof inverted.Dark)
   const Chips = {
     BorderRadius: {
       Clickable: 0,
-      NonClickable: '16px',
+      NonClickable: '100px',
     },
     Default: {
       Label: Text.TextColors.Secondary,