diff --git a/src/app/(modules)/ticket/[ticketId]/components/TicketAssignmentsCard.tsx b/src/app/(modules)/ticket/[ticketId]/components/TicketAssignmentsCard.tsx
index e6e3e15..b1abce7 100644
--- a/src/app/(modules)/ticket/[ticketId]/components/TicketAssignmentsCard.tsx
+++ b/src/app/(modules)/ticket/[ticketId]/components/TicketAssignmentsCard.tsx
@@ -180,7 +180,7 @@ export function TicketAssignmentsCard({
             </CardDescription>
           </div>
           {assignmentsQuery.data ? (
-            <Badge variant="secondary">{assignments.length}</Badge>
+            <Badge variant="default">{assignments.length}</Badge>
           ) : null}
         </div>
       </CardHeader>
diff --git a/src/app/(modules)/ticket/[ticketId]/components/TicketOverviewCard.tsx b/src/app/(modules)/ticket/[ticketId]/components/TicketOverviewCard.tsx
index 750b7e1..9e964d0 100644
--- a/src/app/(modules)/ticket/[ticketId]/components/TicketOverviewCard.tsx
+++ b/src/app/(modules)/ticket/[ticketId]/components/TicketOverviewCard.tsx
@@ -183,7 +183,7 @@ export function TicketOverviewCard({
               {analysisVideoId ? (
                 <CardAction>
                   <Button
-                    variant="secondary"
+                    variant="default"
                     onClick={() => setIsAnalysisOpen(true)}
                   >
                     <Play className="mr-2 size-4" />
diff --git a/src/app/(modules)/ticket/[ticketId]/components/actions/TicketActionCard.tsx b/src/app/(modules)/ticket/[ticketId]/components/actions/TicketActionCard.tsx
index b1d1a32..e3cc6b6 100644
--- a/src/app/(modules)/ticket/[ticketId]/components/actions/TicketActionCard.tsx
+++ b/src/app/(modules)/ticket/[ticketId]/components/actions/TicketActionCard.tsx
@@ -30,7 +30,7 @@ export function TicketActionCard({
             <span className="truncate">{title}</span>
           </CardTitle>
           {contextLabel ? (
-            <Badge variant="secondary" className="shrink-0">
+            <Badge variant="default" className="shrink-0">
               {contextLabel}
             </Badge>
           ) : null}
diff --git a/src/app/(modules)/upload/components/UploadListColumns.tsx b/src/app/(modules)/upload/components/UploadListColumns.tsx
index a5371c2..79526f1 100644
--- a/src/app/(modules)/upload/components/UploadListColumns.tsx
+++ b/src/app/(modules)/upload/components/UploadListColumns.tsx
@@ -54,7 +54,7 @@ export function useUploadListColumns(): ColumnDef<UploadListItem>[] {
       },
       {
         id: 'uploaded_by',
-        header: 'Uploader',
+        header: 'Uploaded By',
         size: 190,
         cell: ({ row }) => (
           <div>
diff --git a/src/app/(modules)/users/components/UserColumns.tsx b/src/app/(modules)/users/components/UserColumns.tsx
index f120db7..5d0554e 100644
--- a/src/app/(modules)/users/components/UserColumns.tsx
+++ b/src/app/(modules)/users/components/UserColumns.tsx
@@ -69,6 +69,7 @@ export function useUserColumns(): ColumnDef<AdministrationUser>[] {
         header: 'Status',
         cell: ({ row }) => (
           <Badge
+            className="capitalize"
             variant={
               row.original.effective_status === 'active'
                 ? 'default'