diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index facb13cf59f..f78cd42034c 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -35,7 +35,7 @@ if (!$user->admin)
     accessforbidden();
 
 // Load translation files required by the page
-$langs->loadLangs(array('admin', 'other', 'agenda'));
+$langs->loadLangs(array('admin', 'other', 'agenda', 'users'));
 
 $action = GETPOST('action', 'alpha');
 $value = GETPOST('value', 'alpha');
@@ -353,7 +353,8 @@ print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_VIEW
 print '<tr class="oddeven">'."\n";
-print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
+$htmltext=$langs->trans("ThisValueCanOverwrittenOnUserLevel", $langs->transnoentitiesnoconv("UserGUISetup"));
+print '<td>'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltext).'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
 print '<td class="right">'."\n";
 $tmplist=array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
diff --git a/htdocs/document.php b/htdocs/document.php
index 72a50b253d5..e784949c042 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -74,7 +74,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $encoding = '';
 $action=GETPOST('action', 'alpha');
-$original_file=GETPOST('file', 'alpha');		// Do not use urldecode here ($_GET are already decoded by PHP).
+$original_file=GETPOST('file', 'alphanohtml');  // Do not use urldecode here ($_GET are already decoded by PHP).
 $hashp=GETPOST('hashp', 'aZ09');
 $modulepart=GETPOST('modulepart', 'alpha');
 $urlsource=GETPOST('urlsource', 'alpha');
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 6105c086c61..5a7b7ff2e42 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1749,7 +1749,7 @@ elseif ($id || $ref)
     	print '<div class="fichehalfleft">';
     	print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border" width="100%">';
+        print '<table class="border tableforfield" width="100%">';
 
 		// Linked documents
 		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 77b5894b709..d92a0b47bcc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1853,4 +1853,5 @@ ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
\ No newline at end of file
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
+ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
\ No newline at end of file
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 266276b0ab9..49055b31290 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -346,7 +346,7 @@ else
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
 			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 
-			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
+			dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), -1, 'sending');
 
 			/*
 			 * Confirmation de la suppression
@@ -434,7 +434,7 @@ else
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 
-		    print '<table class="border" width="100%">';
+		    print '<table class="border tableforfield" width="100%">';
 
 			// Shipment
 			/*
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index af9ada494f8..7dec3cb7a0b 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -84,7 +84,7 @@ require 'main.inc.php';	// Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $action=GETPOST('action', 'alpha');
-$original_file=GETPOST('file', 'alpha');		// Do not use urldecode here ($_GET are already decoded by PHP).
+$original_file=GETPOST('file', 'alphanohtml');  // Do not use urldecode here ($_GET are already decoded by PHP).
 $hashp=GETPOST('hashp', 'aZ09');
 $modulepart=GETPOST('modulepart', 'alpha');
 $urlsource=GETPOST('urlsource', 'alpha');