diff --git a/install-dev/langs/fr/install.php b/install-dev/langs/fr/install.php
index 2e7eb86eb..2d78ecee2 100644
--- a/install-dev/langs/fr/install.php
+++ b/install-dev/langs/fr/install.php
@@ -200,7 +200,7 @@ return array(
 		'firstname' => 'prénom',
 		'lastname' => 'nom de famille',
 		'Installation Assistant' => 'Assistant d\'installation',
-		'To enjoy the many features that are offered by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Afin de profiter des nombreuses fonctionnalités qu\'offre PrestaShop, merci de prendre connaissance des termes des licences ci-dessous. Le coeur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.',
+		'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Afin de profiter gratuitement des nombreuses fonctionnalités qu\'offre PrestaShop, merci de prendre connaissance des termes des licences ci-dessous. Le coeur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.',
 		'PrestaShop Installation Assistant' => 'Assistant d\'installation',
 		'Contact us!' => 'Contactez-nous !',
 		'E-mail:' => 'E-mail :',
diff --git a/install-dev/theme/js/database.js b/install-dev/theme/js/database.js
index 6e47831bd..0650f49ef 100644
--- a/install-dev/theme/js/database.js
+++ b/install-dev/theme/js/database.js
@@ -36,54 +36,4 @@ $(document).ready(function()
             }
 		});
 	});
-	
-	// Check mails configuration
-	if (!$('#set_stmp').prop('checked'))
-		$("div#mailSMTPParam").hide();
-
-	$("#set_stmp").click(function()
-	{
-		if ($("input#set_stmp").prop('checked'))
-			$("div#mailSMTPParam").slideDown('slow');
-		else
-			$("div#mailSMTPParam").slideUp('slow');
-	});
-
-	// Send test email
-	$('#btVerifyMail').click(function()
-	{
-		$("#mailResultCheck").slideUp('slow');
-		$.ajax({
-			url: 'index.php',
-			data: {
-                'sendMail': 'true',
-                'smtpSrv': $('#smtpSrv').val(),
-                'smtpEnc': $('#smtpEnc').val(),
-                'smtpPort': $('#smtpPort').val(),
-                'smtpLogin': $('#smtpLogin').val(),
-                'smtpPassword': $('#smtpPassword').val(),
-                'testEmail': $('#smtpSrv').val(),
-                'testEmail': $('#testEmail').val(),
-                'smtpChecked': ($('#set_stmp').prop('checked') ? 'true' : 'false')
-            },
-			dataType: 'json',
-			cache: false,
-			success: function(json)
-			{
-				$("#mailResultCheck")
-					.addClass((json.success) ? 'infosBlock' : 'errorBlock')
-					.removeClass((json.success) ? 'errorBlock' : 'infosBlock')
-					.html(json.message)
-					.slideDown('slow');
-			},
-            error: function(xhr)
-            {
-                $("#mailResultCheck")
-                    .addClass('errorBlock')
-                    .removeClass('infosBlock')
-                    .html('An error occurred:<br /><br />'+xhr.responseText)
-                    .slideDown('slow');
-            }
-		});
-	});
 });
\ No newline at end of file
diff --git a/install-dev/theme/view.css b/install-dev/theme/view.css
index 7556d3b03..3ecd4f8e8 100644
--- a/install-dev/theme/view.css
+++ b/install-dev/theme/view.css
@@ -257,12 +257,16 @@ div.field {
 }
 
 .infosBlock {
-	padding:14px 25px 14px 35px;
+	padding:14px 25px 14px 20px;
 	font-weight:normal;
 	font-size:13px;
 	line-height:18px;
-	background:#f8f8f8 url(img/pict_h3_infos.png) no-repeat 10px 13px;
-	border:1px solid #ccc;
+	background:#f8f8f8;
+	border:1px solid #ccc
+}
+
+.infosBlock img {
+	vertical-align:middle
 }
 
 .warnBlock {
diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml
index faf816f27..0861bd78c 100644
--- a/install-dev/theme/views/configure.phtml
+++ b/install-dev/theme/views/configure.phtml
@@ -56,7 +56,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 
 	<!-- Country list -->
 	<div class="field clearfix">
-		<label for="infosCountry" class="aligned"><?php echo $this->l('Default country:') ?></label>
+		<label for="infosCountry" class="aligned"><?php echo $this->l('Country:') ?></label>
 		<div class="contentinput">
 			<select name="shop_country" id="infosCountry" class="chosen">
 				<option value="0" style="font-weight: bold"><?php echo $this->l('Select your country') ?></option>
@@ -84,7 +84,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<?php echo $this->displayError('shop_timezone') ?>
 	</div>
 
-	<!-- Shop logo -->
+	<!-- Shop logo
 	<div class="field clearfix">
 		<label for="uploadedImage" class="aligned logo"><?php echo $this->l('Shop logo:') ?></label>
 		<div class="contentinput">
@@ -97,6 +97,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		</div>
 		<span id="resultInfosLogo" class="result"></span>
 	</div>
+	 -->
 	
 	<h2 style="margin-top:20px"><?php echo $this->l('Your Account') ?></h2>
 
@@ -141,7 +142,7 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<?php if ($this->displayError('admin_password')): ?>
 			<?php echo $this->displayError('admin_password') ?>
 		<?php else: ?>
-			<p class="userInfos aligned"><?php echo $this->l('Must be alphanumeric string with at least 8 characters') ?></p>
+			<p class="userInfos aligned"><?php echo $this->l('Must be letters and numbers with at least 8 characters') ?></p>
 		<?php endif; ?>
 	</div>
 
diff --git a/install-dev/theme/views/license.phtml b/install-dev/theme/views/license.phtml
index ca0089b63..f14f00220 100644
--- a/install-dev/theme/views/license.phtml
+++ b/install-dev/theme/views/license.phtml
@@ -2,7 +2,7 @@
 
 <!-- License agreement -->
 <h2 id="licenses-agreement"><?php echo $this->l('License Agreements') ?></h2>
-<p><strong><?php echo $this->l('To enjoy the many features that are offered by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.') ?></strong></p>
+<p><strong><?php echo $this->l('To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.') ?></strong></p>
 <div style="height:200px; border:1px solid #ccc; margin-bottom:8px; padding:5px; background:#fff; overflow: auto; overflow-x:hidden; overflow-y:scroll;">
 <?php $this->displayTemplate('license_content'); ?>
 </div>
diff --git a/install-dev/theme/views/process.phtml b/install-dev/theme/views/process.phtml
index f0eecb7fa..0beac6c6a 100644
--- a/install-dev/theme/views/process.phtml
+++ b/install-dev/theme/views/process.phtml
@@ -57,7 +57,10 @@ var process_steps = <?php echo Tools::jsonEncode($this->process_steps) ?>;
 			</tr>
 		</table>
 
-		<h3 class="infosBlock"><?php echo $this->l('WARNING: For security purposes, you must delete the "install" folder.') ?></h3>
+		<h3 class="infosBlock">
+			<?php echo $this->l('For security purposes, you must delete the "install" folder.') ?>
+			<a href="<?php echo $this->l('http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation') ?>" target="_blank"><img src="theme/img/help.png" /></a>
+		</h3>
 
 		<div id="boBlock" class="blockInfoEnd clearfix" onclick="window.open('../admin')">
 			<img src="theme/img/visu_boBlock.png" alt="" />