diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
index 425265afc..25969f97c 100644
--- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
@@ -26,7 +26,7 @@
 
 {block name="label"}
 	{if $input.type == 'text' && $input.name == 'ps_cache_fs_directory_depth'}
-		<div id="directory_depth">
+		<div id="directory_depth" class="col-lg-9 col-lg-push-3">
 			<div class="alert alert-warning">{l s='The CacheFS system should be used only when the infrastructure contains one front-end server. If you are not sure, ask your hosting company.'}</div>
 	{else}
 		{$smarty.block.parent}
@@ -45,13 +45,13 @@
 {block name="description"}
 	{$smarty.block.parent}
 	{if $input.type == 'radio' && $input.name == 'combination'}
-		<ul style="list-style-type:disc;margin:0 0 0 30px;">
+		<ul>
 			<li>{l s='Combinations tab on product page'}</li>
 			<li>{l s='Value'}</li>
 			<li>{l s='Attribute'}</li>
 		</ul>
 	{elseif $input.type == 'radio' && $input.name == 'feature'}
-		<ul style="list-style-type:disc;margin:0 0 0 30px;">
+		<ul>
 			<li>{l s='Features tab on product page'}</li>
 			<li>{l s='Feature'}</li>
 			<li>{l s='Feature value'}</li>
@@ -69,39 +69,54 @@
 {block name="other_input"}
 	{if $key == 'memcachedServers'}
 		<div id="memcachedServers">
-			<div class="margin-form">
-				<a id="addMemcachedServer"  class="button" href="#" ><img src="../img/admin/add.gif" />{l s='Add server'}</a>
+			<div class="form-group">
+				<div class="col-lg-9 col-lg-push-3">
+					<button id="addMemcachedServer" class="btn btn-default" type="button" >
+						<i class="icon-plus-sign-alt"></i>&nbsp;{l s='Add server'}
+					</button>
+				</div>
 			</div>
-			<div id="formMemcachedServer" style="margin-top: 10px; display:none;">
-				<form action="{$current}&token={$token}" method="post">
-					<label>{l s='IP Address'} </label>
-					<div class="margin-form">
-						<input type="text" name="memcachedIp" />
+			<div id="formMemcachedServer" style="display:none;">
+				<form action="{$current}&token={$token}" method="post" class="form-horizontal">
+					<div class="form-group">
+						<label class="control-label col-lg-3">{l s='IP Address'} </label>
+						<div class="col-lg-9">
+							<input class="form-control" type="text" name="memcachedIp" />
+						</div>
 					</div>
-					<label>{l s='Port'} </label>
-					<div class="margin-form">
-						<input type="text" name="memcachedPort" value="11211" />
+					<div class="form-group">
+						<label class="control-label col-lg-3">{l s='Port'} </label>
+						<div class="col-lg-9">
+							<input class="form-control" type="text" name="memcachedPort" value="11211" />
+						</div>
 					</div>
-					<label>{l s='Weight'} </label>
-					<div class="margin-form">
-						<input type="text" name="memcachedWeight" value="1" />
+					<div class="form-group">	
+						<label class="control-label col-lg-3">{l s='Weight'} </label>
+						<div class="col-lg-9">
+							<input class="form-control" type="text" name="memcachedWeight" value="1" />
+						</div>
 					</div>
-					<div class="margin-form">
-						<input type="submit" value="{l s='   Add Server   '}" name="submitAddServer" class="button" />
-                        <input type="button" value="{l s='   Test Server   '}" id="testMemcachedServer" class="button" />
+					<div class="form-group">
+						<div class="col-lg-9 col-lg-push-3">
+							<input type="submit" value="{l s='Add Server'}" name="submitAddServer" class="btn btn-default" />
+							<input type="button" value="{l s='Test Server'}" id="testMemcachedServer" class="btn btn-default" />
+	                	</div>
 					</div>
 				</form>
 			</div>
 			{if $servers}
-				<div class="margin-form">
-					<table style="width: 320px;" cellspacing="0" cellpadding="0" class="table">
-					<tr>
-						<th style="width: 20px; text-align: center">{l s='ID'}</th>
-						<th style="width: 200px; text-align: center">{l s='IP address'}</th>
-						<th style="width: 50px; text-align: center">{l s='Port'}</th>
-						<th style="width: 30px; text-align: right; font-weight: bold;">{l s='Weight'}</th>
-						<th style="width: 20px; text-align: right;">&nbsp;</th>
-					</tr>
+				<div class="form-group">
+					<table class="table">
+						<thead>
+							<tr>
+								<th >{l s='ID'}</th>
+								<th >{l s='IP address'}</th>
+								<th >{l s='Port'}</th>
+								<th >{l s='Weight'}</th>
+								<th >&nbsp;</th>
+							</tr>
+						</thead>
+						<tbody>
 					{foreach $servers AS $server}
 						<tr>
 							<td>{$server.id_memcached_server}</td>
@@ -109,12 +124,11 @@
 							<td>{$server.port}</td>
 							<td>{$server.weight}</td>
 							<td>
-								<a href="{$current}&token={$token}&deleteMemcachedServer={$server.id_memcached_server}" >
-									<img src="../img/admin/delete.gif" />
-								</a>
+								<a class="btn btn-default" href="{$current}&token={$token}&deleteMemcachedServer={$server.id_memcached_server}" ><i class="icon-minus-sign-alt"></i></a>
 							</td>
 						</tr>
 					{/foreach}
+						</tbody>
 					</table>
 				</div>
 			{/if}
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 28aaa1c79..67c1b1ce2 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -232,23 +232,14 @@
 									{foreach $input.values as $value}
 										
 										<div class="radio {if isset($input.class)}"{$input.class}"{/if}">
-											<div class="label">
+											<label>
 											<input type="radio"	name="{$input.name}"id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
 												{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
 												{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
-											 {if isset($input.is_bool) && $input.is_bool == true}
-												{if $value.value == 1}
-													<img src="../img/admin/enabled.gif" alt="{$value.label}" title="{$value.label}" />
-												{else}
-													<img src="../img/admin/disabled.gif" alt="{$value.label}" title="{$value.label}" />
-												{/if}
-											 {else}
 												{$value.label}
-											{/if}
-											</div>
+											</label>
 										</div>
-										{*if isset($input.br) && $input.br}<br />{/if*}
-										{*if isset($value.p) && $value.p}<p>{$value.p}</p>{/if*}
+										{if isset($value.p) && $value.p}<p class="help-block">{$value.p}</p>{/if}
 									{/foreach}
 								{elseif $input.type == 'switch'}
 									<div class="row">
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index 34dc9ec08..a3956e0e1 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -50,7 +50,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'type' => 'radio',
 					'label' => $this->l('Template cache'),
 					'name' => 'smarty_force_compile',
-					'br' => true,
 					'values' => array(
 						array(
 							'id' => 'smarty_force_compile_'._PS_SMARTY_NO_COMPILE_,
@@ -95,7 +94,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'type' => 'radio',
 					'label' => $this->l('Debug console'),
 					'name' => 'smarty_console',
-					'br' => true,
 					'values' => array(
 						array(
 							'id' => 'smarty_console_none',
@@ -120,8 +118,7 @@ class AdminPerformanceControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('Debug console Key'),
 					'name' => 'smarty_console_key',
-					'size' => 30,
-					'desc' => $this->l('SMARTY_DEBUG parameter in the URL.')
+					'hint' => $this->l('SMARTY_DEBUG parameter in the URL.')
 				),
 			)
 		);
@@ -208,7 +205,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'type' => 'switch',
 					'label' => $this->l('Smart cache for CSS'),
 					'name' => 'PS_CSS_THEME_CACHE',
-					'br' => true,
 					'values' => array(
 						array(
 							'id' => 'PS_CSS_THEME_CACHE_1',
@@ -226,7 +222,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'type' => 'switch',
 					'label' => $this->l('Smart cache for JavaScript'),
 					'name' => 'PS_JS_THEME_CACHE',
-					'br' => true,
 					'values' => array(
 						array(
 							'id' => 'PS_JS_THEME_CACHE_1',
@@ -244,7 +239,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'type' => 'switch',
 					'label' => $this->l('Minify HTML'),
 					'name' => 'PS_HTML_THEME_COMPRESSION',
-					'br' => true,
 					'values' => array(
 						array(
 							'id' => 'PS_HTML_THEME_COMPRESSION_1',
@@ -262,7 +256,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'type' => 'switch',
 					'label' => $this->l('Compress inline JavaScript in HTML'),
 					'name' => 'PS_JS_HTML_THEME_COMPRESSION',
-					'br' => true,
 					'values' => array(
 						array(
 							'id' => 'PS_JS_HTML_THEME_COMPRESSION_1',
@@ -281,7 +274,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'label' => $this->l('Apache optimization'),
 					'name' => 'PS_HTACCESS_CACHE_CONTROL',
 					'hint' => $this->l('This will add directives to your .htaccess file, which should improve caching and compression.'),
-					'is_bool' => true,
 					'values' => array(
 						array(
 							'id' => 'PS_HTACCESS_CACHE_CONTROL_1',
@@ -352,7 +344,7 @@ class AdminPerformanceControllerCore extends AdminController
 				'title' => $this->l('Ciphering'),
 				'icon' => 'icon-desktop'
 			),
-			'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
+			'hint' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
 			'input' => array(
 				array(
 					'type' => 'hidden',
@@ -362,7 +354,6 @@ class AdminPerformanceControllerCore extends AdminController
 					'type' => 'radio',
 					'label' => $this->l('Algorithm'),
 					'name' => 'PS_CIPHER_ALGORITHM',
-					'br' => true,
 					'values' => array(
 						array(
 							'id' => 'PS_CIPHER_ALGORITHM_1',