diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css
index b98568608..90e965136 100644
--- a/admin-dev/themes/default/css/admin.css
+++ b/admin-dev/themes/default/css/admin.css
@@ -194,6 +194,7 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox .process-icon-export-csv-details { background-image: url('../img/process-icon-export-csv-details.png');}
 .toolbarBox .process-icon-export-stock-mvt-csv { background-image: url('../img/process-icon-export-csv.png');}
 .toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
+.toolbarBox .process-icon-new.add_product{ background-image: url('../img/process-icon-addProduct.png');}
 .toolbarBox .process-icon-partialRefund{ background-image: url('../img/process-icon-partial-refund.png');}
 .toolbarBox .process-icon-standardRefund{ background-image: url('../img/process-icon-standard-refund.png');}
 
diff --git a/admin-dev/themes/default/img/process-icon-addProduct.png b/admin-dev/themes/default/img/process-icon-addProduct.png
new file mode 100755
index 000000000..91eb8f878
Binary files /dev/null and b/admin-dev/themes/default/img/process-icon-addProduct.png differ
diff --git a/admin-dev/themes/default/img/process-icon-partial-refund.png b/admin-dev/themes/default/img/process-icon-partial-refund.png
new file mode 100755
index 000000000..9d9f34876
Binary files /dev/null and b/admin-dev/themes/default/img/process-icon-partial-refund.png differ
diff --git a/admin-dev/themes/default/img/process-icon-standard-refund.png b/admin-dev/themes/default/img/process-icon-standard-refund.png
new file mode 100755
index 000000000..65d5de7a1
Binary files /dev/null and b/admin-dev/themes/default/img/process-icon-standard-refund.png differ
diff --git a/admin-dev/themes/default/template/orders/_new_product.tpl b/admin-dev/themes/default/template/orders/_new_product.tpl
index e95ce7e8b..d43b7f0d0 100644
--- a/admin-dev/themes/default/template/orders/_new_product.tpl
+++ b/admin-dev/themes/default/template/orders/_new_product.tpl
@@ -1,3 +1,6 @@
+<<<<<<< .mine
+<tr id="new_product" height="52" style="display:none;background-color:#e9f1f6;">
+=======
 {*
 * 2007-2011 PrestaShop
 *
@@ -62,7 +65,7 @@
 		<input type="button" class="button" id="submitAddProduct" value="{l s='Add product'}" disabled="disabled" />
 	</td>
 </tr>
-<tr id="new_invoice" style="display:none;background-color:#E8EDC2">
+<tr id="new_invoice" style="display:none;background-color:#e9f1f6;">
 	<td colspan="10">
 		<h3>{l s='New invoice informations'}</h3>
 		<label>{l s='Carrier:'}</label>
diff --git a/admin-dev/themes/default/template/orders/view.tpl b/admin-dev/themes/default/template/orders/view.tpl
index 013d1400a..e992010cb 100755
--- a/admin-dev/themes/default/template/orders/view.tpl
+++ b/admin-dev/themes/default/template/orders/view.tpl
@@ -169,7 +169,7 @@
 			<br />
 			<fieldset>
 				<legend><img src="../img/admin/tab-stats.gif" /> {l s='Sources'}</legend>
-				<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll; width: 360px;"{/if}>
+				<ul {if sizeof($sources) > 3}style="height: 200px; overflow-y: scroll;"{/if}>
 				{foreach from=$sources item=source}
 					<li>
 						{dateFormat date=$source['date_add'] full=true}<br />
@@ -533,7 +533,7 @@
 								{l s='Cancel'}
 							{/if}
 						</th>
-						<th style="width: 8%;text-align:right;display:none" class="partial_refund_fields">
+						<th style="width: 12%;text-align:right;display:none" class="partial_refund_fields">
 							{l s='Partial refund'}
 						</th>
 						{if !$order->hasBeenDelivered()}
diff --git a/css/admin.css b/css/admin.css
index 96ff28fb6..ff7c38512 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -2106,7 +2106,7 @@ div#scrollTop a:hover{
 
 .category-filter #filternameForm { float:left; margin-left:10px; color:#585A69;}
 
-.current-edit { background-color: rgb(232, 237, 194); }
+.current-edit { background-color: #E9F1F6 }
 
 .edit-note { width: 98%; height: 100px; }
 
diff --git a/img/admin/google.gif b/img/admin/google.gif
index d24a14a90..f7f1af2f9 100644
Binary files a/img/admin/google.gif and b/img/admin/google.gif differ