diff --git a/js/makegrid.js b/js/makegrid.js
index e18225c11a..6f9d6860be 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -493,6 +493,7 @@
         // register events
         if ($firstRowCols.length > 1) {
             $(t).find('th.draggable')
+                .css('cursor', 'move')
                 .mousedown(function(e) {
                     g.dragStartMove(e, this);
                 });
@@ -506,6 +507,7 @@
                 g.hideHint();
             });
         $(t).find('th.draggable a')
+            .attr('title', '')          // hide default tooltip for sorting
             .mouseenter(function(e) {
                 g.showSortHint = true;
                 g.showMarkHint = false;
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index b50a60d9a0..0a37dc3940 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -393,7 +393,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
     } // end move toward
     ?>
     <td>
-        <input class="restore_column" type="submit" value="<?php echo __('Restore column order'); ?>" />
+        <input class="restore_column hide" type="submit" value="<?php echo __('Restore column order'); ?>" />
         <?php
         if (PMA_isBrowsing()) {
             // generate the column order, if it is set
@@ -910,6 +910,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
              && $GLOBALS['cfg']['HeaderFlipType'] == 'css') {
                 $order_link_params['style'] = 'direction: ltr; writing-mode: tb-rl;';
             }
+            $order_link_params['title'] = __('Sort');
             $order_link_content = ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'fake' ? PMA_flipstring(htmlspecialchars($fields_meta[$i]->name), "<br />\n") : htmlspecialchars($fields_meta[$i]->name));
             $order_link = PMA_linkOrButton($order_url, $order_link_content . $order_img, $order_link_params, false, true);
 
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 3481fa55e7..4c40f84c64 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2224,10 +2224,6 @@ span.mysql-number {
     position: absolute;
 }
 
-.draggable {
-    cursor: move;
-}
-
 .cCpy {
     background: #333;
     color: #FFF;