diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html
index 2cfb5be..d08d47b 100644
--- a/app/templates/dashboard.html
+++ b/app/templates/dashboard.html
@@ -86,11 +86,11 @@
           <td class="text-secondary small">{{ j.printer.name if j.printer else '—' }}</td>
           <td>
             {% set s = j.status.value %}
-            {% if   s == 'printing'  %}<span class="badge bg-primary">printing</span>
+            {% if   s == 'printing'  %}<span class="badge bg-warning text-dark">printing</span>
             {% elif s == 'done'      %}<span class="badge bg-success">done</span>
             {% elif s == 'failed'    %}<span class="badge bg-danger">failed</span>
-            {% elif s == 'cancelled' %}<span class="badge bg-warning text-dark">cancelled</span>
-            {% else                  %}<span class="badge bg-secondary">queued</span>
+            {% elif s == 'cancelled' %}<span class="badge bg-secondary">cancelled</span>
+            {% else                  %}<span class="badge border border-warning text-warning" style="background:#000">queued</span>
             {% endif %}
           </td>
           <td class="text-secondary small text-end">{{ j.created_at.strftime('%d.%m %H:%M') }}</td>
diff --git a/app/templates/job_detail.html b/app/templates/job_detail.html
index 1d029b3..776272a 100644
--- a/app/templates/job_detail.html
+++ b/app/templates/job_detail.html
@@ -11,11 +11,11 @@
       <h5 class="text-white mb-0">{{ job.file_name or job.name }}</h5>
       {% set s = job.status.value %}
       {% if job.priority %}<span class="badge bg-warning text-dark"><i class="bi bi-exclamation-circle me-1"></i>Priority</span>{% endif %}
-      {% if   s == 'printing'  %}<span class="badge bg-primary">printing</span>
+      {% if   s == 'printing'  %}<span class="badge bg-warning text-dark">printing</span>
       {% elif s == 'done'      %}<span class="badge bg-success">done</span>
       {% elif s == 'failed'    %}<span class="badge bg-danger">failed</span>
-      {% elif s == 'cancelled' %}<span class="badge bg-warning text-dark">cancelled</span>
-      {% else                  %}<span class="badge bg-secondary">queued</span>
+      {% elif s == 'cancelled' %}<span class="badge bg-secondary">cancelled</span>
+      {% else                  %}<span class="badge border border-warning text-warning" style="background:#000">queued</span>
       {% endif %}
     </div>
     <div class="text-secondary small font-monospace mt-1">{{ job.job_uuid or '—' }}</div>
diff --git a/app/templates/jobs.html b/app/templates/jobs.html
index c850614..c71ef4a 100644
--- a/app/templates/jobs.html
+++ b/app/templates/jobs.html
@@ -79,11 +79,11 @@
       </td>
       <td>
         {% set s = j.status.value %}
-        {% if   s == 'printing'  %}<span class="badge bg-primary">printing</span>
+        {% if   s == 'printing'  %}<span class="badge bg-warning text-dark">printing</span>
         {% elif s == 'done'      %}<span class="badge bg-success">done</span>
         {% elif s == 'failed'    %}<span class="badge bg-danger">failed</span>
-        {% elif s == 'cancelled' %}<span class="badge bg-warning text-dark">cancelled</span>
-        {% else                  %}<span class="badge bg-secondary">queued</span>
+        {% elif s == 'cancelled' %}<span class="badge bg-secondary">cancelled</span>
+        {% else                  %}<span class="badge border border-warning text-warning" style="background:#000">queued</span>
         {% endif %}
       </td>
       <td class="text-secondary text-end">{{ j.created_at.strftime('%d.%m.%Y %H:%M') }}</td>