diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index d37a8bbabbe892212d4b4c071e1a3c6e2fe19007..8cc235bf81824c5444fd424079b04f342fd7cee4 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -80,9 +80,9 @@ class TemplateLayout extends \OC_Template {
 			// Add navigation entry
 			$this->assign( 'application', '');
 			$this->assign( 'appid', $appId );
-			$navigation = \OC_App::getNavigation();
+			$navigation = \OC::$server->getNavigationManager()->getAll();
 			$this->assign( 'navigation', $navigation);
-			$settingsNavigation = \OC_App::getSettingsNavigation();
+			$settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings');
 			$this->assign( 'settingsnavigation', $settingsNavigation);
 			foreach($navigation as $entry) {
 				if ($entry['active']) {
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 6102de73693eee46aadacb9f4e9d211b20e486cb..cb2d3ca615fe04d92c319e6feabcd7afb7505ee6 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -586,6 +586,7 @@ class OC_App {
 	 * Returns the navigation
 	 *
 	 * @return array
+	 * @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll()
 	 *
 	 * This function returns an array containing all entries added. The
 	 * entries are sorted by the key 'order' ascending. Additional to the keys
@@ -600,6 +601,7 @@ class OC_App {
 	 * Returns the Settings Navigation
 	 *
 	 * @return string[]
+	 * @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll('settings')
 	 *
 	 * This function returns an array containing all settings pages added. The
 	 * entries are sorted by the key 'order' ascending.
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index 167f819f91e4668d5a93cfe93b85d40c3273537b..043e10da559de6b551a2ddfd200653cdb75d3717 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -23,6 +23,6 @@
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-$navigation = \OC_App::getNavigation();
+$navigation = \OC::$server->getNavigationManager()->getAll();
 
 OCP\JSON::success(['nav_entries' => $navigation]);