diff --git a/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/TopnavItemViewHelper.php b/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/TopnavItemViewHelper.php
deleted file mode 100644
index b2ee4d5c..00000000
--- a/public/typo3conf/ext/ep_theme/Classes/ViewHelpers/TopnavItemViewHelper.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace EP\EpTheme\ViewHelpers;
-
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2018 Björn Fromme <fromme@dreipunktnull.com>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
-
-class TopnavItemViewHelper extends AbstractViewHelper
-{
-    use CompileWithRenderStatic;
-
-    /**
-     * @var bool
-     */
-    protected $escapeOutput = false;
-
-    public function initializeArguments()
-    {
-        parent::initializeArguments();
-
-        $this->registerArgument('item', 'string', 'The navigation item');
-    }
-
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return mixed
-     */
-    public static function renderStatic(
-        array $arguments,
-        \Closure $renderChildrenClosure,
-        RenderingContextInterface $renderingContext
-    )
-    {
-        $item = $renderChildrenClosure();
-        if ($item === null) {
-            $item = $arguments['item'];
-        }
-        $parts = explode(' ', $item);
-        if (count($parts) === 1) {
-            return $item;
-        }
-        $hiddenMobileText = array_shift($parts);
-        $linkText = implode(' ', $parts);
-
-        return '<span class="hidden-md">' . $hiddenMobileText . '</span> ' . $linkText;
-    }
-
-}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Topnav.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Topnav.html
index 71c8ac45..83b511d2 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Topnav.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Topnav.html
@@ -13,10 +13,10 @@
                             </svg>
                         </f:link.typolink>
                         <f:for each="{topnav}" as="menuitem">
-                            <a class="block flex flex-grow h-8 justify-center items-center uppercase text-sm leading-none text-white hover:text-white focus:text-white hover:bg-ep-secondary{f:if(condition: menuitem.tx_eptheme_navitemclass, then: ' {menuitem.tx_eptheme_navitemclass}')}{f:if(condition: '{menuitem.active} or {menuitem.data.uid} == {settings.forceActiveTopnavUid}', then: ' bg-ep-secondary')}"
+                            <a class="block flex flex-grow h-8 justify-center items-center uppercase text-sm leading-none text-white hover:text-white focus:text-white hover:bg-ep-secondary{f:if(condition: menuitem.data.tx_eptheme_navitemclass, then: ' {menuitem.data.tx_eptheme_navitemclass}')}{f:if(condition: '{menuitem.active} or {menuitem.data.uid} == {settings.forceActiveTopnavUid}', then: ' bg-ep-secondary')}"
                                href="{menuitem.link}"{f:if(condition: '{menuitem.data.doktype} == 3', then: ' target="_blank"')}
                                title="{menuitem.title}">
-                                {menuitem.title -> ep:topnavItem()}
+                                {menuitem.title}
                             </a>
                         </f:for>
                         <f:if condition="{settings.myEpPageUid}">