diff --git a/badges/criteria/award_criteria.php b/badges/criteria/award_criteria.php
index 7b323a5262b..0fb86e18e95 100644
--- a/badges/criteria/award_criteria.php
+++ b/badges/criteria/award_criteria.php
@@ -210,7 +210,8 @@ abstract class award_criteria {
             $mform->addGroup($parameter, 'param_' . $prefix . $param['id'], '', array(' '), false);
         } else {
             $parameter[] =& $mform->createElement('advcheckbox', $prefix . $param['id'], '', $param['name'], null, array(0, $param['id']));
-            $parameter[] =& $mform->createElement('static', 'break_start_' . $param['id'], null, '<div style="margin-left: 3em;">');
+            $parameter[] =& $mform->createElement('static', 'break_start_' . $param['id'], null,
+                '<div class="ml-3 mt-1 w-100 align-items-center">');
 
             if (in_array('grade', $this->optional_params)) {
                 $parameter[] =& $mform->createElement('static', 'mgrade_' . $param['id'], null, get_string('mingrade', 'badges'));
diff --git a/theme/boost/scss/moodle/bs4alphacompat.scss b/theme/boost/scss/moodle/bs4alphacompat.scss
index d38dbd62010..34424875514 100644
--- a/theme/boost/scss/moodle/bs4alphacompat.scss
+++ b/theme/boost/scss/moodle/bs4alphacompat.scss
@@ -131,10 +131,6 @@ $tag-font-weight: bold !default;
     position: static;
 }
 
-.form-check .form-check-input {
-    position: absolute;
-}
-
 @mixin tag-variant($color) {
     background-color: $color;
 
diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
index 9f7a9593107..590da447c47 100644
--- a/theme/boost/scss/moodle/forms.scss
+++ b/theme/boost/scss/moodle/forms.scss
@@ -28,7 +28,7 @@
         max-width: 100%;
     }
     .form-group {
-        margin-right: 0.25rem;
+        margin: 0.1rem 0.25rem 0.1rem 0;
     }
 }
 
diff --git a/theme/boost/templates/core_form/element-date_selector-inline.mustache b/theme/boost/templates/core_form/element-date_selector-inline.mustache
index 8a06ef7c173..df5ccdbfec6 100644
--- a/theme/boost/templates/core_form/element-date_selector-inline.mustache
+++ b/theme/boost/templates/core_form/element-date_selector-inline.mustache
@@ -1,6 +1,6 @@
 {{< core_form/element-template-inline }}
     {{$element}}
-        <span class="fdate_selector">
+        <span class="fdate_selector d-flex align-items-center">
         {{#element.elements}}
             {{{separator}}}
             {{{html}}}
diff --git a/theme/boost/templates/core_form/element-date_selector.mustache b/theme/boost/templates/core_form/element-date_selector.mustache
index 470fa812f77..250c4916c21 100644
--- a/theme/boost/templates/core_form/element-date_selector.mustache
+++ b/theme/boost/templates/core_form/element-date_selector.mustache
@@ -1,6 +1,6 @@
 {{< core_form/element-template }}
     {{$element}}
-        <span class="fdate_selector">
+        <span class="fdate_selector d-flex">
         {{#element.elements}}
             {{{separator}}}
             {{{html}}}