diff --git a/templates/base/components/panel/layout.html.twig b/templates/base/components/panel/layout.html.twig
index ddc916f92..fbcfc7039 100644
--- a/templates/base/components/panel/layout.html.twig
+++ b/templates/base/components/panel/layout.html.twig
@@ -1,6 +1,5 @@
 {# @copyright   Copyright (C) 2010-2021 Combodo SARL #}
 {# @license     http://opensource.org/licenses/AGPL-3.0 #}
-{% apply spaceless %}
     <div id="{{ oUIBlock.GetId() }}"
          class="{{ oUIBlock.GetBlocksInheritanceCSSClassesAsString() }} {{ oUIBlock.GetAdditionalCSSClassesAsString() }} {{ oUIBlock.GetCSSColorClass() }} {% if oUIBlock.HasIcon() %}ibo-has-icon{% endif %} {% if oUIBlock.IsIconAsMedallion() %}ibo-has-medallion-icon{% endif %} {% if oUIBlock.IsHidden() %}ibo-is-hidden{% endif %} ibo-is-opened"
             {% block iboPanelMetaData %}{% endblock %}
@@ -56,5 +55,4 @@
                 {% endfor %}
             {% endblock %}
         </div>
-    </div>
-{% endapply %}
\ No newline at end of file
+    </div>
\ No newline at end of file
diff --git a/templates/base/layouts/activity-panel/activity-entry/layout.html.twig b/templates/base/layouts/activity-panel/activity-entry/layout.html.twig
index c8dbf3326..bae577579 100644
--- a/templates/base/layouts/activity-panel/activity-entry/layout.html.twig
+++ b/templates/base/layouts/activity-panel/activity-entry/layout.html.twig
@@ -1,4 +1,3 @@
-{% apply spaceless %}
 <div class="{{ oUIBlock.GetBlocksInheritanceCSSClassesAsString() }} {{ oUIBlock.GetAdditionalCSSClassesAsString() }} {% if oUIBlock.IsFromCurrentUser() %}ibo-is-current-user{% endif %} {% block iboActivityEntryExtraClasses %}{% endblock %}"
      data-role="ibo-activity-entry"
      data-entry-type="{% block iboActivityEntryType %}{{ oUIBlock.GetType() }}{% endblock %}"
@@ -33,23 +32,24 @@
 				</div>
 			</div>
 			<div class="ibo-activity-entry--sub-information" data-role="ibo-activity-entry--sub-information">
-				{% block iboActivityEntrySubInformation %}
-                    {% if oUIBlock.GetOrigin() is not null and oUIBlock.GetOrigin != constant('Combodo\\iTop\\Core\\CMDBChange\\CMDBChangeOrigin::INTERACTIVE') %}
-                        <span class="ibo-activity-entry--origin" data-role="ibo-activity-entry--origin" data-tooltip-content="{{ ('Class:CMDBChange/Attribute:origin/Value:' ~ oUIBlock.GetOrigin())|dict_s }}" data-tooltip-placement="bottom">
-                            <span class="{{ oUIBlock.GetOriginDecorationClasses() }}"></span>
-                        </span>
-                    {% endif %}
-                    {% if get_config_parameter('activity_panel.show_author_name_below_entries') %}
-                        <span class="ibo-activity-entry--author-name ibo-is-hidden" data-role="ibo-activity-entry--author-name">{{ oUIBlock.GetAuthorFriendlyname() }}</span>
-                    {% endif %}
-                    <span class="ibo-activity-entry--datetime" data-role="ibo-activity-entry--datetime"
-                          data-tooltip-content="{{ oUIBlock.GetFormattedDateTime() }}"
-                          data-tooltip-placement="bottom"
-                          data-raw-datetime="{{ oUIBlock.GetRawDateTime() }}"
-                          data-formatted-datetime="{{ oUIBlock.GetFormattedDateTime() }}">{{ oUIBlock.GetFormattedDateTime() }}</span>
-                {% endblock %}
+                {% apply spaceless %}
+                    {% block iboActivityEntrySubInformation %}
+                        {% if oUIBlock.GetOrigin() is not null and oUIBlock.GetOrigin != constant('Combodo\\iTop\\Core\\CMDBChange\\CMDBChangeOrigin::INTERACTIVE') %}
+                            <span class="ibo-activity-entry--origin" data-role="ibo-activity-entry--origin" data-tooltip-content="{{ ('Class:CMDBChange/Attribute:origin/Value:' ~ oUIBlock.GetOrigin())|dict_s }}" data-tooltip-placement="bottom">
+                                <span class="{{ oUIBlock.GetOriginDecorationClasses() }}"></span>
+                            </span>
+                        {% endif %}
+                        {% if get_config_parameter('activity_panel.show_author_name_below_entries') %}
+                            <span class="ibo-activity-entry--author-name ibo-is-hidden" data-role="ibo-activity-entry--author-name">{{ oUIBlock.GetAuthorFriendlyname() }}</span>
+                        {% endif %}
+                        <span class="ibo-activity-entry--datetime" data-role="ibo-activity-entry--datetime"
+                              data-tooltip-content="{{ oUIBlock.GetFormattedDateTime() }}"
+                              data-tooltip-placement="bottom"
+                              data-raw-datetime="{{ oUIBlock.GetRawDateTime() }}"
+                              data-formatted-datetime="{{ oUIBlock.GetFormattedDateTime() }}">{{ oUIBlock.GetFormattedDateTime() }}</span>
+                    {% endblock %}
+                {% endapply %}
 			</div>
 		{% endblock %}
 	</div>
-</div>
-{% endapply %}
\ No newline at end of file
+</div>
\ No newline at end of file