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 10e7a8b6b..b6bdb3bec 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
@@ -27,12 +27,13 @@
 {block name="other_fieldsets"}
 	{if $f == 1}
 		<fieldset>
-			<legend onclick="$('#tracking_help').slideToggle();" style="cursor:pointer;">
-				<img src="../img/admin/help.png" /> {l s='Help'}
-			</legend>
+			<h3>
+				<i class="icon-question-sign"></i> {l s='Help'}
+			</h3>
+			<div class="row"><button type="button" class="btn btn-default toggle_help"><i class="icon-chevron-sign-down"></i> {l s='Show me more'}</button></div>
 			<div id="tracking_help" style="display: none;">
 				<p>{l s='Definitions:'}</p>
-				<ul style="list-style: disc; margin-left: 20px;">
+				<ul>
 					<li>
 						{l s='The field `http_referer` is the website from which your customers arrive.'}<br />
 						{l s='For example, visitors coming from Google will have an `http_referer` like this one: "http://www.google.com/search?q=prestashop".'}<br />
@@ -66,7 +67,7 @@
 					<br />
 					<li>
 						{l s='The simple mode uses the MySQL "LIKE", but for a higher potency you can use MySQL regular expressions.'}
-						<a href="http://dev.mysql.com/doc/refman/5.0/en/regexp.html" target="_blank" style="font-style: italic;">{l s='Take a look at our documentation for more details.'}</a>
+						<a class="btn btn-link" href="http://dev.mysql.com/doc/refman/5.0/en/regexp.html" target="_blank" style="font-style: italic;"><i class="icon-external-link-sign"></i> {l s='Take a look at our documentation for more details.'}</a>
 					</li>
 				</ul>
 			</div>
@@ -75,45 +76,43 @@
 {/block}
 
 {block name="other_input"}
-
 	{if $key == 'help'}
-		<a style="cursor:pointer;font-style:italic;" onclick="$('#tracking_help').slideToggle();">
-			<img src="../img/admin/help.png" /> {l s='Get help!'}
+		<a class="btn btn-default toggle_help">
+			<i class="icon-question-sign"></i> {l s='Get help!'}
 		</a>
 	{/if}
+{/block}
 
+
+{block name="fieldset"}
+	{if $f == 3}
+		<div id="tracking_expert" style="display: none;">
+		{$smarty.block.parent}
+		</div>
+	{else}
+		{$smarty.block.parent}
+	{/if}	
 {/block}
 
 {block name="label"}
-
-	{if $input.name == 'http_referer_regexp'}
-		<div id="tracking_expert" style="display: none;">
-	{/if}
-
-	{if isset($input.h3)}
-		<h3>{$input.h3}</h3>
+	{if isset($input.legend)}
+		<legend>{$input.legend}</legend>		
 	{/if}
 
 	{if isset($input.label)}
-		<label>{$input.label} </label>
-	{/if}
-
-{/block}
-
-{block name="field"}
-	{$smarty.block.parent}
-	{if $input.name == 'request_uri_regexp_not'}
-		</div>
+		<label class="control-label col-lg-3" for="{$input.name}">{$input.label}</label>
 	{/if}
 {/block}
 
 {block name="script"}
+	$( document ).ready(function() {
+		$('.toggle_help').click(function() {
+			$('#tracking_help').slideToggle();
 
-	$(document).ready(function() {
-		$('fieldset#fieldset_3 legend').css('cursor', 'pointer');
-		$('fieldset#fieldset_3 legend').click(function(){
-			$('#tracking_expert').slideToggle();
+			if ($(this).find('i').hasClass('icon-chevron-sign-down'))
+				$(this).find('i').removeClass('icon-chevron-sign-down').addClass('icon-chevron-sign-up');
+			else if ($(this).find('i').hasClass('icon-chevron-sign-up'))
+				$(this).find('i').removeClass('icon-chevron-sign-up').addClass('icon-chevron-sign-down');
 		});
 	});
-
 {/block}
diff --git a/controllers/admin/AdminReferrersController.php b/controllers/admin/AdminReferrersController.php
index 6f6f94141..02a20f9b7 100644
--- a/controllers/admin/AdminReferrersController.php
+++ b/controllers/admin/AdminReferrersController.php
@@ -198,55 +198,50 @@ class AdminReferrersControllerCore extends AdminController
 		$this->fields_form[0] = array('form' => array(
 			'legend' => array(
 				'title' => $this->l('Affiliate'),
-				'image' => '../img/admin/affiliation.png'
+				'icon' => 'icon-group'
 			),
 			'input' => array(
 				array(
 					'type' => 'text',
 					'label' => $this->l('Name:'),
 					'name' => 'name',
-					'size' => 20,
 					'required' => true
 				),
 				array(
 					'type' => 'password',
 					'label' => $this->l('Password:'),
 					'name' => 'passwd',
-					'size' => 20,
 					'desc' => $this->l('Leave blank if no change')
 				)
 			),
 			'desc' => array(
 				$this->l('Affiliates can access their data with this name and password.'),
-				$this->l('Front access:').' <a href="'.$uri.'modules/trackingfront/stats.php" style="font-style: italic;">'.$uri.'modules/trackingfront/stats.php</a>'
+				$this->l('Front access:').' <a class="btn btn-link" href="'.$uri.'modules/trackingfront/stats.php" style="font-style: italic;"><i class="icon-external-link-sign"></i> '.$uri.'modules/trackingfront/stats.php</a>'
 			)
 		));
 
 		$this->fields_form[1] = array('form' => array(
 			'legend' => array(
 				'title' => $this->l('Commission plan'),
-				'image' => '../img/admin/money.png'
+				'icon' => 'icon-dollar'
 			),
 			'input' => array(
 				array(
 					'type' => 'text',
 					'label' => $this->l('Click fee:'),
 					'name' => 'click_fee',
-					'size' => 8,
 					'desc' => $this->l('Fee given for each visit.')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Base fee:'),
 					'name' => 'base_fee',
-					'size' => 8,
 					'desc' => $this->l('Fee given for each order placed.')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Percent fee:'),
 					'name' => 'percent_fee',
-					'size' => 8,
 					'desc' => $this->l('Percent of the sales.')
 				)
 			)
@@ -264,7 +259,7 @@ class AdminReferrersControllerCore extends AdminController
 		$this->fields_form[2] = array('form' => array(
 			'legend' => array(
 				'title' => $this->l('Technical information -- Simple mode.'),
-				'image' => '../img/admin/affiliation.png'
+				'icon' => 'icon-cogs'
 			),
 			'help' => true,
 			'input' => array(
@@ -274,7 +269,7 @@ class AdminReferrersControllerCore extends AdminController
 					'name' => 'http_referer_like',
 					'cols' => 40,
 					'rows' => 1,
-					'h3' => $this->l('HTTP referrer')
+					'legend' => $this->l('HTTP referrer')
 				),
 				array(
 					'type' => 'textarea',
@@ -289,7 +284,7 @@ class AdminReferrersControllerCore extends AdminController
 					'name' => 'request_uri_like',
 					'cols' => 40,
 					'rows' => 1,
-					'h3' => $this->l('Request URI')
+					'legend' => $this->l('Request URI')
 				),
 				array(
 					'type' => 'textarea',
@@ -310,7 +305,7 @@ class AdminReferrersControllerCore extends AdminController
 		$this->fields_form[3] = array('form' => array(
 			'legend' => array(
 				'title' => $this->l('Technical information -- Expert mode'),
-				'image' => '../img/admin/affiliation.png'
+				'icon' => 'icon-cogs'
 			),
 			'input' => array(
 				array(
@@ -319,7 +314,7 @@ class AdminReferrersControllerCore extends AdminController
 					'name' => 'http_referer_regexp',
 					'cols' => 40,
 					'rows' => 1,
-					'h3' => $this->l('HTTP referrer')
+					'legend' => $this->l('HTTP referrer')
 				),
 				array(
 					'type' => 'textarea',
@@ -334,7 +329,7 @@ class AdminReferrersControllerCore extends AdminController
 					'name' => 'request_uri_regexp',
 					'cols' => 40,
 					'rows' => 1,
-					'h3' => $this->l('Request URI')
+					'legend' => $this->l('Request URI')
 				),
 				array(
 					'type' => 'textarea',