diff --git a/calendar/templates/event_icon.mustache b/calendar/templates/event_icon.mustache
index c43b7c4ecbf..69a9ff1aa7d 100644
--- a/calendar/templates/event_icon.mustache
+++ b/calendar/templates/event_icon.mustache
@@ -34,7 +34,17 @@
}
}}
{{#modulename}}
- {{#pix}} monologo, {{modulename}} {{/pix}}
+ {{#icon}}
+ {{#iconurl}}
+
+ {{/iconurl}}
+ {{^iconurl}}
+ {{#pix}} monologo, {{modulename}} {{/pix}}
+ {{/iconurl}}
+ {{/icon}}
+ {{^icon}}
+ {{#pix}} monologo, {{modulename}} {{/pix}}
+ {{/icon}}
{{/modulename}}
{{^modulename}}
{{#icon}}{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}{{/icon}}
diff --git a/calendar/templates/event_item.mustache b/calendar/templates/event_item.mustache
index 2ac7c811f4e..abb2054e36c 100644
--- a/calendar/templates/event_item.mustache
+++ b/calendar/templates/event_item.mustache
@@ -75,7 +75,16 @@
{{/isactionevent}}
{{/canedit}}
- {{#icon}}