diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 408122ffd18..495181214fe 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -4179,12 +4179,12 @@ EOD;
         global $CFG;
 
         $label = get_string('contactsitesupport', 'admin');
-        $icon = $this->pix_icon('t/email', '', 'moodle', ['class' => 'iconhelp icon-pre']);
+        $icon = $this->pix_icon('t/email', '');
         $content = $icon . $label;
 
         if (!empty($CFG->supportpage)) {
             $attributes = ['href' => $CFG->supportpage, 'target' => 'blank'];
-            $content .= $this->pix_icon('i/externallink', '', 'moodle', ['class' => 'iconhelp icon-pre']);
+            $content .= $this->pix_icon('i/externallink', '', 'moodle', ['class' => 'ml-1']);
         } else {
             $attributes = ['href' => $CFG->wwwroot . '/user/contactsitesupport.php'];
         }
@@ -4209,8 +4209,7 @@ EOD;
         }
 
         $liferingicon = $this->pix_icon('t/life-ring', '', 'moodle', ['class' => 'fa fa-life-ring']);
-        $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle',
-            ['class' => 'fa fa-externallink fa-fw']);
+        $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle', ['class' => 'ml-1']);
         $link = 'https://moodle.com/help/?utm_source=CTA-banner&utm_medium=platform&utm_campaign=name~Moodle4+cat~lms+mp~no';
         $content = $liferingicon . get_string('moodleservicesandsupport') . $newwindowicon;
 
diff --git a/lib/templates/local/notification/cta.mustache b/lib/templates/local/notification/cta.mustache
index adcdba9a0e4..ccaaa16aae2 100644
--- a/lib/templates/local/notification/cta.mustache
+++ b/lib/templates/local/notification/cta.mustache
@@ -61,7 +61,7 @@
                     {{# data }}
                    data-{{ name }}="{{ value }}"
                     {{/ data }}
-                >{{ title }} {{#newwindow}}{{#pix}}i/externallink, core, {{#str}}opensinnewwindow{{/str}}{{/pix}}{{/newwindow}}</a>
+                >{{ title }}{{#newwindow}}<span class="ml-1">{{#pix}}i/externallink, core, {{#str}}opensinnewwindow{{/str}}{{/pix}}</span>{{/newwindow}}</a>
             {{/ actions }}
         </div>
     </div>
diff --git a/lib/templates/userfeedback_footer_link.mustache b/lib/templates/userfeedback_footer_link.mustache
index a6633e243ee..37cee69325a 100644
--- a/lib/templates/userfeedback_footer_link.mustache
+++ b/lib/templates/userfeedback_footer_link.mustache
@@ -25,7 +25,8 @@
     }
 }}
 
-{{# pix }} i/bullhorn, core {{/ pix }}
 <a href="{{url}}" target="_blank">
-    {{#str}}calltofeedback_give{{/str}} {{#pix}}i/externallink, core, {{#str}}opensinnewwindow{{/str}}{{/pix}}
+    {{#pix}}i/bullhorn, core{{/pix}}{{!
+    }}{{#str}}calltofeedback_give{{/str}}{{!
+    }}<span class="ml-1">{{#pix}}i/externallink, core, {{#str}}opensinnewwindow{{/str}}{{/pix}}</span>
 </a>