diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css
index 46bbb75c3..f43e77354 100644
--- a/admin-dev/themes/default/admin.css
+++ b/admin-dev/themes/default/admin.css
@@ -184,6 +184,7 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox .process-icon-export-csv-orders { background-image: url(process-icon-export-csv.png);}
 .toolbarBox .process-icon-export-csv-details { background-image: url(process-icon-export-csv-details.png);}
 .toolbarBox .process-icon-export-stock-mvt-csv { background-image: url(process-icon-export-csv.png);}
+.toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url(process-icon-new.png);}
 
 div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
 
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 5fd9652d1..bdc05d9af 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -633,7 +633,7 @@ class AdminProductsControllerCore extends AdminController
 					if (!empty($is_virtual))
 						Product::updateIsVirtual($product->id);
 
-					$this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&action=Combinations&token='.($token ? $token : $this->token);
+					$this->redirect_after = self::$currentIndex.'&id_product='.$product->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&add'.$this->table.'&conf=4&action=Combinations&token='.($token ? $token : $this->token);
 				}
 			}
 		}
@@ -1415,13 +1415,14 @@ class AdminProductsControllerCore extends AdminController
 							}
 							$this->redirect_after = $preview_url;
 						}
-						else //if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))// || ($id_image && $id_image !== true)) // Save and stay on same form
-						{// Save and stay on same form
-						if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
-							$this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=4&action='.Tools::getValue('key_tab').'&token='.($token ? $token : $this->token);
-                        else
-						// Default behavior (save and back)
-						$this->redirect_after = self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=4&token='.($token ? $token : $this->token);
+						else
+						{
+							// Save and stay on same form
+							if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
+								$this->redirect_after = self::$currentIndex.'&id_product='.$object->id.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&addproduct&conf=4&action='.Tools::getValue('key_tab').'&token='.($token ? $token : $this->token);
+							else
+							// Default behavior (save and back)
+							$this->redirect_after = self::$currentIndex.'&id_category='.(!empty($_REQUEST['id_category'])?$_REQUEST['id_category']:'1').'&conf=4&token='.($token ? $token : $this->token);
 						}
 					}
 				}
@@ -1734,7 +1735,16 @@ class AdminProductsControllerCore extends AdminController
 
 		// this is made to "save and stay" feature
 		$this->tpl_form_vars['show_product_tab_content'] = Tools::getValue('action');
-		if (Tools::getValue('id_product') || ((Tools::isSubmit('submitAddproduct') OR Tools::isSubmit('submitAddproductAndPreview') OR Tools::isSubmit('submitAddproductAndStay') OR Tools::isSubmit('submitSpecificPricePriorities') OR Tools::isSubmit('submitPriceAddition') OR Tools::isSubmit('submitPricesModification')) AND count($this->_errors)) OR Tools::isSubmit('updateproduct') OR Tools::isSubmit('addproduct'))
+		if (Tools::getValue('id_product')
+			|| ((Tools::isSubmit('submitAddproduct')
+				|| Tools::isSubmit('submitAddproductAndPreview')
+				|| Tools::isSubmit('submitAddproductAndStay')
+				|| Tools::isSubmit('submitSpecificPricePriorities')
+				|| Tools::isSubmit('submitPriceAddition')
+				|| Tools::isSubmit('submitPricesModification'))
+			&& count($this->_errors))
+			|| Tools::isSubmit('updateproduct')
+			|| Tools::isSubmit('addproduct'))
 		{
 			$this->addJS(_PS_JS_DIR_.'admin-products.js');
 			$this->fields_form = array();
@@ -2037,7 +2047,6 @@ class AdminProductsControllerCore extends AdminController
 		// let's calculate this once for all
 		if (!Validate::isLoadedObject($this->object) && Tools::getValue('id_product'))
 			$this->_errors[] = 'Unable to load object';
-	//		throw new PrestashopException('object not loaded');
 		else
 		{
 			$this->_displayDraftWarning($this->object->active);
diff --git a/translations/fr/admin.php b/translations/fr/admin.php
index f6255ee4f..fc3f4af7a 100644
--- a/translations/fr/admin.php
+++ b/translations/fr/admin.php
@@ -498,7 +498,7 @@ $_LANGADM['AdminFeatures52f5e0bc3859bc5f5e25130b6c7e8881'] = 'Position';
 $_LANGADM['AdminFeaturesd3b206d196cd6be3a2764c1fb90b200f'] = 'Supprimer la sélection';
 $_LANGADM['AdminFeaturese25f0ecd41211b01c83e5fec41df4fe7'] = 'Supprimer les éléments sélectionnés ?';
 $_LANGADM['AdminFeatures7aad0283b11e41230d9d1fc7372c3862'] = 'Ajouter une nouvelle valeur';
-$_LANGADM['AdminFeatures5f46be79c24b6cde1ff2176a2ce917e9'] = 'Ajouter une nouvelle caractristique';
+$_LANGADM['AdminFeatures5f46be79c24b6cde1ff2176a2ce917e9'] = 'Ajouter une nouvelle caractéristique';
 $_LANGADM['AdminFeatures689202409e48743b914713f96d93947c'] = 'Valeur';
 $_LANGADM['AdminFeaturesd6ae681fcd58f1e1936ca97da36528ff'] = 'Ajouter une nouvelle caractéristique';
 $_LANGADM['AdminFeatures21021ea0e52be8e9c599f4dff41e5be0'] = 'Caractéristique';