diff --git a/.github/ISSUE_TEMPLATE/icon_request.md b/.github/ISSUE_TEMPLATE/icon_request.md
new file mode 100644
index 00000000..a7e39b38
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/icon_request.md
@@ -0,0 +1,19 @@
+---
+name: Icon request
+about: Request a new icon for SimpleIcons
+---
+
+<!-- Before opening a new issue search for duplicate or closed issues -->
+
+
+<!-- When requesting a new icon we need information such as: -->
+**Name:**
+**Website:**
+**Official resources for icon and color:**
+  <!-- for example media kits, brand guidelines, SVG files, ...) -->
+
+
+<!--
+We won't add non-brand icons or anything related to illegal services.
+If in doubt open an issue and we'll have a look.
+-->
diff --git a/.github/ISSUE_TEMPLATE/icon_update.md b/.github/ISSUE_TEMPLATE/icon_update.md
new file mode 100644
index 00000000..559f8f72
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/icon_update.md
@@ -0,0 +1,12 @@
+---
+name: Icon update
+about: Help us improve by reporting outdated icons
+---
+
+<!-- Before opening a new issue search for duplicate or closed issues -->
+
+
+<!-- When reporting an update to an icon we need information such as: -->
+**Name:**
+**Official resources for icon and color:**
+  <!-- for example media kits, brand guidelines, SVG files, ...) -->
diff --git a/.github/ISSUE_TEMPLATE/website_and_package.md b/.github/ISSUE_TEMPLATE/website_and_package.md
new file mode 100644
index 00000000..e4b022b9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/website_and_package.md
@@ -0,0 +1,29 @@
+---
+name: Website & NPM Package
+about: For general issues and improvements
+---
+
+<!-- Before opening a new issue search for duplicate or closed issues -->
+
+
+### Kind of issue <!-- Change the one that applies to `[x]`  -->
+  - [ ] Improvement
+  - [ ] Bug
+  - [ ] Other, namely: 
+
+### This issue concerns <!-- Change the one that applies to `[x]`  -->
+  - [ ] The NPM Package
+  - [ ] The website
+  - [ ] Other, namely: 
+
+### Description
+
+
+<!--
+Anything relevant, for example:
+  - For bugs: "Steps to reproduce" and "Expected behavior"
+  - For improvements: An example of a use case
+  - Package issues: What is your node version ($ node --version)
+  - Website issues: What browser do you use
+  - etc.
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..0a03a587
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,21 @@
+<!--
+Before opening your pull request, have a quick look at our contribution guidelines: https://github.com/simple-icons/simple-icons/blob/develop/CONTRIBUTING.md
+-->
+
+**Issue:**
+
+
+### Checklist
+  - [ ] I optimized the icon with SVGO or SVGOMG
+  - [ ] The SVG `viewbox` is `0 0 24 24`
+
+### Description
+
+
+<!--
+Anything relevant, for example:
+  - Why did you pick the hex value?
+  - Did you manually vectorize the logo?
+  - Have you used multiple sources?
+  - etc.
+-->
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 9ce4dbb5..00000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Before opening a new issue search for duplicate or closed issues.
-
-When requesting a new or updated icon include helpful information such as:
-* The requested icon’s brand name in the title.
-* Links to official sources for the brand's icon and colors (e.g. media kits, brand guidelines, SVG files etc.).