diff --git a/.gitignore b/.gitignore
index 54439274..a6b05b93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ cypress/videos
 **/dist
 packages/components/src/index.js
 packages/icons/src/*.*
-!packages/icons/src/Base.js
+!packages/icons/src/*.mdx
 
 # Components must live within their own directory. There should not be any loose files in the source directory.
 packages/components/src/*.*
diff --git a/packages/icons/package.json b/packages/icons/package.json
index b836ad7e..8f5b60e2 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -19,9 +19,10 @@
     "LICENSE.md"
   ],
   "scripts": {
+    "pregenerate:main": "rm -f src/*.js",
     "generate:main": "svgr -d src src/svg",
-    "postgenerate:main": "rm -f src/index.js && generate-main-icons",
-    "prebuild": "yarn generate:main",
+    "postgenerate:main": "generate-main-icons",
+    "prebuild": "yarn generate:main && rm -rf dist",
     "build": "babel --root-mode upward src --out-dir ./dist"
   },
   "publishConfig": {
diff --git a/docs/icons/README.mdx b/packages/icons/src/README.mdx
similarity index 89%
rename from docs/icons/README.mdx
rename to packages/icons/src/README.mdx
index c9596296..dfe1adfd 100644
--- a/docs/icons/README.mdx
+++ b/packages/icons/src/README.mdx
@@ -4,7 +4,8 @@ route: /icons
 menu: Icons
 ---
 
-import { BaseIcon, DeleteIcon } from '@versionone/icons';
+import { DeleteIcon } from './';
+import { Base } from './utils/Base';
 import { Playground, PropsTable } from '@versionone/docz';
 
 # Icons
@@ -25,4 +26,4 @@ Prior to adding in an icon, make sure the icon file is named without the word "i
 
 ## API
 
-<PropsTable of={BaseIcon} />
+<PropsTable of={Base} />
diff --git a/packages/icons/src/Base.js b/packages/icons/src/utils/Base.js
similarity index 96%
rename from packages/icons/src/Base.js
rename to packages/icons/src/utils/Base.js
index e1abea37..5eaaf630 100644
--- a/packages/icons/src/Base.js
+++ b/packages/icons/src/utils/Base.js
@@ -24,4 +24,4 @@ Base.defaultProps = {
   color: '#000',
   size: 24,
 };
-export default Base;
+export { Base };
diff --git a/packages/icons/src/utils/withIconProps.js b/packages/icons/src/utils/withIconProps.js
index 5c0c2b14..ff52a18c 100644
--- a/packages/icons/src/utils/withIconProps.js
+++ b/packages/icons/src/utils/withIconProps.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import Base from '../Base';
+import { Base } from './Base';
 
 const withIconProps = Component => props => (
   <Base {...props} icon={Component} />