diff --git a/themes/default-bootstrap/css/highdpi.css b/themes/default-bootstrap/css/highdpi.css
index 1f777ceb2..6f06e9369 100644
--- a/themes/default-bootstrap/css/highdpi.css
+++ b/themes/default-bootstrap/css/highdpi.css
@@ -1,11 +1,7 @@
-@media only screen and (-webkit-min-device-pixel-ratio: 2), 
-only screen and (min-device-pixel-ratio: 2) {
-
-
+@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {
 	.replace-2x {
 		font-size: 1px;
 	}
-	
 	.example {
 		background-image: url(../images/example2x.png);
 		-webkit-background-size:13px 13px;
@@ -13,5 +9,4 @@ only screen and (min-device-pixel-ratio: 2) {
 		-o-background-size:13px 13px;
 		background-size:13px 13px;
 	}
-                
 }
\ No newline at end of file
diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl
index fa06645fe..b64881274 100644
--- a/themes/default-bootstrap/header.tpl
+++ b/themes/default-bootstrap/header.tpl
@@ -44,16 +44,18 @@
 		
 		<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
 		<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
+
+		<link rel="stylesheet" href="{$css_dir}highdpi.css" type="text/css" media="screen" />
 		<link rel="stylesheet" href="{$css_dir}bootstrap_lib/bootstrap.css" type="text/css" media="all" />
 		<link rel="stylesheet" href="{$css_dir}font-awesome.css" type="text/css" media="all" />
 		<link rel="stylesheet" href="{$css_dir}jquery/uniform.default.css" type="text/css" media="all" />
-		<link rel="stylesheet" href="{$css_dir}highdpi.css" media="only screen and (-webkit-min-device-pixel-ratio: 2)" />
 		<link rel="stylesheet" href="{$css_dir}jquery/footable.core.css" type="text/css" media="all" />
 		<link rel="stylesheet" href="{$css_dir}jquery/jquery.bxslider.css" type="text/css" media="all" />
-		<link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic' rel='stylesheet' type='text/css' />
+
+		<link rel='stylesheet' href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic'  type='text/css' />
 		{if isset($css_files)}
 			{foreach from=$css_files key=css_uri item=media}
-				<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
+				<link rel="stylesheet" href="{$css_uri}" type="text/css" media="{$media}" />
 			{/foreach}
 		{/if}
 
@@ -62,10 +64,9 @@
 				var viewport = document.querySelector("meta[name=viewport]");
 				viewport.setAttribute('content', 'initial-scale=1.0,maximum-scale=1.0,user-scalable=0,width=device-width,height=device-height');
 			}
-			if(navigator.userAgent.match(/Android/i)){
+			if(navigator.userAgent.match(/Android/i)) {
 				window.scrollTo(0,1);
 			}
-
 			var baseDir = '{$content_dir|addslashes}';
 			var baseUri = '{$base_uri|addslashes}';
 			var static_token = '{$static_token|addslashes}';
diff --git a/themes/default-bootstrap/modules/blockcart/blockcart.tpl b/themes/default-bootstrap/modules/blockcart/blockcart.tpl
index 39ea46550..fae2c2d06 100644
--- a/themes/default-bootstrap/modules/blockcart/blockcart.tpl
+++ b/themes/default-bootstrap/modules/blockcart/blockcart.tpl
@@ -76,8 +76,8 @@ var generated_date = {$smarty.now|intval};
 			{assign var='productId' value=$product.id_product}
 			{assign var='productAttributeId' value=$product.id_product_attribute}
 			<dt id="cart_block_product_{$product.id_product}_{if $product.id_product_attribute}{$product.id_product_attribute}{else}0{/if}_{if $product.id_address_delivery}{$product.id_address_delivery}{else}0{/if}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">
-            	<a class="cart-images" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)}">
-                    <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'cart_default')}" alt=""  title="{$product.name|escape:htmlall:'UTF-8'|truncate:20}" />
+            	<a class="cart-images" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:htmlall:'UTF-8'}" title="{$product.name|escape:htmlall:'UTF-8'|truncate:20}">
+                    <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'cart_default')}" alt="{$product.name|escape:htmlall:'UTF-8'}" />
                 </a>
                 <div class="cart-info">
                 	<div class="product-name">
diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl
index fa1a114aa..5ff63a2bc 100644
--- a/themes/default-bootstrap/product-list.tpl
+++ b/themes/default-bootstrap/product-list.tpl
@@ -116,13 +116,10 @@
 							{$product.name|truncate:45:'...'|escape:'html':'UTF-8'}
 						</a>
 					</h5>
-
 					{hook h='displayProductListReviews' product=$product}
-
 					<p class="product-desc" itemprop="description">
 						{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}
 					</p>
-
 					{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
 					<div itemprop="offers" itemscope itemtype="http://schema.org/Offer" class="content_price">
 						{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}
@@ -141,7 +138,6 @@
 						{/if}
 					</div>
 					{/if}
-
 					<div class="button-container">
 						{if ($product.id_product_attribute == 0 || (isset($add_prod_display) && ($add_prod_display == 1))) && $product.available_for_order && !isset($restricted_country_mode) && $product.minimal_quantity <= 1 && $product.customizable != 2 && !$PS_CATALOG_MODE}
 							{if ($product.allow_oosp || $product.quantity > 0)}
@@ -190,7 +186,6 @@
 								<span class="discount">{l s='Reduced price!'}</span>
 							{/if}
 					</div>
-
 					{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
 						{if isset($product.available_for_order) && $product.available_for_order && !isset($restricted_country_mode)}
 							<span itemprop="offers" itemscope itemtype="http://schema.org/Offer" class="availability">
@@ -210,9 +205,7 @@
 							</span>
 						{/if}
 					{/if}
-					
 				</div>
-
 				<div class="functional-buttons clearfix">
 					{hook h='displayProductListFunctionalButtons' product=$product}
 					{if isset($comparator_max_item) && $comparator_max_item}
@@ -251,7 +244,6 @@
 		)});	
 	}
 </script>
-
 {if $page_name !='index' && $page_name !='product'}  <!--// excluding page for Grid/List-->
 	<script type="text/javascript"><!--
 		function display(view) {
@@ -348,4 +340,4 @@
 	}
 	//--></script>
 {/if}
-{/if}
+{/if}
\ No newline at end of file