diff --git a/components/project/activity/action-icon.tsx b/components/project/activity/action-icon.tsx
new file mode 100644
index 0000000..34cbfee
--- /dev/null
+++ b/components/project/activity/action-icon.tsx
@@ -0,0 +1,53 @@
+import { ActivityIcon, Plus, RefreshCw, Trash2 } from "lucide-react";
+import { cn } from "@/lib/utils";
+
+function CreatedIcon({ className }: { className?: string }) {
+	return (
+		<div className={cn("rounded-lg shrink-0 p-1.5 bg-emerald-500/10", className)}>
+			<Plus className="h-4 w-4 text-emerald-500" />
+		</div>
+	);
+}
+
+function UpdatedIcon({ className }: { className?: string }) {
+	return (
+		<div className={cn("rounded-lg shrink-0 p-1.5 bg-amber-500/10", className)}>
+			<RefreshCw className="h-4 w-4 text-amber-500" />
+		</div>
+	);
+}
+
+function DeletedIcon({ className }: { className?: string }) {
+	return (
+		<div className={cn("rounded-lg shrink-0 p-1.5 bg-red-500/10", className)}>
+			<Trash2 className="h-4 w-4 text-red-500" />
+		</div>
+	);
+}
+
+function DefaultIcon({ className }: { className?: string }) {
+	return (
+		<div className={cn("rounded-lg shrink-0 p-1.5 bg-muted", className)}>
+			<ActivityIcon className="h-4 w-4 text-muted-foreground" />
+		</div>
+	);
+}
+
+export function ActionIcon({
+	action,
+	className,
+}: {
+	action: string;
+	className?: string;
+}) {
+	switch (action) {
+		case "created":
+			return <CreatedIcon className={className} />;
+		case "updated":
+			return <UpdatedIcon className={className} />;
+		case "deleted":
+			return <DeletedIcon className={className} />;
+		default:
+			return <DefaultIcon className={className} />;
+	}
+}
diff --git a/components/project/activity/activity-detail-panel.tsx b/components/project/activity/activity-detail-panel.tsx
index 4f972ca..2cdaa1c 100644
--- a/components/project/activity/activity-detail-panel.tsx
+++ b/components/project/activity/activity-detail-panel.tsx
@@ -1,24 +1,18 @@
 "use client";
 
 import { useQuery } from "@tanstack/react-query";
-import {
-	CalendarIcon,
-	CompassIcon,
-	RefreshCw,
-	UserIcon,
-	X,
-} from "lucide-react";
+import { CalendarIcon, CompassIcon, UserIcon, X } from "lucide-react";
 import { useParams } from "next/navigation";
 import { Panel } from "@/components/core/panel";
 import { UserAvatar } from "@/components/core/user-avatar";
 import { SpinnerWithSpacing } from "@/components/core/loaders";
 import {
 	formatEventTypeLabel,
-	getActionIcon,
 	getEventDescription,
 } from "@/lib/activity/message";
 import { guessTimezone, toFullDateTimeString } from "@/lib/utils/date";
 import { useTRPCClient } from "@/trpc/client";
+import { ActionIcon } from "./action-icon";
 
 function SectionLabel({
 	icon: Icon,
@@ -64,9 +58,6 @@ export function ActivityDetailPanel({
 			}),
 	});
 
-	const actionConfig = item ? getActionIcon(item.action) : null;
-	const ActionIcon = actionConfig?.icon ?? RefreshCw;
-
 	return (
 		<Panel
 			open={true}
@@ -87,11 +78,7 @@ export function ActivityDetailPanel({
 				<>
 					<div className="flex items-start justify-between p-4 border-b">
 						<div className="flex items-start gap-3">
-							<div className={`p-2 rounded-lg ${actionConfig?.bg}`}>
-								<ActionIcon
-									className={`h-5 w-5 ${actionConfig?.color}`}
-								/>
-							</div>
+							<ActionIcon action={item.action} />
 							<div>
 								<h2 className="font-semibold text-lg">
 									{formatEventTypeLabel(item.type, item.action)}
diff --git a/components/project/activity/activity-feed.tsx b/components/project/activity/activity-feed.tsx
index 410bd15..dc517af 100644
--- a/components/project/activity/activity-feed.tsx
+++ b/components/project/activity/activity-feed.tsx
@@ -13,10 +13,10 @@ import type { ActivityWithActor } from "@/drizzle/types";
 import {
 	formatEventTypeLabel,
 	generateObjectDiffMessage,
-	getActionIcon,
 } from "@/lib/activity/message";
 import { guessTimezone, toDateTimeString } from "@/lib/utils/date";
 import { useTRPCClient } from "@/trpc/client";
+import { ActionIcon } from "./action-icon";
 import { ActivityDetailPanel } from "./activity-detail-panel";
 
 const ACTIVITIES_LIMIT = 25;
@@ -25,9 +25,6 @@ export function ActivityItem({
 	item,
 	onSelect,
 }: { item: ActivityWithActor; onSelect: (id: number) => void }) {
-	const actionConfig = getActionIcon(item.action);
-	const ActionIcon = actionConfig.icon;
-
 	return (
 		<button
 			type="button"
@@ -35,11 +32,7 @@ export function ActivityItem({
 			className="w-full text-left py-4 px-4 hover:bg-muted/40 rounded-lg transition-colors cursor-pointer"
 		>
 			<div className="flex items-start gap-3">
-				<div
-					className={`p-1.5 rounded-lg ${actionConfig.bg} mt-0.5 shrink-0`}
-				>
-					<ActionIcon className={`h-4 w-4 ${actionConfig.color}`} />
-				</div>
+				<ActionIcon action={item.action} className="mt-0.5" />
 
 				<div className="flex-1 min-w-0">
 					<div className="flex items-center justify-between gap-2">
diff --git a/lib/activity/message.ts b/lib/activity/message.ts
index 22b92f7..6bb166d 100644
--- a/lib/activity/message.ts
+++ b/lib/activity/message.ts
@@ -1,20 +1,6 @@
-import { ActivityIcon, Plus, RefreshCw, Trash2 } from "lucide-react";
 import type { ActivityWithActor } from "@/drizzle/types";
 import { guessTimezone, toDateStringWithDay } from "../utils/date";
 
-export function getActionIcon(action: string) {
-	switch (action) {
-		case "created":
-			return { icon: Plus, color: "text-emerald-500", bg: "bg-emerald-500/10" };
-		case "updated":
-			return { icon: RefreshCw, color: "text-amber-500", bg: "bg-amber-500/10" };
-		case "deleted":
-			return { icon: Trash2, color: "text-red-500", bg: "bg-red-500/10" };
-		default:
-			return { icon: ActivityIcon, color: "text-muted-foreground", bg: "bg-muted" };
-	}
-}
-
 // biome-ignore lint/suspicious/noExplicitAny: flexible date parameter handling
 function toDateString(date: any) {
 	if (!date) {