diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl
index 7a1398251..0d549a2e3 100644
--- a/admin-dev/themes/default/template/controllers/images/content.tpl
+++ b/admin-dev/themes/default/template/controllers/images/content.tpl
@@ -76,20 +76,19 @@
 				</div>
 			</div>
 
-			<div class="form-group">
 			{foreach $types AS $k => $type}
-				<label class="control-label col-lg-3 second-select format_{$k}" style="display:none;">{l s='Select a format'}</label>
-				<div class="col-lg-9 second-select margin-form format_{$k}" style="display:none;">
-					<select class="second-select format_{$k}" name="format_{$k}">
+			<div class="form-group second-select format_{$k}" style="display:none;">			
+				<label class="control-label col-lg-3">{l s='Select a format'}</label>
+				<div class="col-lg-9 margin-form">
+					<select name="format_{$k}">
 						<option value="all">{l s='All'}</option>
 						{foreach $formats[$k] AS $format}
 							<option value="{$format['id_image_type']}">{$format['name']}</option>
 						{/foreach}
 					</select>
 				</div>
-			{/foreach}
 			</div>
-
+			{/foreach}
 			<script>
 				function changeFormat(elt)
 				{ldelim}
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index d73765595..bb5cb4c10 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -362,7 +362,7 @@
 							type="submit"
 							id="{$table}_form_submit_btn"
 							name="{if isset($categoryData['submit']['name'])}{$categoryData['submit']['name']}{else}submitOptions{$table}{/if}"
-							class="btn btn-default {if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
+							class="{if isset($categoryData['submit']['class'])}{$categoryData['submit']['class']}{else}btn btn-default{/if}"
 							>
 							{if isset($categoryData['submit']['title'])}{$categoryData['submit']['title']}{else}{l s='Save'}{/if}
 						</button>
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index b319af9ba..8626445bb 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -341,6 +341,7 @@ class FrontControllerCore extends Controller
 			'request' => $link->getPaginationLink(false, false, false, true),
 			'PS_STOCK_MANAGEMENT' => Configuration::get('PS_STOCK_MANAGEMENT'),
 			'quick_view' => Configuration::get('PS_QUICK_VIEW'),
+			'shop_phone' => Configuration::get('PS_SHOP_PHONE'),
 		));
 
 		// Add the tpl files directory for mobile
diff --git a/modules/bankwire/bankwire.php b/modules/bankwire/bankwire.php
index 6a2fdf0b5..38a4946ef 100644
--- a/modules/bankwire/bankwire.php
+++ b/modules/bankwire/bankwire.php
@@ -215,7 +215,7 @@ class BankWire extends PaymentModule
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockadvertising/blockadvertising.php b/modules/blockadvertising/blockadvertising.php
index 3a1ac73f1..6028d3db0 100644
--- a/modules/blockadvertising/blockadvertising.php
+++ b/modules/blockadvertising/blockadvertising.php
@@ -226,7 +226,7 @@ class BlockAdvertising extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockbestsellers/blockbestsellers.php b/modules/blockbestsellers/blockbestsellers.php
index 5ef8ad0ac..9097c588c 100644
--- a/modules/blockbestsellers/blockbestsellers.php
+++ b/modules/blockbestsellers/blockbestsellers.php
@@ -141,7 +141,7 @@ class BlockBestSellers extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php
index 2940ba4e4..685e663e8 100644
--- a/modules/blockcart/blockcart.php
+++ b/modules/blockcart/blockcart.php
@@ -270,7 +270,7 @@ class BlockCart extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockcategories/blockcategories.php b/modules/blockcategories/blockcategories.php
index 3b89a4f27..e4c212688 100644
--- a/modules/blockcategories/blockcategories.php
+++ b/modules/blockcategories/blockcategories.php
@@ -371,7 +371,7 @@ class BlockCategories extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockcontact/blockcontact.php b/modules/blockcontact/blockcontact.php
index aa73cb770..51da4ba1b 100644
--- a/modules/blockcontact/blockcontact.php
+++ b/modules/blockcontact/blockcontact.php
@@ -116,7 +116,7 @@ class Blockcontact extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockcontactinfos/blockcontactinfos.php b/modules/blockcontactinfos/blockcontactinfos.php
index e330bdf11..8f6b54b6f 100644
--- a/modules/blockcontactinfos/blockcontactinfos.php
+++ b/modules/blockcontactinfos/blockcontactinfos.php
@@ -130,7 +130,7 @@ class Blockcontactinfos extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockcustomerprivacy/blockcustomerprivacy.php b/modules/blockcustomerprivacy/blockcustomerprivacy.php
index 5834c7522..308dddd07 100644
--- a/modules/blockcustomerprivacy/blockcustomerprivacy.php
+++ b/modules/blockcustomerprivacy/blockcustomerprivacy.php
@@ -139,7 +139,7 @@ Tip: If the customer privacy message is too long to be written directly in the f
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blocklink/blocklink.php b/modules/blocklink/blocklink.php
index 2cbf76911..db89285d5 100644
--- a/modules/blocklink/blocklink.php
+++ b/modules/blocklink/blocklink.php
@@ -461,7 +461,7 @@ class BlockLink extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitLinkAdd',
 				)
 			),
@@ -498,7 +498,7 @@ class BlockLink extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitTitle',
 				)
 			),
@@ -533,7 +533,7 @@ class BlockLink extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitOrderWay',
 				)
 			),
diff --git a/modules/blockmanufacturer/blockmanufacturer.php b/modules/blockmanufacturer/blockmanufacturer.php
index 5f89c0691..95490d248 100644
--- a/modules/blockmanufacturer/blockmanufacturer.php
+++ b/modules/blockmanufacturer/blockmanufacturer.php
@@ -185,7 +185,7 @@ class BlockManufacturer extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blocknewproducts/blocknewproducts.php b/modules/blocknewproducts/blocknewproducts.php
index ba283cdea..3185ebc44 100644
--- a/modules/blocknewproducts/blocknewproducts.php
+++ b/modules/blocknewproducts/blocknewproducts.php
@@ -180,7 +180,7 @@ class BlockNewProducts extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php
index e68bce7ff..1be48971e 100644
--- a/modules/blocknewsletter/blocknewsletter.php
+++ b/modules/blocknewsletter/blocknewsletter.php
@@ -557,7 +557,7 @@ class Blocknewsletter extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockpaymentlogo/blockpaymentlogo.php b/modules/blockpaymentlogo/blockpaymentlogo.php
index fbe57e0c9..80c790e21 100644
--- a/modules/blockpaymentlogo/blockpaymentlogo.php
+++ b/modules/blockpaymentlogo/blockpaymentlogo.php
@@ -147,7 +147,7 @@ class BlockPaymentLogo extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockrss/blockrss.php b/modules/blockrss/blockrss.php
index 266f816f4..54fc21efe 100644
--- a/modules/blockrss/blockrss.php
+++ b/modules/blockrss/blockrss.php
@@ -196,7 +196,7 @@ class Blockrss extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blocksocial/blocksocial.php b/modules/blocksocial/blocksocial.php
index b26aa43a3..ff1d04c11 100644
--- a/modules/blocksocial/blocksocial.php
+++ b/modules/blocksocial/blocksocial.php
@@ -115,7 +115,7 @@ class blocksocial extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockspecials/blockspecials.php b/modules/blockspecials/blockspecials.php
index 855434267..9b18e083a 100644
--- a/modules/blockspecials/blockspecials.php
+++ b/modules/blockspecials/blockspecials.php
@@ -165,7 +165,7 @@ class BlockSpecials extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blockstore/blockstore.php b/modules/blockstore/blockstore.php
index 18740d506..f823c502c 100644
--- a/modules/blockstore/blockstore.php
+++ b/modules/blockstore/blockstore.php
@@ -135,7 +135,7 @@ class BlockStore extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blocksupplier/blocksupplier.php b/modules/blocksupplier/blocksupplier.php
index a97c532b7..e6db11f46 100644
--- a/modules/blocksupplier/blocksupplier.php
+++ b/modules/blocksupplier/blocksupplier.php
@@ -194,7 +194,7 @@ class BlockSupplier extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/blocktags/blocktags.php b/modules/blocktags/blocktags.php
index 4e4c24414..acda0c4c5 100644
--- a/modules/blocktags/blocktags.php
+++ b/modules/blocktags/blocktags.php
@@ -139,7 +139,7 @@ class BlockTags extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary')
+					'class' => 'btn btn-default')
 				),
 			);
 			
diff --git a/modules/blocktopmenu/blocktopmenu.php b/modules/blocktopmenu/blocktopmenu.php
index 682fe6457..d61e58180 100644
--- a/modules/blocktopmenu/blocktopmenu.php
+++ b/modules/blocktopmenu/blocktopmenu.php
@@ -151,6 +151,12 @@ class Blocktopmenu extends Module
 		}
 		else if (Tools::isSubmit('submitBlocktopmenuLinks'))
 		{
+			foreach ($languages as $key => $val)
+			{
+				$links_label[$val['id_lang']] = Tools::getValue('link_'.(int)$val['id_lang']);
+				$labels[$val['id_lang']] = Tools::getValue('label_'.(int)$val['id_lang']);
+			}
+			
 			if ((!count($links_label)) && (!count($labels)))
 				;
 			else if (!count($links_label))
@@ -161,7 +167,7 @@ class Blocktopmenu extends Module
 				$this->_html .= $this->displayError($this->l('Please add a label for your default language.'));
 			else
 			{
-				MenuTopLinks::add(Tools::getValue('link'), Tools::getValue('label'), Tools::getValue('new_window', 0), (int)Shop::getContextShopID());
+				MenuTopLinks::add($links_label, $labels,  Tools::getValue('new_window', 0), (int)Shop::getContextShopID());
 				$this->_html .= $this->displayConfirmation($this->l('The link has been added.'));
 			}
 			$update_cache = true;
@@ -779,7 +785,7 @@ class Blocktopmenu extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					)
 			),
 		);
@@ -851,7 +857,7 @@ class Blocktopmenu extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					)
 			),
 		);
@@ -1027,4 +1033,4 @@ class Blocktopmenu extends Module
 				
 		return $helper->generateList($links, $fields_list);
 	}
-}
\ No newline at end of file
+}
diff --git a/modules/blockviewed/blockviewed.php b/modules/blockviewed/blockviewed.php
index d4e92c1bf..baef6e818 100644
--- a/modules/blockviewed/blockviewed.php
+++ b/modules/blockviewed/blockviewed.php
@@ -188,7 +188,7 @@ class BlockViewed extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary')
+					'class' => 'btn btn-default')
 				),
 			);
 			
diff --git a/modules/carriercompare/carriercompare.php b/modules/carriercompare/carriercompare.php
index a2029b489..76e1dd8fb 100755
--- a/modules/carriercompare/carriercompare.php
+++ b/modules/carriercompare/carriercompare.php
@@ -307,7 +307,7 @@ class CarrierCompare extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/cheque/cheque.php b/modules/cheque/cheque.php
index 1aae69bda..955362eda 100644
--- a/modules/cheque/cheque.php
+++ b/modules/cheque/cheque.php
@@ -202,7 +202,7 @@ class Cheque extends PaymentModule
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/crossselling/crossselling.php b/modules/crossselling/crossselling.php
index c4fc51a32..181be60ba 100755
--- a/modules/crossselling/crossselling.php
+++ b/modules/crossselling/crossselling.php
@@ -273,7 +273,7 @@ class CrossSelling extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/dateofdelivery/dateofdelivery.php b/modules/dateofdelivery/dateofdelivery.php
index 34fd0f1b2..33e86318e 100644
--- a/modules/dateofdelivery/dateofdelivery.php
+++ b/modules/dateofdelivery/dateofdelivery.php
@@ -498,7 +498,7 @@ class DateOfDelivery extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
@@ -583,7 +583,7 @@ class DateOfDelivery extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitCarrierRule',
 				)
 			),
diff --git a/modules/homefeatured/homefeatured.php b/modules/homefeatured/homefeatured.php
index 52042aed9..678742d4c 100644
--- a/modules/homefeatured/homefeatured.php
+++ b/modules/homefeatured/homefeatured.php
@@ -162,7 +162,7 @@ class HomeFeatured extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php
index 635cc555e..266951c83 100644
--- a/modules/mailalerts/mailalerts.php
+++ b/modules/mailalerts/mailalerts.php
@@ -577,7 +577,7 @@ class MailAlerts extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitMailAlert',
 				)
 			),
@@ -668,7 +668,7 @@ class MailAlerts extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitMAMerchant',
 				)
 			),
diff --git a/modules/newsletter/newsletter.php b/modules/newsletter/newsletter.php
index 9aac8ac88..5361d9d02 100644
--- a/modules/newsletter/newsletter.php
+++ b/modules/newsletter/newsletter.php
@@ -241,7 +241,7 @@ class Newsletter extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Export .CSV file'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitExport',
 				)
 			),
@@ -300,7 +300,7 @@ class Newsletter extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Export .CSV file'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitExport',
 				)
 			),
diff --git a/modules/productscategory/productscategory.php b/modules/productscategory/productscategory.php
index 7fbc24841..eca12f57a 100644
--- a/modules/productscategory/productscategory.php
+++ b/modules/productscategory/productscategory.php
@@ -222,7 +222,7 @@ class productsCategory extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/producttooltip/producttooltip.php b/modules/producttooltip/producttooltip.php
index a8d3c0f1b..d2dd44cba 100644
--- a/modules/producttooltip/producttooltip.php
+++ b/modules/producttooltip/producttooltip.php
@@ -240,7 +240,7 @@ class ProductToolTip extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/pscleaner/pscleaner.php b/modules/pscleaner/pscleaner.php
index e906667fe..c1597a953 100644
--- a/modules/pscleaner/pscleaner.php
+++ b/modules/pscleaner/pscleaner.php
@@ -543,7 +543,7 @@ class PSCleaner extends Module
 				'description' => $this->l('I understand that all the catalog data will be removed without possible rollback: products, features, categories, tags, images, prices, attachments, scenes, stocks, attribute groups and values, manufacturers, suppliers…'),
 			'submit' => array(
 				'title' => $this->l('Delete catalog'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitTruncateCatalog',
 				'id' => 'submitTruncateCatalog',
 				)
@@ -559,7 +559,7 @@ class PSCleaner extends Module
 				'description' => $this->l('I understand that all the orders and customers will be removed without possible rollback: customers, carts, orders, connections, guests, messages, stats...'),
 				'submit' => array(
 					'title' => $this->l('Delete orders & customers'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					'name' => 'submitTruncateSales',
 					'id' => 'submitTruncateSales',
 					)
@@ -574,7 +574,7 @@ class PSCleaner extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Check & fix'),
-				'class' => 'btn btn-primary',
+				'class' => 'btn btn-default',
 				'name' => 'submitCheckAndFix',
 				)
 			),
diff --git a/modules/referralprogram/referralprogram.php b/modules/referralprogram/referralprogram.php
index 2600fc788..d7820442e 100644
--- a/modules/referralprogram/referralprogram.php
+++ b/modules/referralprogram/referralprogram.php
@@ -566,7 +566,7 @@ class ReferralProgram extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					'name' => 'submitReferralProgram',
 					)
 			),
@@ -589,7 +589,7 @@ class ReferralProgram extends Module
 				),
 				'submit' => array(
 					'title' => $this->l('Save'),
-					'class' => 'btn btn-primary',
+					'class' => 'btn btn-default',
 					'name' => 'submitText',
 				)
 			),
diff --git a/modules/statsdata/statsdata.php b/modules/statsdata/statsdata.php
index 03db297be..6854da6a9 100644
--- a/modules/statsdata/statsdata.php
+++ b/modules/statsdata/statsdata.php
@@ -235,7 +235,7 @@ class StatsData extends Module
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);
 		
diff --git a/modules/vatnumber/vatnumber.php b/modules/vatnumber/vatnumber.php
index e2e2b89d0..ee7e96c86 100755
--- a/modules/vatnumber/vatnumber.php
+++ b/modules/vatnumber/vatnumber.php
@@ -214,7 +214,7 @@ class VatNumber extends TaxManagerModule
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'btn btn-primary')
+				'class' => 'btn btn-default')
 			),
 		);