diff --git a/admin-dev/themes/default/template/controllers/modules/filters.tpl b/admin-dev/themes/default/template/controllers/modules/filters.tpl
index c4395c1ea..11a1bc9a4 100644
--- a/admin-dev/themes/default/template/controllers/modules/filters.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/filters.tpl
@@ -62,11 +62,11 @@
 		</select>
 	</span> -->
 	<!-- <span class="pull-right">
-		<button class="btn btn-default btn-small" type="submit" name="resetFilterModules">
+		<button class="btn btn-default " type="submit" name="resetFilterModules">
 			<i class="icon-eraser"></i>
 			{l s='Reset'} 
 		</button>
-		<button class="btn btn-default btn-small" name="filterModules" id="filterModulesButton" type="submit">
+		<button class="btn btn-default " name="filterModules" id="filterModulesButton" type="submit">
 			<i class="icon-filter"></i> 
 			{l s='Filter'}
 		</button>
diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
index a3a2f27d5..e966b516a 100644
--- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
@@ -83,7 +83,7 @@
 							{/if}
 						{elseif get_class($document) eq 'OrderSlip'}
 							#{Configuration::get('PS_CREDIT_SLIP_PREFIX', $current_id_lang)}{'%06d'|sprintf:$document->id}
-						{/if} 	<span class="btn btn-default btn-small">
+						{/if} 	<span class="btn btn-default">
 									<i class="icon-search"></i>
 									{l s='See the document'}
 								</span>
@@ -113,12 +113,12 @@
 					{if get_class($document) eq 'OrderInvoice'}
 						{if !isset($document->is_delivery)}
 							{if $document->getRestPaid()}
-								<a href="#" class="js-set-payment btn btn-default btn-small" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
+								<a href="#" class="js-set-payment btn btn-default" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
 									<i class="icon-pencil"></i>
 									{l s='Set payment form'}
 								</a>
 							{/if}
-							<a href="#" class="btn btn-default btn-small" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
+							<a href="#" class="btn btn-default" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
 								{if $document->note eq ''}
 									<i class="icon-plus-sign-alt"></i>
 									{l s='Add note'}
diff --git a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
index f88070aa3..6c2b4f0fb 100644
--- a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
@@ -24,19 +24,19 @@
 *}
 
 {* Generate HTML code for printing Invoice Icon with link *}
-<span style="width:20px; margin-right:5px;">
+<span>
 {if ($order_state->invoice || $order->invoice_number)}
-	<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
-{else}
-	-
+	<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}">
+		<i class="icon-file-text"></i>
+	</a>
 {/if}
 </span>
 
 {* Generate HTML code for printing Delivery Icon with link *}
-<span style="width:20px;">
+<span>
 {if ($order_state->delivery || $order->delivery_number)}
-	<a target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}"><img src="../img/admin/delivery.gif" alt="delivery" /></a>
-{else}
-	-
+	<a class="btn btn-default"  target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}">
+		<i class="icon-truck"></i>
+	</a>
 {/if}
-</span>
+</span>
\ 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 abe04ba72..f8fd21ad6 100644
--- a/admin-dev/themes/default/template/controllers/products/features.tpl
+++ b/admin-dev/themes/default/template/controllers/products/features.tpl
@@ -62,7 +62,7 @@
 					<input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" />
 					<span>{l s='N/A'} - 
 						<a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature_value&id_feature={$available_feature.id_feature}"
-					 	class="confirm_leave btn btn-link btn-small"><i class="icon-plus-sign"></i> {l s='Add pre-defined values first'} <i class="icon-external-link-sign"></i></a>
+					 	class="confirm_leave btn btn-link"><i class="icon-plus-sign"></i> {l s='Add pre-defined values first'} <i class="icon-external-link-sign"></i></a>
 					</span>
 				{/if}
 				</td>
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index ab37951a2..14565490d 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -258,7 +258,7 @@
 			<ul id="header_employee_box">
 {if {$base_url}}
 				<li>
-					<a href="http://{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">
+					<a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">
 						<i class="icon-eye-open"></i> {l s='View my shop'}
 					</a>
 				</li>
diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index f33c37dce..0c25c1f19 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -135,7 +135,7 @@
 			{/if}</td>
 	{/if}
 	{if $has_actions}
-		<td>
+		<td class="text-right">
 			{assign var='compiled_actions' value=array()}
 			{foreach $actions AS $key => $action}
 				{if isset($tr.$action)}
@@ -149,7 +149,7 @@
 			<div class="btn-group{if $compiled_actions|count > 1} btn-group-action{/if}">
 				{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
 				{if $compiled_actions|count > 1}
-				<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
+				<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 					<span class="caret"></span>&nbsp;
 				</button>
 					<ul class="dropdown-menu">
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 667d15fd9..675ea9d83 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -356,11 +356,11 @@
 						<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 						<span class="pull-right">
 							{if $filters_has_value}
-							<button type="submit" name="submitReset{$list_id}" class="btn btn-warning btn-small">
+							<button type="submit" name="submitReset{$list_id}" class="btn btn-warning">
 								<i class="icon-eraser"></i> {l s='Reset'}
 							</button>
 							{/if}
-							<button type="submit" id="submitFilterButton{$list_id}" name="submitFilter" class="btn btn-default btn-small" />
+							<button type="submit" id="submitFilterButton{$list_id}" name="submitFilter" class="btn btn-default" />
 								<i class="icon-search"></i> {l s='Search'}
 							</button>
 						</span>
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 46d8fe8e8..ffcdd5be2 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -75,13 +75,6 @@ class AdminOrdersControllerCore extends AdminController
 			'align' => 'center',
 			'type' => 'bool',
 			'tmpTableFilter' => true,
-			'icon' => array(
-				0 => 'blank.gif',
-				1 => array(
-					'src' => 'note.png',
-					'alt' => $this->l('First customer order'),
-				)
-			),
 			'orderby' => false
 		),
 		'customer' => array(