diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
index a762b7ceaac3c1..4769c52b5e4116 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/feature_edit_tools.tsx
@@ -10,9 +10,9 @@ import { EuiButtonIcon, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 import { DRAW_SHAPE } from '../../../../../common/constants';
-import { VectorCircleIcon } from '../../icons/vector_circle_icon';
-import { VectorLineIcon } from '../../icons/vector_line_icon';
-import { VectorSquareIcon } from '../../icons/vector_square_icon';
+import { VectorCircleIcon } from './vector_circle_icon';
+import { VectorLineIcon } from './vector_line_icon';
+import { VectorSquareIcon } from './vector_square_icon';
 
 export interface ReduxStateProps {
   drawShape?: string;
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_circle_icon.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_circle_icon.tsx
similarity index 89%
rename from x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_circle_icon.tsx
rename to x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_circle_icon.tsx
index 1a39072d0842fd..c872fa60741adf 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_circle_icon.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_circle_icon.tsx
@@ -7,14 +7,14 @@
 
 import React, { FunctionComponent } from 'react';
 
-export const VectorCircleIcon: FunctionComponent = () => (
+export const VectorCircleIcon: FunctionComponent = (props) => (
   <svg
     width="16"
     height="16"
     viewBox="0 0 16 16"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
-    className="euiIcon"
+    {...props}
   >
     <path
       fillRule="evenodd"
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_line_icon.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_line_icon.tsx
similarity index 88%
rename from x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_line_icon.tsx
rename to x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_line_icon.tsx
index 0e4baf536e7007..83ed054fcff807 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_line_icon.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_line_icon.tsx
@@ -7,14 +7,14 @@
 
 import React, { FunctionComponent } from 'react';
 
-export const VectorLineIcon: FunctionComponent = () => (
+export const VectorLineIcon: FunctionComponent = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     width="16"
     height="16"
     fill="none"
     viewBox="0 0 16 16"
-    className="euiIcon"
+    {...props}
   >
     <path d="M11.506 3.881l.707.707-7.594 7.594-.707-.707z" />
     <path
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_square_icon.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_square_icon.tsx
similarity index 88%
rename from x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_square_icon.tsx
rename to x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_square_icon.tsx
index 4734a4feebc8fa..71e1f28afb94bb 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/icons/vector_square_icon.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/feature_draw_controls/feature_edit_tools/vector_square_icon.tsx
@@ -7,14 +7,14 @@
 
 import React, { FunctionComponent } from 'react';
 
-export const VectorSquareIcon: FunctionComponent = () => (
+export const VectorSquareIcon: FunctionComponent = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     width="16"
     height="16"
     fill="none"
     viewBox="0 0 16 16"
-    className="euiIcon"
+    {...props}
   >
     <path
       fillRule="evenodd"