diff --git a/apps/common/main/lib/component/CheckBox.js b/apps/common/main/lib/component/CheckBox.js
index c42f26253..354046ecb 100644
--- a/apps/common/main/lib/component/CheckBox.js
+++ b/apps/common/main/lib/component/CheckBox.js
@@ -95,7 +95,7 @@ define([
         value       : 'unchecked',
 
         template    : _.template('<label class="checkbox-indeterminate"><input id="<%= id %>" type="checkbox" class="checkbox__native">' +
-                                    '<label for="<%= id %>" class="checkbox__shape" /><span><%= labelText %></span></label>'),
+                                    '<label for="<%= id %>" class="checkbox__shape"></label><span><%= labelText %></span></label>'),
 
         initialize : function(options) {
             Common.UI.BaseView.prototype.initialize.call(this, options);
diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js
index 03cf4cf7d..a109a10e7 100644
--- a/apps/common/main/lib/component/ComboBoxFonts.js
+++ b/apps/common/main/lib/component/ComboBoxFonts.js
@@ -76,7 +76,7 @@ define([
                         '<li class="divider">',
                     '<% _.each(items, function(item) { %>',
                         '<li id="<%= item.id %>">',
-                            '<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"/>',
+                            '<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>',
                         '</li>',
                     '<% }); %>',
                     '</ul>',
@@ -380,7 +380,7 @@ define([
             onInsertItem: function(item) {
                 $(this.el).find('ul').prepend(_.template([
                     '<li id="<%= item.id %>">',
-                        '<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"/>',
+                        '<a class="font-item" tabindex="-1" type="menuitem" style="height:<%=scope.getListItemHeight()%>px;"></a>',
                     '</li>'
                 ].join(''))({
                     item: item.attributes,
diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js
index d46057f61..df8164441 100644
--- a/apps/common/main/lib/component/InputField.js
+++ b/apps/common/main/lib/component/InputField.js
@@ -88,7 +88,7 @@ define([
                         'placeholder="<%= placeHolder %>" ',
                         'value="<%= value %>"',
                     '>',
-                    '<span class="input-error"/>',
+                    '<span class="input-error"></span>',
                 '</div>'
             ].join('')),
 
@@ -414,7 +414,7 @@ define([
                         'placeholder="<%= placeHolder %>" ',
                         'value="<%= value %>"',
                     '>',
-                    '<span class="input-error"/>',
+                    '<span class="input-error"></span>',
                     '<div class="select-button">' +
                         '<button type="button" class="btn btn-toolbar"><i class="icon toolbar__icon <%= iconCls %>"></i></button>' +
                     '</div>',
diff --git a/apps/common/main/lib/component/RadioBox.js b/apps/common/main/lib/component/RadioBox.js
index b26e23aa8..1c9a6c360 100644
--- a/apps/common/main/lib/component/RadioBox.js
+++ b/apps/common/main/lib/component/RadioBox.js
@@ -72,7 +72,7 @@ define([
         rendered    : false,
 
         template    : _.template('<label class="radiobox"><input type="radio" name="<%= name %>" id="<%= id %>" class="button__radiobox">' +
-                                    '<label for="<%= id %>" class="radiobox__shape" /><span><%= labelText %></span></label>'),
+                                    '<label for="<%= id %>" class="radiobox__shape"></label><span><%= labelText %></span></label>'),
 
         initialize : function(options) {
             Common.UI.BaseView.prototype.initialize.call(this, options);
diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js
index 31eaddea4..b2d1a18a3 100644
--- a/apps/common/main/lib/component/TabBar.js
+++ b/apps/common/main/lib/component/TabBar.js
@@ -311,7 +311,7 @@ define([
         },
 
         tabs: [],
-        template: _.template('<ul id="statusbar_bottom" class="nav nav-tabs <%= placement %>"/>'),
+        template: _.template('<ul id="statusbar_bottom" class="nav nav-tabs <%= placement %>"></ul>'),
         selectTabs: [],
 
         initialize : function (options) {
diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js
index 0d2a153c8..5345ddaab 100644
--- a/apps/common/main/lib/component/Window.js
+++ b/apps/common/main/lib/component/Window.js
@@ -439,12 +439,12 @@ define([
             if (!options.width) options.width = 'auto';
             
             var template =  '<div class="info-box">' +
-                                '<% if (typeof iconCls !== "undefined") { %><div class="icon img-commonctrl <%= iconCls %>" /><% } %>' +
+                                '<% if (typeof iconCls !== "undefined") { %><div class="icon img-commonctrl <%= iconCls %>"></div><% } %>' +
                                 '<div class="text" <% if (typeof iconCls == "undefined") { %> style="padding-left:10px;" <% } %>><span><%= msg %></span>' +
                                     '<% if (dontshow) { %><div class="dont-show-checkbox"></div><% } %>' +
                                 '</div>' +
                             '</div>' +
-                            '<% if (dontshow) { %><div class="separator horizontal" style="width: 100%;"/><% } %>';
+                            '<% if (dontshow) { %><div class="separator horizontal" style="width: 100%;"></div><% } %>';
 
             _.extend(options, {
                 cls: 'alert',
diff --git a/apps/common/main/lib/template/CommentsPanel.template b/apps/common/main/lib/template/CommentsPanel.template
index e5caaef49..bcbe18673 100644
--- a/apps/common/main/lib/template/CommentsPanel.template
+++ b/apps/common/main/lib/template/CommentsPanel.template
@@ -1,11 +1,11 @@
 <div id="comments-box" class="layout-ct vbox">
-    <div class="layout-item messages-ct"/>
+    <div class="layout-item messages-ct"></div>
     <div class="layout-item add-link-ct">
         <label class="btn new"><%=textAddCommentToDoc%></label>
     </div>
     <div style="display: none;" class="layout-item new-comment-ct">
         <div class="inner-ct">
-            <textarea id="comment-msg-new" class="user-select textarea-control" placeholder="<%=textEnterCommentHint%>" maxlength="<%=maxCommLength%>"/>
+            <textarea id="comment-msg-new" class="user-select textarea-control" placeholder="<%=textEnterCommentHint%>" maxlength="<%=maxCommLength%>"></textarea>
         </div>
         <button class="btn add normal dlg-btn primary"><%=textAddComment%></button>
         <button class="btn cancel normal dlg-btn"><%=textCancel%></button>
diff --git a/apps/common/main/lib/view/About.js b/apps/common/main/lib/view/About.js
index 36624130b..5a5185e19 100644
--- a/apps/common/main/lib/view/About.js
+++ b/apps/common/main/lib/view/About.js
@@ -97,7 +97,7 @@ define([
                 '</table>',
                 '<table id="id-about-licensee-info" cols="1" style="width: 100%; margin-top: 20px;" class="hidden margin-bottom"><tbody>',
                     '<tr>',
-                        '<td align="center" class="padding-small"><div id="id-about-company-logo"/></td>',
+                        '<td align="center" class="padding-small"><div id="id-about-company-logo"></div></td>',
                     '</tr>',
                     '<tr>',
                         '<td align="center"><label class="asc-about-version">' + options.appName.toUpperCase()  + '</label></td>',
@@ -135,9 +135,9 @@ define([
                 '</table>',
                 '<table id="id-about-licensor-short" cols="1" style="width: 100%; margin-top: 31px;" class="hidden"><tbody>',
                     '<tr>',
-                        '<td style="width:50%;"><div class="separator horizontal short left"/></td>',
+                        '<td style="width:50%;"><div class="separator horizontal short left"></div></td>',
                         '<td align="center"><label class="asc-about-header">' + this.txtPoweredBy + '</label></td>',
-                        '<td style="width:50%;"><div class="separator horizontal short"/></td>',
+                        '<td style="width:50%;"><div class="separator horizontal short"></div></td>',
                     '</tr>',
                     '<tr>',
                         '<td colspan="3" align="center" style="padding: 9px 0 10px;"><label class="asc-about-companyname"><%= publishername %></label></td>',
diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js
index eaadb464f..cf3e6589c 100644
--- a/apps/common/main/lib/view/AdvancedSettingsWindow.js
+++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js
@@ -62,10 +62,10 @@ define([
                         '<button class="btn btn-category" content-target="<%= item.panelId %>"><span class=""><%= item.panelCaption %></span></button>',
                     '<% }); %>',
                     '</div>',
-                    '<div class="separator"/>',
+                    '<div class="separator"></div>',
                     '<div class="content-panel" >' + _options.contentTemplate + '</div>',
                 '</div>',
-                '<div class="separator horizontal"/>'
+                '<div class="separator horizontal"></div>'
             ].join('');
 
             _options.tpl = _.template(this.template)(_options);
diff --git a/apps/common/main/lib/view/CopyWarningDialog.js b/apps/common/main/lib/view/CopyWarningDialog.js
index 95b1150b0..a8b080356 100644
--- a/apps/common/main/lib/view/CopyWarningDialog.js
+++ b/apps/common/main/lib/view/CopyWarningDialog.js
@@ -79,7 +79,7 @@ define([
                     '</div>',
                     '<div id="copy-warning-checkbox" style="margin-top: 20px; text-align: left;"></div>',
                 '</div>',
-                '<div class="separator horizontal"/>'
+                '<div class="separator horizontal"></div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/common/main/lib/view/ExternalDiagramEditor.js b/apps/common/main/lib/view/ExternalDiagramEditor.js
index 4a2856281..778da84f4 100644
--- a/apps/common/main/lib/view/ExternalDiagramEditor.js
+++ b/apps/common/main/lib/view/ExternalDiagramEditor.js
@@ -60,7 +60,7 @@ define([
                 '<div id="id-diagram-editor-container" class="box" style="height:' + (_options.height-85) + 'px;">',
                     '<div id="id-diagram-editor-placeholder" style="width: 100%;height: 100%;"></div>',
                 '</div>',
-                '<div class="separator horizontal"/>',
+                '<div class="separator horizontal"></div>',
                 '<div class="footer" style="text-align: center;">',
                     '<button id="id-btn-diagram-editor-apply" class="btn normal dlg-btn primary custom" result="ok">' + this.textSave + '</button>',
                     '<button id="id-btn-diagram-editor-cancel" class="btn normal dlg-btn" result="cancel">' + this.textClose + '</button>',
diff --git a/apps/common/main/lib/view/ExternalMergeEditor.js b/apps/common/main/lib/view/ExternalMergeEditor.js
index 3fd1e79f1..390430587 100644
--- a/apps/common/main/lib/view/ExternalMergeEditor.js
+++ b/apps/common/main/lib/view/ExternalMergeEditor.js
@@ -59,7 +59,7 @@ define([
                 '<div id="id-merge-editor-container" class="box" style="height:' + (_options.height-85) + 'px;">',
                     '<div id="id-merge-editor-placeholder" style="width: 100%;height: 100%;"></div>',
                 '</div>',
-                '<div class="separator horizontal"/>',
+                '<div class="separator horizontal"></div>',
                 '<div class="footer" style="text-align: center;">',
                     '<button id="id-btn-merge-editor-apply" class="btn normal dlg-btn primary custom" result="ok">' + this.textSave + '</button>',
                     '<button id="id-btn-merge-editor-cancel" class="btn normal dlg-btn disabled" result="cancel">' + this.textClose + '</button>',
diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
index 66cf7da7e..974274901 100644
--- a/apps/common/main/lib/view/Header.js
+++ b/apps/common/main/lib/view/Header.js
@@ -104,7 +104,7 @@ define([
                         '</section>';
 
         var templateLeftBox = '<section class="logo">' +
-                                '<div id="header-logo"><i /></div>' +
+                                '<div id="header-logo"><i></i></div>' +
                             '</section>';
 
         var templateTitleBox = '<section id="box-document-title">' +
diff --git a/apps/common/main/lib/view/OpenDialog.js b/apps/common/main/lib/view/OpenDialog.js
index 4f2c7e00d..6fd52e989 100644
--- a/apps/common/main/lib/view/OpenDialog.js
+++ b/apps/common/main/lib/view/OpenDialog.js
@@ -84,7 +84,7 @@ define([
                     '<% if (type == Common.Utils.importTextType.DRM) { %>',
                         '<% if (warning) { %>',
                         '<div>',
-                            '<div class="icon img-commonctrl warn"/>',
+                            '<div class="icon img-commonctrl warn"></div>',
                             '<div style="padding-left: 50px;"><div style="font-size: 12px;">' + t.txtProtected+ '</div>',
                                 '<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
                                 '<div id="id-password-txt" style="width: 290px;"></div></div>',
diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js
index fe1d9c2ca..a1bee256d 100644
--- a/apps/common/main/lib/view/Plugins.js
+++ b/apps/common/main/lib/view/Plugins.js
@@ -365,7 +365,7 @@ define([
                     '<div id="id-plugin-placeholder" style="width: 100%;height: 100%;"></div>',
                 '</div>',
                 '<% if ((typeof buttons !== "undefined") && _.size(buttons) > 0) { %>',
-                    '<div class="separator horizontal"/>',
+                    '<div class="separator horizontal"></div>',
                 '<% } %>'
             ].join('');
 
diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js
index f47f0078c..bbb3bbf2c 100644
--- a/apps/common/main/lib/view/ReviewChanges.js
+++ b/apps/common/main/lib/view/ReviewChanges.js
@@ -61,12 +61,12 @@ define([
                     '<span id="slot-btn-sharing" class="btn-slot text x-huge"></span>' +
                     '<span id="slot-btn-coauthmode" class="btn-slot text x-huge"></span>' +
                 '</div>' +
-                '<div class="separator long sharing"/>' +
+                '<div class="separator long sharing"></div>' +
                 '<div class="group">' +
                     '<span class="btn-slot text x-huge slot-comment"></span>' +
                     '<span class="btn-slot text x-huge" id="slot-comment-remove"></span>' +
                 '</div>' +
-                '<div class="separator long comments"/>' +
+                '<div class="separator long comments"></div>' +
                 '<div class="group">' +
                     '<span id="btn-review-on" class="btn-slot text x-huge"></span>' +
                 '</div>' +
@@ -79,15 +79,15 @@ define([
                     '<span id="btn-change-accept" class="btn-slot text x-huge"></span>' +
                     '<span id="btn-change-reject" class="btn-slot text x-huge"></span>' +
                 '</div>' +
-                '<div class="separator long review"/>' +
+                '<div class="separator long review"></div>' +
                 '<div class="group">' +
                     '<span id="btn-compare" class="btn-slot text x-huge"></span>' +
                 '</div>' +
-                '<div class="separator long compare"/>' +
+                '<div class="separator long compare"></div>' +
                 '<div class="group no-group-mask">' +
                     '<span id="slot-btn-chat" class="btn-slot text x-huge"></span>' +
                 '</div>' +
-                '<div class="separator long chat"/>' +
+                '<div class="separator long chat"></div>' +
                 '<div class="group no-group-mask">' +
                     '<span id="slot-btn-history" class="btn-slot text x-huge"></span>' +
                 '</div>' +
diff --git a/apps/common/main/lib/view/SearchDialog.js b/apps/common/main/lib/view/SearchDialog.js
index c8ab48e0f..cd18d12f0 100644
--- a/apps/common/main/lib/view/SearchDialog.js
+++ b/apps/common/main/lib/view/SearchDialog.js
@@ -96,12 +96,12 @@
                         '<label class="link" id="search-label-replace" result="replaceshow">'+this.txtBtnReplace+'</label>',
                     '</div>',
                 '</div>',
-                '<div class="separator horizontal"/>',
+                '<div class="separator horizontal"></div>',
                 '<div class="footer right">',
                     '<button class="btn normal dlg-btn" result="replace">'+this.txtBtnReplace+'</button>',
                     '<button class="btn normal dlg-btn" result="replaceall" style="margin-left: 6px;">'+this.txtBtnReplaceAll+'</button>',
-                    '<button class="btn normal dlg-btn iconic" result="back"><span class="icon img-commonctrl back" /></button>',
-                    '<button class="btn normal dlg-btn iconic" result="next" style="margin-left: 6px;"><span class="icon img-commonctrl next" /></button>',
+                    '<button class="btn normal dlg-btn iconic" result="back"><span class="icon img-commonctrl back"></span></button>',
+                    '<button class="btn normal dlg-btn iconic" result="next" style="margin-left: 6px;"><span class="icon img-commonctrl next"></span></button>',
                 '</div>'
             ].join('');
 
diff --git a/apps/documenteditor/main/app/template/FileMenu.template b/apps/documenteditor/main/app/template/FileMenu.template
index 35378e635..8bb022a44 100644
--- a/apps/documenteditor/main/app/template/FileMenu.template
+++ b/apps/documenteditor/main/app/template/FileMenu.template
@@ -1,37 +1,37 @@
 <div class="panel-menu">
-    <li class="fm-first-item"/>
-    <li id="fm-btn-return" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-save" class="fm-btn" />
-    <li id="fm-btn-edit" class="fm-btn" />
-    <li id="fm-btn-download" class="fm-btn" />
-    <li id="fm-btn-save-copy" class="fm-btn" />
-    <li id="fm-btn-save-desktop" class="fm-btn" />
-    <li id="fm-btn-print" class="fm-btn" />
-    <li id="fm-btn-rename" class="fm-btn" />
-    <li id="fm-btn-protect" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-recent" class="fm-btn" />
-    <li id="fm-btn-create" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-info" class="fm-btn" />
-    <li id="fm-btn-rights" class="fm-btn" />
-    <li id="fm-btn-history" class="fm-btn" />
-    <li class="devider" class="fm-btn" />
-    <li id="fm-btn-settings" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-help" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-back" class="fm-btn" />
+    <li class="fm-first-item"></li>
+    <li id="fm-btn-return" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-save" class="fm-btn"></li>
+    <li id="fm-btn-edit" class="fm-btn"></li>
+    <li id="fm-btn-download" class="fm-btn"></li>
+    <li id="fm-btn-save-copy" class="fm-btn"></li>
+    <li id="fm-btn-save-desktop" class="fm-btn"></li>
+    <li id="fm-btn-print" class="fm-btn"></li>
+    <li id="fm-btn-rename" class="fm-btn"></li>
+    <li id="fm-btn-protect" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-recent" class="fm-btn"></li>
+    <li id="fm-btn-create" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-info" class="fm-btn"></li>
+    <li id="fm-btn-rights" class="fm-btn"></li>
+    <li id="fm-btn-history" class="fm-btn"></li>
+    <li class="devider" class="fm-btn"></li>
+    <li id="fm-btn-settings" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-help" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-back" class="fm-btn"></li>
 </div>
 <div class="panel-context">
-    <div id="panel-saveas" class="content-box" />
-    <div id="panel-savecopy" class="content-box" />
-    <div id="panel-recentfiles" class="content-box" />
-    <div id="panel-createnew" class="content-box" />
-    <div id="panel-info" class="content-box" />
-    <div id="panel-rights" class="content-box" />
-    <div id="panel-settings" class="content-box" />
-    <div id="panel-help" class="content-box" />
-    <div id="panel-protect" class="content-box" />
+    <div id="panel-saveas" class="content-box"></div>
+    <div id="panel-savecopy" class="content-box"></div>
+    <div id="panel-recentfiles" class="content-box"></div>
+    <div id="panel-createnew" class="content-box"></div>
+    <div id="panel-info" class="content-box"></div>
+    <div id="panel-rights" class="content-box"></div>
+    <div id="panel-settings" class="content-box"></div>
+    <div id="panel-help" class="content-box"></div>
+    <div id="panel-protect" class="content-box"></div>
 </div>
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/template/LeftMenu.template b/apps/documenteditor/main/app/template/LeftMenu.template
index 2466925d3..96827d295 100644
--- a/apps/documenteditor/main/app/template/LeftMenu.template
+++ b/apps/documenteditor/main/app/template/LeftMenu.template
@@ -12,10 +12,10 @@
     </div>
     <div class="left-panel" style="">
         <!-- /** coauthoring begin **/ -->
-        <div id="left-panel-comments" class="" style="display: none;" />
-        <div id="left-panel-chat" class="" style="display: none;" />
+        <div id="left-panel-comments" class="" style="display: none;"></div>
+        <div id="left-panel-chat" class="" style="display: none;"></div>
         <!-- /** coauthoring end **/ -->
-        <div id="left-panel-navigation" class="" style="display: none; height: 100%;" />
-        <div id="left-panel-plugins" class="" style="display: none; height: 100%;" />
+        <div id="left-panel-navigation" class="" style="display: none; height: 100%;"></div>
+        <div id="left-panel-plugins" class="" style="display: none; height: 100%;"></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/template/RightMenu.template b/apps/documenteditor/main/app/template/RightMenu.template
index 306a80310..7b4bb1ba8 100644
--- a/apps/documenteditor/main/app/template/RightMenu.template
+++ b/apps/documenteditor/main/app/template/RightMenu.template
@@ -20,7 +20,7 @@
         </div>
     </div>
     <div class="tool-menu-btns">
-        <div class="ct-btn-category arrow-left" />
+        <div class="ct-btn-category arrow-left"></div>
         <button id="id-right-menu-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button>
         <button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
         <button id="id-right-menu-image" class="btn btn-category arrow-left" content-target="id-image-settings"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template
index 8f10cfc6d..8b782f6b7 100644
--- a/apps/documenteditor/main/app/template/StatusBar.template
+++ b/apps/documenteditor/main/app/template/StatusBar.template
@@ -15,7 +15,7 @@
         <div class="cnt-lang el-edit">
             <div class="dropdown-toggle" data-toggle="dropdown" style="margin-right: 6px;">
                 <label id="status-label-lang" class="status-label">English (United States)</label>
-                <div class="caret up img-commonctrl" />
+                <div class="caret up img-commonctrl"></div>
             </div>
         </div>
         <span id="btn-doc-lang" class="el-edit"></span>
diff --git a/apps/documenteditor/main/app/template/Viewport.template b/apps/documenteditor/main/app/template/Viewport.template
index 8d56d214c..4fa35178f 100644
--- a/apps/documenteditor/main/app/template/Viewport.template
+++ b/apps/documenteditor/main/app/template/Viewport.template
@@ -11,7 +11,7 @@
                 <div id="about-menu-panel" class="left-menu-full-ct" style="display:none;"></div>
                 <div id="editor-container" class="layout-item"><div id="editor_sdk"></div></div>
                 <div id="right-menu" class="layout-item"></div>
-                <div id="left-panel-history" class="layout-item" />
+                <div id="left-panel-history" class="layout-item"></div>
             </div>
         </div>
         <div id="statusbar" class="layout-item"></div>
diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js
index 921816a76..78c9a7543 100644
--- a/apps/documenteditor/main/app/view/CustomColumnsDialog.js
+++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js
@@ -70,7 +70,7 @@ define([
                         '<div id="custom-columns-separator"></div>',
                     '</div>',
                 '</div>',
-                '<div class="separator horizontal"/>'
+                '<div class="separator horizontal"></div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index dc049fcd0..90b6083f3 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -179,60 +179,60 @@ define([
                 /** coauthoring begin **/
                 '<tr class="comments">',
                     '<td class="left"><label><%= scope.txtLiveComment %></label></td>',
-                    '<td class="right"><div id="fms-chb-live-comment"/></td>',
+                    '<td class="right"><div id="fms-chb-live-comment"></div></td>',
                 '</tr>','<tr class="divider comments"></tr>',
                 '<tr class="comments">',
                     '<td class="left"></td>',
-                    '<td class="right"><div id="fms-chb-resolved-comment"/></td>',
+                    '<td class="right"><div id="fms-chb-resolved-comment"></div></td>',
                 '</tr>','<tr class="divider comments"></tr>',
                 /** coauthoring end **/
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
-                    '<td class="right"><div id="fms-chb-spell-check"/></td>',
+                    '<td class="right"><div id="fms-chb-spell-check"></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.txtInput %></label></td>',
-                    '<td class="right"><div id="fms-chb-input-mode"/></td>',
+                    '<td class="right"><div id="fms-chb-input-mode"></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.textAlignGuides %></label></td>',
-                    '<td class="right"><span id="fms-chb-align-guides" /></td>',
+                    '<td class="right"><span id="fms-chb-align-guides"></span></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.textCompatible %></label></td>',
-                    '<td class="right"><span id="fms-chb-compatible" /></td>',
+                    '<td class="right"><span id="fms-chb-compatible"></span></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="autosave">',
                     '<td class="left"><label id="fms-lbl-autosave"><%= scope.textAutoSave %></label></td>',
-                    '<td class="right"><span id="fms-chb-autosave" /></td>',
+                    '<td class="right"><span id="fms-chb-autosave"></span></td>',
                 '</tr>','<tr class="divider autosave"></tr>',
                 '<tr class="forcesave">',
                     '<td class="left"><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
-                    '<td class="right"><span id="fms-chb-forcesave" /></td>',
+                    '<td class="right"><span id="fms-chb-forcesave"></span></td>',
                 '</tr>','<tr class="divider forcesave"></tr>',
                 /** coauthoring begin **/
                 '<tr class="coauth changes">',
                     '<td class="left"><label><%= scope.strCoAuthMode %></label></td>',
                     '<td class="right">',
-                        '<div><div id="fms-cmb-coauth-mode" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
+                        '<div><div id="fms-cmb-coauth-mode" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
                         '<label id="fms-lbl-coauth-mode" style="vertical-align: middle;"><%= scope.strCoAuthModeDescFast %></label></div></td>',
                 '</tr>','<tr class="divider coauth changes"></tr>',
                 '<tr class="coauth changes">',
                     '<td class="left"><label><%= scope.strShowChanges %></label></td>',
-                    '<td class="right"><span id="fms-cmb-show-changes" /></td>',
+                    '<td class="right"><span id="fms-cmb-show-changes"></span></td>',
                 '</tr>','<tr class="divider coauth changes"></tr>',
                 /** coauthoring end **/
                 '<tr>',
                     '<td class="left"><label><%= scope.strZoom %></label></td>',
-                    '<td class="right"><div id="fms-cmb-zoom" class="input-group-nr" /></td>',
+                    '<td class="right"><div id="fms-cmb-zoom" class="input-group-nr"></div></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr>',
                     '<td class="left"><label><%= scope.strFontRender %></label></td>',
-                    '<td class="right"><span id="fms-cmb-font-render" /></td>',
+                    '<td class="right"><span id="fms-cmb-font-render"></span></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strUnit %></label></td>',
-                    '<td class="right"><span id="fms-cmb-unit" /></td>',
+                    '<td class="right"><span id="fms-cmb-unit"></span></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr>',
                     '<td class="left"></td>',
diff --git a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
index 279b2afe5..b49947b59 100644
--- a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
+++ b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
@@ -57,7 +57,7 @@ define([    'text!documenteditor/main/app/template/MailMergeEmailDlg.template',
                     '<div class="box" style="height:' + (this.options.height-85) + 'px;">',
                     '<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
                     '</div>',
-                    '<div class="separator horizontal"/>'
+                    '<div class="separator horizontal"></div>'
                 ].join('')
             }, options);
             Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js
index ff026d3c8..50a32ce27 100644
--- a/apps/documenteditor/main/app/view/PageSizeDialog.js
+++ b/apps/documenteditor/main/app/view/PageSizeDialog.js
@@ -79,7 +79,7 @@ define([
                         '</tr>',
                     '</table>',
                 '</div>',
-                '<div class="separator horizontal"/>'
+                '<div class="separator horizontal"></div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
index 3dc09edc5..597098e25 100644
--- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js
+++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js
@@ -120,7 +120,7 @@ define([
                             '</div></div>',
                         '</div>',
                     '</div>',
-                    '<div class="separator horizontal"/>'
+                    '<div class="separator horizontal"></div>'
                 ].join('')
             }, options);
 
diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
index e62d9aab4..029e27b84 100644
--- a/apps/documenteditor/main/app/view/Toolbar.js
+++ b/apps/documenteditor/main/app/view/Toolbar.js
@@ -1137,12 +1137,12 @@ define([
 
                     this.listStyles.fieldPicker.itemTemplate = _.template([
                         '<div class="style" id="<%= id %>">',
-                        '<div style="background-image: url(<%= imageUrl %>); width: ' + this.listStyles.itemWidth + 'px; height: ' + this.listStyles.itemHeight + 'px;"/>',
+                        '<div style="background-image: url(<%= imageUrl %>); width: ' + this.listStyles.itemWidth + 'px; height: ' + this.listStyles.itemHeight + 'px;"></div>',
                         '</div>'
                     ].join(''));
                     this.listStyles.menuPicker.itemTemplate = _.template([
                         '<div class="style" id="<%= id %>">',
-                        '<div style="background-image: url(<%= imageUrl %>); width: ' + this.listStyles.itemWidth + 'px; height: ' + this.listStyles.itemHeight + 'px;"/>',
+                        '<div style="background-image: url(<%= imageUrl %>); width: ' + this.listStyles.itemWidth + 'px; height: ' + this.listStyles.itemHeight + 'px;"></div>',
                         '</div>'
                     ].join(''));
                     this.paragraphControls.push(this.listStyles);
diff --git a/apps/presentationeditor/main/app/template/FileMenu.template b/apps/presentationeditor/main/app/template/FileMenu.template
index d67b35cfe..a2c9eb462 100644
--- a/apps/presentationeditor/main/app/template/FileMenu.template
+++ b/apps/presentationeditor/main/app/template/FileMenu.template
@@ -1,36 +1,36 @@
 <div class="panel-menu">
-    <li class="fm-first-item"/>
-    <li id="fm-btn-return" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-save" class="fm-btn" />
-    <li id="fm-btn-edit" class="fm-btn" />
-    <li id="fm-btn-download" class="fm-btn" />
-    <li id="fm-btn-save-copy" class="fm-btn" />
-    <li id="fm-btn-save-desktop" class="fm-btn" />
-    <li id="fm-btn-print" class="fm-btn" />
-    <li id="fm-btn-rename" class="fm-btn" />
-    <li id="fm-btn-protect" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-recent" class="fm-btn" />
-    <li id="fm-btn-create" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-info" class="fm-btn" />
-    <li id="fm-btn-rights" class="fm-btn" />
-    <li class="devider" class="fm-btn" />
-    <li id="fm-btn-settings" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-help" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-back" class="fm-btn" />
+    <li class="fm-first-item"></li>
+    <li id="fm-btn-return" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-save" class="fm-btn"></li>
+    <li id="fm-btn-edit" class="fm-btn"></li>
+    <li id="fm-btn-download" class="fm-btn"></li>
+    <li id="fm-btn-save-copy" class="fm-btn"></li>
+    <li id="fm-btn-save-desktop" class="fm-btn"></li>
+    <li id="fm-btn-print" class="fm-btn"></li>
+    <li id="fm-btn-rename" class="fm-btn"></li>
+    <li id="fm-btn-protect" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-recent" class="fm-btn"></li>
+    <li id="fm-btn-create" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-info" class="fm-btn"></li>
+    <li id="fm-btn-rights" class="fm-btn"></li>
+    <li class="devider" class="fm-btn"></li>
+    <li id="fm-btn-settings" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-help" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-back" class="fm-btn"></li>
 </div>
 <div class="panel-context">
-    <div id="panel-saveas" class="content-box" />
-    <div id="panel-savecopy" class="content-box" />
-    <div id="panel-recentfiles" class="content-box" />
-    <div id="panel-createnew" class="content-box" />
-    <div id="panel-info" class="content-box" />
-    <div id="panel-rights" class="content-box" />
-    <div id="panel-settings" class="content-box" />
-    <div id="panel-help" class="content-box" />
-    <div id="panel-protect" class="content-box" />
+    <div id="panel-saveas" class="content-box"></div>
+    <div id="panel-savecopy" class="content-box"></div>
+    <div id="panel-recentfiles" class="content-box"></div>
+    <div id="panel-createnew" class="content-box"></div>
+    <div id="panel-info" class="content-box"></div>
+    <div id="panel-rights" class="content-box"></div>
+    <div id="panel-settings" class="content-box"></div>
+    <div id="panel-help" class="content-box"></div>
+    <div id="panel-protect" class="content-box"></div>
 </div>
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/template/LeftMenu.template b/apps/presentationeditor/main/app/template/LeftMenu.template
index 33401f1b9..7471d770d 100644
--- a/apps/presentationeditor/main/app/template/LeftMenu.template
+++ b/apps/presentationeditor/main/app/template/LeftMenu.template
@@ -12,9 +12,9 @@
     </div>
     <div class="left-panel" style="">
         <!-- /** coauthoring begin **/ -->
-        <div id="left-panel-comments" class="" style="display: none;" />
-        <div id="left-panel-chat" class="" style="display: none;" />
+        <div id="left-panel-comments" class="" style="display: none;"></div>
+        <div id="left-panel-chat" class="" style="display: none;"></div>
         <!-- /** coauthoring end **/ -->
-        <div id="left-panel-plugins" class="" style="display: none; height: 100%;" />
+        <div id="left-panel-plugins" class="" style="display: none; height: 100%;"></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/presentationeditor/main/app/template/RightMenu.template b/apps/presentationeditor/main/app/template/RightMenu.template
index 83a4bdf86..a1e1e9c5d 100644
--- a/apps/presentationeditor/main/app/template/RightMenu.template
+++ b/apps/presentationeditor/main/app/template/RightMenu.template
@@ -18,7 +18,7 @@
         </div>
     </div>
     <div class="tool-menu-btns">
-        <div class="ct-btn-category arrow-left" />
+        <div class="ct-btn-category arrow-left"></div>
         <button id="id-right-menu-slide" class="btn btn-category arrow-left" content-target="id-slide-settings"><i class="icon toolbar__icon btn-menu-slide">&nbsp;</i></button>
         <button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
         <button id="id-right-menu-image" class="btn btn-category arrow-left" content-target="id-image-settings"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template
index f4d7afebb..16159833c 100644
--- a/apps/presentationeditor/main/app/template/StatusBar.template
+++ b/apps/presentationeditor/main/app/template/StatusBar.template
@@ -11,9 +11,9 @@
         </div>
     </div>
     <div id="status-users-ct" class="status-group dropup" style="display:none;">
-        <div class="separator short" style="margin-right: 12px; margin-left: 40px;" />
+        <div class="separator short" style="margin-right: 12px; margin-left: 40px;"></div>
         <div id="status-users-block" style="display:inline-block; cursor:pointer;">
-            <span id="status-users-icon" class="img-commonctrl" style="margin-bottom: 2px;"/>
+            <span id="status-users-icon" class="img-commonctrl" style="margin-bottom: 2px;"></span>
             <label id="status-users-count" class="status-label" style="font-size: 14px; font-weight: normal; margin-top: -1px;">+</label>
         </div>
         <div id="status-users-menu" class="dropdown-menu">
@@ -21,7 +21,7 @@
             <div id="status-users-list"></div>
             <label id="status-change-rights" class="link" style="margin-top: 15px;"><%= scope.txAccessRights %></label>
         </div>
-        <div class="separator short" style="margin-left: 10px;" />
+        <div class="separator short" style="margin-left: 10px;"></div>
     </div>
     <div class="status-group" style="width:100%; text-align:center;">
         <label id="status-label-action" class="status-label"></label>
@@ -30,7 +30,7 @@
         <div class="cnt-lang el-edit">
             <div class="dropdown-toggle" data-toggle="dropdown" style="margin-right: 6px;">
                 <label id="status-label-lang" class="status-label">English (United States)</label>
-                <div class="caret up img-commonctrl" />
+                <div class="caret up img-commonctrl"></div>
             </div>
         </div>
         <span id="btn-doc-lang" class="el-edit"></span>
diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js
index c7219b226..8b23928e1 100644
--- a/apps/presentationeditor/main/app/view/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/view/DocumentHolder.js
@@ -2078,7 +2078,7 @@ define([
                     store       : PE.getCollection('SlideLayouts'),
                     itemTemplate: _.template([
                         '<div class="layout" id="<%= id %>" style="width: <%= itemWidth %>px;">',
-                            '<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"/>',
+                            '<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"></div>',
                             '<div class="title"><%= title %></div> ',
                         '</div>'
                     ].join(''))
@@ -2117,7 +2117,7 @@ define([
                     store       : PE.getCollection('SlideThemes'),
                     itemTemplate: _.template([
                         '<div class="style" id="<%= id %>"">',
-                        '<div class="item-theme" style="' + '<% if (typeof imageUrl !== "undefined") { %>' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"/>',
+                        '<div class="item-theme" style="' + '<% if (typeof imageUrl !== "undefined") { %>' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"></div>',
                         '</div>'
                     ].join(''))
                 }).on('item:click', function(picker, item, record, e) {
diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js
index c47749871..eb3806fed 100644
--- a/apps/presentationeditor/main/app/view/DocumentPreview.js
+++ b/apps/presentationeditor/main/app/view/DocumentPreview.js
@@ -75,7 +75,7 @@ define([
                         '<button id="btn-preview-prev" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-previtem">&nbsp;</span></button>',
                         '<button id="btn-preview-play" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-preview-play">&nbsp;</span></button>',
                         '<button id="btn-preview-next" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-nextitem">&nbsp;</span></button>',
-                    '<div class="separator"/>',
+                    '<div class="separator"></div>',
                     '</div>',
                     '<div class="preview-group dropup">',
                         '<label id="preview-label-slides" class="status-label dropdown-toggle" data-toggle="dropdown">Slide 1 of 1</label>',
@@ -85,9 +85,9 @@ define([
                         '</div>',
                     '</div>',
                     '<div class="preview-group" style="">',
-                        '<div class="separator"/>',
+                        '<div class="separator"></div>',
                         '<button id="btn-preview-fullscreen" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-preview-fullscreen">&nbsp;</span></button>',
-                        '<div class="separator fullscreen"/>',
+                        '<div class="separator fullscreen"></div>',
                         '<button id="btn-preview-close" type="button" class="btn small btn-toolbar"><span class="icon toolbar__icon btn-close">&nbsp;</span></button>',
                     '</div>',
                 '</div>'
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index 1a9277247..5e2f96a2c 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -170,43 +170,43 @@ define([
             '<table><tbody>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
-                    '<td class="right"><div id="fms-chb-spell-check"/></td>',
+                    '<td class="right"><div id="fms-chb-spell-check"></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.txtInput %></label></td>',
-                    '<td class="right"><div id="fms-chb-input-mode"/></td>',
+                    '<td class="right"><div id="fms-chb-input-mode"></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.textAlignGuides %></label></td>',
-                    '<td class="right"><span id="fms-chb-align-guides" /></td>',
+                    '<td class="right"><span id="fms-chb-align-guides"></span></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="autosave">',
                     '<td class="left"><label id="fms-lbl-autosave"><%= scope.textAutoSave %></label></td>',
-                    '<td class="right"><span id="fms-chb-autosave" /></td>',
+                    '<td class="right"><span id="fms-chb-autosave"></span></td>',
                 '</tr>','<tr class="divider autosave"></tr>',
                 '<tr class="forcesave">',
                     '<td class="left"><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
-                    '<td class="right"><span id="fms-chb-forcesave" /></td>',
+                    '<td class="right"><span id="fms-chb-forcesave"></span></td>',
                 '</tr>','<tr class="divider forcesave"></tr>',
                 /** coauthoring begin **/
                 '<tr class="coauth changes">',
                     '<td class="left"><label><%= scope.strCoAuthMode %></label></td>',
                     '<td class="right">',
-                        '<div><div id="fms-cmb-coauth-mode" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
+                        '<div><div id="fms-cmb-coauth-mode" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
                         '<label id="fms-lbl-coauth-mode" style="vertical-align: middle;"><%= scope.strCoAuthModeDescFast %></label></div></td>',
                 '</tr>','<tr class="divider coauth changes"></tr>',
                 /** coauthoring end **/
                 '<tr>',
                     '<td class="left"><label><%= scope.strZoom %></label></td>',
-                    '<td class="right"><div id="fms-cmb-zoom" class="input-group-nr" /></td>',
+                    '<td class="right"><div id="fms-cmb-zoom" class="input-group-nr"></div></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr>',
                     '<td class="left"><label><%= scope.strFontRender %></label></td>',
-                    '<td class="right"><span id="fms-cmb-font-render" /></td>',
+                    '<td class="right"><span id="fms-cmb-font-render"></span></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strUnit %></label></td>',
-                    '<td class="right"><span id="fms-cmb-unit" /></td>',
+                    '<td class="right"><span id="fms-cmb-unit"></span></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr>',
                     '<td class="left"></td>',
diff --git a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
index d7a669ac1..ec2a29bff 100644
--- a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
+++ b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
@@ -65,7 +65,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
                                 template,
                                 '</div></div>',
                             '</div>',
-                            '<div class="separator"/>',
+                            '<div class="separator"></div>',
                             '<div class="menu-panel" style="width: 130px; padding-top: 17px;">',
                                 '<label  style="display:block; margin-left: 15px;" class="input-label">' + me.textPreview + '</label>',
                                 '<div style="width: 100px; height: 80px; padding: 5px; margin-left: 15px; border: 1px solid #AFAFAF; border-radius: 2px; background: #ffffff;">',
@@ -73,7 +73,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
                                 '</div>',
                             '</div>',
                         '</div>',
-                        '<div class="separator horizontal"/>',
+                        '<div class="separator horizontal"></div>',
                         '<div class="footer center">',
                             '<button class="btn normal dlg-btn primary" result="all" style="width: auto; min-width: 86px;">' + me.applyAllText + '</button>',
                             '<button class="btn normal dlg-btn" result="ok" style="width: auto; min-width: 86px;">' + me.applyText + '</button>',
diff --git a/apps/presentationeditor/main/app/view/SlideSizeSettings.js b/apps/presentationeditor/main/app/view/SlideSizeSettings.js
index 2d82c2ea9..f207a751a 100644
--- a/apps/presentationeditor/main/app/view/SlideSizeSettings.js
+++ b/apps/presentationeditor/main/app/view/SlideSizeSettings.js
@@ -81,7 +81,7 @@ define([
                     '</div>',
                     '<div id="slide-orientation-combo" class="" style="margin-bottom: 10px;"></div>',
                 '</div>',
-                '<div class="separator horizontal"/>'
+                '<div class="separator horizontal"></div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/presentationeditor/main/app/view/SlideshowSettings.js b/apps/presentationeditor/main/app/view/SlideshowSettings.js
index c4e595dba..a9abd396a 100644
--- a/apps/presentationeditor/main/app/view/SlideshowSettings.js
+++ b/apps/presentationeditor/main/app/view/SlideshowSettings.js
@@ -62,7 +62,7 @@ define([
                 '<div class="box" style="height: 20px;">',
                     '<div id="slideshow-checkbox-loop"></div>',
                 '</div>',
-                '<div class="separator horizontal"/>'
+                '<div class="separator horizontal"></div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index ff1228ea7..4537f48c0 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -836,12 +836,12 @@ define([
 
                     me.listTheme.fieldPicker.itemTemplate = _.template([
                         '<div class="style" id="<%= id %>">',
-                        '<div class="item-theme" style="' + '<% if (typeof imageUrl !== "undefined") { %>' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"/>',
+                        '<div class="item-theme" style="' + '<% if (typeof imageUrl !== "undefined") { %>' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"></div>',
                         '</div>'
                     ].join(''));
                     me.listTheme.menuPicker.itemTemplate = _.template([
                         '<div class="style" id="<%= id %>">',
-                        '<div class="item-theme" style="' + '<% if (typeof imageUrl !== "undefined") { %>' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"/>',
+                        '<div class="item-theme" style="' + '<% if (typeof imageUrl !== "undefined") { %>' + 'background-image: url(<%= imageUrl %>);' + '<% } %> background-position: 0 -<%= offsety %>px;"></div>',
                         '</div>'
                     ].join(''));
 
@@ -1505,7 +1505,7 @@ define([
                             store: PE.getCollection('SlideLayouts'),
                             itemTemplate: _.template([
                                 '<div class="layout" id="<%= id %>" style="width: <%= itemWidth %>px;">',
-                                '<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"/>',
+                                '<div style="background-image: url(<%= imageUrl %>); width: <%= itemWidth %>px; height: <%= itemHeight %>px;"></div>',
                                 '<div class="title"><%= title %></div> ',
                                 '</div>'
                             ].join(''))
diff --git a/apps/presentationeditor/mobile/app/view/edit/EditSlide.js b/apps/presentationeditor/mobile/app/view/edit/EditSlide.js
index d521612e6..40e0d23b3 100644
--- a/apps/presentationeditor/mobile/app/view/edit/EditSlide.js
+++ b/apps/presentationeditor/mobile/app/view/edit/EditSlide.js
@@ -310,7 +310,7 @@ define([
                         '<% _.each(themes, function(row) { %>',
                             '<div class="row">',
                             '<% _.each(row, function(theme) { %>',
-                                '<div class="item-theme" data-type="<%= theme.themeId %>" style="' + '<% if (typeof theme.imageUrl !== "undefined") { %>' + 'background-image: url(<%= theme.imageUrl %>);' + '<% } %> background-position: 0 -<%= theme.offsety %>px;"/>',
+                                '<div class="item-theme" data-type="<%= theme.themeId %>" style="' + '<% if (typeof theme.imageUrl !== "undefined") { %>' + 'background-image: url(<%= theme.imageUrl %>);' + '<% } %> background-position: 0 -<%= theme.offsety %>px;"></div>',
                             '<% }); %>',
                             '</div>',
                         '<% }); %>'
diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template
index 3f2e877d2..afad9d985 100644
--- a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template
+++ b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template
@@ -41,7 +41,7 @@
                 </td>
                 <td class="padding-small" width="50%">
                     <label class="input-label" style="margin-left: 7px;"><%= scope.textLegendPos %></label>
-                    <div id="chart-dlg-combo-legend-pos" class="input-group-nr" style="margin-left: 7px;" />
+                    <div id="chart-dlg-combo-legend-pos" class="input-group-nr" style="margin-left: 7px;"></div>
                 </td>
             </tr>
             <tr>
@@ -58,7 +58,7 @@
             <tr>
                 <td class="padding-small" width="50%">
                     <label class="input-label"><%= scope.textSeparator %></label>
-                    <div id="chart-dlg-txt-separator" class="input-row"  style="margin-right: 7px;"/>
+                    <div id="chart-dlg-txt-separator" class="input-row"  style="margin-right: 7px;"></div>
                 </td>
             </tr>
             <tr>
@@ -82,7 +82,7 @@
                 </td>
                 <td class="padding-small" width="50%">
                     <label class="input-label" style="margin-left: 7px;"><%= scope.textVertAxis %></label>
-                    <div id="chart-dlg-combo-vert-show" class="input-group-nr" style="margin-left: 7px;" />
+                    <div id="chart-dlg-combo-vert-show" class="input-group-nr" style="margin-left: 7px;"></div>
                 </td>
             </tr>
             <tr>
@@ -92,7 +92,7 @@
                 </td>
                 <td class="padding-large" width="50%">
                     <label class="input-label" style="margin-left: 7px;"><%= scope.textVertTitle %></label>
-                    <div id="chart-dlg-combo-vert-title" class="input-group-nr" style="margin-left: 7px;" />
+                    <div id="chart-dlg-combo-vert-title" class="input-group-nr" style="margin-left: 7px;"></div>
                 </td>
             </tr>
             <tr>
@@ -107,7 +107,7 @@
                 </td>
                 <td class="padding-small" width="50%">
                     <label class="input-label" style="margin-left: 7px;"><%= scope.textVertGrid %></label>
-                    <div id="chart-dlg-combo-vert-grid" class="input-group-nr" style="margin-left: 7px;" />
+                    <div id="chart-dlg-combo-vert-grid" class="input-group-nr" style="margin-left: 7px;"></div>
                 </td>
             </tr>
         </table>
@@ -186,7 +186,7 @@
                 </td>
                 <td class="padding-large">
                     <label class="input-label" style="margin-left: 15px;"><%= scope.textMinorType %></label>
-                    <div id="chart-dlg-combo-v-minor-type" class="input-group-nr" style="margin-left: 15px;" />
+                    <div id="chart-dlg-combo-v-minor-type" class="input-group-nr" style="margin-left: 15px;"></div>
                 </td>
             </tr>
         </table>
diff --git a/apps/spreadsheeteditor/main/app/template/FileMenu.template b/apps/spreadsheeteditor/main/app/template/FileMenu.template
index d67b35cfe..a2c9eb462 100644
--- a/apps/spreadsheeteditor/main/app/template/FileMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/FileMenu.template
@@ -1,36 +1,36 @@
 <div class="panel-menu">
-    <li class="fm-first-item"/>
-    <li id="fm-btn-return" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-save" class="fm-btn" />
-    <li id="fm-btn-edit" class="fm-btn" />
-    <li id="fm-btn-download" class="fm-btn" />
-    <li id="fm-btn-save-copy" class="fm-btn" />
-    <li id="fm-btn-save-desktop" class="fm-btn" />
-    <li id="fm-btn-print" class="fm-btn" />
-    <li id="fm-btn-rename" class="fm-btn" />
-    <li id="fm-btn-protect" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-recent" class="fm-btn" />
-    <li id="fm-btn-create" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-info" class="fm-btn" />
-    <li id="fm-btn-rights" class="fm-btn" />
-    <li class="devider" class="fm-btn" />
-    <li id="fm-btn-settings" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-help" class="fm-btn" />
-    <li class="devider" />
-    <li id="fm-btn-back" class="fm-btn" />
+    <li class="fm-first-item"></li>
+    <li id="fm-btn-return" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-save" class="fm-btn"></li>
+    <li id="fm-btn-edit" class="fm-btn"></li>
+    <li id="fm-btn-download" class="fm-btn"></li>
+    <li id="fm-btn-save-copy" class="fm-btn"></li>
+    <li id="fm-btn-save-desktop" class="fm-btn"></li>
+    <li id="fm-btn-print" class="fm-btn"></li>
+    <li id="fm-btn-rename" class="fm-btn"></li>
+    <li id="fm-btn-protect" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-recent" class="fm-btn"></li>
+    <li id="fm-btn-create" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-info" class="fm-btn"></li>
+    <li id="fm-btn-rights" class="fm-btn"></li>
+    <li class="devider" class="fm-btn"></li>
+    <li id="fm-btn-settings" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-help" class="fm-btn"></li>
+    <li class="devider"></li>
+    <li id="fm-btn-back" class="fm-btn"></li>
 </div>
 <div class="panel-context">
-    <div id="panel-saveas" class="content-box" />
-    <div id="panel-savecopy" class="content-box" />
-    <div id="panel-recentfiles" class="content-box" />
-    <div id="panel-createnew" class="content-box" />
-    <div id="panel-info" class="content-box" />
-    <div id="panel-rights" class="content-box" />
-    <div id="panel-settings" class="content-box" />
-    <div id="panel-help" class="content-box" />
-    <div id="panel-protect" class="content-box" />
+    <div id="panel-saveas" class="content-box"></div>
+    <div id="panel-savecopy" class="content-box"></div>
+    <div id="panel-recentfiles" class="content-box"></div>
+    <div id="panel-createnew" class="content-box"></div>
+    <div id="panel-info" class="content-box"></div>
+    <div id="panel-rights" class="content-box"></div>
+    <div id="panel-settings" class="content-box"></div>
+    <div id="panel-help" class="content-box"></div>
+    <div id="panel-protect" class="content-box"></div>
 </div>
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/template/LeftMenu.template b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
index e01779e68..e39aeb9a5 100644
--- a/apps/spreadsheeteditor/main/app/template/LeftMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/LeftMenu.template
@@ -12,10 +12,10 @@
     </div>
     <div class="left-panel" style="">
         <!-- /** coauthoring begin **/ -->
-        <div id="left-panel-comments" class="" style="display: none;" />
-        <div id="left-panel-chat" class="" style="display: none;" />
-        <div id="left-panel-spellcheck" class="" style="display: none; height: 100%;" />
+        <div id="left-panel-comments" class="" style="display: none;"></div>
+        <div id="left-panel-chat" class="" style="display: none;"></div>
+        <div id="left-panel-spellcheck" class="" style="display: none; height: 100%;"></div>
         <!-- /** coauthoring end **/ -->
-        <div id="left-panel-plugins" class="" style="display: none; height: 100%; position: relative;" />
+        <div id="left-panel-plugins" class="" style="display: none; height: 100%; position: relative;"></div>
     </div>
 </div>
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/template/PrintSettings.template b/apps/spreadsheeteditor/main/app/template/PrintSettings.template
index 370f4af71..f64b909a1 100644
--- a/apps/spreadsheeteditor/main/app/template/PrintSettings.template
+++ b/apps/spreadsheeteditor/main/app/template/PrintSettings.template
@@ -1,20 +1,20 @@
 <div class="settings-panel active">
     <div class="padding-large inner-content" >
-        <div id="printadv-dlg-combo-range" class="input-group-nr" />
-        <div id="printadv-dlg-chb-ignore" style="margin-top: 5px;"/>
+        <div id="printadv-dlg-combo-range" class="input-group-nr"></div>
+        <div id="printadv-dlg-chb-ignore" style="margin-top: 5px;"></div>
     </div>
-    <div class="padding-small"/>
+    <div class="padding-small"></div>
     <div class="padding-large inner-content" >
-        <div id="printadv-dlg-combo-sheets" class="input-group-nr" />
+        <div id="printadv-dlg-combo-sheets" class="input-group-nr"></div>
     </div>
     <div class="padding-large inner-content" >
-        <div id="printadv-dlg-combo-pages" class="input-group-nr" />
+        <div id="printadv-dlg-combo-pages" class="input-group-nr"></div>
     </div>
     <div class="padding-large inner-content" >
-        <span id="printadv-dlg-combo-orient" />
+        <span id="printadv-dlg-combo-orient"></span>
     </div>
     <div class="padding-large inner-content" >
-        <span id="printadv-dlg-combo-layout" />
+        <span id="printadv-dlg-combo-layout"></span>
     </div>
     <div id="printadv-dlg-content-to-hide">
         <div class="padding-large inner-content" >
@@ -55,10 +55,10 @@
                 </tr>
             </table>
         </div>
-        <div class="padding-small"/>
+        <div class="padding-small"></div>
         <div class="inner-content">
-            <div id="printadv-dlg-chb-grid" style="margin-bottom: 10px;"/>
-            <div id="printadv-dlg-chb-rows"/>
+            <div id="printadv-dlg-chb-grid" style="margin-bottom: 10px;"></div>
+            <div id="printadv-dlg-chb-rows"></div>
         </div>
     </div>
 </div>
diff --git a/apps/spreadsheeteditor/main/app/template/RightMenu.template b/apps/spreadsheeteditor/main/app/template/RightMenu.template
index 09960c52f..33a2af169 100644
--- a/apps/spreadsheeteditor/main/app/template/RightMenu.template
+++ b/apps/spreadsheeteditor/main/app/template/RightMenu.template
@@ -20,7 +20,7 @@
         </div>
     </div>
     <div class="tool-menu-btns">
-        <div class="ct-btn-category arrow-left" />
+        <div class="ct-btn-category arrow-left"></div>
         <button id="id-right-menu-cell" class="btn btn-category arrow-left" content-target="id-cell-settings"><i class="icon toolbar__icon btn-menu-cell">&nbsp;</i></button>
         <button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
         <button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
diff --git a/apps/spreadsheeteditor/main/app/template/StatusBar.template b/apps/spreadsheeteditor/main/app/template/StatusBar.template
index 0d913dd6d..0988bde4b 100644
--- a/apps/spreadsheeteditor/main/app/template/StatusBar.template
+++ b/apps/spreadsheeteditor/main/app/template/StatusBar.template
@@ -10,7 +10,7 @@
         <button id="status-btn-addtab" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
     </div>
     <div id="status-zoom-box" class="status-group">
-        <div class="separator short" />
+        <div class="separator short"></div>
         <button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
         <div class="cnt-zoom">
             <div class="dropdown-toggle" data-toggle="dropdown">
@@ -20,7 +20,7 @@
         <button id="status-btn-zoomup" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
     </div>
     <div id="status-math-box" class="status-group">
-        <div class="separator short" style="margin-right: 12px;" />
+        <div class="separator short" style="margin-right: 12px;"></div>
         <label id="status-math-average">AVERAGE: 10</label>
         <label id="status-math-count">COUNT: 3</label>
         <label id="status-math-min">MIN: 1</label>
@@ -28,7 +28,7 @@
         <label id="status-math-sum">SUM: 5</label>
     </div>
     <div id="status-filtered-box" class="status-group">
-        <div class="separator short" style="margin-right: 12px;" />
+        <div class="separator short" style="margin-right: 12px;"></div>
         <label id="status-filtered-records"></label>
     </div>
     <div id="status-sheets-bar-box">
diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index ff7d3fc29..4cf0401c3 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -497,7 +497,7 @@ define([
                         '<div class="" style="display: flex; flex-direction: column; justify-content: flex-start; height: calc(100% - 40px);">',
                             '<div id="id-sd-cell-search" style="height:22px; margin-bottom:10px;"></div>',
                             '<div class="border-values" style="overflow: hidden; flex-grow: 1;">',
-                                '<div id="id-dlg-filter-values" class="combo-values" style=""/>',
+                                '<div id="id-dlg-filter-values" class="combo-values" style=""></div>',
                             '</div>',
                         '</div>',
                         '<div class="footer center">',
@@ -759,7 +759,7 @@ define([
                         '<div>',
                             '<label class="checkbox-indeterminate" style="position:absolute;">',
                                 '<input id="afcheckbox-<%= id %>" type="checkbox" class="button__checkbox">',
-                                '<label for="afcheckbox-<%= id %>" class="checkbox__shape" />',
+                                '<label for="afcheckbox-<%= id %>" class="checkbox__shape"></label>',
                             '</label>',
                             '<div id="<%= id %>" class="list-item" style="pointer-events:none; margin-left: 20px;display: flex;">',
                                 '<div style="flex-grow: 1;"><%= Common.Utils.String.htmlEncode(value) %></div>',
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 61385ae5d..2cec39b08 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -259,19 +259,19 @@ define([
             '<table class="main"><tbody>',
                 '<tr>',
                     '<td class="left"><label><%= scope.textSettings %></label></td>',
-                    '<td class="right"><div id="advsettings-print-combo-sheets" class="input-group-nr" /></td>',
+                    '<td class="right"><div id="advsettings-print-combo-sheets" class="input-group-nr"></div></td>',
                 '</tr>','<tr class="divider"></tr>','<tr class="divider"></tr>',
                 '<tr>',
                     '<td class="left"><label><%= scope.textPageSize %></label></td>',
-                    '<td class="right"><div id="advsettings-print-combo-pages" class="input-group-nr" /></td>',
+                    '<td class="right"><div id="advsettings-print-combo-pages" class="input-group-nr"></div></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr>',
                     '<td class="left"><label><%= scope.textPageOrientation %></label></td>',
-                    '<td class="right"><span id="advsettings-print-combo-orient" /></td>',
+                    '<td class="right"><span id="advsettings-print-combo-orient"></span></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr>',
                     '<td class="left"><label><%= scope.textPageScaling %></label></td>',
-                    '<td class="right"><span id="advsettings-print-combo-layout" /></td>',
+                    '<td class="right"><span id="advsettings-print-combo-layout"></span></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr>',
                     '<td class="left" style="vertical-align: top;"><label><%= scope.strPrintTitles %></label></td>',
@@ -320,8 +320,8 @@ define([
                 '<tr>',
                 '<td class="left" style="vertical-align: top;"><label><%= scope.strPrint %></label></td>',
                 '<td class="right" style="vertical-align: top;"><div id="advsettings-print">',
-                    '<div id="advsettings-print-chb-grid" style="margin-bottom: 10px;"/>',
-                    '<div id="advsettings-print-chb-rows"/>',
+                    '<div id="advsettings-print-chb-grid" style="margin-bottom: 10px;"></div>',
+                    '<div id="advsettings-print-chb-rows"></div>',
                 '</div></td>',
                 '</tr>','<tr class="divider"></tr>','<tr class="divider"></tr>',
                 '<tr>',
@@ -606,66 +606,66 @@ define([
                 /** coauthoring begin **/
                 '<tr class="comments">',
                     '<td class="left"><label><%= scope.txtLiveComment %></label></td>',
-                    '<td class="right"><div id="fms-chb-live-comment"/></td>',
+                    '<td class="right"><div id="fms-chb-live-comment"></div></td>',
                 '</tr>','<tr class="divider comments"></tr>',
                 '<tr class="comments">',
                     '<td class="left"></td>',
-                    '<td class="right"><div id="fms-chb-resolved-comment"/></td>',
+                    '<td class="right"><div id="fms-chb-resolved-comment"></div></td>',
                 '</tr>','<tr class="divider comments"></tr>',
                 '<tr class="autosave">',
                     '<td class="left"><label id="fms-lbl-autosave"><%= scope.textAutoSave %></label></td>',
-                    '<td class="right"><span id="fms-chb-autosave" /></td>',
+                    '<td class="right"><span id="fms-chb-autosave"></span></td>',
                 '</tr>','<tr class="divider autosave"></tr>',
                 '<tr class="forcesave">',
                     '<td class="left"><label id="fms-lbl-forcesave"><%= scope.textForceSave %></label></td>',
-                    '<td class="right"><span id="fms-chb-forcesave" /></td>',
+                    '<td class="right"><span id="fms-chb-forcesave"></span></td>',
                 '</tr>','<tr class="divider forcesave"></tr>',
                 '<tr>',
                     '<td class="left"><label><%= scope.textRefStyle %></label></td>',
-                    '<td class="right"><div id="fms-chb-r1c1-style"/></td>',
+                    '<td class="right"><div id="fms-chb-r1c1-style"></div></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr class="coauth changes">',
                     '<td class="left"><label><%= scope.strCoAuthMode %></label></td>',
                     '<td class="right">',
-                        '<div><div id="fms-cmb-coauth-mode" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
+                        '<div><div id="fms-cmb-coauth-mode" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
                         '<label id="fms-lbl-coauth-mode" style="vertical-align: middle;"><%= scope.strCoAuthModeDescFast %></label></div></td>',
                 '</tr>','<tr class="divider coauth changes"></tr>',
                 /** coauthoring end **/
                 '<tr>',
                     '<td class="left"><label><%= scope.strZoom %></label></td>',
-                    '<td class="right"><div id="fms-cmb-zoom" class="input-group-nr" /></td>',
+                    '<td class="right"><div id="fms-cmb-zoom" class="input-group-nr"></div></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr>',
                     '<td class="left"><label><%= scope.strFontRender %></label></td>',
-                    '<td class="right"><span id="fms-cmb-font-render" /></td>',
+                    '<td class="right"><span id="fms-cmb-font-render"></span></td>',
                 '</tr>','<tr class="divider"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strUnit %></label></td>',
-                    '<td class="right"><span id="fms-cmb-unit" /></td>',
+                    '<td class="right"><span id="fms-cmb-unit"></span></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strFuncLocale %></label></td>',
                     '<td class="right">',
-                        '<div><div id="fms-cmb-func-locale" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
+                        '<div><div id="fms-cmb-func-locale" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
                         '<label id="fms-lbl-func-locale" style="vertical-align: middle;"><%= scope.strFuncLocaleEx %></label></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strRegSettings %></label></td>',
                     '<td class="right">',
-                        '<div><div id="fms-cmb-reg-settings" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
+                        '<div><div id="fms-cmb-reg-settings" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
                         '<label id="fms-lbl-reg-settings" style="vertical-align: middle;"></label></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strSeparator %></label></td>',
-                    '<td class="right"><div id="fms-chb-separator-settings"/></td>',
+                    '<td class="right"><div id="fms-chb-separator-settings"></div></td>',
                 '</tr>',
                 '<tr class="edit">',
                     '<td class="left"></td>',
-                    '<td class="right"><div id="fms-decimal-separator"/><label class="label-separator" style="margin-left: 10px; padding-top: 4px;"><%= scope.strDecimalSeparator %></label></td>',
+                    '<td class="right"><div id="fms-decimal-separator"></div><label class="label-separator" style="margin-left: 10px; padding-top: 4px;"><%= scope.strDecimalSeparator %></label></td>',
                 '</tr>',
                 '<tr class="edit">',
                     '<td class="left"></td>',
-                    '<td class="right"><div id="fms-thousands-separator"/><label class="label-separator" style="margin-left: 10px; padding-top: 4px;"><%= scope.strThousandsSeparator %></label></td>',
+                    '<td class="right"><div id="fms-thousands-separator"></div><label class="label-separator" style="margin-left: 10px; padding-top: 4px;"><%= scope.strThousandsSeparator %></label></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr>',
                     '<td class="left"></td>',
@@ -1161,15 +1161,15 @@ define([
             '<table class="main"><tbody>',
             '<tr>',
                 '<td class="left" style="padding-bottom: 8px;"><label><%= scope.strDictionaryLanguage %></label></td>',
-                '<td class="right" style="padding-bottom: 8px;"><span id="fms-cmb-dictionary-language" /></td>',
+                '<td class="right" style="padding-bottom: 8px;"><span id="fms-cmb-dictionary-language"></span></td>',
             '</tr>',
             '<tr>',
                 '<td class="left" style="padding-bottom: 8px;"></td>',
-                '<td class="right" style="padding-bottom: 8px;"><span id="fms-chb-ignore-uppercase-words" /></td>',
+                '<td class="right" style="padding-bottom: 8px;"><span id="fms-chb-ignore-uppercase-words"></span></td>',
             '</tr>',
             '<tr>',
                 '<td class="left"></td>',
-                '<td class="right"><span id="fms-chb-ignore-numbers-words" /></td>',
+                '<td class="right"><span id="fms-chb-ignore-numbers-words"></span></td>',
             '</tr>','<tr class="divider"></tr>',
             '<tr>',
                 '<td class="left"></td>',
diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
index 4d68defda..6b8e66c2b 100644
--- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
@@ -146,7 +146,7 @@ define([
                     '</div></div>',
                     '</div>',
                     '</div>',
-                    '<div class="separator horizontal"/>'
+                    '<div class="separator horizontal"></div>'
                 ].join('')
             }, options);
 
diff --git a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
index adeb12697..194bdd489 100644
--- a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
@@ -71,14 +71,14 @@ define([
                     '<div class="content-panel" >',
                         '<div id="formula-dlg-search" style="height:22px; margin-bottom:10px;"></div>',
                         '<label class="header">' + t.textGroupDescription + '</label>',
-                        '<div id="formula-dlg-combo-group" class="input-group-nr" style=""/>',
+                        '<div id="formula-dlg-combo-group" class="input-group-nr" style=""></div>',
                         '<label class="header" style="margin-top: 10px">' + t.textListDescription + '</label>',
-                        '<div id="formula-dlg-combo-functions" class="combo-functions"/>',
+                        '<div id="formula-dlg-combo-functions" class="combo-functions"></div>',
                         '<label id="formula-dlg-args" style="margin-top: 7px">' + '</label>',
                         '<label id="formula-dlg-desc" style="margin-top: 4px; display: block;">' + '</label>',
                     '</div>',
                 '</div>',
-                '<div class="separator horizontal"/>',
+                '<div class="separator horizontal"></div>',
                 '<div class="footer center">',
                     '<button id="formula-dlg-btn-ok" class="btn normal dlg-btn primary" result="ok" style="width: 86px;">' + this.okButtonText + '</button>',
                     '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.cancelButtonText + '</button>',
diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
index c2b3060f6..e9e126792 100644
--- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js
@@ -65,7 +65,7 @@ define([  'text!spreadsheeteditor/main/app/template/NameManagerDlg.template',
                     '<div class="box" style="height:' + (this.options.height-85) + 'px;">',
                     '<div class="content-panel" style="padding: 0;">' + _.template(contentTemplate)({scope: this}) + '</div>',
                     '</div>',
-                    '<div class="separator horizontal"/>',
+                    '<div class="separator horizontal"></div>',
                     '<div class="footer center">',
                     '<button class="btn normal dlg-btn" result="cancel" style="width: 86px;">' + this.closeButtonText + '</button>',
                     '</div>'
diff --git a/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js b/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js
index e1b2d95d0..f2a739b10 100644
--- a/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/PageMarginsDialog.js
@@ -83,7 +83,7 @@ define([
                         '</tr>',
                     '</table>',
                 '</div>',
-                '<div class="separator horizontal"/>'
+                '<div class="separator horizontal"></div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettings.js b/apps/spreadsheeteditor/main/app/view/PivotSettings.js
index 64b9b48c2..5c6a8ee26 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotSettings.js
@@ -108,7 +108,7 @@ define([
                     '<div>',
                     '<label class="checkbox-indeterminate" style="position:absolute;">',
                         '<input id="pvcheckbox-<%= id %>" type="checkbox" class="button__checkbox">',
-                        '<label for="pvcheckbox-<%= id %>" class="checkbox__shape" />',
+                        '<label for="pvcheckbox-<%= id %>" class="checkbox__shape"></label>',
                     '</label>',
                     '<div id="<%= id %>" class="list-item" style="pointer-events:none;"><span style="background-color: transparent;"><%= Common.Utils.String.htmlEncode(value) %></span></div>',
                     '<div class="listitem-icon img-commonctrl"></div>',
diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js
index 5849461ca..fe780e22c 100644
--- a/apps/spreadsheeteditor/main/app/view/PivotTable.js
+++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js
@@ -55,22 +55,22 @@ define([
                 '<div class="group">' +
                     '<span id="slot-btn-add-pivot" class="btn-slot text x-huge"></span>' +
                 '</div>' +
-                '<div class="separator long"/>' +
+                '<div class="separator long"></div>' +
                 '<div class="group">' +
                     '<span id="slot-btn-pivot-report-layout" class="btn-slot text x-huge"></span>' +
                     '<span id="slot-btn-pivot-blank-rows" class="btn-slot text x-huge"></span>' +
                     '<span id="slot-btn-pivot-subtotals" class="btn-slot text x-huge"></span>' +
                     '<span id="slot-btn-pivot-grand-totals" class="btn-slot text x-huge"></span>' +
                 '</div>' +
-                '<div class="separator long"/>' +
+                '<div class="separator long"></div>' +
                 '<div class="group">' +
                     '<span id="slot-btn-refresh-pivot" class="btn-slot text x-huge"></span>' +
                 '</div>' +
-                '<div class="separator long"/>' +
+                '<div class="separator long"></div>' +
                 '<div class="group">' +
                     '<span id="slot-btn-select-pivot" class="btn-slot text x-huge"></span>' +
                 '</div>' +
-                '<div class="separator long"/>' +
+                '<div class="separator long"></div>' +
                 '<div class="group">' +
                     '<div class="elset">' +
                         '<span class="btn-slot text" id="slot-chk-header-row"></span>' +
diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js
index a78b35c08..752006fbe 100644
--- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js
+++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js
@@ -73,7 +73,7 @@ define([    'text!spreadsheeteditor/main/app/template/PrintSettings.template',
                         '</div>',
                         '<div class="content-panel">' + _.template(contentTemplate)({scope: this}) + '</div>',
                     '</div>',
-                    '<div class="separator horizontal"/>',
+                    '<div class="separator horizontal"></div>',
                     '<div class="footer justify">',
                         '<button id="printadv-dlg-btn-hide" class="btn btn-text-default" style="width: 100px;">' + this.textHideDetails + '</button>',
                         '<button class="btn normal dlg-btn primary" result="ok" style="margin-left: 55px;  width: 150px;">' + ((this.type == 'print') ? this.btnPrint : this.btnDownload) + '</button>',
diff --git a/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js b/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js
index ab7efd41e..8d04fd18d 100644
--- a/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/PrintTitlesDialog.js
@@ -89,7 +89,7 @@ define([
                     '</tr>',
                 '</table>',
                 '</div>',
-                '<div class="separator horizontal"/>'
+                '<div class="separator horizontal"></div>'
             ].join('');
 
             this.options.tpl = _.template(this.template)(this.options);
diff --git a/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js b/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js
index b124eb5d7..e24c1b19e 100644
--- a/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js
@@ -106,7 +106,7 @@ define([
                     '<div>',
                         '<label class="checkbox-indeterminate" style="position:absolute;">',
                             '<input id="rdcheckbox-<%= id %>" type="checkbox" class="button__checkbox">',
-                            '<label for="rdcheckbox-<%= id %>" class="checkbox__shape" />',
+                            '<label for="rdcheckbox-<%= id %>" class="checkbox__shape"></label>',
                         '</label>',
                         '<div id="<%= id %>" class="list-item" style="pointer-events:none; margin-left: 20px;display: flex;">',
                             '<div style="flex-grow: 1;"><%= Common.Utils.String.htmlEncode(value) %></div>',
diff --git a/apps/spreadsheeteditor/main/app/view/SortDialog.js b/apps/spreadsheeteditor/main/app/view/SortDialog.js
index 06d29a3ae..c54c77bd7 100644
--- a/apps/spreadsheeteditor/main/app/view/SortDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/SortDialog.js
@@ -116,7 +116,7 @@ define([  'text!spreadsheeteditor/main/app/template/SortDialog.template',
             Common.Views.AdvancedSettingsWindow.prototype.render.call(this);
             var me = this;
 
-            var span = $('<span style="position: absolute; visibility: hidden;"/>');
+            var span = $('<span style="position: absolute; visibility: hidden;"></span>');
             me.$window.append(span);
             span.text(this.textSortBy);
             var captionWidth = span.width();
diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js
index f507af28e..6761e16a5 100644
--- a/apps/spreadsheeteditor/main/app/view/Statusbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js
@@ -353,7 +353,7 @@ define([
                         });
                     });
 
-                this.tabbar.$el.append('<div class="dropdown-toggle" data-toggle="dropdown" style="width:0; height:0;"/>');
+                this.tabbar.$el.append('<div class="dropdown-toggle" data-toggle="dropdown" style="width:0; height:0;"></div>');
                 this.tabMenu.render(this.tabbar.$el);
                 this.tabMenu.cmpEl.attr({tabindex: -1});
                 this.tabMenu.on('show:after', _.bind(this.onTabMenuAfterShow, this));
@@ -683,7 +683,7 @@ define([
                             '<div class="input-row">' +
                                 '<label><%= label %></label>' +
                             '</div>' +
-                            '<div class="input-row" id="txt-sheet-name" />' +
+                            '<div class="input-row" id="txt-sheet-name"></div>' +
                         '</div>',
 
             initialize : function(options) {
@@ -790,7 +790,7 @@ define([
                             '<div class="input-row">' +
                                 '<label><%= label %></label>' +
                             '</div>' +
-                            '<div id="status-list-names" style="height: 162px;"/>' +
+                            '<div id="status-list-names" style="height: 162px;"></div>' +
                         '</div>',
 
             initialize : function(options) {