diff --git a/components/cart/CartSidebarView/CartSidebarView.tsx b/components/cart/CartSidebarView/CartSidebarView.tsx
index 5dbde0e93..5e1c5427c 100644
--- a/components/cart/CartSidebarView/CartSidebarView.tsx
+++ b/components/cart/CartSidebarView/CartSidebarView.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { UserNav } from '@components/core'
 import { Button } from '@components/ui'
 import { Trash, Cross } from '@components/icon'
diff --git a/components/core/Avatar/Avatar.tsx b/components/core/Avatar/Avatar.tsx
index f1d61a054..bb76544e7 100644
--- a/components/core/Avatar/Avatar.tsx
+++ b/components/core/Avatar/Avatar.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './Avatar.module.css'
 
 interface Props {
diff --git a/components/core/Footer/Footer.tsx b/components/core/Footer/Footer.tsx
index 7b58acf84..a2db8e687 100644
--- a/components/core/Footer/Footer.tsx
+++ b/components/core/Footer/Footer.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './Footer.module.css'
 import { Container } from '@components/ui'
 
diff --git a/components/core/Navbar/Navbar.tsx b/components/core/Navbar/Navbar.tsx
index 09b1441f7..ecbbd0341 100644
--- a/components/core/Navbar/Navbar.tsx
+++ b/components/core/Navbar/Navbar.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './Navbar.module.css'
 import { Logo, Container } from '@components/ui'
 import { Searchbar } from '@components/core'
diff --git a/components/core/Searchbar/Searchbar.tsx b/components/core/Searchbar/Searchbar.tsx
index 9d583a6c3..ef2d78240 100644
--- a/components/core/Searchbar/Searchbar.tsx
+++ b/components/core/Searchbar/Searchbar.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './Searchbar.module.css'
 
 interface Props {
diff --git a/components/core/UserNav/UserNav.tsx b/components/core/UserNav/UserNav.tsx
index a0de8ba41..2d18903e9 100644
--- a/components/core/UserNav/UserNav.tsx
+++ b/components/core/UserNav/UserNav.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './UserNav.module.css'
 import { Avatar } from '@components/core'
 import { Heart, Bag } from '@components/icon'
diff --git a/components/icon/Bag.tsx b/components/icon/Bag.tsx
index da8a9fe0e..febde6b0d 100644
--- a/components/icon/Bag.tsx
+++ b/components/icon/Bag.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 const Bag = ({ ...props }) => {
   return (
     <svg
diff --git a/components/icon/Cross.tsx b/components/icon/Cross.tsx
index 4536dc2a1..f6c709312 100644
--- a/components/icon/Cross.tsx
+++ b/components/icon/Cross.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 const Cross = ({ ...props }) => {
   return (
     <svg fill="none" viewBox="0 0 24 24" stroke="currentColor" {...props}>
diff --git a/components/icon/Heart.tsx b/components/icon/Heart.tsx
index 3f2ff1302..9c8b9162b 100644
--- a/components/icon/Heart.tsx
+++ b/components/icon/Heart.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 const Heart = ({ ...props }) => {
   return (
     <svg
diff --git a/components/icon/Trash.tsx b/components/icon/Trash.tsx
index d843749ae..b005ea892 100644
--- a/components/icon/Trash.tsx
+++ b/components/icon/Trash.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 const Trash = ({ ...props }) => {
   return (
     <svg
diff --git a/components/product/ProductCard/ProductCard.tsx b/components/product/ProductCard/ProductCard.tsx
index b1523e0e1..713ddc73c 100644
--- a/components/product/ProductCard/ProductCard.tsx
+++ b/components/product/ProductCard/ProductCard.tsx
@@ -1,6 +1,6 @@
 import cn from 'classnames'
 import s from './ProductCard.module.css'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import { Heart } from '@components/icon'
 interface Props {
   className?: string
diff --git a/components/product/ProductGrid/ProductGrid.tsx b/components/product/ProductGrid/ProductGrid.tsx
index 599a65e18..e52373dac 100644
--- a/components/product/ProductGrid/ProductGrid.tsx
+++ b/components/product/ProductGrid/ProductGrid.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './ProductGrid.module.css'
 import ProductCard from '@components/ProductCard'
 interface Props {
diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx
index cb7e0f24b..c9f26ebe9 100644
--- a/components/product/ProductView/ProductView.tsx
+++ b/components/product/ProductView/ProductView.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './ProductView.module.css'
 import { Button } from '@components/ui'
 import { Swatch } from '@components/product'
diff --git a/components/product/Swatch/Swatch.tsx b/components/product/Swatch/Swatch.tsx
index 8161f8f71..ad80373af 100644
--- a/components/product/Swatch/Swatch.tsx
+++ b/components/product/Swatch/Swatch.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './Swatch.module.css'
 import { Colors } from '@components/ui/types'
 
diff --git a/components/ui/Button/Button.tsx b/components/ui/Button/Button.tsx
index 362ade2ae..2063e6d36 100644
--- a/components/ui/Button/Button.tsx
+++ b/components/ui/Button/Button.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { ButtonHTMLAttributes } from 'react'
+import { ButtonHTMLAttributes } from 'react'
 import s from './Button.module.css'
 
 interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
diff --git a/components/ui/Sidebar/Sidebar.tsx b/components/ui/Sidebar/Sidebar.tsx
index a14e34608..a8f1a438e 100644
--- a/components/ui/Sidebar/Sidebar.tsx
+++ b/components/ui/Sidebar/Sidebar.tsx
@@ -1,5 +1,5 @@
 import cn from 'classnames'
-import React, { FC } from 'react'
+import { FC } from 'react'
 import s from './Sidebar.module.css'
 
 interface Props {
diff --git a/components/ui/context.tsx b/components/ui/context.tsx
index 9d34eb2b0..09dc5c384 100644
--- a/components/ui/context.tsx
+++ b/components/ui/context.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react'
+import { FC } from 'react'
 
 export interface UIState {
   displaySidebar: boolean