diff --git a/src/components/Button/Button.stories.mdx b/src/components/Button/Button.stories.mdx
index da61946..959374a 100644
--- a/src/components/Button/Button.stories.mdx
+++ b/src/components/Button/Button.stories.mdx
@@ -1,6 +1,8 @@
 import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs';
 
 import Button from './Button.vue';
+import IconList from '../Shared/IconList.js';
+export const icons = Object.keys(IconList.solid);
 
 <Meta
   title="Components/Button"
@@ -10,39 +12,34 @@ import Button from './Button.vue';
       control: {
         type: 'select',
         options: ['primary', 'secondary', 'icon', 'text', 'outline'],
-        defaultValue: 'primary',
       },
     },
     loading: {
       control: {
         type: 'boolean',
-        defaultValue: false,
       },
     },
     disabled: {
       control: {
         type: 'boolean',
-        defaultValue: false,
       },
     },
     size: {
       control: {
         type: 'select',
         options: ['small', 'medium', 'large'],
-        defaultValue: 'medium',
       },
     },
     icon: {
       control: {
-        type: 'text',
-        defaultValue: 'PlusCircleSolid',
+        type: 'select',
+        options: icons,
       },
     },
     type: {
       control: {
         type: 'select',
         options: ['button', 'submit', 'reset'],
-        defaultValue: 'button',
       },
     },
     backgroundColor: {
@@ -50,6 +47,22 @@ import Button from './Button.vue';
         type: 'color',
       },
     },
+    iconColor: {
+      control: {
+        type: 'color',
+      },
+    },
+    iconSize: {
+      control: {
+        type: 'text',
+      },
+    },
+    iconKind: {
+      control: {
+        type: 'radio',
+        options: ['solid', 'outline'],
+      },
+    },
   }}
 />
 
@@ -78,6 +91,7 @@ export const Default = ({ slot1, slot2, ...rest }) => {
     argTypes={{ ...Default.argTypes }}
     args={{
       variant: 'primary',
+      icon: 'PlusCircleIcon',
       slot1: '<span>Primary</span>',
     }}
   >
diff --git a/src/components/Button/Button.vue b/src/components/Button/Button.vue
index 041227b..6db896b 100644
--- a/src/components/Button/Button.vue
+++ b/src/components/Button/Button.vue
@@ -1,13 +1,22 @@
 <script setup lang="ts">
 import './button.css';
 import { computed } from 'vue';
-import { PlusCircleIcon as PlusCircleOutline } from '@heroicons/vue/outline';
-import { PlusCircleIcon as PlusCircleSolid } from '@heroicons/vue/solid';
+import Icon from '../Icon/Icon.vue';
+import { IconKind, type IconSize } from '../Shared/Enums';
 export interface Props {
   variant?: 'primary' | 'secondary' | 'icon' | 'text' | 'outline';
   loading?: boolean;
   disabled?: boolean;
   icon?: string;
+  iconColor?: string;
+  iconSize?:
+    | IconSize.XSmall
+    | IconSize.Small
+    | IconSize.Medium
+    | IconSize.Large
+    | IconSize.XLarge
+    | string;
+  iconKind?: IconKind.Outline | IconKind.Solid;
   size?: 'small' | 'medium' | 'large';
   type?: 'button' | 'submit' | 'reset';
   backgroundColor?: string;
@@ -23,9 +32,6 @@ const classes = computed(() => ({
 const style = computed(() => ({
   backgroundColor: props.backgroundColor,
 }));
-const Icon = computed(() => {
-  return props.icon?.includes('Outline') ? PlusCircleOutline : PlusCircleSolid;
-});
 const onClick = () => {
   emit('click');
 };
@@ -38,7 +44,13 @@ const onClick = () => {
     :disabled="disabled || loading"
     @click="onClick"
   >
-    <component v-if="props.icon?.length" :is="Icon" class="icon" />
+    <Icon
+      :name="`${icon}`"
+      :size="iconSize || '24'"
+      :color="iconColor"
+      :kind="iconKind || IconKind.Solid"
+      class="icon"
+    />
     <slot name="custom-icon" />
     <slot v-if="props.variant !== 'icon'" />
   </button>
diff --git a/src/components/Button/button.css b/src/components/Button/button.css
index 04fcc49..3b43646 100644
--- a/src/components/Button/button.css
+++ b/src/components/Button/button.css
@@ -32,5 +32,5 @@
   @apply font-normal text-sm px-4 py-2;
 }
 .icon {
-  @apply h-5 w-5 mx-2;
+  @apply mr-2;
 }
diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
deleted file mode 100644
index 18fa3e9..0000000
--- a/src/components/HelloWorld.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<script setup lang="ts">
-defineProps<{
-  msg: string;
-}>();
-</script>
-
-<template>
-  <div class="greetings">
-    <h1 class="green">{{ msg }}</h1>
-  </div>
-</template>
diff --git a/src/components/Icon/Icon.stories.mdx b/src/components/Icon/Icon.stories.mdx
new file mode 100644
index 0000000..4350f14
--- /dev/null
+++ b/src/components/Icon/Icon.stories.mdx
@@ -0,0 +1,66 @@
+import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs';
+
+import Icon from './Icon.vue';
+import IconList from '../Shared/IconList.js';
+export const icons = Object.keys(IconList.solid);
+
+<Meta
+  title="Components/Icon"
+  component={Icon}
+  argTypes={{
+    name: {
+      control: {
+        type: 'select',
+        options: icons,
+      },
+    },
+    size: {
+      control: {
+        type: 'radio',
+        options: ['20', '24', '32', '48', '64'],
+      },
+    },
+    color: {
+      control: {
+        type: 'color',
+      },
+    },
+    kind: {
+      control: {
+        type: 'radio',
+        options: ['solid', 'outline'],
+      },
+    },
+  }}
+/>
+
+export const Default = (args) => {
+  return {
+    components: { Icon },
+    setup() {
+      return { args };
+    },
+    template: `<Icon v-bind="args" />`,
+  };
+};
+
+# Default
+
+<Canvas>
+  <Story
+    name="Default"
+    argTypes={{ ...Default.argTypes }}
+    args={{
+      name: 'AcademicCapIcon',
+      size: '24',
+      color: '#000',
+      kind: 'solid',
+    }}
+  >
+    {Default.bind({})}
+  </Story>
+</Canvas>
+
+# Reference
+
+<ArgsTable />
diff --git a/src/components/Icon/Icon.vue b/src/components/Icon/Icon.vue
new file mode 100644
index 0000000..39f8d9c
--- /dev/null
+++ b/src/components/Icon/Icon.vue
@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import IconList from '../Shared/IconList';
+import type { IconKind, IconSize } from '../Shared/Enums';
+export interface Props {
+  name: string;
+  kind?: IconKind.Outline | IconKind.Solid;
+  size?:
+    | IconSize.XSmall
+    | IconSize.Small
+    | IconSize.Medium
+    | IconSize.Large
+    | IconSize.XLarge
+    | string;
+  color?: string;
+}
+
+const props = defineProps<Props>();
+
+const styles = computed(() => {
+  const { size, color } = props;
+  return {
+    color,
+    width: size,
+    height: size,
+  };
+});
+
+const Icon = computed(() => {
+  return IconList[props.kind || 'solid'][props.name || 'AcademicCapIcon'];
+});
+</script>
+<template>
+  <component :is="Icon" :style="styles" />
+</template>
diff --git a/src/components/Icon/__snapshots__/icon.spec.ts.snap b/src/components/Icon/__snapshots__/icon.spec.ts.snap
new file mode 100644
index 0000000..0989904
--- /dev/null
+++ b/src/components/Icon/__snapshots__/icon.spec.ts.snap
@@ -0,0 +1,15 @@
+// Vitest Snapshot v1
+
+exports[`Icon > renders properly 1`] = `
+<svg
+  aria-hidden="true"
+  fill="currentColor"
+  style="color: rgb(255, 255, 255);"
+  viewBox="0 0 20 20"
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <path
+    d="M5 4a1 1 0 00-2 0v7.268a2 2 0 000 3.464V16a1 1 0 102 0v-1.268a2 2 0 000-3.464V4zM11 4a1 1 0 10-2 0v1.268a2 2 0 000 3.464V16a1 1 0 102 0V8.732a2 2 0 000-3.464V4zM16 3a1 1 0 011 1v7.268a2 2 0 010 3.464V16a1 1 0 11-2 0v-1.268a2 2 0 010-3.464V4a1 1 0 011-1z"
+  />
+</svg>
+`;
diff --git a/src/components/Icon/icon.spec.ts b/src/components/Icon/icon.spec.ts
new file mode 100644
index 0000000..f563e87
--- /dev/null
+++ b/src/components/Icon/icon.spec.ts
@@ -0,0 +1,28 @@
+import { describe, it, expect } from 'vitest';
+
+import { mount } from '@vue/test-utils';
+import Icon from './Icon.vue';
+
+describe('Icon', () => {
+  it('renders properly', () => {
+    const wrapper = mount(Icon, {
+      props: {
+        name: 'AdjustmentsIcon',
+        size: '24',
+        color: 'rgb(255, 255, 255)',
+        kind: 'solid',
+      },
+    });
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.find('svg').exists()).toBe(true);
+    expect(wrapper.find('svg').element.getAttribute('aria-hidden')).toBe(
+      'true'
+    );
+    expect(wrapper.find('svg').element.getAttribute('style')).toBe(
+      'color: rgb(255, 255, 255);'
+    );
+    expect(wrapper.find('svg').element.getAttribute('fill')).toBe(
+      'currentColor'
+    );
+  });
+});
diff --git a/src/components/Shared/Enums.ts b/src/components/Shared/Enums.ts
new file mode 100644
index 0000000..c6e5cba
--- /dev/null
+++ b/src/components/Shared/Enums.ts
@@ -0,0 +1,12 @@
+export enum IconKind {
+  Solid = 'solid',
+  Outline = 'outline',
+}
+
+export enum IconSize {
+  XSmall = '20',
+  Small = '24',
+  Medium = '32',
+  Large = '40',
+  XLarge = '48',
+}
diff --git a/src/components/Shared/IconList.js b/src/components/Shared/IconList.js
new file mode 100644
index 0000000..feac7d3
--- /dev/null
+++ b/src/components/Shared/IconList.js
@@ -0,0 +1,6 @@
+import solid from '@heroicons/vue/solid/index.js';
+import outline from '@heroicons/vue/outline/index.js';
+export default {
+  solid,
+  outline,
+};
diff --git a/src/components/icons/IconCommunity.vue b/src/components/icons/IconCommunity.vue
deleted file mode 100644
index 2dc8b05..0000000
--- a/src/components/icons/IconCommunity.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
-    <path
-      d="M15 4a1 1 0 1 0 0 2V4zm0 11v-1a1 1 0 0 0-1 1h1zm0 4l-.707.707A1 1 0 0 0 16 19h-1zm-4-4l.707-.707A1 1 0 0 0 11 14v1zm-4.707-1.293a1 1 0 0 0-1.414 1.414l1.414-1.414zm-.707.707l-.707-.707.707.707zM9 11v-1a1 1 0 0 0-.707.293L9 11zm-4 0h1a1 1 0 0 0-1-1v1zm0 4H4a1 1 0 0 0 1.707.707L5 15zm10-9h2V4h-2v2zm2 0a1 1 0 0 1 1 1h2a3 3 0 0 0-3-3v2zm1 1v6h2V7h-2zm0 6a1 1 0 0 1-1 1v2a3 3 0 0 0 3-3h-2zm-1 1h-2v2h2v-2zm-3 1v4h2v-4h-2zm1.707 3.293l-4-4-1.414 1.414 4 4 1.414-1.414zM11 14H7v2h4v-2zm-4 0c-.276 0-.525-.111-.707-.293l-1.414 1.414C5.42 15.663 6.172 16 7 16v-2zm-.707 1.121l3.414-3.414-1.414-1.414-3.414 3.414 1.414 1.414zM9 12h4v-2H9v2zm4 0a3 3 0 0 0 3-3h-2a1 1 0 0 1-1 1v2zm3-3V3h-2v6h2zm0-6a3 3 0 0 0-3-3v2a1 1 0 0 1 1 1h2zm-3-3H3v2h10V0zM3 0a3 3 0 0 0-3 3h2a1 1 0 0 1 1-1V0zM0 3v6h2V3H0zm0 6a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1H0zm3 3h2v-2H3v2zm1-1v4h2v-4H4zm1.707 4.707l.586-.586-1.414-1.414-.586.586 1.414 1.414z"
-    />
-  </svg>
-</template>
diff --git a/src/components/icons/IconDocumentation.vue b/src/components/icons/IconDocumentation.vue
deleted file mode 100644
index 6d4791c..0000000
--- a/src/components/icons/IconDocumentation.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" fill="currentColor">
-    <path
-      d="M11 2.253a1 1 0 1 0-2 0h2zm-2 13a1 1 0 1 0 2 0H9zm.447-12.167a1 1 0 1 0 1.107-1.666L9.447 3.086zM1 2.253L.447 1.42A1 1 0 0 0 0 2.253h1zm0 13H0a1 1 0 0 0 1.553.833L1 15.253zm8.447.833a1 1 0 1 0 1.107-1.666l-1.107 1.666zm0-14.666a1 1 0 1 0 1.107 1.666L9.447 1.42zM19 2.253h1a1 1 0 0 0-.447-.833L19 2.253zm0 13l-.553.833A1 1 0 0 0 20 15.253h-1zm-9.553-.833a1 1 0 1 0 1.107 1.666L9.447 14.42zM9 2.253v13h2v-13H9zm1.553-.833C9.203.523 7.42 0 5.5 0v2c1.572 0 2.961.431 3.947 1.086l1.107-1.666zM5.5 0C3.58 0 1.797.523.447 1.42l1.107 1.666C2.539 2.431 3.928 2 5.5 2V0zM0 2.253v13h2v-13H0zm1.553 13.833C2.539 15.431 3.928 15 5.5 15v-2c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM5.5 15c1.572 0 2.961.431 3.947 1.086l1.107-1.666C9.203 13.523 7.42 13 5.5 13v2zm5.053-11.914C11.539 2.431 12.928 2 14.5 2V0c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM14.5 2c1.573 0 2.961.431 3.947 1.086l1.107-1.666C18.203.523 16.421 0 14.5 0v2zm3.5.253v13h2v-13h-2zm1.553 12.167C18.203 13.523 16.421 13 14.5 13v2c1.573 0 2.961.431 3.947 1.086l1.107-1.666zM14.5 13c-1.92 0-3.703.523-5.053 1.42l1.107 1.666C11.539 15.431 12.928 15 14.5 15v-2z"
-    />
-  </svg>
-</template>
diff --git a/src/components/icons/IconEcosystem.vue b/src/components/icons/IconEcosystem.vue
deleted file mode 100644
index c3a4f07..0000000
--- a/src/components/icons/IconEcosystem.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" fill="currentColor">
-    <path
-      d="M11.447 8.894a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm0 1.789a1 1 0 1 0 .894-1.789l-.894 1.789zM7.447 7.106a1 1 0 1 0-.894 1.789l.894-1.789zM10 9a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0H8zm9.447-5.606a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm2 .789a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zM18 5a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0h-2zm-5.447-4.606a1 1 0 1 0 .894-1.789l-.894 1.789zM9 1l.447-.894a1 1 0 0 0-.894 0L9 1zm-2.447.106a1 1 0 1 0 .894 1.789l-.894-1.789zm-6 3a1 1 0 1 0 .894 1.789L.553 4.106zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zm-2-.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 2.789a1 1 0 1 0 .894-1.789l-.894 1.789zM2 5a1 1 0 1 0-2 0h2zM0 7.5a1 1 0 1 0 2 0H0zm8.553 12.394a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 1a1 1 0 1 0 .894 1.789l-.894-1.789zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zM8 19a1 1 0 1 0 2 0H8zm2-2.5a1 1 0 1 0-2 0h2zm-7.447.394a1 1 0 1 0 .894-1.789l-.894 1.789zM1 15H0a1 1 0 0 0 .553.894L1 15zm1-2.5a1 1 0 1 0-2 0h2zm12.553 2.606a1 1 0 1 0 .894 1.789l-.894-1.789zM17 15l.447.894A1 1 0 0 0 18 15h-1zm1-2.5a1 1 0 1 0-2 0h2zm-7.447-5.394l-2 1 .894 1.789 2-1-.894-1.789zm-1.106 1l-2-1-.894 1.789 2 1 .894-1.789zM8 9v2.5h2V9H8zm8.553-4.894l-2 1 .894 1.789 2-1-.894-1.789zm.894 0l-2-1-.894 1.789 2 1 .894-1.789zM16 5v2.5h2V5h-2zm-4.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zm-2.894-1l-2 1 .894 1.789 2-1L8.553.106zM1.447 5.894l2-1-.894-1.789-2 1 .894 1.789zm-.894 0l2 1 .894-1.789-2-1-.894 1.789zM0 5v2.5h2V5H0zm9.447 13.106l-2-1-.894 1.789 2 1 .894-1.789zm0 1.789l2-1-.894-1.789-2 1 .894 1.789zM10 19v-2.5H8V19h2zm-6.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zM2 15v-2.5H0V15h2zm13.447 1.894l2-1-.894-1.789-2 1 .894 1.789zM18 15v-2.5h-2V15h2z"
-    />
-  </svg>
-</template>
diff --git a/src/components/icons/IconSupport.vue b/src/components/icons/IconSupport.vue
deleted file mode 100644
index 7452834..0000000
--- a/src/components/icons/IconSupport.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
-    <path
-      d="M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.666.105 5.5 5.5 0 0 0-.114 7.665L10 18.78l8.39-8.4a5.5 5.5 0 0 0-.114-7.665 5.5 5.5 0 0 0-7.666-.105l-.61.61z"
-    />
-  </svg>
-</template>
diff --git a/src/components/icons/IconTooling.vue b/src/components/icons/IconTooling.vue
deleted file mode 100644
index 660598d..0000000
--- a/src/components/icons/IconTooling.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- This icon is from <https://github.com/Templarian/MaterialDesign>, distributed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) license-->
-<template>
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    aria-hidden="true"
-    role="img"
-    class="iconify iconify--mdi"
-    width="24"
-    height="24"
-    preserveAspectRatio="xMidYMid meet"
-    viewBox="0 0 24 24"
-  >
-    <path
-      d="M20 18v-4h-3v1h-2v-1H9v1H7v-1H4v4h16M6.33 8l-1.74 4H7v-1h2v1h6v-1h2v1h2.41l-1.74-4H6.33M9 5v1h6V5H9m12.84 7.61c.1.22.16.48.16.8V18c0 .53-.21 1-.6 1.41c-.4.4-.85.59-1.4.59H4c-.55 0-1-.19-1.4-.59C2.21 19 2 18.53 2 18v-4.59c0-.32.06-.58.16-.8L4.5 7.22C4.84 6.41 5.45 6 6.33 6H7V5c0-.55.18-1 .57-1.41C7.96 3.2 8.44 3 9 3h6c.56 0 1.04.2 1.43.59c.39.41.57.86.57 1.41v1h.67c.88 0 1.49.41 1.83 1.22l2.34 5.39z"
-      fill="currentColor"
-    ></path>
-  </svg>
-</template>