diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 459fc801bae..3a4949b99a4 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -73,20 +73,26 @@ print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 $head = invoice_admin_prepare_head();
 dol_fiche_head($head, 'situation', $langs->trans("InvoiceSituation"), -1, 'invoice');
 
+
+print '<span class="opacitymedium">'.$langs->trans("SituationInvoiceDesc").'</span><br><br>';
+
+
 /*
  *  Numbering module
  */
 
-print load_fiche_titre($langs->trans("InvoiceSituation"), '', '');
-$var=0;
-
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-_updateBtn();
 
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder centpercent">';
 
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
 
 _printOnOff('INVOICE_USE_SITUATION', $langs->trans('UseSituationInvoices'));
 _printOnOff('INVOICE_USE_SITUATION_CREDIT_NOTE', $langs->trans('UseSituationInvoicesCreditNote'));
@@ -100,12 +106,9 @@ $metas = array(
 );
 _printInputFormPart('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_PERCENT', $langs->trans('RetainedwarrantyDefaultPercent'), '', $metas);
 
-
-
-
 // Conditions paiements
 $inputCount = empty($inputCount)?1:($inputCount+1);
-print '<tr class="impair">';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td>';
 print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="right" width="300">';
@@ -115,6 +118,9 @@ print '</td></tr>';
 
 
 print '</table>';
+print '</div>';
+
+print '<br>';
 
 _updateBtn();
 
@@ -134,8 +140,8 @@ $db->close();
 function _updateBtn()
 {
     global $langs;
-    print '<div style="text-align: right;" >';
-    print '<input type="submit" class="butAction" value="'.$langs->trans("Save").'">';
+    print '<div class="center">';
+    print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
     print '</div>';
 }
 
@@ -150,9 +156,9 @@ function _updateBtn()
  */
 function _printOnOff($confkey, $title = false, $desc = '')
 {
-    global $var, $bc, $langs;
-    $var=!$var;
-    print '<tr '.$bc[$var].'>';
+    global $langs;
+
+    print '<tr class="oddeven">';
     print '<td>'.($title?$title:$langs->trans($confkey));
     if (!empty($desc)) {
         print '<br><small>'.$langs->trans($desc).'</small>';
@@ -179,8 +185,8 @@ function _printOnOff($confkey, $title = false, $desc = '')
  */
 function _printInputFormPart($confkey, $title = false, $desc = '', $metas = array(), $type = 'input', $help = false)
 {
-    global $var, $bc, $langs, $conf, $db, $inputCount;
-    $var=!$var;
+    global $langs, $conf, $db, $inputCount;
+
     $inputCount = empty($inputCount)?1:($inputCount+1);
     $form=new Form($db);
 
@@ -200,7 +206,7 @@ function _printInputFormPart($confkey, $title = false, $desc = '', $metas = arra
         $metascompil .= ' '.$key.'="'.$values.'" ';
     }
 
-    print '<tr '.$bc[$var].'>';
+    print '<tr class="oddeven">';
     print '<td>';
 
     if (!empty($help)) {
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index a62aa14764c..dddf914a957 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -109,6 +109,7 @@ dol_fiche_head($head, 'payment', $langs->trans("Invoices"), -1, 'invoice');
 
 print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
@@ -226,6 +227,7 @@ foreach ($dirmodels as $reldir)
 }
 
 print '</table>';
+print '</div>';
 
 print "<br>";
 
@@ -235,6 +237,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'" />';
 print '<input type="hidden" name="action" value="setparams" />';
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -251,6 +254,7 @@ print '</td><td class="right">';
 print "</td></tr>\n";
 
 print '</table>';
+print '</div>';
 
 dol_fiche_end();
 
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index f2818f72872..de1334c37a5 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -137,7 +137,7 @@ function invoice_admin_prepare_head()
 	$head[$h][2] = 'payment';
 	$h++;
 
-	if ($conf->global->INVOICE_USE_SITUATION) {
+	if ($conf->global->INVOICE_USE_SITUATION || $conf->global->MAIN_FEATURES_LEVEL >= 1) {
 	    $head[$h][0] = DOL_URL_ROOT.'/admin/facture_situation.php';
 	    $head[$h][1] = $langs->trans("InvoiceSituation");
 	    $head[$h][2] = 'situation';