diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl
index cb3f2ec44..58c4b8fdc 100644
--- a/admin-dev/themes/default/template/controllers/products/combinations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl
@@ -22,48 +22,57 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
+{if isset($product->id) && !$product->is_virtual}
 <fieldset>
+
 	<script type="text/javascript">
 		var msg_combination_1 = '{l s='Please choose an attribute.'}';
 		var msg_combination_2 = '{l s='Please choose a value.'}';
 		var msg_combination_3 = '{l s='You can only add one combination per attribute type.'}';
 		var msg_new_combination = '{l s='New combination'}';
 		var msg_cancel_combination = '{l s='Cancel combination'}';
+
+		var attrs = new Array();
+		var modifyattributegroup = "{l s='Modify this attribute combination.' js=1}";
+		attrs[0] = new Array(0, "---");
+		{foreach from=$attributeJs key=idgrp item=group}
+			attrs[{$idgrp}] = new Array(0
+			, '---'
+			{foreach from=$group key=idattr item=attrname}
+				, "{$idattr}", "{$attrname|addslashes}"
+			{/foreach}
+			);
+		{/foreach}
+
+		$(document).ready(function(){
+			populate_attrs();
+
+			$(".datepicker").datepicker({
+				prevText: '',
+				nextText: '',
+				dateFormat: 'yy-mm-dd'
+			});
+		});
 	</script>
 
-	{if isset($product->id) && !$product->is_virtual}
-		<input type="hidden" name="submitted_tabs[]" value="Combinations" />
-		<script type="text/javascript">
-			var attrs = new Array();
-			var modifyattributegroup = "{l s='Modify this attribute combination.' js=1}";
-			attrs[0] = new Array(0, "---");
-			{foreach from=$attributeJs key=idgrp item=group}
-				attrs[{$idgrp}] = new Array(0
-				, '---'
-				{foreach from=$group key=idattr item=attrname}
-					, "{$idattr}", "{$attrname|addslashes}"
-				{/foreach}
-				);
-			{/foreach}
-		</script>
+	<input type="hidden" name="submitted_tabs[]" value="Combinations" />
 
-		<h3>{l s='Add or modify combinations for this product.'}</h3>
-		<div class="alert alert-info">
-			{l s='Or use the'}&nbsp;<a class="btn btn-link bt-icon confirm_leave" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}"><i class="icon-magic"></i> {l s='Product combinations generator'} <i class="icon-external-link-sign"></i></a> {l s='in order to automatically create a set of combinations.'}
-		</div>
-		
-		{if $combination_exists}
-		<div class="alert alert-info" style="display:block">
-			{l s='Some combinations already exist. If you want to generate new combinations, the quantities for the existing combinations will be lost.'}<br/>
-			{l s='You can add a combination by clicking the link "Add new combination" on the toolbar.'}
-		</div>
-		{/if}
-		{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
-			<br />
-			{include file="controllers/products/multishop/check_fields.tpl" product_tab="Combinations"}
-		{/if}
+	<h3>{l s='Add or modify combinations for this product.'}</h3>
+	<div class="alert alert-info">
+		{l s='Or use the'}&nbsp;<a class="btn btn-link bt-icon confirm_leave" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}"><i class="icon-magic"></i> {l s='Product combinations generator'} <i class="icon-external-link-sign"></i></a> {l s='in order to automatically create a set of combinations.'}
+	</div>
+	
+	{if $combination_exists}
+	<div class="alert alert-info" style="display:block">
+		{l s='Some combinations already exist. If you want to generate new combinations, the quantities for the existing combinations will be lost.'}<br/>
+		{l s='You can add a combination by clicking the link "Add new combination" on the toolbar.'}
+	</div>
+	{/if}
+	{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
+		<br />
+		{include file="controllers/products/multishop/check_fields.tpl" product_tab="Combinations"}
+	{/if}
 
-		
 	<div id="add_new_combination" class="panel" style="display: none;">
 
 		<div class="panel-heading">{l s='Add or modify combinations for this product.'}</div>
@@ -105,12 +114,6 @@
 			</div>
 		</div>
 
-		<script type="text/javascript">
-			$(document).ready(function(){
-				populate_attrs();
-			});
-		</script>
-
 		<hr/>
 
 		<div class="row">
@@ -163,8 +166,6 @@
 			<span style="display:none;" id="attribute_wholesale_price_full">({l s='Overrides wholesale price on "Information" tab'})</span>
 		</div>
 
-
-
 		<div class="row">
 			<label class="control-label col-lg-3" for="attribute_price_impact">
 				{include file="controllers/products/multishop/checkbox.tpl" field="attribute_price_impact" type="attribute_price_impact"}
@@ -182,7 +183,7 @@
 					<div id="span_impact" class="col-lg-8">
 						<div class="row">
 							<label class="control-label col-lg-1" for="attribute_price">
-									{l s='of'}			
+								{l s='of'}			
 							</label>
 							<div class="input-group col-lg-5">
 								<div class="input-group-addon">
@@ -331,15 +332,6 @@
 					<i class="icon-calendar-empty"></i>
 				</div>
 			</div>
-			<script type="text/javascript">
-				$(document).ready(function(){
-					$(".datepicker").datepicker({
-						prevText: '',
-						nextText: '',
-						dateFormat: 'yy-mm-dd'
-					});
-				});
-			</script>
 		</div>
 		
 		<hr/>
@@ -386,5 +378,5 @@
 
 	{$list}
 
-	{/if}
-</fieldset>
\ No newline at end of file
+</fieldset>
+{/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index de610cab1..006082bf1 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -350,7 +350,7 @@
 	<div class="row">
 		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert alert-info">
-				{l s='Do you want an image associated with the product in your description?'}
+				{l s='Would you like to add an image in your description?'}
 				<a class="addImageDescription" href="javascript:void(0);">{l s='Click here'}</a>.
 			</div>
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
index c1255702e..1080a4f7f 100644
--- a/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
+++ b/admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
@@ -40,7 +40,7 @@
 			onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
 			onblur="updateLinkRewrite();"
 			{if isset($maxchar)} data-maxchar="{$maxchar}"{/if}
-			{if isset($maxlength)} maxlength="{$maxlength}"{/if}>
+			{if isset($maxlength)} maxlength="{$maxlength}"{/if} />
 			{if isset($maxchar)}
 			</div>
 			{/if}
diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
index 2ad6848ee..7c2800213 100644
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -26,7 +26,7 @@
 <script type="text/javascript">
 	var newLabel = '{l s='New label'}';
 	var choose_language = '{l s='Choose language:'}';
-	var required = '{l s='required'}';
+	var required = '{l s='Required'}';
 	var customizationUploadableFileNumber = '{$product->uploadable_files}';
 	var customizationTextFieldNumber = '{$product->text_fields}';
 	var uploadableFileLabel = 0;
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 36c6bfdbd..0a32e7b58 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -33,7 +33,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta name="robots" content="NOFOLLOW, NOINDEX">
-	<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)</title>
+	<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if}</title>
 	{if $display_header}
 	<script type="text/javascript">
 		var help_class_name = '{$controller_name}';
@@ -263,11 +263,11 @@
 					<a href='#' class="employee_name dropdown-toggle" data-toggle="dropdown">
 						<img src="{$img_dir}prestashop-avatar.png" height="15" width="15" />
 						{$first_name}&nbsp;{$last_name}
-						<i class="icon-angle-down"></i>
+						<i class="caret"></i>
 					</a>
 					<ul id="employee_links" class="dropdown-menu">
 						<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee"><i class="icon-wrench"></i> {l s='My preferences'}</a></li>
-						<li><a id="header_logout" href="index.php?logout"><i class="icon-signout"></i> {l s='logout'}</a></li>
+						<li><a id="header_logout" href="index.php?logout"><i class="icon-signout"></i> {l s='Log out'}</a></li>
 					</ul>
 				</li>
 			</ul>