diff --git a/admin-dev/themes/default/template/controllers/referrers/calendar.tpl b/admin-dev/themes/default/template/controllers/referrers/calendar.tpl
index e727cdbce..dbd74cb70 100644
--- a/admin-dev/themes/default/template/controllers/referrers/calendar.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/calendar.tpl
@@ -25,30 +25,34 @@
 
 <div id="referrersContainer">
 	<div id="calendar">
-				<form action="{$current}&token={$token}{if $action && $table}&{$action}{$table}{/if}{if $identifier && $id}&{$identifier}={$id}{/if}" method="post" id="calendar_form" name="calendar_form">
-					<input type="submit" name="submitDateDay" class="button submitDateDay" value="{$translations.Day}">
-					<input type="submit" name="submitDateMonth" class="button submitDateMonth" value="{$translations.Month}">
-					<input type="submit" name="submitDateYear" class="button submitDateYear" value="{$translations.Year}">
-					<input type="submit" name="submitDateDayPrev" class="button submitDateDayPrev" value="{$translations.Day}-1">
-					<input type="submit" name="submitDateMonthPrev" class="button submitDateMonthPrev" value="{$translations.Month}-1">
-					<input type="submit" name="submitDateYearPrev" class="button submitDateYearPrev" value="{$translations.Year}-1">
-					<p><span>{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</span>
-						<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="datepicker">
-					</p>
-					<p><span>{if isset($translations.To)}{$translations.To}{else}<span>{l s='From:'}</span>{/if}</span>
-						<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker">
-					</p>
-					<input type="submit" name="submitDatePicker" id="submitDatePicker" class="button" value="{if isset($translations.Save)}{$translations.Save}{else}{l s='   Save   '}{/if}" />
-				</form>
+		<form action="{$current}&token={$token}{if $action && $table}&{$action}{$table}{/if}{if $identifier && $id}&{$identifier}={$id}{/if}" method="post" id="calendar_form" name="calendar_form" class="form-horizontal">
+			<input type="submit" name="submitDateDay" class="btn btn-default submitDateDay" value="{$translations.Day}">
+			<input type="submit" name="submitDateMonth" class="btn btn-default submitDateMonth" value="{$translations.Month}">
+			<input type="submit" name="submitDateYear" class="btn btn-default submitDateYear" value="{$translations.Year}">
+			<input type="submit" name="submitDateDayPrev" class="btn btn-default submitDateDayPrev" value="{$translations.Day}-1">
+			<input type="submit" name="submitDateMonthPrev" class="btn btn-default submitDateMonthPrev" value="{$translations.Month}-1">
+			<input type="submit" name="submitDateYearPrev" class="btn btn-default submitDateYearPrev" value="{$translations.Year}-1">
+			<p>
+				<span>{if isset($translations.From)}{$translations.From}{else}{l s='From:'}{/if}</span>
+				<input type="text" name="datepickerFrom" id="datepickerFrom" value="{$datepickerFrom|escape}" class="datepicker">
+			</p>
+			<p>
+				<span>{if isset($translations.To)}{$translations.To}{else}<span>{l s='From:'}</span>{/if}</span>
+				<input type="text" name="datepickerTo" id="datepickerTo" value="{$datepickerTo|escape}" class="datepicker">
+			</p>
+			<button type="submit" name="submitDatePicker" id="submitDatePicker" class="btn btn-default">
+				<i class="icon-save"></i> {if isset($translations.Save)}{$translations.Save}{else}{l s='Save'}{/if}
+			</button>
+		</form>
 
-				<script type="text/javascript">
-					$(document).ready(function() {
-						if ($("form#calendar_form .datepicker").length > 0)
-							$("form#calendar_form .datepicker").datepicker({
-								prevText: '',
-								nextText: '',
-								dateFormat: 'yy-mm-dd'
-							});
+		<script type="text/javascript">
+			$(document).ready(function() {
+				if ($("form#calendar_form .datepicker").length > 0)
+					$("form#calendar_form .datepicker").datepicker({
+						prevText: '',
+						nextText: '',
+						dateFormat: 'yy-mm-dd'
 					});
-				</script>
+			});
+		</script>
 	</div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl b/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
index 5a523bcc8..554d6fa3f 100644
--- a/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
@@ -25,39 +25,68 @@
 
 </div>
 
-<div>
-	<fieldset>
-		<legend>
-			<img src="../img/admin/tab-preferences.gif" /> {l s='Settings'}
-		</legend>
-		<form action="{$current}&token={$token}" method="post" id="settings_form" name="settings_form">
-			<label>{l s='Save direct traffic?'}</label>
-			<div class="margin-left">
-				<label class="t" for="tracking_dt_on"><img src="../img/admin/enabled.gif" alt="{l s='Yes'}" title="{l s='Yes'}" /></label>
-				<input type="radio" name="tracking_dt" id="tracking_dt_on" value="1" {if $tracking_dt}checked="checked"{/if} />
-				<label class="t" for="tracking_dt_on"> {l s='Yes'}</label>
-				<label class="t" for="tracking_dt_off"><img src="../img/admin/disabled.gif" alt="{l s='No'}" title="{l s='No'}" style="margin-left: 10px;" /></label>
-				<input type="radio" name="tracking_dt" id="tracking_dt_off" value="0" {if !$tracking_dt}checked="checked"{/if}/>
-				<label class="t" for="tracking_dt_off"> {l s='No'}</label>
-			</div>
-			<p>{l s='Direct traffic can be quite resource-intensive. You should consider enabling it only if you have a strong need for it.'}</p>
-			<input type="submit" class="button" value="{l s='   Save   '}" name="submitSettings" id="submitSettings" />
+<div id="settings_referrers" class="row">
+	<div class="col-lg-3">
+		<form action="{$current}&token={$token}" method="post" id="settings_form" name="settings_form" class="form-horizontal">
+			<fieldset>
+				<h3>
+					<i class="icon-cog"></i> {l s='Settings'}
+				</h3>
+				<div class="row">
+					<label class="control-label col-lg-5">{l s='Save direct traffic?'}</label>
+					<div class="col-lg-7">
+						<div class="row">
+							<div class="input-group col-lg-2">
+								<span class="switch prestashop-switch">
+									<input type="radio" name="tracking_dt" id="tracking_dt_on" value="1" {if $tracking_dt}checked="checked"{/if} />
+									<label class="t radio" for="tracking_dt_on">
+										<i class="icon-check-sign color_success"></i> {l s='Yes'}
+									</label>
+									<input type="radio" name="tracking_dt" id="tracking_dt_off" value="0" {if !$tracking_dt}checked="checked"{/if}  />
+									<label class="t radio" for="tracking_dt_off"> 
+										<i class="icon-ban-circle color_danger"></i> {l s='No'}
+									</label>
+									<span class="slide-button btn btn-default"></span>
+								</span>
+							</div>
+						</div>
+					</div>
+				</div>
+					
+				<p>{l s='Direct traffic can be quite resource-intensive. You should consider enabling it only if you have a strong need for it.'}</p>
+				<button type="submit" class="btn btn-default pull-right" name="submitSettings" id="submitSettings">
+					<i class="icon-save"></i> {l s='Save'}
+				</button>
+			</fieldset>
 		</form>
-		<div class="separation"></div>
-		<form action="{$current}&token={$token}" method="post" id="refresh_index_form" name="refresh_index_form">
-			<h3>{l s='Indexation'}</h3>
-			<p>{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can also refresh this index by clicking the button above. This process may take awhile, and it\'s only needed if you modified or added a referrer, or if you want changes to be retroactive.'}</p>
-			<input type="submit" class="button" value="{l s='Refresh index'}" name="submitRefreshIndex" id="submitRefreshIndex" />
+	</div>
+	<div class="col-lg-6">
+		<form action="{$current}&token={$token}" method="post" id="refresh_index_form" name="refresh_index_form" class="form-horizontal">
+			<fieldset>
+				<h3>
+					<i class="icon-fullscreen"></i> {l s='Indexation'}
+				</h3>
+				<p>{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can also refresh this index by clicking the button above. This process may take awhile, and it\'s only needed if you modified or added a referrer, or if you want changes to be retroactive.'}</p>
+				<button type="submit" class="btn btn-default pull-right" name="submitRefreshIndex" id="submitRefreshIndex">
+					<i class="icon-refresh"></i> {l s='Refresh index'}
+				</button>
+			</fieldset>
 		</form>
-				<div class="separation"></div>
-		<form action="{$current}&token={$token}" method="post" id="refresh_cache_form" name="refresh_cache_form">
-			<h3>{l s='Cache'}</h3>
-			<p>{l s='In order to sort and filter your data, it\'s cached. You can refresh the cache by clicking on the button above.'}</p>
-			<input type="submit" class="button" value="{l s='Refresh cache'}" name="submitRefreshCache" id="submitRefreshCache" />
+	</div>
+	<div class="col-lg-6">
+		<form action="{$current}&token={$token}" method="post" id="refresh_cache_form" name="refresh_cache_form" class="form-horizontal">
+			<fieldset>
+				<h3>
+					<i class="icon-briefcase"></i> {l s='Cache'}
+				</h3>
+				<p>{l s='In order to sort and filter your data, it\'s cached. You can refresh the cache by clicking on the button above.'}</p>
+				<button type="submit" class="btn btn-default pull-right" name="submitRefreshCache" id="submitRefreshCache">
+					<i class="icon-refresh"></i> {l s='Refresh cache'}
+				</button>
+			</fieldset>
 		</form>
-	</fieldset>
+	</div>
 </div>
 
-<div class="clear">&nbsp;</div>
 
 	
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
index fa1244e65..c8ecad632 100644
--- a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
@@ -26,7 +26,6 @@
 
 {block name="other_fieldsets"}
 	{if $f == 1}
-		<br class="clear" />
 		<fieldset>
 			<legend onclick="$('#tracking_help').slideToggle();" style="cursor:pointer;">
 				<img src="../img/admin/help.png" /> {l s='Help'}
diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
index ea06151f8..3f7070395 100644
--- a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
@@ -94,31 +94,33 @@
 		}
 	</script>
 
-	<fieldset style="margin-left: 280px;">
-		<legend>
-			<img src="../img/admin/tab-stats.gif" /> {l s='Statistics'}
-		</legend>
+	<fieldset>
+		<h3>
+			<i class="icon-bar-chart"></i> {l s='Statistics'}
+		</h3>
 		<h2>{$referrer->name}</h2>
-		<table>
+		<table class="table">
 			{foreach $display_tab as $data => $label}
 				<tr>
 					<td>{$label}</td>
-					<td style="color:green;font-weight:bold;padding-left:20px;" id="{$data}"></td>
+					<td id="{$data}"></td>
 				</tr>
 			{/foreach}
 		</table>
-		<br class="clear" />
-		<form id="product_referrers" name="product_referrers">
-			<label>{l s='Filter by product:'}</label>
-			<div class="margin-left">
-				<select id="selectProduct" name="selectProduct" style="width: 200px;" onfocus="fillProducts();" onchange="updateConversionRate(this.value);">
-					<option value="0" selected="selected">-- {l s='All'} --</option>
-				</select>
+		<form id="product_referrers" name="product_referrers" class="form-horizontal">
+			<div class="row">
+				<label class="control-label col-lg-3">{l s='Filter by product:'}</label>
+				<div class="col-lg-9">
+					<select id="selectProduct" name="selectProduct" style="width: 200px;" onfocus="fillProducts();" onchange="updateConversionRate(this.value);">
+						<option value="0" selected="selected">-- {l s='All'} --</option>
+					</select>
+				</div>
 			</div>
-			<br class="clear" />
-			<label>{l s='Search'}</label>
-			<div class="margin-left">
-				<input type="text" size="34" id="filterProduct" name="filterProduct" onkeyup="fillProducts();" />
+			<div class="row">
+				<label class="control-label col-lg-3">{l s='Search'}</label>
+				<div class="col-lg-9">
+					<input class="btn btn-default" type="text" size="34" id="filterProduct" name="filterProduct" onkeyup="fillProducts();" />
+				</div>
 			</div>
 		</form>
 	</fieldset>
diff --git a/controllers/admin/AdminReferrersController.php b/controllers/admin/AdminReferrersController.php
index 7a9fcb33b..6f6f94141 100644
--- a/controllers/admin/AdminReferrersController.php
+++ b/controllers/admin/AdminReferrersController.php
@@ -56,6 +56,7 @@ class AdminReferrersControllerCore extends AdminController
 {
 	public function __construct()
 	{
+		$this->bootstrap = true;
 	 	$this->table = 'referrer';
 		$this->className = 'Referrer';
 		$this->fields_list = array(
diff --git a/controllers/admin/AdminSearchEnginesController.php b/controllers/admin/AdminSearchEnginesController.php
index ad23f2c6e..cdebc8ef0 100644
--- a/controllers/admin/AdminSearchEnginesController.php
+++ b/controllers/admin/AdminSearchEnginesController.php
@@ -28,6 +28,7 @@ class AdminSearchEnginesControllerCore extends AdminController
 {
 	public function __construct()
 	{
+		$this->bootstrap = true;
 	 	$this->table = 'search_engine';
 	 	$this->className = 'SearchEngine';
 	 	$this->lang = false;