diff --git a/ChangeLog b/ChangeLog
index 807b582535..7951b4dc5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 - bug #3961 Avoid Suhosin warning when in simulation mode
 - bug #3897 Row Statistics and Space usage bugs
 - bug #3966 Only display "table has no unique column" message when applicable
+- bug #3960 NavigationBarIconic config not honored
 
 4.0.3.0 (2013-06-05)
 - bug #3941 Recent tables list always empty
diff --git a/doc/config.rst b/doc/config.rst
index 7828d31025..5092eacc50 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1522,9 +1522,9 @@ Browse mode
     :type: string
     :default: true
 
-    Defines whether navigation bar buttons and the right panel top menu
-    contain text or symbols only. A value of true displays icons, false
-    displays text and 'both' displays both icons and text.
+    Defines whether navigation bar buttons contain text or symbols only. A 
+    value of true displays icons, false displays text and 'both' displays 
+    both icons and text.
 
 .. config:option:: $cfg['ShowAll']
 
@@ -1715,8 +1715,8 @@ Tabs display settings
 
     If set to ``true``, will display icons instead of text for db and table
     properties links (like :guilabel:`Browse`, :guilabel:`Select`,
-    :guilabel:`Insert`, ...). Can be set to ``'both'`` if you want icons AND
-    text. When set to ``false``, will only show text.
+    :guilabel:`Insert`, ...) and for the menu tabs. Can be set to ``'both'`` 
+    if you want icons AND text. When set to ``false``, will only show text.
 
 .. config:option:: $cfg['PropertiesNumColumns']