diff --git a/lib/modules/CoreAdmin.php b/lib/modules/CoreAdmin.php
index 9cb09419153096700580fbeacecde66b794c1a21..8941cf24f06c00c747b9f32c3451afec63b536e9 100644
--- a/lib/modules/CoreAdmin.php
+++ b/lib/modules/CoreAdmin.php
@@ -137,15 +137,13 @@ class CoreAdmin extends CorePlugin implements StudipModule
     public function getMetadata()
     {
         return [
-            'displayname' => _('Verwaltung')
+            'displayname' => _('Verwaltung'),
+            'summary' => _('Verwaltung der Grunddaten, Zugangsberechtigungen und sonstigen Einstellungen'),
+            'icon' => Icon::create('admin', Icon::ROLE_INFO),
+            'icon_clickable' => Icon::create('admin')
         ];
     }
 
-    public function isActivatableForContext(Range $context)
-    {
-        return false;
-    }
-
     public function getInfoTemplate($course_id)
     {
         // TODO: Implement getInfoTemplate() method.
diff --git a/lib/navigation/CourseNavigation.php b/lib/navigation/CourseNavigation.php
index 59ca2b64d2c858e0e378d5612514168af1827400..f5d7f71d2194f3b7bb70ff93112f1b03259d2eb8 100644
--- a/lib/navigation/CourseNavigation.php
+++ b/lib/navigation/CourseNavigation.php
@@ -60,11 +60,7 @@ class CourseNavigation extends Navigation
         $where = null;
 
         foreach ($this->range->tools as $tool) {
-            if (
-                $found
-                && $tool->metadata['navigation']
-                && $tool->metadata['navigation'] !== 'admin'
-            ) {
+            if ($found && $tool->metadata['navigation']) {
                 $where = $tool->metadata['navigation'];
                 break;
             }
@@ -75,11 +71,6 @@ class CourseNavigation extends Navigation
             }
         }
 
-        // always insert admin module in first position
-        if (key($navigations) === 'admin') {
-            $where = key($this->getSubNavigation());
-        }
-
         foreach ($navigations as $key => $nav) {
             if (
                 $this->range instanceof Institute