diff --git a/ChangeLog b/ChangeLog
index 443e48714..0a23cc177 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@ $Source$
         - 'splitted' changed to 'seperated'	
     * lang/portuguese.inc.php3 updates, thanks to Lopo Pizarro
     * lang/polish.inc.php3 updates, thanks to Jakub Wilk
+    * db_details_links.php3, header.inc.php3,
+      tbl_properties_links.php3, libraries/common.lib.php3
+        - Neater tab code by Michal Cihar (Patch #571837)
 
 2002-06-21 Marc Delisle  <lem9@users.sourceforge.net>
     * sql.php3: patch 565627 for the old bug 461192: wrong query count
diff --git a/db_details_links.php3 b/db_details_links.php3
index 062288525..3613375d9 100644
--- a/db_details_links.php3
+++ b/db_details_links.php3
@@ -44,7 +44,7 @@ else {
  * Displays tab links
  */
 ?>
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" width="100%" class="tabs">
 	<tr>
 		<td width="8">&nbsp;</td>
 <?php
@@ -70,7 +70,4 @@ if ($lnk5) {
 echo "\n";
 ?>
 	</tr>
-	<tr>
-		<td colspan="<?php echo ($db_details_links_count_tabs*2+1); ?>" bgcolor="gray" class="topline"><img width="1" height="1" alt="" src="images/spacer.gif" /></td>
-	</tr>
 </table>
diff --git a/header.inc.php3 b/header.inc.php3
index 239e6786e..c0fac26a8 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -93,6 +93,20 @@ a.drop:hover    {font-family: <?php echo $right_font_family; ?>; color: #ffffff;
 .nav            {font-family: <?php echo $right_font_family; ?>; color: #000000}
 .warning        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000}
 td.topline      {font-size: 1px}
+td.tab          {
+    border-top: 1px solid black; 
+    border-right: 1px solid black; 
+    border-left: 1px solid black; 
+    border-bottom: none;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+}
+table.tabs      {
+    border-top: none; 
+    border-right: none; 
+    border-left: none; 
+    border-bottom: 2px solid gray;
+}
 //-->
 </style>
 
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index d8fb39852..57c5f674a 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -1347,7 +1347,7 @@ if (typeof(document.getElementById) != 'undefined'
         $bgcolor = (basename($PHP_SELF) == $link) ? "silver" : "#DFDFDF";
         $db_details_links_count_tabs++;
 
-        $out = "\n\t\t<td bgcolor=\"$bgcolor\" align=\"center\" width=\"64\" nowrap=\"nowrap\">";
+        $out = "\n\t\t<td bgcolor=\"$bgcolor\" align=\"center\" width=\"64\" nowrap=\"nowrap\" class=\"tab\">";
         if (strlen($link)>0)
             $out .= "<a href=\"$link?$args\" $attr><b>$text</b></a>";
         else
diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php3
index c6f29f1b8..f53ea7b28 100755
--- a/tbl_properties_links.php3
+++ b/tbl_properties_links.php3
@@ -25,8 +25,12 @@ if ($num_rows > 0) {
     $att6    = 'onclick="return confirmLink(this, \'' . $ln6_stt . PMA_jsFormat($table) . '\')"';
 } else {
     $lnk2 = '';
+    $arg2 = '';
     $lnk4 = '';
+    $arg4 = '';
     $lnk6 = '';
+    $arg6 = '';
+    $att6 = '';
 }
 
 $lnk7 = "sql.php3";
@@ -37,7 +41,7 @@ $att7 = 'class="drop" onclick="return confirmLink(this, \'DROP TABLE ' . PMA_jsF
  * Displays links
  */
 ?>
-<table border="0" cellspacing="0" cellpadding="0" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" width="100%" class="tabs">
 	<tr>
 		<td width="8">&nbsp;</td>
 <?php
@@ -55,7 +59,4 @@ echo printTab($strDrop,"sql.php3",$arg7,$att7);
 ?>
 
 	</tr>
-	<tr>
-		<td colspan="<?php echo ($db_details_links_count_tabs*2+1); ?>" bgcolor="gray" class="topline"><img width="1" height="1" alt="" src="images/spacer.gif" /></td>
-	</tr>
-</table>
\ No newline at end of file
+</table>