diff --git a/Resources/views/macros.html.twig b/Resources/views/macros.html.twig
index ff633767f..36443dea1 100644
--- a/Resources/views/macros.html.twig
+++ b/Resources/views/macros.html.twig
@@ -48,12 +48,10 @@
     {% spaceless %}
     <ul class="breadcrumb">
         {% for element in elements %}
-            <li{% if element['href'] == "" %} class="active"{% endif %}>
-                {% if element['href'] != "" %}
+            <li{% if loop.last %} class="active"{% endif %}>
+                {% if not loop.last %}
                     <a href="{{ element['href'] }}">{% if element['icon'] is defined %}<i class="{{ element['icon'] }}"></i> {% endif %}{{ element['name'] }}</a>
-                {% else %}
-                    {{ element['name'] }}
-                {% endif %}
+                {% else %}<span>{{ element['name'] }}</span>{% endif %}
             </li>
         {% endfor %}
     </ul>