diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 58c07b5ca3e..ca90c836929 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -222,7 +222,7 @@ llxHeader('', $langs->trans("Boxes"));
 
 print load_fiche_titre($langs->trans("Boxes"), '', 'title_setup');
 
-print $langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("BoxesDesc")." ".$langs->trans("OnlyActiveElementsAreShown")."</span><br>\n";
 
 /*
  * Search for the default active boxes for each possible position
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 47f668f69c3..d69a14deb2e 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -174,8 +174,8 @@ llxHeader();
 
 print load_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"), '', 'title_setup');
 
-print $langs->transnoentities("DelaysOfToleranceDesc", img_warning());
-print " ".$langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php')."<br>\n";
+print '<span class="opacitymedium">'.$langs->transnoentities("DelaysOfToleranceDesc", img_warning());
+print " ".$langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php')."</span><br>\n";
 print "<br>\n";
 
 $countrynotdefined='<font class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</font>';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index df8929fd8fe..dfbb548f5e0 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -222,7 +222,6 @@ $formadmin=new FormAdmin($db);
 print load_fiche_titre($langs->trans("GUISetup"), '', 'title_setup');
 
 print '<span class="opacitymedium">'.$langs->trans("DisplayDesc")."</span><br>\n";
-print "<br>\n";
 
 //WYSIWYG Editor
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index c9e69cc469e..ea19b7034a6 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -90,7 +90,7 @@ llxHeader();
 print load_fiche_titre($langs->trans("LimitsSetup"), '', 'title_setup');
 
 
-print $langs->trans("LimitsDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("LimitsDesc")."</span><br>\n";
 print "<br>\n";
 
 if ($action == 'edit')
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index b334ccadf45..4187c4d3eb4 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -159,116 +159,63 @@ print '<span class="opacitymedium">'.$langs->trans("MenusDesc")."</span><br>\n";
 print "<br>\n";
 
 
-if ($action == 'edit')
-{
-	clearstatcache();
+clearstatcache();
 
-	// Gestionnaires de menu
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("InternalUsers"), $langs->trans("InternalExternalDesc"));
-	print '</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("ExternalUsers"), $langs->trans("InternalExternalDesc"));
-	print '</td>';
-	print '</tr>';
+// Gestionnaires de menu
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
+print '<td>';
+print $form->textwithpicto($langs->trans("InternalUsers"), $langs->trans("InternalExternalDesc"));
+print '</td>';
+print '<td>';
+print $form->textwithpicto($langs->trans("ExternalUsers"), $langs->trans("InternalExternalDesc"));
+print '</td>';
+print '</tr>';
 
-	// Menu top
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
-	print '<td>';
-	$formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled');
-	print '</td>';
-	print '<td>';
-	$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled');
-	print '</td>';
-	print '</tr>';
+// Menu top
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
+print '<td>';
+$formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled');
+print '</td>';
+print '<td>';
+$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled');
+print '</td>';
+print '</tr>';
 
-	// Menu smartphone
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
-	print '<td>';
-	$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled');
-	print '</td>';
-	print '<td>';
-	$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled');
-	print '</td>';
-	print '</tr>';
+// Menu smartphone
+print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
+print '<td>';
+$formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled');
 
-	print '</table>';
-}
-else
-{
-	// Gestionnaires de menu
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td width="35%">'.$langs->trans("Menu").'</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("InternalUsers"), $langs->trans("InternalExternalDesc"));
-	print '</td>';
-	print '<td>';
-	print $form->textwithpicto($langs->trans("ExternalUsers"), $langs->trans("InternalExternalDesc"));
-	print '</td>';
-	print '</tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("DefaultMenuManager").'</td>';
-	print '<td>';
-	$filelib=preg_replace('/.php$/i', '', (empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED));
-	print $filelib;
-	print '</td>';
-	print '<td>';
-	$filelib=preg_replace('/.php$/i', '', (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED));
-	print $filelib;
-	print '</td>';
-	print '</tr>';
-
-
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("DefaultMenuSmartphoneManager").'</td>';
-	print '<td>';
-	$filelib=preg_replace('/.php$/i', '', (empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED));
-	print $filelib;
-	if (! empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && preg_match('/smartphone/', $conf->global->MAIN_MENU_SMARTPHONE_FORCED)
+if (! empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && preg_match('/smartphone/', $conf->global->MAIN_MENU_SMARTPHONE_FORCED)
 	|| (empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && ! empty($conf->global->MAIN_MENU_SMARTPHONE) && preg_match('/smartphone/', $conf->global->MAIN_MENU_SMARTPHONE)))
-	{
-		print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
-	}
-	print '</td>';
-	print '<td>';
-	$filelib=preg_replace('/.php$/i', '', (empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED));
-	print $filelib;
-	if (! empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)
-	|| (empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED) && ! empty($conf->global->MAIN_MENU_SMARTPHONE) && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE)))
-	{
-		print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
-	}
-	print '</td>';
-	print '</tr>';
-
-	print '</table>';
+{
+	print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
 }
 
+print '</td>';
+print '<td>';
+$formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard, $dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled');
+
+if (! empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED) && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)
+	|| (empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED) && ! empty($conf->global->MAIN_MENU_SMARTPHONE) && preg_match('/smartphone/', $conf->global->MAIN_MENUFRONT_SMARTPHONE)))
+{
+	print ' '.img_warning($langs->transnoentitiesnoconv("ThisForceAlsoTheme"));
+}
+
+print '</td>';
+print '</tr>';
+
+print '</table>';
+
 dol_fiche_end();
 
-
-if ($action == 'edit')
-{
-	print '<div class="center">';
-	print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
-	print ' &nbsp; &nbsp; &nbsp; ';
-	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-}
+print '<div class="center">';
+print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
 
 print '</form>';
 
-
-if ($action != 'edit')
-{
-	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-	print '</div>';
-}
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index a8c1aa41b5f..e9346f49a3a 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -123,460 +123,244 @@ print "<br>\n";
 
 $noCountryCode = (empty($mysoc->country_code) ? true : false);
 
-if ($action == 'edit')	// Edit
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+
+clearstatcache();
+
+
+// Misc options
+print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+$selected=$conf->global->MAIN_PDF_FORMAT;
+if (empty($selected)) $selected=dol_getDefaultFormat();
+
+// Show pdf format
+
+print '<tr class="oddeven"><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
+print $formadmin->select_paper_format($selected, 'MAIN_PDF_FORMAT');
+print '</td></tr>';
+
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_LEFT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT).'">';
+print '</td></tr>';
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_RIGHT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT).'">';
+print '</td></tr>';
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_TOP" value="'.(empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP).'">';
+print '</td></tr>';
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_BOTTOM" value="'.(empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM).'">';
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+print '<br>';
+
+
+// Addresses
+print load_fiche_titre($langs->trans("PDFAddressForging"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+// Hide VAT Intra on address
+
+print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
+print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS', (! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0, 1);
+print '</td></tr>';
+
+// Show prof id in address into pdf
+for($i=1; $i<=6; $i++)
 {
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="update">';
-
-    clearstatcache();
-
-
-    // Misc options
-    print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    $selected=$conf->global->MAIN_PDF_FORMAT;
-    if (empty($selected)) $selected=dol_getDefaultFormat();
-
-    // Show pdf format
-
-    print '<tr class="oddeven"><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
-    print $formadmin->select_paper_format($selected, 'MAIN_PDF_FORMAT');
-    print '</td></tr>';
-
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
-    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_LEFT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT).'">';
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
-    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_RIGHT" value="'.(empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT).'">';
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
-    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_TOP" value="'.(empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP).'">';
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
-    print '<input type="text" class="maxwidth50" name="MAIN_PDF_MARGIN_BOTTOM" value="'.(empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM).'">';
-    print '</td></tr>';
-
-    print '</table>';
-	print '</div>';
-
-	print '<br>';
-
-
-    // Addresses
-    print load_fiche_titre($langs->trans("PDFAddressForging"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    // Hide VAT Intra on address
-
-    print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
-    print $form->selectyesno('MAIN_TVAINTRA_NOT_IN_ADDRESS', (! empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))?$conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS:0, 1);
-    print '</td></tr>';
-
-    // Show prof id in address into pdf
-    for($i=1; $i<=6; $i++)
-    {
-        if (! $noCountryCode)
-        {
-            $pid=$langs->transcountry("ProfId".$i, $mysoc->country_code);
-            if ($pid == '-') $pid=false;
-        }
-        else
-        {
-            $pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-        }
-        if ($pid)
-        {
-            print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.'</td><td>';
-            $keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
-            print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant)?$conf->global->$keyforconstant:0, 1, $noCountryCode);
-            print '</td></tr>';
-        }
-    }
-
-	print '</table>';
-	print '</div>';
-
-
-    print '<br>';
-
-
-    // Localtaxes
-    $locales ='';
-    $text='';
-    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
-    {
-        if ($mysoc->useLocalTax(1))
-        {
-            $locales = $langs->transcountry("LT1", $mysoc->country_code);
-            $text ='<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)) . '</td><td>';
-            $text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_SECOND_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX : 0, 1);
-            $text .= '</td></tr>';
-        }
-
-        if ($mysoc->useLocalTax(2))
-        {
-            $locales.=($locales?' & ':'').$langs->transcountry("LT2", $mysoc->country_code);
-
-            $text.= '<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)) . '</td><td>';
-            $text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_THIRD_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX : 0, 1);
-            $text.= '</td></tr>';
-        }
-    }
-
-    $title = $langs->trans("PDFRulesForSalesTax");
-    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
-    {
-   		$title.=' - '.$langs->trans("PDFLocaltax", $locales);
-    }
-
-    print load_fiche_titre($title, '', '');
-
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    // Hide any information on Sale tax / VAT
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
-    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0, 1);
-    print '</td></tr>';
-
-    // Locataxes
-    print $text;
-
-    print '</table>';
-    print '<br>';
-
-
-    // Other
-    print load_fiche_titre($langs->trans("Other"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    //Desc
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
-    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0, 1);
-    print '</td></tr>';
-
-    //Ref
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
-    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0, 1);
-    print '</td></tr>';
-
-    //Details
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
-    print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0, 1);
-    print '</td></tr>';
-
-	//Invert sender and recipient
-
-	print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td>';
-	print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT))?$conf->global->MAIN_INVERT_SENDER_RECIPIENT:0, 1);
-	print '</td></tr>';
-
- 	// Place customer adress to the ISO location
-
-    print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
-	print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION', (! empty($conf->global->MAIN_PDF_USE_ISO_LOCATION))?$conf->global->MAIN_PDF_USE_ISO_LOCATION:0, 1);
-    print '</td></tr>';
-
-
-    print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
-	print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS);
-	print '</td></tr>';
-
-	print '</table>';
-	print '</div>';
-
-    print '<br><div class="center">';
-    print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
-    print ' &nbsp; ';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-
-    print '</form>';
-    print '<br>';
-}
-else	// Show
-{
-    // Misc options
-    print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
-
-
-	print '<div class="div-table-responsive-no-min">';
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    // Show pdf format
-
-    print '<tr class="oddeven"><td>'.$langs->trans("DictionaryPaperFormat").'</td><td>';
-
-    $pdfformatlabel='';
-    if (empty($conf->global->MAIN_PDF_FORMAT))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $pdfformatlabel=dol_getDefaultFormat();
-    }
-    else $pdfformatlabel=$conf->global->MAIN_PDF_FORMAT;
-    if (! empty($pdfformatlabel))
-    {
-    	$sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
-        $sql.=" WHERE code LIKE '%".$db->escape($pdfformatlabel)."%'";
-
-        $resql=$db->query($sql);
-        if ($resql)
-        {
-            $obj=$db->fetch_object($resql);
-            $paperKey = $langs->trans('PaperFormat'.$obj->code);
-            $unitKey = $langs->trans('SizeUnit'.$obj->unit);
-            $pdfformatlabel = ($paperKey == 'PaperFormat'.$obj->code ? $obj->label : $paperKey).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
-        }
-    }
-    print $pdfformatlabel;
-    print '</td></tr>';
-
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_LEFT").'</td><td>';
-    print empty($conf->global->MAIN_PDF_MARGIN_LEFT)?10:$conf->global->MAIN_PDF_MARGIN_LEFT;
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_RIGHT").'</td><td>';
-    print empty($conf->global->MAIN_PDF_MARGIN_RIGHT)?10:$conf->global->MAIN_PDF_MARGIN_RIGHT;
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_TOP").'</td><td>';
-    print empty($conf->global->MAIN_PDF_MARGIN_TOP)?10:$conf->global->MAIN_PDF_MARGIN_TOP;
-    print '</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_MARGIN_BOTTOM").'</td><td>';
-    print empty($conf->global->MAIN_PDF_MARGIN_BOTTOM)?10:$conf->global->MAIN_PDF_MARGIN_BOTTOM;
-    print '</td></tr>';
-
-	print '</table>';
-	print '</div>';
-
-	print '<br>';
-
-	print load_fiche_titre($langs->trans("PDFAddressForging"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-	// Hide Intra VAT on address
-
-	print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS, 1);
-	print '</td></tr>';
-
-	// Show prof id in address into pdf
-	for ($i=1; $i<=6; $i++)
+	if (! $noCountryCode)
 	{
-	    if (! $noCountryCode)
-	    {
-	        $pid=$langs->transcountry("ProfId".$i, $mysoc->country_code);
-	        if ($pid == '-') $pid=false;
-	    }
-	    else
-	    {
-	        $pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-	    }
-	    if ($pid)
-	    {
-	        print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.'</td><td>';
-	        $keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
-	        print yn($conf->global->$keyforconstant, 1);
-	        print '</td></tr>';
-	    }
-	}
-
-    print '</table>'."\n";
-	print '</div>';
-
-    print '<br>';
-
-    // Localtaxes
-    $locales ='';
-    $text='';
-    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
-    {
-        if ($mysoc->useLocalTax(1))
-        {
-            $locales = $langs->transcountry("LT1", $mysoc->country_code);
-            $text ='<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)) . '</td><td>';
-            $text .= yn($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX, 1);
-            $text .= '</td></tr>';
-        }
-
-        if ($mysoc->useLocalTax(2))
-        {
-            $locales.=($locales?' & ':'').$langs->transcountry("LT2", $mysoc->country_code);
-
-            $text.= '<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)) . '</td><td>';
-            $text.= yn($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX, 1);
-            $text.= '</td></tr>';
-        }
-    }
-
-    // Sales TAX / VAT information
-    $title=$langs->trans("PDFRulesForSalesTax", $locales);
-    if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2)) $title.=' - '.$langs->trans("PDFLocaltax", $locales);
-
-    print load_fiche_titre($title, '', '');
-
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
-
-    print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td colspan="2">';
-    print yn($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT, 1);
-    print '</td></tr>';
-
-    print $text;
-
-    print '</table>';
-    print '<br>';
-
-
-    // Other
-    print load_fiche_titre($langs->trans("Other"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-    print '<table summary="more" class="noborder" width="100%">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></tr>';
-
-	// Encrypt and protect PDF
-
-	print '<tr class="oddeven">';
-	print '<td>';
-	$text = $langs->trans("ProtectAndEncryptPdfFiles");
-	$desc = $form->textwithpicto($text, $langs->transnoentities("ProtectAndEncryptPdfFilesDesc"), 1);
-	print $desc;
-	print '</td>';
-	print '<td width="60">';
-	if($conf->global->PDF_SECURITY_ENCRYPTION == 1)
-	{
-		print img_picto($langs->trans("Active"), 'tick');
-	}
-	print '</td>';
-	print '<td align="center" width="140">';
-	if (empty($conf->global->PDF_SECURITY_ENCRYPTION))
-	{
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_pdfsecurity">'.$langs->trans("Activate").'</a>';
+		$pid=$langs->transcountry("ProfId".$i, $mysoc->country_code);
+		if ($pid == '-') $pid=false;
 	}
 	else
 	{
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_pdfsecurity">'.$langs->trans("Disable").'</a>';
+		$pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 	}
-	print "</td>";
-
-	print "</td>";
-	print '</tr>';
-
-	// Hide Desc
-
-	print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC, 1);
-	print '</td></tr>';
-
-	// Hide Ref
-
-	print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF, 1);
-	print '</td></tr>';
-
-	// Hide Details
-
-	print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS, 1);
-	print '</td></tr>';
-
-	// Invert sender and recipient
-	print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_INVERT_SENDER_RECIPIENT, 1);
-	print '</td></tr>';
-
-	// Use French location
-	print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td colspan="2">';
-	print yn($conf->global->MAIN_PDF_USE_ISO_LOCATION, 1);
-	print '</td></tr>';
-
-
-	print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td colspan="2">';
-	print $arraydetailsforpdffoot[($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS ? $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS : 0)];
-	print '</td></tr>';
-
-	print '</table>';
-	print '</div>';
-
-
-	/*
-	 *  Library
-	 */
-
-	print '<br>';
-	print load_fiche_titre($langs->trans("Library"), '', '');
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">'."\n";
-
-	print '<tr class="liste_titre">'."\n";
-	print '<td>'.$langs->trans("Name").'</td>'."\n";
-	print '<td>'.$langs->trans("Value").'</td>'."\n";
-	print "</tr>\n";
-
-	print '<tr class="oddeven">'."\n";
-	print '<td>'.$langs->trans("LibraryToBuildPDF").'</td>'."\n";
-	print '<td>';
-	$i=0;
-	$pdf=pdf_getInstance('A4');
-	if (class_exists('FPDF') && ! class_exists('TCPDF'))
+	if ($pid)
 	{
-		if ($i) print ' + ';
-		print 'FPDF';
-		print ' ('.@constant('FPDF_PATH').')';
-		$i++;
+		print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.'</td><td>';
+		$keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
+		print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant)?$conf->global->$keyforconstant:0, 1, $noCountryCode);
+		print '</td></tr>';
 	}
-	if (class_exists('TCPDF'))
-	{
-		if ($i) print ' + ';
-		print 'TCPDF';
-		print ' ('.@constant('TCPDF_PATH').')';
-		$i++;
-	}
-	if (class_exists('FPDI'))
-	{
-		if ($i) print ' + ';
-		print 'FPDI';
-		print ' ('.@constant('FPDI_PATH').')';
-		$i++;
-	}
-	if (class_exists('TCPDI'))
-	{
-		if ($i) print ' + ';
-		print 'TCPDI';
-		print ' ('.@constant('TCPDI_PATH').')';
-		$i++;
-	}
-	print '</td>'."\n";
-	print '</tr>'."\n";
-
-	print "</table>\n";
-	print '</div>';
-
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-    print '</div>';
-	print '<br>';
 }
 
+print '</table>';
+print '</div>';
+
+
+print '<br>';
+
+
+// Localtaxes
+$locales ='';
+$text='';
+if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
+{
+	if ($mysoc->useLocalTax(1))
+	{
+		$locales = $langs->transcountry("LT1", $mysoc->country_code);
+		$text ='<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT1", $mysoc->country_code)) . '</td><td>';
+		$text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_SECOND_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX : 0, 1);
+		$text .= '</td></tr>';
+	}
+
+	if ($mysoc->useLocalTax(2))
+	{
+		$locales.=($locales?' & ':'').$langs->transcountry("LT2", $mysoc->country_code);
+
+		$text.= '<tr class="oddeven"><td>' . $langs->trans("HideLocalTaxOnPDF", $langs->transcountry("LT2", $mysoc->country_code)) . '</td><td>';
+		$text.= $form->selectyesno('MAIN_PDF_MAIN_HIDE_THIRD_TAX', (!empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) ? $conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX : 0, 1);
+		$text.= '</td></tr>';
+	}
+}
+
+$title = $langs->trans("PDFRulesForSalesTax");
+if ($mysoc->useLocalTax(1) || $mysoc->useLocalTax(2))
+{
+	$title.=' - '.$langs->trans("PDFLocaltax", $locales);
+}
+
+print load_fiche_titre($title, '', '');
+
+print '<table summary="more" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+// Hide any information on Sale tax / VAT
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideAnyVATInformationOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))?$conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT:0, 1);
+print '</td></tr>';
+
+// Locataxes
+print $text;
+
+print '</table>';
+print '<br>';
+
+
+// Other
+print load_fiche_titre($langs->trans("Other"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
+print '<table summary="more" class="noborder" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+//Desc
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DESC', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC:0, 1);
+print '</td></tr>';
+
+//Ref
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideRefOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_REF', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF:0, 1);
+print '</td></tr>';
+
+//Details
+
+print '<tr class="oddeven"><td>'.$langs->trans("HideDetailsOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0, 1);
+print '</td></tr>';
+
+//Invert sender and recipient
+
+print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td>';
+print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT))?$conf->global->MAIN_INVERT_SENDER_RECIPIENT:0, 1);
+print '</td></tr>';
+
+// Place customer adress to the ISO location
+
+print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
+print $form->selectyesno('MAIN_PDF_USE_ISO_LOCATION', (! empty($conf->global->MAIN_PDF_USE_ISO_LOCATION))?$conf->global->MAIN_PDF_USE_ISO_LOCATION:0, 1);
+print '</td></tr>';
+
+
+print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td><td>';
+print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS);
+print '</td></tr>';
+
+print '</table>';
+print '</div>';
+
+
+/*
+ *  Library
+ */
+
+print '<br>';
+print load_fiche_titre($langs->trans("Library"), '', '');
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder" width="100%">'."\n";
+
+print '<tr class="liste_titre">'."\n";
+print '<td>'.$langs->trans("Name").'</td>'."\n";
+print '<td>'.$langs->trans("Value").'</td>'."\n";
+print "</tr>\n";
+
+print '<tr class="oddeven">'."\n";
+print '<td>'.$langs->trans("LibraryToBuildPDF").'</td>'."\n";
+print '<td>';
+$i=0;
+$pdf=pdf_getInstance('A4');
+if (class_exists('FPDF') && ! class_exists('TCPDF'))
+{
+	if ($i) print ' + ';
+	print 'FPDF';
+	print ' ('.@constant('FPDF_PATH').')';
+	$i++;
+}
+if (class_exists('TCPDF'))
+{
+	if ($i) print ' + ';
+	print 'TCPDF';
+	print ' ('.@constant('TCPDF_PATH').')';
+	$i++;
+}
+if (class_exists('FPDI'))
+{
+	if ($i) print ' + ';
+	print 'FPDI';
+	print ' ('.@constant('FPDI_PATH').')';
+	$i++;
+}
+if (class_exists('TCPDI'))
+{
+	if ($i) print ' + ';
+	print 'TCPDI';
+	print ' ('.@constant('TCPDI_PATH').')';
+	$i++;
+}
+print '</td>'."\n";
+print '</tr>'."\n";
+
+print "</table>\n";
+print '</div>';
+
+
+print '<br><div class="center">';
+print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+print '</div>';
+
+print '</form>';
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 28c3db6f1d3..c9bf1ba4357 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -88,7 +88,7 @@ llxHeader('', $langs->trans("Miscellaneous"), $wikihelp);
 
 print load_fiche_titre($langs->trans("SecuritySetup"), '', 'title_setup');
 
-print $langs->trans("MiscellaneousDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("MiscellaneousDesc")."</span><br>\n";
 print "<br>\n";
 
 
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index e08c2c5eca8..73cad8f69ad 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -147,7 +147,7 @@ llxHeader('', $langs->trans("Setup"), $wikihelp);
 
 print load_fiche_titre($langs->trans("SmsSetup"), '', 'title_setup');
 
-print $langs->trans("SmsDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("SmsDesc")."</span><br>\n";
 print "<br>\n";
 
 // List of sending methods
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index ad7a2278991..ba2dde77bec 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -229,7 +229,7 @@ print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_
 
 $current_language_code=$langs->defaultlang;
 $s=picto_from_langcode($current_language_code);
-print $form->textwithpicto($langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language_code.'</strong>', $langs->trans("TranslationDesc")).'<br>';
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language_code.'</strong>', $langs->trans("TranslationDesc")).'</span><br>';
 
 print '<br>';
 
diff --git a/htdocs/core/boxes/box_accountancy_suspense_account.php b/htdocs/core/boxes/box_accountancy_suspense_account.php
index 9740de82fbc..03c0f0ab7ae 100644
--- a/htdocs/core/boxes/box_accountancy_suspense_account.php
+++ b/htdocs/core/boxes/box_accountancy_suspense_account.php
@@ -108,14 +108,14 @@ class box_accountancy_suspense_account extends ModeleBoxes
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-					'td' => 'class="nohover opacitymedium left"',
-					'text' => $langs->trans("SuspenseAccountNotDefined")
+					'td' => 'class="nohover"',
+					'text' => '<span class="opacitymedium">'.$langs->trans("SuspenseAccountNotDefined").'</span>'
 				);
 			}
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'class="nohover opacitymedium left"',
-                'text' => $langs->trans("ReadPermissionNotAllowed")
+                'td' => 'class="nohover"',
+            	'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
             );
         }
     }
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 5d9a637de58..490d033dbf3 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -702,8 +702,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 				}
 				$newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto, 1);
-				$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"), 1);
 				$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"), 1);
+				$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"), 1);
 
 				$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
 				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);