diff --git a/src/package/components/Button.svelte b/src/package/components/Button.svelte
index 4b0c3873..f9a4bf03 100644
--- a/src/package/components/Button.svelte
+++ b/src/package/components/Button.svelte
@@ -49,6 +49,8 @@
     <a class={className} {href} {disabled} {title} {target} on:click>
         <slot />
     </a>
+{:else if as === 'input'}
+    <input class={className} {value} {disabled} {title} on:click />
 {:else}
     <svelte:element this={as} class={className} {disabled} {title} on:click>
         <slot />
diff --git a/src/package/plugins/generator/index.js b/src/package/plugins/generator/index.js
index 74f7576b..caf79763 100644
--- a/src/package/plugins/generator/index.js
+++ b/src/package/plugins/generator/index.js
@@ -42,13 +42,16 @@ export default function Generator(options) {
             ) {
                 return;
             }
-            if (options.landingPage) await landingPage(API_URL);
-            if (options.projectColors) await projectColors(API_URL);
-            if (options.gameVersions) await gameVersions(API_URL);
+
             if (options.tags) await tags(API_URL);
+            if (options.landingPage) await landingPage(API_URL);
+            if (options.gameVersions) await gameVersions(API_URL);
+            if (options.projectColors) await projectColors(API_URL);
+
             // Write new state
             state.lastGenerated = new Date().toISOString();
             state.options = options;
+
             await fs.writeFile('./generated/state.json', JSON.stringify(state, null, 2));
         },
     };
diff --git a/src/package/plugins/generator/outputs/tags.js b/src/package/plugins/generator/outputs/tags.js
index fe84a83c..a7ab47ac 100644
--- a/src/package/plugins/generator/outputs/tags.js
+++ b/src/package/plugins/generator/outputs/tags.js
@@ -19,10 +19,15 @@ export async function tags(API_URL) {
     ]);
     progressBar.update(4);
 
+    const tagIconReducer = (a, v) => ({
+        ...a,
+        [v.name]: v.icon.replace('<svg', '<svg class="icon"'),
+    });
+
     // Create single object with icons
     const tagIcons = {
-        ...categories.reduce((a, v) => ({ ...a, [v.name]: v.icon }), {}),
-        ...loaders.reduce((a, v) => ({ ...a, [v.name]: v.icon }), {}),
+        ...categories.reduce(tagIconReducer, {}),
+        ...loaders.reduce(tagIconReducer, {}),
     };
     progressBar.increment();