diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css
index 4acb4d5c0..47b3d57af 100644
--- a/admin-dev/themes/default/admin.css
+++ b/admin-dev/themes/default/admin.css
@@ -27,6 +27,8 @@ select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disab
 	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
 	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap;}
 .button[disabled=disabled]{color:#8C8C8C}
+.button.bt-icon { display:inline-block; margin-bottom:7px;}
+.button.bt-icon span {padding-left:5px;}
 input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .button:hover{border:1px solid #939393;}
 .button:active{border:1px solid #939393;}
@@ -151,7 +153,7 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 48px; margin: 0; padding: 0;}
 .toolbarBox ul.cc_button {float:right;margin:0;padding:0;}
 .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
-.toolbarBox a.toolbar_btn {   border:1px solid #f8f8f8; border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
+.toolbarBox a.toolbar_btn {   border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
 .toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;}
 .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;}
 .toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl
index 1f44e7c70..88012e412 100644
--- a/admin-dev/themes/template/products/combinations.tpl
+++ b/admin-dev/themes/template/products/combinations.tpl
@@ -43,11 +43,12 @@
 	);
 {/foreach}
 </script>
-<h4>{l s='Add or modify combinations for this product'}</h4> {l s='or go to'}
-		&nbsp;<a href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}" onclick="return confirm('{l s='Are you sure you want to delete entered product information?'}');"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" />&nbsp;{l s='Product combinations generator'}</a>
+<h4>{l s='Add or modify combinations for this product'}</h4>
+<div class="separation"></div> {l s='or go to'}
+		&nbsp;<a class="button bt-icon" href="index.php?tab=AdminAttributeGenerator&id_product={$product->id}&attributegenerator&token={$token_generator}" onclick="return confirm('{l s='Are you sure you want to delete entered product information?'}');"><img src="../img/admin/appearance.gif" alt="combinations_generator" class="middle" title="{l s='Product combinations generator'}" /><span>{l s='Product combinations generator'}</span></a>
 <div class="separation"></div>
-<a href="#" onclick="$('#add_new_combination').slideToggle();return false;">
-	<img src="../img/admin/add.gif" alt="" />{l s='Add a new combination'}
+<a class="button bt-icon" href="#" onclick="$('#add_new_combination').slideToggle();return false;">
+	<img src="../img/admin/add.gif" alt="" /><span>{l s='Add a new combination'}</span>
 </a>
 
 <div id="add_new_combination" style="display: none;">
diff --git a/admin-dev/themes/template/products/features.tpl b/admin-dev/themes/template/products/features.tpl
index 2ae2fb37c..3a718b0c6 100644
--- a/admin-dev/themes/template/products/features.tpl
+++ b/admin-dev/themes/template/products/features.tpl
@@ -1,7 +1,5 @@
-<table cellpadding="5">
-	<tr>
-		<td colspan="2">
-			<h4>{l s='Assign features to this product:'}</h4>
+<h4>{l s='Assign features to this product:'}</h4>
+<div class="separation"></div>
 			<ul>
 				<li>{l s='You can specify a value for each relevant feature regarding this product, empty fields will not be displayed.'}</li>
 				<li>{l s='You can either set a specific value, or select among existing pre-defined values you added previously.'}</li>
@@ -9,9 +7,7 @@
 		</td>
 	</tr>
 </table>
-<div class="separation"></div><br />
-
-
+<br />
 <table border="0" cellpadding="0" cellspacing="0" class="table" style="width:900px;">
 	<tr>
 		<th>{l s='Feature'}</td>
diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl
index 6dbc41351..9ef2e7853 100644
--- a/admin-dev/themes/template/products/informations.tpl
+++ b/admin-dev/themes/template/products/informations.tpl
@@ -133,12 +133,11 @@
 	<td class="col-left"><label>{l s='Status:' }</label></td>
 	<td style="padding-bottom:5px;">
 		<input style="float:left;" onclick="toggleDraftWarning(false);showOptions(true);" type="radio" name="active" id="active_on" value="1" {if $product->active}checked="checked" {/if} />
-		<label for="active_on" class="t"><img src="../img/admin/enabled.gif" alt="{l s='Enabled'}"
-			title="{l s='Enabled'}" style="float:left; padding:0px 5px 0px 5px;" />
+		<label for="active_on" class="t">
 		{l s='Enabled'}</label>
 		<br class="clear" />
 		<input style="float:left;" onclick="toggleDraftWarning(true);showOptions(false);"  type="radio" name="active" id="active_off" value="0" {if !$product->active}checked="checked"{/if} />
-		<label for="active_off" class="t"><img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="float:left; padding:0px 5px 0px 5px" />{l s='Disabled'} </label>
+		<label for="active_off" class="t">{l s='Disabled'} </label>
 	</td>
 </tr>
 	{if $feature_shop_active}
@@ -168,13 +167,13 @@
 				});
 			});
 			</script>
-		<label for="available_for_order" class="t"><img src="../img/admin/products.gif" alt="{l s='available for order'}" title="{l s='available for order'}" style="float:left; padding:0px 5px 0px 5px" />{l s='available for order'}</label>
+		<label for="available_for_order" class="t">{l s='available for order'}</label>
 		<br class="clear" />
 		<input style="float: left;" type="checkbox" name="show_price" id="show_price" value="1" {if $product->show_price}checked="checked"{/if} />
-		<label for="show_price" class="t"><img src="../img/admin/gold.gif" alt="{l s='display price'}" title="{l s='show price'}" style="float:left; padding:0px 5px 0px 5px" />{l s='show price'}</label>
+		<label for="show_price" class="t">{l s='show price'}</label>
 		<br class="clear" />
 		<input style="float: left;" type="checkbox" name="online_only" id="online_only" value="1" {if $product->online_only}checked="checked"{/if} />
-		<label for="online_only" class="t"><img src="../img/admin/basket_error.png" alt="{l s='online only'}" title="{l s='online only'}" style="float:left; padding:0px 5px 0px 5px" />{l s='online only (not sold in store)'}</label>
+		<label for="online_only" class="t">{l s='online only (not sold in store)'}</label>
 		</td>
 	</tr>
 	<tr>
diff --git a/admin-dev/themes/template/products/prices.tpl b/admin-dev/themes/template/products/prices.tpl
index a6e9732dc..3ed153fec 100644
--- a/admin-dev/themes/template/products/prices.tpl
+++ b/admin-dev/themes/template/products/prices.tpl
@@ -7,7 +7,7 @@ var product_prices = new Array();
 	product_prices['{$combination.id_product_attribute}'] = '{$combination.price}';
 {/foreach}
 </script>
-<a href="#" onclick="$('#add_specific_price').slideToggle();return false;"><img src="../img/admin/add.gif" alt="" />{l s='Add a new specific price'}</a>
+<a class="button bt-icon" href="#" onclick="$('#add_specific_price').slideToggle();return false;"><img src="../img/admin/add.gif" alt="" /><span>{l s='Add a new specific price'}</span></a>
 <br/>
 <div id="add_specific_price" style="display: none;">
 	<input type="hidden" name="sp_id_shop" value="0" />
diff --git a/admin-dev/themes/template/products/suppliers.tpl b/admin-dev/themes/template/products/suppliers.tpl
index 19ab4cdbb..03759af78 100644
--- a/admin-dev/themes/template/products/suppliers.tpl
+++ b/admin-dev/themes/template/products/suppliers.tpl
@@ -7,8 +7,8 @@
 <div class="separation"></div>
 <p>{l s='Please choose the suppliers associated to this product, and the default one.'}</p>
 {assign var=confirm value="Are you sure you want to delete entered product information?"}
-<a href="{$link->getAdminLink('AdminSuppliers')}&addsupplier" onclick="return confirm(' {$confirm} ')">
-	<img src="../img/admin/add.gif" alt="{l s='Create new supplier'}" title="{l s='Create new supplier'}" /> <b>{l s='Create new supplier'}</b>
+<a class="button bt-icon" href="{$link->getAdminLink('AdminSuppliers')}&addsupplier" onclick="return confirm(' {$confirm} ')">
+	<img src="../img/admin/add.gif" alt="{l s='Create new supplier'}" title="{l s='Create new supplier'}" /><span>{l s='Create new supplier'}</span>
 </a>
 <table cellpadding="5" style="width:100%">
 	<tbody>
@@ -45,7 +45,9 @@
 	{foreach from=$associated_suppliers item=supplier}
 	    <h3 style="margin-bottom:0;"><a href="#">{$supplier->name}</a></h3>
 	    <div style="display:block;">
+
 			<table cellpadding="10" cellspacing="0" class="table">
+
 				<thead>
 					<tr>
 						<th>{l s='product name'}</th>
diff --git a/admin-dev/themes/template/products/warehouses.tpl b/admin-dev/themes/template/products/warehouses.tpl
index e6fd57ae1..6ce0d232e 100644
--- a/admin-dev/themes/template/products/warehouses.tpl
+++ b/admin-dev/themes/template/products/warehouses.tpl
@@ -9,8 +9,8 @@
 
 {assign var=confirm value="Are you sure you want to delete entered product information?"}
 
-<a href="{$link->getAdminLink('AdminWarehouses')}&addwarehouse" onclick="return confirm(' {$confirm} ')">
-	<img src="../img/admin/add.gif" alt="{l s='Create new warehouse'}" title="{l s='Create new warehouse'}" /> <b>{l s='Create new warehouse'}</b>
+<a class="button bt-icon" href="{$link->getAdminLink('AdminWarehouses')}&addwarehouse" onclick="return confirm(' {$confirm} ')">
+	<img src="../img/admin/add.gif" alt="{l s='Create new warehouse'}" title="{l s='Create new warehouse'}" /><span>{l s='Create new warehouse'}</span>
 </a>
 
 <div id="warehouse_accordion" style="margin-top:10px; display:block;">
diff --git a/css/admin.css b/css/admin.css
index 942140c05..0a5d8fe7c 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -223,7 +223,7 @@ label {
 label.t {
 	float: none;
 	clear: none;
-	padding: 0px;
+	padding: 0 5px 0;
 	margin: 0px;
 	font-weight: normal;
 	font-size: 12px;