diff --git a/ui_framework/components/icon/create_icon.js b/ui_framework/components/icon/create_icon.js
deleted file mode 100644
index 08342e3c93d76..0000000000000
--- a/ui_framework/components/icon/create_icon.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import { KuiIcon } from './kui_icon';
-
-export function CreateIcon() {
-  return <KuiIcon className="fa-plus"/>;
-}
diff --git a/ui_framework/components/icon/delete_icon.js b/ui_framework/components/icon/delete_icon.js
deleted file mode 100644
index 7daaa1a587246..0000000000000
--- a/ui_framework/components/icon/delete_icon.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import { KuiIcon } from './kui_icon';
-
-export function DeleteIcon() {
-  return <KuiIcon className="fa-trash"/>;
-}
diff --git a/ui_framework/components/icon/index.js b/ui_framework/components/icon/index.js
new file mode 100644
index 0000000000000..05fd7e476a4fd
--- /dev/null
+++ b/ui_framework/components/icon/index.js
@@ -0,0 +1,5 @@
+import React from 'react';
+import { KuiIcon } from './kui_icon';
+
+export const DeleteIcon = () => <KuiIcon className="fa-trash"/>;
+export const CreateIcon = () => <KuiIcon className="fa-plus"/>;
diff --git a/ui_framework/components/index.js b/ui_framework/components/index.js
index 920743ace4697..af77d84efccff 100644
--- a/ui_framework/components/index.js
+++ b/ui_framework/components/index.js
@@ -1,2 +1 @@
-export { CreateIcon } from './icon/create_icon';
-export { DeleteIcon } from './icon/delete_icon';
+export * from './icon';