From ed3650cf7a2dce6f2345e496f88c1cbd779b270a Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Fri, 2 Mar 2018 12:17:02 +0100
Subject: [PATCH 1/2] More specific CSS selector for SVG icons.

---
 edit-post/assets/stylesheets/main.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/edit-post/assets/stylesheets/main.scss b/edit-post/assets/stylesheets/main.scss
index a9d5f41a0157b8..d0815a2eb2b16d 100644
--- a/edit-post/assets/stylesheets/main.scss
+++ b/edit-post/assets/stylesheets/main.scss
@@ -70,11 +70,6 @@ body.gutenberg-editor-page {
 		top: -1px;
 	}
 
-	svg {
-		fill: currentColor;
-		outline: none;
-	}
-
 	ul#adminmenu a.wp-has-current-submenu:after,
 	ul#adminmenu>li.current>a.current:after {
 		border-right-color: $white;
@@ -104,6 +99,11 @@ body.gutenberg-editor-page {
 		font-size: $default-font-size;
 		color: $dark-gray-500;
 	}
+
+	svg.dashicon {
+		fill: currentColor;
+		outline: none;
+	}
 }
 
 .gutenberg__editor {

From 615a1116f13764acde4ee15a46e2e1e61a8155dc Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Mon, 5 Mar 2018 15:12:24 +0100
Subject: [PATCH 2/2] Remove tabindex from block mover icons.

---
 editor/components/block-mover/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/components/block-mover/index.js b/editor/components/block-mover/index.js
index 8c3f68153757b0..5df37e8ce55dc0 100644
--- a/editor/components/block-mover/index.js
+++ b/editor/components/block-mover/index.js
@@ -24,13 +24,13 @@ import { selectBlock } from '../../store/actions';
  * Module constants
  */
 const upArrow = (
-	<svg tabIndex="-1" width="18" height="18" xmlns="http://www.w3.org/2000/svg" aria-hidden role="img" focusable="false">
+	<svg className="dashicon" width="18" height="18" xmlns="http://www.w3.org/2000/svg" aria-hidden role="img" focusable="false">
 		<path d="M12.293 12.207L9 8.914l-3.293 3.293-1.414-1.414L9 6.086l4.707 4.707z" />
 	</svg>
 );
 
 const downArrow = (
-	<svg tabIndex="-1" width="18" height="18" xmlns="http://www.w3.org/2000/svg" aria-hidden role="img" focusable="false">
+	<svg className="dashicon" width="18" height="18" xmlns="http://www.w3.org/2000/svg" aria-hidden role="img" focusable="false">
 		<path d="M12.293 6.086L9 9.379 5.707 6.086 4.293 7.5 9 12.207 13.707 7.5z" />
 	</svg>
 );