diff --git a/core/Resources/views/admin/crud/field/button.html.twig b/core/Resources/views/admin/crud/field/button.html.twig
index 969ccf7..7f3ad4d 100644
--- a/core/Resources/views/admin/crud/field/button.html.twig
+++ b/core/Resources/views/admin/crud/field/button.html.twig
@@ -1 +1,7 @@
-<{{ options.button_tag }} {% for k, v in options.button_attr %}{{ k }}="{{ v }}"{% endfor %}>{% if options.raw %}{{ value|raw }}{% else %}{{ value|trans }}{% endif %}</{{  options.button_tag }}>
+{% extends '@Core/admin/crud/field/text.html.twig' %}
+
+{%- block value -%}
+    <{{- options.button_tag }} {% for k, v in options.button_attr %}{{ k }}="{{ v }}" {% endfor %}>
+        {{- parent() -}}
+    </{{- options.button_tag -}}>
+{%- endblock -%}
diff --git a/core/Resources/views/admin/crud/field/date.html.twig b/core/Resources/views/admin/crud/field/date.html.twig
index c1daaa0..f336616 100644
--- a/core/Resources/views/admin/crud/field/date.html.twig
+++ b/core/Resources/views/admin/crud/field/date.html.twig
@@ -1,6 +1,8 @@
-{% if value %}
-    <span class="btn btn-sm btn-light">
-        <span class="fa fa-calendar-alt text-black-50 mr-1"></span>
-        {{ value|date(options.format) }}
-    </span>
-{% endif %}
+{%- block value -%}
+    {%- if value -%}
+        <span class="btn btn-sm btn-light">
+            <span class="fa fa-calendar-alt text-black-50 mr-2"></span>
+            {{- value|date(options.format) -}}
+        </span>
+    {%- endif -%}
+{%- endblock -%}
diff --git a/core/Resources/views/admin/crud/field/image.html.twig b/core/Resources/views/admin/crud/field/image.html.twig
index 1efa29b..82b8e38 100644
--- a/core/Resources/views/admin/crud/field/image.html.twig
+++ b/core/Resources/views/admin/crud/field/image.html.twig
@@ -1 +1,3 @@
-<img {% for k, v in options.image_attr %}{{ k }}="{{ v }}"{% endfor %} src="{{ asset(value) }}">
+{%- block value -%}
+    <img {% for k, v in options.image_attr %}{{ k }}="{{ v }}" {% endfor %} src="{{ asset(value) }}">
+{%- endblock -%}
diff --git a/core/Resources/views/admin/crud/field/text.html.twig b/core/Resources/views/admin/crud/field/text.html.twig
index e9cf8ac..93377e2 100644
--- a/core/Resources/views/admin/crud/field/text.html.twig
+++ b/core/Resources/views/admin/crud/field/text.html.twig
@@ -1,2 +1,7 @@
-{% if options.raw %}{{ value|raw }}{% else %}{{ value|trans }}{% endif %}
-
+{%- block value -%}
+    {%- if options.raw -%}
+        {{- value|raw -}}
+    {%- else -%}
+        {{- value|trans -}}
+    {%- endif -%}
+{%- endblock -%}