diff --git a/lib/classes/output/checkbox_toggleall.php b/lib/classes/output/checkbox_toggleall.php
index be81f80be91..5a900b89101 100644
--- a/lib/classes/output/checkbox_toggleall.php
+++ b/lib/classes/output/checkbox_toggleall.php
@@ -60,7 +60,9 @@ class checkbox_toggleall implements renderable, templatable {
      *     <ul>
      *         <li><b>id          </b> string - The element ID.</li>
      *         <li><b>name        </b> string - The element name.</li>
-     *         <li><b>classes     </b> string - CSS classes that you want to add for your checkbox.</li>
+     *         <li><b>classes     </b> string - CSS classes that you want to add for your checkbox or toggle controls.
+     *                                          For button type master toggle controls, this could be any Bootstrap 4 btn classes
+     *                                          that you might want to add. Defaults to "btn-secondary".</li>
      *         <li><b>value       </b> string|int - The element's value.</li>
      *         <li><b>checked     </b> boolean - Whether to render this initially as checked.</li>
      *         <li><b>label       </b> string - The label for the checkbox element.</li>
diff --git a/lib/templates/checkbox-toggleall-master-button.mustache b/lib/templates/checkbox-toggleall-master-button.mustache
index 4648b4303c4..7ebc0d0fac2 100644
--- a/lib/templates/checkbox-toggleall-master-button.mustache
+++ b/lib/templates/checkbox-toggleall-master-button.mustache
@@ -31,12 +31,12 @@
         "togglegroup": "toggle-group",
         "label": "Select everything!",
         "checked": true,
-        "classes": "p-1",
+        "classes": "btn-primary btn-lg",
         "selectall": "Select all",
         "deselectall": "Deselect all"
     }
 }}
-<button type="button" id="{{id}}" name="{{name}}" class="btn btn-secondary {{classes}}"
+<button type="button" id="{{id}}" name="{{name}}" class="btn {{^classes}}btn-secondary{{/classes}}{{#classes}}{{.}}{{/classes}}"
         data-action="toggle"
         data-toggle="master"
         data-togglegroup="{{togglegroup}}"
diff --git a/lib/templates/checkbox-toggleall-master.mustache b/lib/templates/checkbox-toggleall-master.mustache
index 1a514a4ddb5..7b6f149db10 100644
--- a/lib/templates/checkbox-toggleall-master.mustache
+++ b/lib/templates/checkbox-toggleall-master.mustache
@@ -33,7 +33,8 @@
         "checked": true,
         "classes": "p-1",
         "selectall": "Select all",
-        "deselectall": "Deselect all"
+        "deselectall": "Deselect all",
+        "labelclasses": "badge badge-info"
     }
 }}
 <input id="{{id}}" name="{{name}}" type="checkbox" {{#classes}}class="{{.}}"{{/classes}} value="{{value}}"
diff --git a/lib/templates/checkbox-toggleall-slave.mustache b/lib/templates/checkbox-toggleall-slave.mustache
index ac013add67e..d68ba8e9540 100644
--- a/lib/templates/checkbox-toggleall-slave.mustache
+++ b/lib/templates/checkbox-toggleall-slave.mustache
@@ -31,7 +31,8 @@
         "togglegroup": "toggle-group",
         "label": "Select me!",
         "checked": true,
-        "classes": "p-1"
+        "classes": "p-1",
+        "labelclasses": "badge badge-info"
     }
 }}
 <input id="{{id}}" name="{{name}}" type="checkbox" {{#classes}}class="{{.}}"{{/classes}} value="{{value}}"
diff --git a/mod/choice/renderer.php b/mod/choice/renderer.php
index 3343a148fc8..c780cbfb1d7 100644
--- a/mod/choice/renderer.php
+++ b/mod/choice/renderer.php
@@ -297,7 +297,7 @@ class mod_choice_renderer extends plugin_renderer_base {
                 'name' => $selectallid,
                 'value' => 1,
                 'label' => get_string('selectall'),
-                'classes' => 'mr-1'
+                'classes' => 'btn-secondary mr-1'
             ], true);
             $actiondata .= $OUTPUT->render($selectallcheckbox);
 
diff --git a/mod/data/lib.php b/mod/data/lib.php
index d1405936663..bd562c91dfa 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1444,7 +1444,7 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
             $checkbox = new \core\output\checkbox_toggleall('listview-entries', false, [
                 'id' => "entry_{$record->id}",
                 'name' => 'delcheck[]',
-                'class' => 'recordcheckbox',
+                'classes' => 'recordcheckbox',
                 'value' => $record->id,
             ]);
             $replacement[] = $OUTPUT->render($checkbox);
diff --git a/mod/data/view.php b/mod/data/view.php
index 0812fb80233..5f7800e1cef 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -516,7 +516,7 @@ if ($showactivity) {
                     'name' => $selectallid,
                     'value' => 1,
                     'label' => get_string('selectall'),
-                    'classes' => 'mr-1',
+                    'classes' => 'btn-secondary mr-1',
                 ], true);
                 echo $OUTPUT->render($mastercheckbox);
 
diff --git a/mod/feedback/show_nonrespondents.php b/mod/feedback/show_nonrespondents.php
index fb20199168f..8aa381da1fd 100644
--- a/mod/feedback/show_nonrespondents.php
+++ b/mod/feedback/show_nonrespondents.php
@@ -267,7 +267,7 @@ if (empty($students)) {
             $checkbox = new \core\output\checkbox_toggleall('feedback-non-respondents', false, [
                 'id' => 'messageuser-' . $student->id,
                 'name' => 'messageuser[]',
-                'class' => 'mr-1',
+                'classes' => 'mr-1',
                 'value' => $student->id,
                 'label' => get_string('includeuserinrecipientslist', 'mod_feedback', fullname($student)),
                 'labelclasses' => 'accesshide',