diff --git a/issue_template/bug.yaml b/issue_template/bug.yaml
index 83d71e76d5..9bdcd8b277 100644
--- a/issue_template/bug.yaml
+++ b/issue_template/bug.yaml
@@ -3,20 +3,20 @@ about: File a bug report
 title: "[Bug]: "
 blank_issues_enabled: true
 contact_links:
-  - name: Support Matrix
+  - name: 💁 Support Matrix
     url: https://matrix.to/#/%23calckey:matrix.fedibird.com
     about: Having trouble with deployment? Ask the support chat.
-  - name: Resposible Disclosure
+  - name: 🔒 Resposible Disclosure
     url: https://codeberg.org/calckey/calckey/src/branch/develop/SECURITY.md
     about: Found a security vulnerability? Please disclose it responsibly.
 body:
   - type: markdown
     attributes:
       value: |
-                Thanks for taking the time to fill out this bug report!
-                Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23calckey:matrix.fedibird.com)
-                Found a security vulnerability? [Please disclose it responsibly.](https://codeberg.org/calckey/calckey/src/branch/develop/SECURITY.md)
-                By submitting this issue, you agree to follow our [Contribution Guidelines.](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
+                💖 Thanks for taking the time to fill out this bug report!
+                💁 Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23calckey:matrix.fedibird.com)
+                🔒 Found a security vulnerability? [Please disclose it responsibly.](https://codeberg.org/calckey/calckey/src/branch/develop/SECURITY.md)
+                🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
   - type: textarea
     id: what-happened
     attributes:
@@ -102,7 +102,6 @@ body:
         - YunoHost
         - AUR Package
         - Other (Please Specify)
-    attributes:
   - type: dropdown
     id: operating-system
     attributes:
diff --git a/issue_template/feature.yaml b/issue_template/feature.yaml
index 072027c762..0d44577979 100644
--- a/issue_template/feature.yaml
+++ b/issue_template/feature.yaml
@@ -3,20 +3,20 @@ about: Request a Feature
 title: "[Feature]: "
 blank_issues_enabled: true
 contact_links:
-  - name: Support Matrix
+  - name: 💁 Support Matrix
     url: https://matrix.to/#/%23calckey:matrix.fedibird.com
     about: Having trouble with deployment? Ask the support chat.
-  - name: Resposible Disclosure
+  - name: 🔒 Resposible Disclosure
     url: https://codeberg.org/calckey/calckey/src/branch/develop/SECURITY.md
     about: Found a security vulnerability? Please disclose it responsibly.
 body:
   - type: markdown
     attributes:
       value: |
-                Thanks for taking the time to fill out this feature request!
-                Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23calckey:matrix.fedibird.com)
-                Found a security vulnerability? [Please disclose it responsibly.](https://codeberg.org/calckey/calckey/src/branch/develop/SECURITY.md)
-                By submitting this issue, you agree to follow our [Contribution Guidelines.](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
+                💖 Thanks for taking the time to fill out this feature request!
+                💁 Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23calckey:matrix.fedibird.com)
+                🔒 Found a security vulnerability? [Please disclose it responsibly.](https://codeberg.org/calckey/calckey/src/branch/develop/SECURITY.md)
+                🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
   - type: textarea
     id: what-feature
     attributes: