diff --git a/db_qbe.php b/db_qbe.php
index 529c895e60..af6eadbb0d 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -614,7 +614,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
             <option value="3">3</option>
         </select>
     </td>
-    <td width="10">&nbsp;</td>
+    <td style="width: 10px">&nbsp;</td>
     <td class="nowrap"><?php echo __('Add/Delete columns'); ?>:
         <select size="1" name="add_col">
             <option value="-3">-3</option>
@@ -626,7 +626,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
             <option value="3">3</option>
         </select>
     </td>
-    <td width="10">&nbsp;</td>
+    <td style="width: 10px">&nbsp;</td>
     <!-- Generates a query -->
     <td><input type="submit" name="modify" value="<?php echo __('Update Query'); ?>" /></td>
 </tr>
@@ -656,7 +656,7 @@ foreach ($tbl_names as $key => $val) {
             <input type="submit" name="modify" value="<?php echo __('Update Query'); ?>" />
         </fieldset>
     </td>
-    <td width="20">&nbsp;</td>
+    <td style="width: 20px">&nbsp;</td>
     <td>
         <fieldset>
             <legend><?php echo sprintf(__('SQL query on database <b>%s</b>:'), PMA_getDbLink($db)); ?>
diff --git a/db_search.php b/db_search.php
index c395425c86..9bb08a2c4d 100644
--- a/db_search.php
+++ b/db_search.php
@@ -267,7 +267,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
  * 2. Displays the main search form
  */
 ?>
-<a name="db_search"></a>
+<a id="db_search"></a>
 <form id="db_search_form"<?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> method="post" action="db_search.php" name="db_search">
 <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db']); ?>
 <fieldset>
@@ -278,7 +278,7 @@ if ($GLOBALS['is_ajax_request'] == true) {
         <td><input type="text" name="search_str" size="60"
                 value="<?php echo $searched; ?>" /></td>
     </tr>
-    <tr><td class="right" valign="top">
+    <tr><td class="right vtop">
             <?php echo __('Find:'); ?></td>
             <td><?php
 
@@ -296,7 +296,7 @@ unset($choices);
             ?>
             </td>
     </tr>
-    <tr><td class="right" valign="top">
+    <tr><td class="right vtop">
             <?php echo __('Inside tables:'); ?></td>
         <td rowspan="2">
 <?php
@@ -323,7 +323,7 @@ $alter_select
 ?>
         </td>
     </tr>
-    <tr><td class="right" valign="bottom">
+    <tr><td class="right vbottom">
             <?php echo $alter_select; ?></td>
     </tr>
     <tr><td class="right">
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index af896e458d..4e16a995c6 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -781,7 +781,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
             <?php
             // end horizontal/horizontalflipped mode
         } else {
-            $vertical_display['textbtn'] = '    <th ' . $rowspan . ' valign="middle">' . "\n"
+            $vertical_display['textbtn'] = '    <th ' . $rowspan . ' class="vmiddle">' . "\n"
                                          . '        ' . "\n"
                                          . '    </th>' . "\n";
         } // end vertical mode
@@ -1034,12 +1034,12 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                 if ($GLOBALS['cfg']['BrowseMarkerEnable'] == true) {
                     $th_class[] = 'marker';
                 }
-                echo ' class="' . implode(' ', $th_class) . '"';
+                echo ' class="' . implode(' ', $th_class);
 
                 if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
-                    echo ' valign="bottom"';
+                    echo ' vbottom';
                 }
-                echo '>' . $order_link . $comments . '</th>';
+                echo '">' . $order_link . $comments . '</th>';
             }
             $vertical_display['desc'][] = '    <th '
                 . 'class="draggable'
@@ -1062,10 +1062,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                 if ($condition_field) {
                     $th_class[] = 'condition';
                 }
-                echo ' class="' . implode(' ', $th_class) . '"';
+                echo ' class="' . implode(' ', $th_class);
                 if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
-                    echo ' valign="bottom"';
+                    echo ' vbottom';
                 }
+                echo '"';
                 if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped'
                     && $GLOBALS['cfg']['HeaderFlipType'] == 'css'
                 ) {
@@ -1107,7 +1108,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
             <?php
             // end horizontal/horizontalflipped mode
         } else {
-            $vertical_display['textbtn'] = '    <th ' . $rowspan . ' valign="middle">' . "\n"
+            $vertical_display['textbtn'] = '    <th ' . $rowspan . ' class="vmiddle">' . "\n"
                                          . '        ' . "\n"
                                          . '    </th>' . "\n";
         } // end vertical mode
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index fc77a913f5..f716c0f7f5 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -657,7 +657,7 @@ function addField()
 if ($action == 'tbl_create.php') {
     ?>
     <table>
-    <tr valign="top">
+    <tr class="vtop">
         <th><?php echo __('Table comments'); ?>:&nbsp;</th>
         <td width="25">&nbsp;</td>
         <th><?php echo __('Storage Engine'); ?>:
@@ -688,7 +688,7 @@ if ($action == 'tbl_create.php') {
     <?php
     if (PMA_Partition::havePartitioning()) {
         ?>
-    <tr valign="top">
+    <tr class="vtop">
         <th><?php echo __('PARTITION definition'); ?>:&nbsp;<?php echo PMA_showMySQLDocu('Partitioning', 'Partitioning'); ?>
         </th>
     </tr>
diff --git a/tbl_change.php b/tbl_change.php
index 4d17253625..438d1d908d 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -1049,7 +1049,7 @@ foreach ($rows as $row_id => $vrow) {
     <fieldset id="actions_panel">
     <table cellpadding="5" cellspacing="0">
     <tr>
-        <td valign="middle" class="nowrap">
+        <td class="nowrap vmiddle">
             <select name="submit_type" class="control_at_footer" tabindex="<?php echo ($tabindex + $tabindex_for_value + 1); ?>">
 <?php
 if (isset($where_clause)) {
@@ -1070,10 +1070,10 @@ if (! isset($after_insert)) {
 }
 ?>
         </td>
-        <td valign="middle">
+        <td class="vmiddle">
             &nbsp;&nbsp;&nbsp;<strong><?php echo __('and then'); ?></strong>&nbsp;&nbsp;&nbsp;
         </td>
-        <td valign="middle" class="nowrap">
+        <td class="nowrap vmiddle">
             <select name="after_insert">
                 <option value="back" <?php echo ($after_insert == 'back' ? 'selected="selected"' : ''); ?>><?php echo __('Go back to previous page'); ?></option>
                 <option value="new_insert" <?php echo ($after_insert == 'new_insert' ? 'selected="selected"' : ''); ?>><?php echo __('Insert another new row'); ?></option>
@@ -1101,7 +1101,7 @@ if (isset($where_clause)) {
         <td>
 <?php echo PMA_showHint(__('Use TAB key to move from value to value, or CTRL+arrows to move anywhere')); ?>
         </td>
-        <td colspan="3" class="right" valign="middle">
+        <td colspan="3" class="right vmiddle">
             <input type="submit" class="control_at_footer" value="<?php echo __('Go'); ?>" tabindex="<?php echo ($tabindex + $tabindex_for_value + 6); ?>" id="buttonYes" />
             <input type="reset" class="control_at_footer" value="<?php echo __('Reset'); ?>" tabindex="<?php echo ($tabindex + $tabindex_for_value + 7); ?>" />
         </td>
diff --git a/tbl_printview.php b/tbl_printview.php
index 34a276b371..bfbaa6ca23 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -265,7 +265,7 @@ foreach ($the_tables as $key => $table) {
     <tr>
 
         <!-- Space usage -->
-        <td valign="top">
+        <td class="vtop">
             <big><?php echo __('Space usage') . ':'; ?></big>
             <table width="100%">
             <tr>
@@ -321,7 +321,7 @@ foreach ($the_tables as $key => $table) {
         <td width="20">&nbsp;</td>
 
         <!-- Rows Statistic -->
-        <td valign="top">
+        <td class="vtop">
             <big><?php echo __('Row Statistics') . ':'; ?></big>
             <table width="100%">
             <tr>
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index aa880ad886..e243433384 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -167,11 +167,15 @@ th.right, td.right {
     text-align: right;
 }
 
-th.vtop, td.vtop {
+tr.vtop, th.vtop, td.vtop {
     vertical-align: top;
 }
 
-th.vbottom, td.vbottom {
+tr.vmiddle, th.vmiddle, td.vmiddle {
+    vertical-align: middle;
+}
+
+tr.vbottom, th.vbottom, td.vbottom {
     vertical-align: bottom;
 }
 
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 5ed1f4297e..ffc83d839a 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -363,11 +363,15 @@ th.right, td.right {
     text-align: right;
 }
 
-th.vtop, td.vtop {
+tr.vtop, th.vtop, td.vtop {
     vertical-align: top;
 }
 
-th.vbottom, td.vbottom {
+tr.vmiddle, th.vmiddle, td.vmiddle {
+    vertical-align: middle;
+}
+
+tr.vbottom, th.vbottom, td.vbottom {
     vertical-align: bottom;
 }