diff --git a/client/res/templates/fields/date/detail.tpl b/client/res/templates/fields/date/detail.tpl
index 21a7b01fdf..fba3a359e4 100644
--- a/client/res/templates/fields/date/detail.tpl
+++ b/client/res/templates/fields/date/detail.tpl
@@ -3,12 +3,12 @@
{{#if titleDateValue}}title="{{titleDateValue}}"{{/if}}
class="{{#if style}} text-{{style}} {{/if}} {{#if useNumericFormat}} numeric-text {{/if}}"
>{{dateValue}}
-{{~/if}}
+{{~/if~}}
-{{#if isNone}}
+{{~#if isNone}}
{{translate 'None'}}
-{{/if}}
+{{/if~}}
-{{#if isLoading}}
+{{~#if isLoading}}
-{{/if}}
+{{/if~}}
diff --git a/client/src/views/fields/complex-created.js b/client/src/views/fields/complex-created.js
index 8c8ee2d56d..b063558a10 100644
--- a/client/src/views/fields/complex-created.js
+++ b/client/src/views/fields/complex-created.js
@@ -31,10 +31,17 @@ import BaseFieldView from 'views/fields/base';
class ComplexCreatedFieldView extends BaseFieldView {
// language=Handlebars
- detailTemplateContent =
- `{{#if hasAt}}{{{atField}}}{{/if}}
- {{#if hasBoth}}{{/if}}
- {{#if hasBy}}{{{byField}}}{{/if}}`
+ detailTemplateContent = `
+ {{~#if hasAt~}}
+ {{{atField}}}
+ {{~/if~}}
+ {{~#if hasBoth~}}
+
+ {{~/if~}}
+ {{~#if hasBy~}}
+ {{{byField}}}
+ {{~/if~}}
+ `
baseName = 'created'
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index f51255222b..04f18c7fb8 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -134,7 +134,9 @@ img.image-preview {
content: "\00B7";
display: inline-block;
}
+
padding: 0 0.1em;
+ user-select: none;
}
.page-header {