diff --git a/client/res/layout-types/record.tpl b/client/res/layout-types/record.tpl
index d7686a5d52..260a508dbb 100644
--- a/client/res/layout-types/record.tpl
+++ b/client/res/layout-types/record.tpl
@@ -175,7 +175,7 @@
if (hasHiddenPanel) {
%>
{{#ifNotEqual level 0}}
-
+
{{/ifNotEqual}}
{{#ifNotEqual level 0}}
(
@@ -19,12 +19,12 @@
diff --git a/client/res/templates/admin/dynamic-logic/conditions/not.tpl b/client/res/templates/admin/dynamic-logic/conditions/not.tpl
index 4db380c154..2e557eb1ee 100644
--- a/client/res/templates/admin/dynamic-logic/conditions/not.tpl
+++ b/client/res/templates/admin/dynamic-logic/conditions/not.tpl
@@ -1,6 +1,6 @@
-
+
{{translate 'not' category='logicalOperators' scope='Admin'}} (
@@ -10,14 +10,14 @@
-
)
\ No newline at end of file
+
)
diff --git a/client/res/templates/admin/entity-manager/modals/select-icon.tpl b/client/res/templates/admin/entity-manager/modals/select-icon.tpl
index 49116c3860..403e63384d 100644
--- a/client/res/templates/admin/entity-manager/modals/select-icon.tpl
+++ b/client/res/templates/admin/entity-manager/modals/select-icon.tpl
@@ -1,9 +1,7 @@
@@ -30,4 +28,4 @@
{{/each}}
{{/each}}
-
\ No newline at end of file
+
diff --git a/client/res/templates/admin/entity-manager/scope.tpl b/client/res/templates/admin/entity-manager/scope.tpl
index 37534c78d5..5d54a9e8b2 100644
--- a/client/res/templates/admin/entity-manager/scope.tpl
+++ b/client/res/templates/admin/entity-manager/scope.tpl
@@ -20,7 +20,7 @@
{{{conditionGroup}}}
diff --git a/client/res/templates/admin/field-manager/fields/dynamic-logic-conditions/edit.tpl b/client/res/templates/admin/field-manager/fields/dynamic-logic-conditions/edit.tpl
index eaae67c039..3c8adc4e37 100644
--- a/client/res/templates/admin/field-manager/fields/dynamic-logic-conditions/edit.tpl
+++ b/client/res/templates/admin/field-manager/fields/dynamic-logic-conditions/edit.tpl
@@ -1,7 +1,6 @@
-
{{{conditionGroup}}}
diff --git a/client/res/templates/admin/field-manager/fields/dynamic-logic-options/edit.tpl b/client/res/templates/admin/field-manager/fields/dynamic-logic-options/edit.tpl
index 9e3317e3f9..c2a1c631ca 100644
--- a/client/res/templates/admin/field-manager/fields/dynamic-logic-options/edit.tpl
+++ b/client/res/templates/admin/field-manager/fields/dynamic-logic-options/edit.tpl
@@ -5,7 +5,7 @@
{{{var conditionGroupViewKey ../this}}}
@@ -27,6 +27,6 @@
{{/each}}
-
\ No newline at end of file
+
diff --git a/client/res/templates/admin/field-manager/list.tpl b/client/res/templates/admin/field-manager/list.tpl
index 0312f51bfc..98af913ebd 100644
--- a/client/res/templates/admin/field-manager/list.tpl
+++ b/client/res/templates/admin/field-manager/list.tpl
@@ -47,7 +47,7 @@
{{translate type category='fieldTypes' scope='Admin'}}
{{#if isCustom}}
- {{translate 'Remove'}}
+ {{translate 'Remove'}}
{{/if}}
diff --git a/client/res/templates/admin/field-manager/modals/add-field.tpl b/client/res/templates/admin/field-manager/modals/add-field.tpl
index b072b539c0..58d08ececc 100644
--- a/client/res/templates/admin/field-manager/modals/add-field.tpl
+++ b/client/res/templates/admin/field-manager/modals/add-field.tpl
@@ -1,10 +1,10 @@
{{#each typeList}}
-
+
{{translate this category='fieldTypes' scope='Admin'}}
-
+
diff --git a/client/res/templates/admin/index.tpl b/client/res/templates/admin/index.tpl
index 06f6a1409d..40aa01c35d 100644
--- a/client/res/templates/admin/index.tpl
+++ b/client/res/templates/admin/index.tpl
@@ -26,7 +26,7 @@
{{/if}}
{{label}}
diff --git a/client/res/templates/admin/integrations/index.tpl b/client/res/templates/admin/integrations/index.tpl
index dfdf6d152c..25b75750a8 100644
--- a/client/res/templates/admin/integrations/index.tpl
+++ b/client/res/templates/admin/integrations/index.tpl
@@ -13,7 +13,7 @@
{{{translate ./this scope='Integration' category='titles'}}}
diff --git a/client/res/templates/admin/label-manager/edit.tpl b/client/res/templates/admin/label-manager/edit.tpl
index 04a52e5cb1..8148b6ddd4 100644
--- a/client/res/templates/admin/label-manager/edit.tpl
+++ b/client/res/templates/admin/label-manager/edit.tpl
@@ -18,13 +18,13 @@
{{labelTranslated}}
-
-
+
+
{{#each rows}}
{{#each this}}
@@ -21,13 +21,13 @@
data-no-label="{{noLabel}}" >
{{label}}
{{else}}
{{/if}}
@@ -37,5 +37,5 @@
{{/each}}
\ No newline at end of file
+
+
diff --git a/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl
index 0ae697f172..9f473e7c51 100644
--- a/client/res/templates/admin/layouts/grid.tpl
+++ b/client/res/templates/admin/layouts/grid.tpl
@@ -18,7 +18,7 @@
{{/each}}
-
+
@@ -31,7 +31,7 @@
{{translate this scope=../scope category='fields'}}
{{/each}}
@@ -43,14 +43,14 @@
<% for (var i = 0; i < {{columnCount}}; i++) { %>
<% } %>
@@ -61,7 +61,7 @@
diff --git a/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl
index fbf22fd220..a638a8de95 100644
--- a/client/res/templates/admin/layouts/rows.tpl
+++ b/client/res/templates/admin/layouts/rows.tpl
@@ -18,7 +18,7 @@
{{#if ../editable}}
{{#unless notEditable}}
-
+
{{/unless}}
{{/if}}
@@ -37,7 +37,7 @@
{{#if ../editable}}
{{#unless notEditable}}
-
+
{{/unless}}
{{/if}}
diff --git a/client/res/templates/admin/link-manager/index.tpl b/client/res/templates/admin/link-manager/index.tpl
index 2e616de0c1..a818b42a07 100644
--- a/client/res/templates/admin/link-manager/index.tpl
+++ b/client/res/templates/admin/link-manager/index.tpl
@@ -81,13 +81,13 @@
{{translate entityForeign category='scopeNames'}}
-
+
{{translate 'Edit'}}
{{#if isRemovable}}
-
+
{{translate 'Remove'}}
{{/if}}
diff --git a/client/res/templates/dashlet.tpl b/client/res/templates/dashlet.tpl
index d3de488c0e..2d02cbb26c 100644
--- a/client/res/templates/dashlet.tpl
+++ b/client/res/templates/dashlet.tpl
@@ -24,7 +24,7 @@
{{#if iconHtml}}{{{iconHtml}}}
diff --git a/client/res/templates/email-account/modals/select-folder.tpl b/client/res/templates/email-account/modals/select-folder.tpl
index 5b011a1668..208b96ebf2 100644
--- a/client/res/templates/email-account/modals/select-folder.tpl
+++ b/client/res/templates/email-account/modals/select-folder.tpl
@@ -4,7 +4,7 @@
{{#each folders}}
-
+
{{./this}}
diff --git a/client/res/templates/email-folder/modals/select-folder.tpl b/client/res/templates/email-folder/modals/select-folder.tpl
index f94b17b9cc..761fc17b38 100644
--- a/client/res/templates/email-folder/modals/select-folder.tpl
+++ b/client/res/templates/email-folder/modals/select-folder.tpl
@@ -1,10 +1,10 @@
\ No newline at end of file
+
diff --git a/client/res/templates/external-account/index.tpl b/client/res/templates/external-account/index.tpl
index 51e545a4d6..e035bed8a5 100644
--- a/client/res/templates/external-account/index.tpl
+++ b/client/res/templates/external-account/index.tpl
@@ -4,7 +4,7 @@
diff --git a/client/res/templates/fields/password/edit.tpl b/client/res/templates/fields/password/edit.tpl
index dba14a050d..dcf8a87e1e 100644
--- a/client/res/templates/fields/password/edit.tpl
+++ b/client/res/templates/fields/password/edit.tpl
@@ -1,6 +1,5 @@
-
{{#unless isNew}}
- {{translate 'change'}}
+{{translate 'change'}}
{{/unless}}
{{translate 'See more'}}
diff --git a/client/res/templates/fields/text/list.tpl b/client/res/templates/fields/text/list.tpl
index 5c585b80b4..c2ea2c5d16 100644
--- a/client/res/templates/fields/text/list.tpl
+++ b/client/res/templates/fields/text/list.tpl
@@ -8,7 +8,7 @@
{{#if isCut}}{{/if}}
{{/if}}
diff --git a/client/res/templates/global-search/panel.tpl b/client/res/templates/global-search/panel.tpl
index 6e6637d67a..0261286327 100644
--- a/client/res/templates/global-search/panel.tpl
+++ b/client/res/templates/global-search/panel.tpl
@@ -1,7 +1,7 @@
{{translate 'Global Search'}}
diff --git a/client/res/templates/header.tpl b/client/res/templates/header.tpl
index 16aa20df0e..3019368f33 100644
--- a/client/res/templates/header.tpl
+++ b/client/res/templates/header.tpl
@@ -6,7 +6,7 @@
-
\ No newline at end of file
+
diff --git a/client/res/templates/notification/badge.tpl b/client/res/templates/notification/badge.tpl
index 87f8edf759..85e2b0f3e7 100644
--- a/client/res/templates/notification/badge.tpl
+++ b/client/res/templates/notification/badge.tpl
@@ -1,4 +1,4 @@
-
+
diff --git a/client/res/templates/notification/fields/read-with-menu.tpl b/client/res/templates/notification/fields/read-with-menu.tpl
index a287ed4673..d369109c13 100644
--- a/client/res/templates/notification/fields/read-with-menu.tpl
+++ b/client/res/templates/notification/fields/read-with-menu.tpl
@@ -4,7 +4,7 @@
diff --git a/client/res/templates/notification/panel.tpl b/client/res/templates/notification/panel.tpl
index 1fe1810f59..b6654e6add 100644
--- a/client/res/templates/notification/panel.tpl
+++ b/client/res/templates/notification/panel.tpl
@@ -2,8 +2,8 @@
{{translate 'Notifications'}}
diff --git a/client/res/templates/record/bottom.tpl b/client/res/templates/record/bottom.tpl
index 22852cb5df..4e5d460e93 100644
--- a/client/res/templates/record/bottom.tpl
+++ b/client/res/templates/record/bottom.tpl
@@ -1,7 +1,7 @@
{{#each panelList}}
{{#if isRightAfterDelimiter}}
diff --git a/client/res/templates/record/detail.tpl b/client/res/templates/record/detail.tpl
index 0f8d423aaf..2fc8e05280 100644
--- a/client/res/templates/record/detail.tpl
+++ b/client/res/templates/record/detail.tpl
@@ -26,7 +26,7 @@
{{label}}
{{#if ../isCreatable}}
{{translate this category="massActions" scope=../scope}}
@@ -54,7 +54,7 @@