diff --git a/components/contact/ContactForm.tsx b/components/contact/ContactForm.tsx
index 9cea87c9..508de303 100644
--- a/components/contact/ContactForm.tsx
+++ b/components/contact/ContactForm.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import HCaptcha from "@hcaptcha/react-hcaptcha";
 import { CheckIcon, XIcon } from "@primer/octicons-react";
-import { SendIcon } from "../icons";
+import SendIcon from "../icons/svg/send.svg";
 
 import styles from "./ContactForm.module.scss";
 
diff --git a/components/home/Home.tsx b/components/home/Home.tsx
index db41725d..29366911 100644
--- a/components/home/Home.tsx
+++ b/components/home/Home.tsx
@@ -1,5 +1,6 @@
 import Link from "./ColorLink";
-import { WaveIcon, LockIcon } from "../icons";
+import WaveIcon from "../icons/svg/wave.svg";
+import LockIcon from "../icons/svg/lock.svg";
 
 import styles from "./Home.module.scss";
 
diff --git a/components/notes/Meta.tsx b/components/notes/Meta.tsx
index ac0db8c1..6be44e05 100644
--- a/components/notes/Meta.tsx
+++ b/components/notes/Meta.tsx
@@ -1,7 +1,10 @@
 import Link from "next/link";
 import { format, parseISO } from "date-fns";
 import Hits from "../hits/Hits";
-import { DateIcon, TagIcon, EditIcon, ViewsIcon } from "../icons";
+import DateIcon from "../icons/svg/date.svg";
+import TagIcon from "../icons/svg/tag.svg";
+import EditIcon from "../icons/svg/edit.svg";
+import ViewsIcon from "../icons/svg/views.svg";
 import * as config from "../../lib/config";
 
 import styles from "./Meta.module.scss";
diff --git a/components/page-footer/Footer.tsx b/components/page-footer/Footer.tsx
index c9fbc128..7a14467f 100644
--- a/components/page-footer/Footer.tsx
+++ b/components/page-footer/Footer.tsx
@@ -1,5 +1,6 @@
 import Link from "next/link";
-import { HeartIcon, NextjsIcon } from "../icons";
+import HeartIcon from "../icons/svg/heart.svg";
+import NextjsIcon from "../icons/svg/nextjs.svg";
 import * as config from "../../lib/config";
 
 import styles from "./Footer.module.scss";
diff --git a/components/page-header/Menu.tsx b/components/page-header/Menu.tsx
index ce560db9..0b2a419c 100644
--- a/components/page-header/Menu.tsx
+++ b/components/page-header/Menu.tsx
@@ -1,6 +1,9 @@
 import dynamic from "next/dynamic";
 import Link from "next/link";
-import { HomeIcon, NotesIcon, ProjectsIcon, ContactIcon } from "../icons";
+import HomeIcon from "../icons/svg/home.svg";
+import NotesIcon from "../icons/svg/notes.svg";
+import ProjectsIcon from "../icons/svg/projects.svg";
+import ContactIcon from "../icons/svg/contact.svg";
 
 import styles from "./Menu.module.scss";
 
diff --git a/components/page-header/ThemeToggle.tsx b/components/page-header/ThemeToggle.tsx
index e4d2af31..1e29a611 100644
--- a/components/page-header/ThemeToggle.tsx
+++ b/components/page-header/ThemeToggle.tsx
@@ -1,5 +1,6 @@
 import { useState, useEffect, useCallback } from "react";
-import { BulbOffIcon, BulbOnIcon } from "../icons";
+import BulbOffIcon from "../icons/svg/bulb-off.svg";
+import BulbOnIcon from "../icons/svg/bulb-on.svg";
 
 import styles from "./ThemeToggle.module.scss";
 
diff --git a/pages/birthday.tsx b/pages/birthday.tsx
index 75c6b6c5..f9f2b16b 100644
--- a/pages/birthday.tsx
+++ b/pages/birthday.tsx
@@ -3,7 +3,7 @@ import Container from "../components/Container";
 import Content from "../components/Content";
 import PageTitle from "../components/page/PageTitle";
 import Video from "../components/video/FullPageVideo";
-import { TapeIcon } from "../components/icons";
+import TapeIcon from "../components/icons/svg/tape.svg";
 
 import thumbnail from "../public/static/images/birthday/thumb.png";
 
diff --git a/pages/cli.tsx b/pages/cli.tsx
index 2e36de87..2f992437 100644
--- a/pages/cli.tsx
+++ b/pages/cli.tsx
@@ -3,7 +3,7 @@ import Layout from "../components/Layout";
 import Container from "../components/Container";
 import Content from "../components/Content";
 import PageTitle from "../components/page/PageTitle";
-import { BotIcon } from "../components/icons";
+import BotIcon from "../components/icons/svg/tape.svg";
 
 import cliImg from "../public/static/images/cli/screenshot.png";
 
diff --git a/pages/contact.tsx b/pages/contact.tsx
index 2eb23b04..3b004f16 100644
--- a/pages/contact.tsx
+++ b/pages/contact.tsx
@@ -2,7 +2,8 @@ import Layout from "../components/Layout";
 import Container from "../components/Container";
 import PageTitle from "../components/page/PageTitle";
 import ContactForm from "../components/contact/ContactForm";
-import { MailIcon, LockIcon } from "../components/icons";
+import MailIcon from "../components/icons/svg/mail.svg";
+import LockIcon from "../components/icons/svg/lock.svg";
 
 export default function Contact() {
   return (
diff --git a/pages/license.tsx b/pages/license.tsx
index 397c3a78..f0eca8b6 100644
--- a/pages/license.tsx
+++ b/pages/license.tsx
@@ -2,7 +2,7 @@ import Layout from "../components/Layout";
 import Container from "../components/Container";
 import Content from "../components/Content";
 import PageTitle from "../components/page/PageTitle";
-import { LicenseIcon } from "../components/icons";
+import LicenseIcon from "../components/icons/svg/license.svg";
 
 export default function License() {
   return (
diff --git a/pages/previously.tsx b/pages/previously.tsx
index 7a29d62b..b5812835 100644
--- a/pages/previously.tsx
+++ b/pages/previously.tsx
@@ -5,7 +5,8 @@ import Layout from "../components/Layout";
 import Container from "../components/Container";
 import Content from "../components/Content";
 import PageTitle from "../components/page/PageTitle";
-import { FloppyIcon, SirenIcon } from "../components/icons";
+import FloppyIcon from "../components/icons/svg/floppy.svg";
+import SirenIcon from "../components/icons/svg/siren.svg";
 
 import img_wayback from "../public/static/images/previously/wayback.png";
 import img_2002_02 from "../public/static/images/previously/2002_02.png";
diff --git a/pages/privacy.tsx b/pages/privacy.tsx
index 6b20c2f5..4f2e4442 100644
--- a/pages/privacy.tsx
+++ b/pages/privacy.tsx
@@ -4,7 +4,7 @@ import Layout from "../components/Layout";
 import Container from "../components/Container";
 import Content from "../components/Content";
 import PageTitle from "../components/page/PageTitle";
-import { PrivacyIcon } from "../components/icons";
+import PrivacyIcon from "../components/icons/svg/privacy.svg";
 
 import faunaImg from "../public/static/images/privacy/fauna_hits.png";
 
diff --git a/pages/projects.tsx b/pages/projects.tsx
index c5ca9026..d836d291 100644
--- a/pages/projects.tsx
+++ b/pages/projects.tsx
@@ -3,7 +3,7 @@ import Layout from "../components/Layout";
 import Container from "../components/Container";
 import PageTitle from "../components/page/PageTitle";
 import RepoCard from "../components/projects/RepoCard";
-import { ProjectsIcon } from "../components/icons";
+import ProjectsIcon from "../components/icons/svg/projects.svg";
 import type { GetStaticProps } from "next";
 
 export default function Projects({ repos }) {
diff --git a/pages/uses.tsx b/pages/uses.tsx
index a68c0616..f8ae22b5 100644
--- a/pages/uses.tsx
+++ b/pages/uses.tsx
@@ -4,7 +4,7 @@ import Layout from "../components/Layout";
 import Container from "../components/Container";
 import Content from "../components/Content";
 import PageTitle from "../components/page/PageTitle";
-import { LaptopIcon } from "../components/icons";
+import LaptopIcon from "../components/icons/svg/laptop.svg";
 
 import desktopImg from "../public/static/images/uses/bigsur.png";