diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
index 505633031..19a0b3198 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
@@ -29,9 +29,7 @@
 		{include file='controllers/cart_rules/actions.tpl'}
 		{include file="footer_toolbar.tpl"}
 	</div>
-	<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn">
-		<i class="icon-save"></i>
-		{l s='Save'}
+	<button type="submit" class="btn btn-default pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn">{l s='Save'}
 	</button>
 	<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
 </form>
diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
index d85cfd7dd..4fc060f9d 100644
--- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
@@ -361,7 +361,7 @@
 					</div>
 					<div class="row">
 						<div class="col-lg-12">
-							<button type="submit" id="submitCustomerNote" class="btn btn-primary pull-right" disabled="disabled" /><i class="icon-save"></i> {l s='Save'}</button>
+							<button type="submit" id="submitCustomerNote" class="btn btn-default pull-right" disabled="disabled" /><i class="icon-save"></i> {l s='Save'}</button>
 						</div>
 					</div>
 					<span id="note_feedback"></span>
diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl
index 533a059ce..7002d12d1 100644
--- a/admin-dev/themes/default/template/controllers/images/content.tpl
+++ b/admin-dev/themes/default/template/controllers/images/content.tpl
@@ -123,7 +123,7 @@
 			</div>
 			<div class="row">
 				<div class="col-lg-9 col-lg-push-3">
-					<input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" />
+					<input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-default" onclick="return confirm('{l s='Are you sure?'}');" />
 				</div>
 			</div>
 		</div>
@@ -151,7 +151,7 @@
                 </div>
                 <div class="row">
                     <div class="col-lg-12 pull-right">
-                        <input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" />
+                        <input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="btn btn-default" onclick="return confirm('{l s='Are you sure?'}');" />
                     </div>
                 </div>
             </div>
diff --git a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
index 9fdc954a3..f42b6cfea 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
@@ -80,7 +80,7 @@
 					<input type="hidden" name="id_module" value="{$id_module}" />
 					<input type="hidden" name="id_hook" value="{$id_hook}" />
 				{/if}
-				<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-primary" />
+				<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
 			</div>
 		</div>
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
index 03aeb907a..0bd8a7498 100644
--- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+++ b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
@@ -119,7 +119,7 @@
 			</table>
 		</div>
 		<div class="row pull-right">
-			<button type="submit" class="btn btn-primary" name="submitModule{$list['name_id']}"> 
+			<button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}"> 
 				<i class="icon-save"></i>
 				{l s='Save restrictions'}
 			</button>
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index b466033ff..cb6c85486 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -258,7 +258,7 @@
 
 			<input type="hidden" name="id_product_attribute" id="id_product_attribute" value="0" />
 			<input type="hidden" name="key_tab" id="key_tab" value="Informations" />
-			<button id="product_form_submit_btn"  type="submit" name="submitAddproduct" class="btn btn-primary">{l s='Save'}</button>
+			<button id="product_form_submit_btn"  type="submit" name="submitAddproduct" class="btn btn-default">{l s='Save'}</button>
 			{include file="footer_toolbar.tpl"}
 		</form>
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
index 9bd8862f9..fb605cff1 100644
--- a/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
@@ -37,7 +37,7 @@
 							</select>
 						</div>
 						<div class="col-lg-6">
-							<input type="submit" class="btn btn-primary" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
+							<input type="submit" class="btn btn-default" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
 						</div>
 					</div>
 					{else}
@@ -53,7 +53,7 @@
 							{/if}
 							</div>
 							<div class="col-lg-6">
-								<input type="submit" class="btn btn-primary" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
+								<input type="submit" class="btn btn-default" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
 							</div>
 						</div>
 						{/foreach}
diff --git a/admin-dev/themes/default/template/helpers/required_fields.tpl b/admin-dev/themes/default/template/helpers/required_fields.tpl
index 3efd767b6..4440b6a5d 100644
--- a/admin-dev/themes/default/template/helpers/required_fields.tpl
+++ b/admin-dev/themes/default/template/helpers/required_fields.tpl
@@ -57,6 +57,6 @@
 			{/foreach}
 			</tbody>
 		</table>
-		<button class="btn btn-primary pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button>
+		<button class="btn btn-default pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button>
 	</form>
 </div>
\ No newline at end of file
diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index c28325f9b..ceafdbecb 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -149,7 +149,7 @@ class AdminAddressesControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save   '),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			)
 		);
 		$id_customer = (int)Tools::getValue('id_customer');
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index e9da5bd26..612febe0b 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -491,7 +491,7 @@ class AdminCategoriesControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn-primary'
+				'class' => 'btn-default'
 			)
 		);
 		
diff --git a/controllers/admin/AdminCmsCategoriesController.php b/controllers/admin/AdminCmsCategoriesController.php
index a84a9ab16..d9725536e 100644
--- a/controllers/admin/AdminCmsCategoriesController.php
+++ b/controllers/admin/AdminCmsCategoriesController.php
@@ -293,7 +293,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			)
 		);
 		$this->tpl_form_vars['PS_ALLOW_ACCENTED_CHARS_URL'] = (int)Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL');
diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php
index 770b2241d..5e7ad50ca 100644
--- a/controllers/admin/AdminCmsController.php
+++ b/controllers/admin/AdminCmsController.php
@@ -177,7 +177,7 @@ class AdminCmsControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			)
 		);
 
diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php
index 201f00dd7..1d04a93be 100644
--- a/controllers/admin/AdminContactsController.php
+++ b/controllers/admin/AdminContactsController.php
@@ -101,7 +101,7 @@ class AdminContactsControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save   '),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			)
 		);
 		
diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php
index 1b241aa2a..ed7e727fd 100644
--- a/controllers/admin/AdminCurrenciesController.php
+++ b/controllers/admin/AdminCurrenciesController.php
@@ -226,7 +226,7 @@ class AdminCurrenciesControllerCore extends AdminController
 
 		$this->fields_form['submit'] = array(
 			'title' => $this->l('Save'),
-			'class' => 'btn btn-primary'
+			'class' => 'btn btn-default'
 		);
 
 		return parent::renderForm();
diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php
index 49f92134d..965f6fc8c 100644
--- a/controllers/admin/AdminDeliverySlipController.php
+++ b/controllers/admin/AdminDeliverySlipController.php
@@ -83,7 +83,7 @@ class AdminDeliverySlipControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Generate PDF file'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'icon' => 'icon-download-alt'	
 			)
 		);
diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php
index 403fcc1ee..b5c346db9 100644
--- a/controllers/admin/AdminGendersController.php
+++ b/controllers/admin/AdminGendersController.php
@@ -158,7 +158,7 @@ class AdminGendersControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			)
 		);
 
diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
index d42a3955b..1d53d7115 100644
--- a/controllers/admin/AdminGroupsController.php
+++ b/controllers/admin/AdminGroupsController.php
@@ -239,7 +239,7 @@ class AdminGroupsControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save   '),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			),
 			'input' => array(
 				array(
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 640b0a216..10a90b421 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -157,7 +157,7 @@ class AdminImagesControllerCore extends AdminController
 						'visibility' => Shop::CONTEXT_ALL
 					)
 				),
-				'submit' => array('title' => $this->l('Save   '), 'class' => 'btn btn-primary'),
+				'submit' => array('title' => $this->l('Save   '), 'class' => 'btn btn-default'),
 			),
 		);
 		
@@ -326,7 +326,7 @@ class AdminImagesControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			)
 		);
 
diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php
index 564ceb072..9ad3a3f4d 100644
--- a/controllers/admin/AdminMetaController.php
+++ b/controllers/admin/AdminMetaController.php
@@ -320,7 +320,7 @@ class AdminMetaControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			)
 		);
 		return parent::renderForm();
diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php
index 2b5035acc..db8291401 100644
--- a/controllers/admin/AdminSlipController.php
+++ b/controllers/admin/AdminSlipController.php
@@ -115,7 +115,7 @@ class AdminSlipControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Generate PDF file'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'id' => 'submitPrint',
 				'icon' => 'icon-download-alt'
 			)
diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php
index 4137959ee..0e40081b3 100755
--- a/controllers/admin/AdminSpecificPriceRuleController.php
+++ b/controllers/admin/AdminSpecificPriceRuleController.php
@@ -265,7 +265,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			),
 		);
 		if (($value = $this->getFieldValue($this->object, 'price')) != -1)	
diff --git a/controllers/admin/AdminStockConfigurationController.php b/controllers/admin/AdminStockConfigurationController.php
index 52f6ff3c4..db472441d 100644
--- a/controllers/admin/AdminStockConfigurationController.php
+++ b/controllers/admin/AdminStockConfigurationController.php
@@ -190,7 +190,7 @@ class AdminStockConfigurationControllerCore extends AdminController
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary'
+					'class' => 'btn btn-default'
 				)
 			);
 		}
@@ -302,7 +302,7 @@ class AdminStockConfigurationControllerCore extends AdminController
 					),
 					'submit' => array(
 						'title' => $this->l('Save'),
-						'class' => 'btn btn-primary'
+						'class' => 'btn btn-default'
 					)
 				);
 
@@ -339,7 +339,7 @@ class AdminStockConfigurationControllerCore extends AdminController
 							),
 							'submit' => array(
 								'title' => $this->l('Save'),
-								'class' => 'btn btn-primary'
+								'class' => 'btn btn-default'
 							)
 						);
 					}
diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php
index 4eac01463..b6c087e6e 100644
--- a/controllers/admin/AdminStockManagementController.php
+++ b/controllers/admin/AdminStockManagementController.php
@@ -305,7 +305,7 @@ class AdminStockManagementControllerCore extends AdminController
 					),
 					'submit' => array(
 						'title' => $this->l('Add to stock'),
-						'class' => 'btn btn-primary'
+						'class' => 'btn btn-default'
 					)
 				);
 				$this->fields_value['usable'] = 1;
@@ -409,7 +409,7 @@ class AdminStockManagementControllerCore extends AdminController
 					),
 					'submit' => array(
 						'title' => $this->l('Remove from stock'),
-						'class' => 'btn btn-primary'
+						'class' => 'btn btn-default'
 					)
 				);
 			break;
@@ -531,7 +531,7 @@ class AdminStockManagementControllerCore extends AdminController
 					),
 					'submit' => array(
 						'title' => $this->l('Transfer'),
-						'class' => 'btn btn-primary'
+						'class' => 'btn btn-default'
 					)
 				);
 			break;
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index bd29a8136..ec8f0d251 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -187,7 +187,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save and stay'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'stay' => true
 			)
 		);
@@ -337,7 +337,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save and stay'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'stay' => true
 			)
 		);
diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php
index e99020dd7..5bc82ee97 100644
--- a/controllers/admin/AdminTaxesController.php
+++ b/controllers/admin/AdminTaxesController.php
@@ -215,7 +215,7 @@ class AdminTaxesControllerCore extends AdminController
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary'
+				'class' => 'btn btn-default'
 			)
 		);
 
diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php
index fd2890773..5c9455bba 100755
--- a/controllers/admin/AdminWebserviceController.php
+++ b/controllers/admin/AdminWebserviceController.php
@@ -179,7 +179,7 @@ class AdminWebserviceControllerCore extends AdminController
 
 		$this->fields_form['submit'] = array(
 			'title' => $this->l('Save   '),
-			'class' => 'btn btn-primary'
+			'class' => 'btn btn-default'
 		);
 
 		if (!($obj = $this->loadObject(true)))