diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index b88cba16a..4d4d1474d 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,10 +2,10 @@ blank_issues_enabled: false
 contact_links:
   - name: ⚠️ Extension/source issue
     url: https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose
-    about: Issues and requests for extensions and sources should be opened in the tachiyomi-extensions repository instead.
+    about: Issues and requests for extensions and sources should be opened in the tachiyomi-extensions repository instead
   - name: 📦 Tachiyomi extensions
     url: https://github.com/tachiyomiorg/tachiyomi-extensions
-    about: Extensions and sources.
-  - name: 🌐 Tachiyomi website
+    about: List of all available extensions with download links
+  - name: 🖥️ Tachiyomi website
     url: https://tachiyomi.org/help/
-    about: Guides, troubleshooting, and answers to common questions.
+    about: Guides, troubleshooting, and answers to common questions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
similarity index 95%
rename from .github/ISSUE_TEMPLATE/bug_report.yml
rename to .github/ISSUE_TEMPLATE/report_issue.yml
index 5fe005b14..8c7cc9de0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -1,5 +1,5 @@
-name: 🐞 Bug report
-description: Report a bug in Tachiyomi
+name: 🐞 Issue report
+description: Report an issue in Tachiyomi
 labels: [Bug]
 body:
 
@@ -58,12 +58,12 @@ body:
     id: reproduce-steps
     attributes:
       label: Steps to reproduce
-      description: Provide an example of how to trigger the bug.
+      description: Provide an example of the issue.
       placeholder: |
         Example:
           1. First step
           2. Second step
-          3. Bug occurs
+          3. Issue here
     validations:
       required: true
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/request_feature.yml
similarity index 96%
rename from .github/ISSUE_TEMPLATE/feature_request.yml
rename to .github/ISSUE_TEMPLATE/request_feature.yml
index 3c9ed5e13..398ce3b9e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -1,5 +1,5 @@
 name: ⭐ Feature request
-description: Suggest a feature for Tachiyomi
+description: Suggest a feature to improve Tachiyomi
 labels: [Feature request]
 body: