diff --git a/lib/templates/action_menu_link.mustache b/lib/templates/action_menu_link.mustache
index 6aae3b80a5cac..cec09b71261a6 100644
--- a/lib/templates/action_menu_link.mustache
+++ b/lib/templates/action_menu_link.mustache
@@ -32,5 +32,5 @@
{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}{{/showtext}}
{{/disabled}}
{{#disabled}}
- {{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}
+ {{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}
{{/disabled}}
diff --git a/lib/templates/action_menu_trigger.mustache b/lib/templates/action_menu_trigger.mustache
index bab31932683fd..fce1a8b7e1fe4 100644
--- a/lib/templates/action_menu_trigger.mustache
+++ b/lib/templates/action_menu_trigger.mustache
@@ -27,4 +27,4 @@
"triggerextraclasses": ""
}
}}
-
+
diff --git a/lib/tests/user_menu_test.php b/lib/tests/user_menu_test.php
index 175be4c399021..1e9d2905cb0b9 100644
--- a/lib/tests/user_menu_test.php
+++ b/lib/tests/user_menu_test.php
@@ -96,8 +96,7 @@ public function test_custom_user_menu($data, $entrycount, $dividercount) {
$dividercount += 2;
// The basic entry count will additionally include the wrapper menu, Dashboard, Profile, Logout and switch roles link.
- // On clean theme only, the trigger is also a menuitem.
- $entrycount += 5;
+ $entrycount += 4;
$output = $OUTPUT->user_menu($USER);
preg_match_all('/]+role="menuitem"[^>]+>/', $output, $results);