diff --git a/src/TaxBaik.Web/Pages/Admin/Clients/Create.cshtml b/src/TaxBaik.Web/Pages/Admin/Clients/Create.cshtml
index 10826cd..5b39dad 100644
--- a/src/TaxBaik.Web/Pages/Admin/Clients/Create.cshtml
+++ b/src/TaxBaik.Web/Pages/Admin/Clients/Create.cshtml
@@ -9,7 +9,7 @@
 
     <form method="post" class="card shadow-sm border-0">
         <div class="card-body">
-            <div asp-validation-summary="All" class="alert alert-danger"></div>
+            <partial name="_ValidationSummary" />
             <div class="row g-3">
                 <div class="col-md-6">
                     <label asp-for="Input.Name" class="form-label"></label>
diff --git a/src/TaxBaik.Web/Pages/Admin/Clients/Edit.cshtml b/src/TaxBaik.Web/Pages/Admin/Clients/Edit.cshtml
index 8ad3edf..7368aaa 100644
--- a/src/TaxBaik.Web/Pages/Admin/Clients/Edit.cshtml
+++ b/src/TaxBaik.Web/Pages/Admin/Clients/Edit.cshtml
@@ -9,7 +9,7 @@
 
     <form method="post" class="card shadow-sm border-0">
         <div class="card-body">
-            <div asp-validation-summary="All" class="alert alert-danger"></div>
+            <partial name="_ValidationSummary" />
             <div class="row g-3">
                 <div class="col-md-6">
                     <label asp-for="Input.Name" class="form-label"></label>
diff --git a/src/TaxBaik.Web/Pages/Shared/_AdminPageHeader.cshtml b/src/TaxBaik.Web/Pages/Shared/_AdminPageHeader.cshtml
index 9a2869f..f01ac3b 100644
--- a/src/TaxBaik.Web/Pages/Shared/_AdminPageHeader.cshtml
+++ b/src/TaxBaik.Web/Pages/Shared/_AdminPageHeader.cshtml
@@ -1,20 +1,19 @@
 @model (string Eyebrow, string Title, string Subtitle, string? ActionHref, string? ActionText)
 <div class="page-header d-print-none mb-4">
-    <div class="row align-items-center">
+    <div class="row align-items-center g-2">
         <div class="col">
-            <div class="page-pretitle">@Model.Eyebrow</div>
-            <h2 class="page-title">@Model.Title</h2>
+            <div class="page-pretitle text-uppercase">@Model.Eyebrow</div>
+            <h2 class="page-title mb-1">@Model.Title</h2>
             @if (!string.IsNullOrWhiteSpace(Model.Subtitle))
             {
-                <div class="text-muted">@Model.Subtitle</div>
+                <div class="text-muted small">@Model.Subtitle</div>
             }
         </div>
         @if (!string.IsNullOrWhiteSpace(Model.ActionHref) && !string.IsNullOrWhiteSpace(Model.ActionText))
         {
             <div class="col-auto ms-auto">
-                <a class="btn btn-primary" href="@Model.ActionHref">@Model.ActionText</a>
+                <a class="btn btn-primary btn-pill" href="@Model.ActionHref">@Model.ActionText</a>
             </div>
         }
     </div>
 </div>
-
diff --git a/src/TaxBaik.Web/Pages/Shared/_EmptyState.cshtml b/src/TaxBaik.Web/Pages/Shared/_EmptyState.cshtml
index f605774..f7dc03d 100644
--- a/src/TaxBaik.Web/Pages/Shared/_EmptyState.cshtml
+++ b/src/TaxBaik.Web/Pages/Shared/_EmptyState.cshtml
@@ -1,5 +1,12 @@
 @model string
-<div class="empty">
-    <div class="empty-img"><svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-database-off" width="48" height="48" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path d="M4 6c0 1.657 4.03 3 9 3s9-1.343 9-3-4.03-3-9-3-9 1.343-9 3" /><path d="M4 6v6c0 1.657 4.03 3 9 3s9-1.343 9-3V6" /><path d="M4 12v6c0 1.657 4.03 3 9 3s9-1.343 9-3v-6" /><path d="M3 3l18 18" /></svg></div>
-    <p class="empty-title">@(string.IsNullOrWhiteSpace(Model) ? "데이터가 없습니다." : Model)</p>
+<div class="empty py-5">
+    <div class="empty-img">
+        <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-database-off" width="48" height="48" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+            <path d="M4 6c0 1.657 4.03 3 9 3s9-1.343 9-3-4.03-3-9-3-9 1.343-9 3" />
+            <path d="M4 6v6c0 1.657 4.03 3 9 3s9-1.343 9-3V6" />
+            <path d="M4 12v6c0 1.657 4.03 3 9 3s9-1.343 9-3v-6" />
+            <path d="M3 3l18 18" />
+        </svg>
+    </div>
+    <p class="empty-title">@string.IsNullOrWhiteSpace(Model) ? "데이터가 없습니다." : Model</p>
 </div>
diff --git a/src/TaxBaik.Web/Pages/Shared/_Pagination.cshtml b/src/TaxBaik.Web/Pages/Shared/_Pagination.cshtml
index a2aa63b..d12f6b4 100644
--- a/src/TaxBaik.Web/Pages/Shared/_Pagination.cshtml
+++ b/src/TaxBaik.Web/Pages/Shared/_Pagination.cshtml
@@ -1,7 +1,7 @@
 @model TaxBaik.Web.Pages.Shared.PaginationModel
 @if (Model.TotalPages > 1)
 {
-    <nav class="pagination-wrapper mt-4">
+    <nav class="mt-4" aria-label="페이지네이션">
         <ul class="pagination">
             @for (var i = 1; i <= Model.TotalPages; i++)
             {
diff --git a/src/TaxBaik.Web/Pages/Shared/_StatusBadge.cshtml b/src/TaxBaik.Web/Pages/Shared/_StatusBadge.cshtml
index 69753d6..52181ea 100644
--- a/src/TaxBaik.Web/Pages/Shared/_StatusBadge.cshtml
+++ b/src/TaxBaik.Web/Pages/Shared/_StatusBadge.cshtml
@@ -2,14 +2,14 @@
 @{
     var badgeClass = Model?.ToLowerInvariant() switch
     {
-        "active" => "bg-green text-green-fg",
-        "inactive" => "bg-gray text-gray-fg",
-        "new" => "bg-blue text-blue-fg",
-        "consulting" => "bg-yellow text-yellow-fg",
-        "contracted" => "bg-green text-green-fg",
-        "rejected" => "bg-red text-red-fg",
-        "closed" => "bg-secondary text-secondary-fg",
-        _ => "bg-secondary text-secondary-fg"
+        "active" => "badge bg-green-lt text-green",
+        "inactive" => "badge bg-gray-lt text-muted",
+        "new" => "badge bg-blue-lt text-blue",
+        "consulting" => "badge bg-yellow-lt text-yellow",
+        "contracted" => "badge bg-green-lt text-green",
+        "rejected" => "badge bg-red-lt text-red",
+        "closed" => "badge bg-secondary-lt text-secondary",
+        _ => "badge bg-secondary-lt text-secondary"
     };
 }
-<span class="badge @badgeClass">@Model</span>
+<span class="@badgeClass">@Model</span>
diff --git a/src/TaxBaik.Web/Pages/Shared/_ValidationSummary.cshtml b/src/TaxBaik.Web/Pages/Shared/_ValidationSummary.cshtml
new file mode 100644
index 0000000..fd8ae4a
--- /dev/null
+++ b/src/TaxBaik.Web/Pages/Shared/_ValidationSummary.cshtml
@@ -0,0 +1,15 @@
+@{
+    var hasErrors = ViewData.ModelState.ErrorCount > 0;
+}
+@if (hasErrors)
+{
+    <div class="alert alert-danger alert-important" role="alert">
+        <div class="d-flex align-items-start gap-2">
+            <span class="avatar avatar-xs bg-red-lt text-red">!</span>
+            <div class="flex-fill">
+                <div class="fw-semibold mb-1">입력값을 확인하세요.</div>
+                <div asp-validation-summary="All" class="validation-summary text-sm"></div>
+            </div>
+        </div>
+    </div>
+}