diff --git a/templates/_macro/_macro.html.twig b/templates/_macro/_macro.html.twig
index 406e9023d..242969aef 100644
--- a/templates/_macro/_macro.html.twig
+++ b/templates/_macro/_macro.html.twig
@@ -74,3 +74,10 @@
     {% endfor %}
     {{ fieldsHtml|json_encode }}
 {% endapply %}{% endmacro %}
+
+
+{% macro relative_datetime(datetime) %}{% apply spaceless %}
+    <abbr class="datetime-relative" title="{{ datetime|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
+        {{- datetime|date('c') -}}
+    </abbr>
+{% endapply %}{% endmacro %}
diff --git a/templates/_partials/fields/date.html.twig b/templates/_partials/fields/date.html.twig
index 9de1e0e5e..3c6b1527b 100644
--- a/templates/_partials/fields/date.html.twig
+++ b/templates/_partials/fields/date.html.twig
@@ -1,4 +1,5 @@
 {% extends '@bolt/_partials/fields/_base.html.twig' %}
+{% import '@bolt/_macro/_macro.html.twig' as macro %}
 
 {% block field %}
   {# check disabled #}
@@ -36,10 +37,8 @@
   ></editor-date>
   {% else %}
       <br>
-    {{ value|localedatetime('%B %e, %Y - %k:%M<small>%p</small>') }}
-      <small>(<abbr class="datetime-relative" title="{{ value|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
-          {{- value|date('c') -}}
-          </abbr>)</small>
+    {{ value|localedatetime('%B %e, %Y - %H:%M<small>%p</small>') }}
+      <small>({{ macro.relative_datetime(value) }})</small>
   {% endif %}
   
 {% endblock %}
diff --git a/templates/content/_buttons.html.twig b/templates/content/_buttons.html.twig
index d6357e92e..8f69ca087 100644
--- a/templates/content/_buttons.html.twig
+++ b/templates/content/_buttons.html.twig
@@ -23,10 +23,7 @@
             <span class="status mx-1 is-{{ record.status}}"></span>{{ __('status.' ~ record.status) }}<br>
             {% if record.status == 'published' %}
                 <small>
-                    ({{ 'field.modifiedAt'|trans }}:
-                    <abbr class="datetime-relative" title="{{ record.modifiedAt|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
-                        {{- record.modifiedAt|date('c') -}}
-                    </abbr>)
+                    ({{ 'field.modifiedAt'|trans }}: {{ macro.relative_datetime(record.modifiedAt) }}                    )
                 </small>
             {% endif %}
         </p>
diff --git a/templates/users/listing.html.twig b/templates/users/listing.html.twig
index f0de8407e..beb27c2d6 100644
--- a/templates/users/listing.html.twig
+++ b/templates/users/listing.html.twig
@@ -36,9 +36,7 @@
             <td><code>{{ iteratedUser.roles|join('</code>, <code>')|raw }}</code></td>
             {% if iteratedUser.lastseenAt %}
                 <td>
-                    <abbr class="datetime-relative" title="{{ iteratedUser.lastseenAt|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
-                        {{- iteratedUser.lastseenAt|date("c") -}}
-                    </abbr>
+                    {{ macro.relative_datetime(iteratedUser.lastseenAt) }}
                 </td>
             {% else %}
                 <td>-</td>
@@ -83,14 +81,10 @@
                         <td class="text-nowrap">{{ iteratedUser.id }}</td>
                         <td class="text-nowrap">{{ iteratedUser.username }}</td>
                         <td>
-                            <abbr class="datetime-relative" title="{{ iteratedUser.lastseenAt|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
-                                {{- iteratedUser.lastseenAt|date("c") -}}
-                            </abbr>
+                            {{ macro.relative_datetime(iteratedUser.lastseenAt) }}
                         </td>
                         <td>
-                            <abbr class="datetime-relative" title="{{ authtoken.validity|localedatetime('%A %B %e, %Y - %k:%M%p') }}">
-                                {{- authtoken.validity|date("c") -}}
-                            </abbr>
+                            {{ macro.relative_datetime(authtoken.validity) }}
                         </td>
                         <td class="text-nowrap"><code>{{ iteratedUser.lastIp|default('-') }}</code></td>
                         <td>{{ authtoken.useragent|default('-') }}</td>