diff --git a/db_qbe.php b/db_qbe.php
index de8bbe31e2..767933fd9f 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -369,7 +369,7 @@ for ($y = 0; $y <= $row; $y++) {
 <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
     <td class="<?php echo $cell_align_right; ?> nowrap">
         <!-- Row controls -->
-        <table cellpadding="0" cellspacing="0" border="0">
+        <table class="nospacing nopadding" border="0">
         <tr>
             <td class="<?php echo $cell_align_right; ?> nowrap">
                 <small><?php echo __('Ins'); ?>:</small>
@@ -451,7 +451,7 @@ for ($y = 0; $y <= $row; $y++) {
 <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> noclick">
     <td class="<?php echo $cell_align_right; ?> nowrap">
         <!-- Row controls -->
-        <table cellpadding="0" cellspacing="0">
+        <table class="nospacing nopadding">
         <tr>
             <td class="<?php echo $cell_align_right; ?> nowrap">
                 <small><?php echo __('Ins'); ?>:</small>
diff --git a/db_tracking.php b/db_tracking.php
index 76c24fb713..765e39bb1f 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -185,7 +185,7 @@ if (isset($my_tables)) {
     <table id="noversions" class="data">
     <thead>
     <tr>
-        <th width="300"><?php echo __('Table');?></th>
+        <th style="width: 300px"><?php echo __('Table');?></th>
         <th></th>
     </tr>
     </thead>
diff --git a/js/import.js b/js/import.js
index 98e34fafe1..f1ab31bfe0 100644
--- a/js/import.js
+++ b/js/import.js
@@ -81,4 +81,5 @@ $(document).ready(function() {
     $("#scroll_to_options_msg").hide();
     $(".format_specific_options").css({ "border": 0, "margin": 0, "padding": 0 });
     $(".format_specific_options h3").remove();
+    //$("form[name=import] *").unwrap();
 });
diff --git a/js/rte/common.js b/js/rte/common.js
index a1a553cdea..859d6e1efc 100644
--- a/js/rte/common.js
+++ b/js/rte/common.js
@@ -334,7 +334,7 @@ $(document).ready(function () {
                     var $table = $curr_row.parent();
                     // Check how many rows will be left after we remove
                     // the one that the user has requested us to remove
-                    if ($table.find('tr').length === 2) {
+                    if ($table.find('tr').length === 3) {
                         // If there are two rows left, it means that they are
                         // the header of the table and the rows that we are
                         // about to remove, so after the removal there will be
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 76f4742601..750d52c51f 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -473,9 +473,9 @@ class PMA_Index
             if (! $print_mode) {
                 $this_params = $GLOBALS['url_params'];
                 $this_params['index'] = $index->getName();
-                $r .= '<td class="edit_index ';
+                $r .= '<td class="edit_index';
                 if ($GLOBALS['cfg']['AjaxEnable']) {
-                    $r .= 'ajax" ';
+                    $r .= ' ajax';
                 }
                 $r .= '" ' . $row_span . '>'
                    . '    <a href="tbl_indexes.php' . PMA_generate_common_url($this_params)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index fb51325fd4..c94cade468 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1054,9 +1054,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
 
     // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence,
     // check for it's presence before using it
-    echo '<div id="result_query" '
-        . ( isset($GLOBALS['cell_align_left']) ? 'style="text-align: ' . $GLOBALS['cell_align_left'] . '" ' : '' )
-        . '">' . "\n";
+    echo '<div id="result_query"'
+        . ( isset($GLOBALS['cell_align_left']) ? ' style="text-align: ' . $GLOBALS['cell_align_left'] . '"' : '' )
+        . '>' . "\n";
 
     if ($message instanceof PMA_Message) {
         if (isset($GLOBALS['special_message'])) {
@@ -1334,11 +1334,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
             // document.write conflicts with jQuery, hence used $().append()
             echo "<script type=\"text/javascript\">\n" .
                 "//<![CDATA[\n" .
-                "$('.tools form').last().after('[<a href=\"#\" title=\"" .
+                "$('.tools form').last().after('[ <a href=\"#\" title=\"" .
                 PMA_escapeJsString(__('Inline edit of this query')) .
                 "\" class=\"inline_edit_sql\">" .
                 PMA_escapeJsString(_pgettext('Inline edit query', 'Inline')) .
-                "</a>]');\n" .
+                "</a> ]');\n" .
                 "//]]>\n" .
                 "</script>";
         }
@@ -2790,21 +2790,24 @@ function PMA_toggleButton($action, $select_name, $options, $callback)
         $retval .= "        <div title='" . __('Click to toggle') . "' class='container $state'>\n";
         $retval .= "            <img src='{$GLOBALS['pmaThemeImage']}toggle-{$GLOBALS['text_dir']}.png'\n";
         $retval .= "                 alt='' />\n";
-        $retval .= "            <table cellspacing='0' cellpadding='0'><tr>\n";
+        $retval .= "            <table class='nospacing nopadding'>\n";
         $retval .= "                <tbody>\n";
+        $retval .= "                <tr>\n";
         $retval .= "                <td class='toggleOn'>\n";
         $retval .= "                    <span class='hide'>$link_on</span>\n";
         $retval .= "                    <div>";
-        $retval .= str_replace(' ', '&nbsp;', $options[1]['label']) . "</div>\n";
+        $retval .= str_replace(' ', '&nbsp;', $options[1]['label']) . "\n";
+        $retval .= "                    </div>\n";
         $retval .= "                </td>\n";
         $retval .= "                <td><div>&nbsp;</div></td>\n";
         $retval .= "                <td class='toggleOff'>\n";
         $retval .= "                    <span class='hide'>$link_off</span>\n";
         $retval .= "                    <div>";
-        $retval .= str_replace(' ', '&nbsp;', $options[0]['label']) . "</div>\n";
+        $retval .= str_replace(' ', '&nbsp;', $options[0]['label']) . "\n";
         $retval .= "                    </div>\n";
+        $retval .= "                </tr>\n";
         $retval .= "                </tbody>\n";
-        $retval .= "            </tr></table>\n";
+        $retval .= "            </table>\n";
         $retval .= "            <span class='hide callback'>$callback</span>\n";
         $retval .= "            <span class='hide text_direction'>{$GLOBALS['text_dir']}</span>\n";
         $retval .= "        </div>\n";
@@ -3316,7 +3319,13 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
  */
 function PMA_browseUploadFile($max_upload_size)
 {
-    echo '<label for="radio_import_file">' . __("Browse your computer:") . '</label>';
+    if ($GLOBALS['is_upload'] && !empty($GLOBALS['cfg']['UploadDir'])) {
+        echo '<label for="radio_import_file">';
+    }
+    else {
+        echo '<label for="input_import_file">';
+    }
+    echo __("Browse your computer:") . '</label>';
     echo '<div id="upload_form_status" style="display: none;"></div>';
     echo '<div id="upload_form_status_info" style="display: none;"></div>';
     echo '<input type="file" name="import_file" id="input_import_file" />';
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index a714f995e9..f39e52e7de 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -723,16 +723,32 @@ function PMA_linkURL($url)
  * Returns HTML code to include javascript file.
  *
  * @param string $url Location of javascript, relative to js/ folder.
+ * @param optional string $ie_conditional true - wrap with IE conditional comment
+ *                                        'lt 9' etc. - wrap for specific IE version
  *
  * @return string HTML code for javascript inclusion.
  */
-function PMA_includeJS($url)
+function PMA_includeJS($url, $ie_conditional = false)
 {
-    if (strpos($url, '?') === false) {
-        return '<script src="js/' . $url . '?ts=' . filemtime('./js/' . $url) . '" type="text/javascript"></script>' . "\n";
-    } else {
-        return '<script src="js/' . $url . '" type="text/javascript"></script>' . "\n";
+    $include = '';
+    if ($ie_conditional !== false) {
+        if ($ie_conditional === true) {
+            $include .= '<!--[if IE]>' . "\n    ";
+        }
+        else {
+            $include .= '<!--[if IE ' . $ie_conditional . ']>' . "\n    ";
+        }
     }
+    if (strpos($url, '?') === false) {
+        $include .= '<script src="js/' . $url . '?ts=' . filemtime('js/' . $url) . '" type="text/javascript"></script>' . "\n";
+    }
+    else {
+        $include .= '<script src="js/' . $url . '" type="text/javascript"></script>' . "\n";
+    }
+    if ($ie_conditional !== false) {
+        $include .= '<![endif]-->' . "\n";
+    }
+    return $include;
 }
 
 /**
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 3e5a66e0c3..9703e762f6 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -106,9 +106,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
                 document.write('<form action="import.php" method="post" enctype="multipart/form-data" name="import"<?php if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") echo ' target="import_upload_iframe"'; ?>>');
                 //]]>
     </script>
-    <noscript>
-        <form action="import.php" method="post" enctype="multipart/form-data" name="import">
-    </noscript>
+    <form action="import.php" method="post" enctype="multipart/form-data" name="import">
     <input type="hidden" name="<?php echo $ID_KEY; ?>" value="<?php echo $upload_id ; ?>" />
     <?php
     if ($import_type == 'server') {
@@ -252,7 +250,6 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
         <?php echo PMA_pluginGetOptions('Import', $import_list); ?>
     </div>
         <div class="clearfloat"></div>
-    </div>
     <?php
     // Encoding setting form appended by Y.Kawada
     if (function_exists('PMA_set_enc_form')) { ?>
@@ -267,3 +264,4 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
         <input type="submit" value="<?php echo __('Go'); ?>" id="buttonGo" />
     </div>
 </form>
+</div>
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 4e16a995c6..02074f4d9b 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 cellpadding="0" cellspacing="0" class="navigation">
+<table class="navigation nospacing nopadding">
 <tr>
     <td class="navigation_separator"></td>
     <?php
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index c8a68ac1cb..de2c25913f 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -53,7 +53,11 @@ $GLOBALS['js_include'][] = 'get_image.js.php?theme=' . urlencode($_SESSION['PMA_
 // avoid loading twice a js file
 $GLOBALS['js_include'] = array_unique($GLOBALS['js_include']);
 foreach ($GLOBALS['js_include'] as $js_script_file) {
-    echo PMA_includeJS($js_script_file);
+    $ie_conditional = false;
+    if (is_array($js_script_file)) {
+        list($js_script_file, $ie_conditional) = $js_script_file;
+    }
+    echo PMA_includeJS($js_script_file, $ie_conditional);
 }
 // Below javascript Updates the title of the frameset if possible
 ?>
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 34556b4d25..22a396f625 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -46,12 +46,18 @@ function PMA_RTE_getList($type, $items)
     $retval .= "    <table class='data$class2'>\n";
     $retval .= "        <!-- TABLE HEADERS -->\n";
     $retval .= "        <tr>\n";
+    // th cells with a colspan need corresponding td cells, according to W3C
     switch ($type) {
     case 'routine':
         $retval .= "            <th>" . __('Name') . "</th>\n";
         $retval .= "            <th colspan='4'>" . __('Action') . "</th>\n";
         $retval .= "            <th>" . __('Type') . "</th>\n";
         $retval .= "            <th>" . __('Returns') . "</th>\n";
+        $retval .= "        </tr>\n";
+        $retval .= "        <tr style='display: none'>\n"; // see comment above
+        for($i = 0; $i < 7; $i++) {
+            $retval .= "            <td></td>\n";
+        }
         break;
     case 'trigger':
         $retval .= "            <th>" . __('Name') . "</th>\n";
@@ -61,12 +67,22 @@ function PMA_RTE_getList($type, $items)
         $retval .= "            <th colspan='3'>" . __('Action') . "</th>\n";
         $retval .= "            <th>" . __('Time') . "</th>\n";
         $retval .= "            <th>" . __('Event') . "</th>\n";
+        $retval .= "        </tr>\n";
+        $retval .= "        <tr style='display: none'>\n"; // see comment above
+        for($i = 0; $i < (empty($table) ? 7 : 6); $i++) {
+            $retval .= "            <td></td>\n";
+        }
         break;
     case 'event':
         $retval .= "            <th>" . __('Name') . "</th>\n";
         $retval .= "            <th>" . __('Status') . "</th>\n";
         $retval .= "            <th colspan='3'>" . __('Action') . "</th>\n";
         $retval .= "            <th>" . __('Type') . "</th>\n";
+        $retval .= "        </tr>\n";
+        $retval .= "        <tr style='display: none'>\n"; // see comment above
+        for($i = 0; $i < 6; $i++) {
+            $retval .= "            <td></td>\n";
+        }
         break;
     default:
         break;
diff --git a/prefs_manage.php b/prefs_manage.php
index 136aa5fad7..e765955af6 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -245,16 +245,16 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@'));
                     <div class="localStorage-supported">
                         <?php echo __('Settings will be imported from your browser\'s local storage.') ?>
                         <br />
-                        <span class="localStorage-exists">
+                        <div class="localStorage-exists">
                             <?php echo __('Saved on: @DATE@') ?>
-                        </span>
-                        <span class="localStorage-empty">
+                        </div>
+                        <div class="localStorage-empty">
                             <?php  PMA_Message::notice(__('You have no saved settings!'))->display() ?>
-                        </span>
+                        </div>
                     </div>
-                    <span class="localStorage-unsupported">
+                    <div class="localStorage-unsupported">
                         <?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?>
-                    </span>
+                    </div>
                 </div>
 
                 <input type="checkbox" id="import_merge" name="import_merge" />
@@ -306,9 +306,9 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@'));
                             <br /><b><?php echo __('Existing settings will be overwritten!') ?></b>
                         </span>
                     </span>
-                    <span class="localStorage-unsupported">
+                    <div class="localStorage-unsupported">
                         <?php PMA_Message::notice(__('This feature is not supported by your web browser'))->display() ?>
-                    </span>
+                    </div>
                 </div>
                 <br />
                 <input type="submit" name="submit_export" value="<?php echo __('Go'); ?>" />
diff --git a/tbl_select.php b/tbl_select.php
index 64c92733d7..660c84c723 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -261,13 +261,9 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
 </fieldset>
 </form>
 <div id="sqlqueryresults"></div>
+</fieldset>
     <?php
     include 'libraries/footer.inc.php';
-?>
-
-</fieldset>
-
-<?php
 } else {
     /**
      * Selection criteria have been submitted -> do the work
diff --git a/tbl_structure.php b/tbl_structure.php
index b827e798be..359d32f203 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -208,7 +208,7 @@ $i = 0;
 <?php if ($db_is_information_schema || $tbl_is_view) { ?>
     <th><?php echo __('View'); ?></th>
 <?php } else { /* see functions.js, displayMoreTableOpts() */?>
-    <th colspan="7" class="action"><?php echo __('Action'); ?></th>
+    <th colspan="9" class="action"><?php echo __('Action'); ?></th>
 <?php } ?>
 </tr>
 </thead>
@@ -671,7 +671,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
     ?>
 <input type="submit" value="<?php echo __('Go'); ?>" />
 </form>
-<iframe class="IE_hack" scrolling="no"></iframe>
+<iframe class="IE_hack"></iframe>
 <hr />
 <div id="index_div" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> >
     <?php
@@ -758,7 +758,7 @@ if ($cfg['ShowStats']) {
 
     <fieldset>
     <legend><?php echo __('Information'); ?></legend>
-    <a name="showusage"></a>
+    <a id="showusage"></a>
     <?php if (! $tbl_is_view && ! $db_is_information_schema) { ?>
     <table id="tablespaceusage" class="data">
     <caption class="tblHeaders"><?php echo __('Space usage'); ?></caption>
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 78e43b7892..d04265a534 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -155,6 +155,14 @@ button {
     margin-<?php echo $right; ?>: 1em;
 }
 
+table.nospacing {
+    border-spacing: 0;
+}
+
+table.nopadding tr th, table.nopadding tr td {
+    padding: 0;
+}
+
 th.left, td.left {
     text-align: left;
 }
@@ -1836,6 +1844,7 @@ iframe.IE_hack {
     display: none;
     border: 0;
     filter: alpha(opacity=0);
+    overflow: hidden;
 }
 
 /* config forms */
@@ -2100,7 +2109,7 @@ fieldset .disabled-field td {
     cursor: pointer;
     font-size: 0.8em;
     text-align: center;
-    line-height: 1.55em;
+    line-height: 1.4em;
     height: 1.55em;
     overflow: hidden;
     border-right: 0.1em solid #888;
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 8097a9a2a1..b9e0199fea 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -351,6 +351,14 @@ select[multiple] {
     margin-<?php echo $right; ?>: 1em;
 }
 
+table.nospacing {
+    border-spacing: 0;
+}
+
+table.nopadding tr th, table.nopadding tr td {
+    padding: 0;
+}
+
 th.left, td.left {
     text-align: left;
 }
@@ -2313,6 +2321,7 @@ iframe.IE_hack {
     display: none;
     border: 0;
     filter: alpha(opacity=0);
+    overflow: hidden;
 }
 
 /* config forms */
@@ -2601,7 +2610,7 @@ fieldset .disabled-field td {
     cursor: pointer;
     font-size: .8em;
     text-align: center;
-    line-height: 1.55em;
+    line-height: 1.4em;
     height: 1.55em;
     overflow: hidden;
     border-right: .1em solid #888;