diff --git a/components/MobileNav.tsx b/components/MobileNav.tsx
index e01f227..d1d2905 100644
--- a/components/MobileNav.tsx
+++ b/components/MobileNav.tsx
@@ -78,7 +78,10 @@ const MobileNav: FC<Props> = ({ open, close }) => {
 	return (
 		<Bar dark={dark} open={open} ref={ref}>
 			<div className='close'>
-				<IconButton icon={dark ? '/dark-close.svg' : '/light-close.svg'} onClick={close} />
+				<IconButton
+					icon={dark ? '/icons/dark-close.svg' : '/icons/light-close.svg'}
+					onClick={close}
+				/>
 			</div>
 			<div className='mobile-button-wrapper'>
 				<Button onClick={() => toggle()}>{dark ? 'Light Mode' : 'Dark Mode'}</Button>
diff --git a/components/Nav.tsx b/components/Nav.tsx
index 6302d86..4c27723 100644
--- a/components/Nav.tsx
+++ b/components/Nav.tsx
@@ -74,7 +74,7 @@ const Nav: FC = () => {
 				<h1>Hazem Krimi</h1>
 			</div>
 			<div className='buttons'>
-				<IconButton icon={dark ? '/sun.svg' : '/moon.svg'} onClick={toggle} />
+				<IconButton icon={dark ? '/icons/sun.svg' : '/icons/moon.svg'} onClick={toggle} />
 				<Button onClick={() => router.push('/about')}>About</Button>
 				<Button onClick={() => router.push('/portfolio')}>Portfolio</Button>
 				<Button onClick={() => router.push('/blog')}>Blog</Button>
@@ -87,7 +87,7 @@ const Nav: FC = () => {
 					Resume
 				</Button>
 				<IconButton
-					icon={dark ? '/light-menu.svg' : '/dark-menu.svg'}
+					icon={dark ? '/icons/light-menu.svg' : '/icons/dark-menu.svg'}
 					onClick={() => setMobileNavOpen(true)}
 				/>
 			</div>
diff --git a/pages/about.tsx b/pages/about.tsx
index ddb561c..1514e87 100644
--- a/pages/about.tsx
+++ b/pages/about.tsx
@@ -107,43 +107,43 @@ const About: FC = () => {
 						<h1>Contact Me</h1>
 						<div className='contact'>
 							<IconButton
-								icon={dark ? '/light-mail.svg' : '/dark-mail.svg'}
+								icon={dark ? '/icons/light-mail.svg' : '/icons/dark-mail.svg'}
 								width={36}
 								height={36}
 								onClick={() => window.open('mailto:me@hazemkrimi.tech', '_blank')}
 							/>
 							<IconButton
-								icon={dark ? '/light-github.svg' : '/dark-github.svg'}
+								icon={dark ? '/icons/light-github.svg' : '/icons/dark-github.svg'}
 								width={36}
 								height={36}
 								onClick={() => window.open('https://github.com/hazemKrimi', '_blank')}
 							/>
 							<IconButton
-								icon={dark ? '/light-twitter.svg' : '/dark-twitter.svg'}
+								icon={dark ? '/icons/light-twitter.svg' : '/icons/dark-twitter.svg'}
 								width={36}
 								height={36}
 								onClick={() => window.open('https://twitter.com/HazemKrimi', '_blank')}
 							/>
 							<IconButton
-								icon={dark ? '/light-linkedin.svg' : '/dark-linkedin.svg'}
+								icon={dark ? '/icons/light-linkedin.svg' : '/icons/dark-linkedin.svg'}
 								width={36}
 								height={36}
 								onClick={() => window.open('https://linkedin.com/in/hazemkrimi', '_blank')}
 							/>
 							<IconButton
-								icon={dark ? '/light-codepen.svg' : '/dark-codepen.svg'}
+								icon={dark ? '/icons/light-codepen.svg' : '/icons/dark-codepen.svg'}
 								width={36}
 								height={36}
 								onClick={() => window.open('https://codepen.io/hazemkrimi', '_blank')}
 							/>
 							<IconButton
-								icon={dark ? '/light-dribbble.svg' : '/dark-dribbble.svg'}
+								icon={dark ? '/icons/light-dribbble.svg' : '/icons/dark-dribbble.svg'}
 								width={36}
 								height={36}
 								onClick={() => window.open('https://dribbble.com/HazemKrimi', '_blank')}
 							/>
 							<IconButton
-								icon={dark ? '/light-instagram.svg' : '/dark-instagram.svg'}
+								icon={dark ? '/icons/light-instagram.svg' : '/icons/dark-instagram.svg'}
 								width={36}
 								height={36}
 								onClick={() => window.open('https://instagram.com/hazemkrimi', '_blank')}
diff --git a/pages/blog/[slug].tsx b/pages/blog/[slug].tsx
index a7266ae..e2d55c5 100644
--- a/pages/blog/[slug].tsx
+++ b/pages/blog/[slug].tsx
@@ -148,7 +148,7 @@ const BlogPost: FC<Props> = ({ source, frontMatter }) => {
 			<Wrapper>
 				<div className='meta'>
 					<div className='back' onClick={() => router.back()}>
-						<IconButton icon='/arrow-left.svg' />
+						<IconButton icon='/icons/arrow-left.svg' />
 						<span>Back</span>
 					</div>
 					<h1>{frontMatter.title}</h1>
diff --git a/pages/blog/index.tsx b/pages/blog/index.tsx
index d2be3b2..7d1bc57 100644
--- a/pages/blog/index.tsx
+++ b/pages/blog/index.tsx
@@ -79,7 +79,7 @@ const Index: FC<Props> = ({ blogPosts }) => {
 			</Head>
 			<Wrapper>
 				<div className='back' onClick={() => router.back()}>
-					<IconButton icon='/arrow-left.svg' />
+					<IconButton icon='/icons/arrow-left.svg' />
 					<span>Back</span>
 				</div>
 				<h1>Blog</h1>
diff --git a/pages/portfolio/[slug].tsx b/pages/portfolio/[slug].tsx
index 9ab4c6d..8860f69 100644
--- a/pages/portfolio/[slug].tsx
+++ b/pages/portfolio/[slug].tsx
@@ -135,7 +135,7 @@ const PortfolioProject: FC<Props> = ({ source, frontMatter }) => {
 			<Wrapper>
 				<div className='meta'>
 					<div className='back' onClick={() => router.back()}>
-						<IconButton icon='/arrow-left.svg' />
+						<IconButton icon='/icons/arrow-left.svg' />
 						<span>Back</span>
 					</div>
 					<h1>{frontMatter.title}</h1>
diff --git a/pages/portfolio/index.tsx b/pages/portfolio/index.tsx
index 94b6fc0..46769bc 100644
--- a/pages/portfolio/index.tsx
+++ b/pages/portfolio/index.tsx
@@ -78,7 +78,7 @@ const Index: FC<Props> = ({ portfolioProjects }) => {
 			</Head>
 			<Wrapper>
 				<div className='back' onClick={() => router.back()}>
-					<IconButton icon='/arrow-left.svg' />
+					<IconButton icon='/icons/arrow-left.svg' />
 					<span>Back</span>
 				</div>
 				<h1>Portfolio</h1>
diff --git a/public/arrow-left.svg b/public/icons/arrow-left.svg
similarity index 100%
rename from public/arrow-left.svg
rename to public/icons/arrow-left.svg
diff --git a/public/dark-close.svg b/public/icons/dark-close.svg
similarity index 100%
rename from public/dark-close.svg
rename to public/icons/dark-close.svg
diff --git a/public/dark-codepen.svg b/public/icons/dark-codepen.svg
similarity index 100%
rename from public/dark-codepen.svg
rename to public/icons/dark-codepen.svg
diff --git a/public/dark-dribbble.svg b/public/icons/dark-dribbble.svg
similarity index 100%
rename from public/dark-dribbble.svg
rename to public/icons/dark-dribbble.svg
diff --git a/public/dark-github.svg b/public/icons/dark-github.svg
similarity index 100%
rename from public/dark-github.svg
rename to public/icons/dark-github.svg
diff --git a/public/dark-instagram.svg b/public/icons/dark-instagram.svg
similarity index 100%
rename from public/dark-instagram.svg
rename to public/icons/dark-instagram.svg
diff --git a/public/dark-linkedin.svg b/public/icons/dark-linkedin.svg
similarity index 100%
rename from public/dark-linkedin.svg
rename to public/icons/dark-linkedin.svg
diff --git a/public/dark-mail.svg b/public/icons/dark-mail.svg
similarity index 100%
rename from public/dark-mail.svg
rename to public/icons/dark-mail.svg
diff --git a/public/dark-menu.svg b/public/icons/dark-menu.svg
similarity index 100%
rename from public/dark-menu.svg
rename to public/icons/dark-menu.svg
diff --git a/public/dark-twitter.svg b/public/icons/dark-twitter.svg
similarity index 100%
rename from public/dark-twitter.svg
rename to public/icons/dark-twitter.svg
diff --git a/public/light-close.svg b/public/icons/light-close.svg
similarity index 100%
rename from public/light-close.svg
rename to public/icons/light-close.svg
diff --git a/public/light-codepen.svg b/public/icons/light-codepen.svg
similarity index 100%
rename from public/light-codepen.svg
rename to public/icons/light-codepen.svg
diff --git a/public/light-dribbble.svg b/public/icons/light-dribbble.svg
similarity index 100%
rename from public/light-dribbble.svg
rename to public/icons/light-dribbble.svg
diff --git a/public/light-github.svg b/public/icons/light-github.svg
similarity index 100%
rename from public/light-github.svg
rename to public/icons/light-github.svg
diff --git a/public/light-instagram.svg b/public/icons/light-instagram.svg
similarity index 100%
rename from public/light-instagram.svg
rename to public/icons/light-instagram.svg
diff --git a/public/light-linkedin.svg b/public/icons/light-linkedin.svg
similarity index 100%
rename from public/light-linkedin.svg
rename to public/icons/light-linkedin.svg
diff --git a/public/light-mail.svg b/public/icons/light-mail.svg
similarity index 100%
rename from public/light-mail.svg
rename to public/icons/light-mail.svg
diff --git a/public/light-menu.svg b/public/icons/light-menu.svg
similarity index 100%
rename from public/light-menu.svg
rename to public/icons/light-menu.svg
diff --git a/public/light-twitter.svg b/public/icons/light-twitter.svg
similarity index 100%
rename from public/light-twitter.svg
rename to public/icons/light-twitter.svg
diff --git a/public/moon.svg b/public/icons/moon.svg
similarity index 100%
rename from public/moon.svg
rename to public/icons/moon.svg
diff --git a/public/sun.svg b/public/icons/sun.svg
similarity index 100%
rename from public/sun.svg
rename to public/icons/sun.svg