diff --git a/modules/helpdesk/lib/Module/Helpdesk/Service/DebitorDetailService.php b/modules/helpdesk/lib/Module/Helpdesk/Service/DebitorDetailService.php
index 6f3a679..17b3195 100644
--- a/modules/helpdesk/lib/Module/Helpdesk/Service/DebitorDetailService.php
+++ b/modules/helpdesk/lib/Module/Helpdesk/Service/DebitorDetailService.php
@@ -1696,6 +1696,7 @@ class DebitorDetailService
             ];
         }
 
+        // Sort: unassigned last, then critical_tickets desc, then open_tickets desc
         usort($members, static function (array $a, array $b): int {
             if ($a['support_user'] === '') {
                 return 1;
@@ -1704,6 +1705,10 @@ class DebitorDetailService
                 return -1;
             }
 
+            if ($a['critical_tickets'] !== $b['critical_tickets']) {
+                return $b['critical_tickets'] <=> $a['critical_tickets'];
+            }
+
             return $b['open_tickets'] <=> $a['open_tickets'];
         });
 
diff --git a/modules/helpdesk/web/css/helpdesk.css b/modules/helpdesk/web/css/helpdesk.css
index 0a985e2..317d0b5 100644
--- a/modules/helpdesk/web/css/helpdesk.css
+++ b/modules/helpdesk/web/css/helpdesk.css
@@ -130,12 +130,15 @@
   .helpdesk-team-widget {
     border: 1px solid var(--app-muted-border-color);
     border-radius: var(--app-radius, 0.375rem);
-    padding: calc(var(--app-spacing) * 0.65) calc(var(--app-spacing) * 0.75);
     margin-bottom: calc(var(--app-spacing) * 0.5);
+    overflow: hidden;
   }
 
   .helpdesk-team-widget > .helpdesk-support-section-title {
-    margin-top: 0;
+    margin: 0;
+    padding: calc(var(--app-spacing) * 0.5) calc(var(--app-spacing) * 0.75);
+    background: color-mix(in srgb, var(--app-muted-border-color) 15%, transparent);
+    border-bottom: 1px solid var(--app-muted-border-color);
   }
 
   .helpdesk-team-widget > .helpdesk-support-section-title::after {
@@ -147,15 +150,19 @@
     border-radius: 0;
   }
 
+  .helpdesk-team-widget > .helpdesk-team-ticket-table th {
+    border-radius: 0;
+  }
+
   /* Team workload — inline avatar for section titles */
   .helpdesk-team-avatar-inline {
     display: inline-flex;
     align-items: center;
     justify-content: center;
-    width: 1.6rem;
-    height: 1.6rem;
+    width: 2rem;
+    height: 2rem;
     border-radius: 50%;
-    font-size: 0.65rem;
+    font-size: 0.7rem;
     font-weight: 700;
     letter-spacing: 0.02em;
     flex-shrink: 0;