diff --git a/blocks/timeline/templates/event-list-item.mustache b/blocks/timeline/templates/event-list-item.mustache
index 7c442c13075..13f28089897 100644
--- a/blocks/timeline/templates/event-list-item.mustache
+++ b/blocks/timeline/templates/event-list-item.mustache
@@ -57,7 +57,7 @@
             <div class="activityiconcontainer small {{purpose}} courseicon align-self-top align-self-center mx-3  mb-1 mb-sm-0 text-nowrap">
                 {{#icon}}
                 {{#iconurl}}
-                    <img alt="{{alttext}}" title="{{alttext}}" src="{{{ iconurl }}}" class="icon ">
+                    <img alt="{{alttext}}" title="{{alttext}}" src="{{{ iconurl }}}" class="icon {{iconclass}}">
                 {{/iconurl}}
                 {{^iconurl}}
                     {{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}
diff --git a/calendar/classes/external/event_icon_exporter.php b/calendar/classes/external/event_icon_exporter.php
index f6bdf4c12f0..bdc8b6386d3 100644
--- a/calendar/classes/external/event_icon_exporter.php
+++ b/calendar/classes/external/event_icon_exporter.php
@@ -62,12 +62,15 @@ class event_icon_exporter extends exporter {
         $isgroupevent = ($group && !empty($groupid));
         $isuserevent = ($user && !empty($userid));
         $iconurl = '';
+        $iconclass = '';
 
         if ($isactivityevent) {
             $key = 'monologo';
             $component = $coursemodule->get('modname');
 
-            $iconurl = get_fast_modinfo($courseid)->get_cm($coursemodule->get('id'))->get_icon_url()->out(false);
+            $iconurl = get_fast_modinfo($courseid)->get_cm($coursemodule->get('id'))->get_icon_url();
+            $iconclass = $iconurl->get_param('filtericon') ? '' : 'nofilter';
+            $iconurl = $iconurl->out(false);
             if (get_string_manager()->string_exists($event->get_type(), $component)) {
                 $alttext = get_string($event->get_type(), $component);
             } else {
@@ -121,6 +124,7 @@ class event_icon_exporter extends exporter {
         $data->component = $component;
         $data->alttext = $alttext;
         $data->iconurl = $iconurl;
+        $data->iconclass = $iconclass;
 
         parent::__construct($data, $related);
     }
@@ -136,6 +140,7 @@ class event_icon_exporter extends exporter {
             'component' => ['type' => PARAM_TEXT],
             'alttext' => ['type' => PARAM_TEXT],
             'iconurl' => ['type' => PARAM_TEXT],
+            'iconclass' => ['type' => PARAM_TEXT],
         ];
     }