diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index 5c35b7a0..34fbf3e8 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -91,7 +91,7 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
             $event['url'] = $hesk_settings['hesk_url'] . '/' . $hesk_settings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId'];
             $event['categoryId'] = $row['category'];
             $event['categoryName'] = $row['category_name'];
-            $event['categoryColor'] = $row['overdue'] ? '#dd0000' : $row['category_color'];
+            $event['categoryColor'] = $row['category_color'];
             $event['owner'] = $row['owner_name'];
 
             $priorities = array(
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index 5a85c432..a0e76f87 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -112,7 +112,7 @@ $(document).ready(function() {
         // Hard-code the view name so the modal treats this as an "all-day" event.
         var viewName = 'month';
         displayCreateModal(moment(), viewName);
-    })
+    });
 
 
     $('#create-form input[name="all-day"]').change(function() {
@@ -271,7 +271,7 @@ function buildEvent(id, dbObject) {
             owner: dbObject.owner,
             priority: dbObject.priority,
             textColor: calculateTextColor(dbObject.categoryColor),
-            fontIconMarkup: '<i class="fa fa-ticket"></i>'
+            fontIconMarkup: getIcon(dbObject)
         };
     }
 
@@ -290,10 +290,21 @@ function buildEvent(id, dbObject) {
         color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor,
         textColor: calculateTextColor(dbObject.categoryColor),
         reminderValue: dbObject.reminderValue == null ? '' : dbObject.reminderValue,
-        reminderUnits: dbObject.reminderUnits
+        reminderUnits: dbObject.reminderUnits,
+        fontIconMarkup: '<i class="fa fa-calendar"></i>'
     };
 }
 
+function getIcon(dbObject) {
+    var endOfDay = moment(dbObject.startTime).endOf("day");
+
+    if (moment(endOfDay).isBefore(moment())) {
+        return '<i class="fa fa-exclamation-triangle"></i>';
+    }
+
+    return '<i class="fa fa-ticket"></i>';
+}
+
 function calculateTextColor(color) {
     if (color === null || color === '') {
         return 'black';
@@ -398,7 +409,7 @@ function displayEditModal(date) {
 
 function updateCategoryVisibility() {
     $('input[name="category-toggle"]').each(function() {
-        $this = $(this);
+        var $this = $(this);
 
         if ($this.is(':checked')) {
             $('.category-' + $this.val()).show();
@@ -419,6 +430,10 @@ function respondToDragAndDrop(event, delta, revertFunc) {
                 dueDate: event.start.format('YYYY-MM-DD')
             },
             success: function() {
+                event.fontIconMarkup = getIcon({
+                    startTime: event.start
+                });
+                $('#calendar').fullCalendar('updateEvent', event);
                 $.jGrowl($('#lang_ticket_due_date_updated').text(), { theme: 'alert-success', closeTemplate: '' });
             },
             error: function() {