diff --git a/templates/AdminPages/EntityAdminBase.html.twig b/templates/AdminPages/EntityAdminBase.html.twig
index bb5f52ac..25c80466 100644
--- a/templates/AdminPages/EntityAdminBase.html.twig
+++ b/templates/AdminPages/EntityAdminBase.html.twig
@@ -152,7 +152,8 @@
 
                             {% if datatable is defined and datatable is not null %}
                                 <div id="history" class="tab-pane fade">
-                                    {% include "LogSystem/_log_table.html.twig" %}
+                                    {% import "components/history_log_macros.html.twig" as log %}
+                                    {{ log.element_history_component(datatable) }}
                                 </div>
                             {% endif %}
 
diff --git a/templates/LogSystem/_log_table.html.twig b/templates/LogSystem/_log_table.html.twig
deleted file mode 100644
index 60b2d4c7..00000000
--- a/templates/LogSystem/_log_table.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% import "components/datatables.macro.html.twig" as datatables %}
-
-<form method="post" action="{{ path("log_undo") }}"
-        {{ stimulus_controller('elements/delete_btn') }} {{ stimulus_action('elements/delete_btn', "submit", "submit") }}
-      data-delete-title="{% trans %}log.undo.confirm_title{% endtrans %}"
-      data-delete-message="{% trans %}log.undo.confirm_message{% endtrans %}">
-    <input type="hidden" name="redirect_back" value="{{ app.request.uri }}">
-
-    {{ datatables.logDataTable(datatable) }}
-
-</form>
\ No newline at end of file
diff --git a/templates/LogSystem/log_list.html.twig b/templates/LogSystem/log_list.html.twig
index 9bacfa0c..d2d8c479 100644
--- a/templates/LogSystem/log_list.html.twig
+++ b/templates/LogSystem/log_list.html.twig
@@ -51,5 +51,6 @@
         </div>
     </div>
 
-    {% include "LogSystem/_log_table.html.twig" %}
+    {% import "components/history_log_macros.html.twig" as log %}
+    {{ log.system_log_component(datatable) }}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/Parts/info/_history.html.twig b/templates/Parts/info/_history.html.twig
index 390a007f..7351a3c5 100644
--- a/templates/Parts/info/_history.html.twig
+++ b/templates/Parts/info/_history.html.twig
@@ -1,5 +1,6 @@
 <div class="mt-2">
     {% if datatable is not null %}
-        {% include "LogSystem/_log_table.html.twig" %}
+        {% import "components/history_log_macros.html.twig" as log %}
+        {{ log.element_history_component(datatable) }}
     {% endif %}
 </div>
\ No newline at end of file
diff --git a/templates/Users/user_info.html.twig b/templates/Users/user_info.html.twig
index 4360b775..5afe3581 100644
--- a/templates/Users/user_info.html.twig
+++ b/templates/Users/user_info.html.twig
@@ -75,7 +75,8 @@
 
     <div class="mt-2">
     {% if datatable is defined and datatable is not null %}
-        {% include "LogSystem/_log_table.html.twig" %}
+        {% import "components/history_log_macros.html.twig" as log %}
+        {{ log.element_history_component(datatable) }}
     {% endif %}
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/components/datatables.macro.html.twig b/templates/components/datatables.macro.html.twig
index 9061a514..8299529e 100644
--- a/templates/components/datatables.macro.html.twig
+++ b/templates/components/datatables.macro.html.twig
@@ -13,8 +13,8 @@
     </div>
 {% endmacro %}
 
-{% macro logDataTable(dt) %}
-    {{ _self.datatable(dt, 'elements/datatables/log') }}
+{% macro logDataTable(dt, state_save_tag = null) %}
+    {{ _self.datatable(dt, 'elements/datatables/log', state_save_tag) }}
 {% endmacro %}
 
 {% macro partsDatatableWithForm(datatable, state_save_tag = 'parts') %}
diff --git a/templates/components/history_log_macros.html.twig b/templates/components/history_log_macros.html.twig
new file mode 100644
index 00000000..2911977a
--- /dev/null
+++ b/templates/components/history_log_macros.html.twig
@@ -0,0 +1,24 @@
+{% macro last_activity_component(datatable) %}
+    {{ _self.log_component(datatable, 'last_activity') }}
+{% endmacro %}
+
+{% macro element_history_component(datatable) %}
+    {{ _self.log_component(datatable, 'element_history') }}
+{% endmacro %}
+
+{% macro system_log_component(datatable) %}
+    {{ _self.log_component(datatable, 'system_log') }}
+{% endmacro %}
+
+{% macro log_component(datatable, tag = null) %}
+    {% import "components/datatables.macro.html.twig" as datatables %}
+
+    <form method="post" action="{{ path("log_undo") }}"
+            {{ stimulus_controller('elements/delete_btn') }} {{ stimulus_action('elements/delete_btn', "submit", "submit") }}
+          data-delete-title="{% trans %}log.undo.confirm_title{% endtrans %}"
+          data-delete-message="{% trans %}log.undo.confirm_message{% endtrans %}">
+        <input type="hidden" name="redirect_back" value="{{ app.request.uri }}">
+
+        {{ datatables.logDataTable(datatable, tag) }}
+    </form>
+{% endmacro %}
\ No newline at end of file
diff --git a/templates/homepage.html.twig b/templates/homepage.html.twig
index 1015d4b8..e00f1bf4 100644
--- a/templates/homepage.html.twig
+++ b/templates/homepage.html.twig
@@ -44,7 +44,8 @@
     <div class="card mt-3">
         <div class="card-header"><i class="fas fa-fw fa-history"></i> {% trans %}homepage.last_activity{% endtrans %}</div>
         <div class="card-body">
-            {% include "LogSystem/_log_table.html.twig" %}
+            {% import "components/history_log_macros.html.twig" as log %}
+            {{ log.last_activity_component(datatable) }}
         </div>
     </div>
     {% endif %}