diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js
index 022d63193..9ddedf973 100644
--- a/apps/common/main/lib/component/SynchronizeTip.js
+++ b/apps/common/main/lib/component/SynchronizeTip.js
@@ -128,7 +128,7 @@ define([
             },
 
             textDontShow        : 'Don\'t show this message again',
-            textSynchronize     : 'The document has been changed by another user.<br/>Please click to save your changes and reload the updates.'
+            textSynchronize     : 'The document has been changed by another user.<br>Please click to save your changes and reload the updates.'
         }
     })(), Common.UI.SynchronizeTip || {}));
 });
diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js
index 9b4a4ef41..4d842e87f 100644
--- a/apps/common/main/lib/controller/ReviewChanges.js
+++ b/apps/common/main/lib/controller/ReviewChanges.js
@@ -941,8 +941,8 @@ define([
         textChart: 'Chart',
         textShape: 'Shape',
         textTableChanged: '<b>Table Settings Changed</b>',
-        textTableRowsAdd: '<b>Table Rows Added<b/>',
-        textTableRowsDel: '<b>Table Rows Deleted<b/>',
+        textTableRowsAdd: '<b>Table Rows Added</b>',
+        textTableRowsDel: '<b>Table Rows Deleted</b>',
         textParaMoveTo: '<b>Moved:</b>',
         textParaMoveFromUp: '<b>Moved Up:</b>',
         textParaMoveFromDown: '<b>Moved Down:</b>',
diff --git a/apps/common/mobile/lib/controller/Collaboration.js b/apps/common/mobile/lib/controller/Collaboration.js
index 38b3d352b..1b7f6d391 100644
--- a/apps/common/mobile/lib/controller/Collaboration.js
+++ b/apps/common/mobile/lib/controller/Collaboration.js
@@ -1766,8 +1766,8 @@ define([
             textChart: 'Chart',
             textShape: 'Shape',
             textTableChanged: '<b>Table Settings Changed</b>',
-            textTableRowsAdd: '<b>Table Rows Added<b/>',
-            textTableRowsDel: '<b>Table Rows Deleted<b/>',
+            textTableRowsAdd: '<b>Table Rows Added</b>',
+            textTableRowsDel: '<b>Table Rows Deleted</b>',
             textParaMoveTo: '<b>Moved:</b>',
             textParaMoveFromUp: '<b>Moved Up:</b>',
             textParaMoveFromDown: '<b>Moved Down:</b>',
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index a84ba6fcb..1bdc5e809 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1592,7 +1592,7 @@ define([
                     config.closable = false;
 
                     if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
-                        config.msg += '<br/><br/>' + this.criticalErrorExtText;
+                        config.msg += '<br><br>' + this.criticalErrorExtText;
                         config.callback = function(btn) {
                             if (btn == 'ok')
                                 Common.NotificationCenter.trigger('goback', true);
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index 030daccc6..a5cf8919c 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -236,12 +236,12 @@ define([
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strPaste %></label></td>',
-                    '<td class="right"><div id="fms-chb-paste-settings"/></td>',
+                    '<td class="right"><div id="fms-chb-paste-settings"></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="macros">',
                     '<td class="left"><label><%= scope.strMacrosSettings %></label></td>',
                     '<td class="right">',
-                        '<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
+                        '<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
                         '<label id="fms-lbl-macros" style="vertical-align: middle;"><%= scope.txtWarnMacrosDesc %></label></div></td>',
                 '</tr>','<tr class="divider macros"></tr>',
                 '<tr>',
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 68b4b9770..30b809527 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -65,8 +65,8 @@
   "Common.Controllers.ReviewChanges.textSubScript": "Subscript",
   "Common.Controllers.ReviewChanges.textSuperScript": "Superscript",
   "Common.Controllers.ReviewChanges.textTableChanged": "<b>Table Settings Changed</b>",
-  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Table Rows Added<b/>",
-  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Table Rows Deleted<b/>",
+  "Common.Controllers.ReviewChanges.textTableRowsAdd": "<b>Table Rows Added</b>",
+  "Common.Controllers.ReviewChanges.textTableRowsDel": "<b>Table Rows Deleted</b>",
   "Common.Controllers.ReviewChanges.textTabs": "Change tabs",
   "Common.Controllers.ReviewChanges.textUnderline": "Underline",
   "Common.Controllers.ReviewChanges.textUrl": "Paste a document URL",
@@ -135,7 +135,7 @@
   "Common.UI.SearchDialog.txtBtnReplace": "Replace",
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Replace All",
   "Common.UI.SynchronizeTip.textDontShow": "Don't show this message again",
-  "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br/>Please click to save your changes and reload the updates.",
+  "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.<br>Please click to save your changes and reload the updates.",
   "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
   "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
   "Common.UI.Window.cancelButtonText": "Cancel",
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index f254d7e78..5ab438963 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -1264,7 +1264,7 @@ define([
                     config.closable = false;
 
                     if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
-                        config.msg += '<br/><br/>' + this.criticalErrorExtText;
+                        config.msg += '<br><br>' + this.criticalErrorExtText;
                         config.callback = function(btn) {
                             if (btn == 'ok') {
                                 Common.NotificationCenter.trigger('goback', true);
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index c57964e0b..a586b7f69 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -210,12 +210,12 @@ define([
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strPaste %></label></td>',
-                    '<td class="right"><div id="fms-chb-paste-settings"/></td>',
+                    '<td class="right"><div id="fms-chb-paste-settings"></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="macros">',
                     '<td class="left"><label><%= scope.strMacrosSettings %></label></td>',
                     '<td class="right">',
-                        '<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
+                        '<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
                         '<label id="fms-lbl-macros" style="vertical-align: middle;"><%= scope.txtWarnMacrosDesc %></label></div></td>',
                 '</tr>','<tr class="divider macros"></tr>',
                 '<tr>',
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index f2b109f73..5f739242f 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1525,7 +1525,7 @@ define([
                     config.closable = false;
 
                     if (this.appOptions.canBackToFolder && !this.appOptions.isDesktopApp && typeof id !== 'string') {
-                        config.msg += '<br/><br/>' + this.criticalErrorExtText;
+                        config.msg += '<br><br>' + this.criticalErrorExtText;
                         config.callback = function(btn) {
                             if (btn == 'ok') {
                                 Common.NotificationCenter.trigger('goback', true);
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
index 7dc24c491..4729d53c3 100644
--- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
+++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
@@ -1642,8 +1642,8 @@ define([    'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
         textYAxisTitle:     'Y Axis Title',
         txtEmpty:           'This field is required',
         textInvalidRange:   'ERROR! Invalid cells range',
-        textTypeStyle: 'Chart Type, Style &<br/>Data Range',
-        textChartElementsLegend: 'Chart Elements &<br/>Chart Legend',
+        textTypeStyle: 'Chart Type, Style &<br>Data Range',
+        textChartElementsLegend: 'Chart Elements &<br>Chart Legend',
         textLayout: 'Layout',
         textLegendPos: 'Legend',
         textHorTitle: 'Horizontal Axis Title',
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
index 80c186932..fabfb6020 100644
--- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -669,12 +669,12 @@ define([
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="edit">',
                     '<td class="left"><label><%= scope.strPaste %></label></td>',
-                    '<td class="right"><div id="fms-chb-paste-settings"/></td>',
+                    '<td class="right"><div id="fms-chb-paste-settings"></div></td>',
                 '</tr>','<tr class="divider edit"></tr>',
                 '<tr class="macros">',
                     '<td class="left"><label><%= scope.strMacrosSettings %></label></td>',
                     '<td class="right">',
-                        '<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"/>',
+                        '<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
                         '<label id="fms-lbl-macros" style="vertical-align: middle;"><%= scope.txtWarnMacrosDesc %></label></div></td>',
                 '</tr>','<tr class="divider macros"></tr>',
                 '<tr>',
diff --git a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js
index bb8c346d7..1c3458cd5 100644
--- a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js
+++ b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js
@@ -85,7 +85,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/SlicerAddDialog.js b/apps/spreadsheeteditor/main/app/view/SlicerAddDialog.js
index 912674a2a..6f39533c9 100644
--- a/apps/spreadsheeteditor/main/app/view/SlicerAddDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/SlicerAddDialog.js
@@ -88,7 +88,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>',