diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 8829204a1..c78616e9b 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -58,10 +58,10 @@
 
         <?php if (! empty($task['date_due'])): ?>
             <span class="task-date
-                <?php if (date('Y-m-d') == date('Y-m-d', $task['date_due'])): ?>
-                     task-date-today
-                <?php elseif (time() > $task['date_due']): ?>
+                <?php if (time() > $task['date_due']): ?>
                      task-date-overdue
+                <?php elseif (date('Y-m-d') == date('Y-m-d', $task['date_due'])): ?>
+                     task-date-today
                 <?php endif ?>
                 ">
                 <i class="fa fa-calendar"></i>
diff --git a/app/Template/task_list/task_icons.php b/app/Template/task_list/task_icons.php
index 9545b1e1f..03a891a27 100644
--- a/app/Template/task_list/task_icons.php
+++ b/app/Template/task_list/task_icons.php
@@ -32,10 +32,10 @@
 
     <?php if (! empty($task['date_due'])): ?>
         <span title="<?= t('Due date') ?>" class="task-date
-            <?php if (date('Y-m-d') == date('Y-m-d', $task['date_due'])): ?>
-                 task-date-today
-            <?php elseif (time() > $task['date_due']): ?>
+            <?php if (time() > $task['date_due']): ?>
                  task-date-overdue
+            <?php elseif (date('Y-m-d') == date('Y-m-d', $task['date_due'])): ?>
+                 task-date-today
             <?php endif ?>
             ">
             <i class="fa fa-calendar"></i>