getsentry · Jesse-Box · Nov 18, 2025 · Nov 4, 2025 · Nov 4, 2025 · Nov 4, 2025
diff --git a/static/app/components/badge/iconCellSignal.tsx b/static/app/components/badge/iconCellSignal.tsx
@@ -12,7 +12,7 @@ function IconCellSignal({ref, bars = 3, ...props}: Props) {
   const thirdBarColor = bars > 2 ? theme.subText : theme.gray200;
 
   return (
-    <SvgIcon {...props} ref={ref} kind="path">
+    <SvgIcon {...props} ref={ref}>
       <rect x="0" y="10" width="4" height="5" fill={firstBarColor} rx="1" />
       <rect x="6.2" y="5" width="4" height="10" fill={secondBarColor} rx="1" />
       <rect x="12.4" y="0" width="4" height="15" fill={thirdBarColor} rx="1" />

@@ -82,7 +82,7 @@ export default function ReplayComparisonModal({
                 >
                   <Button
                     aria-label={t('Adjust diff')}
-                    icon={<IconSliders size="md" direction="up" />}
+                    icon={<IconSliders size="md" />}
                     borderless
                   />
                 </AutoWideHovercard>

@@ -14,12 +14,9 @@ interface IconAddProps extends SVGIconProps {
 export function IconAdd({isCircled = false, ...props}: IconAddProps) {
   const theme = useTheme();
   return (
-    <SvgIcon {...props} data-test-id="icon-add" kind={theme.isChonk ? 'stroke' : 'path'}>
+    <SvgIcon {...props} data-test-id="icon-add">
       {theme.isChonk ? (
-        <Fragment>
-          <line x1="13.25" y1="8.01" x2="2.74" y2="8.01" />
-          <line x1="7.99" y1="13.26" x2="7.99" y2="2.75" />
-        </Fragment>
+        <path d="M8 1C8.41421 1 8.75 1.33579 8.75 1.75V7.25H14.25C14.6642 7.25 15 7.58579 15 8C15 8.41421 14.6642 8.75 14.25 8.75H8.75V14.25C8.75 14.6642 8.41421 15 8 15C7.58579 15 7.25 14.6642 7.25 14.25V8.75H1.75C1.33579 8.75 1 8.41421 1 8C1 7.58579 1.33579 7.25 1.75 7.25H7.25V1.75C7.25 1.33579 7.58579 1 8 1Z" />
       ) : isCircled ? (
         <Fragment>
           <path d="M11.28,8.75H4.72a.75.75,0,1,1,0-1.5h6.56a.75.75,0,1,1,0,1.5Z" />

@@ -6,19 +6,8 @@ import {SvgIcon} from './svgIcon';
 export function IconAllProjects(props: SVGIconProps) {
   const theme = useTheme();
   return theme.isChonk ? (
-    <SvgIcon {...props} kind="stroke">
-      <rect
-        x="5"
-        y="5"
-        width="8.25"
-        height="8.25"
-        rx="1"
-        ry="1"
-        transform="translate(18.25 0) rotate(90)"
-      />
-      <path d="M2.75,9.5V3.75c0-.55.45-1,1-1h5.75" />
-      <line x1="7.75" y1="7.75" x2="10.5" y2="7.75" />
-      <line x1="7.75" y1="10.5" x2="10.5" y2="10.5" />
+    <SvgIcon {...props}>
+      <path d="M11.25 0C12.2165 9.18413e-09 13 0.783502 13 1.75V3H14.25C15.2165 3 16 3.7835 16 4.75V14.25C16 15.2165 15.2165 16 14.25 16H4.75C3.7835 16 3 15.2165 3 14.25V13H1.75C0.783502 13 4.73403e-09 12.2165 0 11.25V1.75C9.18409e-09 0.783502 0.783502 5.86568e-08 1.75 0H11.25ZM4.75 4.5C4.61193 4.5 4.5 4.61193 4.5 4.75V14.25C4.5 14.3881 4.61193 14.5 4.75 14.5H14.25C14.3881 14.5 14.5 14.3881 14.5 14.25V4.75C14.5 4.61193 14.3881 4.5 14.25 4.5H4.75ZM12 10.5C12.4142 10.5 12.75 10.8358 12.75 11.25C12.75 11.6642 12.4142 12 12 12H7C6.58579 12 6.25 11.6642 6.25 11.25C6.25 10.8358 6.58579 10.5 7 10.5H12ZM1.75 1.5C1.61193 1.5 1.5 1.61193 1.5 1.75V11.25C1.5 11.3881 1.61193 11.5 1.75 11.5H3V4.75C3 3.7835 3.7835 3 4.75 3H11.5V1.75C11.5 1.61193 11.3881 1.5 11.25 1.5H1.75ZM12 7C12.4142 7 12.75 7.33579 12.75 7.75C12.75 8.16421 12.4142 8.5 12 8.5H7C6.58579 8.5 6.25 8.16421 6.25 7.75C6.25 7.33579 6.58579 7 7 7H12Z" />
     </SvgIcon>
   ) : (
     <svg

@@ -7,16 +7,9 @@ import {SvgIcon} from './svgIcon';
 export function IconAngry(props: SVGIconProps) {
   const theme = useTheme();
   return (
-    <SvgIcon {...props} kind={theme.isChonk ? 'stroke' : 'path'}>
+    <SvgIcon {...props}>
       {theme.isChonk ? (
-        <Fragment>
-          <line x1="9" y1="5.75" x2="12.25" y2="4.25" />
-          <line x1="7" y1="5.75" x2="3.75" y2="4.25" />
-          <circle cx="8" cy="8" r="5.75" />
-          <path d="M10,10.5c-1-1-2.83-1-4,0" />
-          <circle cx="10" cy="7.5" r=".25" />
-          <circle cx="6" cy="7.5" r=".25" />
-        </Fragment>
+        <path d="M8 0C12.4183 0 16 3.58172 16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C1.77176e-07 3.58172 3.58172 1.7717e-07 8 0ZM8 1.5C6.99542 1.5 6.04358 1.72688 5.19434 2.13379L6.78027 3.71973C7.07317 4.01262 7.07317 4.48738 6.78027 4.78027C6.48738 5.07317 6.01262 5.07317 5.71973 4.78027L3.89746 2.95801C2.43443 4.14988 1.5 5.96581 1.5 8C1.5 11.5899 4.41015 14.5 8 14.5C11.5899 14.5 14.5 11.5899 14.5 8C14.5 5.96554 13.5649 4.14987 12.1016 2.95801L10.2803 4.78027C9.98738 5.07317 9.51262 5.07317 9.21973 4.78027C8.92683 4.48738 8.92683 4.01262 9.21973 3.71973L10.8047 2.13379C9.95564 1.72712 9.00427 1.5 8 1.5ZM8 9C9.65685 9 11 10.3431 11 12H5C5 10.3431 6.34315 9 8 9ZM5 6C5.55228 6 6 6.44772 6 7C6 7.55228 5.55228 8 5 8C4.44772 8 4 7.55228 4 7C4 6.44772 4.44772 6 5 6ZM11 6C11.5523 6 12 6.44772 12 7C12 7.55228 11.5523 8 11 8C10.4477 8 10 7.55228 10 7C10 6.44772 10.4477 6 11 6Z" />
       ) : (
         <Fragment>
           <path d="M4.9387 10.375C6.69414 8.87472 9.49739 8.80748 11.1142 10.4243C11.4747 10.7848 11.4747 11.3691 11.1142 11.7296C10.7537 12.0901 10.1694 12.0901 9.80889 11.7296C8.96418 10.8849 7.26279 10.8177 6.13822 11.7788C5.75068 12.11 5.16774 12.0642 4.83654 11.6767C4.5054 11.2891 4.5512 10.7062 4.9387 10.375Z" />

@@ -14,7 +14,6 @@ export function IconArrow({direction = 'up', ...props}: ArrowProps) {
   return (
     <SvgIcon
       {...props}
-      kind={theme.isChonk ? 'stroke' : 'path'}
       css={
         direction
           ? direction === 'down'
@@ -30,10 +29,7 @@ export function IconArrow({direction = 'up', ...props}: ArrowProps) {
       }
     >
       {theme.isChonk ? (
-        <Fragment>
-          <line x1="8" y1="14" x2="8" y2="2.25" />
-          <path d="m2.75,6.84L7.29,2.29c.39-.39,1.02-.39,1.41,0l4.54,4.54" />
-        </Fragment>
+        <path d="M12.7949 6.73521C13.0793 7.03635 13.0657 7.51038 12.7646 7.79478C12.4635 8.07897 11.9894 8.06557 11.705 7.76451L8.75094 4.6356L8.75094 13.2499C8.75094 13.6639 8.41493 13.9996 8.00094 13.9999C7.58672 13.9999 7.25094 13.6641 7.25094 13.2499L7.25094 4.63365L4.29488 7.76451C4.01045 8.06544 3.53638 8.07913 3.23531 7.79478C2.93446 7.51042 2.92091 7.03629 3.20504 6.73521L7.45504 2.23521C7.45782 2.23227 7.46101 2.22932 7.46383 2.22643C7.47043 2.21966 7.47749 2.2134 7.48434 2.20689C7.51221 2.18038 7.54196 2.15637 7.5732 2.13463C7.58151 2.12885 7.59005 2.12347 7.59859 2.11803C7.63238 2.09649 7.6674 2.07722 7.70406 2.06139C7.71106 2.05837 7.71845 2.05638 7.72555 2.05357C7.81216 2.01927 7.90483 1.99992 7.99996 1.99986C8.09559 1.99986 8.18931 2.01897 8.27633 2.05357C8.28506 2.05703 8.29413 2.05956 8.3027 2.06334C8.3376 2.07876 8.37103 2.09741 8.40328 2.11803C8.4122 2.12372 8.42099 2.12955 8.42965 2.1356C8.4578 2.15532 8.4843 2.17742 8.50973 2.20103C8.52037 2.21092 8.53092 2.22083 8.54098 2.23131C8.54225 2.23264 8.54362 2.23388 8.54488 2.23521L12.7949 6.73521Z" />
       ) : (
         <Fragment>
           <path d="M13.76,7.32a.74.74,0,0,1-.53-.22L8,1.87,2.77,7.1A.75.75,0,1,1,1.71,6L7.47.28a.74.74,0,0,1,1.06,0L14.29,6a.75.75,0,0,1,0,1.06A.74.74,0,0,1,13.76,7.32Z" />

@@ -1,12 +1,22 @@
+import {Fragment} from 'react';
+import {useTheme} from '@emotion/react';
+
 import type {SVGIconProps} from './svgIcon';
 import {SvgIcon} from './svgIcon';
 
 export function IconAsana(props: SVGIconProps) {
+  const theme = useTheme();
   return (
-    <SvgIcon {...props} kind="path">
-      <path d="M8,.61A3.48,3.48,0,1,1,4.52,4.09,3.48,3.48,0,0,1,8,.61Z" />
-      <path d="M1,14.38A3.48,3.48,0,1,0,1,9.45,3.49,3.49,0,0,0,1,14.38Z" />
-      <path d="M15,14.38a3.48,3.48,0,1,1,0-4.93A3.49,3.49,0,0,1,15,14.38Z" />
+    <SvgIcon {...props}>
+      {theme.isChonk ? (
+        <path d="M2.78223 8.50098C3.45687 8.36775 4.15591 8.43746 4.79102 8.70117C5.42617 8.96492 5.96874 9.41139 6.35059 9.9834C6.73234 10.5554 6.93652 11.2274 6.93652 11.915C6.93652 12.6028 6.73244 13.2756 6.35059 13.8477C5.96876 14.4195 5.42601 14.8652 4.79102 15.1289C4.15591 15.3926 3.45687 15.4623 2.78223 15.3291C2.1075 15.1958 1.48717 14.8654 1 14.3799C0.347263 13.7256 -0.0195312 12.8392 -0.0195312 11.915C-0.0195257 10.9908 0.347255 10.1045 1 9.4502C1.48717 8.96472 2.1075 8.63427 2.78223 8.50098ZM11.209 8.70117C11.8441 8.43746 12.5431 8.36774 13.2178 8.50098C13.8925 8.63427 14.5128 8.96472 15 9.4502C15.6527 10.1045 16.0195 10.9908 16.0195 11.915C16.0195 12.8392 15.6527 13.7256 15 14.3799C14.5128 14.8654 13.8925 15.1958 13.2178 15.3291C12.5431 15.4623 11.8441 15.3926 11.209 15.1289C10.574 14.8652 10.0312 14.4195 9.64941 13.8477C9.26756 13.2756 9.06348 12.6028 9.06348 11.915C9.06348 11.2274 9.26766 10.5554 9.64941 9.9834C10.0313 9.41139 10.5738 8.96492 11.209 8.70117ZM8 0.610352C8.68828 0.610352 9.36131 0.813902 9.93359 1.19629C10.5057 1.5786 10.9514 2.12212 11.2148 2.75781C11.4782 3.39364 11.5473 4.09356 11.4131 4.76855C11.2788 5.44361 10.9476 6.06409 10.4609 6.55078C9.97425 7.03747 9.35376 7.36865 8.67871 7.50293C8.00372 7.63715 7.30379 7.56805 6.66797 7.30469C6.03228 7.04129 5.48876 6.59556 5.10645 6.02344C4.72406 5.45115 4.52051 4.77812 4.52051 4.08984C4.52051 3.1669 4.88644 2.28153 5.53906 1.62891C6.19168 0.976284 7.07705 0.610357 8 0.610352Z" />
+      ) : (
+        <Fragment>
+          <path d="M8,.61A3.48,3.48,0,1,1,4.52,4.09,3.48,3.48,0,0,1,8,.61Z" />
+          <path d="M1,14.38A3.48,3.48,0,1,0,1,9.45,3.49,3.49,0,0,0,1,14.38Z" />
+          <path d="M15,14.38a3.48,3.48,0,1,1,0-4.93A3.49,3.49,0,0,1,15,14.38Z" />
+        </Fragment>
+      )}
     </SvgIcon>
   );
 }
@@ -6,9 +6,9 @@ import {SvgIcon} from './svgIcon';
 export function IconAttachment(props: SVGIconProps) {
   const theme = useTheme();
   return (
-    <SvgIcon {...props} kind={theme.isChonk ? 'stroke' : 'path'}>
+    <SvgIcon {...props}>
       {theme.isChonk ? (
-        <path d="m14.19,7.12l-5.13,5.13c-1.46,1.46-3.84,1.46-5.3,0h0c-1.46-1.46-1.46-3.84,0-5.3L7.82,2.87c.98-.98,2.56-.98,3.54,0h0c.98.98.98,2.56,0,3.54l-4.07,4.07c-.49.49-1.28.49-1.77,0h0c-.49-.49-.49-1.28,0-1.77l4.07-4.07" />
+        <path d="M6.69836 1.17816C8.22565 -0.391836 10.6994 -0.391826 12.2267 1.17816C13.7426 2.73668 13.7426 5.24364 12.2267 6.80219L7.10657 12.0659C6.19568 13.0021 4.71567 13.0022 3.80481 12.0659C2.90543 11.141 2.90539 9.65568 3.80481 8.7309L8.92493 3.46722C9.21372 3.17047 9.68859 3.16391 9.98547 3.45258C10.2823 3.74136 10.2888 4.21622 10.0001 4.51312L4.88 9.77679C4.54698 10.1193 4.54702 10.6774 4.88 11.02C5.20191 11.3508 5.70945 11.3508 6.03137 11.02L11.1515 5.75629C12.101 4.77999 12.101 3.20033 11.1515 2.22406C10.2132 1.25953 8.71189 1.25954 7.77356 2.22406L2.66711 7.49945L2.66614 7.50043C1.11267 9.09747 1.11277 11.7119 2.66614 13.309C4.20835 14.8944 6.71673 14.8945 8.25891 13.309L14.712 6.67426C15.0008 6.37769 15.4758 6.37103 15.7726 6.65961C16.0693 6.94834 16.0757 7.42325 15.7872 7.72015L9.33411 14.3549C7.20296 16.5459 3.72212 16.5458 1.59094 14.3549C-0.528813 12.1756 -0.528889 8.63383 1.59094 6.45453L6.69739 1.17914L6.69836 1.17816Z" />
       ) : (
         <path d="M4.49,15.79l-.38,0a4.33,4.33,0,0,1-3-1.56A4.41,4.41,0,0,1,1.66,8L10,1a3.33,3.33,0,1,1,4.28,5.1L6,13.06A2.2,2.2,0,0,1,3.17,9.68l8.31-7a.75.75,0,0,1,1,1.15l-8.31,7a.73.73,0,0,0-.25.48.71.71,0,0,0,.16.51.71.71,0,0,0,1,.09l8.31-7A1.84,1.84,0,0,0,14,3.7a1.82,1.82,0,0,0-3-1.56l-8.31,7a2.91,2.91,0,0,0,1.55,5.17,2.89,2.89,0,0,0,2.11-.67l8.38-7a.75.75,0,0,1,1,.1.74.74,0,0,1-.09,1.05l-8.31,7A4.47,4.47,0,0,1,4.49,15.79Z" />
       )}

@@ -1,10 +1,20 @@
+import {Fragment} from 'react';
+import {useTheme} from '@emotion/react';
+
 import type {SVGIconProps} from './svgIcon';
 import {SvgIcon} from './svgIcon';
 
 export function IconBitbucket(props: SVGIconProps) {
+  const theme = useTheme();
   return (
-    <SvgIcon {...props} kind="path">
-      <path d="M15.56.82H.52A.51.51,0,0,0,0,1.32.19.19,0,0,0,0,1.4L2.18,14.61a.7.7,0,0,0,.68.58H13.3a.52.52,0,0,0,.51-.43L16,1.41A.5.5,0,0,0,15.56.82ZM9.68,10.35H6.35l-.9-4.71h5Z" />
+    <SvgIcon {...props}>
+      {theme.isChonk ? (
+        <path d="M14.1931 7.29857L13.1495 13.8687C13.0815 14.2662 12.8092 14.5 12.4236 14.5H3.57639C3.19078 14.5 2.91857 14.2662 2.85047 13.8687L1.01299 2.15467C0.944944 1.75718 1.14912 1.5 1.51208 1.5H14.4879C14.8509 1.5 15.0551 1.75718 14.987 2.15467L14.4879 5.24098C14.4199 5.68526 14.1704 5.87231 13.762 5.87231H5.95836C5.84493 5.87231 5.77688 5.94244 5.79953 6.0827L6.41206 9.96404C6.43471 10.0576 6.5028 10.1277 6.59354 10.1277H9.40646C9.4972 10.1277 9.56529 10.0576 9.58794 9.96404L10.019 7.15825C10.0643 6.80755 10.2912 6.66724 10.6088 6.66724H13.6713C14.125 6.66724 14.2611 6.90107 14.1931 7.29857Z" />
+      ) : (
+        <Fragment>
+          <path d="M15.56.82H.52A.51.51,0,0,0,0,1.32.19.19,0,0,0,0,1.4L2.18,14.61a.7.7,0,0,0,.68.58H13.3a.52.52,0,0,0,.51-.43L16,1.41A.5.5,0,0,0,15.56.82ZM9.68,10.35H6.35l-.9-4.71h5Z" />
+        </Fragment>
+      )}
     </SvgIcon>
   );
 }
@@ -1,7 +1,5 @@
 import {useTheme} from '@emotion/react';
 
-import {useIconDefaults} from 'sentry/icons/useIconDefaults';
-
 import type {SVGIconProps} from './svgIcon';
 import {SvgIcon} from './svgIcon';
 
@@ -11,19 +9,14 @@ interface Props extends SVGIconProps {
 
 export function IconBookmark({isSolid = false, ...props}: Props) {
   const theme = useTheme();
-
-  const {color: providedColor = 'currentColor'} = useIconDefaults(props);
-
-  // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
-  const color = theme[providedColor] ?? providedColor;
-
   return (
-    <SvgIcon {...props} kind={theme.isChonk ? 'stroke' : 'path'}>
+    <SvgIcon {...props}>
       {theme.isChonk ? (
-        <path
-          fill={isSolid ? color : 'none'}
-          d="m5.25,2.75h5.5c.55,0,1,.45,1,1v9.31c0,.23-.29.34-.44.16l-2.92-3.51c-.2-.24-.57-.24-.77,0l-2.92,3.51c-.15.18-.44.07-.44-.16V3.75c0-.55.45-1,1-1Z"
-        />
+        isSolid ? (
+          <path d="M12.25 0C13.2165 0 14 0.783502 14 1.75V14.25C14 14.5429 13.8296 14.8093 13.5635 14.9316C13.2974 15.054 12.9841 15.0099 12.7617 14.8193L8 10.7373L3.23828 14.8193C3.0159 15.0099 2.70262 15.054 2.43652 14.9316C2.17042 14.8093 2 14.5429 2 14.25V1.75C2 0.783502 2.7835 0 3.75 0H12.25Z" />
+        ) : (
+          <path d="M12.25 0C13.2165 0 14 0.783502 14 1.75V14.25C14 14.5429 13.8296 14.8093 13.5635 14.9316C13.2974 15.054 12.9841 15.0099 12.7617 14.8193L8 10.7373L3.23828 14.8193C3.0159 15.0099 2.70262 15.054 2.43652 14.9316C2.17042 14.8093 2 14.5429 2 14.25V1.75C2 0.783502 2.7835 1.00665e-08 3.75 0H12.25ZM3.75 1.5C3.61193 1.5 3.5 1.61193 3.5 1.75V12.6191L7.51172 9.18066L7.62305 9.10156C7.89437 8.94361 8.24254 8.97003 8.48828 9.18066L12.5 12.6191V1.75C12.5 1.61193 12.3881 1.5 12.25 1.5H3.75Z" />
+        )
       ) : isSolid ? (
         <path d="M14.09,16a.71.71,0,0,1-.4-.11L8,12.32,2.31,15.88a.76.76,0,0,1-.76,0,.75.75,0,0,1-.39-.66V2.4A2.38,2.38,0,0,1,3.54,0h8.92A2.38,2.38,0,0,1,14.84,2.4V15.24a.75.75,0,0,1-.39.66A.77.77,0,0,1,14.09,16Z" />
       ) : (

@@ -3,21 +3,8 @@ import {SvgIcon} from './svgIcon';
 
 export function IconBot(props: SVGIconProps) {
   return (
-    <SvgIcon
-      {...props}
-      kind="path"
-      viewBox="0 0 24 24"
-      stroke="currentColor"
-      strokeWidth="2"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    >
-      <path d="M12 8V4H8" fill="none" />
-      <rect width="16" height="12" x="4" y="8" rx="2" fill="none" />
-      <path d="M2 14h2" fill="none" />
-      <path d="M20 14h2" fill="none" />
-      <path d="M15 13v2" />
-      <path d="M9 13v2" />
+    <SvgIcon {...props}>
+      <path d="M8 0C8.41407 0.000167456 8.75 0.33589 8.75 0.75V3H13.25C14.7688 3 16 4.23122 16 5.75V13.25C16 14.7688 14.7688 16 13.25 16H2.75C1.23122 16 2.0133e-08 14.7688 0 13.25V5.75C1.12747e-07 4.23122 1.23122 3 2.75 3H7.25V1.5H5.12305C4.70895 1.49987 4.37305 1.16413 4.37305 0.75C4.37305 0.335868 4.70895 0.000131912 5.12305 0H8ZM2.75 4.5C2.05964 4.5 1.5 5.05964 1.5 5.75V13.25C1.5 13.9404 2.05964 14.5 2.75 14.5H13.25C13.9404 14.5 14.5 13.9404 14.5 13.25V5.75C14.5 5.05964 13.9404 4.5 13.25 4.5H2.75ZM10.25 11.5C10.6642 11.5 11 11.8358 11 12.25C11 12.6642 10.6642 13 10.25 13H5.75C5.33579 13 5 12.6642 5 12.25C5 11.8358 5.33579 11.5 5.75 11.5H10.25ZM6.5 7C6.77614 7 7 7.22386 7 7.5V9.5C7 9.77614 6.77614 10 6.5 10H4.5C4.22386 10 4 9.77614 4 9.5V7.5C4 7.22386 4.22386 7 4.5 7H6.5ZM11.5 7C11.7761 7 12 7.22386 12 7.5V9.5C12 9.77614 11.7761 10 11.5 10H9.5C9.22386 10 9 9.77614 9 9.5V7.5C9 7.22386 9.22386 7 9.5 7H11.5Z" />
     </SvgIcon>
   );
 }
@@ -1,26 +1,14 @@
-import {Fragment} from 'react';
 import {useTheme} from '@emotion/react';
 
 import type {SVGIconProps} from 'sentry/icons/svgIcon';
-import {SvgIcon, useResolvedIconColor} from 'sentry/icons/svgIcon';
+import {SvgIcon} from 'sentry/icons/svgIcon';
 
 export function IconBranch(props: SVGIconProps) {
   const theme = useTheme();
-  const color = useResolvedIconColor(props.color);
   return (
-    <SvgIcon
-      {...props}
-      kind={theme.isChonk ? 'stroke' : 'path'}
-      data-test-id="icon-branch"
-    >
+    <SvgIcon {...props} data-test-id="icon-branch">
       {theme.isChonk ? (
-        <Fragment>
-          <path
-            fill={color}
-            d="M5 13.25c.5523 0 1-.4477 1-1s-.4477-1-1-1-1 .4477-1 1 .4477 1 1 1Zm0-8.5c.5523 0 1-.4477 1-1s-.4477-1-1-1-1 .4477-1 1 .4477 1 1 1Zm6.5 0c.5523 0 1-.4477 1-1s-.4477-1-1-1-1 .4477-1 1 .4477 1 1 1Z"
-          />
-          <path d="M5 3.75v8.5m0 .25V11c0-1.66 1.59-3 3.25-3s3.25-1.34 3.25-3V3.75" />
-        </Fragment>
+        <path d="M12 0C13.1046 0 14 0.895431 14 2C14 2.73976 13.5971 3.3835 13 3.72949V4.75C13 6.82115 11.321 8.5 9.25 8.5H7.25C6.00736 8.5 5 9.50736 5 10.75V11.2695C5.59733 11.6155 6 12.2601 6 13C6 14.1046 5.10457 15 4 15C2.89543 15 2 14.1046 2 13C2 12.0683 2.63768 11.2877 3.5 11.0654V3.93359C2.6378 3.71129 2 2.93162 2 2C2 0.895431 2.89543 0 4 0C5.10457 0 6 0.895431 6 2C6 2.73976 5.5971 3.3835 5 3.72949V7.74902C5.62669 7.27841 6.40595 7 7.25 7H9.25C10.4927 7 11.5 5.99256 11.5 4.75V3.93359C10.6378 3.71129 10 2.93162 10 2C10 0.895431 10.8954 0 12 0Z" />
       ) : (
         <path d="M12.4863 1.1953c.9662.0003 1.7498.7839 1.75 1.75 0 .698-.4098 1.2982-1.0009 1.5791v.1387c-.0003 2.4933-2.3343 4.372-4.6739 4.372-1.6693 0-3.1748 1.3576-3.1748 2.8731v.2314c.591.281 1 .8823 1 1.5801-.0002.9664-.7836 1.75-1.75 1.75-.9663 0-1.7498-.7837-1.75-1.75 0-.6978.4091-1.2991 1-1.5801V4.5244c-.5907-.281-1-.8814-1-1.579.0003-.9664.7837-1.75 1.75-1.75.9664 0 1.7498.7836 1.75 1.75 0 .6976-.4093 1.298-1 1.579V8.752c.8717-.7606 2.0225-1.2168 3.1748-1.2168 1.6691-.0002 3.1736-1.3568 3.1739-2.8721v-.1397c-.5901-.2813-.9991-.8808-.9991-1.578.0003-.9664.7837-1.75 1.75-1.75Z" />
       )}