diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 9dcc30235..296e929e9 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -2930,7 +2930,7 @@ body { min-height: 100%; height: 100%; font: 400 12px/1.42857 "Open Sans", Helve
 body.display-modal #content, body.display-modal #main { margin: 0; padding: 0; background: #f8f8f8; }
 
 .bootstrap .panel .panel-footer, .bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer, #header_notifs_icon_wrapper .bootstrap .notifs_panel .panel-footer, .bootstrap #dash_version .panel-footer, #header_notifs_icon_wrapper .notifs_panel .bootstrap .panel .notifs_panel_footer, .bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer, #header_notifs_icon_wrapper .bootstrap .notifs_panel .notifs_panel_footer, #header_notifs_icon_wrapper .notifs_panel .bootstrap #dash_version .notifs_panel_footer { margin: 15px -20px -20px; height: 73px; }
-.bootstrap .panel .panel-footer .btn.pull-right, .bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer .btn.pull-right, #header_notifs_icon_wrapper .bootstrap .notifs_panel .panel-footer .btn.pull-right, .bootstrap #dash_version .panel-footer .btn.pull-right, #header_notifs_icon_wrapper .notifs_panel .bootstrap .panel .notifs_panel_footer .btn.pull-right, .bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .btn.pull-right, #header_notifs_icon_wrapper .bootstrap .notifs_panel .notifs_panel_footer .btn.pull-right, #header_notifs_icon_wrapper .notifs_panel .bootstrap #dash_version .notifs_panel_footer .btn.pull-right, #content.bootstrap .panel .panel-footer h3:not(.modal-title) .btn.panel-heading-action, #content.bootstrap h3:not(.modal-title) .panel .panel-footer .btn.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer h3:not(.modal-title) .btn.panel-heading-action, #content.bootstrap h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_panel .panel-footer .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap .notifs_panel .panel-footer h3:not(.modal-title) .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap h3:not(.modal-title) .notifs_panel .panel-footer .btn.panel-heading-action, #content.bootstrap #dash_version .panel-footer h3:not(.modal-title) .btn.panel-heading-action, #content.bootstrap h3:not(.modal-title) #dash_version .panel-footer .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel .notifs_panel_footer h3:not(.modal-title) .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap h3:not(.modal-title) .panel .notifs_panel_footer .btn.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer h3:not(.modal-title) .btn.panel-heading-action, #content.bootstrap h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap .notifs_panel .notifs_panel_footer h3:not(.modal-title) .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap h3:not(.modal-title) .notifs_panel .notifs_panel_footer .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap #dash_version .notifs_panel_footer h3:not(.modal-title) .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap h3:not(.modal-title) #dash_version .notifs_panel_footer .btn.panel-heading-action, #content.bootstrap .panel .panel-footer .panel-heading .btn.panel-heading-action, #content.bootstrap .panel-heading .panel .panel-footer .btn.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer .panel-heading .btn.panel-heading-action, #content.bootstrap .panel-heading #header_notifs_icon_wrapper .notifs_panel .panel-footer .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap .notifs_panel .panel-footer .panel-heading .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap .panel-heading .notifs_panel .panel-footer .btn.panel-heading-action, #content.bootstrap #dash_version .panel-footer .panel-heading .btn.panel-heading-action, #content.bootstrap .panel-heading #dash_version .panel-footer .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel .notifs_panel_footer .panel-heading .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel-heading .panel .notifs_panel_footer .btn.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .panel-heading .btn.panel-heading-action, #content.bootstrap .panel-heading #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap .notifs_panel .notifs_panel_footer .panel-heading .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap .panel-heading .notifs_panel .notifs_panel_footer .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap #dash_version .notifs_panel_footer .panel-heading .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel-heading #dash_version .notifs_panel_footer .btn.panel-heading-action, #content.bootstrap .panel .panel-footer #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .btn.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer .notifs_panel_header .btn.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-footer .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer .notifs_panel_header .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-footer .btn.panel-heading-action, #content.bootstrap #dash_version .panel-footer #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .btn.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .notifs_panel_header .btn.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_panel_footer .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .notifs_panel_header .btn.panel-heading-action, #header_notifs_icon_wrapper #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_panel_footer .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel .panel-footer .notifs_panel_header .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel .panel-footer .btn.panel-heading-action, .bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer #content.bootstrap .notifs_panel_header .btn.panel-heading-action, .bootstrap #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel-footer .btn.panel-heading-action, #header_notifs_icon_wrapper .bootstrap .notifs_panel .panel-footer #content.bootstrap .notifs_panel_header .btn.panel-heading-action, #header_notifs_icon_wrapper .bootstrap .notifs_panel #content.bootstrap .notifs_panel_header .panel-footer .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap #dash_version .panel-footer .notifs_panel_header .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header #dash_version .panel-footer .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel .notifs_panel_footer .notifs_panel_header .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel .notifs_panel_footer .btn.panel-heading-action, .bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer #content.bootstrap .notifs_panel_header .btn.panel-heading-action, .bootstrap #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .notifs_panel_footer .btn.panel-heading-action, #header_notifs_icon_wrapper .bootstrap .notifs_panel .notifs_panel_footer #content.bootstrap .notifs_panel_header .btn.panel-heading-action, #header_notifs_icon_wrapper .bootstrap .notifs_panel #content.bootstrap .notifs_panel_header .notifs_panel_footer .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap #dash_version .notifs_panel_footer .notifs_panel_header .btn.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header #dash_version .notifs_panel_footer .btn.panel-heading-action { margin-left: 3px; }
+.bootstrap .panel .panel-footer .btn.pull-right:not(:first-child), .bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer .btn.pull-right:not(:first-child), #header_notifs_icon_wrapper .bootstrap .notifs_panel .panel-footer .btn.pull-right:not(:first-child), .bootstrap #dash_version .panel-footer .btn.pull-right:not(:first-child), #header_notifs_icon_wrapper .notifs_panel .bootstrap .panel .notifs_panel_footer .btn.pull-right:not(:first-child), .bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .btn.pull-right:not(:first-child), #header_notifs_icon_wrapper .bootstrap .notifs_panel .notifs_panel_footer .btn.pull-right:not(:first-child), #header_notifs_icon_wrapper .notifs_panel .bootstrap #dash_version .notifs_panel_footer .btn.pull-right:not(:first-child), #content.bootstrap .panel .panel-footer h3:not(.modal-title) .btn.panel-heading-action:not(:first-child), #content.bootstrap h3:not(.modal-title) .panel .panel-footer .btn.panel-heading-action:not(:first-child), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer h3:not(.modal-title) .btn.panel-heading-action:not(:first-child), #content.bootstrap h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_panel .panel-footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap .notifs_panel .panel-footer h3:not(.modal-title) .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap h3:not(.modal-title) .notifs_panel .panel-footer .btn.panel-heading-action:not(:first-child), #content.bootstrap #dash_version .panel-footer h3:not(.modal-title) .btn.panel-heading-action:not(:first-child), #content.bootstrap h3:not(.modal-title) #dash_version .panel-footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel .notifs_panel_footer h3:not(.modal-title) .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap h3:not(.modal-title) .panel .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer h3:not(.modal-title) .btn.panel-heading-action:not(:first-child), #content.bootstrap h3:not(.modal-title) #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap .notifs_panel .notifs_panel_footer h3:not(.modal-title) .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap h3:not(.modal-title) .notifs_panel .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap #dash_version .notifs_panel_footer h3:not(.modal-title) .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap h3:not(.modal-title) #dash_version .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #content.bootstrap .panel .panel-footer .panel-heading .btn.panel-heading-action:not(:first-child), #content.bootstrap .panel-heading .panel .panel-footer .btn.panel-heading-action:not(:first-child), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer .panel-heading .btn.panel-heading-action:not(:first-child), #content.bootstrap .panel-heading #header_notifs_icon_wrapper .notifs_panel .panel-footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap .notifs_panel .panel-footer .panel-heading .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap .panel-heading .notifs_panel .panel-footer .btn.panel-heading-action:not(:first-child), #content.bootstrap #dash_version .panel-footer .panel-heading .btn.panel-heading-action:not(:first-child), #content.bootstrap .panel-heading #dash_version .panel-footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel .notifs_panel_footer .panel-heading .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel-heading .panel .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .panel-heading .btn.panel-heading-action:not(:first-child), #content.bootstrap .panel-heading #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap .notifs_panel .notifs_panel_footer .panel-heading .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap .panel-heading .notifs_panel .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap #dash_version .notifs_panel_footer .panel-heading .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel-heading #dash_version .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #content.bootstrap .panel .panel-footer #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .btn.panel-heading-action:not(:first-child), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer .notifs_panel_header .btn.panel-heading-action:not(:first-child), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer .notifs_panel_header .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .panel-footer .btn.panel-heading-action:not(:first-child), #content.bootstrap #dash_version .panel-footer #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .btn.panel-heading-action:not(:first-child), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .notifs_panel_header .btn.panel-heading-action:not(:first-child), #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer .notifs_panel_header .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel .panel-footer .notifs_panel_header .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel .panel-footer .btn.panel-heading-action:not(:first-child), .bootstrap #header_notifs_icon_wrapper .notifs_panel .panel-footer #content.bootstrap .notifs_panel_header .btn.panel-heading-action:not(:first-child), .bootstrap #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel-footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .bootstrap .notifs_panel .panel-footer #content.bootstrap .notifs_panel_header .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .bootstrap .notifs_panel #content.bootstrap .notifs_panel_header .panel-footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap #dash_version .panel-footer .notifs_panel_header .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header #dash_version .panel-footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .panel .notifs_panel_footer .notifs_panel_header .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .panel .notifs_panel_footer .btn.panel-heading-action:not(:first-child), .bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer #content.bootstrap .notifs_panel_header .btn.panel-heading-action:not(:first-child), .bootstrap #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .bootstrap .notifs_panel .notifs_panel_footer #content.bootstrap .notifs_panel_header .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .bootstrap .notifs_panel #content.bootstrap .notifs_panel_header .notifs_panel_footer .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap #dash_version .notifs_panel_footer .notifs_panel_header .btn.panel-heading-action:not(:first-child), #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header #dash_version .notifs_panel_footer .btn.panel-heading-action:not(:first-child) { margin-left: 5px; }
 
 #header .panel-footer, #header #header_notifs_icon_wrapper .notifs_panel .notifs_panel_footer, #header_notifs_icon_wrapper .notifs_panel #header .notifs_panel_footer { margin: 15px 0 0 !important; height: 40px !important; }
 
@@ -3214,7 +3214,6 @@ a.link-social:hover { text-decoration: none; }
 .bootstrap .dropdown-menu { text-align: left; }
 .bootstrap .dropdown-menu > li a { padding: 5px 10px; }
 .bootstrap .btn-group-action { width: 160px; float: right; }
-.bootstrap .btn-group-action .btn-group { float: right; }
 .bootstrap .btn-group-action a { text-decoration: none; }
 .bootstrap .tt-query { border-bottom-right-radius: 3px !important; border-top-right-radius: 3px !important; }
 .bootstrap .tt-dropdown-menu { background-color: white; border: solid 1px #cccccc; font-size: 0.9em; text-transform: none; }
diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-content.sass b/admin-dev/themes/default/scss/admin-theme/_admin-content.sass
index 5da8eaf85..10ad866d4 100644
--- a/admin-dev/themes/default/scss/admin-theme/_admin-content.sass
+++ b/admin-dev/themes/default/scss/admin-theme/_admin-content.sass
@@ -18,7 +18,6 @@ body
 	padding: 36px 0 60px
 	margin: 0 0 -60px 0
 	background-color: $bg-content-color
-	//background-image: url('../img/patterns/bedge_grunge.png') // texture
 
 #content.bootstrap
 	padding: 80px 10px 0
@@ -113,8 +112,8 @@ body.display-modal
 		.panel-footer
 			margin: 15px -20px -20px
 			height: 73px
-			.btn.pull-right
-				margin-left: 3px
+			.btn.pull-right:not(:first-child)
+				margin-left: 5px
 #header
 	.panel-footer
 		margin: 15px 0 0!important
diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-forms.sass b/admin-dev/themes/default/scss/admin-theme/_admin-forms.sass
index d70ed911d..68d3e10cb 100644
--- a/admin-dev/themes/default/scss/admin-theme/_admin-forms.sass
+++ b/admin-dev/themes/default/scss/admin-theme/_admin-forms.sass
@@ -72,8 +72,6 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
 .btn-group-action
 	width: 160px
 	float: right
-	.btn-group
-		float: right
 	a
 		text-decoration: none
 
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 964fca5a8..b33af7e0c 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
@@ -310,50 +310,40 @@
 		</div>
 		<div class="panel">
 			<div class="panel-heading">
-				<i class="icon-info-sign"></i>
-				{l s='Download sample csv files.'}
+				<i class="icon-download"></i>
+				{l s='Download sample csv files'}
 			</div>
 			
 			<div class="list-group">
 				<a class="list-group-item" href="../docs/csv_import/categories_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Sample Categories file'}
 				</a>
 				<a class="list-group-item" href="../docs/csv_import/products_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Sample Products file'}
 				</a>
 				<a class="list-group-item" href="../docs/csv_import/combinations_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Sample Combinations file'}
 				</a>
 				<a class="list-group-item" href="../docs/csv_import/customers_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Sample Customers file'}
 				</a>
 				<a class="list-group-item" href="../docs/csv_import/addresses_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Sample Addresses file'}
 				</a>
 				<a class="list-group-item" href="../docs/csv_import/manufacturers_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Sample Manufacturers file'}
 				</a>
 				<a class="list-group-item" href="../docs/csv_import/suppliers_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Sample Suppliers file'}
 				</a>
 				<a class="list-group-item" href="../docs/csv_import/alias_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Sample Alias file'}
 				</a>
 				{if $PS_ADVANCED_STOCK_MANAGEMENT}
 				<a class="list-group-item" href="../docs/csv_import/supply_orders_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Supply Orders sample file'}
 				</a>
 				<a class="list-group-item" href="../docs/csv_import/supply_orders_details_import.csv" target="_blank">
-					<i class="icon-download"></i>
 					{l s='Supply Orders Details sample file'}
 				</a>
 				{/if}
diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl
index f19882529..5c87d44a9 100644
--- a/admin-dev/themes/default/template/controllers/modules/list.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/list.tpl
@@ -94,7 +94,7 @@
 				</td>
 				<td>
 					<div class="btn-group-action">
-						<div class="btn-group">
+						<div class="btn-group pull-right">
 							{if isset($module->type) && $module->type == 'addonsMustHave'}
 								<a class="btn btn-default" href="{$module->addons_buy_url}" target="_blank">
 									<i class="icon-shopping-cart"></i> &nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
index 9b0396754..aa6b108d8 100644
--- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
@@ -129,7 +129,7 @@
 				{/foreach}
 				{if $compiled_actions|count > 0}
 					{if $compiled_actions|count > 1}<div class="btn-group-action">{/if}
-					<div class="btn-group">
+					<div class="btn-group pull-right">
 						{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
 						{if $compiled_actions|count > 1}
 						<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
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 cb4b3a3de..3ef5af0d2 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -155,7 +155,7 @@
 			{/foreach}
 			{if $compiled_actions|count > 0}
 				{if $compiled_actions|count > 1}<div class="btn-group-action">{/if}
-				<div class="btn-group">
+				<div class="btn-group pull-right">
 					{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
 					{if $compiled_actions|count > 1}
 					<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">