diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index b1532f5d7d7..ddc7079c786 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -240,7 +240,9 @@ if ($socid)
 	}
 
 	// Address
-	print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">'.nl2br($soc->address).'</td></tr>';
+	print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">';
+    print dol_print_address($soc->address,'gmap','thirdparty',$object->id);
+    print '</td></tr>';
 
 	// Zip / Town
 	print '<tr><td width="25%">'.$langs->trans('Zip').'</td><td width="25%">'.$soc->zip."</td>";
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index f3538c6e266..7c0a4c0332f 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -106,7 +106,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="socid" value="'.$socid.'">';
 
 print '<table class="border" width="100%">';
-print '<tr><td width="30%">'.$langs->trans('ThirdPartyName').'</td>';
+print '<tr><td width="25%">'.$langs->trans('ThirdPartyName').'</td>';
 print '<td colspan="3">';
 print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
 print '</td></tr>';
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index ca5582b4dee..f9703044257 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -133,7 +133,7 @@ if ($object->id)
 	print '<table class="border"width="100%">';
 
 	// Ref
-	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td>';
+	print '<tr><td width="25%">'.$langs->trans("ThirdPartyName").'</td>';
 	print '<td colspan="3">';
 	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
 	print '</td></tr>';
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index fba53282d1f..8fbd6c6187f 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -92,7 +92,7 @@ if ($id > 0)
 
     print '<table class="border" width="100%">';
 
-    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+    print '<tr><td width="25%">'.$langs->trans('ThirdPartyName').'</td>';
     print '<td colspan="3">';
     print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
     print '</td></tr>';
@@ -124,7 +124,7 @@ if ($id > 0)
 
     print '<br>';
 
-    $colwidth='20';
+    $colwidth='25';
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 
diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php
index 2499ae30a5b..a0ab078e315 100644
--- a/htdocs/societe/notify/fiche.php
+++ b/htdocs/societe/notify/fiche.php
@@ -141,7 +141,7 @@ if ($result > 0)
 
     print '<table class="border"width="100%">';
 
-    print '<tr><td width="20%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
+    print '<tr><td width="25%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
     print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
     print '</td></tr>';
 
@@ -169,7 +169,7 @@ if ($result > 0)
         print '</td></tr>';
     }
 
-    print '<tr><td width="30%">'.$langs->trans("NbOfActiveNotifications").'</td>';
+    print '<tr><td>'.$langs->trans("NbOfActiveNotifications").'</td>';
     print '<td colspan="3">';
     $sql = "SELECT COUNT(n.rowid) as nb";
     $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index ceef3ec324e..0ee8d7d0f8c 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1465,7 +1465,7 @@ else
         */
 
         // Name
-        print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
+        print '<tr><td width="25%">'.$langs->trans('ThirdPartyName').'</td>';
         print '<td colspan="3">';
         print $form->showrefnav($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
         print '</td>';