diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index 621cf800d99..58fffbae5b7 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -42,8 +42,10 @@ function resource_prepare_head($object)
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('Contact');
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
+		$head[$h][1] = $langs->trans('ContactsAddresses');
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
 		$head[$h][2] = 'contact';
 		$h++;
 	}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 52e0b9b9e96..2c362a42c2c 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -62,11 +62,16 @@ function shipping_prepare_head($object)
 		}
 	}
 
-	$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
-	$head[$h][1] = $langs->trans("ContactsAddresses");
-	$head[$h][2] = 'contact';
-	$h++;
-
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+	    $head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
+    	$head[$h][1] = $langs->trans("ContactsAddresses");
+		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    	$head[$h][2] = 'contact';
+    	$h++;
+	}
+	
     $nbNote = 0;
     if (!empty($object->note_private)) $nbNote++;
     if (!empty($object->note_public)) $nbNote++;
diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql
index 4acc8e467c5..a0b36634ce1 100644
--- a/htdocs/install/mysql/data/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/data/llx_c_type_contact.sql
@@ -64,11 +64,14 @@ insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) v
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (130, 'fichinter','external', 'BILLING',       'Contact client facturation intervention', 1);
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (131, 'fichinter','external', 'CUSTOMER',      'Contact client suivi de l''intervention', 1);
 
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (140,'order_supplier','internal', 'SALESREPFOLL',  'Responsable suivi de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (141,'order_supplier','internal', 'SHIPPING',      'Responsable réception de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (142,'order_supplier','external', 'BILLING',       'Contact fournisseur facturation commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (143,'order_supplier','external', 'CUSTOMER',      'Contact fournisseur suivi commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (145,'order_supplier','external', 'SHIPPING',      'Contact fournisseur livraison commande', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (140, 'order_supplier','internal', 'SALESREPFOLL',  'Responsable suivi de la commande', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (141, 'order_supplier','internal', 'SHIPPING',      'Responsable réception de la commande', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (142, 'order_supplier','external', 'BILLING',       'Contact fournisseur facturation commande', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (143, 'order_supplier','external', 'CUSTOMER',      'Contact fournisseur suivi commande', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (145, 'order_supplier','external', 'SHIPPING',      'Contact fournisseur livraison commande', 1);
+
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (150, 'dolresource','internal', 'USERINCHARGE',     'In charge of resource', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (151, 'dolresource','external', 'THIRDINCHARGE',    'In charge of resource', 1);
 
 -- All project code must start with 'PROJECT'
 insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (160, 'project',  'internal', 'PROJECTLEADER', 'Chef de Projet', 1);
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 4aae6de71e6..1ddc7479bcb 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -39,6 +39,9 @@ ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after dat
 
 ALTER TABLE llx_expedition ADD COLUMN billed smallint DEFAULT 0;
 
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (150, 'dolresource','internal', 'USERINCHARGE',     'In charge of resource', 1);
+insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (151, 'dolresource','external', 'THIRDINCHARGE',    'In charge of resource', 1);
+
 -- DROP TABLE llx_product_lot;
 CREATE TABLE llx_product_lot (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 163eeab13ce..d803ec774fd 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -173,17 +173,17 @@ if ( $object->fetch($id) > 0 )
 		print '<table class="border" width="100%">';
 
 		// Ref
-		print '<tr><td width="20%" class="fieldrequired">'.$langs->trans("ResourceFormLabel_ref").'</td>';
+		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("ResourceFormLabel_ref").'</td>';
 		print '<td><input size="12" name="ref" value="'.(GETPOST('ref') ? GETPOST('ref') : $object->ref).'"></td></tr>';
 
 		// Type
-		print '<tr><td width="20%">'.$langs->trans("ResourceType").'</td>';
+		print '<tr><td>'.$langs->trans("ResourceType").'</td>';
 		print '<td>';
 		$ret = $formresource->select_types_resource($object->fk_code_type_resource,'fk_code_type_resource','',2);
 		print '</td></tr>';
 
 		// Description
-		print '<tr><td valign="top">'.$langs->trans("Description").'</td>';
+		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 		print '<td>';
 		print '<textarea name="description" cols="80" rows="'.ROWS_3.'">'.($_POST['description'] ? GETPOST('description','alpha') : $object->description).'</textarea>';
 		print '</td></tr>';
@@ -215,7 +215,7 @@ if ( $object->fetch($id) > 0 )
 		 */
 		print '<table width="100%" class="border">';
 
-		print '<tr><td style="width:35%">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
+		print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
 		$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
 		print $form->showrefnav($object, 'id', $linkback,1,"rowid");
 		print '</td>';
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index d635ee2e1e6..cadde67eba3 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -127,7 +127,7 @@ if ($id > 0 || ! empty($ref))
 	*/
 	print '<table width="100%" class="border">';
 
-	print '<tr><td style="width:35%">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
 	$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
 	print $form->showrefnav($object, 'id', $linkback,1,"rowid");
 	print '</td>';
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index a21bc88c319..8e39c64e2c9 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -89,7 +89,7 @@ if ($object->id)
 
 	$head=resource_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("ResourceSingular"), 0, 'resource');
+	dol_fiche_head($head, 'documents',  $langs->trans("ResourceSingular"), 0, 'resource@resource');
 
 
 	// Construit liste des fichiers
@@ -104,7 +104,7 @@ if ($object->id)
     print '<table class="border" width="100%">';
 
 
-	print '<tr><td style="width:35%">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans("ResourceFormLabel_ref").'</td><td>';
 	$linkback = $objet->ref.' <a href="list.php">'.$langs->trans("BackToList").'</a>';
 	print $form->showrefnav($object, 'id', $linkback,1,"rowid");
 	print '</td>';
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index e404a3bdef8..1f277688957 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) 2005-2012	Regis Houssin	  <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2012	Juanjo Menent	  <jmenent@2byte.es>
+ * Copyright (C) 2016       Laurent Destailleur <aldy@users.sourceforge.net>
  * Copyright (C) 2013       Florian Henry   <florian.henry@open-concept.pro>
- * Copyright (C) 2016	  	  Gilles Poirier  <glgpoirier@gmail.com>
+ * Copyright (C) 2016	    Gilles Poirier  <glgpoirier@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,6 +45,7 @@ $object->fetch($id,$ref);
 
 $permissionnote=$user->rights->resource->write;	// Used by the include of actions_setnotes.inc.php
 
+
 /*
  * Actions
  */