diff --git a/ChangeLog b/ChangeLog
index 49baf76f0..a1d244409 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ $Source$
 2006-02-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/footer.inc.php:
       bug #1436279 Left frame links open in new windows in Safari
+    * libraries/footer.inc.php, themes/*/img/window-new.png *NEW*:
+      added icon for new window
 
 2006-02-21 Michal Čihař  <michal@cihar.com>
     * scripts/setup.php:
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 670438c6d..205332b59 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -82,12 +82,25 @@ if (!isset($GLOBALS['checked_special'])) {
 
 if (isset($_SERVER['SCRIPT_NAME']) && empty($_POST) && !$GLOBALS['checked_special']) {
     echo '<div id="selflink" class="print_ignore">' . "\n";
+    $url_params['target'] = basename($_SERVER['SCRIPT_NAME']);
+    echo '<a href="index.php' . PMA_generate_common_url($url_params) . '"'
+        . ' title="' . $GLOBALS['strOpenNewWindow'] . '" target="_blank">';
+    /*
     echo '<a href="index.php?target=' . basename($_SERVER['SCRIPT_NAME']);
     $url = PMA_generate_common_url(isset($GLOBALS['db']) ? $GLOBALS['db'] : '', isset($GLOBALS['table']) ? $GLOBALS['table'] : '');
     if (!empty($url)) {
         echo '&amp;' . $url;
     }
-    echo '" target="_blank">' . $GLOBALS['strOpenNewWindow'] . '</a>' . "\n";
+    echo '" target="_blank">';
+    */
+    if ($GLOBALS['cfg']['NavigationBarIconic']) {
+        echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 'window-new.png"'
+            . ' alt="' . $GLOBALS['strOpenNewWindow'] . '" />';
+    }
+    if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
+        echo $GLOBALS['strOpenNewWindow'];
+    }
+    echo '</a>' . "\n";
     echo '</div>' . "\n";
 }
 
diff --git a/themes/darkblue_orange/img/window-new.png b/themes/darkblue_orange/img/window-new.png
new file mode 100644
index 000000000..0e12ef954
Binary files /dev/null and b/themes/darkblue_orange/img/window-new.png differ
diff --git a/themes/original/img/window-new.png b/themes/original/img/window-new.png
new file mode 100644
index 000000000..0e12ef954
Binary files /dev/null and b/themes/original/img/window-new.png differ