diff --git a/js/functions.js b/js/functions.js
index 0a51657be8..947dac0de7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1531,23 +1531,23 @@ function PMA_ajaxShowMessage(message, timeout)
     if (dismissable) {
         $retval.addClass('dismissable').css('cursor', 'pointer');
         /**
-         * @var qOpts Options for "Dismiss notification" tooltip
+         * @var tooltipOptions Options for "Dismiss notification" tooltip
+         *                     to remove any animation when showing and hiding
          */
-        var qOpts = {
-            show: {
-                effect: { length: 0 },
-                delay: 0
-            },
-            hide: {
-                effect: { length: 0 },
-                delay: 0
-            }
+        var tooltipOptions = {
+            show: false, 
+            hide: false 
         };
         /**
          * Add a tooltip to the notification to let the user know that (s)he
          * can dismiss the ajax notification by clicking on it.
          */
-        PMA_createqTip($retval, PMA_messages['strDismiss'], qOpts);
+        PMA_tooltip(
+            $retval,
+            'span',
+            PMA_messages['strDismiss'],
+            tooltipOptions
+        ); 
     }
 
     return $retval;
diff --git a/js/server_status_queries.js b/js/server_status_queries.js
index b1b632165a..3faeec4510 100644
--- a/js/server_status_queries.js
+++ b/js/server_status_queries.js
@@ -31,8 +31,9 @@ AJAX.registerOnload('server_status_queries.js', function() {
     }
 
     /*** Table sort tooltip ***/
-    PMA_createqTip(
-        $('table.sortable').children('thead').children('tr').has('th'),
+    PMA_tooltip(
+        $('table.sortable>thead>tr:first').find('th'),
+        'th',
         PMA_messages['strSortHint']
     );
     initTableSorter('statustabs_queries');
diff --git a/js/server_status_variables.js b/js/server_status_variables.js
index f6ce73d2f4..2f670666cc 100644
--- a/js/server_status_variables.js
+++ b/js/server_status_variables.js
@@ -17,7 +17,11 @@ AJAX.registerTeardown('server_status_variables.js', function() {
 
 AJAX.registerOnload('server_status_variables.js', function() {
     /*** Table sort tooltip ***/
-    PMA_tooltip($('table.sortable>thead>tr:first').find('th'), 'th', PMA_messages['strSortHint']);
+    PMA_tooltip(
+        $('table.sortable>thead>tr:first').find('th'),
+        'th',
+        PMA_messages['strSortHint']
+    );
     initTableSorter('statustabs_allvars');
 
     // Filters for status variables
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
index 0c4b7ca0cb..76dff375c2 100644
--- a/libraries/Header.class.php
+++ b/libraries/Header.class.php
@@ -374,7 +374,7 @@ class PMA_Header
                     $retval .= PMA_userprefsAutoloadGetHeader();
                 }
                 // pass configuration for hint tooltip display
-                // (to be used by PMA_createqTip in js/functions.js)
+                // (to be used by PMA_tooltip() in js/functions.js)
                 if (! $GLOBALS['cfg']['ShowHint']) {
                     $retval .= '<span id="no_hint" class="hide"></span>';
                 }