diff --git a/inc/Menu/AbstractMenu.php b/inc/Menu/AbstractMenu.php
index b1f34a14a925ec550a4b985795935ca2799358fd..7680d2bacd3965d1fe908e063671f3cc0fc9d225 100644
--- a/inc/Menu/AbstractMenu.php
+++ b/inc/Menu/AbstractMenu.php
@@ -66,6 +66,7 @@ abstract class AbstractMenu {
      * output, use getItems() and build the HTML yourself
      *
      * @param string|false $classprefix create a class from type with this prefix, false for no class
+     * @return string
      */
     public function getListItems($classprefix = '') {
         $html = '';
@@ -80,6 +81,7 @@ abstract class AbstractMenu {
             $html .= $item->asHtmlLink(false);
             $html .= '</li>';
         }
+        return $html;
     }
 
 }
diff --git a/inc/Menu/Item/AbstractItem.php b/inc/Menu/Item/AbstractItem.php
index c999cb91944e227cccc85459aedee04609feaf48..f47cd0ef2e6ff16c24d93a5e8bf2d2f8829ad70e 100644
--- a/inc/Menu/Item/AbstractItem.php
+++ b/inc/Menu/Item/AbstractItem.php
@@ -34,7 +34,7 @@ abstract class AbstractItem {
     protected $nofollow    = true;
     protected $replacement = '';
     protected $category    = 'page';
-    protected $svg         = DOKU_BASE . 'lib/images/menu/00-default_checkbox-blank-circle-outline.svg';
+    protected $svg         = DOKU_INC . 'lib/images/menu/00-default_checkbox-blank-circle-outline.svg';
     protected $label       = '';
     protected $context     = self::CTX_ALL;
 
diff --git a/inc/Menu/Item/Backlink.php b/inc/Menu/Item/Backlink.php
index 5d4901753e34fa7886f26d0632dc6998783740b4..3a39426fc2ef562683aa26f378a4917e8bafd30c 100644
--- a/inc/Menu/Item/Backlink.php
+++ b/inc/Menu/Item/Backlink.php
@@ -4,6 +4,6 @@ namespace dokuwiki\Menu\Item;
 
 class Backlink extends AbstractItem {
 
-    protected $svg = DOKU_BASE . 'lib/images/menu/08-backlink_link-variant.svg';
+    protected $svg = DOKU_INC . 'lib/images/menu/08-backlink_link-variant.svg';
 
 }
diff --git a/inc/Menu/Item/Edit.php b/inc/Menu/Item/Edit.php
index 45a05eb1e1b95b0ce7855f910a7a9e16d40c57f1..eb9705673555995b5fdc76fd797ba63999b12067 100644
--- a/inc/Menu/Item/Edit.php
+++ b/inc/Menu/Item/Edit.php
@@ -52,7 +52,7 @@ class Edit extends AbstractItem {
             'source' => '05-source_file-xml.svg',
         );
         if(isset($icons[$this->type])) {
-            $this->svg = DOKU_BASE . 'lib/images/menu/' . $icons[$this->type];
+            $this->svg = DOKU_INC . 'lib/images/menu/' . $icons[$this->type];
         }
     }
 
diff --git a/inc/Menu/Item/ImgBackto.php b/inc/Menu/Item/ImgBackto.php
index 79fda098a7dcc7a824bf10c285c78cfc80d0a192..0d5f726f2f3affaf840538cee01336ea28fd01c3 100644
--- a/inc/Menu/Item/ImgBackto.php
+++ b/inc/Menu/Item/ImgBackto.php
@@ -9,7 +9,7 @@ class ImgBackto extends AbstractItem {
         global $ID;
         parent::__construct();
 
-        $this->svg = DOKU_BASE . 'lib/images/menu/12-back_arrow-left.svg';
+        $this->svg = DOKU_INC . 'lib/images/menu/12-back_arrow-left.svg';
         $this->type = 'img_backto';
         $this->params = array();
         $this->accesskey = 'b';
diff --git a/inc/Menu/Item/MediaManager.php b/inc/Menu/Item/MediaManager.php
index e8a44e0f3f0e4874b2cb687213871d4ae8feddb4..eef9ec581b8aacc0ed22d6d19cf3fa639d1496b4 100644
--- a/inc/Menu/Item/MediaManager.php
+++ b/inc/Menu/Item/MediaManager.php
@@ -4,7 +4,7 @@ namespace dokuwiki\Menu\Item;
 
 class MediaManager extends AbstractItem {
 
-    protected $svg = DOKU_BASE . 'lib/images/menu/11-mediamanager_folder-image.svg';
+    protected $svg = DOKU_INC . 'lib/images/menu/11-mediamanager_folder-image.svg';
 
     /** @inheritdoc */
     public function __construct() {
diff --git a/inc/Menu/Item/Revert.php b/inc/Menu/Item/Revert.php
index d1fc8f34c266bb051001b4753c19fb237616bc08..83072e4698ba45dcaa56b41bcce0bbd0e48622fa 100644
--- a/inc/Menu/Item/Revert.php
+++ b/inc/Menu/Item/Revert.php
@@ -15,7 +15,7 @@ class Revert extends AbstractItem {
         }
         $this->params['rev'] = $REV;
         $this->params['sectok'] = getSecurityToken();
-        $this->svg = DOKU_BASE . 'lib/images/menu/06-revert_replay.svg';
+        $this->svg = DOKU_INC . 'lib/images/menu/06-revert_replay.svg';
     }
 
 }
diff --git a/inc/Menu/Item/Revisions.php b/inc/Menu/Item/Revisions.php
index 415eaddd7f17a6ddc9dddd6fc0af1b3791fc1eba..63b0b94a5d3fc4f7da20d6d24503e723f02f77be 100644
--- a/inc/Menu/Item/Revisions.php
+++ b/inc/Menu/Item/Revisions.php
@@ -10,7 +10,7 @@ class Revisions extends AbstractItem {
 
         $this->type = 'revs';
         $this->params['do'] = 'revs';
-        $this->svg = DOKU_BASE . 'lib/images/menu/07-revisions_history.svg';
+        $this->svg = DOKU_INC . 'lib/images/menu/07-revisions_history.svg';
     }
 
 }
diff --git a/inc/Menu/Item/Subscribe.php b/inc/Menu/Item/Subscribe.php
index b2c2492f94cda590239d59b546edb9d5b411995a..f71414adea5d35067299d6b8d4590a22dd27d1da 100644
--- a/inc/Menu/Item/Subscribe.php
+++ b/inc/Menu/Item/Subscribe.php
@@ -4,7 +4,7 @@ namespace dokuwiki\Menu\Item;
 
 class Subscribe extends AbstractItem {
 
-    protected $svg = DOKU_BASE . 'lib/images/menu/09-subscribe_email-outline.svg';
+    protected $svg = DOKU_INC . 'lib/images/menu/09-subscribe_email-outline.svg';
 
     /** @inheritdoc */
     public function __construct() {
diff --git a/inc/Menu/Item/Top.php b/inc/Menu/Item/Top.php
index 7d67fd4ba9083be1546be1b1fc2e159f2150ce52..6c5307e452e32f9f1d740218e1144fe4c06ef4a2 100644
--- a/inc/Menu/Item/Top.php
+++ b/inc/Menu/Item/Top.php
@@ -4,7 +4,7 @@ namespace dokuwiki\Menu\Item;
 
 class Top extends AbstractItem {
 
-    protected $svg       = DOKU_BASE . 'lib/images/menu/10-top_arrow-up.svg';
+    protected $svg       = DOKU_INC . 'lib/images/menu/10-top_arrow-up.svg';
     protected $accesskey = 't';
     protected $params    = array('do' => '');
     protected $id        = '#dokuwiki__top';