diff --git a/src/tokens/component/avatar.json5 b/src/tokens/component/avatar.json5
new file mode 100644
index 000000000..796bcabf3
--- /dev/null
+++ b/src/tokens/component/avatar.json5
@@ -0,0 +1,42 @@
+{
+  avatar: {
+    bgColor: {
+      $value: '{base.color.neutral.0}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component (internal)',
+          scopes: ['bgColor'],
+        },
+        'org.primer.overrides': {
+          dark: {
+            $value: '{base.color.neutral.13}',
+            alpha: 0.1,
+          },
+        },
+      },
+    },
+    borderColor: {
+      $value: '{borderColor.translucent}',
+      $type: 'color',
+      $extensions: {
+        'org.primer.figma': {
+          collection: 'mode',
+          group: 'component (internal)',
+          scopes: ['borderColor'],
+        },
+        'org.primer.overrides': {
+          'dark-high-contrast': {
+            $value: '{base.color.neutral.13}',
+            alpha: 0.9,
+          },
+          'light-high-contrast': {
+            $value: '{base.color.neutral.13}',
+            alpha: 0.9,
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/src/tokens/component/avatarStack.json5 b/src/tokens/component/avatarStack.json5
new file mode 100644
index 000000000..86b588173
--- /dev/null
+++ b/src/tokens/component/avatarStack.json5
@@ -0,0 +1,30 @@
+{
+  avatarStack: {
+    fade: {
+      bgColor: {
+        default: {
+          $value: '{base.color.neutral.7}',
+          $type: 'color',
+          $extensions: {
+            'org.primer.figma': {
+              collection: 'mode',
+              group: 'component (internal)',
+              scopes: ['bgColor'],
+            },
+          },
+        },
+        muted: {
+          $value: '{base.color.neutral.5}',
+          $type: 'color',
+          $extensions: {
+            'org.primer.figma': {
+              collection: 'mode',
+              group: 'component (internal)',
+              scopes: ['bgColor'],
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5 b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
index d24aac89e..37b68db97 100644
--- a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
+++ b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
@@ -213,13 +213,6 @@
     },
   },
   // patterns
-  avatar: {
-    borderColor: {
-      $value: '{base.color.neutral.13}',
-      $type: 'color',
-      alpha: 0.9,
-    },
-  },
   counter: {
     borderColor: {
       $value: '{borderColor.default}',
diff --git a/src/tokens/functional/color/dark/patterns-dark.json5 b/src/tokens/functional/color/dark/patterns-dark.json5
index 4cb669408..f5c12b9cc 100644
--- a/src/tokens/functional/color/dark/patterns-dark.json5
+++ b/src/tokens/functional/color/dark/patterns-dark.json5
@@ -1,57 +1,4 @@
 {
-  avatar: {
-    bgColor: {
-      $value: '{base.color.neutral.13}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['bgColor'],
-        },
-      },
-      alpha: 0.1,
-    },
-    borderColor: {
-      $value: '{borderColor.translucent}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['borderColor'],
-        },
-      },
-    },
-  },
-  avatarStack: {
-    fade: {
-      bgColor: {
-        default: {
-          $value: '{base.color.neutral.7}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component (internal)',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-        muted: {
-          $value: '{base.color.neutral.5}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component (internal)',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-      },
-    },
-  },
   control: {
     bgColor: {
       rest: {
diff --git a/src/tokens/functional/color/light/overrides/light.high-contrast.json5 b/src/tokens/functional/color/light/overrides/light.high-contrast.json5
index 66b99fbb5..ed65e0f2d 100644
--- a/src/tokens/functional/color/light/overrides/light.high-contrast.json5
+++ b/src/tokens/functional/color/light/overrides/light.high-contrast.json5
@@ -191,13 +191,6 @@
     },
   },
   // patterns
-  avatar: {
-    borderColor: {
-      $value: '{base.color.neutral.13}',
-      $type: 'color',
-      alpha: 0.9,
-    },
-  },
   counter: {
     borderColor: {
       $value: '{borderColor.default}',
diff --git a/src/tokens/functional/color/light/patterns-light.json5 b/src/tokens/functional/color/light/patterns-light.json5
index 6ceb59bd2..73ff3df3b 100644
--- a/src/tokens/functional/color/light/patterns-light.json5
+++ b/src/tokens/functional/color/light/patterns-light.json5
@@ -1,56 +1,4 @@
 {
-  avatar: {
-    bgColor: {
-      $value: '{base.color.neutral.0}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['bgColor'],
-        },
-      },
-    },
-    borderColor: {
-      $value: '{borderColor.translucent}',
-      $type: 'color',
-      $extensions: {
-        'org.primer.figma': {
-          collection: 'mode',
-          group: 'component (internal)',
-          scopes: ['borderColor'],
-        },
-      },
-    },
-  },
-  avatarStack: {
-    fade: {
-      bgColor: {
-        default: {
-          $value: '{base.color.neutral.7}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component (internal)',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-        muted: {
-          $value: '{base.color.neutral.5}',
-          $type: 'color',
-          $extensions: {
-            'org.primer.figma': {
-              collection: 'mode',
-              group: 'component (internal)',
-              scopes: ['bgColor'],
-            },
-          },
-        },
-      },
-    },
-  },
   control: {
     bgColor: {
       rest: {