diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.md b/.github/ISSUE_TEMPLATE/01_bug-report.md
index 781a7b0bfe..50f8de5f6a 100644
--- a/.github/ISSUE_TEMPLATE/01_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/01_bug-report.md
@@ -1,5 +1,5 @@
 ---
-name: Bug Report
+name: 🐛 Bug Report
 about: Create a report to help us improve
 title: ''
 labels: ⚠️bug?
diff --git a/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md b/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
index e18459a903..513598011c 100644
--- a/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/02_client-side-bug-report.md
@@ -1,5 +1,5 @@
 ---
-name: Bug Report (Client specific)
+name: 🐛 Bug Report (🖥️Client specific)
 about: Create a report to help us improve
 title: ''
 labels: ⚠️bug?, 🖥️Client
diff --git a/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md b/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
index 3e72285188..41a70d426f 100644
--- a/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/03_server-side-bug-report.md
@@ -1,5 +1,5 @@
 ---
-name: Bug Report (Server specific)
+name: 🐛 Bug Report (⚙️Server specific)
 about: Create a report to help us improve
 title: ''
 labels: ⚠️bug?, ⚙️Server
diff --git a/.github/ISSUE_TEMPLATE/11_feature-request.md b/.github/ISSUE_TEMPLATE/11_feature-request.md
index 2051ddef77..5045b17712 100644
--- a/.github/ISSUE_TEMPLATE/11_feature-request.md
+++ b/.github/ISSUE_TEMPLATE/11_feature-request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature Request
+name: ✨ Feature Request
 about: Suggest an idea for this project
 title: ''
 labels: ✨Feature
diff --git a/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md b/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
index 786742a3d8..e3628fb07d 100644
--- a/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/12_client-side-feature-request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature Request (Client specific)
+name: ✨ Feature Request (🖥️Client specific)
 about: Suggest an idea for this project
 title: ''
 labels: ✨Feature, 🖥️Client
diff --git a/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md b/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
index 3194142131..84f561d44c 100644
--- a/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/13_server-side-feature-request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature Request (Server specific)
+name: ✨ Feature Request (⚙️Server specific)
 about: Suggest an idea for this project
 title: ''
 labels: ✨Feature, ⚙️Server