diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 0a7031a56..6a257463b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -987,6 +987,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice')
 
     if ($message instanceof PMA_Message) {
         $message->display();
+        $type = $message->getLevel();
     } else {
         echo '<div class="' . $type . '">';
         echo PMA_sanitize($message);
@@ -1170,27 +1171,23 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice')
             $validate_link = '';
         } //validator
 
-        // Displays the message
-        echo '<fieldset class="">' . "\n";
-        echo '    <legend>' . $GLOBALS['strSQLQuery'] . ':</legend>';
-        echo '    <div>';
+        echo '<code class="sql">';
         if ($query_too_big) {
-            echo '    ' . substr($query_base, 0, $cfg['MaxCharactersInDisplayedSQL']) . '[...]';
+            echo substr($query_base, 0, $cfg['MaxCharactersInDisplayedSQL']) . '[...]';
         } else {
-            echo '    ' . $query_base;
+            echo $query_base;
         }
 
         //Clean up the end of the PHP
         if (! empty($GLOBALS['show_as_php'])) {
             echo '";';
         }
-        echo '    </div>';
-        echo '</fieldset>' . "\n";
+        echo '</code>';
 
-        echo '<fieldset class="tblFooters">';
+        echo '<div class="tools">';
         PMA_profilingCheckbox($sql_query);
         echo $edit_link . $explain_link . $php_link . $refresh_link . $validate_link;
-        echo '</fieldset>';
+        echo '</div>';
     }
     echo '</div><br />' . "\n";
 } // end of the 'PMA_showMessage()' function
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 22fc3090e..a7882e0a7 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -15,6 +15,14 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 ?>
 /******************************************************************************/
 /* general tags */
+html {
+    font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
+}
+
+input, select, textarea {
+    font-size: 1em;
+}
+
 body {
 <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
     font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
@@ -30,7 +38,6 @@ textarea, tt, pre, code {
     font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
 }
 <?php } ?>
-
 h1 {
     font-size:          180%;
     font-weight:        bold;
@@ -122,9 +129,9 @@ fieldset fieldset {
 }
 
 fieldset legend {
-    color:              #444444;
-    font-weight:        bold;
     background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+    font-weight:        bold;
+    color:              #444444;
     padding:            2px 2px 2px 2px;
 }
 
@@ -152,7 +159,12 @@ button {
 
 /******************************************************************************/
 /* classes */
+div.tools {
+    border: 1px solid #000000;
+    padding: 0.2em;
+}
 
+div.tools,
 fieldset.tblFooters {
     margin-top:         0;
     margin-bottom:      0.5em;
@@ -181,11 +193,13 @@ button.mult_submit {
 }
 
 /* odd items 1,3,5,7,... */
+table tr.odd th,
 .odd {
     background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
 }
 
 /* even items 2,4,6,8,... */
+table tr.even th,
 .even {
     background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
 }
@@ -385,20 +399,20 @@ div.success,
 div.notice,
 div.warning,
 div.error {
-    margin:             0.3em 0 0.3em 0;
+    margin:             0.3em 0 0 0;
     border:             2px solid;
     width:              90%;
     <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-repeat:  no-repeat;
         <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 10px 50%;
-    padding:            10px 10px 10px 36px;
+    padding:            0.1em 0.1em 0.1em 36px;
         <?php } else { ?>
     background-position: 99% 50%;
     padding:            10px 5% 10px 10px;
         <?php } ?>
     <?php } else { ?>
-    padding:            0.5em;
+    padding:            0.3em;
     <?php } ?>
 }
 
@@ -500,16 +514,19 @@ fieldset.confirmation legend {
     background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }
 
+div.tools,
 .tblFooters {
     font-weight:        normal;
     color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
     background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-
 }
 
 .tblHeaders a:link,
 .tblHeaders a:active,
 .tblHeaders a:visited,
+div.tools a:link,
+div.tools a:visited,
+div.tools a:active,
 .tblFooters a:link,
 .tblFooters a:active,
 .tblFooters a:visited {
@@ -518,6 +535,7 @@ fieldset.confirmation legend {
 }
 
 .tblHeaders a:hover,
+div.tools a:hover,
 .tblFooters a:hover {
     text-decoration:    none;
     color:              #ffffff;
@@ -1166,3 +1184,16 @@ label.desc {
     width: 30em;
     float: <?php echo $left; ?>;
 }
+
+code.sql {
+    display:            block;
+    padding:            0.3em;
+    margin-top:         0;
+    margin-bottom:      0;
+    border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
+    border-top:         0;
+    border-bottom:      0;
+    max-height:         10em;
+    overflow:           auto;
+    background:         <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+}
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index f46997f31..c962520d5 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -15,6 +15,13 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 ?>
 /******************************************************************************/
 /* general tags */
+html {
+    font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
+}
+
+input, select, textarea {
+    font-size: 1em;
+}
 
 body {
 <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
@@ -38,8 +45,8 @@ a:active {
 }
 
 ul {
-	margin:0;
-}	
+    margin:0;
+}
 
 form {
     margin:             0;
@@ -204,7 +211,7 @@ div#left_tableList ul ul {
     padding-<?php echo $left; ?>:       0.1em;
     border-<?php echo $left; ?>:        0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     padding-bottom:     0.1em;
-    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>; 
+    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }
 
 /* for the servers list in navi panel */
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 7fdc55382..5b0c135ee 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -15,6 +15,14 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 ?>
 /******************************************************************************/
 /* general tags */
+html {
+    font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
+}
+
+input, select, textarea {
+    font-size: 1em;
+}
+
 body {
 <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
     font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
@@ -30,7 +38,6 @@ textarea, tt, pre, code {
     font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
 }
 <?php } ?>
-
 h1 {
     font-size:          140%;
     font-weight:        bold;
@@ -135,7 +142,12 @@ button {
 
 /******************************************************************************/
 /* classes */
+div.tools {
+    border: 1px solid #000000;
+    padding: 0.2em;
+}
 
+div.tools,
 fieldset.tblFooters {
     margin-top:         0;
     margin-bottom:      0.5em;
@@ -363,19 +375,19 @@ div.success,
 div.notice,
 div.warning,
 div.error {
-    margin:             0.3em 0 0.3em 0;
+    margin:             0.3em 0 0 0;
     border:             2px solid;
     <?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
     background-repeat:  no-repeat;
         <?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
     background-position: 10px 50%;
-    padding:            10px 10px 10px 36px;
+    padding:            0.1em 0.1em 0.1em 36px;
         <?php } else { ?>
     background-position: 99% 50%;
     padding:            10px 5% 10px 10px;
         <?php } ?>
     <?php } else { ?>
-    padding:            0.5em;
+    padding:            0.3em;
     <?php } ?>
 }
 
@@ -478,16 +490,19 @@ fieldset.confirmation legend {
     background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }
 
+div.tools,
 .tblFooters {
     font-weight:        normal;
     color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
     background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-
 }
 
 .tblHeaders a:link,
 .tblHeaders a:active,
 .tblHeaders a:visited,
+div.tools a:link,
+div.tools a:visited,
+div.tools a:active,
 .tblFooters a:link,
 .tblFooters a:active,
 .tblFooters a:visited {
@@ -495,6 +510,7 @@ fieldset.confirmation legend {
 }
 
 .tblHeaders a:hover,
+div.tools a:hover,
 .tblFooters a:hover {
     color:              #FF0000;
 }
@@ -1093,7 +1109,10 @@ li#li_flush_privileges {
     float: <?php echo $left; ?>;
 }
 
-#div_table_copy, #div_partition_maintenance, #div_referential_integrity, #div_table_maintenance {
+#div_table_copy, 
+#div_partition_maintenance, 
+#div_referential_integrity, 
+#div_table_maintenance {
     min-width: 48%;
     float: <?php echo $left; ?>;
 }
@@ -1116,3 +1135,16 @@ label.desc {
     width: 30em;
     float: <?php echo $left; ?>;
 }
+
+code.sql {
+    display:            block;
+    padding:            0.3em;
+    margin-top:         0;
+    margin-bottom:      0;
+    border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
+    border-top:         0;
+    border-bottom:      0;
+    max-height:         10em;
+    overflow:           auto;
+    background:         <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+}