diff --git a/db_qbe.php b/db_qbe.php
index 8d559f3d5c..c228aba978 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -451,7 +451,7 @@ for ($y = 0; $y <= $row; $y++) {
 <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
     <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
         <!-- Row controls -->
-        <table border="0" cellpadding="0" cellspacing="0">
+        <table cellpadding="0" cellspacing="0">
         <tr>
             <td align="<?php echo $cell_align_right; ?>" nowrap="nowrap">
                 <small><?php echo __('Ins'); ?>:</small>
@@ -600,7 +600,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
 ?>
 </fieldset>
 <fieldset class="tblFooters">
-<table border="0" cellpadding="2" cellspacing="1">
+<table cellpadding="2" cellspacing="1">
 <tr>
     <td nowrap="nowrap">
         <?php echo __('Add/Delete criteria rows'); ?>:
diff --git a/js/functions.js b/js/functions.js
index 9d104caedb..2dc0eb5201 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3630,5 +3630,5 @@ function toggleRowColors($start)
  * This way, we don't break HTML validity
  */
 $(function () {
-    $("a[rel=_blank]").prop("target", "_blank");
+    $("a._blank").prop("target", "_blank");
 });
diff --git a/js/server_status.js b/js/server_status.js
index 86da8ea8b8..2a043eb6e6 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -76,7 +76,7 @@ $(function() {
     });
 
     // Popup behaviour
-    $('a[rel="popupLink"]').click( function() {
+    $('a.popupLink').click( function() {
         var $link = $(this);
 
         $('.' + $link.attr('href').substr(1))
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index 84e82c993e..15af4d1a27 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1615,7 +1615,7 @@ $(function() {
     function buildLogTable(data) {
         var rows = data.rows;
         var cols = new Array();
-        var $table = $('<table border="0" class="sortable"></table>');
+        var $table = $('<table class="sortable"></table>');
         var $tBody, $tRow, $tCell;
 
         $('#logTable').html($table);
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index b27bdbe155..dcf9a15bb1 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -86,7 +86,7 @@ function PMA_auth_fails()
     <h1><?php echo sprintf(__('Welcome to %s'), ' phpMyAdmin '); ?></h1>
 </center>
 <br />
-<table border="0" cellpadding="0" cellspacing="3" align="center" width="80%">
+<table cellpadding="0" cellspacing="3" align="center" width="80%">
     <tr>
         <td>
 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 8eb35e9a32..73fbc1a373 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -297,7 +297,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
     ?>
 
 <!-- Navigation bar -->
-<table border="0" cellpadding="0" cellspacing="0" class="navigation">
+<table cellpadding="0" cellspacing="0" class="navigation">
 <tr>
     <td class="navigation_separator"></td>
     <?php
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 867635020f..ba78ac6c1a 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -267,7 +267,7 @@ class PMA_User_Schema
             <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
             <input type="hidden" name="chpage" value="<?php echo htmlspecialchars($this->chosenPage); ?>" />
             <input type="hidden" name="do" value="edcoord" />
-            <table border="0">
+            <table>
             <tr>
                 <th><?php echo __('Table'); ?></th>
                 <th><?php echo __('Delete'); ?></th>
diff --git a/pmd_general.php b/pmd_general.php
index 8b0e7c0aa4..b606a732de 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -330,7 +330,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <div id='layer_action' style="display:none;">Load...</div>
 
 <table id="layer_new_relation" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -340,7 +340,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" align="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
             <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Create relation'); ?></strong></td>
@@ -397,7 +397,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="layer_upd_relation" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -407,7 +407,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="100%" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="100%" align="center" cellpadding="2" cellspacing="0">
         <tr>
             <td colspan="3" align="center" nowrap="nowrap"><strong><?php echo __('Delete relation'); ?></strong></td>
         </tr>
@@ -432,7 +432,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="pmd_optionse" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -442,7 +442,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" align="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
             <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td>
@@ -454,11 +454,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
             <td width="102"><select name="rel_opt" id="rel_opt">
                     <option value="--" selected="selected"> -- </option>
-                    <option value="=" > = </option>
-                    <option value=">"> > </option>
-                    <option value="<"> < </option>
-                    <option value=">="> >= </option>
-                    <option value="<="> <= </option>
+                    <option value="="> = </option>
+                    <option value="&gt;"> &gt; </option>
+                    <option value="&lt;"> &lt; </option>
+                    <option value="&gt;="> &gt;= </option>
+                    <option value="&lt;="> &lt;= </option>
                     <option value="NOT"> NOT </option>
                     <option value="IN"> IN </option>
                     <option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@@ -513,11 +513,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
             <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td>
             <td width="102"><select name="h_rel_opt" id="h_rel_opt">
                     <option value="--" selected="selected"> -- </option>
-                    <option value="=" > = </option>
-                    <option value=">"> > </option>
-                    <option value="<"> < </option>
-                    <option value=">="> >= </option>
-                    <option value="<="> <= </option>
+                    <option value="="> = </option>
+                    <option value="&gt;"> &gt; </option>
+                    <option value="&lt;"> &lt; </option>
+                    <option value="&gt;="> &gt;= </option>
+                    <option value="&lt;="> &lt;= </option>
                     <option value="NOT"> NOT </option>
                     <option value="IN"> IN </option>
                     <option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@@ -554,7 +554,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="query_rename_to" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -564,7 +564,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" align="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
         <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Rename to'); ?></strong></td>
@@ -602,7 +602,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="query_having" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
     <tr>
         <td class="frams1" width="10px"></td>
@@ -612,7 +612,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-    <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+    <table width="168" align="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
           <td colspan="2" align="center" nowrap="nowrap"><strong>HAVING</strong></td>
@@ -636,11 +636,11 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td>
             <td width="102"><select name="hrel_opt" id="hrel_opt">
                 <option value="--" selected="selected"> -- </option>
-                    <option value="=" > = </option>
-                    <option value=">"> > </option>
-                    <option value="<"> < </option>
-                    <option value=">="> >= </option>
-                    <option value="<="> <= </option>
+                    <option value="="> = </option>
+                    <option value="&gt;"> &gt; </option>
+                    <option value="&lt;"> &lt; </option>
+                    <option value="&gt;="> &gt;= </option>
+                    <option value="&lt;="> &lt;= </option>
                     <option value="NOT"> NOT </option>
                     <option value="IN"> IN </option>
                     <option value="EXCEPT"> <?php echo __('Except'); ?> </option>
@@ -678,7 +678,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="query_Aggregate" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
 <tr>
     <td class="frams1" width="10px"></td>
@@ -688,7 +688,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <table width="168" align="center" cellpadding="2" cellspacing="0">
         <thead>
         <tr>
         <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Aggregate'); ?></strong></td>
@@ -732,7 +732,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </table>
 
 <table id="query_where" style="display:none;"
-    width="5%" border="0" cellpadding="0" cellspacing="0">
+    width="5%" cellpadding="0" cellspacing="0">
 <tbody>
     <tr>
         <td class="frams1" width="10px"></td>
@@ -742,7 +742,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 <tr>
     <td class="frams8"></td>
     <td class="input_tab">
-    <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+    <table width="168" align="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
           <td colspan="2" align="center" nowrap="nowrap"><strong>WHERE</strong></td>
@@ -754,10 +754,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
             <td width="102"><select name="erel_opt" id="erel_opt">
                 <option value="--" selected="selected"> -- </option>
                     <option value="=" > = </option>
-                    <option value=">"> > </option>
-                    <option value="<"> < </option>
-                    <option value=">="> >= </option>
-                    <option value="<="> <= </option>
+                    <option value="&gt;"> &gt; </option>
+                    <option value="&lt;"> &lt; </option>
+                    <option value="&gt;="> &gt;= </option>
+                    <option value="&lt;="> &lt;= </option>
                     <option value="NOT"> NOT </option>
                     <option value="IN"> IN </option>
                     <option value="EXCEPT"> <?php echo __('Except'); ?> </option>
diff --git a/server_binlog.php b/server_binlog.php
index 1cbe7bbf29..7a2262044c 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -117,7 +117,7 @@ PMA_showMessage(PMA_Message::success());
  * Displays the page
  */
 ?>
-<table border="0" cellpadding="2" cellspacing="1">
+<table cellpadding="2" cellspacing="1">
 <thead>
 <tr>
     <td colspan="6" align="center">
diff --git a/server_status.php b/server_status.php
index 6cdd5c6228..1acd120c8f 100644
--- a/server_status.php
+++ b/server_status.php
@@ -830,13 +830,13 @@ echo __('Runtime Information');
         </div>
         <div id="statustabs_allvars" class="clearfloat">
             <fieldset id="tableFilter" class="jsfeature">
+                <legend><?php echo __('Filters'); ?></legend>
                 <div class="buttonlinks">
                     <a class="tabRefresh" href="<?php echo $PMA_PHP_SELF . '?show=variables_table&amp;' . PMA_generate_common_url(); ?>" >
                         <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" />
                         <?php echo __('Refresh'); ?>
                     </a>
                 </div>
-                <legend><?php echo __('Filters'); ?></legend>
                 <div class="formelement">
                     <label for="filterText"><?php echo __('Containing the word:'); ?></label>
                     <input name="filterText" type="text" id="filterText" style="vertical-align: baseline;" />
@@ -1550,7 +1550,7 @@ function printMonitor()
             <?php echo PMA_getImage('play.png'); ?>
             <?php echo __('Start Monitor'); ?>
         </a>
-        <a href="#settingsPopup" rel="popupLink" style="display:none;">
+        <a href="#settingsPopup" class="popupLink" style="display:none;">
             <?php echo PMA_getImage('s_cog.png'); ?>
             <?php echo __('Settings'); ?>
         </a>
@@ -1735,7 +1735,7 @@ function printMonitor()
     </div>
     <?php } ?>
 
-    <table border="0" class="clearfloat" id="chartGrid">
+    <table class="clearfloat" id="chartGrid">
 
     </table>
     <div id="logTable">
diff --git a/tbl_change.php b/tbl_change.php
index 7a244ff307..d5059a7e78 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -1047,7 +1047,7 @@ foreach ($rows as $row_id => $vrow) {
     <div id="gis_editor"></div><div id="popup_background"></div>
     <br />
     <fieldset id="actions_panel">
-    <table border="0" cellpadding="5" cellspacing="0">
+    <table cellpadding="5" cellspacing="0">
     <tr>
         <td valign="middle" nowrap="nowrap">
             <select name="submit_type" class="control_at_footer" tabindex="<?php echo ($tabindex + $tabindex_for_value + 1); ?>">
diff --git a/tbl_printview.php b/tbl_printview.php
index 03c5c75f8e..79dd3d3173 100644
--- a/tbl_printview.php
+++ b/tbl_printview.php
@@ -261,7 +261,7 @@ foreach ($the_tables as $key => $table) {
                 ?>
     <br /><br />
 
-    <table border="0" cellspacing="0" cellpadding="0" class="noborder">
+    <table cellspacing="0" cellpadding="0">
     <tr>
 
         <!-- Space usage -->
diff --git a/themes.php b/themes.php
index f343987291..9c6d6731f2 100644
--- a/themes.php
+++ b/themes.php
@@ -25,7 +25,7 @@ require './libraries/header_scripts.inc.php';
 
 <body id="bodythemes">
 <h1>phpMyAdmin - <?php echo __('Theme'); ?></h1>
-<p><a href="<?php echo PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php'); ?>#pma_<?php echo preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); ?>" rel="_blank"><?php echo __('Get more themes!'); ?></a></p>
+<p><a href="<?php echo PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php'); ?>#pma_<?php echo preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); ?>" class="_blank"><?php echo __('Get more themes!'); ?></a></p>
 <?php
 $_SESSION['PMA_Theme_Manager']->printPreviews();
 ?>
diff --git a/transformation_overview.php b/transformation_overview.php
index 12db462345..ae80a506e8 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -40,7 +40,7 @@ foreach ($types['mimetype'] as $key => $mimetype) {
 <br />
 <br />
 <h2><?php echo __('Available transformations'); ?></h2>
-<table border="0" width="90%">
+<table width="90%">
 <thead>
 <tr>
     <th><?php echo __('Browser transformation'); ?></th>