diff --git a/ChangeLog b/ChangeLog
index fe070878a..b487a9a1c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-01-20 Alexander M. Turek  <me@derrabus.de>
+    * server_engines.php, server_links.inc.php: Use Michael's new icon for
+      storage engines.
+    * main.php: Added link to storage engines sub-page.
+
 2005-01-18 Marc Delisle  <lem9@users.sourceforge.net>
     * sql.php, libraries/common.lib.php, /display_tbl.lib.php, /functions.js,
       lang/*.php: bug #1084820: ask a confirmation when a user wants to 
diff --git a/main.php b/main.php
index 438fba1f4..0faef0b44 100644
--- a/main.php
+++ b/main.php
@@ -400,7 +400,16 @@ function PMA_analyseShowGrant($rs_usr, &$is_create_priv, &$db_to_create) {
     </tr>
             <?php
         }
-
+        ?>
+    <tr><?php
+            echo '        ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,'<a href="./server_engines.php?'.$common_url_query.'">','b_engine.png',$strStorageEngines,'</a>') : $str_normal_list);
+?>
+        <td>
+                <a href="./server_engines.php?<?php echo $common_url_query; ?>">
+                    <?php echo $strStorageEngines; ?></a>&nbsp;
+        </td>
+    </tr>
+        <?php
         if ($is_reload_priv) {
             echo "\n";
             ?>
diff --git a/server_engines.php b/server_engines.php
index 7e66556f6..d6e169cc3 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -114,7 +114,7 @@ if (empty($engine) || empty($mysql_storage_engines[$engine])) {
      * Displays the sub-page heading
      */
     echo '<h2>' . "\n"
-       . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' )
+       . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 'b_engine.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' )
        . '    ' . $strStorageEngines . "\n"
        . '</h2>' . "\n";
 
@@ -169,7 +169,7 @@ if (empty($engine) || empty($mysql_storage_engines[$engine])) {
      */
 
     echo '<h2>' . "\n"
-       . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' )
+       . ($cfg['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 'b_engine.png" width="16" height="16" border="0" hspace="2" align="middle" />' : '' )
        . '    ' . htmlspecialchars($mysql_storage_engines[$engine]['Engine']) . "\n"
        . '</h2>' . "\n\n"
        . '<p>' . "\n"
diff --git a/server_links.inc.php b/server_links.inc.php
index 2b2d4b37c..b8d5d5a7b 100644
--- a/server_links.inc.php
+++ b/server_links.inc.php
@@ -53,7 +53,7 @@ if ($cfg['ShowMysqlVars']) {
 if (PMA_MYSQL_INT_VERSION >= 40100) {
     echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_asci.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strCharsets.'" />' : '') . $strCharsets, 'server_collations.php', $url_query);
 }
-echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" alt="' . $strEngines . '" />' : '') . $strEngines, 'server_engines.php', $url_query);
+echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 'b_engine.png" width="16" height="16" border="0" hspace="2" align="middle" alt="' . $strEngines . '" />' : '') . $strEngines, 'server_engines.php', $url_query);
 if ($is_superuser) {
     echo PMA_printTab(($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $GLOBALS['pmaThemeImage'] . 's_rights.png" width="16" height="16" border="0" hspace="2" align="middle" alt="'.$strPrivileges.'" />' : '') . $strPrivileges, 'server_privileges.php', $url_query);
 }