diff --git a/Resources/views/Person/create_review.html.twig b/Resources/views/Person/create_review.html.twig
index c8dd64455..cca78758b 100644
--- a/Resources/views/Person/create_review.html.twig
+++ b/Resources/views/Person/create_review.html.twig
@@ -44,11 +44,11 @@
                             <tr>
                                 <td>
                                     <a href="{{ path('chill_person_view', {'person_id': person.id } ) }}">
-                                        {{ person|chill_entity_render_string }}{% spaceless %}
+                                        {{ person|chill_entity_render_string }}{% apply spaceless %}
                                             {% if person.isOpen == false %}
                                                 <i class="icon-lock"></i>
                                             {% endif %}
-                                        {% endspaceless %}
+                                        {% endapply %}
                                     </a>
                                 </td>
                                 <td>{% if person.birthdate is not null %}{{ person.birthdate|localizeddate('long', 'none', app.request.locale) }}{% else %}&nbsp;{% endif %}</td>
diff --git a/Resources/views/Person/list.html.twig b/Resources/views/Person/list.html.twig
index 3b309eb0d..e4f2896c2 100644
--- a/Resources/views/Person/list.html.twig
+++ b/Resources/views/Person/list.html.twig
@@ -43,7 +43,7 @@
                       {% set is_open = person.isOpen() %}
                       <a href="{{ path('chill_person_view', { person_id : person.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
                             {{ person|chill_entity_render_box }}
-                            {% spaceless %}
+                            {% apply spaceless %}
                                 {% if chill_person.fields.accompanying_period == 'visible' %}
                                   {% if is_open == false %}
                                   <i class="fa fa-lock" ></i>
@@ -51,7 +51,7 @@
                                   <i class="fa fa-unlock" ></i>
                                   {% endif %}
                                 {% endif %}
-                            {% endspaceless %}
+                            {% endapply %}
                         </a>
                     </td>
                     <td>
diff --git a/Resources/views/Person/list_by_phonenumber.html.twig b/Resources/views/Person/list_by_phonenumber.html.twig
index f15a6906b..44444024b 100644
--- a/Resources/views/Person/list_by_phonenumber.html.twig
+++ b/Resources/views/Person/list_by_phonenumber.html.twig
@@ -43,7 +43,7 @@
                       {% set is_open = person.isOpen() %}
                       <a href="{{ path('chill_person_view', { person_id : person.getId }) }}" {% if chill_person.fields.accompanying_period == 'visible' %}{% if is_open %} alt="{{ 'An accompanying period is open'|trans|e('html_attr') }}"{% else %} alt="{{ 'Any accompanying periods are open'|trans|e('html_attr') }}" {% endif %}{% endif %}>
                             {{person.firstName}} {{person.lastName}}
-                            {% spaceless %}
+                            {% apply spaceless %}
                                 {% if chill_person.fields.accompanying_period == 'visible' %}
                                   {% if is_open == false %}
                                   <i class="fa fa-lock" ></i>
@@ -51,7 +51,7 @@
                                   <i class="fa fa-unlock" ></i>
                                   {% endif %}
                                 {% endif %}
-                            {% endspaceless %}
+                            {% endapply %}
                         </a>
                     </td>
                     <td>
diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig
index 1293dc5dc..3194f9dad 100644
--- a/Resources/views/Person/view.html.twig
+++ b/Resources/views/Person/view.html.twig
@@ -104,13 +104,13 @@ This view should receive those arguments:
                 {%- endif -%}
                 {%- if chill_person.fields.country_of_birth == 'visible' -%}
                 <dt>{{ 'Country of birth'|trans }}&nbsp;:</dt>
-                <dd>{% spaceless %}
+                <dd>{% apply spaceless %}
                     {% if person.countryOfBirth is not null %}
                         {{ person.countryOfBirth.name|localize_translatable_string }}
                     {% else %}
                         <span class="chill-no-data-statement">{{ 'Unknown country of birth'|trans }}</span>
                     {% endif %}
-                {% endspaceless %}</dd>
+                {% endapply %}</dd>
                 {%- endif -%}
             </dl>
 
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 30028b54b..9f6339691 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -34,7 +34,7 @@
             <div class="grid-3">
                 <span class="open_sansbold">{{ 'File number'|trans|upper}}&nbsp;:</span> {{  person.id|upper }}
                                     &mdash;
-                <i class="fa  fa-{% spaceless %}
+                <i class="fa  fa-{% apply spaceless %}
                     {% if person.gender == "woman" %}
                        female
                     {%  elseif person.gender == "both" %}
@@ -42,7 +42,7 @@
                     {% else %}
                         male
                     {% endif %}
-                {% endspaceless %}"></i>
+                {% endapply %}"></i>
             </div> 
             <div class="grid-3">
                 <span class="open_sansbold">{{ 'Phonenumber'|trans|upper  }}&nbsp;:</span>