diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f132e7529..4023cb27a 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1870,7 +1870,14 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
                     . implode(' ', $tag_params_strings)
                     . ' src="' . preg_replace(
                         '/^.*\ssrc="([^"]*)".*$/si', '\1', $message) . '"'
-                    . ' value="' . $displayed_message . '" title="' . $displayed_message . '" />';
+                        . ' value="' . $displayed_message . '" title="' . $displayed_message . '" />';
+                // Here we cannot obey PropertiesIconic completely as a
+                // generated link would have a length over LinkLengthLimit
+                // but we can at least show the message.
+                // If PropertiesIconic is false or 'both'
+                if ($GLOBALS['cfg']['PropertiesIconic'] !== true) {
+                    $ret .= ' ' . $displayed_message;
+                }
             }
         } else {
             $message = trim(strip_tags($message));
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 9fece7acd..604030b05 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2590,7 +2590,7 @@ $cfg['CheckConfigurationPermissions'] = true;
  * is replaced by form with button.
  * This is required as some web servers (IIS) have problems with long URLs.
  */
-$cfg['LinkLengthLimit'] = 1000;
+$cfg['LinkLengthLimit'] = 2000;
 
 /*******************************************************************************
  * SQL Parser Settings