diff --git a/modules/blockbanner/blockbanner.tpl b/modules/blockbanner/blockbanner.tpl
index 460a41a89a988..9604d6c1a4384 100644
--- a/modules/blockbanner/blockbanner.tpl
+++ b/modules/blockbanner/blockbanner.tpl
@@ -29,7 +29,7 @@
 	<div class="container">
 	  <a href="{$banner_link}" title="{$banner_desc}">
 		{if isset($banner_img)}
-			<img class="img-responsive" src="{$module_dir}{$banner_img}" alt=""/>
+			<img class="img-responsive" src="{$module_dir}{$banner_img}" alt="{$banner_desc}" title="{$banner_desc}"/>
 		{else}
 			{$banner_desc}
 		{/if}
diff --git a/modules/blockcategories/category-tree-branch.tpl b/modules/blockcategories/category-tree-branch.tpl
index f0d945c2388e9..a0d13c82046db 100644
--- a/modules/blockcategories/category-tree-branch.tpl
+++ b/modules/blockcategories/category-tree-branch.tpl
@@ -25,7 +25,7 @@
 
 <li class="category_{$node.id}{if isset($last) && $last == 'true'} last{/if}">
 	<a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
-		title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
+		title="{$node.desc|strip_tags|trim|truncate:255:'...'|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
 	{if $node.children|@count > 0}
 		<ul>
 		{foreach from=$node.children item=child name=categoryTreeBranch}
diff --git a/modules/themeconfigurator/views/templates/admin/items.tpl b/modules/themeconfigurator/views/templates/admin/items.tpl
index 8cd6e246f054a..a6a997ddfdaf2 100644
--- a/modules/themeconfigurator/views/templates/admin/items.tpl
+++ b/modules/themeconfigurator/views/templates/admin/items.tpl
@@ -15,7 +15,7 @@
                 {foreach name=items from=$hookItems item=hItem}
                     <li id="item-{$hItem.id_item}" class="item panel">
                         <span class="item-order">{if $hItem.item_order le 9}0{/if}{$hItem.item_order}</span>
-                        <!--<i class="icon-sort"></i>-->
+                        {if $hItem.image}<span><img src="{$module_dir}images/{$hItem.image}" alt="" title="" class="preview" /></span>{/if}
                         <span class="item-title">{$hItem.title}</span>
                         <span class="button btn btn-default button-edit pull-right"><i class="icon-edit"></i>{l s='Edit' mod='themeconfigurator'}</span>
                         <span class="button btn btn-default button-close pull-right"><i class="icon-remove"></i>{l s='Close' mod='themeconfigurator'}</span>
diff --git a/themes/default-bootstrap/addresses.tpl b/themes/default-bootstrap/addresses.tpl
index 8779feea70818..5866c8370ca27 100644
--- a/themes/default-bootstrap/addresses.tpl
+++ b/themes/default-bootstrap/addresses.tpl
@@ -23,58 +23,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{*
-** Retro compatibility for PrestaShop version < 1.4.2.5 with a recent theme
-*}
-
-{* Two variable are necessaries to display the address with the new layout system *}
-{* Will be deleted for 1.5 version and more *}
-{if !isset($multipleAddresses)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}
-
-	{* PrestaShop < 1.4.2 compatibility *}
-	{if isset($addresses)}
-		{$address_number = 0}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$multipleAddresses.$address_number.ordered.$address_key_number = $address_key}
-					{$multipleAddresses.$address_number.formated.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{$multipleAddresses.$address_number.object = $address}
-		{$address_number = $address_number  + 1}
-		{/foreach}
-	{/if}
-{/if}
-
-{* Define the style if it doesn't exist in the PrestaShop version*}
-{* Will be deleted for 1.5 version and more *}
-{if !isset($addresses_style)}
-	{$addresses_style.company = 'address_company'}
-	{$addresses_style.vat_number = 'address_company'}
-	{$addresses_style.firstname = 'address_name'}
-	{$addresses_style.lastname = 'address_name'}
-	{$addresses_style.address1 = 'address_address1'}
-	{$addresses_style.address2 = 'address_address2'}
-	{$addresses_style.city = 'address_city'}
-	{$addresses_style.country = 'address_country'}
-	{$addresses_style.phone = 'address_phone'}
-	{$addresses_style.phone_mobile = 'address_phone_mobile'}
-	{$addresses_style.alias = 'address_title'}
-{/if}
-
 <script type="text/javascript">
 //<![CDATA[
 	{literal}
diff --git a/themes/default-bootstrap/authentication.tpl b/themes/default-bootstrap/authentication.tpl
index 56d75a82ce282..24e23c00024bb 100644
--- a/themes/default-bootstrap/authentication.tpl
+++ b/themes/default-bootstrap/authentication.tpl
@@ -82,9 +82,6 @@ $(document).ready(function() {
 	<script type="text/javascript">
 	{literal}
 	$(document).ready(function(){
-		// Retrocompatibility with 1.4
-		if (typeof baseUri === "undefined" && typeof baseDir !== "undefined")
-		baseUri = baseDir;
 		$('#create-account_form').submit(function(){
 			submitFunction();
 			return false;
diff --git a/themes/default-bootstrap/css/global.css b/themes/default-bootstrap/css/global.css
index 09df5efba0cff..14dfa0ca21f20 100644
--- a/themes/default-bootstrap/css/global.css
+++ b/themes/default-bootstrap/css/global.css
@@ -2405,6 +2405,64 @@ a.price_discount_delete:hover {
   background: white;
 }
 
+@media (max-width: 767px) {
+  #order-detail-content #cart_summary table, #order-detail-content #cart_summary thead, #order-detail-content #cart_summary tbody, #order-detail-content #cart_summary th, #order-detail-content #cart_summary td, #order-detail-content #cart_summary tr {
+    display: block;
+  }
+  #order-detail-content #cart_summary thead tr {
+    position: absolute;
+    top: -9999px;
+    left: -9999px;
+  }
+  #order-detail-content #cart_summary tr {
+    border-bottom: 1px solid #ccc;
+    overflow: hidden;
+  }
+  #order-detail-content #cart_summary td {
+    border: none;
+    position: relative;
+    width: 50%;
+    float: left;
+    white-space: normal;
+  }
+  #order-detail-content #cart_summary td.cart_avail {
+    clear: both;
+  }
+  #order-detail-content #cart_summary td.cart_quantity {
+    clear: both;
+    padding: 9px 8px 11px 18px;
+  }
+  #order-detail-content #cart_summary td.cart_delete {
+    width: 100%;
+    clear: both;
+    text-align: right;
+  }
+  #order-detail-content #cart_summary td.cart_delete:before {
+    display: inline-block;
+    padding-right: 0.5em;
+    position: relative;
+    top: -3px;
+  }
+  #order-detail-content #cart_summary td.cart_delete div {
+    display: inline;
+  }
+  #order-detail-content #cart_summary td:before {
+    content: attr(data-title);
+    display: block;
+  }
+  #order-detail-content #cart_summary tfoot td {
+    float: none;
+    width: 100%;
+  }
+  #order-detail-content #cart_summary tfoot td:before {
+    display: inline;
+  }
+  #order-detail-content #cart_summary tfoot tr .text-right, #order-detail-content #cart_summary tfoot tr .price {
+    display: block;
+    float: left;
+    width: 50%;
+  }
+}
 .cart_voucher {
   vertical-align: top !important;
 }
@@ -3451,3 +3509,10 @@ div.star.star_hover:after {
 .ie8 #facebook_block, .ie8 #cmsinfo_block {
   height: 344px;
 }
+
+/************************* Zoom ******************************/
+@media (max-width: 1199px) {
+  .zoomdiv {
+    display: none !important;
+  }
+}
diff --git a/themes/default-bootstrap/css/product.css b/themes/default-bootstrap/css/product.css
index e3b5d8e73b790..dc496628b017f 100644
--- a/themes/default-bootstrap/css/product.css
+++ b/themes/default-bootstrap/css/product.css
@@ -569,8 +569,15 @@ span.view_scroll_spacer {
     display: none;
   }
 }
-.box-info-product .exclusive.disabled:before {
+.box-info-product .exclusive.added:before {
+  content: "";
+}
+.box-info-product .exclusive.added.disabled:before, .box-info-product .exclusive.disabled:before {
   content: "";
+  animation: 2s linear 0s normal none infinite spin;
+  -webkit-animation: 2s linear 0s normal none infinite spin;
+  -moz-animation: 2s linear 0s normal none infinite spin;
+  border: none;
 }
 .box-info-product .exclusive:after {
   background: url(../img/border-1.gif) repeat-y 0 0;
diff --git a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
index dfbceb697da68..63e198425deea 100644
--- a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
+++ b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
@@ -176,8 +176,15 @@ var ajaxCart = {
 		ajaxCart.updateCart(jsonData);
 		
 		//reactive the button when adding has finished
-		if (addedFromProductPage)
+		if (addedFromProductPage) {
 			$('#add_to_cart button').removeAttr('disabled').removeClass('disabled');
+			if (!jsonData.hasError || jsonData.hasError==false) {
+				$('#add_to_cart button').addClass('added');
+			}
+			else {
+				$('#add_to_cart button').removeClass('added');
+			}
+		}
 		else
 			$('.ajax_add_to_cart_button').removeAttr('disabled');
 	},
diff --git a/themes/default-bootstrap/js/product.js b/themes/default-bootstrap/js/product.js
index 2f32a252f46de..8f17aa1115fb1 100644
--- a/themes/default-bootstrap/js/product.js
+++ b/themes/default-bootstrap/js/product.js
@@ -545,8 +545,8 @@ $(document).ready(function()
 	{
 		$('#bigpic').attr('rel', $('#bigpic').attr('src').replace('large', 'thickbox'));
 		$('img.jqzoom').jqueryzoom({
-			xzoom: 200, //zooming div default width(default width value is 200)
-			yzoom: 200, //zooming div default width(default height value is 200)
+			xzoom: 600, //zooming div default width(default width value is 200)
+			yzoom: 600, //zooming div default width(default height value is 200)
 			offset: 21 //zooming div default offset(default offset value is 10)
 			//position: "right" //zooming div position(default position value is "right")
 		});
diff --git a/themes/default-bootstrap/order-address-multishipping.tpl b/themes/default-bootstrap/order-address-multishipping.tpl
index d917cf1db22ea..0d30fd7dd57c8 100644
--- a/themes/default-bootstrap/order-address-multishipping.tpl
+++ b/themes/default-bootstrap/order-address-multishipping.tpl
@@ -30,35 +30,6 @@
 	{assign var="back_order_page" value="order.php"}
 {/if}
 
-{* Will be deleted for 1.5 version and more *}
-{if !isset($formatedAddressFieldsValuesList)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}	
-	
-	{* PrestaShop 1.4.0.17 compatibility *}
-	{if isset($addresses)}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{$id_address = $address.id_address}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$formatedAddressFieldsValuesList.$id_address.ordered_fields.$address_key_number = $address_key}
-					{$formatedAddressFieldsValuesList.$id_address.formated_fields_values.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{/foreach}
-	{/if}
-{/if}
-
 <script type="text/javascript">
 // <![CDATA[
 	{if !$opc}
diff --git a/themes/default-bootstrap/order-address.tpl b/themes/default-bootstrap/order-address.tpl
index aafc8908d4139..1210bf24fbd5c 100644
--- a/themes/default-bootstrap/order-address.tpl
+++ b/themes/default-bootstrap/order-address.tpl
@@ -29,40 +29,6 @@
 	{assign var="back_order_page" value="order.php"}
 {/if}
 
-{*
-** Retro compatibility for PrestaShop version < 1.4.2.5 with a recent theme
-** Syntax smarty for v2
-*}
-
-{* Will be deleted for 1.5 version and more *}
-{if !isset($formatedAddressFieldsValuesList)}
-	{$ignoreList.0 = "id_address"}
-	{$ignoreList.1 = "id_country"}
-	{$ignoreList.2 = "id_state"}
-	{$ignoreList.3 = "id_customer"}
-	{$ignoreList.4 = "id_manufacturer"}
-	{$ignoreList.5 = "id_supplier"}
-	{$ignoreList.6 = "date_add"}
-	{$ignoreList.7 = "date_upd"}
-	{$ignoreList.8 = "active"}
-	{$ignoreList.9 = "deleted"}
-
-	{* PrestaShop 1.4.0.17 compatibility *}
-	{if isset($addresses)}
-		{foreach from=$addresses key=k item=address}
-			{counter start=0 skip=1 assign=address_key_number}
-			{$id_address = $address.id_address}
-			{foreach from=$address key=address_key item=address_content}
-				{if !in_array($address_key, $ignoreList)}
-					{$formatedAddressFieldsValuesList.$id_address.ordered_fields.$address_key_number = $address_key}
-					{$formatedAddressFieldsValuesList.$id_address.formated_fields_values.$address_key = $address_content}
-					{counter}
-				{/if}
-			{/foreach}
-		{/foreach}
-	{/if}
-{/if}
-
 <script type="text/javascript">
 // <![CDATA[
 	{if !$opc}
diff --git a/themes/default-bootstrap/sass/global.scss b/themes/default-bootstrap/sass/global.scss
index 0c9dec1884c51..9cd98c8e820ee 100644
--- a/themes/default-bootstrap/sass/global.scss
+++ b/themes/default-bootstrap/sass/global.scss
@@ -2230,6 +2230,70 @@ a.price_discount_delete {
 		}
 	}
 }
+@media (max-width: 767px) {
+  #order-detail-content{
+    #cart_summary{
+      table, thead, tbody, th, td, tr{display: block;}
+      thead tr{
+        position: absolute;
+        top: -9999px;
+        left: -9999px;        
+      }
+      tr{
+        border-bottom: 1px solid #ccc;
+        overflow: hidden;
+      }
+      td{
+        border: none;
+        position: relative;
+        width: 50%;
+        float: left;
+        white-space: normal;
+        &.cart_product{}
+        &.cart_description{}
+        &.cart_avail{clear: both;}
+        &.cart_unit{}
+        &.cart_quantity{
+          clear: both;
+          padding: 9px 8px 11px 18px;
+        }
+        &.cart_total{}
+        &.cart_delete{
+          width: 100%;
+          clear: both;
+          text-align: right;
+          &:before{
+            display: inline-block;
+            padding-right: 0.5em;
+            position: relative;
+            top: -3px;
+          }
+          div{display: inline;}
+        }
+      }
+      td:before {
+        content: attr(data-title);
+        display: block;
+      }
+      tfoot{
+        td{
+          float: none;
+          width: 100%;
+          &:before{
+            display: inline;
+          }
+        }
+        tr{
+          .text-right, .price{
+            display: block;
+            float: left;
+            width: 50%;
+          }
+        }
+      }
+    }
+  }
+}
 .cart_voucher {
 	vertical-align:top !important;
 	h4 {
@@ -3201,4 +3265,11 @@ div.star.star_hover {
 	#facebook_block, #cmsinfo_block {
 		height:344px;
 	}
+}
+
+/************************* Zoom ******************************/
+@media  (max-width: $screen-md-max) { // max 1199px 
+	.zoomdiv {
+		display:none !important;
+	}
 }
\ No newline at end of file
diff --git a/themes/default-bootstrap/sass/product.scss b/themes/default-bootstrap/sass/product.scss
index 060888ef1f844..6f16385924bde 100644
--- a/themes/default-bootstrap/sass/product.scss
+++ b/themes/default-bootstrap/sass/product.scss
@@ -555,9 +555,18 @@ padding:18px 19px 12px;
 																		} 	
 	 
     }
-	&.disabled {
+	&.added {
 		&:before {
-			content:"";	
+			content:"";	
+		}
+	}
+	&.added.disabled, &.disabled {
+		&:before {
+			content:"";
+			animation:2s linear 0s normal none infinite spin;
+			-webkit-animation:2s linear 0s normal none infinite spin;
+			-moz-animation:2s linear 0s normal none infinite spin;
+			border:none;
 		}
 	}
 	 
diff --git a/themes/default-bootstrap/shopping-cart-product-line.tpl b/themes/default-bootstrap/shopping-cart-product-line.tpl
index f082731bcb3e1..15da9bf83b5ae 100644
--- a/themes/default-bootstrap/shopping-cart-product-line.tpl
+++ b/themes/default-bootstrap/shopping-cart-product-line.tpl
@@ -31,8 +31,8 @@
         <small class="cart_ref">{l s='SKU'} : {if $product.reference}{$product.reference|escape:'html':'UTF-8'}{else}--{/if}</small>
 		{if isset($product.attributes) && $product.attributes}<small><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}">{$product.attributes|escape:'html':'UTF-8'}</a></small>{/if}
 	</td>
-	<td class="cart_avail">{if $product.quantity_available > 0}<span class="label label-success">{l s='In Stock'}</span>{else}<span class="label label-warning">{l s='Out of Stock'}</span>{/if}</td>
-	<td class="cart_unit">
+	<td class="cart_avail" >{if $product.quantity_available > 0}<span class="label label-success">{l s='In Stock'}</span>{else}<span class="label label-warning">{l s='Out of Stock'}</span>{/if}</td>
+	<td class="cart_unit" data-title="{l s='Unit price'}">
 		<span class="price" id="product_price_{$product.id_product}_{$product.id_product_attribute}{if $quantityDisplayed > 0}_nocustom{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
 			{if !empty($product.gift)}
 				<span class="gift-icon">{l s='Gift!'}</span>
@@ -85,7 +85,7 @@
 		{/if}
 	</td>
     {/if}
-	<td class="cart_total">
+	<td class="cart_total" data-title="{l s='Total'}">
 		<span class="price" id="total_product_price_{$product.id_product}_{$product.id_product_attribute}{if $quantityDisplayed > 0}_nocustom{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
 			{if !empty($product.gift)}
 				<span class="gift-icon">{l s='Gift!'}</span>
@@ -99,7 +99,7 @@
 		</span>
 	</td>
 	{if !isset($noDeleteButton) || !$noDeleteButton}
-		<td class="cart_delete text-center">
+		<td class="cart_delete text-center" data-title="Delete">
 		{if (!isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0) && empty($product.gift)}
 			<div>
 				<a rel="nofollow" title="{l s='Delete'}" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html'}"><i class="icon-trash"></i></a>