diff --git a/application/layouts/scripts/pdf.phtml b/application/layouts/scripts/pdf.phtml
index 38c9bdc2c..c5b28ecbf 100644
--- a/application/layouts/scripts/pdf.phtml
+++ b/application/layouts/scripts/pdf.phtml
@@ -31,7 +31,7 @@ if ( isset($pdf) )
 }
 
 </script>
-<?= $this->img('img/logo_icinga_big_dark.png', array('align' => 'right', 'width' => '75')) ?>
+<?= $this->img('img/logo_icinga_big_dark.png', null, array('align' => 'right', 'width' => '75')) ?>
 <!--<div id="page-header">
   <table>
     <tr>
diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index f40f5c4e0..4b1de3961 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -7,7 +7,7 @@
   <div class="form" data-base-target="layout">
     <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
     <?php if ($requiresSetup): ?>
-    <p tabindex="0" class="config-note"><?= sprintf(
+    <p class="config-note"><?= sprintf(
       $this->translate(
         'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
         . 'authentication method. Please define a authentication method by following the instructions in the'
@@ -18,7 +18,7 @@
       '</a>'
     ); ?></p>
     <?php elseif ($requiresExternalAuth): ?>
-    <p tabindex="0" class="info-box"><i aria-hidden="true" class="icon-info"></i><?= $this->translate(
+    <p class="info-box"><?= $this->icon('icon-info'); ?><?= $this->translate(
       'You\'re currently not authenticated using any of the web server\'s authentication mechanisms.'
       . ' Make sure you\'ll configure such, otherwise you\'ll not be able to login.'
     ); ?></p>
diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index a31062025..ad0d0ebc5 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -21,7 +21,7 @@
   </h2>
   <p>
     <a href="<?= $this->href('/config/createAuthenticationBackend'); ?>">
-      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?><?= $this->translate('Create A New Authentication Backend'); ?>
+      <?= $this->icon('plus'); ?><?= $this->translate('Create A New Authentication Backend'); ?>
     </a>
   </p>
   <h2 tabindex="0" id="authentication-reorder" class="sr-only">
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 013dfed19..12c9cf6ce 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -21,7 +21,7 @@
   </h2>
   <p>
     <a href="<?= $this->href('/config/createresource'); ?>">
-      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?>
+      <?= $this->icon('plus'); ?> <?= $this->translate('Create A New Resource'); ?>
     </a>
   </p>
   <h2 tabindex="0" id="resource-edit-resource" class="sr-only">
diff --git a/library/Icinga/Web/Form/Decorator/NoScriptApply.php b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
index 2ea810e16..fbc96756b 100644
--- a/library/Icinga/Web/Form/Decorator/NoScriptApply.php
+++ b/library/Icinga/Web/Form/Decorator/NoScriptApply.php
@@ -25,7 +25,7 @@ class NoScriptApply extends Zend_Form_Decorator_Abstract
     {
         if ($content) {
             $content .= '<noscript><button name="noscript_apply" style="margin-left: 0.5em;" type="submit" value="1">'
-                . Icinga::app()->getViewRenderer()->view->icon('refresh.png', null, array('aria-hidden' => 'true')) . '&nbsp;' . t('Apply')
+                . Icinga::app()->getViewRenderer()->view->icon('refresh.png') . '&nbsp;' . t('Apply')
                 . '</button></noscript>';
         }
 
diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 38eecb722..999a825ac 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/library/Icinga/Web/Widget/FilterEditor.php
@@ -669,7 +669,7 @@ class FilterEditor extends AbstractWidget
             . '" title="'
             . $title
             . '">'
-            . '<i class="icon-filter"></i>'
+            . '<i aria-hidden="true" class="icon-filter"></i>'
             . '</a>';
     }
 
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 2d24d5f40..143c3e552 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -215,9 +215,9 @@ class Tab extends AbstractWidget
 
         if ($this->icon !== null) {
             if (strpos($this->icon, '.') === false) {
-                $caption = $view->icon($this->icon, null, array('aria-hidden' => 'true')) . $caption;
+                $caption = $view->icon($this->icon) . $caption;
             } else {
-                $caption = $view->img($this->icon, array('aria-hidden' => 'true', 'class' => 'icon')) . $caption;
+                $caption = $view->img($this->icon, null, array('class' => 'icon')) . $caption;
             }
         }
         if ($this->url !== null) {
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index 9df556f65..56bd3404c 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -33,7 +33,7 @@ EOT;
      */
     private $dropdownTpl = <<< 'EOT'
 <li class="dropdown">
-  <a href="#" class="dropdown-toggle"><i class="icon-down-open"></i></a>
+  <a href="#" class="dropdown-toggle"><i aria-hidden="true" class="icon-down-open"></i></a>
   <ul class="dropdown-menu">
     {TABS}
   </ul>
diff --git a/modules/monitoring/application/views/scripts/alertsummary/index.phtml b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
index b71456ab6..dbfff6433 100644
--- a/modules/monitoring/application/views/scripts/alertsummary/index.phtml
+++ b/modules/monitoring/application/views/scripts/alertsummary/index.phtml
@@ -42,11 +42,11 @@
 
             <span>
                 <?php if ($this->trend->trend === 'up'): ?>
-                    <?= $this->icon('up-open', null, array('aria-hidden' => 'true')); ?>
+                    <?= $this->icon('up-open'); ?>
                 <?php elseif ($this->trend->trend === 'unchanged'): ?>
-                    <?= $this->icon('right-open', null, array('aria-hidden' => 'true')); ?>
+                    <?= $this->icon('right-open'); ?>
                 <?php else: ?>
-                    <?= $this->icon('down-open', null, array('aria-hidden' => 'true')); ?>
+                    <?= $this->icon('down-open'); ?>
                 <?php endif; ?>
             </span>
         </div>
diff --git a/modules/monitoring/application/views/scripts/config/index.phtml b/modules/monitoring/application/views/scripts/config/index.phtml
index a0f922ba4..b1729f9b1 100644
--- a/modules/monitoring/application/views/scripts/config/index.phtml
+++ b/modules/monitoring/application/views/scripts/config/index.phtml
@@ -6,7 +6,7 @@
 <div class="content" data-base-target="_next">
   <p>
     <a href="<?= $this->href('/monitoring/config/createbackend'); ?>">
-      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
+      <?= $this->icon('plus'); ?> <?= $this->translate('Create New Monitoring Backend'); ?>
     </a>
   </p>
   <table class="action">
@@ -38,7 +38,7 @@
   <h1><?= $this->translate('Monitoring Instances') ?></h1>
   <p>
     <a href="<?= $this->href('/monitoring/config/createinstance'); ?>">
-      <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create New Instance'); ?>
+      <?= $this->icon('plus'); ?> <?= $this->translate('Create New Instance'); ?>
     </a>
   </p>
   <table class="action">
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index 0da62ad77..9a7c850f2 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -31,21 +31,21 @@
 
         <div>
             <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reschedule'); ?>
                 <?= $this->translate('Reschedule host checks') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= $this->translate('Schedule host downtimes') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?>
+                <?= $this->icon('reply'); ?>
                 <?= $this->translate('Submit passive check results'); ?>
             </a>
         </div>
@@ -71,7 +71,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Schedule downtime for unhandled host problem',
@@ -91,7 +91,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('ok'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Acknowledge unhandled host problem',
@@ -133,7 +133,7 @@
                        ),
                        $inDowntimeCount
                    ) ?>">
-                    <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('plug'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u host currently in downtime',
@@ -158,7 +158,7 @@
                        ),
                        $commentCount
                    ) ?>">
-                    <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('comment'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u host comment',
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index 99d070c31..f32a22815 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -20,7 +20,7 @@ foreach ($groupData as $groupName => $groupInfo): ?>
             <div class="box contents">
 <?php foreach ($groupInfo['contacts'] as $c): ?>
                 <div class="box entry">
-                    <img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $c->contact_email )) ?>" />
+                    <?= $this->img('/static/gravatar', array('email' => $c->contact_email)); ?>
                     <a href="<?= $this->href(
                         'monitoring/show/contact',
                         array('contact' => $c->contact_name)
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 292617493..4623a5027 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -14,7 +14,7 @@
     }
     foreach ($contacts as $contact): ?>
         <div class="contact">
-            <img aria-hidden="true" src="<?= $this->href('/static/gravatar', array('email' => $contact->contact_email )) ?>" />
+            <?= $this->img('/static/gravatar', array('email' => $contact->contact_email)); ?>
             <a href="<?= $this->href(
                 'monitoring/show/contact',
                 array('contact' => $contact->contact_name)
diff --git a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
index a92302775..da58fc9cb 100644
--- a/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command/objects-command-form.phtml
@@ -9,8 +9,8 @@
     <table class="objectlist">
         <thead>
             <tr>
-                <th><?= $this->icon('host', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Host'); ?></th>
-                <th><?= $this->icon('conf', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Service'); ?></th>
+                <th><?= $this->icon('host'); ?> <?= $this->translate('Host'); ?></th>
+                <th><?= $this->icon('conf'); ?> <?= $this->translate('Service'); ?></th>
             </tr>
         </thead>
         <tbody>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 44951735a..8f818627a 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -19,21 +19,21 @@
 
         <div>
             <a href="<?= $rescheduleAllLink ?>">
-                <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reschedule'); ?>
                 <?= $this->translate('Reschedule service checks') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $downtimeAllLink ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= $this->translate('Schedule service downtimes') ?>
             </a>
         </div>
 
         <div>
             <a href="<?= $processCheckResultAllLink; ?>">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')); ?>
+                <?= $this->icon('reply'); ?>
                 <?= $this->translate('Submit passive check results'); ?>
             </a>
         </div>
@@ -59,7 +59,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('plug'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Schedule downtime for unhandled service problem',
@@ -79,7 +79,7 @@
                 ),
                 $unhandledCount
             ) ?>">
-                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('ok'); ?>
                 <?= sprintf(
                     $this->translatePlural(
                         'Acknowledge unhandled service problem',
@@ -119,7 +119,7 @@
                         $inDowntimeCount
                     ),
                 $inDowntimeCount) ?>">
-                    <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('plug'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u service currently in downtime',
@@ -143,7 +143,7 @@
                     ),
                     $commentCount
                 ) ?>">
-                    <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+                    <?= $this->icon('comment'); ?>
                     <?= sprintf(
                         $this->translatePlural(
                             'List %u service comment',
diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index c5c2a5667..8da35590f 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -36,7 +36,7 @@ if ($object->acknowledged): ?>
                 }
             ?>
             <a href="<?= $ackLink ?>" data-base-target="_self">
-                <?= $this->icon('ok', null, array('aria-hidden' => 'true')) ?> <?= $this->translate('Acknowledge') ?>
+                <?= $this->icon('ok') ?> <?= $this->translate('Acknowledge') ?>
             </a>
             <?php } else {
                 echo '&#45;';
diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
index 5545790ab..ec0c2792a 100644
--- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml
@@ -40,7 +40,7 @@ if ($object->getType() === $object::TYPE_HOST) {
           }
       ?>
       <a href="<?= $reschedule ?>" data-base-target="_self">
-          <?= $this->icon('reschedule', null, array('aria-hidden' => 'true')) ?>
+          <?= $this->icon('reschedule') ?>
           <?= $this->translate('Reschedule') ?>
       </a>
       <?php } // endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml
index 1041b7ff6..a74b5b884 100644
--- a/modules/monitoring/application/views/scripts/show/components/command.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/command.phtml
@@ -22,7 +22,7 @@ $command = array_shift($parts);
                 );
             } ?>
             <a href="<?= $processCheckResult ?>" data-base-target="_self">
-                <?= $this->icon('reply', null, array('aria-hidden' => 'true')) ?>
+                <?= $this->icon('reply') ?>
                 <?= $this->translate('Process check result') ?>
             </a>
         <?php endif ?>
diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
index 9973ff037..a6503a70b 100644
--- a/modules/monitoring/application/views/scripts/show/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -16,7 +16,7 @@
             }
         ?>
         <a href="<?= $addCommentLink ?>" data-base-target="_self">
-            <?= $this->icon('comment', null, array('aria-hidden' => 'true')) ?>
+            <?= $this->icon('comment') ?>
             <?= $this->translate('Add comment') ?>
         </a>
         <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
index 68e6423ff..50b173381 100644
--- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml
@@ -12,7 +12,7 @@ if (! empty($object->contacts)) {
     printf(
         "<tr><th>%s</th><td>%s %s</td></tr>\n",
         $this->translate('Contacts'),
-        $this->icon('user', null, array('aria-hidden' => 'true')),
+        $this->icon('user'),
         implode(', ', $list)
     );
 
@@ -31,7 +31,7 @@ if (! empty($object->contactgroups)) {
     printf(
         "<tr><th>%s</th><td>%s %s</td></tr>\n",
         $this->translate('Contactgroups'),
-        $this->icon('users', null, array('aria-hidden' => 'true')),
+        $this->icon('users'),
         implode(', ', $list)
     );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index f838b3d61..4aa1e21c1 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -16,7 +16,7 @@
             }
         ?>
         <a href="<?= $scheduleDowntimeLink ?>" data-base-target="_self">
-            <?= $this->icon('plug', null, array('aria-hidden' => 'true')) ?>
+            <?= $this->icon('plug') ?>
             <?= $this->translate('Schedule downtime') ?>
         </a>
         <?php } else {
diff --git a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
index 3a41f0cd8..165df627a 100644
--- a/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml
@@ -11,7 +11,7 @@ foreach ($object->hostgroups as $name => $alias) {
 printf(
     "<tr><th>%s</th><td>%s %s</td></tr>\n",
     $this->translate('Hostgroups'),
-    $this->icon('host', null, array('aria-hidden' => 'true')),
+    $this->icon('host'),
     implode(', ', $list)
 );
 
diff --git a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
index 01de6d71c..50b71d839 100644
--- a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
@@ -12,7 +12,7 @@ foreach ($object->servicegroups as $name => $alias) {
 printf(
     "<tr><th>%s</th><td>%s %s</td></tr>\n",
     $this->translate('Servicegroups'),
-    $this->icon('services', null, array('aria-hidden' => 'true')),
+    $this->icon('services'),
     implode(', ', $list)
 );
 
diff --git a/modules/setup/application/forms/AuthenticationPage.php b/modules/setup/application/forms/AuthenticationPage.php
index b55dcff10..d7c26d460 100644
--- a/modules/setup/application/forms/AuthenticationPage.php
+++ b/modules/setup/application/forms/AuthenticationPage.php
@@ -41,7 +41,7 @@ class AuthenticationPage extends Form
                 'note',
                 'external_note',
                 array(
-                    'value'         => $this->translate(
+                    'value'         => '<i aria-hidden="true" class="icon-info"></i>' . $this->translate(
                         'You\'re currently not authenticated using any of the web server\'s authentication '
                         . 'mechanisms. Make sure you\'ll configure such, otherwise you\'ll not be able to '
                         . 'log into Icinga Web 2.'
@@ -50,7 +50,7 @@ class AuthenticationPage extends Form
                         'ViewHelper',
                         array(
                             'HtmlTag',
-                            array('tag' => 'p', 'class' => 'icon-info info-box')
+                            array('tag' => 'p', 'class' => 'info-box')
                         )
                     )
                 )