diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 49dacbb..fd22359 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,26 +7,26 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+# Describe the bug
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+# To Reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+# Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+# Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Smartphone (please complete the following information):**
+# Smartphone (please complete the following information)
  - Device: [e.g. Samsung A7]
  - Android Version: [e.g. Marshmallow, 6.0 or API 23]
  - µLauncher Version: [e.g. j-0.0.11 or version code 25]
 
-**Additional info**
+# Additional info
 Add any other info or comments about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 7e70cba..4ab974b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-**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 [...]
+# Mandatory: Please describe the problem to be solved
+(Remove this text: Add a clear and concise description of the addressed problem. Don't say "add a button such that ... " but **why** this button should be added. This is very important as it allows to discuss alternative solutions.)
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+# Optional: Describe the solution you would suggest
+(Remove this text: A description of the solution, e.g. "add a button to the settings activity. When clicking that button ..." )
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+# Optional: Describe alternative solutions you've considered
+(Remove this text: A description of any alternative solutions or features you've considered.)
 
-**Additional info**
-Add any other info, comments or screenshots about the feature request here.
+# Optional: Additional info
+(Remove this text: Add any other info, comments or screenshots about the feature request here.)