diff --git a/static/app/views/issueDetails/activitySection/groupActivityIcons.tsx b/static/app/views/issueDetails/activitySection/groupActivityIcons.tsx
index 779ce980fade..3d00b2f02d4d 100644
--- a/static/app/views/issueDetails/activitySection/groupActivityIcons.tsx
+++ b/static/app/views/issueDetails/activitySection/groupActivityIcons.tsx
@@ -44,12 +44,12 @@ import {GroupActivityType} from 'sentry/types/group';
 interface IconWithDefaultProps {
   Component: React.ComponentType<SVGIconProps> | null;
   defaultProps: {locked?: boolean; type?: string};
-  componentFunction?: (props: {
+  propsFunction?: (data: GroupActivity['data']) => Record<string, unknown>;
+  renderIcon?: (props: {
     data: GroupActivity['data'];
     sentry_app: GroupActivity['sentry_app'];
     user: GroupActivity['user'];
-  }) => React.ComponentType<SVGIconProps>;
-  propsFunction?: (data: GroupActivity['data']) => Record<string, unknown>;
+  }) => React.ReactNode;
 }
 
 export const groupActivityTypeIconMapping: Record<
@@ -59,13 +59,11 @@ export const groupActivityTypeIconMapping: Record<
   [GroupActivityType.NOTE]: {
     Component: IconChat,
     defaultProps: {},
-    componentFunction: ({user, sentry_app}) => {
+    renderIcon: ({user, sentry_app}) => {
       if (sentry_app) {
-        return function () {
-          return <SentryAppAvatar sentryApp={sentry_app} />;
-        };
+        return <SentryAppAvatar sentryApp={sentry_app} />;
       }
-      return user ? () => <StyledUserAvatar user={user} /> : IconChat;
+      return user ? <StyledUserAvatar user={user} /> : <IconChat size="xs" />;
     },
   },
   [GroupActivityType.SET_RESOLVED]: {Component: IconCheckmark, defaultProps: {}},
@@ -109,21 +107,21 @@ export const groupActivityTypeIconMapping: Record<
   [GroupActivityType.SET_REGRESSION]: {Component: IconFire, defaultProps: {}},
   [GroupActivityType.CREATE_ISSUE]: {
     Component: IconAdd,
-    componentFunction: ({data}) => {
+    renderIcon: ({data}) => {
       const provider = (data as GroupActivityCreateIssue['data']).provider;
       switch (provider) {
         case 'GitHub':
-          return IconGithub;
+          return <IconGithub size="xs" />;
         case 'GitLab':
-          return IconGitlab;
+          return <IconGitlab size="xs" />;
         case 'Bitbucket':
-          return IconBitbucket;
+          return <IconBitbucket size="xs" />;
         case 'Jira':
-          return IconJira;
+          return <IconJira size="xs" />;
         case 'Asana':
-          return IconAsana;
+          return <IconAsana size="xs" />;
         default:
-          return IconAdd;
+          return <IconAdd size="xs" />;
       }
     },
     defaultProps: {},
diff --git a/static/app/views/issueDetails/activitySection/index.tsx b/static/app/views/issueDetails/activitySection/index.tsx
index a85dd8c426d3..70a55ed421b7 100644
--- a/static/app/views/issueDetails/activitySection/index.tsx
+++ b/static/app/views/issueDetails/activitySection/index.tsx
@@ -134,14 +134,20 @@ function LegacyTimelineItem({
   );
 
   const iconMapping = groupActivityTypeIconMapping[item.type];
-  const componentFunction = iconMapping?.componentFunction;
-  const Icon = componentFunction
-    ? componentFunction({
+  const Icon = iconMapping?.Component ?? null;
+  const iconNode = iconMapping?.renderIcon
+    ? iconMapping.renderIcon({
         data: item.data,
         user: item.user,
         sentry_app: item.sentry_app,
       })
-    : (iconMapping?.Component ?? null);
+    : Icon && (
+        <Icon
+          {...iconMapping.defaultProps}
+          {...iconMapping.propsFunction?.(item.data)}
+          size="xs"
+        />
+      );
 
   return (
     <ActivityTimelineItem
@@ -160,15 +166,7 @@ function LegacyTimelineItem({
         </TitleRow>
       }
       timestamp={<Timestamp date={item.dateCreated} unitStyle={timestampUnitStyle} />}
-      icon={
-        Icon && (
-          <Icon
-            {...iconMapping.defaultProps}
-            {...iconMapping.propsFunction?.(item.data)}
-            size="xs"
-          />
-        )
-      }
+      icon={iconNode}
     >
       {item.type === GroupActivityType.NOTE && editing ? (
         <ActivityNoteInput
diff --git a/static/app/views/issueList/progressActivityTooltip.tsx b/static/app/views/issueList/progressActivityTooltip.tsx
index f81af33c2ac1..f52da9c320b4 100644
--- a/static/app/views/issueList/progressActivityTooltip.tsx
+++ b/static/app/views/issueList/progressActivityTooltip.tsx
@@ -77,15 +77,20 @@ function ProgressActivityItem({group, item}: {group: Group; item: GroupActivity}
   );
 
   const iconMapping = groupActivityTypeIconMapping[item.type];
-  const componentFunction =
-    item.type === GroupActivityType.NOTE ? undefined : iconMapping?.componentFunction;
-  const Icon = componentFunction
-    ? componentFunction({
+  const Icon = iconMapping?.Component ?? null;
+  const iconNode = iconMapping?.renderIcon
+    ? iconMapping.renderIcon({
         data: item.data,
         user: item.user,
         sentry_app: item.sentry_app,
       })
-    : (iconMapping?.Component ?? null);
+    : Icon && (
+        <Icon
+          {...iconMapping.defaultProps}
+          {...iconMapping.propsFunction?.(item.data)}
+          size="xs"
+        />
+      );
 
   return (
     <Timeline.Item
@@ -93,15 +98,7 @@ function ProgressActivityItem({group, item}: {group: Group; item: GroupActivity}
       timestamp={<Timestamp date={item.dateCreated} unitStyle="extraShort" />}
       marker={<ActivityMarker item={item} color={colorConfig.icon} />}
       colorConfig={colorConfig}
-      icon={
-        Icon && (
-          <Icon
-            {...iconMapping.defaultProps}
-            {...iconMapping.propsFunction?.(item.data)}
-            size="xs"
-          />
-        )
-      }
+      icon={iconNode}
     >
       {typeof message === 'string' ? (
         <NoteBody text={message} />