diff --git a/mod/quiz/classes/question/bank/custom_view.php b/mod/quiz/classes/question/bank/custom_view.php
index 6e86dd37fca..08fa9922f05 100644
--- a/mod/quiz/classes/question/bank/custom_view.php
+++ b/mod/quiz/classes/question/bank/custom_view.php
@@ -148,7 +148,7 @@ class custom_view extends \core_question\local\bank\view {
 
         $canuseall = has_capability('moodle/question:useall', $catcontext);
 
-        echo \html_writer::start_tag('div', ['class' => 'modulespecificbuttonscontainer']);
+        echo \html_writer::start_tag('div', ['class' => 'pt-2']);
         if ($canuseall) {
             // Add selected questions to the quiz.
             $params = array(
diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
index 675885e38ad..4bbc62ae430 100644
--- a/mod/quiz/styles.css
+++ b/mod/quiz/styles.css
@@ -975,16 +975,6 @@ table#categoryquestions {
     font-size: 100%;
 }
 
-.modulespecificbuttonscontainer {
-    padding-left: 0.3em;
-    padding-right: 0.3em;
-}
-
-.questionbankformforpopup .modulespecificbuttonscontainer {
-    padding-top: 10px;
-    padding-left: 0;
-}
-
 .quizquestionlistcontrols {
     text-align: center;
 }
diff --git a/question/templates/bulk_actions_ui.mustache b/question/templates/bulk_actions_ui.mustache
index 4601cd09c1b..158cb98eeae 100644
--- a/question/templates/bulk_actions_ui.mustache
+++ b/question/templates/bulk_actions_ui.mustache
@@ -30,7 +30,7 @@
     }
 }}
 
-<div class="btn-group dropup mt-2 modulespecificbuttonscontainer" id="bulkactionsui-container">
+<div class="btn-group dropup mt-2" id="bulkactionsui-container">
     <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="bulkactionsui-selector">
         {{#str}} withselected, question{{/str}}
     </button>
diff --git a/theme/boost/scss/moodle/question.scss b/theme/boost/scss/moodle/question.scss
index 2b603afccdd..12ba8d55b49 100644
--- a/theme/boost/scss/moodle/question.scss
+++ b/theme/boost/scss/moodle/question.scss
@@ -585,35 +585,6 @@ body.jsenabled .questionflag input[type=checkbox] {
     padding: 0.3em 0;
 }
 
-#page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer {
-    padding: 0;
-
-    strong {
-        display: block;
-    }
-
-    hr,
-    br {
-        display: none;
-    }
-
-    strong {
-        margin-left: -0.3em;
-    }
-
-    strong label {
-        margin-left: 0.3em;
-    }
-
-    input {
-        margin-left: 0;
-    }
-
-    input + input {
-        margin-left: 5px;
-    }
-}
-
 .questionbankwindow .module {
     width: auto;
 }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index c423e8119ed..99ff7fb9236 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -16642,22 +16642,6 @@ body.jsenabled .questionflag input[type=checkbox] {
 #page-mod-quiz-edit div.questionbank .categoryinfo {
   padding: 0.3em 0; }
 
-#page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer {
-  padding: 0; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer strong {
-    display: block; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer hr,
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer br {
-    display: none; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer strong {
-    margin-left: -0.3em; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer strong label {
-    margin-left: 0.3em; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer input {
-    margin-left: 0; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer input + input {
-    margin-left: 5px; }
-
 .questionbankwindow .module {
   width: auto; }
 
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 319d120de4f..68ba70faeee 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -16642,22 +16642,6 @@ body.jsenabled .questionflag input[type=checkbox] {
 #page-mod-quiz-edit div.questionbank .categoryinfo {
   padding: 0.3em 0; }
 
-#page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer {
-  padding: 0; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer strong {
-    display: block; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer hr,
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer br {
-    display: none; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer strong {
-    margin-left: -0.3em; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer strong label {
-    margin-left: 0.3em; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer input {
-    margin-left: 0; }
-  #page-mod-quiz-edit div.questionbank .modulespecificbuttonscontainer input + input {
-    margin-left: 5px; }
-
 .questionbankwindow .module {
   width: auto; }