diff --git a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
index ce120f0d0..7ca3b3799 100644
--- a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
@@ -173,14 +173,14 @@
 	<div class="leadin">{block name="leadin"}{/block}</div>
 {/if}
 <div class="row">
-<div class="productTabs col-lg-2">
-	<div class="tab list-group">
-	{foreach $profiles as $profile}
-		<a class="list-group-item nav-profile {if $profile.id_profile == $current_profile}active{/if}" id="profile-{$profile.id_profile}" href="{$current}&token={$token}&id_profile={$profile.id_profile}">{$profile.name}</a>
-	{/foreach}
+	<div class="productTabs col-lg-2">
+		<div class="tab list-group">
+		{foreach $profiles as $profile}
+			<a class="list-group-item nav-profile {if $profile.id_profile == $current_profile}active{/if}" id="profile-{$profile.id_profile}" href="{$current}&token={$token}&id_profile={$profile.id_profile}">{$profile.name}</a>
+		{/foreach}
+		</div>
 	</div>
-</div>
-<form id="{$table}_form" class="defaultForm form-horizontal col-lg-10" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
+	<form id="{$table}_form" class="defaultForm form-horizontal col-lg-10" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
 		{if $form_id}
 			<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 		{/if}
@@ -197,7 +197,7 @@
 			<div class="row">			
 			{if $profile.id_profile != $admin_profile}
 				<div class="col-lg-6">	
-					<fieldset>
+					<div class="panel">
 						<h3>{l s='Menu'}</h3>
 						<table class="table" id="table_{$profile.id_profile}">
 							<thead>
@@ -345,10 +345,10 @@
 								{/if}
 							</tbody>
 						</table>
-					</fieldset>
+					</div>
 				</div>
 				<div class="col-lg-6">
-					<fieldset>
+					<div class="panel">
 						<h3>{l s='Modules'}</h3>
 						<table class="table" id="table_module_{$profile.id_profile}">
 							<thead>
@@ -413,17 +413,17 @@
 								{/if}
 							</tbody>
 						</table>
-					</fieldset>
+					</div>
 				</div>
 			{else}
 				<div class="col-lg-12">
-					<fieldset>
+					<div class="panel">
 						{l s='Administrator permissions cannot be modified.'}
-					</fieldset>
+					</div>
 				</div>
 			{/if}
 			</div>
 		</div>
 		{/foreach}
-</form>
+	</form>
 </div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
index a2277bd3f..e2a5ee277 100644
--- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
@@ -67,8 +67,11 @@
 {if $generate}<div class="module_confirmation conf confirm">{l s='%d product(s) successfully created.' sprintf=$combinations_size}</div>{/if}
 <script type="text/javascript" src="../js/attributesBack.js"></script>
 <form enctype="multipart/form-data" method="post" id="generator" action="{$url_generator}">
-	<fieldset>
-		<h3><i class="icon-asterisk"></i> {l s='Attributes generator'}</h3>
+	<div class="panel">
+		<h3>
+			<i class="icon-asterisk"></i>
+			{l s='Attributes generator'}
+		</h3>
 		<div class="row">
 			<div class="col-lg-3">
 				<div class="form-group">
@@ -139,5 +142,5 @@
 				<button type="submit" class="btn btn-default" name="generate"><i class="icon-random"></i> {l s='Generate these Combinations'}</button>
 			</div>
 		</div>
-	</fieldset>
+	</div>
 </form>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/backup/download/view.tpl b/admin-dev/themes/default/template/controllers/backup/download/view.tpl
index aab9ce685..e6cd6961d 100644
--- a/admin-dev/themes/default/template/controllers/backup/download/view.tpl
+++ b/admin-dev/themes/default/template/controllers/backup/download/view.tpl
@@ -26,8 +26,11 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-	<fieldset>
-		<h3><i class="icon-download"></i> {l s='Download'}</h3>
+	<div class="panel">
+		<h3>
+			<i class="icon-download"></i>
+			{l s='Download'}
+		</h3>
 		<p>
 			<a class="btn btn-default" href="{$backup_url}">
 				<i class="icon-download"></i> 
@@ -35,7 +38,7 @@
 			</a>
 		</p>
 		<p>{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>
-	</fieldset>
+	</div>
 
 	<div class="row">
 		<div class="alert alert-warning">
@@ -79,6 +82,4 @@
 		</div>
 	</div>
 
-{/block}
-
-
+{/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
index 56da6ba26..d06b1ad79 100644
--- a/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/backup/helpers/list/list_header.tpl
@@ -28,8 +28,11 @@
 {block name="override_header"}
 
 	{if isset($backup_url) && isset($backup_weight)}
-	<fieldset>
-		<h3><i class="icon-download"></i> {l s='Download'}</h3>
+	<div class="panel">
+		<h3>
+			<i class="icon-download"></i>
+			{l s='Download'}
+		</h3>
 		<p>
 			<a class="btn btn-default" href="{$backup_url}">
 				<i class="icon-download"></i> 
@@ -37,10 +40,9 @@
 			</a>
 		</p>
 		<p>{l s='Tip: You can also download this file over to your FTP. Backup files are located in the "admin/backups" directory.'}</p>
-	</fieldset>
+	</div>
 	{/if}
 
-
 		<div class="alert alert-warning">
 			<button data-dismiss="alert" class="close" type="button">×</button>
 			<p>{l s='Disclaimer before creating a new backup'}</p>
@@ -63,8 +65,6 @@
 			</form>
 		</div>
 
-
-
 		<div class="alert alert-info">
 			<p>{l s='How to restore a database backup in 10 easy steps:'}</p>
 			<ol>
@@ -81,5 +81,4 @@
 			</ol>
 		</div>
 
-
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
index 2e5459808..49b4c5ec1 100644
--- a/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
@@ -26,13 +26,13 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-download"></i> {l s='Download'}</h3>
 	<div class="alert alert-success">{l s='Beginning the download ...'}</div>
 	<p>{l s='Backup files should automatically download.'}</p>
 	<p>{l s='If not,'} <b><a href="{$url_backup}" class="btn btn-default"><i class="icon-download"></i> {l s='please click here!'}</a></b></p>
 	<iframe width="0" height="0" scrolling="no" frameborder="0" src="{$url_backup}"></iframe>
-</fieldset>
+</div>
 {/block}
 
 
diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
index c1705925b..353dedab5 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
@@ -36,7 +36,7 @@
 </script>
 
 <div class="defaultForm">
-	<fieldset>
+	<div class="panel">
 		{l s='Carrier name:'} <strong id="summary_name"></strong>
 		<div id="summary_meta_informations"></div>
 		<div id="summary_shipping_cost"></div>
@@ -56,5 +56,5 @@
 		</div>
 		{/if}
 		{$active_form}
-	</fieldset>
+	</div>
 </div>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
index 9f752db1e..505633031 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
@@ -14,22 +14,25 @@
 <form action="{$currentIndex|escape}&token={$currentToken|escape}&addcart_rule" id="cart_rule_form" class="form-horizontal" method="post">
 	{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
 	<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
-	<fieldset id="cart_rule_informations" class="cart_rule_tab">
+	<div id="cart_rule_informations" class="panel cart_rule_tab">
 		<h3><i class="icon-info"></i> {l s='Cart rule information'}</h3>
 		{include file='controllers/cart_rules/informations.tpl'}
 		{include file="footer_toolbar.tpl"}
-	</fieldset>
-	<fieldset id="cart_rule_conditions" class="cart_rule_tab">
+	</div>
+	<div id="cart_rule_conditions" class="panel cart_rule_tab">
 		<h3><i class="icon-random"></i> {l s='Cart rule conditions'}</h3>
 		{include file='controllers/cart_rules/conditions.tpl'}
 		{include file="footer_toolbar.tpl"}
-	</fieldset>
-	<fieldset id="cart_rule_actions" class="cart_rule_tab">
+	</div>
+	<div id="cart_rule_actions" class="panel cart_rule_tab">
 		<h3><i class="icon-wrench"></i> {l s='Cart rule actions'}</h3>
 		{include file='controllers/cart_rules/actions.tpl'}
 		{include file="footer_toolbar.tpl"}
-	</fieldset>
-	<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button>
+	</div>
+	<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn">
+		<i class="icon-save"></i>
+		{l s='Save'}
+	</button>
 	<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
 </form>
 
diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
index d7393ce04..9b52eee3d 100755
--- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
@@ -26,7 +26,7 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-<fieldset>
+<div class="panel">
 	{include file="helpers/kpi/kpi.tpl"
 		id="kpi-cart"
 		color="color1"
@@ -37,10 +37,10 @@
 		source=''
 		chart=null
 	}
-</fieldset>
+</div>
 <div class="row">
 	<div class="col-lg-6">
-		<fieldset>
+		<div class="panel">
 			<h3><i class="icon-user"></i> {l s='Customer information'}</h3>
 			{if $customer->id}
 				<a class="btn btn-default pull-right" href="mailto:{$customer->email}"><i class="icon-envelope"></i> {$customer->email}</a>
@@ -70,10 +70,10 @@
 			{else}
 				<h2>{l s='Guest not registered'}</h2>
 			{/if}
-		</fieldset>
+		</div>
 	</div>
 	<div class="col-lg-6">
-		<fieldset>
+		<div class="panel">
 			<h3><i class="icon-shopping-cart"></i> {l s='Order information'}</h3>
 			{if $order->id}
 				<h2><a href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></h2>
@@ -84,10 +84,10 @@
 					<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_cart={$cart->id}&addorder"><i class="icon-shopping-cart"></i> {l s='Create an order from this cart.'}</a>
 				{/if}
 			{/if}
-		</fieldset>
+		</div>
 	</div>
 </div>
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-archive"></i> {l s='Cart summary'}</h3>
 		<table class="table" id="orderProducts">
 			<thead>
@@ -193,7 +193,7 @@
 	</table>
 	
 	{if $discounts}
-	<table cellspacing="0" cellpadding="0" class="table" style="width:280px; margin:15px 0px 0px 420px;">
+	<table class="table">
 		<tr>
 			<th><img src="../img/admin/coupon.gif" alt="{l s='Discounts'}" />{l s='Discount name'}</th>
 			<th align="center" style="width: 100px">{l s='Value'}</th>
@@ -211,4 +211,4 @@
 	</div>	
 	<div class="clear" style="height:20px;">&nbsp;</div>
 {/block}
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
index 9c397bd5e..41e4eb114 100644
--- a/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/countries/helpers/list/list_footer.tpl
@@ -137,7 +137,7 @@
 	</tr>
 </table>
 <input type="hidden" name="token" value="{$token}" />
-</fieldset>
+</div>
 </form>
 <script type="text/javascript">
 	var confirmation = new Array();
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
index 0f234c824..bc58cc63e 100644
--- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
@@ -25,7 +25,7 @@
 {extends file="helpers/options/options.tpl"}
 {block name="after"}
 {if $use_sync}
-		<fieldset>
+		<div class="panel">
 			<legend>{l s='Sync'}</legend>
 			<label>{l s='Run sync:'}</label>
 			<div class="margin-form">
@@ -35,7 +35,7 @@
 				<div class="error" style="display:none" id="ajax_error"></div>
 				<div class="alert" style="display:none" id="ajax_conf"></div>
 			</div>
-		</fieldset>
+		</div>
 
 		<script type="text/javascript"> 
 			var ajaxQueries = new Array();
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
index c3fcbe898..02a341957 100644
--- a/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/helpers/view/view.tpl
@@ -27,7 +27,7 @@
 
 {block name="override_tpl"}
 
-<fieldset>
+<div class="panel">
 	<h3>
 		<i class="icon-envelope"></i>
 		{l s='Message status'}
@@ -79,12 +79,12 @@
 			</div>
 		</div>
 	</form>
-</fieldset>
+</div>
 
 
 	{if $thread->id_customer}
 
-		<fieldset>
+		<div class="panel">
 		{if $orders && count($orders)}
 			{if $count_ok}
 				<h3>
@@ -138,8 +138,8 @@
 				</p>
 			{/if}
 		{/if}
-		</fieldset>
-		<fieldset>
+		</div>
+		<div class="panel">
 		{if $products && count($products)}
 			<h3>
 				<i class="icon-archive"></i> {l s='Products:'}
@@ -180,7 +180,7 @@
 				</table>
 			</div>
 		{/if}
-		</fieldset>
+		</div>
 	{/if}
 
 	<div class="row row-margin-bottom">
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
index 970314e9a..adc7b9173 100644
--- a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
@@ -27,7 +27,7 @@
 
 {if !$email}
 
-	<fieldset>
+	<div class="panel">
 		<h3>
 			{if !empty($message.employee_name)}
 				<i class="icon-user"></i>
@@ -178,20 +178,20 @@
 				<dd>{$message.message|escape:'htmlall':'UTF-8'|nl2br}</dd>
 			</dl>
 		</div>
-	</fieldset>
+	</div>
 
 {if !$email}
 	{if empty($message.id_employee)}
-		<fieldset>
+		<div class="panel">
 			<button class="btn btn-default"
 				onclick="$('#reply_to_{$message.id_customer_message}').show(500); $(this).hide();">
 				<i class="icon-mail-reply"></i> {l s='Reply to this message'}
 			</button>
-		</fieldset>
+		</div>
 	{/if}
 
 	<div id="reply_to_{$message.id_customer_message}" style="display: none;">
-		<fieldset>
+		<div class="panel">
 			<form action="{$current}&token={getAdminToken tab='AdminCustomerThreads'}&id_customer_thread={$message.id_customer_thread}&viewcustomer_thread" method="post" enctype="multipart/form-data" class="form-horizontal">
 				<div class="panel-heading">
 					{l s='Please type your reply below:'}
@@ -212,7 +212,7 @@
 					<input type="hidden" name="msg_email" value="{$message.email}" />
 				</div>				
 			</form>
-		</fieldset>
+		</div>
 	</div>
 {/if}
 
diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
index 221bb1a7b..0a3e720e2 100644
--- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
@@ -145,7 +145,7 @@
 			</table>
 		
 		<div style="display:none" id="group_discount_category_fancybox">
-			<fieldset class="form-horizontal">
+			<div class="panel form-horizontal">
 				<div class="col-lg-12">
 					<h3><i class="icon-group"></i> {l s='New group category discount'}</h3>
 					<hr/>
@@ -164,7 +164,7 @@
 						</div>
 					</div>
 				</div>
-			</fieldset>
+			</div>
 		</div>
 	</div>
 	{elseif $input['type'] == 'modules'}
diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
index fe29bf17b..1157c397a 100755
--- a/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
@@ -27,7 +27,7 @@
 
 {block name="override_tpl"}
 <div class="col-lg-6">
-	<fieldset>
+	<div class="panel">
 		<h3><i class="icon-group"></i> {l s='Group information'}</h3>
 		<h2><i class="icon-group"></i> {$group->name[$language->id]}</h2>
 		<div class="form-horizontal">
@@ -48,10 +48,10 @@
 				<div class="col-lg-3"><p class="form-control-static">{if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}</p></div>
 			</div>
 		</div>
-	</fieldset>
+	</div>
 </div>
 <div class="col-lg-6">
-	<fieldset>
+	<div class="panel">
 		<h3><i class="icon-dollar"></i> {l s='Current category discount'}</h3>	
 		{if !$categorieReductions}
 			<div class="alert alert-warning">{l s='None'}</div>
@@ -73,7 +73,7 @@
 				<tbody>
 			</table>
 		{/if}
-	</fieldset>
+	</div>
 </div>
 <div class="col-lg-12">
 	<h2>{l s='Members of this customer group'}</h2>
diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl
index a4223b14c..533a059ce 100644
--- a/admin-dev/themes/default/template/controllers/images/content.tpl
+++ b/admin-dev/themes/default/template/controllers/images/content.tpl
@@ -52,7 +52,7 @@
 {if isset($display_regenerate)}
 
 	<form class="form-horizontal" action="{$current}&token={$token}" method="post">
-		<fieldset>
+		<div class="panel">
 			<h3>
                 <i class="icon-picture"></i>
                 {l s='Regenerate thumbnails'}
@@ -126,7 +126,7 @@
 					<input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" />
 				</div>
 			</div>
-		</fieldset>
+		</div>
 	</form>
 {/if}
 
@@ -137,7 +137,7 @@
         </div>
     {else}
         <form action="{$current}&token={$token}" method="post" class="form-horizontal">
-            <fieldset>
+            <div class="panel">
                 <h3>
                     <i class="icon-picture"></i>
                     {l s='Move images'}
@@ -154,7 +154,7 @@
                         <input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" />
                     </div>
                 </div>
-            </fieldset>
+            </div>
         </form>
     {/if}
 {/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index 3d96e8795..0304773f7 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -54,7 +54,7 @@
 {* Import fieldset *}
 <form id="preview_import" action="{$current}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
 	
-	<fieldset>
+	<div class="panel">
 		<h3>
 			<i class="icon-download"></i>
 			{l s='Import'}
@@ -233,10 +233,10 @@
 				</ul>
 			</div>
 		{/if}
-	</fieldset>
+	</div>
 </form>
 
-<fieldset>
+<div class="panel">
 	<h3>
 		<i class="icon-download"></i>
 		{l s='Available fields'}
@@ -245,7 +245,7 @@
 		{$available_fields}
 	</div>
 	<p>{l s='* Required field'}</p>
-</fieldset>
+</div>
 
 <script type="text/javascript">
 	$(document).ready(function(){
diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
index d8b551b02..e0cacf223 100644
--- a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
@@ -52,10 +52,9 @@
 {/block}
 
 {block name="other_fieldsets"}
-
 	{if isset($fields['new'])}
 		<br /><br />
-		<fieldset style="width:572px;">
+		<div class="panel" style="width:572px;">
 			{foreach $fields['new'] as $key => $field}
 				{if $key == 'legend'}
 					<legend>
@@ -85,7 +84,6 @@
 			{/foreach}
 			<br />
 			<div class="small">{l s='Missing files are marked in red'}</div>
-		</fieldset>
+		</div>
 	{/if}
-
-{/block}
+{/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
index 656f93f0f..0b8a52e3a 100644
--- a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl
@@ -27,7 +27,7 @@
 
 {block name="override_header"}
 
-	<fieldset>
+	<div class="panel">
 		<h3>
 			<i class="icon-level-up"></i>
 			{l s='Severity levels'}
@@ -39,6 +39,6 @@
 			<li class="text-warning">{l s='Error'}</li>
 			<li class="text-danger">{l s='Major issue (crash)!'}</li>
 		</ol>
-	</fieldset>
+	</div>
 
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
index 00f822257..abb605a2a 100644
--- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl
@@ -26,7 +26,7 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-<fieldset>
+<div class="panel">
 	<h3>{l s='Addresses'} <span class="badge">{count($addresses)}</span></h3>
 	{if !count($addresses)}
 		{l s='No address has been found for this manufacturer.'}
@@ -63,8 +63,8 @@
 		</div>
 		{/foreach}
 	{/if}
-</fieldset>
-<fieldset>
+</div>
+<div class="panel">
 	<h3>{l s='Products'} <span class="badge">{count($products)}</span></h3>
 
 	{foreach $products AS $product}
@@ -142,5 +142,5 @@
 			</div>
 		{/if}
 	{/foreach}
-</fieldset>
+</div>
 {/block}
diff --git a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
index e60e7b21f..4951403e5 100644
--- a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-cogs"></i> {l s='Configuration'}</h3>
 	<div class="row">
 		<div class="input-group">
@@ -44,4 +44,4 @@
 			{l s='Activate module for '}{$shop_context}
 	</div>
 	{/if}
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
index 3953deca0..9fdc954a3 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
@@ -30,7 +30,7 @@
 	{if $display_key}
 		<input type="hidden" name="show_modules" value="{$display_key}" />
 	{/if}
-	<fieldset>
+	<div class="panel">
 		<h3>
 			<i class="icon-paste"></i>
 			{l s='Transplant a module'}
@@ -83,7 +83,7 @@
 				<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-primary" />
 			</div>
 		</div>
-	</fieldset>
+	</div>
 </form>
 <script type="text/javascript">
 	//<![CDATA
diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index 8425227b5..fedfe61cd 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -573,7 +573,7 @@
 						stock[id_product] = new Array();
 						if (this.customizable == '1')
 						{
-							customization_html += '<fieldset class="width3"><h3>{l s='Customization'}</h3><form id="customization_'+id_product+'" class="id_customization" method="post" enctype="multipart/form-data" action="'+admin_cart_link+'" style="display:none;">';
+							customization_html += '<div class="panel width3"><h3>{l s='Customization'}</h3><form id="customization_'+id_product+'" class="id_customization" method="post" enctype="multipart/form-data" action="'+admin_cart_link+'" style="display:none;">';
 							customization_html += '<input type="hidden" name="id_product" value="'+id_product+'" />';
 							customization_html += '<input type="hidden" name="id_cart" value="'+id_cart+'" />';
 							customization_html += '<input type="hidden" name="action" value="updateCustomizationFields" />';
@@ -590,7 +590,7 @@
 									customization_html += '<input class="customization_field" type="text" name="customization_'+id_product+'_'+this.id_customization_field+'" id="customization_'+id_product+'_'+this.id_customization_field+'">';
 								customization_html += '</p>';
 							});
-							customization_html += '</fieldset></form>';
+							customization_html += '</div></form>';
 						}
 
 						$.each(this.combinations, function() {
@@ -1007,7 +1007,7 @@
 <div class="leadin">{block name="leadin"}{/block}</div>
 
 <form action="" method="" class="form-horizontal">
-	<fieldset id="customer_part">
+	<div class="panel" id="customer_part">
 		<h3>
 			<i class="icon-user"></i>
 			{l s='Customer'}
@@ -1031,10 +1031,10 @@
 		<div class="row">
 			<div id="customers" class="col-lg-9 pull-right"></div>
 		</div>
-	</fieldset>
+	</div>
 </form>
 <form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
-	<fieldset id="products_part" style="display:none;">
+	<div class="panel" id="products_part" style="display:none;">
 		<h3>
 			<i class="icon-folder-close"></i>
 			{l s='Cart'}
@@ -1212,8 +1212,8 @@
 				</div>
 			</div>
 		</div>
-	</fieldset>
-	<fieldset id="vouchers_part" style="display:none;">
+	</div>
+	<div class="panel" id="vouchers_part" style="display:none;">
 		<h3>
 			<i class="icon-table"></i>
 			{l s='Vouchers'}
@@ -1247,8 +1247,8 @@
 			</table>
 		</div>
 		<div id="vouchers_err" class="alert alert-warning" style="display:none;"></div>
-	</fieldset>
-	<fieldset id="address_part" style="display:none;">
+	</div>
+	<div class="panel" id="address_part" style="display:none;">
 		<h3>
 			<i class="icon-envelope"></i>
 			{l s='Addresses'}
@@ -1283,8 +1283,8 @@
 				</div>
 			</div>
 		</div>
-	</fieldset>
-	<fieldset id="carriers_part" style="display:none;">
+	</div>
+	<div class="panel" id="carriers_part" style="display:none;">
 		<h3>
 			<i class="icon-truck"></i>
 			{l s='Shipping'}
@@ -1326,8 +1326,8 @@
 				{/if}
 			</div>
 		</div>
-	</fieldset>
-	<fieldset id="summary_part" style="display:none;">
+	</div>
+	<div class="panel" id="summary_part" style="display:none;">
 		<h3>
 			<i class="icon-align-justify"></i>
 			{l s='Summary'}
@@ -1398,10 +1398,9 @@
 				</div>
 			</div>
 		</div>
-	</fieldset>
+	</div>
 </form>
 <div id="loader_container">
 	<div id="loader">
 	</div>
 </div>
-
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index 62050e6cf..aac5778cd 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -247,7 +247,7 @@
 					<div class="tab-pane active" id="shipping">
 						<!-- Shipping block -->
 						{if !$order->isVirtual()}
-						<fieldset class="form-horizontal">
+						<div class="panel form-horizontal">
 							<div class="form-group">
 								<div class="col-lg-6">
 									<label class="control-label col-lg-9">{l s='Recycled packaging'}</label>
@@ -299,14 +299,14 @@
 							{if $carrierModuleCall}
 								{$carrierModuleCall}
 							{/if}
-						</fieldset>
+						</div>
 						{/if}
 					</div>
 					<!-- Tab returns -->
 					<div class="tab-pane" id="returns">
 						{if !$order->isVirtual()}
 						<!-- Return block -->
-						<fieldset>
+						<div class="panel">
 							{if $order->getReturn()|count > 0}
 							<table class="table">
 								<thead>
@@ -356,7 +356,7 @@
 							{if $carrierModuleCall}
 								{$carrierModuleCall}
 							{/if}
-						</fieldset>
+						</div>
 						{/if}
 					</div>
 				</div>
@@ -602,7 +602,7 @@
 		</div>
 
 		<!-- Payments block -->
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-money"></i>
 				{l s="Payment"}
@@ -773,11 +773,11 @@
 				</div>
 			</form>
 			{/if}
-		</fieldset>
+		</div>
 
 		<!-- Sources block -->
 		{if (sizeof($sources))}
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-globe"></i>
 				{l s='Sources'}
@@ -792,7 +792,7 @@
 				</li>
 			{/foreach}
 			</ul>
-		</fieldset>
+		</div>
 		{/if}
 	
 		<!-- linked orders block -->
@@ -852,7 +852,7 @@
 			<input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" />
 		</div>
 
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-shopping-cart"></i>
 				{l s='Products'}
@@ -1102,13 +1102,13 @@
 					{l s='Partial refund'}
 				</button>
 			</div>
-		</fieldset>
+		</div>
 	</form>
 
 	
 
 	{if (sizeof($messages))}
-	<fieldset>
+	<div class="panel">
 		<h3>
 			<i class="icon-envelope-alt"></i>
 			{l s='Messages'}
@@ -1128,7 +1128,7 @@
 			<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
 			</div>
 		{/foreach}
-	</fieldset>
+	</div>
 	{/if}
 
 	<script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
index 7ba0da219..03aeb907a 100644
--- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+++ b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
@@ -24,7 +24,7 @@
 *}
 
 <form action="{$url_submit}" method="post" id="form_{$list['name_id']}" class="form-horizontal">
-	<fieldset>
+	<div class="panel">
 		<h3>
 			<i class="{$list['icon']}"></i>
 			{$list['title']}
@@ -124,5 +124,5 @@
 				{l s='Save restrictions'}
 			</button>
 		</div>
-	</fieldset>
+	</div>
 </form>
diff --git a/admin-dev/themes/default/template/controllers/products/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl
index 44c8eee9f..b34ecba58 100644
--- a/admin-dev/themes/default/template/controllers/products/associations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/associations.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Associations" />
 	<h3>{l s='Associations'}</h3>
 	{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"}
@@ -100,4 +100,4 @@
 			</a>
 		</div>
 	</div>
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/attachments.tpl b/admin-dev/themes/default/template/controllers/products/attachments.tpl
index 311c4b250..d7d279c89 100644
--- a/admin-dev/themes/default/template/controllers/products/attachments.tpl
+++ b/admin-dev/themes/default/template/controllers/products/attachments.tpl
@@ -24,7 +24,7 @@
 *}
 
 {if isset($obj->id)}
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Attachments" />
 	<h3>{l s='Attachment'}</h3>
 
@@ -131,5 +131,5 @@
 		var ad = '{$ad}';
 		hideOtherLanguage({$id_lang});
 	</script>
-</fieldset>
+</div>
 {/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl
index 58c4b8fdc..1dd4d2965 100644
--- a/admin-dev/themes/default/template/controllers/products/combinations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 {if isset($product->id) && !$product->is_virtual}
-<fieldset>
+<div class="panel">
 
 	<script type="text/javascript">
 		var msg_combination_1 = '{l s='Please choose an attribute.'}';
@@ -374,9 +374,7 @@
 				</button>
 			</span>
 		</div>
-	</div>		
-
+	</div>
 	{$list}
-
-</fieldset>
+</div>
 {/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/customization.tpl b/admin-dev/themes/default/template/controllers/products/customization.tpl
index c52ddb5af..86f8c6f6b 100644
--- a/admin-dev/themes/default/template/controllers/products/customization.tpl
+++ b/admin-dev/themes/default/template/controllers/products/customization.tpl
@@ -24,7 +24,7 @@
 *}
 
 {if isset($obj->id)}
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Customization" />
 	<h3>{l s='Add or modify customizable properties.'}</h3>
 	
@@ -76,5 +76,5 @@
 		</div>
 	</div>
 	{/if}
-</fieldset>
+</div>
 {/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl
index dee16d70c..264b53808 100644
--- a/admin-dev/themes/default/template/controllers/products/features.tpl
+++ b/admin-dev/themes/default/template/controllers/products/features.tpl
@@ -24,7 +24,7 @@
 *}
 
 {if isset($product->id)}
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Features" />
 	<h3>{l s='Assign features to this product:'}</h3>
 
@@ -110,7 +110,7 @@
 	<a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature" class="btn btn-link confirm_leave button">
 		<i class="icon-plus-sign"></i> {l s='Add a new feature'} <i class="icon-external-link-sign"></i>
 	</a>
-</fieldset>
+</div>
 {/if}
 <script type="text/javascript">
 	hideOtherLanguage({$default_language});
diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index 368f7b7d1..ee90b0a4a 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -24,7 +24,7 @@
 *}
 
 {if isset($id_product) && isset($product)}
-<fieldset>
+<div class="panel">
 <input type="hidden" name="submitted_tabs[]" value="Images" />
 	
 <h3 class="tab" >
@@ -329,5 +329,5 @@
 	});
 	{/literal}
 </script>
-</fieldset>
+</div>
 {/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index 4994e93bb..0906cb09d 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -28,7 +28,7 @@
 	{assign var=class_input_ajax value=''}
 {/if}
 
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Informations" />
 	<h3 class="tab">{l s='Information'}</h3>
 	<div class="alert alert-info">{l s='Product global information'}</div>
@@ -453,4 +453,4 @@
 			{/if}
 		</div>
 	</div>
-</fieldset>
+</div>
diff --git a/admin-dev/themes/default/template/controllers/products/pack.tpl b/admin-dev/themes/default/template/controllers/products/pack.tpl
index 7e37ac1d0..c768cd432 100644
--- a/admin-dev/themes/default/template/controllers/products/pack.tpl
+++ b/admin-dev/themes/default/template/controllers/products/pack.tpl
@@ -28,7 +28,7 @@
 	var msg_set_quantity = "{l s='Please set a quantity to add a product.' js=1}";
 </script>
 
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Pack" />
 	<h3>{l s='Pack'}</h3>
 	<div class="alert alert-info">{l s='You cannot add combinations to a pack.'}</div>
@@ -92,4 +92,4 @@
 			</ul>
 		</div>
 	</div>
-</fieldset>
+</div>
diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl
index d3ae42957..b0272ea80 100644
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -103,7 +103,7 @@ $(document).ready(function () {
 	Customer.init();
 });
 </script>
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Prices" />
 	<h3>{l s='Product price'}</h3>
 
@@ -281,10 +281,10 @@ $(document).ready(function () {
 			</div>
 		</div>
 	</div>
-</fieldset>
+</div>
 
 {if isset($specificPriceModificationForm)}
-<fieldset>
+<div class="panel">
 	<h3>{l s='Specific prices'}</h3>
 
 	<div class="alert alert-info">
diff --git a/admin-dev/themes/default/template/controllers/products/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl
index e5367a154..e1ad86916 100644
--- a/admin-dev/themes/default/template/controllers/products/quantities.tpl
+++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl
@@ -24,7 +24,7 @@
 *}
 
 {if isset($product->id)}
-	<fieldset>
+	<div class="panel">
 		<input type="hidden" name="submitted_tabs[]" value="Quantities" />
 		<h3>{l s='Available quantities for sale'}</h3>
 		{if !$ps_stock_management}
@@ -171,8 +171,8 @@
 				</div>
 			{/if}
 		{/if}
-	</fieldset>
-	<fieldset>
+	</div>
+	<div class="panel">
 		<h3>{l s='Availability settings'}</h3>
 
 		{if !$has_attribute}
@@ -233,7 +233,7 @@
 			var quantities_ajax_success = '{l s='Data saved'}';
 			var quantities_ajax_waiting = '{l s='Saving data...'}';
 		</script>
-	</fieldset>
+	</div>
 {/if}
 {*$default_language*}
 <script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl
index c5dbddac1..ea483fdb3 100644
--- a/admin-dev/themes/default/template/controllers/products/seo.tpl
+++ b/admin-dev/themes/default/template/controllers/products/seo.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Seo" />
 	<h3>{l s='SEO'}</h3>
 
@@ -117,7 +117,7 @@
 			{/foreach}
 		</div>
 	</div>
-</fieldset>
+</div>
 <script type="text/javascript">
 	hideOtherLanguage({$id_lang});
 </script>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/shipping.tpl b/admin-dev/themes/default/template/controllers/products/shipping.tpl
index 1e1bf0368..0327ab84a 100644
--- a/admin-dev/themes/default/template/controllers/products/shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/products/shipping.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Shipping" />
 	<h3>{l s='Shipping'}</h3>
 
@@ -105,4 +105,4 @@
 			</div>
 		</div>
 	</div>
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
index 836b8cc8a..2f7f394a9 100644
--- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl
+++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
@@ -25,7 +25,7 @@
 
 <input type="hidden" name="supplier_loaded" value="1">
 {if isset($product->id)}
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Suppliers" />
 	<h3>{l s='Suppliers of the current product'}</h3>
 	<div class="alert alert-info">
@@ -56,8 +56,8 @@
 	<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')|escape:'htmlall':'UTF-8'}&addsupplier">
 		<i class="icon-plus"></i> {l s='Create a new supplier'} <i class="icon-external-link-sign"></i>
 	</a>
-</fieldset>
-<fieldset>
+</div>
+<div class="panel">
 	<h3>{l s='Product reference(s)'}</h3>
 	<div class="alert alert-info">
 		{if $associated_suppliers|@count == 0}
@@ -126,5 +126,5 @@
 		</div>
 		{/foreach}
 	</div>
-</fieldset>
+</div>
 {/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/warehouses.tpl b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
index ae2b91633..725279882 100644
--- a/admin-dev/themes/default/template/controllers/products/warehouses.tpl
+++ b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
@@ -25,7 +25,7 @@
 
 <input type="hidden" name="warehouse_loaded" value="1">
 {if isset($product->id)}
-<fieldset>
+<div class="panel">
 	<input type="hidden" name="submitted_tabs[]" value="Warehouses" />
 	<h3>{l s='Product location in warehouses'}</h3>
 	<div class="row">
@@ -95,5 +95,5 @@
 			{/foreach}
 		</div>
 	</div>
-</fieldset>
+</div>
 {/if}
\ 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 554d6fa3f..b3e587bde 100644
--- a/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/form_settings.tpl
@@ -28,7 +28,7 @@
 <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>
+			<div class="panel">
 				<h3>
 					<i class="icon-cog"></i> {l s='Settings'}
 				</h3>
@@ -57,12 +57,12 @@
 				<button type="submit" class="btn btn-default pull-right" name="submitSettings" id="submitSettings">
 					<i class="icon-save"></i> {l s='Save'}
 				</button>
-			</fieldset>
+			</div>
 		</form>
 	</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>
+			<div class="panel">
 				<h3>
 					<i class="icon-fullscreen"></i> {l s='Indexation'}
 				</h3>
@@ -70,12 +70,12 @@
 				<button type="submit" class="btn btn-default pull-right" name="submitRefreshIndex" id="submitRefreshIndex">
 					<i class="icon-refresh"></i> {l s='Refresh index'}
 				</button>
-			</fieldset>
+			</div>
 		</form>
 	</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>
+			<div class="panel">
 				<h3>
 					<i class="icon-briefcase"></i> {l s='Cache'}
 				</h3>
@@ -83,7 +83,7 @@
 				<button type="submit" class="btn btn-default pull-right" name="submitRefreshCache" id="submitRefreshCache">
 					<i class="icon-refresh"></i> {l s='Refresh cache'}
 				</button>
-			</fieldset>
+			</div>
 		</form>
 	</div>
 </div>
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 b6bdb3bec..26fd64f74 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,7 @@
 
 {block name="other_fieldsets"}
 	{if $f == 1}
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-question-sign"></i> {l s='Help'}
 			</h3>
@@ -71,7 +71,7 @@
 					</li>
 				</ul>
 			</div>
-		</fieldset>
+		</div>
 	{/if}
 {/block}
 
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 fff4f7135..ffba8b6da 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,7 +94,7 @@
 		}
 	</script>
 
-	<fieldset>
+	<div class="panel">
 		<h3>
 			<i class="icon-bar-chart"></i> {l s='Statistics'}
 		</h3>
@@ -123,7 +123,7 @@
 				</div>
 			</div>
 		</form>
-	</fieldset>
+	</div>
 	<script type="text/javascript">
 		updateConversionRate(0);
 	</script>
diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
index 6695b0b89..06328785f 100644
--- a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl
@@ -28,7 +28,7 @@
 {block name="after"}
 <div class="row">
 	<div class="col-lg-3">
-		<fieldset>
+		<div class="panel">
 			<h3><i class="icon-list"></i> {l s='List of MySQL Tables'}</h3>
 			<div class="row" id="selectTables">
 				<select id="table" size="10">
@@ -40,15 +40,15 @@
 			<div class="row">
 				<button type="button" id="add_table" class="btn btn-default">{l s='Add table'}</button>
 			</div>
-		</fieldset>
+		</div>
 	</div>
 	<div class="col-lg-9">
-		<fieldset>
+		<div class="panel">
 			<h3><i class="icon-list"></i> {l s='List of tables attributes'}</h3>
 			<div id="listAttributes">
 				<div class="alert alert-warning">{l s='Please choose a MySQL table'}</div>
 			</div>
-		</fieldset>
+		</div>
 	</div>
 </div>
 	
diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl
index aaf8ed2bf..a589be50a 100644
--- a/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/view/view.tpl
@@ -26,7 +26,7 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-cog"></i> {l s='Request result'}</h3>
 	{if isset($view['error'])}
 		<div class="alert alert-warning">{l s='This request has no result.'}</div>
@@ -63,5 +63,5 @@
 			});
 		</script>
 	{/if}
-</fieldset>
+</div>
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/shipping/content.tpl b/admin-dev/themes/default/template/controllers/shipping/content.tpl
index 808efda4f..a74baa816 100644
--- a/admin-dev/themes/default/template/controllers/shipping/content.tpl
+++ b/admin-dev/themes/default/template/controllers/shipping/content.tpl
@@ -54,7 +54,7 @@
 
 
 <form action="{$action_fees}" id="fees" name="fees" method="post" class="form-horizontal">
-	<fieldset>
+	<div class="panel">
 		<h3>
 			<i class="icon-truck"></i>
 			{l s='Fees by carrier, geographical zone and ranges'}
@@ -138,5 +138,5 @@
 			</table>
 		{/if}
 		<input type="hidden" name="id_carrier" value="{$id_carrier}" />
-	</fieldset>
+	</div>
 </form>
diff --git a/admin-dev/themes/default/template/controllers/shop/content.tpl b/admin-dev/themes/default/template/controllers/shop/content.tpl
index 25bf07275..18b43296f 100644
--- a/admin-dev/themes/default/template/controllers/shop/content.tpl
+++ b/admin-dev/themes/default/template/controllers/shop/content.tpl
@@ -49,10 +49,10 @@
 
 <div class="row">
 	<div class="col-lg-4">
-		<fieldset>
+		<div class="panel">
 			<h3><i class="icon-sitemap"></i> {l s='Multistore tree'}</h3>
 			{include file="controllers/shop/tree.tpl" selected_tree_id=$selected_tree_id}	
-		</fieldset>
+		</div>
 	</div>
 	<div class="col-lg-8">{$content}</div>
 </div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
index 180737c1d..73644d5b8 100644
--- a/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
@@ -70,7 +70,7 @@
 
 {block name="other_fieldsets"}
 	{if isset($form_import)}
-	<fieldset>
+	<div class="panel">
 		<h3><i class="icon-cloud-download"></i> {l s='Import data from another shop'}</h3>
 		{foreach $form_import as $key => $field}
 		<div class="row">
@@ -118,7 +118,7 @@
 		{/if}
 		</div>			
 		{/foreach}
-	</fieldset>
+	</div>
 	{/if}
 {/block}
 
diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
index 059808ace..82308a6fe 100755
--- a/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/specific_price_rule/helpers/form/form.tpl
@@ -33,7 +33,7 @@
 	<i class="icon-plus-sign"></i> {l s='Add a new condition group'}
 </a>
 <div class="clearfix">&nbsp;</div>
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-tasks"></i> {l s='Conditions'}</h3>
 	<form class="form-horizontal">
 		<div class="row">
@@ -145,7 +145,7 @@
 {if !$is_multishop}
 	<input type="hidden" name="id_shop" value=1 />
 {/if}
-</fieldset>
+</div>
 {/block}
 
 {block name="script"}
@@ -192,9 +192,9 @@ function delete_condition(condition)
 function new_condition_group()
 {
 	last_condition_group++;
-	var html = '<fieldset id="condition_group_'+last_condition_group+'" class="condition_group alert-info"><h3><i class="icon-tasks"></i> {l s='Condition group'} '+last_condition_group+'</h3>';
+	var html = '<div id="condition_group_'+last_condition_group+'" class="panel condition_group alert-info"><h3><i class="icon-tasks"></i> {l s='Condition group'} '+last_condition_group+'</h3>';
 		html += '<table class="table alert-info"><thead><tr><th class="fixed-width-md"><span class="title_box">{l s='Type'}</span></th><th><span class="title_box">{l s='Value'}</span></th><th></th></tr></thead><tbody></tbody></table>';
-		html += '</fieldset><div class="row condition_separator text-center">{l s='OR'}</div><div class="clearfix">&nbsp;</div>';
+		html += '</div><div class="row condition_separator text-center">{l s='OR'}</div><div class="clearfix">&nbsp;</div>';
 	$('#condition_group_list').append(html);
 	toggle_condition_group(last_condition_group);
 }
diff --git a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
index fba08da78..6b4925c6a 100644
--- a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
@@ -25,7 +25,7 @@
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 {if isset($show_filter) && $show_filter}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
 	<div class="filter-stock-extended">
 		<form id="stock_cover" type="get" class="form-horizontal">
@@ -63,6 +63,6 @@
 			</div>
 		</form>
 	</div>
-</fieldset>
+</div>
 {/if}
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
index 3c5e5312a..3cbfc576a 100644
--- a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
@@ -25,7 +25,7 @@
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 {if isset($show_filter) && $show_filter}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
 	<div class="filter-stock">
 		<form id="stock_instant_state" type="get" class="form-horizontal">
@@ -45,6 +45,6 @@
 		{/if}
 		</form>
 	</div>
-</fieldset>
+</div>
 {/if}
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
index 0c383ddde..581c276a7 100644
--- a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
@@ -25,7 +25,7 @@
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 	{if count($list_warehouses) > 0}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
 	<div class="filter-stock">
 			<form type="get" id="stock-movement-filter" class="form-horizontal">
@@ -44,5 +44,5 @@
 			</form>
 		{/if}
 	</div>
-</fieldset>
+</div>
 {/block}
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
index 74e31f9f5..5e0adffe6 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/form/form.tpl
@@ -30,7 +30,7 @@
 	<input type="hidden" id="product_ids_to_delete" name="product_ids_to_delete" value="{$product_ids_to_delete}" />
 	<input type="hidden" name="updatesupply_order" value="1" />
 
-	<fieldset>
+	<div class="panel">
 		<h3><i class="icon-cogs"></i> {l s='Manage the products you want to order from the supplier.'}</h3>
 		<div class="alert alert-info">{l s='To add a product to the order, type the first letters of the product name, then select it from the drop-down list.'}</div>
 		<div class="row">
@@ -107,7 +107,7 @@
 				{/foreach}
 			</tbody>
 		</table>
-	</fieldset>
+	</div>
 
 	<script type="text/javascript">
 		product_infos = null;
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
index aaff96977..e63fce210 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
@@ -25,7 +25,7 @@
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 {if isset($warehouses) && count($warehouses) > 0 && isset($filter_status)}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
 	<div class="filter-stock-extended">
 		<form id="supply_orders" type="get" class="form-horizontal">
@@ -50,6 +50,6 @@
 			</div>
 		</form>
 	</div>
-</fieldset>
+</div>
 {/if}
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
index 9c6163a3f..6045f32c1 100755
--- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl
@@ -28,7 +28,7 @@
 
 <div class="row">
 	<div class="col-lg-6">
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-info"></i>
 				{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'}
@@ -63,10 +63,10 @@
 					<td>{$supply_order_discount_rate} %</td>
 				</tr>
 			</table>
-		</fieldset>
+		</div>
 	</div>
 	<div class="col-lg-6">
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-th-list"></i>
 				{if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Summary'}
@@ -105,7 +105,7 @@
 					</tr>
 				</tbody>
 			</table>
-		</fieldset>
+		</div>
 	</div>
 </div>
 {$supply_order_detail_content}
diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
index 622afaa63..369408d77 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
@@ -63,10 +63,10 @@ $(document).ready(function() {
 
 {block name="other_fieldsets"}							
 {if isset($supply_order_state) && $supply_order_state->editable == false && isset($supply_order)}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-download-alt"></i> {l s='Print the supply order form'}</h3>
 	<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" onclick="return !window.open(this.href);" title="Export as PDF" class="btn btn-default"><i class="icon-download-alt"></i> {l s='Click here to download the supply order form.'}.</a>
-</fieldset>
+</div>
 {/if}
 
 {/block}
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_footer.tpl
index ffe89a413..150d2a409 100644
--- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_footer.tpl
@@ -87,7 +87,7 @@
 
 {if !$simple_header}
 		<input type="hidden" name="token" value="{$token}" />
-	</fieldset>
+	</div>
 </form>
 {/if}
 
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
index 2f3fcf298..cdb7fce5c 100644
--- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
@@ -33,7 +33,7 @@
 {/if}
 
 <form method="post" action="{$currentIndex}&{$identifier}&token={$token}&id_tax_rules_group={$id_tax_rules_group}&updatetax_rules_group#{$table}" class="form">
-	<fieldset>
+	<div class="panel">
 	<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 	<div class="table-responsive clearfix">
 		<table
diff --git a/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
index 3c3eb85d6..689686077 100644
--- a/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl
@@ -50,7 +50,7 @@
 {/block}
 
 {block name="after"}
-	<fieldset id="prestastore-content"></fieldset>
+	<div class="panel" id="prestastore-content"></div>
 	<script type="text/javascript">
 		$.ajax({
 			type: 'POST',
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
index a7363fcbf..25898c680 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
@@ -61,7 +61,7 @@
 	</script>
 	
 	<form method="get" action="index.php" id="typeTranslationForm" class="form-horizontal">
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-file-text"></i>
 				{l s='Modify translations'}
@@ -113,10 +113,10 @@
 				</div>
 				<input type="hidden" name="token" value="{$token}" />
 			</div>
-		</fieldset>
+		</div>
 	</form>
 	<form action="{$url_submit}" method="post" enctype="multipart/form-data" class="form-horizontal">
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-download"></i>
 				{l s='Add / Update a language'}
@@ -147,11 +147,11 @@
 					<p class="text-danger">{l s='Cannot connect to the PrestaShop website to get the language list.'}</p>
 				{/if}				
 			</div>
-		</fieldset>
+		</div>
 	</form>
 	
 	<form action="{$url_submit}" method="post" enctype="multipart/form-data" class="form-horizontal">
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-download"></i>
 				{l s='Import a language pack manually'}
@@ -181,11 +181,11 @@
 					<input type="submit" value="{l s='   Import   '}" name="submitImport" class="btn btn-default" />
 				</div>
 			</div>
-		</fieldset>
+		</div>
 	</form>
 	
 	<form action="{$url_submit}" method="post" enctype="multipart/form-data" class="form-horizontal">
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-upload"></i>
 				{l s='Export a language'}
@@ -219,11 +219,11 @@
 					<input type="submit" class="btn btn-default" name="submitExport" value="{l s='Export'}" />
 				</div>
 			</div>
-		</fieldset>
+		</div>
 	</form>
 	
 	<form action="{$url_submit}" method="post" class="form-horizontal">
-		<fieldset>
+		<div class="panel">
 			<h3>
 				<i class="icon-copy"></i>
 				{l s='Copy'}
@@ -278,6 +278,6 @@
 					{l s='Language files must be complete to allow copying of translations.'}
 				</p>
 			</div>
-		</fieldset>
+		</div>
 	</form>
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
index ea41de246..78c7958a8 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_errors.tpl
@@ -47,10 +47,10 @@
 		<div class="alert alert-info">
 			{l s='Some sentences to translate use this syntax: %s... These are variables, and PrestaShop take care of replacing them before displaying your translation. You must leave these in your translations, and place them appropriately in your sentence.' sprintf='%d, %s, %1$s, %2$d'}
 		</div>
-		<fieldset>
+		<div class="panel">
 			<p>{l s='Expressions to translate:'} <span class="badge">{l s='%d' sprintf=$count}</span></p>
 			<p>{l s='Total missing expresssions:'} <span class="badge">{l s='%d' sprintf=$missing_translations|array_sum}</p>
-		</fieldset>
+		</div>
 
 		<script type="text/javascript">
 			$(document).ready(function(){
@@ -80,7 +80,7 @@
 		</div>
 
 		<form method="post" id="{$table}_form" action="{$url_submit}" class="form-horizontal">
-			<fieldset>
+			<div class="panel">
 				{*{$auto_translate}$*}
 				<input type="hidden" name="lang" value="{$lang}" />
 				<input type="hidden" name="type" value="{$type}" />
@@ -105,7 +105,7 @@
 						</tr>
 					{/foreach}
 				</table>
-			</fieldset>
+			</div>
 		</form>
 	{/if}
 
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
index 1b277b387..d41eddd1a 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
@@ -50,13 +50,13 @@
 				<li>{l s='Some sentences to translate use this syntax: %s... These are variables, and PrestaShop take care of replacing them before displaying your translation. You must leave these in your translations, and place them appropriately in your sentence.' sprintf='%d, %s, %1$s, %2$d'}</li>
 			</ul>
 		</div>
-		<fieldset>
+		<div class="panel">
 			<p>{l s='Expressions to translate:'} <span class="badge">{l s='%d' sprintf=$count}</span></p>
 			<p>{l s='Total missing expresssions:'} <span class="badge">{l s='%d' sprintf=$missing_translations|array_sum}</p>
-		</fieldset>
+		</div>
 
 		<form method="post" id="{$table}_form" action="{$url_submit}" class="form-horizontal">
-			<fieldset>
+			<div class="panel">
 				{$toggle_button}
 				<input type="hidden" name="lang" value="{$lang}" />
 				<input type="hidden" name="type" value="{$type}" />
@@ -89,10 +89,10 @@
 						</ul>
 					</div>
 				</div>
-			</fieldset>
+			</div>
 			{foreach $tabsArray as $k => $newLang}
 				{if !empty($newLang)}
-					<fieldset>
+					<div class="panel">
 						<h3 onclick="$('#{$k}-tpl').slideToggle();">
 							{$k} - <span class="badge">{$newLang|count}</span> {l s='expressions'}
 							{if isset($missing_translations[$k])} <span class="label label-danger">{$missing_translations[$k]} {l s='missing'}</span>{/if}
@@ -125,8 +125,8 @@
 									</tr>
 								{/foreach}
 							</table>
-							</div>
-					</fieldset>
+						</div>
+					</div>
 				{/if}
 			{/foreach}
 		</form>
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
index 122d44a12..cfd64b9c7 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_mails.tpl
@@ -54,7 +54,7 @@
 		</div>
 
 		<form method="post" id="{$table}_form" action="{$url_submit}" class="form-horizontal">
-			<fieldset>
+			<div class="panel">
 				{$toggle_button}
 				<input type="hidden" name="lang" value="{$lang}" />
 				<input type="hidden" name="type" value="{$type}" />
@@ -87,16 +87,16 @@
 						</ul>
 					</div>
 				</div>
-			</fieldset>
-			<fieldset>
+			</div>
+			<div class="panel">
 				<h3>
 					<i class="icon-envelope"></i>
 					{l s='Core emails:'}
 				</h3>
 				<p>{l s='List of emails in the folder'} <strong>"mails/{$lang|strtolower}/"</strong></p>
 				{$mail_content}
-			</fieldset>
-			<fieldset>
+			</div>
+			<div class="panel">
 				<h3>
 					<i class="icon-envelope"></i>
 					{l s='Module emails:'}
@@ -105,7 +105,7 @@
 				{foreach $module_mails as $module_name => $mails}
 					{$mails['display']}
 				{/foreach}
-			</fieldset>
+			</div>
 		</form>
 	{/if}
 
diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
index e70cd8624..1bb2348ae 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
@@ -50,10 +50,10 @@
 				<li>{l s='Some sentences to translate use this syntax: %s... These are variables, and PrestaShop take care of replacing them before displaying your translation. You must leave these in your translations, and place them appropriately in your sentence.' sprintf='%d, %s, %1$s, %2$d'}</li>
 			</ul>
 		</div>
-		<fieldset>
+		<div class="panel">
 			<p>{l s='Expressions to translate:'} <span class="badge">{l s='%d' sprintf=$count}</span></p>
 			<p>{l s='Total missing expresssions:'} <span class="badge">{l s='%d' sprintf=$missing_translations}</p>
-		</fieldset>
+		</div>
 
 		<script type="text/javascript">
 			$(document).ready(function(){
@@ -105,7 +105,7 @@
 							{else}
 								{$missing_translations_module = 0}
 							{/if}
-							<fieldset>
+							<div class="panel">
 								<h3 onclick="$('#{$theme_name}_{$module_name}_{$template_name|replace:'.':'_'}').slideToggle();">{if $theme_name}{$theme_name} - {/if}{$template_name}
 									<span class="badge">{$newLang|count}</span> {l s='expressions'} <span class="label label-danger">{$missing_translations_module}</span>
 								</h3>
@@ -140,7 +140,7 @@
 										{/foreach}
 									</table>
 								</div>
-							</fieldset>
+							</div>
 						{/if}
 					{/foreach}
 				{/foreach}
diff --git a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
index c1e966a54..0ba58ef22 100644
--- a/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/warehouses/helpers/view/view.tpl
@@ -26,7 +26,7 @@
 {extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
 {if isset($warehouse)}
-<fieldset>
+<div class="panel">
 	<h3><i class="icon-cogs"></i> {l s='General information'}</h3>
 	<div class="form-horizontal">
 		<div class="row">
@@ -70,8 +70,8 @@
 			<div class="col-lg-9"><p class="form-control-static">{$warehouse_value}</p></div>
 		</div>
 	</div>
-</fieldset>
-<fieldset>
+</div>
+<div class="panel">
 	<h3><i class="icon-sitemap"></i> {l s='Shops:'}</h3>
 	{if isset($shops) && count($shops) > 0}
 	<div class="alert alert-info">{l s='The following are the shops associated with this warehouse.'}</div>
@@ -94,16 +94,16 @@
 	{else}
 	<div class="alert alert-warning">{l s='Currently there is no shop associated with this warehouse.'}</div>
 	{/if}
-</fieldset>
-<fieldset>
+</div>
+<div class="panel">
 	<h3><i class="icon-archive"></i> {l s='Stock'}</h3>
 	<a class="btn btn-link" href="index.php?controller=adminstockinstantstate&id_warehouse={$warehouse->id}&token={getAdminToken tab='AdminStockInstantState'}">{l s='See products details'} <i class="icon-external-link-sign"></i></a>
-</fieldset>
-<fieldset>
+</div>
+<div class="panel">
 	<h3><i class="icon-reorder"></i> {l s='History'}</h3>
 	<a class="btn btn-link" href="index.php?controller=adminstockmvt&id_warehouse={$warehouse->id}&token={getAdminToken tab='AdminStockMvt'}">{l s='See warehouse\'s activity details'} <i class="icon-external-link-sign"></i></a>
-</fieldset>
+</div class="panel">
 {else}
-	<fieldset><div class="alert alert danger">{l s='This warehouse does not exist.'}</div></fieldset>
+	<div class="panel"><div class="alert alert danger">{l s='This warehouse does not exist.'}</div></div>
 {/if}
 {/block}
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 397b224e9..0001eb08f 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -293,12 +293,12 @@
 			</div>
 {/if}
 {if $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
-			<fieldset class="multishop_toolbar">
+			<div class="panel multishop_toolbar">
 				<div class="col-lg-12 form-horizontal">
 					<label class="control-label col-lg-3"><i class="icon-sitemap"></i> {l s='Multistore configuration for'}</label>
 					<div class="col-lg-9">{$shop_list}</div>
 				</div>
-			</fieldset>
+			</div>
 {/if}
 
 {* end display_header*}	
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 0c56d6ab5..b54caccd3 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -31,7 +31,7 @@
 	{/if}
 	{foreach $fields as $f => $fieldset}
 		{block name="fieldset"}
-		<fieldset id="fieldset_{$f}">
+		<div class="panel" id="fieldset_{$f}">
 			{foreach $fieldset.form as $key => $field}
 				{if $key == 'legend'}
 					<h3>
@@ -657,7 +657,7 @@
 		{block name="footer"}
 		{include file="footer_toolbar.tpl"}
 		{/block}
-		</fieldset>
+		</div>
 		{/block}
 		{block name="other_fieldsets"}{/block}
 	{/foreach}
diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
index d867bfccb..b1b1515db 100644
--- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl
@@ -134,10 +134,10 @@
 
 {if !$simple_header}
 		<input type="hidden" name="token" value="{$token}" />
-	</fieldset>
+	</div>
 </form>
 {else}
-	</fieldset>
+	</div>
 {/if}
 
 {hook h='displayAdminListAfter'}
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 52966c282..94d650a99 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -75,7 +75,7 @@
 {if !$simple_header}
 <form method="post" action="{$action}" class="form-horizontal">
 	{block name="override_form_extra"}{/block}
-	<fieldset class="col-lg-12">
+	<div class="panel col-lg-12">
 		<div class="panel-heading">
 			{if isset($icon)}<i class="{$icon}"></i> {/if}{if is_array($title)}{$title|end}{else}{$title}{/if}
 			{if isset($toolbar_btn) && count($toolbar_btn) >0}
@@ -176,7 +176,7 @@
 		</div>
 {/if}
 {if $simple_header}
-<fieldset class="col-lg-12">
+<div class="panel col-lg-12">
 	{if isset($title)}<h3>{if isset($icon)}<i class="{$icon}"></i> {/if}{if is_array($title)}{$title|end}{else}{$title}{/if}</h3>{/if}
 {/if}
 	<div class="table-responsive clearfix{if isset($use_overflow) && $use_overflow} overflow-y{/if}">
diff --git a/admin-dev/themes/default/template/helpers/modules_list/list.tpl b/admin-dev/themes/default/template/helpers/modules_list/list.tpl
index 64de42298..02925e1f0 100644
--- a/admin-dev/themes/default/template/helpers/modules_list/list.tpl
+++ b/admin-dev/themes/default/template/helpers/modules_list/list.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<fieldset>
+<div class="panel">
 	<h3>
 		<i class="icon-list-ul"></i>
 		{l s='Modules list'}
@@ -51,4 +51,4 @@
 			{/if}
 		</div>
 	</div>
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index 49436b270..546687b79 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -38,7 +38,7 @@
 	enctype="multipart/form-data" class="form-horizontal">
 	{foreach $option_list AS $category => $categoryData}
 		{if isset($categoryData['top'])}{$categoryData['top']}{/if}
-		<fieldset {if isset($categoryData['class'])}class="{$categoryData['class']}"{/if} id="{$table}_fieldset_{$category}">
+		<div class="panel {if isset($categoryData['class'])}{$categoryData['class']}{/if}" id="{$table}_fieldset_{$category}">
 			{* Options category title *}
 			<h3>
 				<i class="{if isset($categoryData['icon'])}{$categoryData['icon']}{else}icon-cogs{/if}"></i>
@@ -377,7 +377,7 @@
 			{block name="footer"}
 			{include file="footer_toolbar.tpl"}
 			{/block}
-		</fieldset>
+		</div>
 	{/foreach}
 	{hook h='displayAdminOptions'}
 	{if isset($name_controller)}
diff --git a/admin-dev/themes/default/template/helpers/required_fields.tpl b/admin-dev/themes/default/template/helpers/required_fields.tpl
index 911fdcc8b..3efd767b6 100644
--- a/admin-dev/themes/default/template/helpers/required_fields.tpl
+++ b/admin-dev/themes/default/template/helpers/required_fields.tpl
@@ -27,7 +27,7 @@
 	<i class="icon-plus-sign"></i> {l s='Set required fields for this section'}
 </a>
 <div class="clearfix">&nbsp;</div>
-<fieldset style="display:none" class="requiredFieldsParameters">
+<div style="display:none" class="panel requiredFieldsParameters">
 	<h3><i class="icon-asterisk"></i> {l s='Required Fields'}</h3>
 	<form name="updateFields" action="{$current}&submitFields=1&token={$token}" method="post">
 		<div class="alert alert-info">
@@ -59,4 +59,4 @@
 		</table>
 		<button class="btn btn-primary pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button>
 	</form>
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file