diff --git a/public/lib/templates/help_icon.mustache b/public/lib/templates/help_icon.mustache
index 12a7543cf0e..e8d614169ac 100644
--- a/public/lib/templates/help_icon.mustache
+++ b/public/lib/templates/help_icon.mustache
@@ -17,7 +17,7 @@
         }
     }
 }}
-<a class="btn btn-link p-0" role="button"
+<a class="btn btn-link p-0 me-2 icon-no-margin" role="button"
     data-bs-container="body" data-bs-toggle="popover"
     data-bs-placement="{{#ltr}}right{{/ltr}}{{^ltr}}left{{/ltr}}" data-bs-content="{{text}} {{completedoclink}}"
     data-bs-html="true" tabindex="0" data-bs-trigger="focus" aria-label="{{#str}} help {{/str}}">
diff --git a/public/theme/boost/scss/moodle/icons.scss b/public/theme/boost/scss/moodle/icons.scss
index dd767df90cb..5ab96f6eb4a 100644
--- a/public/theme/boost/scss/moodle/icons.scss
+++ b/public/theme/boost/scss/moodle/icons.scss
@@ -71,10 +71,9 @@ $iconwidthsizes: map-merge((
 .icon {
     max-width: map-get($iconwidthsizes, 4);
     max-height: map-get($iconsizes, 4);
-    margin: 0;
+    margin: 0 map-get($spacers, 2) 0 0;
     padding: 0;
     box-sizing: content-box;
-    margin-right: 0.5rem;
 
     &.spacer {
         margin-right: 0;
diff --git a/public/theme/boost/style/moodle.css b/public/theme/boost/style/moodle.css
index c307fcacf62..a61d497799a 100644
--- a/public/theme/boost/style/moodle.css
+++ b/public/theme/boost/style/moodle.css
@@ -28716,10 +28716,9 @@ body.behat-site .action-menu .dropdown-subpanel-content.show {
 .icon {
   max-width: 30px;
   max-height: 24px;
-  margin: 0;
+  margin: 0 0.5rem 0 0;
   padding: 0;
   box-sizing: content-box;
-  margin-right: 0.5rem;
 }
 .icon.spacer {
   margin-right: 0;
diff --git a/public/theme/classic/style/moodle.css b/public/theme/classic/style/moodle.css
index 069bb70e5bd..f58959bf409 100644
--- a/public/theme/classic/style/moodle.css
+++ b/public/theme/classic/style/moodle.css
@@ -28716,10 +28716,9 @@ body.behat-site .action-menu .dropdown-subpanel-content.show {
 .icon {
   max-width: 30px;
   max-height: 24px;
-  margin: 0;
+  margin: 0 0.5rem 0 0;
   padding: 0;
   box-sizing: content-box;
-  margin-right: 0.5rem;
 }
 .icon.spacer {
   margin-right: 0;