diff --git a/app/(app)/dashboard/loading.tsx b/app/(app)/dashboard/loading.tsx
index 656e323..40800ab 100644
--- a/app/(app)/dashboard/loading.tsx
+++ b/app/(app)/dashboard/loading.tsx
@@ -1,10 +1,12 @@
+import { Skeleton } from '@/components/ui/skeleton'
+
 export default function Loading() {
   return (
-    <div className="p-6 max-w-4xl mx-auto w-full animate-pulse">
-      <div className="h-6 w-32 bg-border rounded mb-6" />
+    <div className="p-6 max-w-4xl mx-auto w-full">
+      <Skeleton className="h-6 w-32 mb-6" />
       <div className="grid gap-3">
-        {[1, 2, 3].map(i => (
-          <div key={i} className="h-20 bg-border/50 rounded-xl" />
+        {[1, 2, 3].map((i) => (
+          <Skeleton key={i} className="h-20 rounded-xl" />
         ))}
       </div>
     </div>
diff --git a/app/(app)/products/[id]/loading.tsx b/app/(app)/products/[id]/loading.tsx
index 795b2c5..8dcb9c1 100644
--- a/app/(app)/products/[id]/loading.tsx
+++ b/app/(app)/products/[id]/loading.tsx
@@ -1,34 +1 @@
-export default function Loading() {
-  return (
-    <div className="flex flex-col h-full animate-pulse">
-      {/* Header skeleton */}
-      <div className="px-4 py-3 border-b border-border bg-surface-container-low shrink-0 flex items-center justify-between">
-        <div className="space-y-1.5">
-          <div className="h-4 w-32 bg-border rounded" />
-          <div className="h-3 w-48 bg-border/60 rounded" />
-        </div>
-        <div className="h-7 w-24 bg-border rounded" />
-      </div>
-
-      {/* Split pane skeleton */}
-      <div className="flex-1 flex overflow-hidden">
-        {/* Left */}
-        <div className="w-2/5 border-r border-border p-4 space-y-3">
-          <div className="h-4 w-24 bg-border rounded" />
-          {[1, 2, 3, 4, 5].map(i => (
-            <div key={i} className="h-8 bg-border/50 rounded" />
-          ))}
-        </div>
-        {/* Right */}
-        <div className="flex-1 p-4 space-y-3">
-          <div className="h-4 w-16 bg-border rounded" />
-          <div className="flex gap-2 flex-wrap">
-            {[1, 2, 3].map(i => (
-              <div key={i} className="w-28 h-24 bg-border/50 rounded-lg" />
-            ))}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
+export { default } from '@/components/loading/backlog-page-skeleton'
diff --git a/app/(app)/products/[id]/sprint/[sprintId]/loading.tsx b/app/(app)/products/[id]/sprint/[sprintId]/loading.tsx
index 795b2c5..8dcb9c1 100644
--- a/app/(app)/products/[id]/sprint/[sprintId]/loading.tsx
+++ b/app/(app)/products/[id]/sprint/[sprintId]/loading.tsx
@@ -1,34 +1 @@
-export default function Loading() {
-  return (
-    <div className="flex flex-col h-full animate-pulse">
-      {/* Header skeleton */}
-      <div className="px-4 py-3 border-b border-border bg-surface-container-low shrink-0 flex items-center justify-between">
-        <div className="space-y-1.5">
-          <div className="h-4 w-32 bg-border rounded" />
-          <div className="h-3 w-48 bg-border/60 rounded" />
-        </div>
-        <div className="h-7 w-24 bg-border rounded" />
-      </div>
-
-      {/* Split pane skeleton */}
-      <div className="flex-1 flex overflow-hidden">
-        {/* Left */}
-        <div className="w-2/5 border-r border-border p-4 space-y-3">
-          <div className="h-4 w-24 bg-border rounded" />
-          {[1, 2, 3, 4, 5].map(i => (
-            <div key={i} className="h-8 bg-border/50 rounded" />
-          ))}
-        </div>
-        {/* Right */}
-        <div className="flex-1 p-4 space-y-3">
-          <div className="h-4 w-16 bg-border rounded" />
-          <div className="flex gap-2 flex-wrap">
-            {[1, 2, 3].map(i => (
-              <div key={i} className="w-28 h-24 bg-border/50 rounded-lg" />
-            ))}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
+export { default } from '@/components/loading/backlog-page-skeleton'
diff --git a/app/(app)/products/[id]/sprint/[sprintId]/planning/loading.tsx b/app/(app)/products/[id]/sprint/[sprintId]/planning/loading.tsx
index 795b2c5..8dcb9c1 100644
--- a/app/(app)/products/[id]/sprint/[sprintId]/planning/loading.tsx
+++ b/app/(app)/products/[id]/sprint/[sprintId]/planning/loading.tsx
@@ -1,34 +1 @@
-export default function Loading() {
-  return (
-    <div className="flex flex-col h-full animate-pulse">
-      {/* Header skeleton */}
-      <div className="px-4 py-3 border-b border-border bg-surface-container-low shrink-0 flex items-center justify-between">
-        <div className="space-y-1.5">
-          <div className="h-4 w-32 bg-border rounded" />
-          <div className="h-3 w-48 bg-border/60 rounded" />
-        </div>
-        <div className="h-7 w-24 bg-border rounded" />
-      </div>
-
-      {/* Split pane skeleton */}
-      <div className="flex-1 flex overflow-hidden">
-        {/* Left */}
-        <div className="w-2/5 border-r border-border p-4 space-y-3">
-          <div className="h-4 w-24 bg-border rounded" />
-          {[1, 2, 3, 4, 5].map(i => (
-            <div key={i} className="h-8 bg-border/50 rounded" />
-          ))}
-        </div>
-        {/* Right */}
-        <div className="flex-1 p-4 space-y-3">
-          <div className="h-4 w-16 bg-border rounded" />
-          <div className="flex gap-2 flex-wrap">
-            {[1, 2, 3].map(i => (
-              <div key={i} className="w-28 h-24 bg-border/50 rounded-lg" />
-            ))}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
+export { default } from '@/components/loading/backlog-page-skeleton'
diff --git a/app/(app)/settings/loading.tsx b/app/(app)/settings/loading.tsx
index 07f3dd9..11488b0 100644
--- a/app/(app)/settings/loading.tsx
+++ b/app/(app)/settings/loading.tsx
@@ -1,9 +1,11 @@
+import { Skeleton } from '@/components/ui/skeleton'
+
 export default function Loading() {
   return (
-    <div className="p-6 max-w-2xl mx-auto w-full space-y-4 animate-pulse">
-      <div className="h-6 w-28 bg-border rounded" />
-      {[1, 2, 3, 4].map(i => (
-        <div key={i} className="h-28 bg-border/50 rounded-xl" />
+    <div className="p-6 max-w-2xl mx-auto w-full space-y-4">
+      <Skeleton className="h-6 w-28" />
+      {[1, 2, 3, 4].map((i) => (
+        <Skeleton key={i} className="h-28 rounded-xl" />
       ))}
     </div>
   )
diff --git a/app/_components/tasks/task-dialog-skeleton.tsx b/app/_components/tasks/task-dialog-skeleton.tsx
index bb6a66b..823abb7 100644
--- a/app/_components/tasks/task-dialog-skeleton.tsx
+++ b/app/_components/tasks/task-dialog-skeleton.tsx
@@ -1,5 +1,11 @@
 import { Skeleton } from '@/components/ui/skeleton'
 import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog'
+import {
+  entityDialogBodyClasses,
+  entityDialogContentClasses,
+  entityDialogFooterClasses,
+  entityDialogHeaderClasses,
+} from '@/components/shared/entity-dialog-layout'
 import { cn } from '@/lib/utils'
 
 export function TaskDialogSkeleton() {
@@ -8,32 +14,54 @@ export function TaskDialogSkeleton() {
       <DialogContent
         showCloseButton={false}
         className={cn(
-          'flex flex-col p-0 gap-0',
-          'max-h-[90vh] w-full max-w-[calc(100%-2rem)]',
-          'sm:max-w-[90vw] sm:max-h-[85vh]',
-          'lg:max-w-[50vw] lg:min-w-[480px]',
+          entityDialogContentClasses,
           '[animation-delay:200ms] [animation-fill-mode:backwards]',
         )}
       >
         <DialogTitle className="sr-only">Taak laden…</DialogTitle>
 
-        {/* Header */}
-        <div className="px-6 pt-5 pb-4 border-b border-outline-variant shrink-0">
-          <Skeleton className="h-7 w-40" />
+        <div className={entityDialogHeaderClasses}>
+          <div className="flex items-center gap-2">
+            <Skeleton className="h-7 w-40" />
+            <Skeleton className="h-5 w-14 rounded-full" />
+          </div>
+          <Skeleton className="h-4 w-28" />
         </div>
 
-        {/* Body — 3 bars mimicking title + description + plan */}
-        <div className="flex-1 px-6 py-6 space-y-6">
-          <Skeleton className="h-14 w-full" />
-          <Skeleton className="h-24 w-full" />
-          <Skeleton className="h-32 w-full" />
+        <div className={entityDialogBodyClasses}>
+          <div>
+            <Skeleton className="h-4 w-12 mb-2" />
+            <Skeleton className="h-9 w-full" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-12 mb-2" />
+            <Skeleton className="h-14 w-full" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-24 mb-2" />
+            <Skeleton className="h-20 w-full" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-32 mb-2" />
+            <Skeleton className="h-32 w-full" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-16 mb-2" />
+            <Skeleton className="h-9 w-64" />
+          </div>
+          <div>
+            <Skeleton className="h-4 w-12 mb-2" />
+            <Skeleton className="h-9 w-48" />
+          </div>
         </div>
 
-        {/* Footer */}
-        <div className="border-t border-outline-variant px-6 py-4 shrink-0">
-          <div className="flex justify-end gap-2">
-            <Skeleton className="h-8 w-24" />
-            <Skeleton className="h-8 w-24" />
+        <div className={entityDialogFooterClasses}>
+          <div className="flex items-center justify-between gap-2">
+            <Skeleton className="h-9 w-28" />
+            <div className="flex gap-2">
+              <Skeleton className="h-9 w-24" />
+              <Skeleton className="h-9 w-24" />
+            </div>
           </div>
         </div>
       </DialogContent>
diff --git a/components/loading/backlog-page-skeleton.tsx b/components/loading/backlog-page-skeleton.tsx
new file mode 100644
index 0000000..79666b6
--- /dev/null
+++ b/components/loading/backlog-page-skeleton.tsx
@@ -0,0 +1,32 @@
+import { Skeleton } from '@/components/ui/skeleton'
+
+export default function BacklogPageSkeleton() {
+  return (
+    <div className="flex flex-col h-full">
+      <div className="px-4 py-3 border-b border-border bg-surface-container-low shrink-0 flex items-center justify-between">
+        <div className="space-y-1.5">
+          <Skeleton className="h-4 w-32" />
+          <Skeleton className="h-3 w-48" />
+        </div>
+        <Skeleton className="h-7 w-24" />
+      </div>
+
+      <div className="flex-1 flex overflow-hidden">
+        <div className="w-2/5 border-r border-border p-4 space-y-3">
+          <Skeleton className="h-4 w-24" />
+          {[1, 2, 3, 4, 5].map((i) => (
+            <Skeleton key={i} className="h-8 w-full" />
+          ))}
+        </div>
+        <div className="flex-1 p-4 space-y-3">
+          <Skeleton className="h-4 w-16" />
+          <div className="flex gap-2 flex-wrap">
+            {[1, 2, 3].map((i) => (
+              <Skeleton key={i} className="w-28 h-24 rounded-lg" />
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}