diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index bccbbb6..18908be 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,13 +1,24 @@
-### Describe the problem
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
 
-<!--- What happened? What are you seeing? How did you arrive here? -->
+---
 
-### What did you expect?
+**Describe the bug**
+A clear and concise description of what the bug is.
 
-<!--- How would you like this to work instead? -->
+**Reproducible test case**
+Include a URL (codepen.io, jsfiddle.net, Git repository, codesandbox.io, stackblitz.com, etc.) that demonstrates the problem.
 
-### Reproducible test case
+**Expected behavior**
+A clear and concise description of what you expected to happen.
 
-<!--- Insert a URL to your test case -->
+**Desktop (please complete the following information):**
+ - Browser [e.g. chrome, safari]
+ - Version
 
-<!--- Describe any details about the test case that we need to know like "whatever you do, don't click the red button" -->
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 9320fe0..bbcbbe7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,25 +1,20 @@
-### Describe the problem you'd like to see solved or task you'd like to see made easier
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
 
-<!--- What steps or tasks are you trying to complete along the way? -->
+---
 
-### Is this in relation to an existing part of react-native-fontawesome or something new?
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-<!--- If so, what part of Font Awesome? -->
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
 
-### What is 1 thing that we can do when building this feature that will guarantee that it is awesome?
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
 
-<!--- e.g. make the API super-convenient -->
-
-### Why would other react-native-fontawesome users care about this?
-
-<!--- e.g. because everyone wants icons that fly  -->
-
-### On a scale of 1 (sometime in the future) to 10 (absolutely right now), how soon would you recommend we make this feature?
-
-<!--- e.g. 5 - "while we're young" -->
-
-### Feature request checklist
-
-* [ ] This is a single feature (i.e. not a re-write of all of Font Awesome)
-* [ ] The title starts with "Feature request: " and is followed by a clear feature name (Ex: `Feature request: moar cowbell`)
-* [ ] I have [searched for existing issues](https://github.com/FortAwesome/react-native-fontawesome/issues) and to the best of my knowledge this is not a duplicate
+**Additional context**
+Add any other context or screenshots about the feature request here.