diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index c3a14769..5c35b7a0 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -86,7 +86,7 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
             $event['type'] = 'TICKET';
             $event['trackingId'] = $row['trackid'];
             $event['subject'] = $row['subject'];
-            $event['title'] = '[' . $row['trackid'] . '] ' . $row['subject'];
+            $event['title'] = $row['subject'];
             $event['startTime'] = $row['due_date'];
             $event['url'] = $hesk_settings['hesk_url'] . '/' . $hesk_settings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId'];
             $event['categoryId'] = $row['category'];
diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
index 7768ee79..3d1a65d9 100644
--- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
@@ -65,8 +65,14 @@ $(document).ready(function() {
             }
 
             var $eventMarkup = $(this);
+
+            var eventTitle = event.title;
+            if (event.fontIconMarkup != undefined) {
+                eventTitle = event.fontIconMarkup + ' ' + eventTitle;
+            }
+
             $eventMarkup.popover({
-                title: event.title,
+                title: eventTitle,
                 html: true,
                 content: $contents,
                 animation: true,
@@ -76,6 +82,11 @@ $(document).ready(function() {
         },
         eventMouseout: function() {
             $(this).popover('destroy');
+        },
+        eventRender: function(event, element) {
+            if (event.fontIconMarkup !== undefined) {
+                element.find('span.fc-title').html(event.fontIconMarkup + ' ' + element.find('span.fc-title').text());
+            }
         }
     });
 
@@ -98,7 +109,8 @@ function buildEvent(id, dbObject) {
             className: 'category-' + dbObject.categoryId,
             owner: dbObject.owner,
             priority: dbObject.priority,
-            textColor: calculateTextColor(dbObject.categoryColor)
+            textColor: calculateTextColor(dbObject.categoryColor),
+            fontIconMarkup: '<i class="fa fa-ticket"></i>'
         };
     }
 
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index bbbe8d5e..5a85c432 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -79,8 +79,14 @@ $(document).ready(function() {
             }
 
             var $eventMarkup = $(this);
+
+            var eventTitle = event.title;
+            if (event.fontIconMarkup != undefined) {
+                eventTitle = event.fontIconMarkup + '&nbsp;' + eventTitle;
+            }
+
             $eventMarkup.popover({
-                title: event.title,
+                title: eventTitle,
                 html: true,
                 content: $contents,
                 animation: true,
@@ -88,12 +94,17 @@ $(document).ready(function() {
                 placement: 'auto'
             }).popover('show');
         },
-        eventMouseout: function(event) {
+        eventMouseout: function() {
             $(this).popover('destroy');
         },
         dayRender: function(date, cell) {
             var $cell = $(cell);
             $cell.attr('title', 'Click to add event');
+        },
+        eventRender: function(event, element) {
+            if (event.fontIconMarkup !== undefined) {
+                element.find('span.fc-title').html(event.fontIconMarkup + '&nbsp;' + element.find('span.fc-title').text());
+            }
         }
     });
 
@@ -259,7 +270,8 @@ function buildEvent(id, dbObject) {
             className: 'category-' + dbObject.categoryId,
             owner: dbObject.owner,
             priority: dbObject.priority,
-            textColor: calculateTextColor(dbObject.categoryColor)
+            textColor: calculateTextColor(dbObject.categoryColor),
+            fontIconMarkup: '<i class="fa fa-ticket"></i>'
         };
     }