diff --git a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
index d1c9a677f..8ffd3ea00 100644
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@@ -127,7 +127,8 @@ class HistoryColorGrid extends AbstractWidget {
                     . ' opacity: ' . $this->opacity . ';" ' .
                 'aria-label="' . $entry['caption'] . '" ' .
                 'title="' . $entry['caption'] . '" ' .
-                'href="'  . $entry['url'] . '"' .
+                'href="'  . $entry['url'] . '" ' .
+                'data-tooltip-delay="0"' .
             '></a>';
         } else {
             return '<span ' .
diff --git a/public/js/icinga/behavior/tooltip.js b/public/js/icinga/behavior/tooltip.js
index a1a94b62b..d3dc6c539 100644
--- a/public/js/icinga/behavior/tooltip.js
+++ b/public/js/icinga/behavior/tooltip.js
@@ -28,8 +28,7 @@
             $el.attr('title', $el.data('title-rich') || $el.attr('title'));
         });
         $('svg .chart-data', el).tipsy({ gravity: 'se', html: true });
-        $('.historycolorgrid a[title]', el).tipsy({ gravity: 's', offset: 2 });
-        $('img.icon[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 });
+        $('i[title]', el).tipsy({ gravity: $.fn.tipsy.autoNS, offset: 2 });
         $('[title]', el).each(function (i, el) {
            var $el = $(el);
            var delay = 500;