diff --git a/db_central_columns.php b/db_central_columns.php
index 6a0369641c..33fad2a65c 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -130,7 +130,7 @@ $tableheader = PMA_getCentralColumnsTableHeader(
 );
 $response->addHTML($tableheader);
 $result = PMA_getColumnsList($db, $pos, $max_rows);
-$odd_row = false;
+$odd_row = true;
 $row_num=0;
 foreach ($result as $row) {
     $tableHtmlRow = PMA_getHTMLforCentralColumnsTableRow(
diff --git a/js/db_central_columns.js b/js/db_central_columns.js
index 16c8ab07f4..857d5c953b 100644
--- a/js/db_central_columns.js
+++ b/js/db_central_columns.js
@@ -23,7 +23,6 @@ AJAX.registerTeardown('db_central_columns.js', function () {
     $(".del_row").unbind('click');
     $(document).off("keyup", ".filter_rows");
     $('.edit_cancel_form').unbind('click');
-    $('.column_heading').unbind('mouseenter');
     $('#table-select').unbind('change');
     $('#column-select').unbind('change');
     $("#add_col_div>a").unbind('click');
diff --git a/js/sql.js b/js/sql.js
index e57792883d..aa4e1474b9 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -582,7 +582,7 @@ function PMA_changeClassForColumn($this_th, newclass, isAddClass)
 {
     // index 0 is the th containing the big T
     var th_index = $this_th.index();
-    var has_big_t = !$this_th.closest('tr').children(':first').hasClass('column_heading');
+    var has_big_t = $this_th.closest('tr').children(':first').hasClass('column_action');
     // .eq() is zero-based
     if (has_big_t) {
         th_index--;
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 769bf2d483..883154fe50 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1429,7 +1429,7 @@ class PMA_DisplayResults
                 = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
                 && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
 
-            $button_html .= '<th ' . $colspan . '>'
+            $button_html .= '<th class="column_action" ' . $colspan . '>'
                 . $full_or_partial_text_link . '</th>';
 
         } elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
@@ -1448,7 +1448,7 @@ class PMA_DisplayResults
         } elseif (($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_NONE)) {
             // ... elseif display an empty column if the actions links are
             //  disabled to match the rest of the table
-            $button_html .= '<th></th>';
+            $button_html .= '<th class="column_action"></th>';
         }
 
         $this->__set('vertical_display', $vertical_display);
@@ -2203,7 +2203,7 @@ class PMA_DisplayResults
      * column header's alignment right
      *
      * @param array $fields_meta set of field properties
-     * @param array &$th_class   array containing classes 
+     * @param array &$th_class   array containing classes
      *
      * @return void
      *
@@ -2348,7 +2348,7 @@ class PMA_DisplayResults
                 && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 1;
 
             $right_column_html .= "\n"
-                . '<th ' . $colspan . '>' . $full_or_partial_text_link
+                . '<th class="column_action" ' . $colspan . '>' . $full_or_partial_text_link
                 . '</th>';
 
         } elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index b69e937008..fdd9dee67b 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -682,7 +682,8 @@ function PMA_getCentralColumnsTableHeader($class='', $title='', $actionCount=0)
 {
     $action = '';
     if ($actionCount > 0) {
-        $action .= '<th colspan="' . $actionCount . '">' . __('Action') . '</th>';
+        $action .= '<th class="column_action" colspan="' . $actionCount . '">'
+            . __('Action') . '</th>';
     }
     $tableheader = '<thead>';
     $tableheader .= '<tr>'
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 4aa5f0998a..e3b1bdb0cc 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2293,8 +2293,12 @@ function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db)
                 . ($odd_row ? 'odd' : 'even') . '">';
 
             $value = htmlspecialchars($current_user . '&amp;#27;' . $current_host);
-            $html_output .= '<td>'
-                . '<input type="checkbox" class="checkall" name="selected_usr[]" '
+            $html_output .= '<td';
+            if ($nbPrivileges > 1) {
+                $html_output .= ' rowspan="' . $nbPrivileges . '"';
+            }
+            $html_output .= '>';
+            $html_output .= '<input type="checkbox" class="checkall" name="selected_usr[]" '
                 . 'id="checkbox_sel_users_' . ($index_checkbox++) . '" '
                 . 'value="' . $value . '" /></td>' . "\n";