diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index c0e115a20df..20a10694500 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -24,3 +24,4 @@ SalariesStatistics=Salary statistics
 SalariesAndPayments=Salaries and payments
 ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
 FillFieldFirst=Fill employee field first
+UpdateAmountWithLastSalary=Set amount with last salary
diff --git a/htdocs/salaries/ajax/ajaxsalaries.php b/htdocs/salaries/ajax/ajaxsalaries.php
index dc7715ff6ba..adea28ee8ce 100644
--- a/htdocs/salaries/ajax/ajaxsalaries.php
+++ b/htdocs/salaries/ajax/ajaxsalaries.php
@@ -47,8 +47,14 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 
 restrictedArea($user, 'salaries');
 
+
+/*
+ * View
+ */
+
 $fk_user = GETPOST('fk_user', 'int');
 $return_arr = array();
+
 if (!empty(GETPOST('fk_user', 'int'))) {
 	$sql = "SELECT s.amount, s.rowid FROM ".MAIN_DB_PREFIX."salary as s";
 	$sql .= " WHERE s.fk_user = ".((int) $fk_user);
@@ -60,7 +66,7 @@ if (!empty(GETPOST('fk_user', 'int'))) {
 		$obj = $db->fetch_object($resql);
 		$label = "Salary amount";
 		$row_array['label'] = $label;
-		$row_array['value'] = $obj->amount;
+		$row_array['value'] = price2num($obj->amount, 'MT');
 		$row_array['key'] = "Amount";
 
 		array_push($return_arr, $row_array);
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 3caf2afa7bd..b0abeeb134a 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -668,7 +668,7 @@ if ($action == 'create') {
 						);
 
 					} else {
-						alert("'.$langs->trans("FillFieldFirst").'");
+						alert("'.dol_escape_js($langs->trans("FillFieldFirst")).'");
 					}
 		});
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5ea2e6c0529..a2d912d46e6 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -657,6 +657,10 @@ input:-webkit-autofill {
 	-webkit-box-shadow: 0 0 0 50px #FBFFEA inset;
 }
 
+input[type=checkbox], input[type=radio] {
+	margin: 0 3px 0 3px;
+}
+
 /* CSS for placeholder */
 .placeholder { color: #ccc; }
 ::-webkit-input-placeholder { color:#ccc; }
@@ -922,6 +926,19 @@ textarea.centpercent {
 .marginright2 {
 	margin-<?php print $right; ?>: 2px;
 }
+.paddingtop {
+	padding-top: 4px;
+}
+.paddingtop2 {
+	padding-top: 2px;
+}
+.paddingbottom {
+	padding-bottom: 4px;
+}
+.paddingbottom2 {
+	padding-bottom: 2px;
+}
+
 .cursordefault {
 	cursor: default;
 }
@@ -3324,18 +3341,7 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 .smallpaddingimp {
 	padding: 4px !important;
 }
-.nopaddingleft {
-	padding-<?php print $left; ?>: 0px;
-}
-.nopaddingright {
-	padding-<?php print $right; ?>: 0px;
-}
-.nopaddingtopimp {
-	padding-top: 0px !important;
-}
-.nopaddingbottomimp {
-	padding-bottom: 0px !important;
-}
+
 .notopnoleft {
 	border-collapse: collapse;
 	border: 0px;