diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index 0b0ae5e922f..28c0360b775 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -126,4 +126,22 @@
 
 </div>
 
+<?php if (! $user->societe_id) { ?>
+<div class="tabsAction">
+				
+<?php if ($user->rights->societe->contact->creer) { ?>
+<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Modify'); ?></a>
+<?php } ?>
+
+<?php if (! $this->control->tpl['user_id'] && $user->rights->user->user->creer) { ?>
+<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=create_user&amp;canvas='.$canvas; ?>"><?php echo $langs->trans("CreateDolibarrLogin"); ?></a>
+<?php } ?>
+
+<?php if ($user->rights->societe->contact->supprimer) { ?>
+<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
+<?php } ?>
+
+</div><br>
+<?php } ?>
+
 <!-- END PHP TEMPLATE -->
\ No newline at end of file
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 38b690e568d..76bbc228b01 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -359,29 +359,6 @@ if (! empty($canvas))
 			// Display canvas
 			$objcanvas->display_canvas();
 			
-			// Barre d'actions
-			if (! $user->societe_id)
-			{
-				print '<div class="tabsAction">';
-				
-				if ($user->rights->societe->contact->creer)
-				{
-					print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
-				}
-				
-				if (! $objcanvas->control->object->user_id && $user->rights->user->user->creer)
-				{
-					print '<a class="butAction" href="fiche.php?id='.$id.'&amp;action=create_user&amp;canvas='.$canvas.'">'.$langs->trans("CreateDolibarrLogin").'</a>';
-				}
-
-				if ($user->rights->societe->contact->supprimer)
-				{
-					print '<a class="butActionDelete" href="fiche.php?id='.$id.'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
-				}
-				
-				print "</div><br>";
-			}
-			
 			print show_actions_todo($conf,$langs,$db,$objsoc,$objcanvas->control->object);
 			
 			print show_actions_done($conf,$langs,$db,$objsoc,$objcanvas->control->object);
diff --git a/htdocs/societe/canvas/default/tpl/card_view.tpl.php b/htdocs/societe/canvas/default/tpl/card_view.tpl.php
index 8577330effe..d9e7d3ccb34 100644
--- a/htdocs/societe/canvas/default/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/default/tpl/card_view.tpl.php
@@ -241,4 +241,20 @@ function CheckVAT(a) {
 
 </div>
 
+<div class="tabsAction">
+<?php if ($user->rights->societe->creer) { ?>
+<a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=edit&amp;canvas='.$canvas; ?>"><?php echo $langs->trans("Modify"); ?></a>
+<?php } ?>
+
+<?php if ($user->rights->societe->contact->creer) { ?>
+<a class="butAction" href="<?php echo DOL_URL_ROOT.'/contact/fiche.php?socid='.$this->control->tpl['id'].'&amp;action=create&amp;canvas='.$canvas; ?>"><?php echo $langs->trans("AddContact"); ?></a>
+<?php } ?>
+
+<?php if ($user->rights->societe->supprimer) { ?>
+<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
+<?php } ?>
+</div>
+
+<br>
+
 <!-- END PHP TEMPLATE -->
\ No newline at end of file
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 7327496a674..fc976ff1f02 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -470,32 +470,6 @@ if (! empty($canvas))
 			// Display canvas
 			$soccanvas->display_canvas();
 
-			/*
-			 *	Actions
-			 */
-			if ($_GET["action"] == '')
-			{
-				print '<div class="tabsAction">';
-
-				if ($user->rights->societe->creer)
-				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'&amp;action=edit&amp;canvas='.$canvas.'">'.$langs->trans("Modify").'</a>';
-				}
-
-				if ($user->rights->societe->contact->creer)
-				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid.'&amp;action=create&amp;canvas='.$canvas.'">'.$langs->trans("AddContact").'</a>';
-				}
-
-				if ($user->rights->societe->supprimer)
-				{
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
-				}
-
-				print '</div>';
-				print '<br>';
-			}
-
 
 			print '<table width="100%"><tr><td valign="top" width="50%">';
 			print '<a name="builddoc"></a>'; // ancre
@@ -513,8 +487,7 @@ if (! empty($canvas))
 			$somethingshown=$formfile->show_documents('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$soccanvas->control->object->default_lang);
 
 			print '</td>';
-			print '<td>';
-			print '</td>';
+			print '<td></td>';
 			print '</tr>';
 			print '</table>';