diff --git a/ChangeLog b/ChangeLog
index e6baa02a7..57be0d607 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,12 @@ $Source$
 	* tbl_change.php3, lines 198-205: fixed a crash with binary "characters".
 	  Bug was reported by Joshua Nye <josh at boxcarmedia.com> to the
 	  phpMyAdmin-devel mailing-list.
+	* config.inc.php3, line 112; Documentation.html, lines 545-550;
+	  libraries/display_tbl.lib.php3: merged patch #474210 (hiding full text of
+	  navigation buttons) submitted by
+	  Gosha Sakovich <gt2 at users.sourceforge.net>.
+	* Documentation.html, lines 407-410: explicited the use of MySQL wildcards
+	  in the "only_db" setting.
 	* lang/italian.inc.php3: updated thanks to Pietro Danesi.
 
 2001-10-25  Loïc Chapeaux  <lolo@phpheaven.net>
@@ -36,7 +42,6 @@ $Source$
 	  - get all privilege at the begenning of the script;
 ###	* released 2.2.1 revision. ###
 
-
 2001-10-24  Marc Delisle  <lem9@users.sourceforge.net>
 	* main.php3 (for Loïc): a non-empty only_db was removing the MySQL links on
 	  the main page.
diff --git a/config.inc.php3 b/config.inc.php3
index d6d2845ba..a4acadb5d 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -107,16 +107,19 @@ $cfgShowStats             = TRUE;   // allow to display statistics and space usa
                                     // properties
 $cfgShowTooltip	          = TRUE;	// display table comment as tooltip in left frame
 
-$cfgShowBlob              = FALSE;  // display blob field contents in browse mode
-$cfgShowAll               = FALSE;  // allows to display all the rows in browse mode
-$cfgMaxRows               = 30;     // maximum number of rows to display in browse mode
+// In browse mode...
+$cfgShowBlob              = FALSE;  // display blob field contents
+$cfgNavigationBarIconic   = TRUE;   // do not display text inside navigation bar buttons
+$cfgShowAll               = FALSE;  // allows to display all the rows
+$cfgMaxRows               = 30;     // maximum number of rows to display
 $cfgOrder                 = 'ASC';  // default for 'ORDER BY' clause (valid
                                     // values are 'ASC', 'DESC' or 'SMART' -ie
                                     // descending order for fields of type
                                     // TIME, DATE, DATETIME & TIMESTAMP,
                                     // ascending order else-)
 
-$cfgProtectBinary         = 'blob'; // disallow editing of binary fields in edit mode
+// In edit mode...
+$cfgProtectBinary         = 'blob'; // disallow editing of binary fields
                                     // valid values are:
                                     //   FALSE  allow editing
                                     //   'blob' allow editing except for BLOB fields
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index ba005a20a..649d36f61 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -202,6 +202,18 @@ if (!defined('__LIB_DISPLAY_TBL__')){
         <?php
         // Move to the beginning or to the previous page
         if ($pos > 0 && $sessionMaxRows != 'all') {
+            // loic1: patch #474210 from Gosha Sakovich - part 1
+            if ($GLOBALS['cfgNavigationBarIconic']) {
+                $caption1 = '&lt;&lt;';
+                $caption2 = '&nbsp;&lt;&nbsp;';
+                $title1   = ' title="' . $GLOBALS['strPos1'] . '"';
+                $title2   = ' title="' . $GLOBALS['strPrevious'] . '"';
+            } else {
+                $caption1 = $GLOBALS['strPos1'] . ' &lt;&lt;';
+                $caption2 = $GLOBALS['strPrevious'] . ' &lt;';
+                $title1   = '';
+                $title2   = '';
+            } // end if... else...
             ?>
     <td>
         <form action="sql.php3" method="post">
@@ -214,7 +226,7 @@ if (!defined('__LIB_DISPLAY_TBL__')){
             <input type="hidden" name="sessionMaxRows" value="<?php echo $sessionMaxRows; ?>" />
             <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
             <input type="hidden" name="dontlimitchars" value="<?php echo $dontlimitchars; ?>" />
-            <input type="submit" name="navig" value="<?php echo $GLOBALS['strPos1'] . ' &lt;&lt;'; ?>" />
+            <input type="submit" name="navig" value="<?php echo $caption1; ?>"<?php echo $title1; ?> />
         </form>
     </td>
     <td>
@@ -228,7 +240,7 @@ if (!defined('__LIB_DISPLAY_TBL__')){
             <input type="hidden" name="sessionMaxRows" value="<?php echo $sessionMaxRows; ?>" />
             <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
             <input type="hidden" name="dontlimitchars" value="<?php echo $dontlimitchars; ?>" />
-            <input type="submit" name="navig" value="<?php echo $GLOBALS['strPrevious'] . ' &lt;'; ?>" />
+            <input type="submit" name="navig" value="<?php echo $caption2; ?>"<?php echo $title2; ?> />
         </form>
     </td>
             <?php
@@ -261,6 +273,18 @@ if (!defined('__LIB_DISPLAY_TBL__')){
         // Move to the next page or to the last one
         if (($pos + $sessionMaxRows < $unlim_num_rows) && $num_rows >= $sessionMaxRows
             && $sessionMaxRows != 'all') {
+            // loic1: patch #474210 from Gosha Sakovich - part 2
+            if ($GLOBALS['cfgNavigationBarIconic']) {
+                $caption3 = '&nbsp;&gt;&nbsp;';
+                $caption4 = '&gt;&gt;';
+                $title3   = ' title="' . $GLOBALS['strNext'] . '"';
+                $title4   = ' title="' . $GLOBALS['strEnd'] . '"';
+            } else {
+                $caption3 = '&gt; ' . $GLOBALS['strNext'];
+                $caption4 = '&gt;&gt; ' . $GLOBALS['strEnd'];
+                $title3   = '';
+                $title4   = '';
+            } // end if... else...
             echo "\n";
             ?>
     <td>
@@ -274,7 +298,7 @@ if (!defined('__LIB_DISPLAY_TBL__')){
             <input type="hidden" name="sessionMaxRows" value="<?php echo $sessionMaxRows; ?>" />
             <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
             <input type="hidden" name="dontlimitchars" value="<?php echo $dontlimitchars; ?>" />
-            <input type="submit" name="navig" value="<?php echo '&gt; ' . $GLOBALS['strNext']; ?>" />
+            <input type="submit" name="navig" value="<?php echo $caption3; ?>"<?php echo $title3; ?> />
         </form>
     </td>
     <td>
@@ -289,7 +313,7 @@ if (!defined('__LIB_DISPLAY_TBL__')){
             <input type="hidden" name="sessionMaxRows" value="<?php echo $sessionMaxRows; ?>" />
             <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
             <input type="hidden" name="dontlimitchars" value="<?php echo $dontlimitchars; ?>" />
-            <input type="submit" name="navig" value="<?php echo '&gt;&gt; ' . $GLOBALS['strEnd']; ?>" />
+            <input type="submit" name="navig" value="<?php echo $caption4; ?>"<?php echo $title4; ?> />
         </form>
     </td>
             <?php