diff --git a/helpdesk/templates/helpdesk/ticket/ticket_card.html b/helpdesk/templates/helpdesk/ticket/ticket_card.html
index 0290c3e42..565b1e128 100644
--- a/helpdesk/templates/helpdesk/ticket/ticket_card.html
+++ b/helpdesk/templates/helpdesk/ticket/ticket_card.html
@@ -239,7 +239,9 @@
                                                     </form>
                                                 {% endif %}
                                                 <div>
+                                                    {% if ticket.status != "resolved" %}
                                                     <span class='float-end' title = 'due {% if ticket.deadline == today %}today {% else %}in {{ticket.deadline|sub:today}}{% endif %}'><ion-icon class="text-{% if ticket.deadline < today %}danger {% elif ticket.deadline == today %}warning {% else %}success{% endif %}" name="time-sharp"></ion-icon></span>
+                                                    {% endif %}
                                                 </div>
                                             </div>
                                         </div>
@@ -610,7 +612,9 @@
                                                         {% endif %}
                                                     {% endif %}
                                                 <div>
+                                                    {% if ticket.status != "resolved" %}
                                                     <span class='float-end' title = 'due {% if ticket.deadline == today %}today {% else %}in {{ticket.deadline|sub:today}}{% endif %}'><ion-icon class="text-{% if ticket.deadline < today %}danger {% elif ticket.deadline == today %}warning {% else %}success{% endif %}" name="time-sharp"></ion-icon></span>
+                                                    {% endif %}
                                                 </div>
                                             </div>
                                         </div>
@@ -901,7 +905,9 @@
                                                     </form>
                                                 {% endif %}
                                                 <div>
+                                                    {% if ticket.status != "resolved" %}
                                                     <span class='float-end' title = 'due {% if ticket.deadline == today %}today {% else %}in {{ticket.deadline|sub:today}}{% endif %}'><ion-icon class="text-{% if ticket.deadline < today %}danger {% elif ticket.deadline == today %}warning {% else %}success{% endif %}" name="time-sharp"></ion-icon></span>
+                                                    {% endif %}
                                                 </div>
                                             </div>
                                         </div>
diff --git a/helpdesk/templates/helpdesk/ticket/ticket_list.html b/helpdesk/templates/helpdesk/ticket/ticket_list.html
index bcf357495..259c258e1 100644
--- a/helpdesk/templates/helpdesk/ticket/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket/ticket_list.html
@@ -73,6 +73,7 @@
 												<span class='d-flex justify-content-between align-items-center'
 												>
 													{{ticket.ticket_type.prefix}}{{ ticket.id|stringformat:"03d" }}
+													{% if ticket.status != "resolved" %}
 													<span title = 'due  {% if ticket.deadline == today %} today {% else %}in {{ticket.deadline|sub:today}}{% endif %}'>
 														<ion-icon
 															class="text-{% if ticket.deadline < today %}danger {% elif ticket.deadline == today %}warning {% else %}success{% endif %}"
@@ -80,6 +81,7 @@
 														>
 														</ion-icon>
 													</span>
+													{% endif %}
 												</span>
 											</div>
 											<div data-cell-index="1" class="oh-sticky-table__td">{{ticket.title}}</div>
@@ -399,6 +401,7 @@
 												<span class='d-flex justify-content-between align-items-center'
 												>
 													{{ticket.ticket_type.prefix}}{{ ticket.id|stringformat:"03d" }}
+													{% if ticket.status != "resolved" %}
 													<span title = 'due  {% if ticket.deadline == today %} today {% else %}in {{ticket.deadline|sub:today}}{% endif %}'>
 														<ion-icon
 															class="text-{% if ticket.deadline < today %}danger {% elif ticket.deadline == today %}warning {% else %}success{% endif %}"
@@ -406,6 +409,7 @@
 														>
 														</ion-icon>
 													</span>
+													{% endif %}
 												</span>
 											</div>
 											<div data-cell-index="11" class="oh-sticky-table__td">{{ticket.title}}</div>
@@ -783,6 +787,7 @@
 											<span class='d-flex justify-content-between align-items-center'
 											>
 												{{ticket.ticket_type.prefix}}{{ ticket.id|stringformat:"03d" }}
+												{% if ticket.status != "resolved" %}
 												<span title = 'due  {% if ticket.deadline == today %} today {% else %}in {{ticket.deadline|sub:today}}{% endif %}'>
 													<ion-icon
 														class="text-{% if ticket.deadline < today %}danger {% elif ticket.deadline == today %}warning {% else %}success{% endif %}"
@@ -790,6 +795,7 @@
 													>
 													</ion-icon>
 												</span>
+												{% endif %}
 											</span>
 										</div>
 										<div data-cell-index="21" class="oh-sticky-table__td">{{ticket.title}}</div>