diff --git a/lib/src/components/Icon/Icon.tsx b/lib/src/components/Icon/Icon.tsx
index 1e99801..e910d4c 100644
--- a/lib/src/components/Icon/Icon.tsx
+++ b/lib/src/components/Icon/Icon.tsx
@@ -4,29 +4,11 @@ import { IIconProps } from "./icon.type";
 const Icon: ForwardRefRenderFunction<SVGSVGElement, IIconProps> = ({
   children,
   xmlns = "http://www.w3.org/2000/svg",
-  width = "24",
-  height = "24",
-  viewBox = "0 0 24 24",
-  strokeWidth = "2",
-  stroke = "currentColor",
-  fill = "none",
-  strokeLinecap = "round",
-  strokeLinejoin = "round",
+
   ...nativeProps
 }) => {
   return (
-    <svg
-      xmlns={xmlns}
-      width={width}
-      height={height}
-      viewBox={viewBox}
-      strokeWidth={strokeWidth}
-      stroke={stroke}
-      fill={fill}
-      strokeLinecap={strokeLinecap}
-      strokeLinejoin={strokeLinejoin}
-      {...nativeProps}
-    >
+    <svg xmlns={xmlns} {...nativeProps}>
       {children}
     </svg>
   );
diff --git a/lib/src/components/_internal/Icons/ArrowDown.tsx b/lib/src/components/_internal/Icons/ArrowDown.tsx
index 37663b1..e4de2fc 100644
--- a/lib/src/components/_internal/Icons/ArrowDown.tsx
+++ b/lib/src/components/_internal/Icons/ArrowDown.tsx
@@ -4,7 +4,17 @@ import { IIconProps } from "src/components/Icon/icon.type";
 
 export const ArrowDown: FC<IIconProps> = (props) => {
   return (
-    <Icon {...props}>
+    <Icon
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      strokeWidth="2"
+      stroke="currentColor"
+      fill="none"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      {...props}
+    >
       <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
       <line x1={12} y1={5} x2={12} y2={19}></line>
       <line x1={18} y1={13} x2={12} y2={19}></line>
diff --git a/lib/src/components/_internal/Icons/CheckIcon.tsx b/lib/src/components/_internal/Icons/CheckIcon.tsx
index babe935..f3c9202 100644
--- a/lib/src/components/_internal/Icons/CheckIcon.tsx
+++ b/lib/src/components/_internal/Icons/CheckIcon.tsx
@@ -3,7 +3,17 @@ import { IIconProps } from "src/components/Icon/icon.type";
 
 const CheckIcon: React.FC<IIconProps> = (props) => {
   return (
-    <Icon viewBox="0 0 12 10" {...props}>
+    <Icon
+      width="24"
+      height="24"
+      strokeWidth="2"
+      stroke="currentColor"
+      fill="none"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      viewBox="0 0 12 10"
+      {...props}
+    >
       <path
         fill="currentColor"
         stroke="none"
diff --git a/lib/src/components/_internal/Icons/Chevron.tsx b/lib/src/components/_internal/Icons/Chevron.tsx
index 43c8279..655b568 100644
--- a/lib/src/components/_internal/Icons/Chevron.tsx
+++ b/lib/src/components/_internal/Icons/Chevron.tsx
@@ -4,7 +4,17 @@ import { IIconProps } from "src/components/Icon/icon.type";
 
 const ChevronIcon: React.FC<IIconProps> = (props) => {
   return (
-    <Icon {...props}>
+    <Icon
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      strokeWidth="2"
+      stroke="currentColor"
+      fill="none"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      {...props}
+    >
       <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
       <polyline points="6 9 12 15 18 9"></polyline>
     </Icon>
diff --git a/lib/src/components/_internal/Icons/Clear.tsx b/lib/src/components/_internal/Icons/Clear.tsx
index d9b62cd..ebf2334 100644
--- a/lib/src/components/_internal/Icons/Clear.tsx
+++ b/lib/src/components/_internal/Icons/Clear.tsx
@@ -4,7 +4,17 @@ import { IIconProps } from "src/components/Icon/icon.type";
 
 export const Clear: FC<IIconProps> = (props) => {
   return (
-    <Icon {...props}>
+    <Icon
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      strokeWidth="2"
+      stroke="currentColor"
+      fill="none"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      {...props}
+    >
       <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
       <circle cx={12} cy={12} r={9}></circle>
       <path d="M10 10l4 4m0 -4l-4 4"></path>
diff --git a/lib/src/components/_internal/Icons/Close.tsx b/lib/src/components/_internal/Icons/Close.tsx
index 287f18c..450fa44 100644
--- a/lib/src/components/_internal/Icons/Close.tsx
+++ b/lib/src/components/_internal/Icons/Close.tsx
@@ -4,7 +4,17 @@ import { IIconProps } from "../../../components/Icon/icon.type";
 
 const CloseIcon: React.FC<IIconProps> = (props) => {
   return (
-    <Icon {...props}>
+    <Icon
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      strokeWidth="2"
+      stroke="currentColor"
+      fill="none"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      {...props}
+    >
       <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
       <line x1="18" y1="6" x2="6" y2="18"></line>
       <line x1="6" y1="6" x2="18" y2="18"></line>
diff --git a/lib/src/components/_internal/Icons/DashIcon.tsx b/lib/src/components/_internal/Icons/DashIcon.tsx
index acfd12e..4758977 100644
--- a/lib/src/components/_internal/Icons/DashIcon.tsx
+++ b/lib/src/components/_internal/Icons/DashIcon.tsx
@@ -3,7 +3,17 @@ import { IIconProps } from "src/components/Icon/icon.type";
 
 const DashIcon: React.FC<IIconProps> = (props) => {
   return (
-    <Icon viewBox="0 0 32 6" {...props}>
+    <Icon
+      width="24"
+      height="24"
+      strokeWidth="2"
+      stroke="currentColor"
+      fill="none"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      viewBox="0 0 32 6"
+      {...props}
+    >
       <rect width="32" height="6" fill="currentColor" rx="3" />
     </Icon>
   );
diff --git a/lib/src/components/_internal/Icons/SvgDot.tsx b/lib/src/components/_internal/Icons/SvgDot.tsx
index 55d7d5e..3fa6650 100644
--- a/lib/src/components/_internal/Icons/SvgDot.tsx
+++ b/lib/src/components/_internal/Icons/SvgDot.tsx
@@ -1,8 +1,10 @@
+import { Icon } from "src/components/Icon";
+
 const SvgDot = () => {
   return (
-    <svg viewBox="0 0 6 6">
+    <Icon viewBox="0 0 6 6">
       <circle fill="currentColor" cx="3" cy="3" r="3"></circle>
-    </svg>
+    </Icon>
   );
 };