diff --git a/templates/database/designer/database_tables.phtml b/templates/database/designer/database_tables.phtml
index 866febaf7f..5d9a7b6768 100644
--- a/templates/database/designer/database_tables.phtml
+++ b/templates/database/designer/database_tables.phtml
@@ -28,14 +28,11 @@
                 <td class="small_tab"
                     title="<?= __('Show/hide columns'); ?>"
                     id="id_hide_tbody_<?= $t_n_url; ?>"
-                    table_name="<?= htmlspecialchars($t_n_url); ?>"
-                    onmouseover="this.className='small_tab2';"
-                    onmouseout="this.className='small_tab';" ><?= (! isset($tab_pos[$t_n]) || ! empty($tab_pos[$t_n]["V"])) ? 'v' : '&gt;'; ?>
+                    table_name="<?= htmlspecialchars($t_n_url); ?>">
+                    <?= (! isset($tab_pos[$t_n]) || ! empty($tab_pos[$t_n]["V"])) ? 'v' : '&gt;'; ?>
                 </td>
                 <td class="small_tab_pref small_tab_pref_1"
-                    table_name_small="<?= htmlspecialchars($GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]); ?>"
-                    onmouseover="this.className='small_tab_pref2 small_tab_pref_1';"
-                    onmouseout="this.className='small_tab_pref small_tab_pref_1';" >
+                    table_name_small="<?= htmlspecialchars($GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]); ?>">
                     <img src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>"
                          title="<?= __('See table structure'); ?>" />
                 </td>
@@ -79,8 +76,6 @@
                 ?>
                 <tr id="id_tr_<?= htmlspecialchars($GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]); ?>.<?= htmlspecialchars($tab_column[$t_n]["COLUMN_NAME"][$j]); ?>"
                     <?= ($display_field == $tab_column[$t_n]["COLUMN_NAME"][$j]) ? 'class="tab_field_3"' : 'class="tab_field"'; ?>
-                    onmouseover="old_class = this.className; this.className = 'tab_field_2';"
-                    onmouseout="this.className = old_class;"
                     click_field_param="<?= htmlspecialchars(implode($click_field_param, ',')); ?>">
                     <?php if (isset($_REQUEST['query'])) : ?>
                         <td class="select_all">
@@ -127,8 +122,6 @@
                     </td>
                     <?php if (isset($_REQUEST['query'])) : ?>
                         <td class="small_tab_pref small_tab_pref_click_opt"
-                            onmouseover="this.className='small_tab_pref2 small_tab_pref_click_opt'"
-                            onmouseout="this.className='small_tab_pref small_tab_pref_click_opt'"
                             Click_option_param="pmd_optionse,<?= urlencode($tab_column[$t_n]['COLUMN_NAME'][$j]); ?>,<?= $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i]; ?>" >
                             <img src="<?= $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png'); ?>" title="options" />
                         </td>
diff --git a/templates/database/designer/table_list.phtml b/templates/database/designer/table_list.phtml
index 4deafb20ca..0e4fb2201c 100644
--- a/templates/database/designer/table_list.phtml
+++ b/templates/database/designer/table_list.phtml
@@ -27,8 +27,6 @@
                 <tr>
                     <td title="<?= __('Structure'); ?>"
                         width="1px"
-                        onmouseover="this.className='L_butt2_2'"
-                        onmouseout="this.className='L_butt2_1'"
                         class="L_butt2_1">
                         <img alt=""
                              table_name="<?= htmlspecialchars($GLOBALS['PMD_URL']['TABLE_NAME_SMALL'][$i]); ?>"
@@ -45,8 +43,6 @@
                                <?php if ($checked) : ?>checked="checked"<?php endif; ?> />
                     </td>
                     <td class="pmd_Tabs"
-                        onmouseover="this.className='pmd_Tabs2'"
-                        onmouseout="this.className='pmd_Tabs'"
                         pmd_url_table_name="<?= htmlspecialchars($GLOBALS['PMD_URL']['TABLE_NAME'][$i]); ?>">
                         <?= $GLOBALS['PMD_OUT']["TABLE_NAME"][$i]; ?>
                     </td>
diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
index 7d1c38b4a7..b70da36b42 100644
--- a/themes/pmahomme/css/pmd.css.php
+++ b/themes/pmahomme/css/pmd.css.php
@@ -101,7 +101,7 @@ canvas.pmd * {
     cursor: default;
 }
 
-.tab_field_2 {
+.tab_field:hover, .tab_field_3:hover {
     background-color: #CCFFCC;
     color: #000;
     background-repeat: repeat-x;
@@ -144,7 +144,7 @@ canvas.pmd * {
     border: #ccc solid 1px;
 }
 
-.pmd_Tabs2 {
+.pmd_Tabs:hover {
     cursor: default;
     color: #0055bb;
     background: #FFEE99;
@@ -192,7 +192,7 @@ canvas.pmd * {
     text-decoration: none;
 }
 
-.small_tab2 {
+.small_tab:hover {
     vertical-align: top;
     color: #fff;
     background-color: #FF9966;
@@ -212,7 +212,7 @@ canvas.pmd * {
     width: 1px;
 }
 
-.small_tab_pref2 {
+.small_tab_pref:hover {
     vertical-align: top;
     color: #fff;
     background-color: #FF9966;
@@ -240,7 +240,7 @@ canvas.pmd * {
     cursor: default;
 }
 
-.L_butt2_2 {
+.L_butt2_1:hover {
     padding: 0;
     border: #0099CC solid 1px;
     background: #FFEE99;