diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php
index ec0cc7b..117e6ef 100644
--- a/lib/Controller/NavController.php
+++ b/lib/Controller/NavController.php
@@ -154,7 +154,7 @@ class NavController extends Controller
                 $items[$category]['apps'][$app['id']] = [
                     'name' => $app['name'],
                     'href' => $app['href'],
-                    'icon' => $app['previewAsIcon'] ? $app['preview'] : null,
+                    'icon' => $app['icon'],
                 ];
             }
         }
diff --git a/lib/Service/AppRepository.php b/lib/Service/AppRepository.php
index e893a48..736d4ec 100644
--- a/lib/Service/AppRepository.php
+++ b/lib/Service/AppRepository.php
@@ -42,11 +42,14 @@ class AppRepository
         foreach ($apps as $app) {
             $id = $app['id'];
 
-            if (isset($navigation[$id])) {
-                $app['name'] = $this->l10nFactory->get($app['id'])->t($app['name']);
-                $app['href'] = $navigation[$id]['href'];
+            foreach ([$app['id'], $app['id'].'_index'] as $id) {
+                if (isset($navigation[$id])) {
+                    $app['name'] = $this->l10nFactory->get($id)->t($app['name']);
+                    $app['href'] = $navigation[$id]['href'];
+                    $app['icon'] = $navigation[$id]['icon'];
 
-                $visibleApps[$id] = $app;
+                    $visibleApps[$id] = $app;
+                }
             }
         }
 
@@ -56,8 +59,7 @@ class AppRepository
                     'id' => $app['id'],
                     'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
                     'href' => $app['href'],
-                    'preview' => $app['icon'],
-                    'previewAsIcon' => true,
+                    'icon' => $app['icon'],
                     'category' => [
                         'external_links',
                     ],
@@ -67,8 +69,7 @@ class AppRepository
                     'id' => $app['id'],
                     'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
                     'href' => $app['href'],
-                    'preview' => $app['icon'],
-                    'previewAsIcon' => true,
+                    'icon' => $app['icon'],
                     'category' => [],
                 ];
             }