diff --git a/ChangeLog b/ChangeLog
index 32dbea9a8..ad2749aa9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,9 @@ $Id$
 $Source$
 
 2003-08-15 Marc Delisle  <lem9@users.sourceforge.net>
-    * tbl_properties_structure.php3: bug 786710, IE and dropping fields
+    * tbl_properties_structure.php3: bug 786710, IE and dropping fields,
+      and bug 788676: added a table to help Netscape aligning the icons
+      with the text
 
 2003-08-15 Garvin Hicking <me@supergarv.de>
     * tbl_properties_structure.php3: RFE #784900 (show alternate text for
diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php3
index f0dd124af..5aa90cb6a 100755
--- a/tbl_properties_structure.php3
+++ b/tbl_properties_structure.php3
@@ -375,7 +375,10 @@ $checkall_url = 'tbl_properties_structure.php3?' . PMA_generate_common_url($db,$
 
 <tr>
     <td colspan="<?php echo PMA_MYSQL_INT_VERSION >= 40100 ? '14' : (PMA_MYSQL_INT_VERSION >= 32323 ? '13' : '12'); ?>">
-        <img src="./images/arrow_<?php echo $text_dir; ?>.gif" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" />
+        <table>
+            <tr>
+                <td>
+                    <img src="./images/arrow_<?php echo $text_dir; ?>.gif" border="0" width="38" height="22" alt="<?php echo $strWithChecked; ?>" />
         <a href="<?php echo $checkall_url; ?>&amp;checkall=1" onclick="setCheckboxes('fieldsForm', true); return false;">
             <?php echo $strCheckAll; ?></a>
         &nbsp;/&nbsp;
@@ -383,38 +386,43 @@ $checkall_url = 'tbl_properties_structure.php3?' . PMA_generate_common_url($db,$
             <?php echo $strUncheckAll; ?></a>
         &nbsp;&nbsp;&nbsp;
         <i><?php echo $strWithChecked; ?></i>&nbsp;&nbsp;
-<?php
+                </td>
+                <td>
+                    <?php
 
 if ($cfg['PropertiesIconic']) {
     /* Opera has trouble with <input type="image"> */
     /* IE has trouble with <button> */
     if (PMA_USR_BROWSER_AGENT != 'IE') {
-        echo '        <button class="mult_submit" type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '">' . "\n"
-           . '            <img src="./images/button_edit.png" title="' . $strChange . '" alt="' . $strChange . '" width="12" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n"
-           . '        </button>' . "\n";
+        echo '<button class="mult_submit" type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '">' . "\n"
+           . '<img src="./images/button_edit.png" title="' . $strChange . '" alt="' . $strChange . '" width="12" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n"
+           . '</button>' . "\n";
     } else {
-        echo '        <input type="image" name="submit_mult_change" value="' .$strChange . '" title="' . $strChange . '" src="./images/button_edit.png" />'  . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n"; 
+        echo '                    <input type="image" name="submit_mult_change" value="' .$strChange . '" title="' . $strChange . '" src="./images/button_edit.png" />'  . (($propicon == 'both') ? '&nbsp;' . $strChange : '') . "\n"; 
     }
     // Drop button if there is at least two fields
     if ($fields_cnt > 1) {
         if (PMA_USR_BROWSER_AGENT != 'IE') {
-            echo '        <button class="mult_submit" type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '">' . "\n"
-               . '            <img src="./images/button_drop.png" title="' . $strDrop . '" alt="' . $strDrop . '" width="11" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n"
-               . '        </button>' . "\n";
+            echo '                    <button class="mult_submit" type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '">' . "\n"
+               . '<img src="./images/button_drop.png" title="' . $strDrop . '" alt="' . $strDrop . '" width="11" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n"
+               . '</button>' . "\n";
         } else {
-            echo '        <input type="image" name="submit_mult_drop" value="' .$strDrop . '" title="' . $strDrop . '" src="./images/button_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n"; 
+            echo '                    <input type="image" name="submit_mult_drop" value="' .$strDrop . '" title="' . $strDrop . '" src="./images/button_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $strDrop : '') . "\n"; 
         }
     }
 } else {
-    echo '        <input type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '" />' . "\n";
+    echo '                    <input type="submit" name="submit_mult" value="' . $strChange . '" title="' . $strChange . '" />' . "\n";
     // Drop button if there is at least two fields
     if ($fields_cnt > 1) {
-        echo '        &nbsp;<i>' . $strOr . '</i>&nbsp;' . "\n"
-           . '        <input type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '" />' . "\n";
+        echo '                    &nbsp;<i>' . $strOr . '</i>&nbsp;' . "\n"
+           . '                    <input type="submit" name="submit_mult" value="' . $strDrop . '" title="' . $strDrop . '" />' . "\n";
     }
 }
 
 ?>
+                </td>
+            </tr>
+        </table>
     </td>
 </tr>
 </table>