diff --git a/.github/ISSUE_TEMPLATE/request-svg-.md b/.github/ISSUE_TEMPLATE/request-svg-.md
deleted file mode 100644
index 1e15060..0000000
--- a/.github/ISSUE_TEMPLATE/request-svg-.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Request SVG.
-about: Request an SVG here.
-title: '🔔 [Request]:'
-labels: request
----
-
-## 🔎 Information:
-
-> **All fields are required**:
-
-- **Title**:
-- **Category** ([check categories](https://github.com/pheralb/svgl/blob/main/src/types/categories.ts#L1)):
-- **Source (.svg)** (type the link of the svg):
-- **Company/Product Website**:
-
-## 📝 Checklist:
-
-> **Make sure that you have completed the following steps**:
-
-- [x] I have permission to use this logo.
-- [x] The link I have provided is optimized for web use.
-- [x] The size of the SVG is less than **20kb**.
diff --git a/.github/ISSUE_TEMPLATE/request-svg.yml b/.github/ISSUE_TEMPLATE/request-svg.yml
new file mode 100644
index 0000000..003af14
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/request-svg.yml
@@ -0,0 +1,92 @@
+name: 🔔 Request SVG
+description: Request a new SVG icon to be added to the collection.
+title: '[🔔 Request SVG]: '
+labels: [request]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        👋 Thanks for requesting a new SVG icon! Please fill out the form below to help us understand your request better:
+
+  - type: input
+    id: svg-name
+    attributes:
+      label: Title
+      description: Product name, brand name.
+      placeholder: SVGL
+    validations:
+      required: true
+
+  - type: input
+    id: svg-url
+    attributes:
+      label: SVG URL
+      description: The URL to the SVG file.
+      placeholder: https://website.com/logo.svg
+    validations:
+      required: true
+
+  - type: input
+    id: svg-url-dark
+    attributes:
+      label: SVG Dark Mode URL (optional)
+      description: The URL to the SVG file for dark mode.
+      placeholder: https://website.com/logo-dark.svg
+    validations:
+      required: false
+
+  - type: input
+    id: svg-product-url
+    attributes:
+      label: Product URL
+      description: The URL to the product or brand.
+      placeholder: https://website.com
+    validations:
+      required: true
+
+  - type: dropdown
+    id: svg-category
+    attributes:
+      label: Category
+      description: Category/Categories of the product. If the category does not exist, select “Others”.
+      multiple: true
+      options:
+        - AI
+        - Software
+        - Hardware
+        - Library
+        - Hosting
+        - Framework
+        - Devtool
+        - Monorepo
+        - CMS
+        - Database
+        - Compiler
+        - Crypto
+        - Cybersecurity
+        - Social
+        - Entertainment
+        - Browser
+        - Language
+        - Education
+        - Design
+        - Community
+        - Marketplace
+        - Music
+        - Vercel
+        - Google
+        - Payment
+        - void(0)
+        - Other
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Checklist
+      options:
+        - label: I have permission to use this logo.
+          required: true
+        - label: The .svg URL I have provided is optimized for web use.
+          required: true
+        - label: The .svg size is less than **20kb**.
+          required: true