diff --git a/course/classes/management_renderer.php b/course/classes/management_renderer.php
index 8f3e8b6ef26..680401af6ad 100644
--- a/course/classes/management_renderer.php
+++ b/course/classes/management_renderer.php
@@ -620,8 +620,7 @@ class core_course_management_renderer extends plugin_renderer_base {
                 new action_menu_link_secondary($shortnameurl, null, get_string('resortbyshortname')),
                 new action_menu_link_secondary($idnumberurl, null, get_string('resortbyidnumber'))
             ));
-            $menu->actiontext = get_string('resortcourses');
-            $menu->actionicon = new pix_icon('t/contextmenu', ' ', 'moodle', array('class' => 'iconsmall', 'title' => ''));
+            $menu->set_menu_trigger(get_string('resortcourses'));
             $actions[] = $this->render($menu);
         }
         $strall = get_string('all');
@@ -637,7 +636,7 @@ class core_course_management_renderer extends plugin_renderer_base {
             $perpage = $strall;
         }
         $menu->attributes['class'] .= ' courses-per-page';
-        $menu->actiontext = get_string('perpagea', 'moodle', $perpage);
+        $menu->set_menu_trigger(get_string('perpagea', 'moodle', $perpage));
         $actions[] = $this->render($menu);
         return html_writer::div(join(' | ', $actions), 'listing-actions course-listing-actions');
     }
@@ -931,7 +930,7 @@ class core_course_management_renderer extends plugin_renderer_base {
             $menu->add(new action_menu_link_secondary($modeurl, null, $modestr, $attributes));
         }
 
-        $menu->actiontext = get_string('viewing', 'moodle', $selected);
+        $menu->set_menu_trigger(get_string('viewing', 'moodle', $selected));
 
         $html = html_writer::start_div('view-mode-selector vms');
         $html .= $this->render($menu);
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index a24bcd59204..09c0f559336 100644
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -368,6 +368,17 @@ input.titleeditor { vertical-align: text-bottom; }
 #course-category-listings .listing-actions .moodle-actionmenu:not([data-enhanced]) > .menubar a {color:inherit;}
 #course-category-listings .listing-actions .moodle-actionmenu:not([data-enhanced]) > .menubar a > img {display:none;}
 
+.jsenabled #course-category-listings .moodle-actionmenu[data-enhance] .toggle-display img {
+    width: auto;
+}
+
+.jsenabled #course-category-listings .moodle-actionmenu[data-enhance] .toggle-display.textmenu {
+    padding-right: 4px;
+}
+.jsenabled #course-category-listings .moodle-actionmenu[data-enhance] .toggle-display.textmenu .caret {
+    margin-top: 10px;
+}
+
 #course-category-listings .item-actions {margin-right:1em;display:inline-block;display:initial;}
 #course-category-listings .item-actions img {margin: 0 4px;vertical-align:inherit;}
 #course-category-listings .item-actions .menu img {max-width:none;width:12px;}
diff --git a/theme/bootstrapbase/less/moodle/course.less b/theme/bootstrapbase/less/moodle/course.less
index 3d1030b933c..7678d62f3b3 100644
--- a/theme/bootstrapbase/less/moodle/course.less
+++ b/theme/bootstrapbase/less/moodle/course.less
@@ -806,6 +806,22 @@ span.editinstructions {
     .moodle-actionmenu {
         white-space:nowrap;
     }
+
+    .moodle-actionmenu[data-enhance] {
+        .toggle-display {
+            img {
+                width: auto;
+            }
+            &.textmenu {
+                padding-right: 4px;
+
+                .caret {
+                    margin-top: 12px;
+                }
+            }
+        }
+    }
+
     .listing-actions {
         text-align:center;
         padding:0.4rem 0.3rem 0.3rem;