diff --git a/admin/templates/setting_configtext.mustache b/admin/templates/setting_configtext.mustache
index 15fd9680d94..236228a7922 100644
--- a/admin/templates/setting_configtext.mustache
+++ b/admin/templates/setting_configtext.mustache
@@ -38,5 +38,5 @@
     }
 }}
 <div class="form-text defaultsnext">
-    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="{{#forceltr}}text-ltr{{/forceltr}}" {{#attributes}} {{name}}="{{value}}"{{/attributes}}>
+    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="{{#forceltr}}text-ltr{{/forceltr}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
 </div>
diff --git a/lib/templates/action_link.mustache b/lib/templates/action_link.mustache
index 04284afa896..11617bc1761 100644
--- a/lib/templates/action_link.mustache
+++ b/lib/templates/action_link.mustache
@@ -52,11 +52,11 @@
     }
 }}
 {{^disabled}}
-    <a href="{{{url}}}" id="{{id}}" class="{{classes}}" {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{{text}}}</a>
+    <a href="{{{url}}}" id="{{id}}" class="{{classes}}"{{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{{text}}}</a>
     {{#hasactions}}
         {{> core/actions }}
     {{/hasactions}}
 {{/disabled}}
 {{#disabled}}
-    <span class="currentlink {{classes}}" {{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}} {{/attributes}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{{text}}}</span>
+    <span class="currentlink {{classes}}"{{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{{text}}}</span>
 {{/disabled}}
diff --git a/lib/templates/action_menu.mustache b/lib/templates/action_menu.mustache
index a6dc24377ab..bb1167ae3b8 100644
--- a/lib/templates/action_menu.mustache
+++ b/lib/templates/action_menu.mustache
@@ -30,10 +30,10 @@
         }
     }
 }}
-<div class="{{classes}}" {{#attributes}}{{name}}="{{value}}"{{/attributes}}>
+<div class="{{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
     {{#primary}}
 
-        <ul class="{{classes}}" {{#attributes}}{{name}}="{{value}}"{{/attributes}}>
+        <ul class="{{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
 
             {{#prioritise}}<li role="presentation">{{> core/action_menu_trigger }}</li>{{/prioritise}}<!--
 
@@ -46,7 +46,7 @@
     {{/primary}}
 
     {{#secondary}}
-        <ul class="{{classes}}" {{#attributes}}{{name}}="{{value}}"{{/attributes}}>
+        <ul class="{{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
             {{#items}}<li role="presentation">{{> core/action_menu_item }}</li>{{/items}}
         </ul>
     {{/secondary}}
diff --git a/lib/templates/action_menu_link.mustache b/lib/templates/action_menu_link.mustache
index 054df8b5302..d8d34627e54 100644
--- a/lib/templates/action_menu_link.mustache
+++ b/lib/templates/action_menu_link.mustache
@@ -29,7 +29,7 @@
     }
 }}
 {{^disabled}}
-    <a href="{{url}}" class="{{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>
+    <a href="{{url}}" class="{{classes}}"{{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>
 {{/disabled}}
 {{#disabled}}
     <span class="currentlink" role="menuitem">{{#icon}}{{>core/pix_icon}}{{/icon}}{{{text}}}</span>
diff --git a/lib/templates/pix_icon.mustache b/lib/templates/pix_icon.mustache
index 403735c92a8..f2fcc5cb855 100644
--- a/lib/templates/pix_icon.mustache
+++ b/lib/templates/pix_icon.mustache
@@ -40,4 +40,4 @@
     }
 
 }}
-<img {{#attributes}}{{name}}="{{value}}" {{/attributes}}/>
\ No newline at end of file
+<img{{#attributes}} {{name}}="{{value}}"{{/attributes}}/>
\ No newline at end of file
diff --git a/lib/templates/select_time.mustache b/lib/templates/select_time.mustache
index e2954cdcf31..d14658a8d7e 100644
--- a/lib/templates/select_time.mustache
+++ b/lib/templates/select_time.mustache
@@ -31,7 +31,7 @@
     }
 }}
 <label for="{{id}}" class="accesshide">{{label}}</label>
-<select name="{{name}}" id="{{id}}" {{#attributes}} {{name}}="{{value}}"{{/attributes}}>
+<select name="{{name}}" id="{{id}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
     {{/options}}
diff --git a/lib/templates/single_select.mustache b/lib/templates/single_select.mustache
index 7d8831f7694..57eb5330a85 100644
--- a/lib/templates/single_select.mustache
+++ b/lib/templates/single_select.mustache
@@ -88,7 +88,7 @@
             <input type="hidden" name="{{name}}" value="{{value}}">
         {{/params}}
         {{#label}}
-            <label for="{{id}}" {{#labelattributes}}{{name}}="{{value}}" {{/labelattributes}}>
+            <label for="{{id}}"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>
                 {{{label}}}
             </label>
         {{/label}}
diff --git a/lib/templates/url_select.mustache b/lib/templates/url_select.mustache
index 807b36a7f30..b2ace98c24c 100644
--- a/lib/templates/url_select.mustache
+++ b/lib/templates/url_select.mustache
@@ -27,7 +27,7 @@
         <input type="hidden" name="sesskey" value="{{sesskey}}">
         <div class="form-group">
             {{#label}}
-                <label for="{{id}}" {{#labelattributes}}{{name}}="{{value}}" {{/labelattributes}}>
+                <label for="{{id}}"{{#labelattributes}} {{name}}="{{value}}"{{/labelattributes}}>
                     {{label}}
                 </label>
             {{/label}}
diff --git a/theme/boost/templates/core/action_menu.mustache b/theme/boost/templates/core/action_menu.mustache
index 5a0d38f9e07..c09f5560d89 100644
--- a/theme/boost/templates/core/action_menu.mustache
+++ b/theme/boost/templates/core/action_menu.mustache
@@ -30,10 +30,10 @@
         }
     }
 }}
-<div class="action-menu {{classes}}" {{#attributes}}{{name}}="{{value}}"{{/attributes}}>
+<div class="action-menu {{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
     {{#primary}}
 
-        <div class="{{classes}}" {{#attributes}}{{name}}="{{value}}"{{/attributes}}>
+        <div class="{{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
 
             {{#prioritise}}{{> core/action_menu_trigger }}{{/prioritise}}{{!
 
diff --git a/theme/boost/templates/core/action_menu_link.mustache b/theme/boost/templates/core/action_menu_link.mustache
index 756e95c77dd..34108f77f88 100644
--- a/theme/boost/templates/core/action_menu_link.mustache
+++ b/theme/boost/templates/core/action_menu_link.mustache
@@ -27,7 +27,7 @@
     }
 }}
 {{^disabled}}
-    <a href="{{url}}" class="{{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>
+    <a href="{{url}}" class="{{classes}}"{{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>
 {{/disabled}}
 {{#disabled}}
     <span class="currentlink" role="menuitem">{{#icon}}{{>core/pix_icon}}{{/icon}}{{{text}}}</span>
diff --git a/theme/boost/templates/core/action_menu_trigger.mustache b/theme/boost/templates/core/action_menu_trigger.mustache
index 39bc925263f..ecc18e96f9c 100644
--- a/theme/boost/templates/core/action_menu_trigger.mustache
+++ b/theme/boost/templates/core/action_menu_trigger.mustache
@@ -17,15 +17,15 @@
 {{!
     Action menu trigger.
 }}
-<span class="dropdown">
-    <a href="#" class="dropdown-toggle" id="dropdown-{{instance}}" title="{{title}}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{> core/pix_icon}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}<b class="caret"></b>{{/menutrigger}}</a>
+<div class="dropdown">
+    <a href="#" class="dropdown-toggle" id="action-menu-toggle-{{instance}}" title="{{title}}" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{{actiontext}}}{{{menutrigger}}}{{#icon}}{{> core/pix_icon}}{{/icon}}{{#rawicon}}{{{.}}}{{/rawicon}}{{#menutrigger}}<b class="caret"></b>{{/menutrigger}}</a>
     {{#secondary}}
-        <div class="dropdown-menu dropdown-menu-right {{classes}}" {{#attributes}}{{name}}="{{value}}"{{/attributes}} aria-labelledby="dropdown-{{instance}}">
+        <div class="dropdown-menu dropdown-menu-right {{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}">
             {{#items}}{{!
-                }}{{#actionmenulink}}<a href="{{url}}" class="dropdown-item {{classes}}" {{#attributes}}{{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>{{/actionmenulink}}{{!
+                }}{{#actionmenulink}}<a href="{{url}}" class="dropdown-item {{classes}}"{{#attributes}} {{name}}={{#quote}}{{value}}{{/quote}}{{/attributes}} {{#showtext}}aria-labelledby="actionmenuaction-{{instance}}"{{/showtext}}>{{#icon}}{{>core/pix_icon}}{{/icon}}{{#showtext}}<span class="menu-action-text" id="actionmenuaction-{{instance}}">{{{text}}}</span>{{/showtext}}</a>{{/actionmenulink}}{{!
                 }}{{#actionmenufiller}}<div class="dropdown-divider"></div>{{/actionmenufiller}}{{!
                 }}{{^actionmenulink}}{{^actionmenufiller}}<div class="dropdown-item">{{> core/action_menu_item }}</div>{{/actionmenufiller}}{{/actionmenulink}}{{!
             }}{{/items}}
         </div>
     {{/secondary}}
-</span>
+</div>
diff --git a/theme/boost/templates/core/custom_menu_item.mustache b/theme/boost/templates/core/custom_menu_item.mustache
index 9a35f5745a7..80760ead133 100644
--- a/theme/boost/templates/core/custom_menu_item.mustache
+++ b/theme/boost/templates/core/custom_menu_item.mustache
@@ -1,6 +1,6 @@
 {{^divider}}
 {{#haschildren}}
-<span class="dropdown nav-item">
+<div class="dropdown nav-item">
     <a class="dropdown-toggle nav-link" id="drop-down-{{uniqid}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
         {{text}}
     </a>
@@ -14,7 +14,7 @@
             {{/divider}}
         {{/children}}
     </div>
-</span>
+</div>
 {{/haschildren}}
 {{^haschildren}}
 <a class="nav-item nav-link" href="{{{url}}}" {{#title}}title="{{{title}}}"{{/title}}>{{text}}</a>
diff --git a/theme/boost/templates/core/pix_icon.mustache b/theme/boost/templates/core/pix_icon.mustache
index fd62cd415e4..6b846fbe524 100644
--- a/theme/boost/templates/core/pix_icon.mustache
+++ b/theme/boost/templates/core/pix_icon.mustache
@@ -39,4 +39,4 @@
     }
 
 }}
-<img class="icon {{extraclasses}}" {{#attributes}}{{name}}="{{value}}" {{/attributes}}/>
+<img class="icon {{extraclasses}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}/>
diff --git a/theme/boost/templates/core/select_time.mustache b/theme/boost/templates/core/select_time.mustache
index 64932801369..f2c9029613e 100644
--- a/theme/boost/templates/core/select_time.mustache
+++ b/theme/boost/templates/core/select_time.mustache
@@ -31,7 +31,7 @@
     }
 }}
 <label for="{{id}}" class="sr-only">{{label}}</label>
-<select name="{{name}}" id="{{id}}" {{#attributes}} {{name}}="{{value}}"{{/attributes}} class="form-control">
+<select name="{{name}}" id="{{id}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}} class="form-control">
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
     {{/options}}
diff --git a/theme/boost/templates/custom_menu_footer.mustache b/theme/boost/templates/custom_menu_footer.mustache
index e26a6d1544b..c03dd3fa1c4 100644
--- a/theme/boost/templates/custom_menu_footer.mustache
+++ b/theme/boost/templates/custom_menu_footer.mustache
@@ -8,8 +8,10 @@
             {{/url}}
         {{/divider}}
         {{#haschildren}}
-            <ul class="list-unstyled m-l-1">
-                {{> theme_boost/custom_menu_footer }}
-            </ul>
+            <li>
+                <ul class="list-unstyled m-l-1">
+                    {{> theme_boost/custom_menu_footer }}
+                </ul>
+            </li>
         {{/haschildren}}
     {{/children}}