diff --git a/src/features/chat/ui/message-stream/text-item-actions.tsx b/src/features/chat/ui/message-stream/text-item-actions.tsx
index 4322249b..c1be566a 100644
--- a/src/features/chat/ui/message-stream/text-item-actions.tsx
+++ b/src/features/chat/ui/message-stream/text-item-actions.tsx
@@ -49,7 +49,7 @@ export function TextItemHeader({ item, context }: { item: TextMessageStreamItem;
       )}
       {context.canForkItem?.(item) ? (
         <TextItemAction
-          icon="git-fork"
+          icon={forkActionsOpen ? "file-plus-corner" : "lucide-split"}
           label={forkActionsOpen ? "Fork" : "Fork from here"}
           className="codex-panel__fork-message"
           onClick={() => {
diff --git a/tests/features/chat/ui/message-stream/blocks-and-messages.test.tsx b/tests/features/chat/ui/message-stream/blocks-and-messages.test.tsx
index 9a0bd3ee..4f33178f 100644
--- a/tests/features/chat/ui/message-stream/blocks-and-messages.test.tsx
+++ b/tests/features/chat/ui/message-stream/blocks-and-messages.test.tsx
@@ -347,6 +347,7 @@ describe("message stream rendering and message actions", () => {
     expect(closedElement.querySelector(".codex-panel__copy-message")).not.toBeNull();
     const initialFork = expectPresent(closedElement.querySelector<HTMLButtonElement>(".codex-panel__fork-message"));
     expect(initialFork.getAttribute("aria-label")).toBe("Fork from here");
+    expect(initialFork.getAttribute("data-icon")).toBe("lucide-split");
     initialFork.click();
     expect(onForkActionsToggle).toHaveBeenCalledWith("a1");
 
@@ -373,6 +374,7 @@ describe("message stream rendering and message actions", () => {
     );
     const openFork = expectPresent(openElement.querySelector<HTMLButtonElement>(".codex-panel__fork-message"));
     expect(openFork.getAttribute("aria-label")).toBe("Fork");
+    expect(openFork.getAttribute("data-icon")).toBe("file-plus-corner");
     openFork.click();
     expect(onForkItem).toHaveBeenCalledWith(expect.objectContaining({ id: "a1" }), false);
   });