diff --git a/admin/post-types/shop_order.php b/admin/post-types/shop_order.php
index 9e6a9362ab7..ac7d3802c8b 100644
--- a/admin/post-types/shop_order.php
+++ b/admin/post-types/shop_order.php
@@ -36,8 +36,8 @@ function woocommerce_edit_order_columns($columns){
 	$columns["billing_address"] = __("Billing", 'woocommerce');
 	$columns["shipping_address"] = __("Shipping", 'woocommerce');
 	$columns["total_cost"] = __("Order Total", 'woocommerce');
-	$columns["order_comments"] = '<img alt="' . esc_attr__( 'Order Notes', 'woocommerce' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" class="tips" data-tip="' . __("Order Notes", 'woocommerce') . '" />';
-	$columns["note"] = '<img src="' . $woocommerce->plugin_url() . '/assets/images/note_head.png" alt="' . __("Customer Notes", 'woocommerce') . '" class="tips" data-tip="' . __("Customer Notes", 'woocommerce') . '" />';
+	$columns["order_comments"] = '<img alt="' . esc_attr__( 'Order Notes', 'woocommerce' ) . '" src="' . $woocommerce->plugin_url() . '/assets/images/icons/comment.svg' . '" class="tips" data-tip="' . __("Order Notes", 'woocommerce') . '" height="12" width="12" />';
+	$columns["note"] = '<img src="' . $woocommerce->plugin_url() . '/assets/images/icons/note-fill.svg" alt="' . __("Customer Notes", 'woocommerce') . '" class="tips" data-tip="' . __("Customer Notes", 'woocommerce') . '" height="12" width="12" />';
 	$columns["order_date"] = __("Date", 'woocommerce');
 	$columns["order_actions"] = __("Actions", 'woocommerce');
 
@@ -172,9 +172,9 @@ function woocommerce_custom_order_columns($column) {
 		case "note" :
 
 			if ($order->customer_note)
-				echo '<img src="'.$woocommerce->plugin_url().'/assets/images/note.png" alt="yes" class="tips" data-tip="'. __('Yes', 'woocommerce') .'" />';
+				echo '<img src="'.$woocommerce->plugin_url().'/assets/images/icons/note-fill.svg" alt="yes" class="tips" data-tip="'. __('Yes', 'woocommerce') .'" height="16" width="16" />';
 			else
-				echo '<img src="'.$woocommerce->plugin_url().'/assets/images/note-off.png" alt="no" class="tips" data-tip="'. __('No', 'woocommerce') .'" />';
+				echo '<img src="'.$woocommerce->plugin_url().'/assets/images/icons/note.svg" alt="no" class="tips" data-tip="'. __('No', 'woocommerce') .'" height="16" width="16" />';
 
 		break;
 		case "order_comments" :
diff --git a/assets/images/icons/comment.svg b/assets/images/icons/comment.svg
new file mode 100755
index 00000000000..2ca653ec9ad
--- /dev/null
+++ b/assets/images/icons/comment.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
+<path fill="#555555" d="M1.975,44.223c0,0,7.098-6.184,3.909-12.174c-3.188-5.988,9.4,5.307,9.4,5.307S6.171,43.449,1.975,44.223z"
+	/>
+<path fill="#555555" d="M48.562,26.9c0,6.006-4.869,10.873-10.873,10.873H12.312c-6.005,0-10.874-4.867-10.874-10.873v-6.286
+	c0-6.005,4.868-10.874,10.874-10.874h25.377c6.002,0,10.871,4.869,10.871,10.874V26.9H48.562z"/>
+</svg>
diff --git a/assets/images/icons/note-fill.svg b/assets/images/icons/note-fill.svg
new file mode 100755
index 00000000000..37ab903a45e
--- /dev/null
+++ b/assets/images/icons/note-fill.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="75px" height="100px" viewBox="0 0 75 100" enable-background="new 0 0 75 100" xml:space="preserve">
+<path fill="#BBBBBB" d="M43.75-1H0V99h75V30.244L43.75-1z M12.5,86.5v-75h25v25h25v50H12.5z"/>
+<rect x="20.5" y="71.75" fill="#BBBBBB" width="34" height="8.25"/>
+<rect x="20.5" y="44.5" fill="#BBBBBB" width="34" height="8.25"/>
+<rect x="20.5" y="58" fill="#BBBBBB" width="34" height="8.25"/>
+</svg>
diff --git a/assets/images/icons/note.svg b/assets/images/icons/note.svg
new file mode 100755
index 00000000000..e7f87d6f400
--- /dev/null
+++ b/assets/images/icons/note.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="75px" height="100px" viewBox="0 0 75 100" enable-background="new 0 0 75 100" xml:space="preserve">
+<path fill="#BBBBBB" d="M43.75,0H0v100h75V31.244L43.75,0z M12.5,87.5v-75h25v25h25v50H12.5z"/>
+</svg>