diff --git a/resources/vue/components/responsive/NavigationItem.vue b/resources/vue/components/responsive/NavigationItem.vue
index c227771648c5de0e414305429b3e32efa1514361..0d164c233bf335db9e662f91739411d7f436c633 100644
--- a/resources/vue/components/responsive/NavigationItem.vue
+++ b/resources/vue/components/responsive/NavigationItem.vue
@@ -5,26 +5,34 @@
                 <a :href="item.url" :title="navigateToText(item.title)"
                    :aria-label="navigateToText(item.title)" tabindex="0">
                     <span class="navigation-icon">
-                        <studip-icon v-if="isCourse" shape="seminar" role="info_alt" size="24" alt=""></studip-icon>
-                        <img v-if="item.icon" :src="iconUrl" width="24" alt="">
+                        <studip-icon v-if="isCourse" shape="seminar" role="info_alt" :size="24" alt=""></studip-icon>
+                        <img v-if="item.icon" :src="iconUrl" width="24" alt="" />
                     </span>
                     <span class="navigation-text">
                         {{ item.title }}
                     </span>
                 </a>
             </div>
-            <button class="styleless navigation-in"
-                    :title="openNavigationText(item.title)"
-                    :aria-label="openNavigationText(item.title)"
-                    @click="moveTo(item.path)" @keydown.prevent.enter="moveTo(item.path)" @keydown.prevent.space="moveTo(item.path)">
-                <studip-icon shape="arr_1right" role="info_alt" size="20" alt=""></studip-icon>
+            <button
+                class="styleless navigation-in"
+                :title="openNavigationText(item.title)"
+                :aria-label="openNavigationText(item.title)"
+                @click="moveTo(item.path)"
+                @keydown.prevent.enter="moveTo(item.path)"
+                @keydown.prevent.space="moveTo(item.path)"
+            >
+                <studip-icon shape="arr_1right" role="info_alt" :size="20" alt=""></studip-icon>
             </button>
         </template>
         <div v-else class="navigation-title">
-            <a :href="item.url" tabindex="0" :title="navigateToText(item.title)"
-               :aria-label="navigateToText(item.title)">
-                <studip-icon v-if="isCourse" shape="seminar" role="info_alt" size="24" alt=""></studip-icon>
-                <img v-if="item.icon" :src="iconUrl" width="24" alt="">
+            <a
+                :href="item.url"
+                tabindex="0"
+                :title="navigateToText(item.title)"
+                :aria-label="navigateToText(item.title)"
+            >
+                <studip-icon v-if="isCourse" shape="seminar" role="info_alt" :size="24" alt=""></studip-icon>
+                <img v-if="item.icon" :src="iconUrl" width="24" alt="" />
                 {{ item.title }}
             </a>
         </div>
diff --git a/resources/vue/components/responsive/ResponsiveContentBar.vue b/resources/vue/components/responsive/ResponsiveContentBar.vue
index 0622bf64e9bf824eeee8a8ceb3e443c283d1e1b7..b40bdd8bb40a3eb0937304f23e024d0dd47ef718 100644
--- a/resources/vue/components/responsive/ResponsiveContentBar.vue
+++ b/resources/vue/components/responsive/ResponsiveContentBar.vue
@@ -8,12 +8,12 @@
                 <div v-if="hasSidebar" class="contentbar-nav" ref="leftNav">
                     <button :class="sidebarIconClasses" @click.prevent="toggleSidebar" id="toggle-sidebar"
                             :title="$gettext('Sidebar öffnen')">
-                        <studip-icon shape="sidebar3" size="24" ref="sidebarIcon"
+                        <studip-icon shape="sidebar3" :size="24" ref="sidebarIcon"
                                      alt=""></studip-icon>
                     </button>
                 </div>
                 <div class="contentbar-wrapper-left">
-                    <studip-icon :shape="icon" size="24" role="info" class="text-bottom contentbar-icon"></studip-icon>
+                    <studip-icon :shape="icon" :size="24" role="info" class="text-bottom contentbar-icon"></studip-icon>
                     <nav class="contentbar-breadcrumb" ref="breadcrumbs">
                         <span>{{ title }}</span>
                     </nav>
diff --git a/resources/vue/components/responsive/ResponsiveNavigation.vue b/resources/vue/components/responsive/ResponsiveNavigation.vue
index 81b6a4da3522b6a8d1549163abb8d8539a64bf9f..4151884b2900e1d0e275399e51cf4064b852171f 100644
--- a/resources/vue/components/responsive/ResponsiveNavigation.vue
+++ b/resources/vue/components/responsive/ResponsiveNavigation.vue
@@ -150,7 +150,8 @@ export default {
             iconSize: 28,
             showMenu: false,
             activeItem: this.navigation.activated.at(-1) ?? 'start',
-            currentNavigation: this.findItem(this.navigation.activated.at(0) ?? 'start', studipNavigation),
+            currentNavigation: this.findItem(this.navigation.activated.at(0) ?? 'start', studipNavigation)
+                ?? this.studipNavigation,
             initialNavigation: {},
             initialTitle: '',
             isAdmin: ['root','admin'].includes(this.me.perm),
@@ -259,7 +260,7 @@ export default {
                             return found;
 
                         }
-                        // No children left to search through, we are doomed.
+                    // No children left to search through, we are doomed.
                     } else {
                         return null;
                     }
@@ -345,7 +346,8 @@ export default {
          */
         moveTo(path) {
             this.avatarMenuOpen = false;
-            this.currentNavigation = this.findItem(path ? path : '/', this.studipNavigation);
+            this.currentNavigation =
+                this.findItem(path ? path : '/', this.studipNavigation) ?? this.studipNavigation;
             this.$nextTick(() => {
                 const current = document.querySelector('.navigation-current')
                     ? document.querySelector('.navigation-current .navigation-title button')