diff --git a/components/Button.tsx b/components/Button.tsx
index 4f43b3e..b503d00 100644
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -10,7 +10,7 @@ type VariantStyles = {
 type Button = {
     variant?: string
     className: string
-    href: string
+    href?: string
     children: ReactNode
 }
 
diff --git a/components/Feature.tsx b/components/Feature.tsx
new file mode 100644
index 0000000..1142452
--- /dev/null
+++ b/components/Feature.tsx
@@ -0,0 +1,28 @@
+import {ElementType, ReactNode} from 'react'
+import {twMerge} from 'tailwind-merge'
+
+type FeatureProps = {
+    icon: ElementType
+    title: String
+    children: ReactNode
+    className?: string
+}
+
+export function Feature({icon: Icon, title, children, className}: FeatureProps) {
+    return (
+        <div className={twMerge(`
+            rounded-2xl 
+            border 
+            border-zinc-100 
+            p-6 
+            dark:border-zinc-700/40
+            ${className ?? ""}
+        `)}>
+            <h2 className="flex text-sm font-semibold text-zinc-900 dark:text-zinc-100">
+                <Icon className="h-6 w-6 flex-none"/>
+                <span className="ml-3">{title}</span>
+            </h2>
+            {children}
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/components/Resume.tsx b/components/Resume.tsx
index 9388ef5..a4249ee 100644
--- a/components/Resume.tsx
+++ b/components/Resume.tsx
@@ -1,6 +1,7 @@
 import {BriefcaseIcon} from '@/components/icons/BriefcaseIcon'
 import {ArrowDownIcon} from '@/components/icons/ArrowDownIcon'
 import {Button} from '@/components/Button'
+import {Feature} from '@/components/Feature'
 
 type Work = {
     company: string
@@ -44,15 +45,10 @@ export function Resume() {
     ]
 
     return (
-        <div className="rounded-2xl border border-zinc-100 p-6 dark:border-zinc-700/40">
-            <h2 className="flex text-sm font-semibold text-zinc-900 dark:text-zinc-100">
-                <BriefcaseIcon className="h-6 w-6 flex-none"/>
-                <span className="ml-3">Work</span>
-            </h2>
+        <Feature icon={BriefcaseIcon} title="Work">
             <ol className="mt-6 space-y-4">
                 {work.map((role, roleIndex) => (
                     <li key={roleIndex} className="flex gap-4">
-
                         <dl className="flex flex-auto flex-wrap gap-x-2">
                             <dt className="sr-only">Company</dt>
                             <dd className="w-full flex-none text-sm font-medium text-zinc-900 dark:text-zinc-100">
@@ -86,6 +82,6 @@ export function Resume() {
                 <ArrowDownIcon
                     className="h-4 w-4 stroke-zinc-400 transition group-active:stroke-zinc-600 dark:group-hover:stroke-zinc-50 dark:group-active:stroke-zinc-50"/>
             </Button>
-        </div>
+        </Feature>
     )
 }
\ No newline at end of file
diff --git a/components/Subscribe.tsx b/components/Subscribe.tsx
new file mode 100644
index 0000000..b0cf5cd
--- /dev/null
+++ b/components/Subscribe.tsx
@@ -0,0 +1,25 @@
+import {Feature} from '@/components/Feature'
+import {MailIcon} from '@/components/icons/MailIcon'
+import {Button} from '@/components/Button'
+
+export function Subscribe() {
+    return (
+        <Feature icon={MailIcon} title="Subscribe">
+            <p className="mt-2 text-sm text-zinc-600 dark:text-zinc-400">
+                Get notified when I publish something new, and unsubscribe at any time.
+            </p>
+            <div className="mt-6 flex">
+                <input
+                    type="email"
+                    placeholder="Email address"
+                    aria-label="Email address"
+                    required
+                    className="min-w-0 flex-auto appearance-none rounded-md border border-zinc-900/10 bg-white px-3 py-[calc(theme(spacing.2)-1px)] shadow-md shadow-zinc-800/5 placeholder:text-zinc-400 focus:border-indigo-500 focus:outline-none focus:ring-4 focus:ring-indigo-500/10 dark:border-zinc-700 dark:bg-zinc-700/[0.15] dark:text-zinc-200 dark:placeholder:text-zinc-500 dark:focus:border-indigo-400 dark:focus:ring-indigo-400/10 sm:text-sm"
+                />
+                <Button className="ml-4 flex-none" variant="secondary">
+                    Join
+                </Button>
+            </div>
+        </Feature>
+    )
+}
\ No newline at end of file
diff --git a/components/icons/MailIcon.tsx b/components/icons/MailIcon.tsx
index 85db943..d344087 100644
--- a/components/icons/MailIcon.tsx
+++ b/components/icons/MailIcon.tsx
@@ -2,11 +2,11 @@ import {Props} from '@/types'
 
 export function MailIcon(props: Props) {
     return (
-        <svg viewBox="0 0 24 24" aria-hidden="true" {...props}>
-            <path
-                fillRule="evenodd"
-                d="M6 5a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h12a3 3 0 0 0 3-3V8a3 3 0 0 0-3-3H6Zm.245 2.187a.75.75 0 0 0-.99 1.126l6.25 5.5a.75.75 0 0 0 .99 0l6.25-5.5a.75.75 0 0 0-.99-1.126L12 12.251 6.245 7.187Z"
-            />
+        <svg viewBox="0 0 24 24" fill="none" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true"
+             className="h-6 w-6 flex-none" {...props}>
+            <path d="M2.75 7.75a3 3 0 0 1 3-3h12.5a3 3 0 0 1 3 3v8.5a3 3 0 0 1-3 3H5.75a3 3 0 0 1-3-3v-8.5Z"
+                  className="fill-zinc-100 stroke-zinc-400 dark:fill-zinc-100/10 dark:stroke-zinc-500"></path>
+            <path d="m4 6 6.024 5.479a2.915 2.915 0 0 0 3.952 0L20 6" className="stroke-zinc-400 dark:stroke-zinc-500"></path>
         </svg>
     )
 }
\ No newline at end of file