diff --git a/src/components/dashboard/kpi-cards.tsx b/src/components/dashboard/kpi-cards.tsx
index ade422a..f3a5d59 100644
--- a/src/components/dashboard/kpi-cards.tsx
+++ b/src/components/dashboard/kpi-cards.tsx
@@ -28,8 +28,8 @@ function formatPercent(value: number): string {
 
 function KpiTileSkeleton() {
   return (
-    <div className="relative overflow-hidden rounded-xl border border-slate-200 bg-card p-5 shadow-sm">
-      <div className="absolute inset-x-0 top-0 h-1 bg-slate-100" aria-hidden />
+    <div className="relative overflow-hidden rounded-xl border border-border bg-card p-5 shadow-sm">
+      <div className="absolute inset-x-0 top-0 h-1 bg-muted" aria-hidden />
       <Skeleton className="h-3 w-24" />
       <Skeleton className="mt-3 h-7 w-32" />
       <Skeleton className="mt-2 h-3 w-12" />
diff --git a/src/components/layout/sidebar.tsx b/src/components/layout/sidebar.tsx
index 279eaec..e1b482b 100644
--- a/src/components/layout/sidebar.tsx
+++ b/src/components/layout/sidebar.tsx
@@ -338,7 +338,7 @@ export function Sidebar({ portRoles, isSuperAdmin = false, user }: SidebarProps)
       {/* Desktop sidebar */}
       <aside
         className={cn(
-          'hidden md:flex flex-col h-screen border-r border-[#474e66] transition-all duration-200 ease-in-out shrink-0',
+          'relative hidden md:flex flex-col h-screen border-r border-[#474e66] transition-all duration-200 ease-in-out shrink-0',
           sidebarCollapsed ? 'w-sidebar-collapsed' : 'w-sidebar',
         )}
         style={{ backgroundColor: '#1e2844' }}
diff --git a/src/components/layout/topbar.tsx b/src/components/layout/topbar.tsx
index fefae42..8529547 100644
--- a/src/components/layout/topbar.tsx
+++ b/src/components/layout/topbar.tsx
@@ -96,7 +96,7 @@ export function Topbar({ ports, user }: TopbarProps) {
         <DropdownMenu>
           <DropdownMenuTrigger asChild>
             <Button variant="ghost" size="icon" className="rounded-full">
-              <Avatar className="w-7 h-7 shadow-sm ring-2 ring-white">
+              <Avatar className="w-7 h-7 shadow-sm ring-2 ring-background">
                 <AvatarImage src={undefined} />
                 <AvatarFallback className="bg-brand text-white text-xs font-semibold">
                   {(user?.name ?? 'U').slice(0, 1).toUpperCase()}
diff --git a/src/components/shared/detail-header-strip.tsx b/src/components/shared/detail-header-strip.tsx
index 2056471..03cba18 100644
--- a/src/components/shared/detail-header-strip.tsx
+++ b/src/components/shared/detail-header-strip.tsx
@@ -10,7 +10,7 @@ export function DetailHeaderStrip({ children, className }: DetailHeaderStripProp
   return (
     <div
       className={cn(
-        'rounded-xl border border-slate-200 bg-gradient-brand-soft px-5 py-4 shadow-xs',
+        'rounded-xl border border-border bg-gradient-brand-soft px-5 py-4 shadow-xs',
         className,
       )}
     >
diff --git a/src/components/ui/kpi-tile.tsx b/src/components/ui/kpi-tile.tsx
index f54a038..0c242b5 100644
--- a/src/components/ui/kpi-tile.tsx
+++ b/src/components/ui/kpi-tile.tsx
@@ -44,7 +44,7 @@ export function KPITile({
   return (
     <div
       className={cn(
-        'group relative overflow-hidden rounded-xl border border-slate-200 bg-gradient-brand-soft p-5 shadow-sm transition-all duration-base ease-smooth hover:shadow-md',
+        'group relative overflow-hidden rounded-xl border border-border bg-gradient-brand-soft p-5 shadow-sm transition-all duration-base ease-smooth hover:shadow-md',
         className,
       )}
       {...props}