diff --git a/packages/react-icons/.gitignore b/packages/react-icons/.gitignore
index 3f6f8b25a6..c282fcc222 100644
--- a/packages/react-icons/.gitignore
+++ b/packages/react-icons/.gitignore
@@ -1,16 +1,16 @@
 # autogenerated
-index.d.ts
-index.mjs
-all.mjs
-all.d.ts
-fa/
-io/
-md/
-ti/
-go/
-fi/
-gi/
-wi/
-di/
+/index.d.ts
+/index.mjs
+/all.mjs
+/all.d.ts
+/fa/
+/io/
+/md/
+/ti/
+/go/
+/fi/
+/gi/
+/wi/
+/di/
 README.md
 
diff --git a/packages/react-icons/package.json b/packages/react-icons/package.json
index 5576c6da75..ed596f9a86 100644
--- a/packages/react-icons/package.json
+++ b/packages/react-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-icons",
-  "version": "3.5.0",
+  "version": "3.6.0-beta1",
   "description": "SVG React icons of popular icon packs using ES6 imports",
   "author": "Goran Gajic",
   "contributors": [
diff --git a/packages/react-icons/scripts/build.js b/packages/react-icons/scripts/build.js
index 7b34b03536..afa871dc01 100644
--- a/packages/react-icons/scripts/build.js
+++ b/packages/react-icons/scripts/build.js
@@ -82,8 +82,7 @@ function generateIconRow(icon, formattedName, iconData, type = "module") {
         `module.exports.${formattedName} = function (props) {\n` +
         `  return GenIcon(${JSON.stringify(iconData)})(props);\n` +
         `};\n` +
-        `module.exports.${formattedName}.displayName = "${formattedName}"
-        ;\n`
+        `module.exports.${formattedName}.displayName = "${formattedName}";\n`
       );
     case "dts":
       return `export declare const ${formattedName}: IconType;\n`;
@@ -116,9 +115,11 @@ async function dirInit() {
   const initFiles = ["index.d.ts", "index.mjs", "all.mjs", "all.d.ts"];
 
   const gitignore =
-    ["# autogenerated", ...initFiles, ...icons.map(icon => `${icon.id}/`)].join(
-      "\n"
-    ) + "\nREADME.md\n\n";
+    [
+      "# autogenerated",
+      ...initFiles.map(s => `/${s}`),
+      ...icons.map(icon => `/${icon.id}/`)
+    ].join("\n") + "\nREADME.md\n\n";
   writeFile(path.resolve(DIST, ".gitignore"), gitignore);
 
   for (const icon of icons) {
@@ -136,6 +137,17 @@ async function dirInit() {
       [icon.id, "index.d.ts"],
       "import { IconTree, IconType } from '../lib/iconBase'\n// THIS FILE IS AUTO GENERATED\n"
     );
+    await write(
+      [icon.id, "package.json"],
+      JSON.stringify(
+        {
+          sideEffects: false,
+          module: "./index.mjs"
+        },
+        null,
+        2
+      ) + "\n"
+    );
   }
 
   for (const file of initFiles) {
@@ -188,7 +200,6 @@ async function writeIconModule(icon) {
 async function writeIconsManifest() {
   const writeFile = promisify(fs.writeFile);
   const copyFile = promisify(fs.copyFile);
-  const appendFile = promisify(fs.appendFile);
 
   const writeObj = icons.map(icon => ({
     id: icon.id,