diff --git a/templates/macros/topmenu.html.twig b/templates/macros/topmenu.html.twig
index a3aa674..e9930e5 100644
--- a/templates/macros/topmenu.html.twig
+++ b/templates/macros/topmenu.html.twig
@@ -4,22 +4,10 @@
         {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
         {% if p.children.visible.count > 0 %}
             <li class="{{ current_page }}">
-                {% if p.routable == false %}
                 <a>
                     {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
-                    {{ p.menu }}
+                    <span>{{ p.menu }}{% if p.routable == false %}&nbsp;<i class="fa fa-angle-down"></i>{% endif %}</span>
                 </a>
-                {% elseif p.routable != false and p.children.count > 0 %}
-                <a>
-                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
-                    <span>{{ p.menu }}</span>
-                </a>
-                {% else %}
-                <a href="{{p.url}}">
-                    {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
-                    {{ p.menu }}
-                </a>
-                {% endif %}
                 <ul>
                     {{ macros.nav_loop(p) }}
                 </ul>
@@ -28,9 +16,9 @@
             <li class="{{ current_page }}">
                 <a href="{{ p.url }}">
                     {% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
-                    {{ p.menu }}
+                    <span>{{ p.menu }}</span>
                 </a>
             </li>
         {% endif %}
     {% endfor %}
-{% endmacro %}
\ No newline at end of file
+{% endmacro %}