diff --git a/src/icons/ContentClassIcons/OfficialClassIcon.tsx b/src/icons/ContentClassIcons/OfficialClassIcon.tsx
index 62d6097ed..522ab4db5 100644
--- a/src/icons/ContentClassIcons/OfficialClassIcon.tsx
+++ b/src/icons/ContentClassIcons/OfficialClassIcon.tsx
@@ -14,8 +14,8 @@ export const OfficialClassIcon: FC<IconProps> = ({
     width={width}
   >
     <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
+      fillRule="evenodd"
+      clipRule="evenodd"
       d="M1.85613 1.20703L10.1439 1.20703C10.6167 1.20703 11 1.59034 11 2.06316V4.65658C11 7.6542 9.03375 10.2969 6.16254 11.1583C6.05652 11.1901 5.94349 11.1901 5.83746 11.1583C2.96626 10.2969 1 7.6542 1 4.65658V2.06316C1 1.59033 1.3833 1.20703 1.85613 1.20703ZM6.56129 5.43269L6 3.70601L5.43872 5.43269L3.62236 5.43269L5.09182 6.49984L4.53054 8.22651L6 7.15937L7.46947 8.22651L6.90818 6.49984L8.37764 5.43269L6.56129 5.43269Z"
       fill={fill}
     />
diff --git a/src/icons/ContentClassIcons/VerificationClassIcon.tsx b/src/icons/ContentClassIcons/VerificationClassIcon.tsx
index 5f59f41ec..2f911bde7 100644
--- a/src/icons/ContentClassIcons/VerificationClassIcon.tsx
+++ b/src/icons/ContentClassIcons/VerificationClassIcon.tsx
@@ -15,8 +15,8 @@ export const VerificationClassIcon: FC<IconProps> = ({
     fill={fill}
   >
     <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
+      fillRule="evenodd"
+      clipRule="evenodd"
       d="M6.87297 1.42151C6.50993 1.13554 5.99007 1.13554 5.62703 1.42151L5.1892 1.76637C5.00453 1.91184 4.77201 1.98781 4.53428 1.98035L3.97592 1.96283C3.52026 1.94853 3.11362 2.23851 2.99154 2.66478L2.81687 3.27476C2.75625 3.48645 2.62259 3.67153 2.43823 3.79906L1.91481 4.16114C1.55855 4.40759 1.4116 4.85198 1.55356 5.25359L1.78056 5.89574C1.85188 6.0975 1.85188 6.31656 1.78056 6.51832L1.55356 7.16047C1.4116 7.56208 1.55855 8.00648 1.91481 8.25292L2.43823 8.615C2.62259 8.74253 2.75625 8.92762 2.81687 9.13931L2.99154 9.74928C3.11362 10.1756 3.52026 10.4655 3.97592 10.4512L4.53428 10.4337C4.77201 10.4263 5.00453 10.5022 5.1892 10.6477L5.62703 10.9926C5.99007 11.2785 6.50993 11.2785 6.87297 10.9926L7.3108 10.6477C7.49547 10.5022 7.72799 10.4263 7.96572 10.4337L8.52408 10.4512C8.97974 10.4655 9.38638 10.1756 9.50845 9.74928L9.68313 9.13931C9.74375 8.92762 9.87741 8.74253 10.0618 8.615L10.5852 8.25292C10.9415 8.00648 11.0884 7.56208 10.9464 7.16047L10.7194 6.51832C10.6481 6.31656 10.6481 6.0975 10.7194 5.89575L10.9464 5.25359C11.0884 4.85198 10.9415 4.40759 10.5852 4.16114L10.0618 3.79906C9.87741 3.67153 9.74375 3.48645 9.68313 3.27476L9.50845 2.66478C9.38638 2.23851 8.97974 1.94853 8.52408 1.96283L7.96572 1.98035C7.72799 1.98781 7.49547 1.91184 7.3108 1.76637L6.87297 1.42151ZM8.79938 5.35136C8.97414 5.14785 8.9458 4.8454 8.7361 4.67581C8.52639 4.50622 8.21473 4.53372 8.03998 4.73722L5.85299 7.28406L4.73974 6.56382C4.51262 6.41688 4.20574 6.47644 4.05433 6.69686C3.90291 6.91727 3.96428 7.21508 4.19141 7.36202L5.6742 8.32134C5.88437 8.45731 6.16636 8.41762 6.32807 8.22931L8.79938 5.35136Z"
       fill={fill}
     />
diff --git a/src/icons/Drag/DragIcon.tsx b/src/icons/Drag/DragIcon.tsx
index d399b904b..3ae5b28f3 100644
--- a/src/icons/Drag/DragIcon.tsx
+++ b/src/icons/Drag/DragIcon.tsx
@@ -18,7 +18,7 @@ export const DragIcon = ({
     >
       <path
         d="M600 1440c132.36 0 240 107.64 240 240s-107.64 240-240 240-240-107.64-240-240 107.64-240 240-240Zm720 0c132.36 0 240 107.64 240 240s-107.64 240-240 240-240-107.64-240-240 107.64-240 240-240ZM600 720c132.36 0 240 107.64 240 240s-107.64 240-240 240-240-107.64-240-240 107.64-240 240-240Zm720 0c132.36 0 240 107.64 240 240s-107.64 240-240 240-240-107.64-240-240 107.64-240 240-240ZM600 0c132.36 0 240 107.64 240 240S732.36 480 600 480 360 372.36 360 240 467.64 0 600 0Zm720 0c132.36 0 240 107.64 240 240s-107.64 240-240 240-240-107.64-240-240S1187.64 0 1320 0Z"
-        fill-rule="evenodd"
+        fillRule="evenodd"
       />
     </svg>
   );
diff --git a/src/icons/Feedback/FeedbackIcon.tsx b/src/icons/Feedback/FeedbackIcon.tsx
index 42f566ef3..ee5b76396 100644
--- a/src/icons/Feedback/FeedbackIcon.tsx
+++ b/src/icons/Feedback/FeedbackIcon.tsx
@@ -25,8 +25,8 @@ const FeedbackIcon: FC<KeppelApplicationIconProps> = ({
         stroke="none"
         d="M20 2H4C2.9 2 2.01 2.9 2.01 4L2 22L6 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2ZM13 14H11V12H13V14ZM13 10H11V6H13V10Z"
       />
-      <line x1="12" y1="6" x2="12" y2="10" stroke="inherit" stroke-width="2" />
-      <line x1="12" y1="12" x2="12" y2="14" stroke="inherit" stroke-width="2" />
+      <line x1="12" y1="6" x2="12" y2="10" stroke="inherit" strokeWidth="2" />
+      <line x1="12" y1="12" x2="12" y2="14" stroke="inherit" strokeWidth="2" />
     </svg>
   );
 };
diff --git a/src/icons/Filter/FilterIcon.tsx b/src/icons/Filter/FilterIcon.tsx
index cc54ef01b..9b1d4d14e 100644
--- a/src/icons/Filter/FilterIcon.tsx
+++ b/src/icons/Filter/FilterIcon.tsx
@@ -13,7 +13,7 @@ export const FilterIcon = ({
       width={width}
       height={height}
       fill={props.fill}
-      fill-opacity={props.fillOpacity}
+      fillOpacity={props.fillOpacity}
       {...props}
     >
       <path d="M0 0h24v24H0z" fill="none" />
diff --git a/src/icons/Info/InfoCircle.tsx b/src/icons/Info/InfoCircle.tsx
index 0d9826cb1..9e5927095 100644
--- a/src/icons/Info/InfoCircle.tsx
+++ b/src/icons/Info/InfoCircle.tsx
@@ -32,8 +32,8 @@ export function InfoCircleIcon({
         height={height}
       >
         <path
-          fill-rule="evenodd"
-          clip-rule="evenodd"
+          fillRule="evenodd"
+          clipRule="evenodd"
           d="M11 8C11 7.448 11.448 7 12 7C12.552 7 13 7.448 13 8C13 8.552 12.552 9 12 9C11.448 9 11 8.552 11 8ZM11 11C11 10.448 11.448 10 12 10C12.552 10 13 10.448 13 11V16C13 16.552 12.552 17 12 17C11.448 17 11 16.552 11 16V11ZM12 20C7.589 20 4 16.411 4 12C4 7.589 7.589 4 12 4C16.411 4 20 7.589 20 12C20 16.411 16.411 20 12 20ZM12 2C6.477 2 2 6.477 2 12C2 17.523 6.477 22 12 22C17.522 22 22 17.523 22 12C22 6.477 17.522 2 12 2Z"
           fill="none"
         />
diff --git a/src/icons/Info/index.tsx b/src/icons/Info/index.tsx
index 1794545e4..a4fd6bfd3 100644
--- a/src/icons/Info/index.tsx
+++ b/src/icons/Info/index.tsx
@@ -16,7 +16,7 @@ function InfoIcon({
       viewBox="0 0 20 20"
       fill="none"
     >
-      <g clip-path="url(#clip0_19460_1750)">
+      <g clipPath="url(#clip0_19460_1750)">
         <path
           d="M10.0003 1.66666C5.40033 1.66666 1.66699 5.39999 1.66699 9.99999C1.66699 14.6 5.40033 18.3333 10.0003 18.3333C14.6003 18.3333 18.3337 14.6 18.3337 9.99999C18.3337 5.39999 14.6003 1.66666 10.0003 1.66666ZM10.8337 14.1667H9.16699V9.16666H10.8337V14.1667ZM10.8337 7.49999H9.16699V5.83332H10.8337V7.49999Z"
           fill={fill}
diff --git a/src/icons/MoveFile/MoveFileIcon.tsx b/src/icons/MoveFile/MoveFileIcon.tsx
index e0fd0c90b..86510d790 100644
--- a/src/icons/MoveFile/MoveFileIcon.tsx
+++ b/src/icons/MoveFile/MoveFileIcon.tsx
@@ -22,9 +22,9 @@ export const MoveFileIcon: FC<IconProps> = ({
         <g>
           <path
             fill={fill || theme.palette.icon.default}
-            fill-rule="evenodd"
+            fillRule="evenodd"
             d="M2 6a3 3 0 0 1 3-3h4.172a3 3 0 0 1 2.12.879L12.415 5H19a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H5a3 3 0 0 1-3-3zm11.08 10.664 2.667-3a1 1 0 0 0 0-1.328l-2.666-3a1 1 0 1 0-1.495 1.328L12.773 12H9a1 1 0 1 0 0 2h3.773l-1.187 1.336a1 1 0 0 0 1.495 1.328z"
-            clip-rule="evenodd"
+            clipRule="evenodd"
             opacity="1"
             data-original="#000000"
             style={style}
diff --git a/src/icons/Response/Responseicon.tsx b/src/icons/Response/Responseicon.tsx
index 20d34ed15..e842f96e9 100644
--- a/src/icons/Response/Responseicon.tsx
+++ b/src/icons/Response/Responseicon.tsx
@@ -15,7 +15,7 @@ export const ResponseIcon = ({
       width={width}
       height={height}
       fill={props.fill}
-      fill-opacity={props.fillOpacity}
+      fillOpacity={props.fillOpacity}
       {...props}
     >
       <path
diff --git a/src/icons/SMP/SMPIcon.tsx b/src/icons/SMP/SMPIcon.tsx
index f34b9f846..6da96d2a7 100644
--- a/src/icons/SMP/SMPIcon.tsx
+++ b/src/icons/SMP/SMPIcon.tsx
@@ -14,7 +14,7 @@ export const SMPIcon = ({
       viewBox="0 0 26 25"
       {...props}
     >
-      <g clip-path="url(#clip0_21266_800)">
+      <g clipPath="url(#clip0_21266_800)">
         <path
           d="M17.3458 12.2052C17.1694 12.2052 17.0237 12.2647 16.9068 12.3816C15.8237 13.436 14.359 14.0206 12.8369 14.0206C11.3148 14.0206 9.88088 13.4339 8.76904 12.3795C8.65212 12.2626 8.4757 12.2031 8.33005 12.2031C5.13812 12.439 2.62109 15.1325 2.62109 18.3531V21.1922C2.62109 23.299 4.31963 24.9975 6.42638 24.9975H19.2187C21.3255 24.9975 23.024 23.299 23.024 21.1922V18.3531C23.0548 15.1325 20.5377 12.439 17.3458 12.2052Z"
           fill="#3C494E"
diff --git a/src/icons/View/ViewIcon.tsx b/src/icons/View/ViewIcon.tsx
index 0ccc69c28..28133ede8 100644
--- a/src/icons/View/ViewIcon.tsx
+++ b/src/icons/View/ViewIcon.tsx
@@ -9,7 +9,7 @@ const ViewsIcon: FC<IconProps> = ({ width, height, style = {}, fill }) => (
     viewBox="0 0 26 23"
     width={width}
   >
-    <g clip-path="url(#clip0_23433_12271)">
+    <g clipPath="url(#clip0_23433_12271)">
       <path
         d="M20.5866 8.85328L14.5 17.99L12.5 13.9993L20.7388 1.03498C20.8625 0.818834 21.0289 0.629639 21.2282 0.478725C21.4274 0.327812 21.6553 0.218281 21.8982 0.156693C22.0596 0.111893 22.2263 0.0891113 22.3938 0.0889721C22.7289 0.0883636 23.0579 0.176991 23.3465 0.345577C23.7828 0.596529 24.1009 1.0086 24.231 1.49149C24.3611 1.97438 24.2927 2.48869 24.0408 2.9217L22.7901 5.07719L20.5866 8.85328Z"
         fill={fill}
diff --git a/src/icons/Workspace/WorkspaceIcon.tsx b/src/icons/Workspace/WorkspaceIcon.tsx
index d4cc66089..de0803be1 100644
--- a/src/icons/Workspace/WorkspaceIcon.tsx
+++ b/src/icons/Workspace/WorkspaceIcon.tsx
@@ -16,9 +16,9 @@ export const WorkspaceIcon = ({
       width={width}
       fill={fill}
       stroke={fill}
-      stroke-width="2"
-      stroke-linecap="round"
-      stroke-linejoin="round"
+      strokeWidth="2"
+      strokeLinecap="round"
+      strokeLinejoin="round"
       {...props}
     >
       <path