diff --git a/lib/templates/action_menu_link.mustache b/lib/templates/action_menu_link.mustache
index ade499f89a2..cec09b71261 100644
--- a/lib/templates/action_menu_link.mustache
+++ b/lib/templates/action_menu_link.mustache
@@ -29,7 +29,7 @@
}
}}
{{^disabled}}
- {{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}{{/showtext}}
+ {{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}{{/showtext}}
{{/disabled}}
{{#disabled}}
{{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{{text}}}
diff --git a/theme/boost/templates/core/action_menu_link.mustache b/theme/boost/templates/core/action_menu_link.mustache
index 4a96ccdad6a..0e9f42af6cd 100644
--- a/theme/boost/templates/core/action_menu_link.mustache
+++ b/theme/boost/templates/core/action_menu_link.mustache
@@ -27,7 +27,7 @@
}
}}
{{^disabled}}
- {{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}{{/showtext}}
+ {{#icon}}{{#pix}}{{key}}, {{component}}, {{title}}{{/pix}}{{/icon}}{{#showtext}}{{/showtext}}
{{/disabled}}
{{#disabled}}
{{#icon}}{{#pix}}{{key}},{{component}},{{title}}{{/pix}}{{/icon}}{{{text}}}
diff --git a/theme/boost/templates/core/action_menu_trigger.mustache b/theme/boost/templates/core/action_menu_trigger.mustache
index e2d71772cae..7eab5030460 100644
--- a/theme/boost/templates/core/action_menu_trigger.mustache
+++ b/theme/boost/templates/core/action_menu_trigger.mustache
@@ -15,14 +15,73 @@
along with Moodle. If not, see