diff --git a/question/templates/question_banks_list.mustache b/question/templates/question_banks_list.mustache
index 054d0ec1e7f..30a5b4dc6bb 100644
--- a/question/templates/question_banks_list.mustache
+++ b/question/templates/question_banks_list.mustache
@@ -203,13 +203,13 @@
 
 <div class="question-banks-list">
     <ul class="list-unstyled">
-        <li class="media mb-2 mr-2">
-            <div class="{{purpose}} activityiconcontainer icon-size-6 modicon_{{modname}}">
+        <li class="d-flex mb-2 me-2">
+            <div class="flex-shrink-0 {{purpose}} activityiconcontainer icon-size-6 modicon_{{modname}}">
                 <a href="{{managequestions.url}}">
                     <img class="icon activityicon" aria-hidden="true" src="{{iconurl}}" alt="modicon_{{modname}}"/>
                 </a>
             </div>
-            <div class="media-body align-self-center ms-3">
+            <div class="flex-grow-1 align-self-center ms-3">
                 {{#managequestions}}
                     {{> core/action_link}}
                 {{/managequestions}}
diff --git a/question/templates/view_banks.mustache b/question/templates/view_banks.mustache
index 6d824f6e32a..34f677467bc 100644
--- a/question/templates/view_banks.mustache
+++ b/question/templates/view_banks.mustache
@@ -299,7 +299,7 @@
     }
 }
 }}
-<h2>{{#str}}banksincourse, question{{/str}} {{#addqbank}}<div class="float-right">{{> core/single_button }}</div>{{/addqbank}}</h2>
+<h2>{{#str}}banksincourse, question{{/str}} {{#addqbank}}<div class="float-end">{{> core/single_button }}</div>{{/addqbank}}</h2>
 
 {{#addcustombanks}}
     <div class="add-bank pt-2">