diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index f4409e27928..749e2fa08ce 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -107,7 +107,7 @@ class Contact extends CommonObject
 		$this->db->begin();
 
 		// Clean parameters
-		$this->lastname=$this->lastname?trim($this->lastname):$this->lastname;
+		$this->lastname=$this->lastname?trim($this->lastname):trim($this->name);
         $this->firstname=trim($this->firstname);
         if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
         if (! empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7981c290183..75183c2448a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -64,6 +64,7 @@ abstract class CommonObject
     {
         global $conf;
 
+        //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
         $lastname=$this->lastname;
         $firstname=$this->firstname;
         if (empty($lastname))  $lastname=($this->lastname?$this->lastname:($this->name?$this->name:$this->nom));
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index e5e119fc92b..7618feb0349 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -115,15 +115,15 @@ if (empty($reshook))
         {
             $object->particulier       = GETPOST("private");
 
-            $object->name              = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?GETPOST('firstname').' '.GETPOST('nom'):GETPOST('nom').' '.GETPOST('firstname');
+            $object->name              = dolGetFirstLastname(GETPOST('firstname'),GETPOST('nom')?GETPOST('nom'):GETPOST('name'));
             $object->civilite_id       = GETPOST('civilite_id');
             // Add non official properties
-            $object->name_bis          = GETPOST('nom');
+            $object->name_bis          = GETPOST('name')?GETPOST('name'):GETPOST('nom');
             $object->firstname         = GETPOST('firstname');
         }
         else
         {
-            $object->name              = GETPOST('nom');
+            $object->name              = GETPOST('name')?GETPOST('name'):GETPOST('nom');
         }
         $object->address               = GETPOST('address');
         $object->zip                   = GETPOST('zipcode');
@@ -138,6 +138,8 @@ if (empty($reshook))
         $object->idprof2               = GETPOST('idprof2');
         $object->idprof3               = GETPOST('idprof3');
         $object->idprof4               = GETPOST('idprof4');
+        $object->idprof5               = GETPOST('idprof5');
+        $object->idprof6               = GETPOST('idprof6');
         $object->prefix_comm           = GETPOST('prefix_comm');
         $object->code_client           = GETPOST('code_client');
         $object->code_fournisseur      = GETPOST('code_fournisseur');
@@ -602,6 +604,8 @@ else
         $object->idprof2			= GETPOST('idprof2');
         $object->idprof3			= GETPOST('idprof3');
         $object->idprof4			= GETPOST('idprof4');
+        $object->idprof5			= GETPOST('idprof5');
+        $object->idprof6			= GETPOST('idprof6');
         $object->typent_id			= GETPOST('typent_id');
         $object->effectif_id		= GETPOST('effectif_id');
         $object->civility_id		= GETPOST('civilite_id');
@@ -1081,6 +1085,8 @@ else
                 $object->idprof2				= GETPOST('idprof2');
                 $object->idprof3				= GETPOST('idprof3');
                 $object->idprof4				= GETPOST('idprof4');
+        		$object->idprof5				= GETPOST('idprof5');
+        		$object->idprof6				= GETPOST('idprof6');
                 $object->typent_id				= GETPOST('typent_id');
                 $object->effectif_id			= GETPOST('effectif_id');
                 $object->barcode				= GETPOST('barcode');
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index de6b3f691a1..dce3f0bfbed 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -196,7 +196,7 @@ body {
 	background-color: <?php print $colorbackbody; ?>;
 <?php } ?>
 	color:#232323;
-	<?php if (empty($dol_use_jmobile)) { ?>
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
 	font-size:<?php print $fontsize ?>px;
 	<?php } ?>
    	font-family:<?php print $fontlist ?>;
@@ -2066,9 +2066,13 @@ li.ui-li-divider .ui-link {
 	color: #FFF !important;
 }
 .ui-btn-inner {
+	min-width: .4em;
 	padding-left: 10px;
 	padding-right: 10px;
 	white-space: normal;
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
+	font-size: <?php print $fontsize ?>px;
+	<?php } ?>
 }
 .ui-select .ui-btn-icon-right .ui-btn-inner {
 	padding-right: 36px;
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index b2a2981a769..4238327a35b 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -102,7 +102,7 @@ body {
 	background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
 <?php } ?>
 	color: #101010;
-	<?php if (empty($dol_use_jmobile)) { ?>
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
 	font-size: <?php print $fontsize ?>px;
 	<?php } ?>
     font-family: <?php print $fontlist ?>;
@@ -2259,8 +2259,12 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
 }
 
 .ui-btn-inner {
+	min-width: .4em;
 	padding-left: 10px;
 	padding-right: 10px;
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
+	font-size: <?php print $fontsize ?>px;
+	<?php } ?>
 	/* white-space: normal; */		/* Warning, enable this break the truncate feature */
 }
 .ui-select .ui-btn-icon-right .ui-btn-inner {
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 2736284ba71..cc31da801d0 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -79,7 +79,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
 body {
 /*	background-color: #FFFFFF; */
 	color: #101010;
-	<?php if (empty($dol_use_jmobile)) { ?>
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
 	font-size: <?php print $fontsize ?>px;
     <?php } ?>
     font-family: <?php print $fontlist ?>;
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index a8c80aee10e..7b1c9762db0 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -83,7 +83,7 @@ body {
 	/*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
 <?php } ?>
 	color: #101010;
-	<?php if (empty($dol_use_jmobile)) { ?>
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
 	font-size: <?php print $fontsize ?>px;
     <?php } ?>
     font-family: <?php print $fontlist ?>;
@@ -2304,8 +2304,12 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
 }
 
 .ui-btn-inner {
+	min-width: .4em;
 	padding-left: 10px;
 	padding-right: 10px;
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
+	font-size: <?php print $fontsize ?>px;
+	<?php } ?>
 	/* white-space: normal; */		/* Warning, enable this break the truncate feature */
 }
 .ui-select .ui-btn-icon-right .ui-btn-inner {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5f6b0ca9228..27c1a2cce90 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -216,7 +216,7 @@ body {
 	background: <?php print $colorbackbody; ?>;
 <?php } ?>
 	color: #101010;
-	<?php if (empty($dol_use_jmobile)) { ?>
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
 	font-size: <?php print $fontsize ?>px;
 	<?php } ?>
 	font-family: <?php print $fontlist ?>;
@@ -2622,17 +2622,27 @@ div.dolEventError h1, div.dolEventError h2 {
 li.ui-li-divider .ui-link {
 	color: #FFF !important;
 }
+.ui-btn {
+	margin: 0.2em 4px
+}
 a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover {
 	text-decoration: none !important;
 }
 
 .ui-btn-inner {
+	min-width: .4em;
 	padding-left: 10px;
 	padding-right: 10px;
+	<?php if (empty($dol_use_jmobile) || 1==1) { ?>
+	font-size: <?php print $fontsize ?>px;
+    <?php } ?>
 	/* white-space: normal; */		/* Warning, enable this break the truncate feature */
 }
+.ui-btn-icon-right .ui-btn-inner {
+	padding-right: 34px;
+}
 .ui-select .ui-btn-icon-right .ui-btn-inner {
-	padding-right: 36px;
+	padding-right: 38px;
 }
 .fiche .ui-controlgroup {
 	margin: 0px;