diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 6ec50bb1d23..ed29c2732d1 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -31,9 +31,34 @@ print '<head>
 <meta name="author" content="Dolibarr Development Team">
 <link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>
 <title>'.$langs->trans('Login').' '.$title.'</title>'."\n";
-print '<!-- Includes for JQuery (Ajax library) -->'."\n";
-if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
-else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
+print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
+$jquerytheme = 'smoothness';
+if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
+else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
+print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tiptip/tipTip.css" />'."\n";                           // Tooltip
+print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css" />'."\n";          // JNotify
+// jQuery jMobile
+if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || GETPOST('dol_use_jmobile'))
+{
+	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.css" />'."\n";
+}
+print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+// Includes CSS for Dolibarr theme
+$themepath=dol_buildpath((empty($conf->global->MAIN_FORCETHEMEDIR)?'':$conf->global->MAIN_FORCETHEMEDIR).$conf->css,1);
+$themesubdir='';
+if (! empty($conf->modules_parts['theme']))	// This slow down
+{
+	foreach($conf->modules_parts['theme'] as $reldir)
+	{
+		if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
+		{
+			$themepath=dol_buildpath($reldir.$conf->css, 1);
+			$themesubdir=$reldir;
+			break;
+		}
+	}
+}
 // CSS forced by modules (relative url starting with /)
 if (isset($conf->modules_parts['css']))
 {
@@ -51,13 +76,17 @@ if (isset($conf->modules_parts['css']))
 		}
 	}
 }
-// JQuery. Must be before other includes
+print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />'."\n";
 $ext='.js';
 print '<!-- Includes JS for JQuery -->'."\n";
 if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
 else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/dst.js"></script>'."\n";
-print '<link rel="stylesheet" type="text/css" href="'.dol_escape_htmltag($conf_css).'" />'."\n";
+// jQuery jMobile
+if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || GETPOST('dol_use_jmobile'))
+{
+	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js"></script>'."\n";
+}
 if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER;
 print '<!-- HTTP_USER_AGENT = '.$_SERVER['HTTP_USER_AGENT'].' -->
 </head>';
@@ -107,13 +136,13 @@ $(document).ready(function () {
 <table class="left" summary="Login pass" cellpadding="2">
 <!-- Login -->
 <tr>
-<td valign="bottom"> &nbsp; <strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong> &nbsp; </td>
+<td valign="bottom" class="loginfield"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td>
 <td valign="bottom" nowrap="nowrap">
 <input type="text" id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" />
 </td>
 </tr>
 <!-- Password -->
-<tr><td valign="top" nowrap="nowrap"> &nbsp; <strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong> &nbsp; </td>
+<tr><td valign="top" class="loginfield" nowrap="nowrap"><strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong></td>
 <td valign="top" nowrap="nowrap">
 <input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" />
 </td></tr>
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index b0b4a2f4d73..b56393dcbac 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -48,7 +48,12 @@ print $langs->trans("HelpCenterDesc2")."<br>\n";
 
 print '<br>';
 
-print $langs->trans("ToGoBackToDolibarr",DOL_URL_ROOT.'/');
+$homeurl=DOL_URL_ROOT.'/';
+if (GETPOST('dol_hide_toptmenu'))  $homeurl.=(strpos($homeurl,'?')===false?'?':'&').'dol_hide_toptmenu=1';
+if (GETPOST('dol_hide_leftmenu'))  $homeurl.=(strpos($homeurl,'?')===false?'?':'&').'dol_hide_leftmenu=1';
+if (GETPOST('dol_no_mouse_hover')) $homeurl.=(strpos($homeurl,'?')===false?'?':'&').'dol_no_mouse_hover=1';
+if (GETPOST('dol_use_jmobile'))    $homeurl.=(strpos($homeurl,'?')===false?'?':'&').'dol_use_jmobile=1';
+print $langs->trans("ToGoBackToDolibarr",$homeurl);
 
 print '<br><br>';
 
@@ -56,8 +61,7 @@ $style1='color: #333344; font-size: 16px; font-weight: bold';
 $style2='color: #5D4455; font-weight: bold;';
 
 print "\n";
-print '<table border="0" style="spacing: 4px; padding: 0px" width="100%">';
-print '<tr><td width="50%" valign="top">';
+print '<div style="width: 100%"><div class="inline-block">';
 print "\n";
 
 // Forum/wiki support
@@ -73,12 +77,12 @@ print '<br>'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$la
 print $langs->trans("TypeHelpDev").'/'.img_picto_common('','redstar','',1).img_picto_common('','redstar','',1).'/'.img_picto_common('','star','',1).img_picto_common('','star','',1).img_picto_common('','star','',1).img_picto_common('','star','',1);
 
 print '</td></tr></table>';
-
 print '</td>';
 print '</tr>';
 
 print '<tr>';
 print '<td align="center" valign="top">';
+
 print '<table class="nocellnopadd">';
 /*print '<tr><td align="center" valign="top">';
 print img_picto_common('','who.png','',1);
@@ -99,8 +103,7 @@ print '</table>'."\n";
 print "\n";
 
 
-print '</td><td width="50%" valign="top">'."\n";
-print "\n";
+print '</div><div class="inline-block">';
 
 
 // Online support
@@ -134,9 +137,10 @@ print '</td>';
 print '</tr>';
 print '</table>'."\n";
 
-print '</td></tr>';
-print '<tr><td width="50%" valign="top">'."\n";
-print "\n";
+
+
+print '</div><div class="inline-block">';
+
 
 // EMail support
 print '<table class="login" width="100%">';
@@ -170,8 +174,9 @@ print '</td>';
 print '</tr>';
 print '</table>'."\n";
 
-print '</td><td width="50%" valign="top">'."\n";
-print "\n";
+
+print '</div><div class="inline-block">';
+
 
 // Other support
 print '<table class="login" width="100%">';
@@ -207,9 +212,10 @@ print '</tr>';
 print '</table>'."\n";
 print "\n";
 
-print '</td>';
-print '</tr>';
-print '</table>';
+
+print '<div style="clear: both"></div>';
+print '</div>';
+
 
 pFooter();
 ?>

trans('Login'); ?>	trans('Login'); ?>
trans('Password'); ?>
trans('Password'); ?>