diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 7e65d711f0b..73b58d7fb37 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -655,7 +655,8 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 			
 			print '<td>'.$address->town.'</td>';
 			
-			print '<td>'.$address->country.'</td>';
+			$img=picto_from_langcode($address->country_code);
+			print '<td>'.($img?$img.' ':'').$address->country.'</td>';
 
 			// Lien click to dial
 			print '<td>';
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index bf6cceabab0..e8fad145610 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -296,7 +296,7 @@ class Address
 						$line->town				= $objp->town;
 						$line->country_id		= $objp->country_id;
 						$line->country_code		= $objp->country_id?$objp->country_code:'';
-						$line->country			= $objp->country_id?($langs->trans('Country'.$objp->country_code)!='Country'.$objp->country_code?strtoupper($langs->trans('Country'.$objp->country_code)):$objp->country):'';
+						$line->country			= $objp->country_id?($langs->trans('Country'.$objp->country_code)!='Country'.$objp->country_code?$langs->trans('Country'.$objp->country_code):$objp->country):'';
 						$line->phone			= $objp->tel;
 						$line->fax				= $objp->fax;
 						$line->note				= $objp->note;
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 602f467b3ba..0190a4c8a49 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -1646,12 +1646,12 @@ else
         print '</td>';
 
         // VAT Code
-        print '<td nowrap="nowrpa">'.$langs->trans('VATIntra').'</td><td>';
+        print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td><td>';
         if ($object->tva_intra)
         {
             $s='';
             $s.=$object->tva_intra;
-            $s.='<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$object->tva_intra.'">';
+            $s.='<input type="hidden" id="tva_intra" name="tva_intra" size="12" maxlength="20" value="'.$object->tva_intra.'">';
 
             if (empty($conf->global->MAIN_DISABLEVATCHECK))
             {
@@ -1666,7 +1666,7 @@ else
                     print "}\n";
                     print '</script>';
                     print "\n";
-                    $s.='<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
+                    $s.='<a href="#" onclick="javascript: CheckVAT( $(\'#tva_intra\').val() );">'.$langs->trans("VATIntraCheck").'</a>';
                     $s = $form->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1);
                 }
                 else