diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ac0f44ea80..9840616b56 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,14 +1,15 @@
 ---
-name: "🐞 Bug report"
+name: "\U0001F41E Bug report"
 about: Report a bug
 title: "[Bug] Write short description here"
-labels: "bug"
+labels: bug
+assignees: ''
 
 ---
 
 ### Device information
 * Tachiyomi version: ?
-* Android version: ?
+* Android phone & version: ?
 
 ## Steps to reproduce
 1. First step
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index d3c307acf7..353fe05e38 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,10 +1,12 @@
 ---
-name: "🌟 Feature request"
+name: "\U0001F31F Feature request"
 about: Suggest a feature to improve Tachiyomi
 title: "[Feature Request] Write short description here"
-labels: "feature"
+labels: enhancement
+assignees: ''
 
 ---
+
 ### Why/User Benefit/User Problem
 (explain why this feature should be added)