diff --git a/src/app/(modules)/ticket/[ticketId]/components/TicketDetailHeader.tsx b/src/app/(modules)/ticket/[ticketId]/components/TicketDetailHeader.tsx
index e71cad7..b7f9a76 100644
--- a/src/app/(modules)/ticket/[ticketId]/components/TicketDetailHeader.tsx
+++ b/src/app/(modules)/ticket/[ticketId]/components/TicketDetailHeader.tsx
@@ -21,9 +21,23 @@ export function TicketDetailHeader({
 
   return (
     <div className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
-      <div className="min-w-0 space-y-1">
-        <h1 className="text-2xl font-semibold tracking-tight">Ticket Detail</h1>
-        <p className="text-xs ">Ticket: {ticketLabel}</p>
+      <div className="flex min-w-0 items-start gap-3">
+        <Button
+          type="button"
+          variant="secondary"
+          size="icon"
+          onClick={() => router.push('/ticket')}
+          aria-label="Back to ticket list"
+          className="shrink-0"
+        >
+          <ArrowLeft />
+        </Button>
+        <div className="min-w-0 space-y-1">
+          <h1 className="text-2xl font-semibold tracking-tight">
+            Ticket Detail
+          </h1>
+          <p className="text-xs">Ticket: {ticketLabel}</p>
+        </div>
       </div>
 
       <div className="flex shrink-0 items-center gap-2">
@@ -37,10 +51,6 @@ export function TicketDetailHeader({
         <PermissionGuard permissions={PERMISSIONS.TICKET.ASSIGN}>
           <AssignTicketAction ticketId={ticket.id} />
         </PermissionGuard>
-        <Button variant="secondary" onClick={() => router.push('/ticket')}>
-          <ArrowLeft className="size-4" />
-          Back to List
-        </Button>
       </div>
     </div>
   );
diff --git a/src/app/(modules)/ticket/[ticketId]/components/TicketOverviewSkeleton.tsx b/src/app/(modules)/ticket/[ticketId]/components/TicketOverviewSkeleton.tsx
index 997190d..a04caee 100644
--- a/src/app/(modules)/ticket/[ticketId]/components/TicketOverviewSkeleton.tsx
+++ b/src/app/(modules)/ticket/[ticketId]/components/TicketOverviewSkeleton.tsx
@@ -31,9 +31,12 @@ function SummarySkeletonCard() {
 export function TicketOverviewHeaderSkeleton() {
   return (
     <div className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
-      <div className="min-w-0 space-y-2">
-        <Skeleton className="h-8 w-40" />
-        <Skeleton className="h-3 w-36 max-w-full" />
+      <div className="flex min-w-0 items-start gap-3">
+        <Skeleton className="size-10 shrink-0 rounded-lg" />
+        <div className="min-w-0 space-y-2">
+          <Skeleton className="h-8 w-40" />
+          <Skeleton className="h-3 w-36 max-w-full" />
+        </div>
       </div>
 
       <div className="flex shrink-0 items-center gap-2">