diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 701c72f3cf9..a2b71df348c 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -354,14 +354,14 @@ class FormFile
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 			print_titre($langs->trans("Documents"));
-			print '<table class="border" summary="listofdocumentstable" width="100%">';
+			print '<table class="border formdoc" summary="listofdocumentstable" width="100%">';
 
 			print '<tr '.$bc[$var].'>';
 
 			// Model
 			if (! empty($modellist))
 			{
-				print '<td align="center">';
+				print '<td align="center" class="formdoc">';
 				print $langs->trans('Model').' ';
 				print $html->selectarray('model',$modellist,$modelselected,$showempty,0,0);
 			    if (sizeof($cgvlist) > 0)
@@ -372,13 +372,13 @@ class FormFile
 			}
 			else
 			{
-				print '<td align="left">';
+				print '<td align="left" class="formdoc">';
 				print $langs->trans("Files");
 				print '</td>';
 			}
 
 			// Language code (if multilang)
-			print '<td align="center">';
+			print '<td align="center" class="formdoc">';
 			if (($allowgenifempty || (is_array($modellist) && sizeof($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && ! $forcenomultilang)
 			{
 				include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php');
@@ -393,7 +393,7 @@ class FormFile
 			print '</td>';
 
 			// Button
-			print '<td align="center" colspan="'.($delallowed?'2':'1').'">';
+			print '<td align="center" colspan="'.($delallowed?'2':'1').'" class="formdocbutton">';
 			print '<input class="button" ';
 			//print ((is_array($modellist) && sizeof($modellist))?'':' disabled="true"') // Always allow button "Generate" (even if no model activated)
 			print ' type="submit" value="'.$buttonlabel.'"';
diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/includes/modules/societe/modules_societe.class.php
index ee367ae3ad0..02a0df5847b 100644
--- a/htdocs/includes/modules/societe/modules_societe.class.php
+++ b/htdocs/includes/modules/societe/modules_societe.class.php
@@ -38,10 +38,11 @@ class ModeleThirdPartyDoc extends CommonDocGenerator
 	var $error='';
 
 	/**
-	 *      \brief      Return list of active generation modules
-	 * 		\param		$db		Database handler
+	 *     Return list of active generation modules
+	 * 	   @param      $db                 Database handler
+	 *     @param      $maxfilenamelength  Max length of value to show
 	 */
-	function liste_modeles($db)
+	function liste_modeles($db,$maxfilenamelength=0)
 	{
 		global $conf;
 
@@ -49,7 +50,7 @@ class ModeleThirdPartyDoc extends CommonDocGenerator
 		$liste=array();
 
 		include_once(DOL_DOCUMENT_ROOT.'/lib/functions2.lib.php');
-		$liste=getListOfModels($db,$type);
+		$liste=getListOfModels($db,$type,$maxfilenamelength);
 
 		return $liste;
 	}
diff --git a/htdocs/lib/functions2.lib.php b/htdocs/lib/functions2.lib.php
index f0fefed5b96..cbe0c229a8b 100644
--- a/htdocs/lib/functions2.lib.php
+++ b/htdocs/lib/functions2.lib.php
@@ -1001,11 +1001,12 @@ function version_webserver()
 
 /**
  * 	Return list of activated modules usable for document generation.
- * 	@param		$db				Database handler
- * 	@param		$type			Type of models (company, invoice, ...)
- * 	@return		int or array	0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".
+ * 	@param		$db				    Database handler
+ * 	@param		$type			    Type of models (company, invoice, ...)
+ *  @param      $maxfilenamelength  Max length of value to show
+ * 	@return		int or array	    0 if no module is activated, or array(key=>label). For modules that need directory scan, key is completed with ":filename".
  */
-function getListOfModels($db,$type)
+function getListOfModels($db,$type,$maxfilenamelength=0)
 {
     global $conf,$langs;
     $liste=array();
@@ -1057,7 +1058,8 @@ function getListOfModels($db,$type)
                 {
                     foreach($listoffiles as $record)
                     {
-                        $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],24,'middle');
+                        $max=($maxfilenamelength?$maxfilenamelength:28);
+                        $liste[$obj->id.':'.$record['fullname']]=dol_trunc($record['name'],$max,'middle');
                     }
                 }
                 else