diff --git a/ChangeLog b/ChangeLog
index a0dd43b28..d5f7dac5a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
       tbl_properties_links.php, css/phpmyadmin.css.php: Use classes for
       heading (RFE #965542).
     * libraries/common.lib.php: Add drop class also to td (RFE #946540).
+    * db_details.php, db_details_structure.php, css/phpmyadmin.css.php: CSSize
+      error messages.
 
 2004-06-02 Alexander M. Turek  <happybirthdaytome@derrabus.de>
     * db_details_db_info.php, tbl_properties_tbl_info.php: Table type is called
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 0bdcfa2a4..4502fe669 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -239,14 +239,33 @@ div.warning {
     width: 90%;
 }
 
+div.error {
+    width: 100%;
+    border: 1px solid #cc0000;
+    background-color: #ffffcc;
+    padding: 0px;
+}
+
+div.error  div.text {
+    padding: 5px;
+}
+
+div.error div.head {
+    background-color: #cc0000;
+    font-weight: bold;
+    color: #ffffff;
+<?php if ($cfg['ErrorIconic']) { ?>
+    background-image: url(../images/s_error.png);
+    background-repeat: no-repeat;
+    background-position: 10px 50%;
+    padding: 2px 2px 2px 30px;
+<?php } ?>
+    margin: 0px;
+}
+
 /* some new styles added 20047-05-05 by Michael Keck (mkkeck) */
 
 /* tables */
-.tblError {
-  border:           1px solid #cc0000;
-  background-color: #ffffcc;
-		width: 100%;
-}
 .tblHeaders {
   background-color: #9999CC;
   font-weight:      bold;
@@ -257,16 +276,6 @@ div.warning {
   font-weight:      normal;
   color:            #000000;
 }
-.tblHeadError {
-  background-color: #cc0000;
-  font-weight:      bold;
-  color:            #ffffff;
-}
-.tblHeadWarn {
-  background-color: #ffcc00;
-  font-weight:      bold;
-  color:            #000000;
-}
 /* forbidden, no privilegs */
 .noPrivileges{
   color:            #cc0000;
@@ -505,7 +514,7 @@ h1 div a {
     font-weight: bolder;
 }
 
-<?php if ($cfg['ErrorIconic']) { ?>
+<?php if ($cfg['PropertiesIconic']) { ?>
 h1 div.server a {
     background-image: url(../images/s_host.png);
 }
diff --git a/db_details.php b/db_details.php
index 99331f8dc..4a083ecac 100644
--- a/db_details.php
+++ b/db_details.php
@@ -50,10 +50,6 @@ $auto_sel  = ($cfg['TextareaAutoSelect']
            : '';
 
 
-// added by mkkeck
-$strErrorUploadDir = '';
-// is needed to check if an error in $cfg['UploadDir'] (or this dir not exist)
-
 // for better administration
 $strHiddenFields = '        <input type="hidden" name="is_js_confirmed" value="0" />'  ."\n"
                  . '        ' .PMA_generate_common_hidden_inputs($db) . "\n"
@@ -175,21 +171,11 @@ if (!empty($cfg['UploadDir'])) {
                . '    </tr>' . "\n\n";
         } // end if (isfirst > 0)
         @closedir($handle);
-        $strErrorUploadDir=''; // please see 'else {' below ;)
     }
     else {
-        // modified by mkkeck 2004-05-08
-        //   showing UploadDir Error at the end of all option for SQL-Queries
-        $strErrorUploadDir = '    <tr><td colspan="2"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>' . "\n";
-        $strErrorUploadDir.= '    <tr><td colspan="2" class="tblHeadError">';
-        if ($cfg['PropertiesIconic']){
-           $strErrorUploadDir.= '<img src="./images/s_error.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
-        }
-        $strErrorUploadDir.= '    ' . $strError . '' . "\n";
-        $strErrorUploadDir.= '</td><tr>';
-        $strErrorUploadDir.= '<td colspan="2" class="tblError">';
-        $strErrorUploadDir.= '        &nbsp;' . wordwrap($strWebServerUploadDirectoryError,80,'<br />&nbsp;') . "\n";
-        $strErrorUploadDir.= '    </td></tr>' . "\n";
+        $upload_dir_error = '<tr><td colspan="2"><div class="error"><div class="head">' . $strError . '</div>'
+                            . '<div class="text">' . $strWebServerUploadDirectoryError
+                            . '</div></div></td></tr>';
     }
 } // end if (web-server upload directory)
 // Charset conversion options
@@ -257,8 +243,8 @@ if (function_exists('PMA_set_enc_form')) {
 }
 // modified by mkkeck 2004-05-08
 //   showing UploadDir Error at the end of all option for SQL-Queries
-if ($strErrorUploadDir!='') {
-    echo "\n\n" . '<!-- UploadDir not found -->' . "\n" . $strErrorUploadDir . "\n\n";
+if (isset($upload_dir_error)) {
+    echo $upload_dir_error;
 }
 ?>
 </form>
diff --git a/db_details_structure.php b/db_details_structure.php
index c6110b613..e173a0687 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -758,17 +758,9 @@ if (PMA_MYSQL_INT_VERSION >= 40101) {
 
 if ($num_tables > 0
     && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == FALSE) {
-    echo '    <tr><td colspan="3"><img src="images/spacer.png" width="1" height="1" border="0" alt="" /></td></tr>' . "\n"
-       . '    <tr><td colspan="3" class="tblHeadError">';
-       if ($cfg['PropertiesIconic']){
-         echo '<img src="./images/s_error.png" border="0" width="16" height="16" hspace="2" align="absmiddle" />';
-       }
-    echo '    ' . $strError . '' . "\n";
-    echo '</td><tr>';
-    echo '<td colspan="3" class="tblError">';
-    $url_to_goto = '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">';
-    echo '        ' . sprintf(wordwrap($strRelationNotWorking,60,'<br />'), $url_to_goto, '</a>') . "\n";
-    echo '    </td></tr>' . "\n";
+    echo '<tr><td colspan="3"><div class="error"><div class="head">' . $strError . '</div>'
+        . '<div class="text">' . sprintf($strRelationNotWorking, '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">',  '</a>')
+        . '</div></div></td></tr>';
 } // end if
 ?>
 </table>