diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 0caae25c1d5..ccf52302e9a 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -115,7 +115,7 @@ DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
+TagSignature=Signature of sending user
 EMailRecipient=Recipient EMail
 TagMailtoEmail=Recipient EMail (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile. 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6aadcb7cd0a..205f9677d82 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1971,13 +1971,14 @@ if (! function_exists("llxFooter"))
     		print '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(($conf->browser->layout == 'phone' ? 400 : 700),'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
-            		jQuery(".classfortooltiponclicktext").dialog({ width: '.($conf->browser->layout == 'phone' ? 400 : 700).', autoOpen: false });
+            		jQuery(".classfortooltiponclicktext").dialog({ closeOnEscape: true, classes: { "ui-dialog": "highlight" }, height: window.innerHeight-60, width: '.($conf->browser->layout == 'phone' ? 400 : 700).', autoOpen: false }).css("z-index: 5000");
             		jQuery(".classfortooltiponclick").click(function () {
             		    console.log("We click on tooltip for element with dolid="+$(this).attr(\'dolid\'));
             		    if ($(this).attr(\'dolid\'))
             		    {
-                            obj=$("#idfortooltiponclick_"+$(this).attr(\'dolid\'));
+                            obj=$("#idfortooltiponclick_"+$(this).attr(\'dolid\'));		/* obj is a div component */
             		        obj.dialog("open");
+
             		    }
             		});
                 });
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 7faca1aee80..e468e688178 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3259,6 +3259,12 @@ table.valid {
 /* Tooltips                                                                       */
 /* ============================================================================== */
 
+/* For tooltip using dialog */
+.ui-dialog.highlight.ui-widget.ui-widget-content.ui-front {
+    z-index: 3000;
+}
+
+/* For tooltip using tipTip */
 #tooltip {
 	position: absolute;
 	width: <?php print dol_size(450,'width'); ?>px;