diff --git a/plugins/calendar/calendar.js b/plugins/calendar/calendar.js
index 1efbcde6..aada0286 100644
--- a/plugins/calendar/calendar.js
+++ b/plugins/calendar/calendar.js
@@ -610,18 +610,13 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
       // event rendering
       eventRender: function(event, element, view) {
         if(view.name != "month") {
-          if (event.categories) {
-            if(!event.allDay)
-              element.find('span.fc-event-title').after('<span class="fc-event-categories">' + event.categories + '</span>');
-          }
           if (event.location) {
-            element.find('span.fc-event-title').after('<span class="fc-event-location">@' + event.location + '</span>');
-          }
-          if (event.description) {
-            if (!event.allDay){
-              element.find('span.fc-event-title').after('<span class="fc-event-description">' + event.description + '</span>');
-            }
+            element.find('div.fc-event-title').after('<div class="fc-event-location">@&nbsp;' + Q(event.location) + '</div>');
           }
+          if (event.recurrence_id)
+            element.find('div.fc-event-time').append('<i class="fc-icon-recurring"></i>');
+          if (event.alarms)
+            element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>');
         }
       },
       // callback for date range selection
diff --git a/plugins/calendar/skins/default/calendar.css b/plugins/calendar/skins/default/calendar.css
index 68f5b542..a9607578 100644
--- a/plugins/calendar/skins/default/calendar.css
+++ b/plugins/calendar/skins/default/calendar.css
@@ -410,6 +410,10 @@ a.alarm-action-snooze:after {
 	font-style:italic; 
 }
 
+.fc-event-location {
+	font-size: 90%;
+}
+
 .fc-agenda-slots td div {
 	height: 22px;
 }
@@ -422,6 +426,20 @@ a.alarm-action-snooze:after {
 	background-color: #fff;
 }
 
+.fc-icon-alarms,
+.fc-icon-recurring {
+	display: inline-block;
+	width: 11px;
+	height: 11px;
+	background: url('images/eventicons.gif') 0 0 no-repeat;
+	margin-left: 3px;
+	line-height: 10px;
+}
+
+.fc-icon-alarms {
+	background-position: 0 -13px;
+}
+
 /* Settings section */
 
 fieldset #calendarcategories div {
diff --git a/plugins/calendar/skins/default/images/eventicons.gif b/plugins/calendar/skins/default/images/eventicons.gif
new file mode 100644
index 00000000..f08d97ea
Binary files /dev/null and b/plugins/calendar/skins/default/images/eventicons.gif differ