diff --git a/admin/tool/analytics/templates/evaluation_options.mustache b/admin/tool/analytics/templates/evaluation_options.mustache
index b75f9072013..80e29be716e 100644
--- a/admin/tool/analytics/templates/evaluation_options.mustache
+++ b/admin/tool/analytics/templates/evaluation_options.mustache
@@ -45,12 +45,12 @@
 {{#trainedexternally}}
     <div class="box mb-4">{{#str}} evaluationmodeinfo, tool_analytics {{/str}}</div>
 
-    <div class="form-check custom-radio">
+    <div class="form-check">
         <input class="form-check-input" type="radio" name="evaluationmode" id="id-mode-trainedmodel" value="trainedmodel" checked>
         <label class="form-check-label" for="id-mode-trainedmodel">{{#str}} evaluationmodetrainedmodel, tool_analytics {{/str}}</label>
     </div>
 
-    <div class="form-check custom-radio">
+    <div class="form-check">
         <input class="form-check-input" type="radio" name="evaluationmode" id="id-mode-configuration" value="configuration">
         <label class="form-check-label" for="id-mode-configuration">{{#str}} evaluationmodeconfiguration, tool_analytics {{/str}}</label>
     </div>
diff --git a/admin/tool/analytics/templates/export_options.mustache b/admin/tool/analytics/templates/export_options.mustache
index 7fe41240b45..cc63fea0bf8 100644
--- a/admin/tool/analytics/templates/export_options.mustache
+++ b/admin/tool/analytics/templates/export_options.mustache
@@ -31,15 +31,15 @@
     {
     }
 }}
-<div class="form-check custom-radio">
+<div class="form-check">
     <input class="form-check-input" type="radio" name="exportoption" id="id-mode-exportdata" value="exportdata">
     <label class="form-check-label" for="id-mode-exportdata">{{#str}} exporttrainingdata, tool_analytics {{/str}}</label>
 </div>
-<div class="form-check custom-radio">
+<div class="form-check">
     <input class="form-check-input" type="radio" name="exportoption" id="id-mode-exportmodel" value="exportmodel" checked>
     <label class="form-check-label" for="id-mode-exportmodel">{{#str}} exportmodel, tool_analytics {{/str}}</label>
 </div>
-<div class="form-check custom-checkbox ms-5" id="id-includeweights-container">
+<div class="form-check ms-5" id="id-includeweights-container">
   <input class="form-check-input" type="checkbox" id="id-includeweights" value="1" checked>
   <label class="form-check-label" for="id-includeweights">{{#str}} exportincludeweights, tool_analytics {{/str}}</label>
 </div>
diff --git a/course/classes/management_renderer.php b/course/classes/management_renderer.php
index a9f8ecb520a..e2365bc54d3 100644
--- a/course/classes/management_renderer.php
+++ b/course/classes/management_renderer.php
@@ -243,7 +243,7 @@ class core_course_management_renderer extends plugin_renderer_base {
         $html = html_writer::start_tag('li', $attributes);
         $html .= html_writer::start_div('clearfix');
         $html .= html_writer::start_div('float-start ' . $checkboxclass);
-        $html .= html_writer::start_div('form-check custom-checkbox me-1 ');
+        $html .= html_writer::start_div('form-check me-1 ');
         $html .= html_writer::empty_tag('input', $bcatinput);
         $labeltext = html_writer::span(get_string('bulkactionselect', 'moodle', $text), 'visually-hidden');
         $html .= html_writer::tag('label', $labeltext, array(
@@ -624,7 +624,7 @@ class core_course_management_renderer extends plugin_renderer_base {
         }
 
         $html .= html_writer::start_div('float-start ' . $checkboxclass);
-        $html .= html_writer::start_div('form-check custom-checkbox me-1 ');
+        $html .= html_writer::start_div('form-check me-1 ');
         $html .= html_writer::empty_tag('input', $bulkcourseinput);
         $labeltext = html_writer::span(get_string('bulkactionselect', 'moodle', $text), 'visually-hidden');
         $html .= html_writer::tag('label', $labeltext, array(
@@ -1203,7 +1203,7 @@ class core_course_management_renderer extends plugin_renderer_base {
         $html .= html_writer::start_div('clearfix');
         $html .= html_writer::start_div('float-start');
         if ($bulkcourseinput) {
-            $html .= html_writer::start_div('form-check custom-checkbox me-1');
+            $html .= html_writer::start_div('form-check me-1');
             $html .= html_writer::empty_tag('input', $bulkcourseinput);
             $labeltext = html_writer::span(get_string('bulkactionselect', 'moodle', $text), 'visually-hidden');
             $html .= html_writer::tag('label', $labeltext, array(
diff --git a/course/templates/addresourceoractivitybutton.mustache b/course/templates/addresourceoractivitybutton.mustache
index bac21862733..fcdcfeb86d4 100644
--- a/course/templates/addresourceoractivitybutton.mustache
+++ b/course/templates/addresourceoractivitybutton.mustache
@@ -47,7 +47,7 @@
         {{^modid}}
             <div class="px-1">
                 {{#pix}} t/add, core {{/pix}}
-                <span class="activity-add-text pr-1">{{#str}}addresourceoractivity, core{{/str}}</span>
+                <span class="activity-add-text pe-1">{{#str}}addresourceoractivity, core{{/str}}</span>
             </div>
         {{/modid}}
     {{/hasactionlinks}}
diff --git a/lib/templates/checkbox.mustache b/lib/templates/checkbox.mustache
index aac50f2e4e5..0aaa03851e2 100644
--- a/lib/templates/checkbox.mustache
+++ b/lib/templates/checkbox.mustache
@@ -28,7 +28,7 @@
         "label": "Reset options"
     }
 }}
-<div class="form-check custom-checkbox">
+<div class="form-check">
   <input type="checkbox" name={{{ name }}} class="form-check-input" value={{{ value }}} id="{{{ id }}}" {{#checked}} checked="checked" {{/checked}}>
   <label class="form-check-label" for="{{{ id }}}">{{{ label }}}</label>
 </div>
\ No newline at end of file
diff --git a/message/templates/message_drawer_view_conversation_body_confirm_dialogue.mustache b/message/templates/message_drawer_view_conversation_body_confirm_dialogue.mustache
index 5a1610d8927..d1c02929f4a 100644
--- a/message/templates/message_drawer_view_conversation_body_confirm_dialogue.mustache
+++ b/message/templates/message_drawer_view_conversation_body_confirm_dialogue.mustache
@@ -37,7 +37,7 @@
 
 <div class="p-3 bg-white" data-region="confirm-dialogue" role="alert">
     <p class="text-muted" data-region="dialogue-text"></p>
-    <div class="mb-2 form-check custom-checkbox hidden" data-region="delete-messages-for-all-users-toggle-container">
+    <div class="mb-2 form-check hidden" data-region="delete-messages-for-all-users-toggle-container">
         <input type="checkbox" class="form-check-input" id="delete-messages-for-all-users" data-region="delete-messages-for-all-users-toggle">
         <label class="form-check-label text-muted" for="delete-messages-for-all-users">
             {{#cleanstr}} deleteforeveryone, core_message {{/cleanstr}}
diff --git a/message/templates/message_drawer_view_settings_body_content.mustache b/message/templates/message_drawer_view_settings_body_content.mustache
index 0830f38c52a..154e96af23e 100644
--- a/message/templates/message_drawer_view_settings_body_content.mustache
+++ b/message/templates/message_drawer_view_settings_body_content.mustache
@@ -42,7 +42,7 @@
         <fieldset>
             <legend class="visually-hidden">{{#str}} contactableprivacy, message {{/str}}</legend>
             {{#privacy}}
-                <div class="form-check custom-radio mb-2">
+                <div class="form-check mb-2">
                     <input
                         type="radio"
                         name="message_blocknoncontacts"
diff --git a/payment/templates/gateway.mustache b/payment/templates/gateway.mustache
index d73d4f897a0..0ebf88e6177 100644
--- a/payment/templates/gateway.mustache
+++ b/payment/templates/gateway.mustache
@@ -41,7 +41,7 @@
     }
 
 }}
-<div class="form-check custom-radio {{shortname}}">
+<div class="form-check {{shortname}}">
     <input class="form-check-input" type="radio" name="payby" id="id-payby-{{uniqid}}-{{shortname}}" data-cost="{{cost}}" data-surcharge="{{surcharge}}" value="{{shortname}}" {{#checked}} checked="checked" {{/checked}} />
     <label class="form-check-label bg-light border p-3 my-3" for="id-payby-{{uniqid}}-{{shortname}}">
         <p class="h3">{{name}}</p>
diff --git a/payment/templates/gateways_placeholder.mustache b/payment/templates/gateways_placeholder.mustache
index 550a1ef0b8a..43f398b2197 100644
--- a/payment/templates/gateways_placeholder.mustache
+++ b/payment/templates/gateways_placeholder.mustache
@@ -30,7 +30,7 @@
     {}
 
 }}
-<div class="form-check custom-radio">
+<div class="form-check">
     <input class="form-check-input" type="radio" disabled />
     <label class="form-check-label bg-light border p-3 my-3 w-100">
         <div class="bg-pulse-grey mb-2" style="height: 31px; width: 18%"></div>