diff --git a/resources/assets/javascripts/bootstrap/tooltip.js b/resources/assets/javascripts/bootstrap/tooltip.js
index c2493cf745606ff11c3a8110df0ad516878964a4..449baccd51cb937061cf2ed0b9fb435d655ea3b4 100644
--- a/resources/assets/javascripts/bootstrap/tooltip.js
+++ b/resources/assets/javascripts/bootstrap/tooltip.js
@@ -37,6 +37,7 @@ $(document).on('mouseenter mouseleave focusin focusout', '[data-tooltip],.toolti
         }
         $(this).attr('title', '');
         $(this).attr('data-tooltip', content);
+        $(this).attr('aria-label', content);
 
         tooltip = new STUDIP.Tooltip(x, y, content);
 
diff --git a/resources/assets/javascripts/lib/tooltip.js b/resources/assets/javascripts/lib/tooltip.js
index 5ae28edfd203d02a7c34f065d942e5066841a7f7..bf0e786ecf985c61024fce3b40762af50c3872a2 100644
--- a/resources/assets/javascripts/lib/tooltip.js
+++ b/resources/assets/javascripts/lib/tooltip.js
@@ -87,6 +87,7 @@ class Tooltip {
      *
      * @param {int} x - Horizontal offset
      * @param {int} y - Vertical offset
+     * @param {bool} left_arrow - Vertical offset
      */
     translateArrows(x, y, left_arrow = false) {
         CSS.removeRule(`#${this.id}::before`);
diff --git a/templates/shared/tooltip.php b/templates/shared/tooltip.php
index a97c73f275919a6d8639c8d074f8582a7d6673a3..af06bce8a5a921f56ffa7dede4f282077c903a61 100644
--- a/templates/shared/tooltip.php
+++ b/templates/shared/tooltip.php
@@ -1,3 +1,10 @@
+<?php
+/**
+ * @var bool $html
+ * @var bool $important
+ * @var string $text
+ */
+?>
 <span class="tooltip tooltip-icon <? if ($important) echo 'tooltip-important'; ?>" data-tooltip <? if (!$html) printf('title="%s"', htmlReady($text)) ?> tabindex="0">
 <? if ($html): ?>
     <span class="tooltip-content"><?= $text ?></span>