diff --git a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
index 007b4a9129b..119a6c04b8a 100644
--- a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
+++ b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
@@ -1459,7 +1459,7 @@
          data-gn-click-and-spin="remove({$elementToRemove/@ref}, {$elementToRemove/@parent}, {$editInfo/@ref})"
          data-gn-field-highlight-remove="{$editInfo/@ref}"
          data-toggle="tooltip" data-placement="top" title="{{{{'deleteField' | translate}}}}">
-        <i class="fa fa-times text-danger gn-control"/>
+        <i class="fa fa-times text-danger gn-control"></i>
       </a>
     </xsl:if>
   </xsl:template>
@@ -1538,7 +1538,7 @@
     <div class="form-group {$class} gn-attr-{replace($attributeName, ':', '_')}" id="gn-attr-{$fieldName}">
       <label class="col-sm-4">
         <xsl:if test="$attributeName = 'xlink:href'">
-          <i class="fa fa-link fa-fw"/>
+          <i class="fa fa-link fa-fw"></i>
         </xsl:if>
         <xsl:value-of select="gn-fn-metadata:getLabel($schema, $attributeName, $labels, name(..), '', gn-fn-metadata:getXPath(.))/label"/>
       </label>
@@ -1659,7 +1659,7 @@
               data-params="{$process-params}"
               data-icon="{$btnClass}"
               data-name="{normalize-space($strings/*[name() = $process-label-key])}"
-              data-help="{normalize-space($strings/*[name() = concat($process-name, 'Help')])}"/>
+              data-help="{normalize-space($strings/*[name() = concat($process-name, 'Help')])}"></span>
       </div>
     </div>
   </xsl:template>
@@ -1676,7 +1676,7 @@
               data-params="{$process-params}"
               data-icon="{$btnClass}"
               data-name="{normalize-space($strings/*[name() = $process-name])}"
-              data-help="{normalize-space($strings/*[name() = concat($process-name, 'Help')])}"/>
+              data-help="{normalize-space($strings/*[name() = concat($process-name, 'Help')])}"></span>
       </div>
     </div>
   </xsl:template>
diff --git a/web/src/main/webapp/xslt/ui-metadata/menu-builder.xsl b/web/src/main/webapp/xslt/ui-metadata/menu-builder.xsl
index 682ec672407..5fa12d2ca5c 100644
--- a/web/src/main/webapp/xslt/ui-metadata/menu-builder.xsl
+++ b/web/src/main/webapp/xslt/ui-metadata/menu-builder.xsl
@@ -40,7 +40,7 @@
     <div class="gn-scroll-spy"
          data-gn-scroll-spy="gn-editor-{$metadataId}"
          data-watch=""
-         data-all-depth="{if ($isFlatMode) then 'true' else 'false'}"/>
+         data-all-depth="{if ($isFlatMode) then 'true' else 'false'}"></div>
 
     <div class="nav nav-tabs">
       <!-- Make a drop down choice to swith to one view to another -->
@@ -108,7 +108,7 @@
               <li role="menuitem">
                 <a data-ng-click="toggleAttributes(true)" href="">
                   <i class="fa"
-                     data-ng-class="gnCurrentEdit.displayAttributes ? 'fa-check-square-o' : 'fa-square-o'"/>
+                     data-ng-class="gnCurrentEdit.displayAttributes ? 'fa-check-square-o' : 'fa-square-o'"></i>
                   &#160;
                   <span data-translate="">toggleAttributes</span>
                 </a>
@@ -116,7 +116,7 @@
               <li role="menuitem">
                 <a data-ng-click="toggleTooltips(true)" href="">
                   <i class="fa"
-                     data-ng-class="gnCurrentEdit.displayTooltips ? 'fa-check-square-o' : 'fa-square-o'"/>
+                     data-ng-class="gnCurrentEdit.displayTooltips ? 'fa-check-square-o' : 'fa-square-o'"></i>
                   &#160;
                   <span data-translate="">toggleTooltips</span>
                 </a>