diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 77a21059b..710673d3a 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,11 @@
 blank_issues_enabled: false
 contact_links:
-  - name: ⚠️ Tachiyomi app issue
+  - name: ⚠️ Application issue
     url: https://github.com/tachiyomiorg/tachiyomi/issues/new/choose
-    about: Issues and requests about the app itself should be opened in the tachiyomi repository instead.
+    about: Issues and requests about the app itself should be opened in the tachiyomi repository instead
   - name: 📦 Tachiyomi extensions
     url: https://tachiyomi.org/extensions
-    about: List of all available extensions with download links.
-  - 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/source_bug.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
similarity index 94%
rename from .github/ISSUE_TEMPLATE/source_bug.yml
rename to .github/ISSUE_TEMPLATE/report_issue.yml
index 0e4081d45..772ca165f 100644
--- a/.github/ISSUE_TEMPLATE/source_bug.yml
+++ b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -1,5 +1,5 @@
-name: 🐞 Issue/Bug report
-description: Report a source issue/bug in Tachiyomi
+name: 🐞 Issue report
+description: Report a source issue in Tachiyomi
 title: "Source name: Short description"
 labels: [Bug]
 body:
@@ -62,12 +62,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 100%
rename from .github/ISSUE_TEMPLATE/feature_request.yml
rename to .github/ISSUE_TEMPLATE/request_feature.yml
diff --git a/.github/ISSUE_TEMPLATE/meta_request.yml b/.github/ISSUE_TEMPLATE/request_meta.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/meta_request.yml
rename to .github/ISSUE_TEMPLATE/request_meta.yml
diff --git a/.github/ISSUE_TEMPLATE/source_request.yml b/.github/ISSUE_TEMPLATE/request_source.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/source_request.yml
rename to .github/ISSUE_TEMPLATE/request_source.yml