diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c47a7a8935b..da1ec3442c8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -137,10 +137,12 @@ class Form
      *	@param	tooltipon			1=tooltip sur texte, 2=tooltip sur picto, 3=tooltip sur les 2
      *	@param	direction			-1=Le picto est avant, 0=pas de picto, 1=le picto est apres
      *	@param	img					Code img du picto (use img_xxx() function to get it)
+     *  @param  extracss            Add a CSS style to td tags
+     *  @param  notable             Do not include table and tr tags
      *	@return	string				Code html du tooltip (texte+picto)
      * 	@see	Use function textwithpicto if you can.
      */
-    function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$extracss='')
+    function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$extracss='',$notabs=0)
     {
         global $conf;
 
@@ -161,7 +163,7 @@ class Form
        	$paramfortooltip.=' class="classfortooltip'.$extracss.'" title="'.$htmltext.'"'; // Attribut to put on td tag to store tooltip
 
        	$s="";
-        $s.='<table class="nobordernopadding" summary=""><tr>';
+        if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr>';
         if ($direction > 0)
         {
         	if ($text != '')
@@ -182,7 +184,7 @@ class Form
 				$s.=$text.'</td>';
 			}
 		}
-		$s.='</tr></table>';
+		if (empty($notabs)) $s.='</tr></table>';
 
         return $s;
     }
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index b70618c629f..16601743ac3 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -452,10 +452,9 @@ div.login_block table {
 }
 
 div.login {
-	display: inline;
 	white-space:nowrap;
-	padding: 0px 5px;
-	margin: 0px 0px 1px 0px;
+	padding: 8px 0px 0px 0px;
+	margin: 0px 0px 0px 8px;
 	font-weight: bold;
 }
 div.login a {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 43a4f817e21..92c29c9342d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -123,9 +123,6 @@ textarea.flat {
 textarea:disabled {
 background:#ddd;
 }
-input:disabled {
-background:#ddd;
-}
 select.flat {
 	background: #FDFDFD;
     font-size: <?php print $fontsize ?>px;
@@ -475,10 +472,9 @@ div.login_block table {
 }
 
 div.login {
-	display: inline;
 	white-space:nowrap;
-	padding: 0px 5px;
-	margin: 0px 0px 1px 0px;
+    padding: <?php echo ($conf->browser->phone?'0':'8')?>px 0px 0px 0px;
+    margin: 0px 0px 0px 8px;
 	font-weight: bold;
 }
 div.login a {