diff --git a/src/components/CamBadge.tsx b/src/components/CamBadge.tsx
index a4b2c1ba..5ee1a66b 100644
--- a/src/components/CamBadge.tsx
+++ b/src/components/CamBadge.tsx
@@ -1,68 +1,94 @@
-import { Box, SxProps, Typography } from '@mui/material'
+import { Box, SxProps } from '@mui/material'
+
 import { useTheme } from '@mui/system'
 import React from 'react'
 
-const getVariantStyles = (variant: string, theme: string) => {
-    const isDark = theme === 'dark'
-
-    const defaultStyles = {
-        primary: {
-            background: 'rgba(0, 133, 255, 0.2)',
-            color: 'var(--camino-brand-too-blue-to-be-true)',
+const VARIANT_STYLES = {
+    primary: {
+        background: 'rgba(0, 133, 255, 0.2)',
+        color: 'var(--camino-brand-too-blue-to-be-true)',
+    },
+    positive: {
+        dark: {
+            background: 'rgba(9, 222, 107, 0.2)',
+            color: 'var(--camino-success-light)',
         },
-        positive: {
-            background: isDark ? 'rgba(9, 222, 107, 0.2)' : 'var(--camino-success-light)',
-            color: isDark ? 'var(--camino-success-light)' : '#ffff',
+        light: {
+            background: 'var(--camino-success-light)',
+            color: '#ffff',
         },
-        warning: {
-            background: isDark ? 'rgba(229, 162, 31, 0.2)' : 'var(--camino-warning-light)',
-            color: isDark ? 'var(--camino-warning-light)' : '#ffff',
+    },
+    warning: {
+        dark: {
+            background: 'rgba(229, 162, 31, 0.2)',
+            color: 'var(--camino-warning-light)',
         },
-        negative: {
-            background: isDark ? 'rgba(229, 67, 31, 0.2)' : 'var(--camino-error-light)',
-            color: isDark ? 'var(--camino-error-light)' : '#ffff',
+        light: {
+            background: 'var(--camino-warning-light)',
+            color: '#ffff',
         },
-        verified: {
-            background: 'var(--camino-aphrodite-aqua)',
-            color: 'var(--tailwind-slate-slate-800)',
+    },
+    negative: {
+        dark: {
+            background: 'rgba(229, 67, 31, 0.2)',
+            color: 'var(--camino-error-light)',
         },
-        default: {
-            background: 'var(--tailwind-slate-slate-800)',
-            color: 'var(--tailwind-slate-slate-300)',
+        light: {
+            background: 'var(--camino-error-light)',
+            color: '#ffff',
         },
+    },
+    verified: {
+        background: 'var(--camino-aphrodite-aqua)',
+        color: 'var(--tailwind-slate-slate-800)',
+    },
+    default: {
+        background: 'var(--tailwind-slate-slate-800)',
+        color: 'var(--tailwind-slate-slate-300)',
+    },
+}
+
+const getVariantStyles = (variant: string, themeMode: string) => {
+    const isDark = themeMode === 'dark'
+    const styles = VARIANT_STYLES[variant] || VARIANT_STYLES.default
+
+    if (styles.dark && styles.light) {
+        return isDark ? styles.dark : styles.light
     }
+    return styles
+}
 
-    return defaultStyles[variant] || defaultStyles.default
+const SIZE_STYLES = {
+    small: {
+        fontSize: '10px',
+    },
+    medium: {
+        fontSize: '12px',
+    },
 }
 
-const getSizeStyles = (size: string) => {
-    switch (size) {
-        case 'small':
-            return {
-                fontSize: '10px',
-            }
-        default:
-            return {
-                fontSize: '12px',
-            }
-    }
+const getSizeStyles = (size: string) => SIZE_STYLES[size] || SIZE_STYLES.medium
+
+interface CamBadgeProps {
+    variant?: 'default' | 'primary' | 'positive' | 'warning' | 'negative' | 'verified'
+    label: string
+    size?: 'small' | 'medium'
+    sx?: SxProps
+    'data-testid'?: string
 }
 
-const CamBadge = ({
+const CamBadge: React.FC<CamBadgeProps> = ({
     variant = 'default',
     label,
     size = 'medium',
     sx,
-}: {
-    variant?: 'default' | 'primary' | 'positive' | 'warning' | 'negative' | 'verified'
-    label: string
-    size?: 'small' | 'medium'
-    sx?: SxProps
+    'data-testid': dataTestId,
 }) => {
     const theme = useTheme()
 
     return (
         <Box
+            className="CamBadge MuiChip-root"
             sx={{
                 display: 'flex',
                 alignItems: 'center',
@@ -72,10 +98,22 @@ const CamBadge = ({
                 ...getVariantStyles(variant, theme.palette.mode),
                 ...sx,
             }}
+            data-testid={dataTestId}
         >
-            <Typography variant="badge" fontWeight={600} sx={getSizeStyles(size)}>
+            <span
+                style={{
+                    fontFamily: 'Inter, sans-serif',
+                    fontWeight: 600,
+                    lineHeight: '16px',
+                    letterSpacing: '1.6px',
+                    textTransform: 'uppercase',
+                    fontVariantNumeric: 'lining-nums tabular-nums slashed-zero',
+                    fontFeatureSettings: '"ss01" on',
+                    ...getSizeStyles(size),
+                }}
+            >
                 {label}
-            </Typography>
+            </span>
         </Box>
     )
 }