diff --git a/lib/templates/checkbox-toggleall-master.mustache b/lib/templates/checkbox-toggleall-master.mustache
index b54afdf7655..255b9e1377a 100644
--- a/lib/templates/checkbox-toggleall-master.mustache
+++ b/lib/templates/checkbox-toggleall-master.mustache
@@ -38,7 +38,7 @@
     }
 }}
 <div class="form-check">
-    <input id="{{id}}" name="{{name}}" type="checkbox" class="mr-1 {{classes}}" value="{{value}}"
+    <input id="{{id}}" name="{{name}}" type="checkbox" class="{{classes}}" value="{{value}}"
            aria-labelledby="{{id}}-label"
            data-action="toggle"
            data-toggle="master"
diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss
index 3aa67c66187..85f543be1cf 100644
--- a/theme/boost/scss/moodle/grade.scss
+++ b/theme/boost/scss/moodle/grade.scss
@@ -428,7 +428,7 @@
                             }
 
                             .itemselect {
-                                margin-right: 0.7rem;
+                                margin-right: 15px;
                             }
 
                             .itemicon {
@@ -490,7 +490,6 @@
                             }
 
                             &.column-name {
-                                padding-left: 10px;
                                 font-weight: bold;
 
                                 div {
@@ -500,6 +499,10 @@
 
                                     .form-check {
                                         padding: 0;
+
+                                        .itemselect {
+                                            margin-right: 5px;
+                                        }
                                     }
 
                                     a {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 969cadab3c3..9d9e081fe09 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -35704,7 +35704,7 @@ p.arrow_button {
   font-size: 70%;
 }
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemselect {
-  margin-right: 0.7rem;
+  margin-right: 15px;
 }
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemicon {
   font-size: 18px;
@@ -35748,7 +35748,6 @@ p.arrow_button {
   border-right: 1px solid #dee2e6;
 }
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name {
-  padding-left: 10px;
   font-weight: bold;
 }
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div {
@@ -35759,6 +35758,9 @@ p.arrow_button {
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div .form-check {
   padding: 0;
 }
+.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div .form-check .itemselect {
+  margin-right: 5px;
+}
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category {
   height: 24px;
   width: 24px;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 38568d21fca..46ed3ae6958 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -35704,7 +35704,7 @@ p.arrow_button {
   font-size: 70%;
 }
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemselect {
-  margin-right: 0.7rem;
+  margin-right: 15px;
 }
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemicon {
   font-size: 18px;
@@ -35748,7 +35748,6 @@ p.arrow_button {
   border-right: 1px solid #dee2e6;
 }
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name {
-  padding-left: 10px;
   font-weight: bold;
 }
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div {
@@ -35759,6 +35758,9 @@ p.arrow_button {
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div .form-check {
   padding: 0;
 }
+.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div .form-check .itemselect {
+  margin-right: 5px;
+}
 .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr.category td.column-name div a.toggle-category {
   height: 24px;
   width: 24px;