diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index cd982ef0f5c..5ad79c4f0bb 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -195,7 +195,7 @@ dol_fiche_end();
  * Projects Numbering model
  */
 
-print load_fiche_titre($langs->trans("TicketNumberingModules"));
+print load_fiche_titre($langs->trans("TicketNumberingModules"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
@@ -298,7 +298,7 @@ if (!$conf->use_javascript_ajax) {
     print '<input type="hidden" name="action" value="setvarother">';
 }
 
-print load_fiche_titre($langs->trans("TicketParams"));
+print load_fiche_titre($langs->trans("Other"), '', '');
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -307,78 +307,6 @@ print '<td></td>';
 print '<td></td>';
 print "</tr>\n";
 
-// Activate email notifications
-/*
-print '<tr class="pair"><td>' . $langs->trans("TicketsDisableEmail") . '</td>';
-print '<td class="left">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKET_DISABLE_ALL_MAILS');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKET_DISABLE_ALL_MAILS", $arrval, $conf->global->TICKET_DISABLE_ALL_MAILS);
-}
-print '</td>';
-print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
-print '</td>';
-print '</tr>';
-
-// Activate log by email
-print '<tr class="pair"><td>' . $langs->trans("TicketsLogEnableEmail") . '</td>';
-print '<td class="left">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKET_ACTIVATE_LOG_BY_EMAIL');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKET_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL);
-}
-print '</td>';
-print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketsLogEnableEmailHelp"), 1, 'help');
-print '</td>';
-print '</tr>';
-*/
-
-// Also send to main email address
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-{
-	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');
-	} else {
-	    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	    print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
-	}
-	print '</td>';
-	print '<td class="center">';
-	print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
-	print '</td>';
-	print '</tr>';
-}
-
-// Limiter la vue des tickets à ceux assignés à l'utilisateur
-/*
-print '<tr class="pair"><td>' . $langs->trans("TicketsLimitViewAssignedOnly") . '</td>';
-print '<td class="left">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKET_LIMIT_VIEW_ASSIGNED_ONLY');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKET_LIMIT_VIEW_ASSIGNED_ONLY", $arrval, $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY);
-}
-print '</td>';
-print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketsLimitViewAssignedOnlyHelp"), 1, 'help');
-print '</td>';
-print '</tr>';
-*/
-
-/*if (!$conf->use_javascript_ajax) {
-    print '<tr class="impair"><td colspan="3" align="center"><input type="submit" class="button" value="' . $langs->trans("Save") . '"></td>';
-    print '</tr>';
-}*/
-
 // Auto assign ticket at user who created it
 print '<tr class="oddeven"><td>'.$langs->trans("TicketsAutoAssignTicket").'</td>';
 print '<td class="left">';
@@ -401,7 +329,7 @@ if (!$conf->use_javascript_ajax) {
 }
 
 // Admin var of module
-print load_fiche_titre($langs->trans("Notification"));
+print load_fiche_titre($langs->trans("Notification"), '', '');
 
 print '<table class="noborder centpercent">';
 
@@ -419,22 +347,6 @@ if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
     print "</tr>\n";
 }
 
-// Activate log by email
-/*print '<tr class="pair"><td>' . $langs->trans("TicketsLogEnableEmail") . '</td>';
-print '<td class="left">';
-if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKET_ACTIVATE_LOG_BY_EMAIL');
-} else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKET_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL);
-}
-print '</td>';
-print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketsLogEnableEmailHelp"), 1, 'help');
-print '</td>';
-print '</tr>';
-*/
-
 // @todo Use module notification instead...
 
 // Email d'envoi des notifications
@@ -455,6 +367,24 @@ print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1
 print '</td>';
 print '</tr>';
 
+// Also send to main email address
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+{
+	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');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
+	}
+	print '</td>';
+	print '<td class="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
+}
+
 // Texte d'introduction
 $mail_intro = $conf->global->TICKET_MESSAGE_MAIL_INTRO ? $conf->global->TICKET_MESSAGE_MAIL_INTRO : $langs->trans('TicketMessageMailIntroText');
 print '<tr class="oddeven"><td>'.$langs->trans("TicketMessageMailIntroLabelAdmin").'</label>';
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index a2f87a9dc75..79a0d758de7 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -349,7 +349,7 @@ $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">';
+print '<div class="ticketpublicarea">';
 
 if ($action != "infos_success") {
     $formticket->withfromsocid = isset($socid) ? $socid : $user->socid;
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 37fdf9be219..59515ab2d8a 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -67,7 +67,7 @@ $arrayofcss = array('/ticket/css/styles.css.php');
 
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-print '<div style="margin: 0 auto; width:60%" class="ticketpublicarea">';
+print '<div 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 8c022457f88..881f6c05691 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -170,7 +170,7 @@ $arrayofcss = array('/ticket/css/styles.css.php');
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 
-print '<div style="margin: 0 auto; width:60%" class="ticketpublicarea">';
+print '<div class="ticketpublicarealist">';
 
 if ($action == "view_ticketlist")
 {
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 04331f30f80..a4cc33f5506 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -224,7 +224,7 @@ $arrayofcss = array('/ticket/css/styles.css.php');
 
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-print '<div style="margin: 0 auto;" class="ticketpublicarea">';
+print '<div class="ticketpublicarea">';
 
 if ($action == "view_ticket" || $action == "presend" || $action == "close" || $action == "confirm_public_close") {
     if ($display_ticket)
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ee80cf10a23..2e2cb4f0152 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5817,7 +5817,8 @@ div.tabsElem a.tab {
 }
 
 .ticketpublicarea {
-	width: 70%;
+	margin-left: 15%;
+    margin-right: 15%;
 }
 .publicnewticketform {
 	/* margin-top: 25px !important; */
@@ -5833,7 +5834,8 @@ div.tabsElem a.tab {
 		padding-left: 5px; padding-right: 5px;
 	}
 	.ticketpublicarea {
-		width: 100% !important;
+		margin-left: 100%;
+		margin-right: 100%;
 	}
 }