diff --git a/admin-dev/themes/template/invoices/form.tpl b/admin-dev/themes/template/invoices/form.tpl
index 73f2d5942..e50da7b13 100644
--- a/admin-dev/themes/template/invoices/form.tpl
+++ b/admin-dev/themes/template/invoices/form.tpl
@@ -81,5 +81,5 @@
 		{/if}
 {/block}
 
-{block name="other_fieldsets"}<div class="clear">&nbsp;</div>{/block}
+{block name="after"}<div style="clear:both">&nbsp;</div>{/block}
 
diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php
index 8206448b0..5321e9cde 100644
--- a/controllers/admin/AdminInvoicesController.php
+++ b/controllers/admin/AdminInvoicesController.php
@@ -110,7 +110,6 @@ class AdminInvoicesControllerCore extends AdminController
 			'date_to' => date('Y-m-d')
 		);
 
-		$this->tpl_form_vars = array('style' => 'float:left;');
 		$this->table = 'invoice_date';
 		$this->toolbar_title = $this->l('Print PDF invoices');
 		return parent::renderForm();
@@ -163,7 +162,7 @@ class AdminInvoicesControllerCore extends AdminController
 
 		$this->tpl_form_vars = array(
 			'statusStats' => $status_stats,
-			'style' => 'margin-left:400px'
+			'style' => ''
 		);
 
 		$this->table = 'invoice_status';
diff --git a/controllers/admin/AdminShippingController.php b/controllers/admin/AdminShippingController.php
index 892af710b..8ee4193f8 100644
--- a/controllers/admin/AdminShippingController.php
+++ b/controllers/admin/AdminShippingController.php
@@ -64,9 +64,9 @@ class AdminShippingControllerCore extends AdminController
 						'validation' => 'isUnsignedFloat'),
 				),
 				'description' =>
-					'<ul style="font-size:11px;color:#7F7F7F;line-height:20px;margin-left:20px;">
-						<li style="list-style-type: disc;">'.$this->l('If you set these parameters to 0, they will be disabled').'</li>
-						<li style="list-style-type: disc;">'.$this->l('Coupons are not taken into account when calculating free shipping').'</li>
+					'<ul>
+						<li>'.$this->l('If you set these parameters to 0, they will be disabled').'</li>
+						<li>'.$this->l('Coupons are not taken into account when calculating free shipping').'</li>
 					</ul>',
 				'submit' => array()
 			),
diff --git a/css/admin.css b/css/admin.css
index 66537f957..8badab8f4 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -127,6 +127,7 @@ form .simulate-disable-input{
 	color:#666666;
 	font-size:12px;
 }
+
 .block-mail {
 	margin:0 0 20px 0;
 }
@@ -465,7 +466,7 @@ select optgroup option {
 	min-height:32px;
 }
 #content .conf img, #content .warn img, #content .error img {
-	margin:-4px 5px 0 0;
+	margin:0 5px 0 0;
 }
 
 #content .error  {
@@ -504,7 +505,7 @@ select optgroup option {
 	background: #FEEFB3 url(../img/admin/icon-attention.png) no-repeat scroll 6px 6px;
 	border: 1px solid #9e6014;
 	color:#9e6014;
-	padding: 5px 5px 5px 40px;
+	padding: 10px 5px 5px 40px;
 	border-radius:3px;
 	min-height:32px;
 }
@@ -805,17 +806,24 @@ tr.deleted td {
 	margin-top: 4px;
 	margin-bottom: 2px;
 	border: 1px solid #00529B;
-	padding: 5px 5px 5px 40px;
+	padding:15px 5px 15px 40px;
 	color: #00529B;
 	background: #BDE5F8 url(../img/admin/icon-info.png) no-repeat 6px 5px;
 	border-radius:3px;
 	min-height:32px;
 }
-
+.hint p {
+	color: #00529B;
+}
 div.hint {
 	position: relative;
 }
 
+div.hint ul li {
+	color: #00529B;
+	padding-left: 5px;
+}
+
 table tr th .hint {
 	display: none;
 	position: absolute;
@@ -1714,12 +1722,17 @@ fieldset .optionsDescription{
     border: 1px solid #00529B;
     color: #00529B;
     font-family: Arial,Verdana,Helvetica,sans-serif;
-    font-size: 0.85em;
+    font-size: 12px;
     margin-bottom: 15px;
-    padding: 5px 5px 5px 40px;
+    padding: 10px 5px 5px 40px;
 	border-radius:3px;
 	min-height:32px;
-	line-height:32px;
+}
+
+fieldset .optionsDescription ul li {
+    color: #00529B;
+    margin:0;
+    padding:0;
 }
 
 p.preference_description{
diff --git a/img/admin/close.png b/img/admin/close.png
index 2ceb6133f..2862d09e0 100644
Binary files a/img/admin/close.png and b/img/admin/close.png differ