diff --git a/templates/macros/topmenu.html.twig b/templates/macros/topmenu.html.twig
index 80258a0..80319b5 100644
--- a/templates/macros/topmenu.html.twig
+++ b/templates/macros/topmenu.html.twig
@@ -8,10 +8,9 @@
           {% if p.header.icon %}
             <i class="fa fa-{{ p.header.icon }}"></i>
           {% endif %}
-          <span>{{ p.menu }}
+          {{ p.menu }}
             {% if p.routable ?? false %}&nbsp;<i class="fa fa-angle-down"></i>
             {% endif %}
-          </span>
         </a>
         <ul>
           {{ macros.nav_loop(p) }}
diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig
index 4308b93..776ed2a 100644
--- a/templates/partials/navigation.html.twig
+++ b/templates/partials/navigation.html.twig
@@ -10,7 +10,7 @@
           {% if mitem.icon %}
             <i class="fa fa-{{ mitem.icon }}"></i>
           {% endif %}
-          <span>{{ mitem.text }}</span>
+          {{ mitem.text }}
         </a>
       </li>
     {% endfor %}