diff --git a/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl
index ad3397a2f..1aed3a12e 100644
--- a/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/tags/helpers/form/form.tpl
@@ -25,40 +25,36 @@
 {extends file="helpers/form/form.tpl"}
 
 {block name="other_input"}
-	{if $key eq 'selects'}
-	<div class="margin-form">
-	<h3>{l s='Products:'}</h3>
-	<table class="double_select">
-		<tr>
-			<td style="padding-left:20px;">
+{if $key eq 'selects'}
+<div class="row">
+	<label class="control-label col-lg-3">{l s='Products:'}</label>
+
+	<div class="col-lg-9">
+		<div class="row">
+			<div class="col-lg-6">
 				<select multiple id="select_left">
 					{foreach from=$field.products_unselected item='product'}
 					<option value="{$product.id_product}">{$product.name}</option>
 					{/foreach}
 				</select>
-				<span class="alert alert-info" name="help_box">{l s='Double click to move the item to another column'}<span class="hint-pointer">&nbsp;</span></span>
-				<br /><br />
-				<a href="#" id="move_to_right" class="multiple_select_add">
-					{l s='Add'} &gt;&gt;
+				<a href="#" id="move_to_right" class="btn btn-default btn-block multiple_select_add">
+					{l s='Add'} <i class="icon-arrow-right"></i>
 				</a>
 			</div>
-			</td>
-			<td>
+			<div class="col-lg-6">
 				<select multiple id="select_right" name="products[]">
 					{foreach from=$field.products item='product'}
 					<option selected="selected" value="{$product.id_product}">{$product.name}</option>
 					{/foreach}
 				</select>
-				<span class="alert alert-info" name="help_box">{l s='Double click to move the item to another column'}<span class="hint-pointer">&nbsp;</span></span>
-				<br /><br />
-				<a href="#" id="move_to_left" class="multiple_select_remove">
-					&lt;&lt; {l s='Remove'}
+				<a href="#" id="move_to_left" class="btn btn-default btn-block multiple_select_remove">
+					<i class="icon-arrow-left"></i> {l s='Remove'}
 				</a>
-			</td>
-		</tr>
-	</table>
+			</div>
+		</div>
 	</div>
-	<div class="clear">&nbsp;</div>
+</div>
+
 
 	<script type="text/javascript">
 	$(document).ready(function(){
diff --git a/controllers/admin/AdminAttachmentsController.php b/controllers/admin/AdminAttachmentsController.php
index eb875aa52..30a2430ec 100644
--- a/controllers/admin/AdminAttachmentsController.php
+++ b/controllers/admin/AdminAttachmentsController.php
@@ -60,14 +60,13 @@ class AdminAttachmentsControllerCore extends AdminController
 		$this->fields_form = array(
 			'legend' => array(
 				'title' => $this->l('Attachment'),
-				'image' => '../img/t/AdminAttachments.gif'
+				'icon' => 'icon-paper-clip'
 			),
 			'input' => array(
 				array(
 					'type' => 'text',
 					'label' => $this->l('Filename:'),
 					'name' => 'name',
-					'size' => 33,
 					'required' => true,
 					'lang' => true,
 				),
@@ -75,15 +74,13 @@ class AdminAttachmentsControllerCore extends AdminController
 					'type' => 'textarea',
 					'label' => $this->l('Description:'),
 					'name' => 'description',
-					'cols' => 40,
-					'rows' => 10,
 					'lang' => true,
 				),
 				array(
 					'type' => 'file',
 					'label' => $this->l('File:'),
 					'name' => 'file',
-					'desc' => $this->l('Upload a file from your computer.')
+					'hint' => $this->l('Upload a file from your computer.')
 				),
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminScenesController.php b/controllers/admin/AdminScenesController.php
index c82b10959..c5b70ad84 100644
--- a/controllers/admin/AdminScenesController.php
+++ b/controllers/admin/AdminScenesController.php
@@ -140,7 +140,7 @@ class AdminScenesControllerCore extends AdminController
 		$fields_form = array(
 			'legend' => array(
 				'title' => $this->l('Image Maps'),
-				'image' => '../img/admin/photo.gif',
+				'icon' => 'icon-picture',
 				),
 			'submit' => array(
 				'title' => $this->l('Save'),
@@ -164,12 +164,11 @@ class AdminScenesControllerCore extends AdminController
 					'label' => $this->l('Image map name:'),
 					'name' => 'name',
 					'lang' => true,
-					'size' => 48,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
 				array(
-					'type' => 'radio',
+					'type' => 'switch',
 					'label' => $this->l('Status:'),
 					'name' => 'active',
 					'required' => false,
diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php
index c83bb1edb..6958d44f8 100644
--- a/controllers/admin/AdminSuppliersController.php
+++ b/controllers/admin/AdminSuppliersController.php
@@ -73,7 +73,7 @@ class AdminSuppliersControllerCore extends AdminController
 		$this->fields_form = array(
 			'legend' => array(
 				'title' => $this->l('Suppliers'),
-				'image' => '../img/admin/suppliers.gif'
+				'icon' => 'icon-truck'
 			),
 			'input' => array(
 				array(
@@ -84,7 +84,6 @@ class AdminSuppliersControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('Name'),
 					'name' => 'name',
-					'size' => 40,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
 				),
@@ -92,25 +91,23 @@ class AdminSuppliersControllerCore extends AdminController
 					'type' => 'textarea',
 					'label' => $this->l('Description:'),
 					'name' => 'description',
-					'cols' => 60,
-					'rows' => 10,
 					'lang' => true,
-					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'desc' => $this->l('Will appear in the supplier list')
+					'hint' => array(
+						$this->l('Invalid characters:').' <>;=#{}',
+						$this->l('Will appear in the supplier list')
+					)
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Phone:'),
 					'name' => 'phone',
-					'size' => 15,
 					'maxlength' => 16,
-					'desc' => $this->l('Phone number for this supplier')
+					'hint' => $this->l('Phone number for this supplier')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Address:'),
 					'name' => 'address',
-					'size' => 100,
 					'maxlength' => 128,
 					'required' => true
 				),
@@ -118,14 +115,12 @@ class AdminSuppliersControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('Address:').' (2)',
 					'name' => 'address2',
-					'size' => 100,
 					'maxlength' => 128,
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Postal Code/Zip Code:'),
 					'name' => 'postcode',
-					'size' => 10,
 					'maxlength' => 12,
 					'required' => true,
 				),
@@ -133,7 +128,6 @@ class AdminSuppliersControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('City:'),
 					'name' => 'city',
-					'size' => 20,
 					'maxlength' => 32,
 					'required' => true,
 				),
@@ -164,7 +158,7 @@ class AdminSuppliersControllerCore extends AdminController
 					'label' => $this->l('Logo:'),
 					'name' => 'logo',
 					'display_image' => true,
-					'desc' => $this->l('Upload a supplier logo from your computer')
+					'hint' => $this->l('Upload a supplier logo from your computer')
 				),
 				array(
 					'type' => 'text',
@@ -185,11 +179,13 @@ class AdminSuppliersControllerCore extends AdminController
 					'label' => $this->l('Meta keywords:'),
 					'name' => 'meta_keywords',
 					'lang' => true,
-					'hint' => $this->l('Forbidden characters:').' <>;=#{}',
-					'desc' => $this->l('To add "tags" click in the field, write something and then press "Enter"')
+					'hint' => array(
+						$this->l('To add "tags" click in the field, write something and then press "Enter"'),
+						$this->l('Forbidden characters:').' <>;=#{}'
+					)
 				),
 				array(
-					'type' => 'radio',
+					'type' => 'switch',
 					'label' => $this->l('Enable:'),
 					'name' => 'active',
 					'required' => false,
diff --git a/controllers/admin/AdminTagsController.php b/controllers/admin/AdminTagsController.php
index 47b509cae..438dc972e 100644
--- a/controllers/admin/AdminTagsController.php
+++ b/controllers/admin/AdminTagsController.php
@@ -104,7 +104,8 @@ class AdminTagsControllerCore extends AdminController
 
 		$this->fields_form = array(
 			'legend' => array(
-				'title' => $this->l('Tag')
+				'title' => $this->l('Tag'),
+				'icon' => 'icon-tag'
 			),
 			'input' => array(
 				array(