diff --git a/lib/navigation/Navigation.php b/lib/navigation/Navigation.php
index 50ea94f71c4b2e1a2dc3005483f89baaf744caf9..3c02e86b31773c07b036b1b92108b3c5163d770f 100644
--- a/lib/navigation/Navigation.php
+++ b/lib/navigation/Navigation.php
@@ -352,38 +352,27 @@ class Navigation implements IteratorAggregate
     }
 
     /**
-     * Set the image of this navigation item. Additional HTML
-     * attributes can be passed using the $options parameter
-     * (like 'style' or 'onclick').
+     * Set the image of this navigation item.
      *
-     * @param Icon   $image            an instance of class Icon depicting this item
-     * @param array  $link_attributes  additional link attributes
+     * @param \Icon|null $image an instance of class Icon depicting this item
+     *                          or null to remove the image
      */
-    public function setImage(\Icon $image = null, $linkAttributes = [])
+    public function setImage(?\Icon $image)
     {
         $this->image = $image;
-        $this->link_attributes = array_merge(
-            $this->link_attributes,
-            $linkAttributes
-        );
     }
 
     /**
      * Set the image for the active state of this navigation item.
      * If no active image is set, the normal image is used for the
-     * active state. Additional HTML attributes can be passed using
-     * the $options parameter (like 'style' or 'onclick').
+     * active state.
      *
-     * @param Icon   $image            an instance of class Icon depicting this item
-     * @param array  $link_attributes  additional link attributes
+     * @param \Icon|null $image an instance of class Icon depicting this item
+     *                          or null to remove the image
      */
-    public function setActiveImage(\Icon $image = null, $linkAttributes = [])
+    public function setActiveImage(?\Icon $image)
     {
         $this->active_image = $image;
-        $this->link_attributes = array_merge(
-            $this->link_attributes,
-            $linkAttributes
-        );
     }
 
     /**
diff --git a/tests/unit/lib/classes/NavigationTest.php b/tests/unit/lib/classes/NavigationTest.php
index a90e386702fec84f9c80eb8e2097982e9c3b9a94..a67b355b2350eff6056010a486e45d562e77499c 100644
--- a/tests/unit/lib/classes/NavigationTest.php
+++ b/tests/unit/lib/classes/NavigationTest.php
@@ -44,14 +44,12 @@ class NavigationTest extends \Codeception\Test\Unit
         $navigation = new Navigation('test', 'foo.php');
         $this->assertNull($navigation->getImage());
 
-        $icon = Icon::create('foo', 'clickable');
-        $link_attrs = ['alt' => 'foo'];
+        $icon = Icon::create('foo', Icon::ROLE_CLICKABLE);
 
-        $navigation->setImage($icon, $link_attrs);
+        $navigation->setImage($icon);
 
         $this->assertTrue($navigation->isVisible(true));
         $this->assertEquals($icon, $navigation->getImage());
-        $this->assertEquals($link_attrs, $navigation->getLinkAttributes());
     }
 
     public function testActiveImage ()