diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index cdb9fd1ace..19c315fce4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,4 +1,4 @@
-name: Bug report
+name: 🐞 Bug report
 description: Create a report to help us improve
 labels: [ "bug", "0. Needs triage" ]
 body:
@@ -6,7 +6,7 @@ body:
         attributes:
             value: |
                 Thank you for contributing! Before reporting, please ensure the following:
-                
+
                  * You've [searched for similar issues](https://github.com/nextcloud/talk-android/issues) and didn't find a duplicate.
                  * You've written a clear and descriptive title for this issue, something like "Crash when trying to send a file on group chat"
                  * You agree to Nextcloud's [Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/)
@@ -64,9 +64,9 @@ body:
             required: true
     -   type: markdown
         attributes:
-            value: | 
+            value: |
                 ## Server information
-                
+
                 If you're unsure about any of these fields, just leave them empty.
     -   type: input
         id: server-version
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 7b0474bf4e..c203eb7e28 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,9 @@
 # SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro.brey@nextcloud.com>
-# SPDX-FileCopyrightText: 2021 Joas Schilling <coding@schilljs.com>
 # SPDX-License-Identifier: GPL-3.0-or-later
 contact_links:
-    -   name: Community Support and Help
-        url: https://help.nextcloud.com/
-        about: For questions and general help
+    - name: 🗺️ Feature request for the full Nextcloud Talk suite
+      url: https://github.com/nextcloud/spreed/issues/new/choose
+      about: Suggest an idea for Nextcloud Talk for all users, client and server
+    - name: ❓ Community Support and Help
+      url: https://help.nextcloud.com/
+      about: Configuration, webserver/proxy or performance issues and other questions
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bb89f0b29b..d72d140698 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: 🚀 Feature request specifically for Nextcloud Talk Android
 about: Suggest an idea for Nextcloud Talk Android
 title: ''
 labels: 0. Needs triage, enhancement