diff --git a/lib/templates/single_select.mustache b/lib/templates/single_select.mustache
index 288fa7e7bca..071d38c2e28 100644
--- a/lib/templates/single_select.mustache
+++ b/lib/templates/single_select.mustache
@@ -111,7 +111,7 @@
             {{/options}}
         </select>
         <noscript>
-            <input type="submit" class="btn btn-secondary ml-1" value="{{#str}}go, core{{/str}}">
+            <input type="submit" class="btn btn-secondary" value="{{#str}}go, core{{/str}}">
         </noscript>
     </form>
 </div>
diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index f7207a57dcc..f82e5f40e81 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -307,7 +307,7 @@ if (!empty($CFG->enableportfolios) && has_capability('mod/forum:exportdiscussion
         $button = '&nbsp;';
         $buttonextraclass = ' noavailable';
     }
-    echo html_writer::tag('div', $button, array('class' => 'discussioncontrol exporttoportfolio'.$buttonextraclass));
+    echo html_writer::tag('div', $button, array('class' => 'discussioncontrol exporttoportfolio mr-1' . $buttonextraclass));
 } else {
     echo html_writer::tag('div', '&nbsp;', array('class'=>'discussioncontrol nullcontrol'));
 }