diff --git a/Resources/Private/Partials/Analysis/ActionSwitcher.html b/Resources/Private/Partials/Analysis/ActionSwitcher.html
index 44ddc910..8eeb18e6 100644
--- a/Resources/Private/Partials/Analysis/ActionSwitcher.html
+++ b/Resources/Private/Partials/Analysis/ActionSwitcher.html
@@ -1,22 +1,40 @@
-<f:link.action action="dashboard" controller="Analysis" class="btn{lux:backend.getClassNameOnAction(onAction:'dashboard',view:view)}">
+<f:be.link
+    route="lux_LuxAnalysis"
+    parameters="{tx_lux_lux_luxanalysis:'{action:\'dashboard\',controller:\'Analysis\'}'}"
+    class="btn{lux:backend.getClassNameOnAction(onAction:'dashboard',view:view)}">
     <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.dashboard">dashboard</f:translate>
-</f:link.action>
-<f:link.action action="content" controller="Analysis" class="btn{lux:backend.getClassNameOnAction(onAction:'content',view:view)}">
+</f:be.link>
+<f:be.link
+    route="lux_LuxAnalysis"
+    parameters="{tx_lux_lux_luxanalysis:'{action:\'content\',controller:\'Analysis\'}'}"
+    class="btn{lux:backend.getClassNameOnAction(onAction:'content',view:view)}">
     <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.content">content</f:translate>
-</f:link.action>
+</f:be.link>
 <lux:condition.isNewsExtensionActivated>
-    <f:link.action action="news" controller="Analysis" class="btn{lux:backend.getClassNameOnAction(onAction:'news',view:view)}">
+    <f:be.link
+        route="lux_LuxAnalysis"
+        parameters="{tx_lux_lux_luxanalysis:'{action:\'news\',controller:\'Analysis\'}'}"
+        class="btn{lux:backend.getClassNameOnAction(onAction:'news',view:view)}">
         <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.news">news</f:translate>
-    </f:link.action>
+    </f:be.link>
 </lux:condition.isNewsExtensionActivated>
-<f:link.action action="utm" controller="Analysis" class="btn{lux:backend.getClassNameOnAction(onAction:'utm',view:view)}">
+<f:be.link
+    route="lux_LuxAnalysis"
+    parameters="{tx_lux_lux_luxanalysis:'{action:\'utm\',controller:\'Analysis\'}'}"
+    class="btn{lux:backend.getClassNameOnAction(onAction:'utm',view:view)}">
     <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.utm">UTM</f:translate>
-</f:link.action>
-<f:link.action action="linkListener" controller="Analysis" class="btn{lux:backend.getClassNameOnAction(onAction:'linkListener',view:view)}">
+</f:be.link>
+<f:be.link
+    route="lux_LuxAnalysis"
+    parameters="{tx_lux_lux_luxanalysis:'{action:\'linkListener\',controller:\'Analysis\'}'}"
+    class="btn{lux:backend.getClassNameOnAction(onAction:'linkListener',view:view)}">
     <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.linkListeners">Linklisteners</f:translate>
-</f:link.action>
+</f:be.link>
 <lux:condition.isSearchAvailable>
-    <f:link.action action="search" controller="Analysis" class="btn{lux:backend.getClassNameOnAction(onAction:'search',view:view)}">
+    <f:be.link
+        route="lux_LuxAnalysis"
+        parameters="{tx_lux_lux_luxanalysis:'{action:\'search\',controller:\'Analysis\'}'}"
+        class="btn{lux:backend.getClassNameOnAction(onAction:'search',view:view)}">
         <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.analysis.search">Search</f:translate>
-    </f:link.action>
+    </f:be.link>
 </lux:condition.isSearchAvailable>
diff --git a/Resources/Private/Partials/Lead/ActionSwitcher.html b/Resources/Private/Partials/Lead/ActionSwitcher.html
index 47002fc0..045eaff4 100644
--- a/Resources/Private/Partials/Lead/ActionSwitcher.html
+++ b/Resources/Private/Partials/Lead/ActionSwitcher.html
@@ -1,6 +1,12 @@
-<f:link.action action="dashboard" controller="Lead" class="btn{lux:backend.getClassNameOnAction(onAction:'dashboard',view:view)}">
+<f:be.link
+    route="lux_LuxLeads"
+    parameters="{tx_lux_lux_luxleads:'{action:\'dashboard\',controller:\'Lead\'}'}"
+    class="btn{lux:backend.getClassNameOnAction(onAction:'dashboard',view:view)}">
     <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.lead.dashboard">dashboard</f:translate>
-</f:link.action>
-<f:link.action action="list" controller="Lead" class="btn{lux:backend.getClassNameOnAction(onAction:'list',view:view)}">
+</f:be.link>
+<f:be.link
+    route="lux_LuxLeads"
+    parameters="{tx_lux_lux_luxleads:'{action:\'list\',controller:\'Lead\'}'}"
+    class="btn{lux:backend.getClassNameOnAction(onAction:'list',view:view)}">
     <f:translate key="LLL:EXT:lux/Resources/Private/Language/locallang_db.xlf:module.lead.list">list</f:translate>
-</f:link.action>
+</f:be.link>