diff --git a/templates/header.php b/templates/header.php
index 4b1d8ddedfcda187d7b629c23238efcbc3a660b8..73e37135ed851c49211b40c022e8c73d6717f1ba 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -190,7 +190,8 @@ if ($navigation) {
                         $action_menu->addLink(
                             URLHelper::getURL($subnav->getURL(), [], true),
                             $subnav->getTitle(),
-                            $subnav->getImage()
+                            $subnav->getImage(),
+                            $subnav->getLinkAttributes()
                         );
                     }
                     SkipLinks::addIndex(_('Profilmenü'), 'header_avatar_image_link', 1, false);
diff --git a/templates/shared/contentgroup-row.php b/templates/shared/contentgroup-row.php
index eecb35de56c8f920d4eab65df3f9e6fdb6b3ff37..a1052ab9d44394f5e826fe9983feddefd5350bfe 100644
--- a/templates/shared/contentgroup-row.php
+++ b/templates/shared/contentgroup-row.php
@@ -6,7 +6,7 @@
         <?= $image ?>
     </a>
     <div class="action-menu-content">
-    	<? if (!empty($label)): ?>
+        <? if (!empty($label)): ?>
         <div class="action-menu-title" aria-hidden="true">
             <?= htmlReady(_($label)) ?>
         </div>
@@ -19,7 +19,7 @@
 
                 <? if ($has_link_icons): ?>
                     <? if ($action['icon']): ?>
-                        <?= $action['icon'] ?>
+                        <?= $action['icon']->asImg(false, ['class' => 'action-menu-item-icon']) ?>
                     <? else: ?>
                         <span class="action-menu-no-icon"></span>
                     <? endif; ?>
@@ -29,7 +29,11 @@
             <? elseif ($action['type'] === 'button'): ?>
                 <label>
                 <? if ($action['icon']): ?>
-                    <?= $action['icon']->asInput(['name' => $action['name']]) ?>
+                    <?= $action['icon']->asInput(false, [
+                        'class' => 'action-menu-item-icon',
+                        'name'  => $action['name'],
+                        'title' => $action['label'],
+                    ]) ?>
                 <? else: ?>
                     <span class="action-menu-no-icon"></span>
                     <button type="submit" name="<?= htmlReady($action['name']) ?>" style="display: none;"></button>