diff --git a/js/functions.js b/js/functions.js
index c2bb21cdd..84eb2e4e4 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1904,4 +1904,33 @@ $(document).ready(function() {
              }
          );
     }
+});
+
+/* Displays tooltips */
+$(document).ready(function() {
+    // Hide the footnotes from the footer (which are displayed for
+    // JavaScript-disabled browsers) since the tooltip is sufficient
+    $(".footnotes").hide();
+    $(".footnotes span").each(function() {
+        $(this).children("sup").remove();
+    });
+    // The border and padding must be removed otherwise a thin yellow box remains visible
+    $(".footnotes").css("border", "none");
+    $(".footnotes").css("padding", "0px");
+
+    // Replace the superscripts with the help icon
+    $("sup[class='footnotemarker']").hide();
+    $("img[class='footnotemarker']").show();
+
+    $("img[class='footnotemarker']").each(function() {
+        var span_id = $(this).attr("id");
+        span_id = span_id.split("_")[1];
+        var tooltip_text = $(".footnotes span[id='footnote_" + span_id + "']").html();
+        $(this).qtip({
+            content: tooltip_text,
+            show: { delay: 0 },
+            hide: { when: 'unfocus', delay: 0 },
+            style: { background: '#ffffcc' }
+        });
+    });
 });
\ No newline at end of file
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index a16004000..8e357860a 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -489,8 +489,8 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
     }
 
     // footnotemarker used in js/tooltip.js
-    return '<sup class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '">' . $nr . '</sup>' .
-    '<img class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '" src="' .
+    return '<sup class="footnotemarker">' . $nr . '</sup>' .
+    '<img class="footnotemarker" id="footnote_' . $nr . '_' . $instance . '" src="' .
     $GLOBALS['pmaThemeImage'] . 'b_help.png" alt="tooltip" />';
 }