diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index ce3324505eb..44b209e4371 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -44,6 +44,7 @@ $origin		= GETPOST('origin','alpha');
 $catorigin	= GETPOST('catorigin','int');
 $type 		= GETPOST('type','alpha');
 $urlfrom	= GETPOST('urlfrom','alpha');
+$backtopage = GETPOST('backtopage','alpha');
 
 $socid=GETPOST('socid','int');
 $label=GETPOST('label');
@@ -173,6 +174,11 @@ if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->cr
 			header("Location: ".$urlfrom);
 			exit;
 		}
+		elseif ($backtopage)
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
 		else if ($idProdOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
@@ -232,8 +238,9 @@ if ($user->rights->categorie->creer)
 		print '<input type="hidden" name="urlfrom" value="'.$urlfrom.'">';
 		print '<input type="hidden" name="action" value="add">';
 		print '<input type="hidden" name="addcat" value="addcat">';
-		print '<input type="hidden" name="id" value="'.GETPOST('origin').'">';
+		print '<input type="hidden" name="id" value="'.GETPOST('origin','alpha').'">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 		if ($origin) print '<input type="hidden" name="origin" value="'.$origin.'">';
 		if ($catorigin)	print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index e634da4fe80..18112f13eba 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -65,8 +65,11 @@ $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css')
 
 llxHeader('',$title,'','',0,0,$arrayofjs,$arrayofcss);
 
+$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/categories/card.php?action=create&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type).'"><span class="valignmiddle">'.$langs->trans("NewCategory").'</span>';
+$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+$newcardbutton.= '</a>';
 
-print load_fiche_titre($title);
+print load_fiche_titre($title, $newcardbutton);
 
 //print '<table border="0" width="100%" class="notopnoleftnoright">';
 //print '<tr><td valign="top" width="30%" class="notopnoleft">';
@@ -170,6 +173,8 @@ foreach($fulltree as $key => $val)
 }
 
 
+//print_barre_liste('', 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, 0, '', 0, $newcardbutton, '', 0, 1, 1);
+
 print '<table class="liste nohover" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td></td><td align="right">';
 if (! empty($conf->use_javascript_ajax))
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 57168c3a4c0..30a7ebbfddc 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -7,7 +7,7 @@ DeleteContact=Delete a contact/address
 ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
-MenuNewProspect=Nnew Prospect
+MenuNewProspect=New Prospect
 MenuNewSupplier=New Vendor
 MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, vendor)
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a17f5660d36..da5ac450d09 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -54,7 +54,7 @@ $colortexttitlenotab='100,60,20';
 $colortexttitle='0,0,0';
 $colortext='0,0,0';
 $colortextlink='0,0,100';
-$fontsize='0.85em';
+$fontsize='0.86em';
 $fontsizesmaller='0.75em';
 
 if (defined('THEME_ONLY_CONSTANT')) return;
@@ -1899,7 +1899,7 @@ if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
 .login_table .tdinputlogin {
     background-color: #fff;
     border: 2px solid #ccc;
-    min-width: 200px;
+    min-width: 220px;
     border-radius: 2px;
 }
 .login_table .tdinputlogin .fa {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3ad63794c08..6862825d2ed 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -55,7 +55,7 @@ $colortexttitlenotab='90,90,90';
 $colortexttitle='20,20,20';
 $colortext='0,0,0';
 $colortextlink='0,0,120';
-$fontsize='13';
+$fontsize='14';
 $fontsizesmaller='11';
 
 if (defined('THEME_ONLY_CONSTANT')) return;
@@ -121,7 +121,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
     $conf->global->THEME_ELDY_TEXT='0,0,0';
-    $conf->global->THEME_ELDY_FONT_SIZE1='13';
+    $conf->global->THEME_ELDY_FONT_SIZE1='14';
     $conf->global->THEME_ELDY_FONT_SIZE2='11';
 }
 
@@ -1890,7 +1890,7 @@ form#login {
 .login_table .tdinputlogin {
     background-color: #fff;
     border: 2px solid #ccc;
-    min-width: 200px;
+    min-width: 220px;
     border-radius: 2px;
 }
 .login_table .tdinputlogin .fa {