diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index cb8c35f0416..986267198c5 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -573,7 +573,14 @@ if (! $error && $action == 'writebookkeeping') {
 					{
 						$reflabel = '';
 						if (! empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']) . ($val['soclib']?" - ":"");
-						$reflabel.= dol_string_nohtmltag($val['soclib']);
+						if ($tabtype[$key] == 'banktransfert')
+						{
+							$reflabel.= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
+						}
+						else
+						{
+							$reflabel.= dol_string_nohtmltag($val['soclib']);
+						}
 
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
@@ -702,7 +709,7 @@ if (! $error && $action == 'writebookkeeping') {
 					}
 				}
 			}
-			else {	// If thirdparty unkown, output the waiting account
+			else {	// If thirdparty unknown, output the waiting account
 				foreach ($tabbq[$key] as $k => $mt) {
 					if ($mt)
 					{
@@ -831,7 +838,6 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	print '"' . $langs->transnoentitiesnoconv("Note")  . '"' . $sep;
 	print "\n";
 
-
 	foreach ($tabpay as $key => $val)
 	{
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
@@ -869,7 +875,14 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 				{
 					$reflabel = '';
 					if (! empty($val['lib'])) $reflabel .= dol_string_nohtmltag($val['lib']) . ($val['soclib']?" - ":"");
-					$reflabel.= dol_string_nohtmltag($val['soclib']);
+					if ($tabtype[$key] == 'banktransfert')
+					{
+						$reflabel.= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
+					}
+					else
+					{
+						$reflabel.= dol_string_nohtmltag($val['soclib']);
+					}
 
 					print '"' . $key . '"' . $sep;
 					print '"' . $date . '"' . $sep;
@@ -1087,7 +1100,14 @@ if (empty($action) || $action == 'view') {
 				{
 					$reflabel = '';
 					if (! empty($val['lib'])) $reflabel .= $val['lib'] . ($val['soclib']?" - ":"");
-					$reflabel.= $val['soclib'];
+					if ($tabtype[$key] == 'banktransfert')
+					{
+						$reflabel.= $langs->trans('TransitionalAccount').' '.$account_transfer;
+					}
+					else
+					{
+						$reflabel.= $val['soclib'];
+					}
 
 					print '<!-- Thirdparty bank.rowid='.$key.' -->';
 					print '<tr class="oddeven">';
@@ -1115,7 +1135,7 @@ if (empty($action) || $action == 'view') {
 							}
 							else
 							{
-								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>';	// We will a waiting account
+								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>';	// We will use a waiting account
 							}
 						}
 						else
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index e2f36f96fe9..b62009c2ba6 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -873,6 +873,7 @@ if ($resql)
                 // Status / Active
                 print '<td align="center" class="nowrap">';
                 if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+                else print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
                 print "</td>";
 
                 // Modify link / Delete link
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 1bcff705aef..4e6b6d75e85 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -185,12 +185,6 @@ if ($action == 'setvarother') {
     if (!$res > 0) {
         $error++;
     }
-
-    $param_auto_assign = GETPOST('TICKET_AUTO_ASSIGN_USER_CREATE', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKET_AUTO_ASSIGN_USER_CREATE', $param_auto_assign, 'chaine', 0, '', $conf->entity);
-    if (!$res > 0) {
-        $error++;
-    }
 }
 
 
@@ -260,7 +254,7 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     print '</tr>';
 
     // Check if email exists
-    print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsEmailMustExist") . '</td>';
+    print '<tr class="oddeven"><td>' . $langs->trans("TicketsEmailMustExist") . '</td>';
     print '<td class="left">';
     if ($conf->use_javascript_ajax) {
         print ajax_constantonoff('TICKET_EMAIL_MUST_EXISTS');
@@ -277,7 +271,7 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     /*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     {
     	// Show logo for module
-    	print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsShowModuleLogo") . '</td>';
+    	print '<tr class="oddeven"><td>' . $langs->trans("TicketsShowModuleLogo") . '</td>';
     	print '<td class="left">';
     	if ($conf->use_javascript_ajax) {
     	    print ajax_constantonoff('TICKET_SHOW_MODULE_LOGO');
@@ -293,7 +287,7 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     }*/
 
     // Show logo for company
-    print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsShowCompanyLogo") . '</td>';
+    print '<tr class="oddeven"><td>' . $langs->trans("TicketsShowCompanyLogo") . '</td>';
     print '<td class="left">';
     if ($conf->use_javascript_ajax) {
     	print ajax_constantonoff('TICKET_SHOW_COMPANY_LOGO');
@@ -310,7 +304,7 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     // Also send to main email address
     if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     {
-    	print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsEmailAlsoSendToMainAddress") . '</td>';
+    	print '<tr class="oddeven"><td>' . $langs->trans("TicketsEmailAlsoSendToMainAddress") . '</td>';
     	print '<td class="left">';
     	if ($conf->use_javascript_ajax) {
     	    print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS');
@@ -330,21 +324,6 @@ if (! empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
         print '</tr>';
     }
 
-    // Auto assign ticket at user who created it
-    print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsAutoAssignTicket") . '</td>';
-    print '<td class="left">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('TICKET_AUTO_ASSIGN_USER_CREATE');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKET_AUTO_ASSIGN_USER_CREATE);
-    }
-    print '</td>';
-    print '<td align="center">';
-    print $form->textwithpicto('', $langs->trans("TicketsAutoAssignTicketHelp"), 1, 'help');
-    print '</td>';
-    print '</tr>';
-
     print '</table><br>';
 
     if (!$conf->use_javascript_ajax) {
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 811fe663f8c..5609bb6b598 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -603,12 +603,13 @@ if ($resql)
 	        print $langs->trans("EventualyAddCategory").': ';
 	        print Form::selectarray('cat', $options, GETPOST('cat'), 1);
 	    }
-	    print '<br>'.$langs->trans("ThenCheckLinesAndConciliate").' ';
+	    print '<br><div style="margin-top: 5px;">'.$langs->trans("ThenCheckLinesAndConciliate").' ';
 	    print '<input class="button" name="confirm_savestatement" type="submit" value="'.$langs->trans("SaveStatementOnly").'">';
 	    print ' '.$langs->trans("or").' ';
 	    print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
 	    print ' '.$langs->trans("or").' ';
 	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+		print '</div>';
 
 	    // Show last bank statements
 	    $nbmax=15;      // We accept to show last 15 receipts (so we can have more than one year)
@@ -617,7 +618,7 @@ if ($resql)
 	    $sql.= " WHERE fk_account=".$object->id." AND num_releve IS NOT NULL";
 	    $sql.= $db->order("num_releve", "DESC");
 	    $sql.= $db->plimit($nbmax+1);
-	    print '<br><br>';
+	    print '<br>';
 	    print $langs->trans("LastAccountStatements").' : ';
 	    $resqlr=$db->query($sql);
 	    if ($resqlr)
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index ac4d17e4c49..b93f381c555 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -415,7 +415,7 @@ if (empty($numref))
 		if ($object->canBeConciliated() > 0) {
 			// If not cash account and can be reconciliate
 			if ($user->rights->banque->consolidate) {
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&search_conciliated=0'.$param.'">'.$langs->trans("Conciliate").'</a>';
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0&search_account='.$id.$param.'">'.$langs->trans("Conciliate").'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
 			}
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 1d681d2672b..6f712fa6c4d 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -419,7 +419,7 @@ class FormTicket
 
         if ($withdolfichehead) dol_fiche_end();
 
-        print '<center>';
+        print '<br><center>';
         print '<input class="button" type="submit" name="add" value="' . $langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")) . '" />';
 
         if ($this->withcancel) {
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index f7e1b28876f..1de902d1f1d 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -175,7 +175,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 {
     global $langs;
 
-    print "\n\n<!-- debut cartouche journal -->\n";
+    print "\n\n<!-- start banner journal -->\n";
 
     if(! is_empty($varlink)) $varlink = '?'.$varlink;
 
@@ -186,6 +186,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
     $head[$h][2] = 'journal';
 
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
     dol_fiche_head($head, 'journal');
 
@@ -240,5 +241,5 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 
     print '</form>';
 
-    print "\n<!-- fin cartouche journal -->\n\n";
+    print "\n<!-- end banner journal -->\n\n";
 }
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index c5791e5c89e..9e0c357be05 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -159,7 +159,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
 
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
 
-    print '<body id="mainbody" class="publicnewticketform" style="margin-top: 10px;">';
+    print '<body id="mainbody" class="publicnewticketform">';
 
     if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || ! empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
         print '<center>';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 80645e2a486..18ba697bc20 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -777,14 +777,14 @@ if ($resql)
 		print '<td class="liste_titre"><input type="text" size="6" class="flat" name="search_company" value="'.$search_company.'"></td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+		print '<input class="flat maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
@@ -1004,7 +1004,7 @@ if ($resql)
 		// Town
 		if (! empty($arrayfields['s.town']['checked']))
 		{
-			print '<td class="nocellnopadd">';
+			print '<td>';
 			print $obj->town;
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;
@@ -1012,7 +1012,7 @@ if ($resql)
 		// Zip
 		if (! empty($arrayfields['s.zip']['checked']))
 		{
-			print '<td class="nocellnopadd">';
+			print '<td>';
 			print $obj->zip;
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 3bb0df59812..ece95cfca29 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -158,6 +158,7 @@ ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer 
+TransitionalAccount=Transitional bank transfer account
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index ae189111c15..616b565496a 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -287,6 +287,7 @@ SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users
 SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
 Vendor=Vendor
+Supplier=Vendor
 AddContact=Create contact
 AddContactAddress=Create contact/address
 EditContact=Edit contact
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 0f6e21f0984..62de885eac6 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -97,7 +97,7 @@ if (empty($reshook))
 		),
 	    // All demo profile
 	    array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore',
-		'disablemodules'=>'adherent,don,externalsite,mailmanspip',
+		'disablemodules'=>'adherent,don,externalsite,mailmanspip,takepos',
 	    //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-all.jpg'
 	    )
@@ -106,10 +106,10 @@ if (empty($reshook))
 
 	// Visible
 	$alwayscheckedmodules=array('barcode','bookmark','categorie','externalrss','fckeditor','geoipmaxmind','gravatar','memcached','syslog','user','webservices');  // Technical module we always want
-	$alwaysuncheckedmodules=array('dav','dynamicprices','incoterm','loan','multicurrency','paybox','paypal','stripe','google','printing','scanner','skype','takepos','workflow','website');  // Module we dont want by default
+	$alwaysuncheckedmodules=array('dav','dynamicprices','incoterm','loan','multicurrency','paybox','paypal','stripe','google','printing','scanner','skype','website');  // Module we dont want by default
 	// Not visible
 	$alwayshiddencheckedmodules=array('accounting','api','barcode','blockedlog','bookmark','clicktodial','comptabilite','cron','document','domain','externalrss','externalsite','fckeditor','geoipmaxmind','gravatar','label','ldap',
-									'mailmanspip','notification','oauth','syslog','user','webservices',
+									'mailmanspip','notification','oauth','syslog','user','webservices','workflow',
 	                                // Extended modules
 	                                'memcached','numberwords','zipautofillfr');
 	$alwayshiddenuncheckedmodules=array('debugbar','emailcollector','ftp','hrm','modulebuilder','webservicesclient','websites',
@@ -392,10 +392,10 @@ foreach ($demoprofiles as $profilearray)
         		    //if ($modulo == 0) print '<tr>';
                     print '<!-- id='.$val->numero.' -->';
                     print '<div class="nowrap">';
-                    print '<input type="checkbox" class="checkbox" name="'.$modulekeyname.'" value="1"';
+                    print '<input type="checkbox" class="checkbox" id="id'.$modulekeyname.'" name="'.$modulekeyname.'" value="1" title="'.dol_escape_htmltag($val->getName()).'"';
                     if (in_array($modulekeyname, $alwaysuncheckedmodules)) print ' disabled';
                     if (! in_array($modulekeyname, $alwaysuncheckedmodules)  && (! in_array($modulekeyname, $listofdisabledmodules) || in_array($modulekeyname, $alwayscheckedmodules))) print ' checked';
-                    print '> <div class="inline-block demomaxoveflow">'.$val->getName().'</div><br>';
+                    print '> <label for="id'.$modulekeyname.'" class="inline-block demomaxoveflow" title="'.dol_escape_htmltag($val->getName()).'">'.$val->getName().'</label><br>';
                     print '</div>';
                     //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
                     $j++;
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 42774772eb5..b663aaa43c3 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -59,7 +59,7 @@ $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
  */
 
 // Add file in email form
-if (GETPOST('addfile') && !GETPOST('add_ticket')) {
+if (GETPOST('addfile', 'alpha') && ! GETPOST('add', 'alpha')) {
     ////$res = $object->fetch('','',GETPOST('track_id'));
     ////if($res > 0)
     ////{
@@ -77,7 +77,7 @@ if (GETPOST('addfile') && !GETPOST('add_ticket')) {
 }
 
 // Remove file
-if (GETPOST('removedfile') && !GETPOST('add_ticket')) {
+if (GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha')) {
 
     include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
@@ -89,7 +89,7 @@ if (GETPOST('removedfile') && !GETPOST('add_ticket')) {
     dol_remove_file_process($_POST['removedfile'], 0, 0);
     $action = 'create_ticket';
 }
-if ($action == 'create_ticket' && GETPOST('add_ticket')) {
+if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
     $error = 0;
     $origin_email = GETPOST('email', 'alpha');
     if (empty($origin_email)) {
@@ -311,7 +311,13 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
             	$formmail->remove_attached_files($i);
             }
 
-            setEventMessages($langs->trans('YourTicketSuccessfullySaved'), null, 'mesgs');
+            //setEventMessages($langs->trans('YourTicketSuccessfullySaved'), null, 'mesgs');
+
+            // Make a redirect to avoid to have ticket submitted twice if we make back
+            setEventMessages($langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '<strong>' . $object->track_id . '</strong>'), null, 'warnings');
+            setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
+            header("Location: index.php");
+			exit;
         }
     } else {
         setEventMessages($object->error, $object->errors, 'errors');
@@ -324,21 +330,23 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
  * View
  */
 
-$arrayofjs = array();
-$arrayofcss = array('/opensurvey/css/style.css', '/ticket/css/styles.css.php');
-
-llxHeaderTicket($langs->trans("CreateTicket"), "", 0, 0, $arrayofjs, $arrayofcss);
-
 $form = new Form($db);
 $formticket = new FormTicket($db);
 
-if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
+if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)
+{
     print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
     $db->close();
     exit();
 }
 
-print '<div style="width:60%; margin: 0 auto;">';
+$arrayofjs = array();
+$arrayofcss = array('/opensurvey/css/style.css', '/ticket/css/styles.css.php');
+
+llxHeaderTicket($langs->trans("CreateTicket"), "", 0, 0, $arrayofjs, $arrayofcss);
+
+
+print '<div style="width:60%; margin: 0 auto;" class="ticketpublicarea">';
 
 if ($action != "infos_success") {
     $formticket->withfromsocid = isset($socid) ? $socid : $user->societe_id;
@@ -361,11 +369,8 @@ if ($action != "infos_success") {
 
     print '<div class="info marginleftonly marginrightonly">' . $langs->trans('TicketPublicInfoCreateTicket') . '</div>';
     $formticket->showForm();
-} else {
-    print '<div class="info center">' . $langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '<strong>' . $object->track_id . '</strong>');
-    print '<br>';
-    print $langs->trans('PleaseRememberThisId');
 }
+
 print '</div>';
 
 // End of page
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index a3e4d63a4bc..2e138312102 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -55,18 +55,18 @@ $action = GETPOST('action', 'alpha');
 $form = new Form($db);
 $formticket = new FormTicket($db);
 
-$arrayofjs = array();
-$arrayofcss = array('/ticket/css/styles.css.php');
-
 if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 {
 	print $langs->trans('TicketPublicInterfaceForbidden');
 	exit;
 }
 
+$arrayofjs = array();
+$arrayofcss = array('/ticket/css/styles.css.php');
+
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-print '<div style="margin: 0 auto; width:60%">';
+print '<div style="margin: 0 auto; width:60%" class="ticketpublicarea">';
 print '<p style="text-align: center">' . ($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")) . '</p>';
 print '<div class="ticketform">';
 print '<a href="create_ticket.php" class=""><div class="index_create orange bigrounded">' . dol_escape_htmltag($langs->trans("CreateTicket")) . '</div></a>';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 443af658cb5..9da0a4272e1 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -155,21 +155,23 @@ $user_assign = new User($db);
 $user_create = new User($db);
 $formTicket = new FormTicket($db);
 
+if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
+	print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
+	$db->close();
+	exit();
+}
+
 $arrayofjs = array();
 $arrayofcss = array('/ticket/css/styles.css.php');
 
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
-    print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
-    $db->close();
-    exit();
-}
 
-print '<div style="margin: 0 auto; width:60%">';
+print '<div style="margin: 0 auto; width:60%" class="ticketpublicarea">';
 
 if ($action == "view_ticketlist")
 {
+	print '<br>';
     if ($display_ticket_list) {
         // Filters
         $search_fk_status = GETPOST("search_fk_status", 'alpha');
@@ -676,6 +678,7 @@ if ($action == "view_ticketlist")
     }
 } else {
     print '<p class="center">' . $langs->trans("TicketPublicMsgViewLogIn") . '</p>';
+	print '<br>';
 
     print '<div id="form_view_ticket">';
     print '<form method="post" name="form_view_ticketlist"  enctype="multipart/form-data" action="' . $_SERVER['PHP_SELF'] . '">';
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index a0311ce1430..69a77413b2e 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -133,18 +133,18 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
 $form = new Form($db);
 $formticket = new FormTicket($db);
 
+if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
+	print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
+	$db->close();
+	exit();
+}
+
 $arrayofjs = array();
 $arrayofcss = array('/ticket/css/styles.css.php');
 
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
-    print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
-    $db->close();
-    exit();
-}
-
-print '<div style="margin: 0 auto; width:60%">';
+print '<div style="margin: 0 auto; width:60%" class="ticketpublicarea">';
 
 if ($action == "view_ticket" || $action == "add_message" || $action == "close" || $action == "confirm_public_close") {
     if ($display_ticket) {
@@ -298,7 +298,7 @@ if ($action == "view_ticket" || $action == "add_message" || $action == "close" |
         print '<div class="error">Not Allowed<br><a href="' . $_SERVER['PHP_SELF'] . '?track_id=' . $object->dao->track_id . '">' . $langs->trans('Back') . '</a></div>';
     }
 } else {
-    print '<p style="text-align: center">' . $langs->trans("TicketPublicMsgViewLogIn") . '</p>';
+    print '<p class="center">' . $langs->trans("TicketPublicMsgViewLogIn") . '</p>';
 
     print '<div id="form_view_ticket">';
     print '<form method="post" name="form_view_ticket"  enctype="multipart/form-data" action="' . $_SERVER['PHP_SELF'] . '">';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ea065cb30dd..7fb121fd90c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5252,6 +5252,9 @@ div.tabsElem a.tab {
 /* Ticket module                                                                  */
 /* ============================================================================== */
 
+.publicnewticketform {
+	margin-top: 25px !important;
+}
 #cd-timeline {
   position: relative;
   padding: 2em 0;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 332b4964a94..c15bbf26eef 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1936,7 +1936,6 @@ a.tmenuimage:focus {
 }
 
 
-
 /* Login */
 
 .bodylogin
@@ -5388,7 +5387,6 @@ border-top-right-radius: 6px;
 }
 
 
-
 /* ============================================================================== */
 /*  Public                                                                        */
 /* ============================================================================== */
@@ -5402,26 +5400,14 @@ border-top-right-radius: 6px;
 }
 
 
-
-::-webkit-scrollbar {
-    width: 12px;
-}
-::-webkit-scrollbar-button {
-    background: #aaa
-}
-::-webkit-scrollbar-track-piece {
-    background: #fff
-}
-::-webkit-scrollbar-thumb {
-    background: #ddd
-}​
-
-
-
 /* ============================================================================== */
 /* Ticket module                                                                  */
 /* ============================================================================== */
 
+.publicnewticketform {
+	margin-top: 25px !important;
+}
+
 #cd-timeline {
   position: relative;
   padding: 2em 0;
@@ -5833,6 +5819,22 @@ border-top-right-radius: 6px;
 
 
 
+/* This must be at end */
+::-webkit-scrollbar {
+    width: 12px;
+}
+::-webkit-scrollbar-button {
+    background: #aaa;
+}
+::-webkit-scrollbar-track-piece {
+    background: #fff;
+}
+::-webkit-scrollbar-thumb {
+    background: #ddd;
+}​
+
+
+
 <?php if (! defined('DISABLE_FONT_AWSOME') && empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) { ?>
         <?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
 <?php }
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index be18cb4051a..ca5e0b1862b 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -150,7 +150,7 @@ if ($canadduser)
     $newcardbutton.= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1': '').'&leftmenu=');
 }
 
-$morehtmlright.= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ?'?search_statut='.$search_statut:''));
+$morehtmlright.= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ?'?search_statut='.$search_statut:''));
 
 print load_fiche_titre($title, $morehtmlright.' '.$newcardbutton);
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ad310b0041e..8c780c703f7 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -304,7 +304,7 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 
-$morehtmlright.= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-sitemap', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ?'?search_statut='.$search_statut:''));
+$morehtmlright.= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-sitemap paddingleft', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ?'?search_statut='.$search_statut:''));
 
 
 print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'title_generic', 0, $morehtmlright.' '.$newcardbutton, '', $limit);