diff --git a/resources/js/components/commit-card.tsx b/resources/js/components/commit-card.tsx
index f584444ee..80b7ae126 100644
--- a/resources/js/components/commit-card.tsx
+++ b/resources/js/components/commit-card.tsx
@@ -16,6 +16,7 @@ import {
     ShowThreadLink,
     ThreadActions,
     ThreadReplies,
+    ThreadReplyComposer,
     useThread,
 } from '@/components/commit-thread';
 import { useCommitTranslation } from '@/components/commit-translation';
@@ -272,6 +273,7 @@ export function CommitCard({
                     lane={laneColor(commit.user.lane)}
                     previousLane={previousLane}
                     endsWithDot={endsWithDot}
+                    endsOnActions
                     nodePosition={railNodePosition}
                     hasTail={hasRailTail && railNodePosition !== 'bottom'}
                     hasReplyTail={
@@ -324,10 +326,7 @@ export function CommitCard({
                 <ChainedEntrance
                     isFresh={isFresh}
                     previousLane={previousLane}
-                    className={cn(
-                        'min-w-0 pr-4',
-                        hasVisibleReplies ? 'pt-3' : 'border-b py-3',
-                    )}
+                    className="min-w-0 pt-3 pr-4"
                 >
                     <div
                         inert={wasDeleted}
@@ -542,6 +541,7 @@ export function CommitCard({
                                 <ThreadActions
                                     thread={thread}
                                     hasKeyboardShortcuts
+                                    hasComposer={false}
                                     actions={
                                         <>
                                             <CommitStarButton
@@ -562,52 +562,78 @@ export function CommitCard({
                                     }
                                 />
                             )}
+                        </div>
+                    </div>
+                </ChainedEntrance>
+                {/* What opens below the actions row gets a row of its own, so the rail's row, and its end dot, end on the actions. */}
+                <RailSegment
+                    lane={
+                        hasRailTail && !endsWithDot
+                            ? laneColor(commit.user.lane)
+                            : undefined
+                    }
+                    isDimmed={isDimmed}
+                />
+                <ChainedEntrance
+                    isFresh={isFresh}
+                    previousLane={previousLane}
+                    className={cn('min-w-0 pr-4', {
+                        'border-b pb-3': !hasVisibleReplies,
+                    })}
+                >
+                    <div
+                        inert={wasDeleted}
+                        className={cn('transition-opacity duration-200', {
+                            'opacity-70': isDimmed,
+                            'opacity-50': wasDeleted,
+                        })}
+                    >
+                        <ThreadReplyComposer thread={thread} />
 
-                            {actions}
+                        {actions}
 
-                            {deletion === 'deleting' && (
-                                <p
-                                    className="mt-3 flex min-h-12 items-center rounded-md bg-destructive/8 px-3 py-2 font-mono text-sm text-muted-foreground"
-                                    role="status"
-                                >
-                                    rm {hash} → /dev/null
-                                </p>
-                            )}
+                        {deletion === 'deleting' && (
+                            <p
+                                className="mt-3 flex min-h-12 items-center rounded-md bg-destructive/8 px-3 py-2 font-mono text-sm text-muted-foreground"
+                                role="status"
+                            >
+                                rm {hash} → /dev/null
+                            </p>
+                        )}
 
-                            {deletion === 'confirming' && (
-                                <div
-                                    role="group"
-                                    aria-label="Confirm delete"
-                                    onKeyDown={(event) => {
-                                        if (event.key === 'Escape') {
-                                            cancelDeletion();
-                                        }
-                                    }}
-                                    className="mt-3 flex min-h-12 flex-wrap items-center gap-x-3 gap-y-2 rounded-md bg-destructive/8 px-3 py-2 text-sm"
+                        {deletion === 'confirming' && (
+                            <div
+                                role="group"
+                                aria-label="Confirm delete"
+                                onKeyDown={(event) => {
+                                    if (event.key === 'Escape') {
+                                        cancelDeletion();
+                                    }
+                                }}
+                                className="mt-3 flex min-h-12 flex-wrap items-center gap-x-3 gap-y-2 rounded-md bg-destructive/8 px-3 py-2 text-sm"
+                            >
+                                <span className="mr-auto">
+                                    Delete this commit? You can undo for 30
+                                    seconds.
+                                </span>
+                                <Button
+                                    variant="ghost"
+                                    size="sm"
+                                    autoFocus
+                                    onClick={cancelDeletion}
                                 >
-                                    <span className="mr-auto">
-                                        Delete this commit? You can undo for 30
-                                        seconds.
-                                    </span>
-                                    <Button
-                                        variant="ghost"
-                                        size="sm"
-                                        autoFocus
-                                        onClick={cancelDeletion}
-                                    >
-                                        Cancel
-                                    </Button>
-                                    <Button
-                                        variant="destructive"
-                                        size="sm"
-                                        onClick={deleteCommit}
-                                        data-test="confirm-delete-commit-button"
-                                    >
-                                        Delete
-                                    </Button>
-                                </div>
-                            )}
-                        </div>
+                                    Cancel
+                                </Button>
+                                <Button
+                                    variant="destructive"
+                                    size="sm"
+                                    onClick={deleteCommit}
+                                    data-test="confirm-delete-commit-button"
+                                >
+                                    Delete
+                                </Button>
+                            </div>
+                        )}
                     </div>
                 </ChainedEntrance>
                 {commit.replies_count !== undefined && (
diff --git a/resources/js/components/commit-report-button.tsx b/resources/js/components/commit-report-button.tsx
index e2567a628..4068fb4b6 100644
--- a/resources/js/components/commit-report-button.tsx
+++ b/resources/js/components/commit-report-button.tsx
@@ -54,7 +54,7 @@ export function CommitReportButton({ commit }: { commit: Commit }) {
                     <DialogTrigger asChild>
                         <button
                             type="button"
-                            className="rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"
+                            className="rounded-md p-1 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"
                             aria-label="Report commit"
                         >
                             <Flag aria-hidden className="size-4" />
diff --git a/resources/js/components/commit-thread.tsx b/resources/js/components/commit-thread.tsx
index a3a5d516e..0eaaf7327 100644
--- a/resources/js/components/commit-thread.tsx
+++ b/resources/js/components/commit-thread.tsx
@@ -563,11 +563,14 @@ export function ThreadActions({
     thread,
     actions,
     hasKeyboardShortcuts = false,
+    hasComposer = true,
     isReply = false,
 }: {
     thread: Thread;
     actions?: ReactNode;
     hasKeyboardShortcuts?: boolean;
+    /** False when the caller renders the reply composer itself, as ThreadReplyComposer. */
+    hasComposer?: boolean;
     isReply?: boolean;
 }) {
     const { auth } = usePage().props;
@@ -666,17 +669,23 @@ export function ThreadActions({
                 )}
             </div>
 
-            {thread.isReplying && !isDeleted(commit) && (
-                <ReplyComposer
-                    parent={commit}
-                    onCancel={thread.cancelReply}
-                    onReplied={thread.onReplied}
-                />
-            )}
+            {hasComposer && <ThreadReplyComposer thread={thread} />}
         </>
     );
 }
 
+export function ThreadReplyComposer({ thread }: { thread: Thread }) {
+    const { commit } = thread;
+
+    return thread.isReplying && !isDeleted(commit) ? (
+        <ReplyComposer
+            parent={commit}
+            onCancel={thread.cancelReply}
+            onReplied={thread.onReplied}
+        />
+    ) : null;
+}
+
 export function ThreadSpine({
     thread,
     className,
diff --git a/resources/js/components/graph-rail.tsx b/resources/js/components/graph-rail.tsx
index c87095d6a..72223c5bc 100644
--- a/resources/js/components/graph-rail.tsx
+++ b/resources/js/components/graph-rail.tsx
@@ -23,6 +23,8 @@ type Props = {
     hasTail?: boolean;
     hasReplyTail?: boolean;
     endsWithDot?: boolean;
+    /** The commit's actions row is the last thing next to the rail, so its end dot lands on that row. */
+    endsOnActions?: boolean;
     isDimmed?: boolean;
     isPreviousDimmed?: boolean;
     node?: ReactNode;
@@ -64,6 +66,7 @@ export function GraphRail({
     hasTail = true,
     hasReplyTail = false,
     endsWithDot = false,
+    endsOnActions = false,
     isDimmed = false,
     isPreviousDimmed = false,
     node,
@@ -74,12 +77,19 @@ export function GraphRail({
     // A fresh commit going on below another one, like a reply chained under the last commit of a thread, scales in once
     // the trunk has reached it.
     const waitsForTrunk = isFresh && previousLane !== undefined;
+    // The actions row is 24px tall, or 28px below md, where the secondary actions fold into a menu button. It ends the
+    // rail's row: what opens below it, like the reply composer, has a row of its own.
+    const endDotBottom = endsOnActions ? 'bottom-3.5 md:bottom-3' : 'bottom-5';
 
     return (
         <div
             aria-hidden
             className={cn('relative min-h-16 w-16 shrink-0 sm:w-18', {
-                'min-h-24': endsWithDot || nodePosition === 'bottom',
+                'min-h-24':
+                    (endsWithDot && !endsOnActions) ||
+                    nodePosition === 'bottom',
+                // The commit's bottom padding and border sit in the row below.
+                'min-h-[calc(6rem-13px)]': endsWithDot && endsOnActions,
             })}
             style={{ '--lane': lane } as CSSProperties}
             onPointerEnter={
@@ -134,7 +144,7 @@ export function GraphRail({
                                 dimmable,
                                 {
                                     'opacity-60': isDimmed,
-                                    'bottom-5': endsWithDot,
+                                    [endDotBottom]: endsWithDot,
                                     'top-[calc(50%-1px)]':
                                         nodePosition === 'center',
                                     'top-[22px]': nodePosition === 'author',
@@ -154,7 +164,10 @@ export function GraphRail({
                                 'top-[23px]': nodePosition === 'author',
                                 'top-1/2': nodePosition === 'center',
                                 'top-auto h-5':
-                                    endsWithDot || nodePosition === 'bottom',
+                                    (endsWithDot && !endsOnActions) ||
+                                    nodePosition === 'bottom',
+                                'top-auto h-3.5 md:h-3':
+                                    endsWithDot && endsOnActions,
                             },
                         )}
                         style={laneStrokeStyle('var(--lane)', {
@@ -180,6 +193,7 @@ export function GraphRail({
                 }
                 isFresh={isFresh}
                 isDimmed={isDimmed}
+                bottom={endDotBottom}
                 delay={endDotDelay + (waitsForTrunk ? bridgeDuration : 0)}
             />
 
@@ -266,11 +280,14 @@ export function RailEndDot({
     isDimmed = false,
     delay = endDotDelay,
     isLeaving = false,
+    bottom = 'bottom-5',
     onLeft,
 }: {
     spec?: GraphNodeSpec | null;
     isFresh?: boolean;
     isDimmed?: boolean;
+    /** How far up the dot sits, as a class. */
+    bottom?: string;
     delay?: number;
     isLeaving?: boolean;
     onLeft?: () => void;
@@ -290,7 +307,9 @@ export function RailEndDot({
             data-dimmed={isDimmed || undefined}
             isFresh={isFresh && !isLeaving}
             className={cn(
-                'group/rail-node absolute bottom-5 left-1/2 flex -translate-x-1/2 translate-y-1/2 rounded-full',
+                'group/rail-node absolute',
+                bottom,
+                'left-1/2 flex -translate-x-1/2 translate-y-1/2 rounded-full',
                 { 'motion-safe:animate-node-out': isLeaving },
             )}
             style={