diff --git a/js/tooltip.js b/js/tooltip.js
index 2df5ff40d..31b62e68e 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -217,7 +217,10 @@ function mouseMove(e) {
 $(document).ready(function() {
     // Hide the footnotes from the footer (which are displayed for
     // JavaScript-disabled browsers) since the tooltip is sufficient
-    $(".notice").hide();
+    $(".footnotes").hide();
+    // 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']").remove();
     $("img[class='footnotemarker']").show();
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 2a3cb28f2..09f566d34 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -68,7 +68,7 @@ if ($GLOBALS['error_handler']->hasDisplayErrors()) {
 }
 
 if (count($GLOBALS['footnotes'])) {
-    echo '<div class="notice">';
+    echo '<div class="footnotes">';
     foreach ($GLOBALS['footnotes'] as $footnote) {
         echo '<span id="footnote_' . $footnote['nr'] . '"><sup>'
             . $footnote['nr'] . '</sup> ' . $footnote['note'] . '</span><br />';
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 355146bce..6ae95705b 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -387,7 +387,8 @@ div.error h1 {
 div.success,
 div.notice,
 div.warning,
-div.error {
+div.error,
+div.footnotes {
     margin:             0.3em 0 0 0;
     border:             2px solid;
     <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
@@ -419,12 +420,13 @@ div.success {
     border-color:       #00FF00;
 }
 
-.notice {
+.notice, .footnotes {
     color:              #000000;
     background-color:   #FFFFDD;
 }
 h1.notice,
-div.notice {
+div.notice,
+div.footnotes {
     border-color:       #FFD700;
     <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-image:   url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
@@ -488,6 +490,7 @@ fieldset.confirmation legend {
         <?php } ?>
     <?php } ?>
 }
+
 /* end messageboxes */