Apply suggestions from code review

Co-authored-by: Noah Jacobus <jabronus@users.noreply.github.com>

.github/DISCUSSION_TEMPLATE/brand-request.yml

@@ -1,7 +1,6 @@
-title: "Brand Request: "
-labels:
-  - "icon request"
-  - "brand icon"
+name: "Brand request"
+description: "Request new brand or product logos to be added to FA Brands."
+labels: ["brand icon"]
 body:
   - type: markdown
     attributes:

.github/DISCUSSION_TEMPLATE/feature-requests.yml

@@ -1,45 +0,0 @@
-title: "Feature request: "
-labels: ["feature"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## 💡 Thanks for suggesting a new feature!
-        Your ideas help us improve Font Awesome. A clear, focused request makes it easier for the community to upvote and for our team to evaluate.
-
-  - type: textarea
-    id: use-case
-    attributes:
-      label: "Is your feature request related to a problem?"
-      description: "A clear and concise description of what the problem is."
-      placeholder: "I'm always frustrated when..."
-
-  - type: textarea
-    id: feature
-    attributes:
-      label: "Feature description"
-      description: "A clear and concise description of what you want to happen."
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: "Alternatives"
-      description: "A clear and concise description of any alternative solutions or features you've considered."
-
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: "Additional context"
-      description: "Add any other context or screenshots about the feature request here."
-
-  - type: checkboxes
-    id: feature-request-checklist
-    attributes:
-      label: "✅ Feature request checklist"
-      options:
-        - label: "This is a single, focused feature request"
-          required: true
-        - label: "I've searched existing feature requests to avoid duplicates"
-          required: true

.github/DISCUSSION_TEMPLATE/icon-request.yml

@@ -1,7 +1,6 @@
-title: "[Icon Name] Icon"
-labels:
-  - "icon request"
-  - "new icon"
+name: "Icon request"
+description: "Request new icons and help the community vote on what we should design next."
+labels: ["icon-request"]
 body:
   - type: markdown
     attributes:
@@ -57,4 +56,4 @@ body:
         - label: "I searched existing Discussions/Issues to avoid duplicates"
           required: true
         - label: "I understand how icon requests work and what makes one more likely to be accepted"
-          required: true
+          required: true

.github/DISCUSSION_TEMPLATE/icon-wizard-request.yml

@@ -1,13 +1,12 @@
-title: "Icon Wizard Request: "
-labels:
-  - "icon request"
-  - "new modifier"
+name: "Icon Wizard modifier request"
+description: "Request new modifiers to add to the Icon Wizard."
+labels: ["icon wizard modifier"]
 body:
   - type: markdown
     attributes:
       value: |
-        ## 🪄 Thanks for suggesting an addition to the Icon Wizard!
-        The [Icon Wizard](https://docs.fontawesome.com/web/add-icons/icon-wizard) lets folks add modifiers to any existing Font Awesome Pro icon.
+        ## 🧙‍♂️ What modifier are you requesting?
+        Describe the modifier you'd like to add and what it should represent.
 
   - type: textarea
     id: modifier-description
@@ -33,4 +32,4 @@ body:
         - label: "I've checked existing Icon Wizard modifiers and didn't find this idea"
           required: true
         - label: "This is a single, clear modifier concept"
-          required: true
+          required: true

.github/ISSUE_TEMPLATE/000_icon_request.yml

@@ -0,0 +1,36 @@
+name: Icon request
+description: Suggest an icon to be included in Font Awesome
+labels: ["new icon"]
+title: "Icon request: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to request a new icon!
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use case
+      description: Describe how this icon could be used.
+  - type: textarea
+    id: example
+    attributes:
+      label: Example image
+      description: Insert the example image here if necessary. A good example is a single color image which plays well at small sizes (16px)
+  - type: checkboxes
+    id: icon-request-checklist
+    attributes:
+      label: Icon request checklist
+      options:
+        - label: 'The title starts with "Icon request: " and is followed by the requested icon name'
+          required: true
+        - label: 'This icon does not represent a brand'
+          required: true
+        - label: 'This is a single icon or matched pair (Ex: `lock` / `unlock`)'
+          required: true
+        - label: The request is for a concrete object, or I've included an example image
+          required: true
+        - label: 'I have [searched for existing issues](https://github.com/FortAwesome/Font-Awesome/issues) and to the best of my knowledge this is not a duplicate'
+          required: true
+        - label: 'I have [understood how requests work](https://fontawesome.com/community/leaderboard/new#faqs)'
+          required: true

.github/ISSUE_TEMPLATE/001_brand_request.yml

@@ -0,0 +1,36 @@
+name: Brand request
+description: Suggest a brand to be included in Font Awesome
+labels: ["brand icon"]
+title: "Brand request: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to request a new brand!
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Please enter a brief description of this brand and why it is important to have it in the core of Font Awesome
+  - type: input
+    id: official-website
+    attributes:
+      label: Official website
+      description: Please provide the official website of this brand. The website must be in production and reachable from the public internet
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Brand guidelines
+      description: "Link to brand guidelines, if available (e.g.: https://about.twitter.com/en/who-we-are/brand-toolkit)"
+  - type: checkboxes
+    id: icon-request-checklist
+    attributes:
+      label: Icon request checklist
+      options:
+        - label: 'The title starts with "Brand request: ", is followed by the requested brand name'
+          required: true
+        - label: 'I have [searched for existing issues](https://github.com/FortAwesome/Font-Awesome/issues) and to the best of my knowledge this is not a duplicate'
+          required: true
+        - label: 'I have [understood how requests work](https://fontawesome.com/community/leaderboard/brands#faqs)'
+          required: true

.github/ISSUE_TEMPLATE/100_web_bug_report.yml

@@ -1,7 +1,7 @@
 name: Bug report (Web - CSS - JS)
 description: Report a bug which occurs in a web application
-labels: ["needs-triage"]
-type: bug
+title: "Bug: "
+labels: ["bug", "needs-triage"]
 body:
   - type: markdown
     attributes:
@@ -34,7 +34,7 @@ body:
     attributes:
       label: Font Awesome version
       description: Provide the version of Font Awesome affected by this bug
-      placeholder: v7.1.0
+      placeholder: v6.0.0
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/101_other_bug_report.yml

@@ -1,7 +1,7 @@
 name: Bug report (Desktop / Native / Other)
 description: Report a bug which occurs outside of a web application
-labels: ["needs-triage"]
-type: bug
+title: "Bug: "
+labels: ["bug", "needs-triage"]
 body:
   - type: markdown
     attributes:
@@ -19,7 +19,7 @@ body:
     attributes:
       label: Font Awesome version
       description: Provide the version of Font Awesome affected by this bug
-      placeholder: v7.1.0
+      placeholder: v6.0.0
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/200_feature_request.yml

@@ -0,0 +1,42 @@
+name: Feature request
+description: Suggest an idea for Font Awesome
+title: "Feature request: "
+labels: ['feature']
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to request a new feature!
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Is your feature request related to a problem?
+      description: A clear and concise description of what the problem is
+      placeholder: I'm always frustrated when...
+  - type: textarea
+    id: feature
+    attributes:
+      label: Feature description
+      description: A clear and concise description of what you want to happen
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives
+      description: A clear and concise description of any alternative solutions or features you've considered.
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here
+  - type: checkboxes
+    id: feature-request-checklist
+    attributes:
+      label: Feature request checklist
+      options:
+        - label: 'The title starts with "Feature request: " and is followed by the requested feature description'
+          required: true
+        - label: 'This is a single feature'
+          required: true
+        - label: 'I have [searched for existing issues](https://github.com/FortAwesome/Font-Awesome/issues) and to the best of my knowledge this is not a duplicate'
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,16 +1,4 @@
 contact_links:
-  - name: "✨ Icon Requests"
-    url: "https://github.com/FortAwesome/Font-Awesome/discussions/new?category=icon-requests"
-    about: "Request new icons or vote on existing icon ideas."
-
-  - name: "🏷️ Brand Requests"
-    url: "https://github.com/FortAwesome/Font-Awesome/discussions/new?category=brand-requests"
-    about: "Request new brands or logos to be added to FA Brands."
-
-  - name: "💡 Feature Requests"
-    url: "https://github.com/FortAwesome/Font-Awesome/discussions/new?category=icon-requests"
-    about: "Suggest an idea for Font Awesome."
-
   - name: Pro License Issue
     url: https://fontawesome.com/#footer
-    about: Click on the "Support" link in the footer
+    about: Click on the "Support" link in the footer

CONTRIBUTING.md

@@ -4,19 +4,14 @@ Looking to contribute something to Font Awesome? **Here's how you can help.**
 
 ## Quick start
 
-We only accept issues bug reports or feature requests.
+We only accept issues that are icon requests, bug reports, or feature requests.
 Bugs must be isolated and reproducible problems that we can fix within the Font
 Awesome core.
+
+* [Request a new icon](https://github.com/FortAwesome/Font-Awesome/issues/new?title=Icon%20request:%20icon-name&template=icon-request.md)
 * [Request a new feature](https://github.com/FortAwesome/Font-Awesome/issues/new??title=Feature%20request:feature-name&template=feature-request.md)
 * [Submit a bug report](https://github.com/FortAwesome/Font-Awesome/issues/new?template=bug-report.md)
 
-## Icon Requests
-
-Please do not submit icon requests as issues. Instead, please use Github's Discussions:
-* [Request a new icon](https://github.com/FortAwesome/Font-Awesome/discussions/new?category=icon-requests)
-* [Request a new brand icon](https://github.com/FortAwesome/Font-Awesome/discussions/new?category=brand-requests)
-* [Request a new modifier in the Icon Wizard](https://github.com/FortAwesome/Font-Awesome/discussions/new?category=icon-wizard-requests)
-
 ## Key branches
 
 - `master` is the latest, deployed version