From e60e1ca9f1948e049c767bc6ce9da8a921356c3c Mon Sep 17 00:00:00 2001
From: Alexandra Goff <agoff@lsst.org>
Date: Thu, 12 Sep 2024 14:47:56 -0700
Subject: [PATCH] fix: spread default props instead of Object.assign

---
 .../src/svg/IconComposer/IconComposer.stories.tsx            | 5 +++--
 packages/epo-react-lib/src/svg/icons/Account.tsx             | 4 +---
 packages/epo-react-lib/src/svg/icons/ArrowUpFromBracket.tsx  | 3 +--
 packages/epo-react-lib/src/svg/icons/Backward.tsx            | 3 +--
 packages/epo-react-lib/src/svg/icons/BackwardStep.tsx        | 3 +--
 packages/epo-react-lib/src/svg/icons/Calendar.tsx            | 3 +--
 packages/epo-react-lib/src/svg/icons/Cancel.tsx              | 3 +--
 packages/epo-react-lib/src/svg/icons/CaretDown.tsx           | 3 +--
 packages/epo-react-lib/src/svg/icons/CheckeredFlag.tsx       | 3 +--
 packages/epo-react-lib/src/svg/icons/Checkmark.tsx           | 3 +--
 packages/epo-react-lib/src/svg/icons/CheckmarkCircle.tsx     | 3 +--
 packages/epo-react-lib/src/svg/icons/Chevron.tsx             | 3 +--
 .../epo-react-lib/src/svg/icons/ChevronLeftElongated.tsx     | 3 +--
 .../epo-react-lib/src/svg/icons/ChevronRightElongated.tsx    | 3 +--
 packages/epo-react-lib/src/svg/icons/ChevronThin.tsx         | 3 +--
 packages/epo-react-lib/src/svg/icons/CircularLoader.tsx      | 3 +--
 packages/epo-react-lib/src/svg/icons/Close.tsx               | 4 +---
 packages/epo-react-lib/src/svg/icons/CloseCircle.tsx         | 4 +---
 packages/epo-react-lib/src/svg/icons/Cloud.tsx               | 3 +--
 packages/epo-react-lib/src/svg/icons/Doc.tsx                 | 3 +--
 packages/epo-react-lib/src/svg/icons/DocArrowRight.tsx       | 3 +--
 packages/epo-react-lib/src/svg/icons/DocInverted.tsx         | 3 +--
 packages/epo-react-lib/src/svg/icons/Email.tsx               | 3 +--
 packages/epo-react-lib/src/svg/icons/Expand.tsx              | 3 +--
 packages/epo-react-lib/src/svg/icons/Eye.tsx                 | 3 +--
 packages/epo-react-lib/src/svg/icons/Facebook.tsx            | 3 +--
 packages/epo-react-lib/src/svg/icons/FloppyDisk.tsx          | 3 +--
 packages/epo-react-lib/src/svg/icons/Forward.tsx             | 3 +--
 packages/epo-react-lib/src/svg/icons/ForwardStep.tsx         | 3 +--
 packages/epo-react-lib/src/svg/icons/Globe.tsx               | 3 +--
 packages/epo-react-lib/src/svg/icons/Google.tsx              | 3 +--
 packages/epo-react-lib/src/svg/icons/Hamburger.tsx           | 3 +--
 packages/epo-react-lib/src/svg/icons/Info.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/InfoCircle.tsx          | 4 ++--
 packages/epo-react-lib/src/svg/icons/Instagram.tsx           | 3 +--
 packages/epo-react-lib/src/svg/icons/Lightbulb.tsx           | 3 +--
 packages/epo-react-lib/src/svg/icons/LinkedIn.tsx            | 3 +--
 packages/epo-react-lib/src/svg/icons/LockClosed.tsx          | 3 +--
 packages/epo-react-lib/src/svg/icons/LockOpen.tsx            | 3 +--
 packages/epo-react-lib/src/svg/icons/LogOut.tsx              | 3 +--
 packages/epo-react-lib/src/svg/icons/Mail.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/Minus.tsx               | 3 +--
 packages/epo-react-lib/src/svg/icons/Page.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/Pause.tsx               | 3 +--
 packages/epo-react-lib/src/svg/icons/Pdf.tsx                 | 4 +---
 packages/epo-react-lib/src/svg/icons/Phone.tsx               | 3 +--
 packages/epo-react-lib/src/svg/icons/Pin.tsx                 | 3 +--
 packages/epo-react-lib/src/svg/icons/Play.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/Plus.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/QuestionCircle.tsx      | 3 +--
 packages/epo-react-lib/src/svg/icons/RotateLeft.tsx          | 3 +--
 .../epo-react-lib/src/svg/icons/RotateLeftWithCenter.tsx     | 3 +--
 packages/epo-react-lib/src/svg/icons/Search.tsx              | 3 +--
 packages/epo-react-lib/src/svg/icons/ShareCopyUrl.tsx        | 3 +--
 packages/epo-react-lib/src/svg/icons/ShareEmail.tsx          | 3 +--
 packages/epo-react-lib/src/svg/icons/ShareFacebook.tsx       | 3 +--
 packages/epo-react-lib/src/svg/icons/ShareToggle.tsx         | 3 +--
 packages/epo-react-lib/src/svg/icons/ShareTwitter.tsx        | 3 +--
 packages/epo-react-lib/src/svg/icons/Team.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/Temp.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/Thumbtack.tsx           | 3 +--
 packages/epo-react-lib/src/svg/icons/Time.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/Timer.tsx               | 3 +--
 packages/epo-react-lib/src/svg/icons/Twitter.tsx             | 3 +--
 packages/epo-react-lib/src/svg/icons/User.tsx                | 3 +--
 packages/epo-react-lib/src/svg/icons/UserInverted.tsx        | 3 +--
 packages/epo-react-lib/src/svg/icons/Video.tsx               | 3 +--
 packages/epo-react-lib/src/svg/icons/Word.tsx                | 4 +---
 packages/epo-react-lib/src/svg/icons/YouTube.tsx             | 3 +--
 packages/epo-react-lib/src/svg/icons/defaultProps.ts         | 1 -
 70 files changed, 72 insertions(+), 144 deletions(-)

diff --git a/packages/epo-react-lib/src/svg/IconComposer/IconComposer.stories.tsx b/packages/epo-react-lib/src/svg/IconComposer/IconComposer.stories.tsx
index 43f2007a..bcf48a55 100644
--- a/packages/epo-react-lib/src/svg/IconComposer/IconComposer.stories.tsx
+++ b/packages/epo-react-lib/src/svg/IconComposer/IconComposer.stories.tsx
@@ -50,14 +50,15 @@ export default meta;
 const IconGrid = styled.div`
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(var(--grid-size, 36px), 1fr));
-  gap: 0.5rem;
+  grid-auto-rows: minmax(var(--grid-size, 36px), 1fr);
+  gap: 0.5em;
   width: 100%;
 `;
 
 const Template: StoryFn<typeof IconComposer> = (args) => {
   const { size = 36 } = args;
   return (
-    <IconGrid style={{ "--grid-size": Number(size) ? size : `${size}px` }}>
+    <IconGrid style={{ "--grid-size": Number(size) ? `${size}px` : size }}>
       {Object.keys(Icons).map((key) => (
         <IconComposer key={key} {...args} size={size} icon={key} />
       ))}
diff --git a/packages/epo-react-lib/src/svg/icons/Account.tsx b/packages/epo-react-lib/src/svg/icons/Account.tsx
index 74b684c5..32a8449e 100644
--- a/packages/epo-react-lib/src/svg/icons/Account.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Account.tsx
@@ -15,10 +15,8 @@ const Account: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
-
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M10 0a10 10 0 1 0 10 10A10 10 0 0 0 10 0Zm0 3a3 3 0 1 1-3 3 3 3 0 0 1 3-3Zm0 14.2a7.2 7.2 0 0 1-6-3.22c.03-1.99 4-3.08 6-3.08s5.97 1.09 6 3.08a7.2 7.2 0 0 1-6 3.22Z"
         fill="currentColor"
diff --git a/packages/epo-react-lib/src/svg/icons/ArrowUpFromBracket.tsx b/packages/epo-react-lib/src/svg/icons/ArrowUpFromBracket.tsx
index 005804f5..a8f2a38b 100644
--- a/packages/epo-react-lib/src/svg/icons/ArrowUpFromBracket.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ArrowUpFromBracket.tsx
@@ -17,9 +17,8 @@ const ArrowUpFromBracket: FunctionComponent<SVGProps> = ({
     stroke,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(1 1)">
         <path
           d="M6,18v7.153a1.788,1.788,0,0,0,1.788,1.788h10.73a1.788,1.788,0,0,0,1.788-1.788V18"
diff --git a/packages/epo-react-lib/src/svg/icons/Backward.tsx b/packages/epo-react-lib/src/svg/icons/Backward.tsx
index b634d23a..57e293f8 100644
--- a/packages/epo-react-lib/src/svg/icons/Backward.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Backward.tsx
@@ -15,9 +15,8 @@ const Backward: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M4.5,0,9,8H0Z" transform="translate(7 9) rotate(-90)" />
       <path d="M4.5,0,9,8H0Z" transform="translate(0 9) rotate(-90)" />
     </svg>
diff --git a/packages/epo-react-lib/src/svg/icons/BackwardStep.tsx b/packages/epo-react-lib/src/svg/icons/BackwardStep.tsx
index 1ca86aad..771d430b 100644
--- a/packages/epo-react-lib/src/svg/icons/BackwardStep.tsx
+++ b/packages/epo-react-lib/src/svg/icons/BackwardStep.tsx
@@ -15,9 +15,8 @@ const BackwardStep: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M8.972,6.862v3.876L15.41,6.809A.226.226,0,0,1,15.75,7V15.5a.226.226,0,0,1-.34.194L8.972,11.762v3.876a.113.113,0,0,1-.113.113h-2a.113.113,0,0,1-.113-.113V6.862a.113.113,0,0,1,.113-.112h2A.113.113,0,0,1,8.972,6.862Z"
         transform="translate(-6.75 -6.75)"
diff --git a/packages/epo-react-lib/src/svg/icons/Calendar.tsx b/packages/epo-react-lib/src/svg/icons/Calendar.tsx
index 03620a4b..1407a84c 100644
--- a/packages/epo-react-lib/src/svg/icons/Calendar.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Calendar.tsx
@@ -15,9 +15,8 @@ const Calendar: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m6.8 4.8c0.3 0 0.6-0.3 0.6-0.6v-3.5c0-0.3-0.2-0.6-0.5-0.6s-0.6 0.2-0.7 0.5v0.1 3.6c0 0.3 0.3 0.5 0.6 0.5" />
       <path d="m20.2 21.6h-16.2v-14.4h16.2v14.4zm0.6-20h-2.6v1.8c0.5 0.5 0.4 1.2 0 1.7-0.5 0.5-1.2 0.4-1.7 0-0.2-0.2-0.3-0.5-0.3-0.8s0.1-0.6 0.3-0.8v-1.9h-8.9v1.8c0.5 0.5 0.4 1.2 0 1.7-0.5 0.5-1.2 0.4-1.7 0-0.2-0.3-0.3-0.5-0.3-0.8s0.1-0.6 0.4-0.9v-1.8h-2.6c-0.8 0-1.4 0.6-1.4 1.4v19.2c0 0.8 0.6 1.4 1.4 1.4h17.4c0.8 0 1.4-0.6 1.4-1.4v-19.2c0-0.8-0.6-1.4-1.4-1.4" />
       <path d="m17.4 4.8c0.3 0 0.6-0.3 0.6-0.6v-3.5c0-0.3-0.2-0.6-0.5-0.6s-0.6 0.2-0.6 0.5v0.1 3.6c-0.1 0.3 0.2 0.5 0.5 0.5" />
diff --git a/packages/epo-react-lib/src/svg/icons/Cancel.tsx b/packages/epo-react-lib/src/svg/icons/Cancel.tsx
index e3abe9c8..93c241ff 100644
--- a/packages/epo-react-lib/src/svg/icons/Cancel.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Cancel.tsx
@@ -15,9 +15,8 @@ const Cancel: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         fill="#ed4c4c"
         transform="translate(-.57 -.57)"
diff --git a/packages/epo-react-lib/src/svg/icons/CaretDown.tsx b/packages/epo-react-lib/src/svg/icons/CaretDown.tsx
index 58a60ddf..e2d4f994 100644
--- a/packages/epo-react-lib/src/svg/icons/CaretDown.tsx
+++ b/packages/epo-react-lib/src/svg/icons/CaretDown.tsx
@@ -16,9 +16,8 @@ const CaretDown: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M0,0,9,9l9-9Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/CheckeredFlag.tsx b/packages/epo-react-lib/src/svg/icons/CheckeredFlag.tsx
index f92de0c8..48d3a39c 100644
--- a/packages/epo-react-lib/src/svg/icons/CheckeredFlag.tsx
+++ b/packages/epo-react-lib/src/svg/icons/CheckeredFlag.tsx
@@ -15,9 +15,8 @@ const CheckeredFlag: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(-3 29)">
         <g transform="translate(7.169 -25.817)">
           <path
diff --git a/packages/epo-react-lib/src/svg/icons/Checkmark.tsx b/packages/epo-react-lib/src/svg/icons/Checkmark.tsx
index f89ac8d2..65de0116 100644
--- a/packages/epo-react-lib/src/svg/icons/Checkmark.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Checkmark.tsx
@@ -15,9 +15,8 @@ const Checkmark: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M8.282,14.423,5.9,12.036l-.8.8,3.182,3.182L15.1,9.2l-.8-.8Z"
         transform="translate(-5.1 -8.4)"
diff --git a/packages/epo-react-lib/src/svg/icons/CheckmarkCircle.tsx b/packages/epo-react-lib/src/svg/icons/CheckmarkCircle.tsx
index a6d723d6..10e7f05a 100644
--- a/packages/epo-react-lib/src/svg/icons/CheckmarkCircle.tsx
+++ b/packages/epo-react-lib/src/svg/icons/CheckmarkCircle.tsx
@@ -15,9 +15,8 @@ const CheckmarkCircle: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M15.563,8.063a7.5,7.5,0,1,1-7.5-7.5A7.5,7.5,0,0,1,15.563,8.063ZM7.195,12.034l5.565-5.565a.484.484,0,0,0,0-.684L12.075,5.1a.484.484,0,0,0-.684,0L6.853,9.639,4.734,7.52a.484.484,0,0,0-.684,0L3.366,8.2a.484.484,0,0,0,0,.684l3.145,3.145a.484.484,0,0,0,.684,0Z"
         transform="translate(-0.563 -0.563)"
diff --git a/packages/epo-react-lib/src/svg/icons/Chevron.tsx b/packages/epo-react-lib/src/svg/icons/Chevron.tsx
index 65bf522e..94fec925 100644
--- a/packages/epo-react-lib/src/svg/icons/Chevron.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Chevron.tsx
@@ -15,9 +15,8 @@ const Chevron: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <polygon points="15.212 22.283 5.204 12 15.212 1.717 18.796 5.203 12.181 12 18.796 18.797 15.212 22.283" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/ChevronLeftElongated.tsx b/packages/epo-react-lib/src/svg/icons/ChevronLeftElongated.tsx
index 2489df28..451972a0 100644
--- a/packages/epo-react-lib/src/svg/icons/ChevronLeftElongated.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ChevronLeftElongated.tsx
@@ -24,9 +24,8 @@ const ChevronLeftElongated: FunctionComponent<SVGProps> = ({
     stroke,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <line y1="11" x2="6" transform="translate(0.439 0.239)" strokeWidth="1" />
       <line
         x2="6"
diff --git a/packages/epo-react-lib/src/svg/icons/ChevronRightElongated.tsx b/packages/epo-react-lib/src/svg/icons/ChevronRightElongated.tsx
index 3063f03f..551bd84b 100644
--- a/packages/epo-react-lib/src/svg/icons/ChevronRightElongated.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ChevronRightElongated.tsx
@@ -24,9 +24,8 @@ const ChevronRightElongated: FunctionComponent<SVGProps> = ({
     stroke,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="scale(-1, 1) translate(-5)">
         <line
           y1="11"
diff --git a/packages/epo-react-lib/src/svg/icons/ChevronThin.tsx b/packages/epo-react-lib/src/svg/icons/ChevronThin.tsx
index a8981c29..d1ed9889 100644
--- a/packages/epo-react-lib/src/svg/icons/ChevronThin.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ChevronThin.tsx
@@ -15,9 +15,8 @@ const ChevronThin: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M10.16326,12.004l6.123,6.119a1.151,1.151,0,0,1,.00525,1.62775l-.00525.00525a1.166,1.166,0,0,1-1.638,0l-6.937-6.933a1.154,1.154,0,0,1-.034-1.595l6.966-6.98a1.15647,1.15647,0,1,1,1.638,1.633h0Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/CircularLoader.tsx b/packages/epo-react-lib/src/svg/icons/CircularLoader.tsx
index 9084832f..4cf9fd2a 100644
--- a/packages/epo-react-lib/src/svg/icons/CircularLoader.tsx
+++ b/packages/epo-react-lib/src/svg/icons/CircularLoader.tsx
@@ -15,9 +15,8 @@ const CircularLoader: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M36.4,3.5c0.9,0.2,1.8,0.4,2.7,0.7v8.4c0,0.1,0,0.3,0.1,0.4c0.1,0.4,0.3,0.8,0.7,1c1.5,0.8,2.9,1.8,4.1,3
 			c0,0.2-0.1,0.4-0.1,0.7c0,1.6,1.3,2.9,2.9,2.9s2.9-1.3,2.9-2.9s-1.3-2.9-2.9-2.9c-0.3,0-0.5,0-0.7,0.1c-1.2-1.2-2.5-2.2-4-3V5.3
diff --git a/packages/epo-react-lib/src/svg/icons/Close.tsx b/packages/epo-react-lib/src/svg/icons/Close.tsx
index b9e7bbb9..7dfc9f54 100644
--- a/packages/epo-react-lib/src/svg/icons/Close.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Close.tsx
@@ -17,10 +17,8 @@ const Close: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
-
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g strokeWidth={2}>
         <path d="m.707 16.707 16-16" />
         <path d="m.707.707 16 16" />
diff --git a/packages/epo-react-lib/src/svg/icons/CloseCircle.tsx b/packages/epo-react-lib/src/svg/icons/CloseCircle.tsx
index 1fe43f60..9d204898 100644
--- a/packages/epo-react-lib/src/svg/icons/CloseCircle.tsx
+++ b/packages/epo-react-lib/src/svg/icons/CloseCircle.tsx
@@ -15,10 +15,8 @@ const CloseCircle: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
-
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <circle cx="10" cy="10" r="10" />
       <g transform="translate(5 5)">
         <path
diff --git a/packages/epo-react-lib/src/svg/icons/Cloud.tsx b/packages/epo-react-lib/src/svg/icons/Cloud.tsx
index fe6d81cc..2531d933 100644
--- a/packages/epo-react-lib/src/svg/icons/Cloud.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Cloud.tsx
@@ -15,9 +15,8 @@ const Cloud: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m20.8 12.1h-1.1c-0.3-1.8-1.9-3.1-3.7-3.2-0.8 0-1.6 0.3-2.3 0.8-0.9-2.8-3.8-4.4-6.6-3.5-2.2 0.7-3.7 2.7-3.7 5-1.7 0.2-2.9 1.8-2.7 3.5 0.2 1.5 1.4 2.6 2.9 2.7h17.2c1.5 0 2.7-1.2 2.7-2.7s-1.2-2.6-2.7-2.6z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/Doc.tsx b/packages/epo-react-lib/src/svg/icons/Doc.tsx
index a4a5e31e..def0aaf4 100644
--- a/packages/epo-react-lib/src/svg/icons/Doc.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Doc.tsx
@@ -15,9 +15,8 @@ const Doc: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m4.6 21.6v-19.3h9.4v5.4h5.4v14l-14.8-0.1zm16.8-14c0-0.5-0.2-1.1-0.6-1.5l-5.4-5.4c-0.4-0.4-0.9-0.6-1.5-0.6h-9.3c-1.1 0-2.1 0.9-2.1 2.1v19.4c0 1.1 0.9 2.1 2.1 2.1h14.7c1.1 0 2.1-0.9 2.1-2.1v-14z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/DocArrowRight.tsx b/packages/epo-react-lib/src/svg/icons/DocArrowRight.tsx
index 7b2bbec3..3b9705b4 100644
--- a/packages/epo-react-lib/src/svg/icons/DocArrowRight.tsx
+++ b/packages/epo-react-lib/src/svg/icons/DocArrowRight.tsx
@@ -15,9 +15,8 @@ const DocArrowRight: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M12.084,3.571a.677.677,0,0,0-.22-.5L8.783.205A.784.784,0,0,0,8.248,0H8.056V3.75h4.028Zm5.885,5.452L14.957,6.2a.51.51,0,0,0-.862.331V8.438H12.081v1.875h2.014v1.91a.51.51,0,0,0,.862.331l3.012-2.827A.475.475,0,0,0,17.968,9.023Zm-11.926.82V8.906a.488.488,0,0,1,.5-.469h5.538V4.688H7.8a.733.733,0,0,1-.755-.7V0H.755A.729.729,0,0,0,0,.7V14.3a.729.729,0,0,0,.755.7H11.329a.729.729,0,0,0,.755-.7V10.313H6.545A.488.488,0,0,1,6.042,9.844Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/DocInverted.tsx b/packages/epo-react-lib/src/svg/icons/DocInverted.tsx
index c7ca5eb9..4aef474d 100644
--- a/packages/epo-react-lib/src/svg/icons/DocInverted.tsx
+++ b/packages/epo-react-lib/src/svg/icons/DocInverted.tsx
@@ -15,9 +15,8 @@ const DocInverted: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M14.936,3H7.787A1.8,1.8,0,0,0,6.009,4.812L6,19.305a1.8,1.8,0,0,0,1.778,1.812H18.51A1.8,1.8,0,0,0,20.3,19.305V8.435Z"
         transform="translate(-6 -3)"
diff --git a/packages/epo-react-lib/src/svg/icons/Email.tsx b/packages/epo-react-lib/src/svg/icons/Email.tsx
index 2a01a786..56a225df 100644
--- a/packages/epo-react-lib/src/svg/icons/Email.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Email.tsx
@@ -15,9 +15,8 @@ const Email: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M21.2026,24.0003l-9.018,7.297V16.7023Zm3.3302,1.8315a.84747.84747,0,0,1-1.067,0l-.915-.74-9.017,7.297h20.932l-9.017-7.298ZM23.9995.3695a23.6305,23.6305,0,1,1-23.63,23.63,23.63084,23.63084,0,0,1,23.63-23.63m14.561,15.241a2.745,2.745,0,0,0-2.745-2.745H12.1845a2.745,2.745,0,0,0-2.745,2.745v16.778a2.745,2.745,0,0,0,2.745,2.745h23.631a2.745,2.745,0,0,0,2.745-2.745Zm-4.094.0003H13.5335l10.466,8.47Zm1.3486,15.6864V16.7022l-9.018,7.297Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/Expand.tsx b/packages/epo-react-lib/src/svg/icons/Expand.tsx
index 9267f3db..ffbcba05 100644
--- a/packages/epo-react-lib/src/svg/icons/Expand.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Expand.tsx
@@ -15,9 +15,8 @@ const Expand: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M10.94,16V13.538h2.6v-2.6H16V16ZM0,16V10.94H2.462v2.6h2.6V16ZM13.538,5.06v-2.6h-2.6V0H16V5.06ZM0,5.06V0H5.06V2.462h-2.6v2.6Z"
         transform="translate(0.5 0.5)"
diff --git a/packages/epo-react-lib/src/svg/icons/Eye.tsx b/packages/epo-react-lib/src/svg/icons/Eye.tsx
index 7f5c6eaf..7c4e8ae2 100644
--- a/packages/epo-react-lib/src/svg/icons/Eye.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Eye.tsx
@@ -15,9 +15,8 @@ const Eye: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M40.255 12.473A22.552 22.552 0 0 0 20.25 0 22.555 22.555 0 0 0 .245 12.474a2.275 2.275 0 0 0 0 2.052A22.552 22.552 0 0 0 20.25 27a22.555 22.555 0 0 0 20.005-12.474 2.275 2.275 0 0 0 0-2.053ZM20.25 23.625A10.125 10.125 0 1 1 30.375 13.5 10.125 10.125 0 0 1 20.25 23.625Zm0-16.875a6.7 6.7 0 0 0-1.78.266 3.364 3.364 0 0 1-4.7 4.7 6.735 6.735 0 1 0 6.484-4.97Z"
         fill="currentColor"
diff --git a/packages/epo-react-lib/src/svg/icons/Facebook.tsx b/packages/epo-react-lib/src/svg/icons/Facebook.tsx
index bab50249..a38a9b3d 100644
--- a/packages/epo-react-lib/src/svg/icons/Facebook.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Facebook.tsx
@@ -15,9 +15,8 @@ const Facebook: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M24.0005.3695a23.6305,23.6305,0,1,0,23.63,23.631A23.63105,23.63105,0,0,0,24.0005.3695m6.624,13.791-2.756.001c-2.175,0-2.579,1.033-2.579,2.55v3.332h5.156l-.675,5.252h-4.481v13.421h-5.419V25.2955h-4.501v-5.252h4.501v-3.851c0-4.482,2.726-6.922,6.724-6.922a37.13957,37.13957,0,0,1,4.03.206Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/FloppyDisk.tsx b/packages/epo-react-lib/src/svg/icons/FloppyDisk.tsx
index f4ebd817..4ff07bdf 100644
--- a/packages/epo-react-lib/src/svg/icons/FloppyDisk.tsx
+++ b/packages/epo-react-lib/src/svg/icons/FloppyDisk.tsx
@@ -15,9 +15,8 @@ const FloppyDisk: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M15.683,5.79,12.651,2.758a1.735,1.735,0,0,0-1.227-.508H1.735A1.735,1.735,0,0,0,0,3.985V16.706a1.735,1.735,0,0,0,1.735,1.735H14.456a1.735,1.735,0,0,0,1.735-1.735V7.016a1.735,1.735,0,0,0-.508-1.227ZM8.1,16.128a2.313,2.313,0,1,1,2.313-2.313A2.313,2.313,0,0,1,8.1,16.128ZM11.565,5.122V8.755a.434.434,0,0,1-.434.434H2.747a.434.434,0,0,1-.434-.434V5a.434.434,0,0,1,.434-.434h8.259a.434.434,0,0,1,.307.127l.126.126a.434.434,0,0,1,.127.307Z"
         transform="translate(0 -2.25)"
diff --git a/packages/epo-react-lib/src/svg/icons/Forward.tsx b/packages/epo-react-lib/src/svg/icons/Forward.tsx
index 006246c4..fda2d89c 100644
--- a/packages/epo-react-lib/src/svg/icons/Forward.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Forward.tsx
@@ -15,9 +15,8 @@ const Forward: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(-2737 -1072)">
         <path
           d="M4.5,0,9,8H0Z"
diff --git a/packages/epo-react-lib/src/svg/icons/ForwardStep.tsx b/packages/epo-react-lib/src/svg/icons/ForwardStep.tsx
index 141a5657..61fab060 100644
--- a/packages/epo-react-lib/src/svg/icons/ForwardStep.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ForwardStep.tsx
@@ -15,9 +15,8 @@ const ForwardStep: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M13.528,6.862v3.876L7.09,6.809A.226.226,0,0,0,6.75,7V15.5a.226.226,0,0,0,.34.194l6.438-3.929v3.876a.113.113,0,0,0,.113.113h2a.113.113,0,0,0,.113-.113V6.862a.113.113,0,0,0-.113-.112h-2A.113.113,0,0,0,13.528,6.862Z"
         transform="translate(-6.75 -6.75)"
diff --git a/packages/epo-react-lib/src/svg/icons/Globe.tsx b/packages/epo-react-lib/src/svg/icons/Globe.tsx
index d51bd872..7146c198 100644
--- a/packages/epo-react-lib/src/svg/icons/Globe.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Globe.tsx
@@ -15,9 +15,8 @@ const Globe: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M11.933,3a8.941,8.941,0,1,0,8.95,8.941A8.937,8.937,0,0,0,11.933,3Zm6.2,5.365H15.491a13.993,13.993,0,0,0-1.234-3.183A7.18,7.18,0,0,1,18.129,8.365ZM11.941,4.824a12.6,12.6,0,0,1,1.708,3.541H10.234A12.6,12.6,0,0,1,11.941,4.824ZM5.021,13.73a6.994,6.994,0,0,1,0-3.577H8.043a14.767,14.767,0,0,0-.125,1.788,14.767,14.767,0,0,0,.125,1.788Zm.733,1.788H8.392A13.993,13.993,0,0,0,9.626,18.7,7.141,7.141,0,0,1,5.754,15.518ZM8.392,8.365H5.754A7.141,7.141,0,0,1,9.626,5.182,13.993,13.993,0,0,0,8.392,8.365Zm3.55,10.694a12.6,12.6,0,0,1-1.708-3.541h3.416A12.6,12.6,0,0,1,11.941,19.059Zm2.092-5.329H9.849a13.155,13.155,0,0,1-.143-1.788,13.041,13.041,0,0,1,.143-1.788h4.185a13.041,13.041,0,0,1,.143,1.788A13.155,13.155,0,0,1,14.034,13.73Zm.224,4.971a13.993,13.993,0,0,0,1.234-3.183h2.638A7.18,7.18,0,0,1,14.257,18.7ZM15.84,13.73a14.767,14.767,0,0,0,.125-1.788,14.767,14.767,0,0,0-.125-1.788h3.022a6.994,6.994,0,0,1,0,3.577Z"
         transform="translate(-3 -3)"
diff --git a/packages/epo-react-lib/src/svg/icons/Google.tsx b/packages/epo-react-lib/src/svg/icons/Google.tsx
index 4c3bd2ce..1563fe2f 100644
--- a/packages/epo-react-lib/src/svg/icons/Google.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Google.tsx
@@ -15,9 +15,8 @@ const Google: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M30 15.602c0 8.7-5.957 14.889-14.754 14.889a15.246 15.246 0 1 1 0-30.492 14.661 14.661 0 0 1 10.223 3.99l-4.15 3.99C15.891 2.737 5.8 6.676 5.8 15.245a9.55 9.55 0 0 0 9.449 9.627c6.037 0 8.3-4.328 8.656-6.572h-8.659v-5.243H29.76a13.365 13.365 0 0 1 .24 2.545Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/Hamburger.tsx b/packages/epo-react-lib/src/svg/icons/Hamburger.tsx
index 542566a0..05c88a01 100644
--- a/packages/epo-react-lib/src/svg/icons/Hamburger.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Hamburger.tsx
@@ -15,9 +15,8 @@ const Hamburger: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <rect x="0.99996" y="1.00024" width="34" height="3.13818" />
       <rect x="0.99996" y="16.43042" width="34" height="3.13867" />
       <rect x="0.99996" y="31.86108" width="34" height="3.13867" />
diff --git a/packages/epo-react-lib/src/svg/icons/Info.tsx b/packages/epo-react-lib/src/svg/icons/Info.tsx
index cea56770..6035dfd4 100644
--- a/packages/epo-react-lib/src/svg/icons/Info.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Info.tsx
@@ -15,9 +15,8 @@ const Info: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m15.6 7.1c-0.3 1.1-1.4 1.7-2.5 1.4s-1.7-1.4-1.4-2.5 1.4-1.7 2.5-1.4c1 0.3 1.7 1.4 1.4 2.5m-1.9 11.2-0.3 0.7c-4 1.5-5.3-0.7-4.5-2.7l1.7-4.1c0.3-0.8 0.2-1.7-1.8-1.7l0.3-0.7c4-1.5 5.3 0.7 4.5 2.7l-1.7 4.1c-0.4 0.8-0.3 1.6 1.8 1.7m-1.8-17.4c-6.1 0-11 4.9-11 11s4.9 11 11 11 11-4.9 11-11-4.9-11-11-11" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/InfoCircle.tsx b/packages/epo-react-lib/src/svg/icons/InfoCircle.tsx
index 3d7a7156..092c6a7e 100644
--- a/packages/epo-react-lib/src/svg/icons/InfoCircle.tsx
+++ b/packages/epo-react-lib/src/svg/icons/InfoCircle.tsx
@@ -13,11 +13,11 @@ const InfoCircle: FunctionComponent<SVGProps> = ({
     height: size,
     fill,
     className,
+    stroke: "currentColor",
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M20.883,11.941A8.941,8.941,0,1,1,11.941,3a8.941,8.941,0,0,1,8.941,8.941Z"
         transform="translate(-3 -3)"
diff --git a/packages/epo-react-lib/src/svg/icons/Instagram.tsx b/packages/epo-react-lib/src/svg/icons/Instagram.tsx
index b057a848..e4e0a698 100644
--- a/packages/epo-react-lib/src/svg/icons/Instagram.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Instagram.tsx
@@ -15,9 +15,8 @@ const Instagram: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M29.9455,11.368H18.0475a6.26316,6.26316,0,0,0-6.263,6.264V30.28a6.263,6.263,0,0,0,6.263,6.263h11.898a6.2638,6.2638,0,0,0,6.264-6.263V17.632a6.264,6.264,0,0,0-6.264-6.264m1.873,12.597a7.83453,7.83453,0,0,1-15.669-.029,7.9667,7.9667,0,0,1,2.402-5.684,7.50818,7.50818,0,0,1,5.471-2.15c4.837.141,7.897,3.227,7.796,7.863m.19-6.257a1.827,1.827,0,1,1,1.827-1.827,1.827,1.827,0,0,1-1.827,1.827m-8.0626,1.033c3.346.097,5.302,2.029,5.233,5.166a5.19454,5.19454,0,1,1-10.389.029,5.316,5.316,0,0,1,1.601-3.791,4.87382,4.87382,0,0,1,3.413-1.406c.047,0,.095.001.142.002M23.9995.3695a23.6305,23.6305,0,1,0,23.631,23.631A23.6302,23.6302,0,0,0,23.9995.3695m14.294,29.969a8.42131,8.42131,0,0,1-8.388,8.456H18.0885a8.49239,8.49239,0,0,1-8.472-8.456V17.6675a8.50181,8.50181,0,0,1,8.472-8.467h11.817a8.43075,8.43075,0,0,1,8.388,8.467Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/Lightbulb.tsx b/packages/epo-react-lib/src/svg/icons/Lightbulb.tsx
index 1858b8c7..4df1ceff 100644
--- a/packages/epo-react-lib/src/svg/icons/Lightbulb.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Lightbulb.tsx
@@ -15,9 +15,8 @@ const Lightbulb: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M4.093,18.635a1.278,1.278,0,0,0,.228.726l.728,1.054A1.378,1.378,0,0,0,6.185,21h2.63a1.378,1.378,0,0,0,1.135-.586l.728-1.054a1.277,1.277,0,0,0,.228-.726l0-1.573H4.091ZM0,7.219a7.026,7.026,0,0,0,1.856,4.749,11.687,11.687,0,0,1,2.225,3.751l0,.032h6.828l0-.032a11.687,11.687,0,0,1,2.225-3.751A7.026,7.026,0,0,0,15,7.219,7.364,7.364,0,0,0,7.477,0,7.329,7.329,0,0,0,0,7.219Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/LinkedIn.tsx b/packages/epo-react-lib/src/svg/icons/LinkedIn.tsx
index c164ccc5..5cb0857d 100644
--- a/packages/epo-react-lib/src/svg/icons/LinkedIn.tsx
+++ b/packages/epo-react-lib/src/svg/icons/LinkedIn.tsx
@@ -15,9 +15,8 @@ const LinkedIn: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M40.685,4.4175H7.307a2.85782,2.85782,0,0,0-2.889,2.824v33.515a2.8595,2.8595,0,0,0,2.889,2.826H40.685a2.86454,2.86454,0,0,0,2.897-2.826V7.2415a2.86287,2.86287,0,0,0-2.897-2.824M16.036,37.7905H10.221v-18.69h5.815ZM13.13,16.5465a3.3685,3.3685,0,1,1,3.367-3.369,3.36684,3.36684,0,0,1-3.367,3.369m24.662,21.244H31.984v-9.089c0-2.167-.038-4.956-3.019-4.956-3.022,0-3.483,2.363-3.483,4.801v9.244H19.68v-18.69h5.568v2.555h.08a6.1005,6.1005,0,0,1,5.495-3.019c5.882,0,6.969,3.87,6.969,8.904Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/LockClosed.tsx b/packages/epo-react-lib/src/svg/icons/LockClosed.tsx
index 1bb1d102..6eaa624d 100644
--- a/packages/epo-react-lib/src/svg/icons/LockClosed.tsx
+++ b/packages/epo-react-lib/src/svg/icons/LockClosed.tsx
@@ -15,9 +15,8 @@ const LockClosed: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m13.6 21.3h-3.3l0.6-3c-0.8-0.6-1-1.7-0.4-2.5s1.7-1 2.5-0.4 1 1.7 0.4 2.5c-0.1 0.2-0.3 0.3-0.4 0.4l0.6 3zm-10.6 2.7h18v-12.2h-18v12.2z" />
       <path d="m8.3 8.3c0-2 1.7-3.7 3.7-3.7s3.7 1.7 3.7 3.7v2.6h4.1v-2.6c0-4.3-3.5-7.8-7.8-7.8s-7.8 3.5-7.8 7.8v2.6h4.1v-2.6z" />
     </svg>
diff --git a/packages/epo-react-lib/src/svg/icons/LockOpen.tsx b/packages/epo-react-lib/src/svg/icons/LockOpen.tsx
index 92929574..936b9cbe 100644
--- a/packages/epo-react-lib/src/svg/icons/LockOpen.tsx
+++ b/packages/epo-react-lib/src/svg/icons/LockOpen.tsx
@@ -15,9 +15,8 @@ const LockOpen: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m13.4 21.5h-2.8l0.5-2.6c-0.7-0.5-0.9-1.5-0.4-2.2s1.5-0.9 2.2-0.4 0.9 1.5 0.4 2.2c-0.1 0.2-0.2 0.3-0.4 0.4l0.5 2.6zm-9.2 2.4h15.6v-10.6h-15.6v10.6z" />
       <path d="m8.8 6.9c0-1.8 1.4-3.2 3.2-3.2s3.2 1.4 3.2 3.2v1.3h3.5v-1.3c0-3.7-3-6.7-6.7-6.7s-6.7 3-6.7 6.7v5.4h3.5v-5.4z" />
     </svg>
diff --git a/packages/epo-react-lib/src/svg/icons/LogOut.tsx b/packages/epo-react-lib/src/svg/icons/LogOut.tsx
index 1f25bce3..0058cd3b 100644
--- a/packages/epo-react-lib/src/svg/icons/LogOut.tsx
+++ b/packages/epo-react-lib/src/svg/icons/LogOut.tsx
@@ -15,9 +15,8 @@ const LogOut: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="m19.723 8.294-6.667 6.667a.954.954 0 0 1-1.627-.675v-3.81h-5.4a.95.95 0 0 1-.952-.952v-3.81a.95.95 0 0 1 .952-.952h5.4V.953a.955.955 0 0 1 1.627-.675l6.667 6.667a.961.961 0 0 1 0 1.349Zm-12.1 6.469v-1.587a.478.478 0 0 0-.476-.476H3.81a1.269 1.269 0 0 1-1.27-1.27V3.81a1.269 1.269 0 0 1 1.27-1.27h3.333a.478.478 0 0 0 .476-.476V.477a.478.478 0 0 0-.476-.476H3.81A3.811 3.811 0 0 0 0 3.81v7.619a3.811 3.811 0 0 0 3.81 3.81h3.333a.478.478 0 0 0 .476-.476Z"
         fill="currentColor"
diff --git a/packages/epo-react-lib/src/svg/icons/Mail.tsx b/packages/epo-react-lib/src/svg/icons/Mail.tsx
index 96bec766..85b2bc50 100644
--- a/packages/epo-react-lib/src/svg/icons/Mail.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Mail.tsx
@@ -15,9 +15,8 @@ const Mail: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <polygon points="24.942 26.726 23.057 26.726 20.522 25.018 7.929 33.5 40.07 33.5 27.477 25.014 24.942 26.726" />
       <polygon points="7.93 31.468 19.013 24.001 7.93 16.532 7.93 31.468" />
       <polygon points="28.987 24.001 40.071 31.468 40.071 16.532 28.987 24.001" />
diff --git a/packages/epo-react-lib/src/svg/icons/Minus.tsx b/packages/epo-react-lib/src/svg/icons/Minus.tsx
index 600c68bd..27aa9a59 100644
--- a/packages/epo-react-lib/src/svg/icons/Minus.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Minus.tsx
@@ -17,9 +17,8 @@ const Minus: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M12,1.12,10.88,0,0,10.88,1.12,12Z"
         transform="translate(8.485 0) rotate(45)"
diff --git a/packages/epo-react-lib/src/svg/icons/Page.tsx b/packages/epo-react-lib/src/svg/icons/Page.tsx
index 7cb008b8..dc2b2bfa 100644
--- a/packages/epo-react-lib/src/svg/icons/Page.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Page.tsx
@@ -15,9 +15,8 @@ const Page: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M14.936,3H7.787A1.8,1.8,0,0,0,6.009,4.812L6,19.305a1.8,1.8,0,0,0,1.778,1.812H18.51A1.8,1.8,0,0,0,20.3,19.305V8.435Z"
         transform="translate(-6 -3)"
diff --git a/packages/epo-react-lib/src/svg/icons/Pause.tsx b/packages/epo-react-lib/src/svg/icons/Pause.tsx
index ae4ab032..0bffeedf 100644
--- a/packages/epo-react-lib/src/svg/icons/Pause.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Pause.tsx
@@ -15,9 +15,8 @@ const Pause: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(-2739 -1064)">
         <rect width="4" height="15" transform="translate(2739 1064)" />
         <rect width="4" height="15" transform="translate(2748 1064)" />
diff --git a/packages/epo-react-lib/src/svg/icons/Pdf.tsx b/packages/epo-react-lib/src/svg/icons/Pdf.tsx
index 525ff053..30b1983f 100644
--- a/packages/epo-react-lib/src/svg/icons/Pdf.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Pdf.tsx
@@ -15,10 +15,8 @@ const Pdf: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
-
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M12.79 18.007c-.352-1.125-.345-3.3-.141-3.3.591.002.535 2.593.141 3.3Zm-.12 3.319a32.444 32.444 0 0 1-2 4.409 25.891 25.891 0 0 1 4.423-1.54 9.108 9.108 0 0 1-2.423-2.869ZM6.054 30.1c0 .056.928-.38 2.454-2.827A9.718 9.718 0 0 0 6.054 30.1Zm11.384-18.85H27v23.063A1.683 1.683 0 0 1 25.313 36H1.688A1.683 1.683 0 0 1 0 34.313V1.688A1.683 1.683 0 0 1 1.688 0H15.75v9.563a1.692 1.692 0 0 0 1.688 1.687Zm-.562 12.08a7.057 7.057 0 0 1-3-3.783c.316-1.3.816-3.277.436-4.514a1.761 1.761 0 0 0-3.361-.478c-.352 1.287-.028 3.1.57 5.414A66.025 66.025 0 0 1 8.648 26c-.007 0-.007.007-.014.007-1.905.977-5.175 3.129-3.832 4.781a2.185 2.185 0 0 0 1.512.7c1.259 0 2.51-1.266 4.3-4.345a40.079 40.079 0 0 1 5.555-1.631 10.656 10.656 0 0 0 4.5 1.371 1.82 1.82 0 0 0 1.385-3.052c-.977-.956-3.818-.682-5.175-.506Zm9.632-15.947L19.617.492A1.686 1.686 0 0 0 18.422 0H18v9h9v-.429a1.682 1.682 0 0 0-.492-1.188ZM21.3 25.334c.288-.19-.176-.837-3.009-.633 2.609 1.111 3.009.633 3.009.633Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/Phone.tsx b/packages/epo-react-lib/src/svg/icons/Phone.tsx
index b025d223..a6446b8d 100644
--- a/packages/epo-react-lib/src/svg/icons/Phone.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Phone.tsx
@@ -15,9 +15,8 @@ const Phone: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M23.8302,19.8355a1.0945,1.0945,0,1,0,1.094,1.095,1.09511,1.09511,0,0,0-1.094-1.095" />
       <path d="M27.6378,22.5234a1.09312,1.09312,0,1,0-1.528.243,1.09106,1.09106,0,0,0,1.528-.243" />
       <path d="M28.2235,23.3262a1.09308,1.09308,0,1,0,1.376.704,1.09121,1.09121,0,0,0-1.376-.704" />
diff --git a/packages/epo-react-lib/src/svg/icons/Pin.tsx b/packages/epo-react-lib/src/svg/icons/Pin.tsx
index 0de08ff3..b61bfc75 100644
--- a/packages/epo-react-lib/src/svg/icons/Pin.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Pin.tsx
@@ -15,9 +15,8 @@ const Pin: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m12 12.7c-2.4 0-4.3-1.9-4.3-4.3s1.9-4.4 4.3-4.4 4.3 1.9 4.3 4.3c0 2.5-1.9 4.4-4.3 4.4m0-12.4c-4.4 0-8 3.6-8 8v0.2c0.1 8.8 8 15.3 8 15.3s7.9-6.5 8-15.3v-0.2c0-4.4-3.6-8-8-8" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/Play.tsx b/packages/epo-react-lib/src/svg/icons/Play.tsx
index a52e3ce9..d56d4e77 100644
--- a/packages/epo-react-lib/src/svg/icons/Play.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Play.tsx
@@ -15,9 +15,8 @@ const Play: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M8.5,0,17,15H0Z" transform="translate(15) rotate(90)" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/Plus.tsx b/packages/epo-react-lib/src/svg/icons/Plus.tsx
index 607201c7..3b694e66 100644
--- a/packages/epo-react-lib/src/svg/icons/Plus.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Plus.tsx
@@ -17,9 +17,8 @@ const Plus: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(7.071 0) rotate(45)">
         <path d="M10,.933,9.067,0,5,4.067.933,0,0,.933,4.067,5,0,9.067.933,10,5,5.933,9.067,10,10,9.067,5.933,5Z" />
       </g>
diff --git a/packages/epo-react-lib/src/svg/icons/QuestionCircle.tsx b/packages/epo-react-lib/src/svg/icons/QuestionCircle.tsx
index 3f525726..3cbe8605 100644
--- a/packages/epo-react-lib/src/svg/icons/QuestionCircle.tsx
+++ b/packages/epo-react-lib/src/svg/icons/QuestionCircle.tsx
@@ -17,9 +17,8 @@ const QuestionCircle: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(1 1)">
         <path
           d="M20.883,11.941A8.941,8.941,0,1,1,11.941,3a8.941,8.941,0,0,1,8.941,8.941Z"
diff --git a/packages/epo-react-lib/src/svg/icons/RotateLeft.tsx b/packages/epo-react-lib/src/svg/icons/RotateLeft.tsx
index f3fcce78..dfb67915 100644
--- a/packages/epo-react-lib/src/svg/icons/RotateLeft.tsx
+++ b/packages/epo-react-lib/src/svg/icons/RotateLeft.tsx
@@ -15,9 +15,8 @@ const RotateLeft: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M10,4.5A7.5,7.5,0,0,0,2.5,12H0l3.333,3.333L6.667,12h-2.5a5.837,5.837,0,1,1,2.45,4.75l-1.183,1.2A7.5,7.5,0,1,0,10,4.5Z"
         transform="translate(19.5) rotate(90)"
diff --git a/packages/epo-react-lib/src/svg/icons/RotateLeftWithCenter.tsx b/packages/epo-react-lib/src/svg/icons/RotateLeftWithCenter.tsx
index ad58af44..d2bcfd38 100644
--- a/packages/epo-react-lib/src/svg/icons/RotateLeftWithCenter.tsx
+++ b/packages/epo-react-lib/src/svg/icons/RotateLeftWithCenter.tsx
@@ -15,9 +15,8 @@ const RotateLeftWithCenter: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M15.007,9.647a2.144,2.144,0,1,0-2.144,2.144A2.15,2.15,0,0,0,15.007,9.647ZM12.863,0A9.648,9.648,0,0,0,3.216,9.647H0l4.288,4.288L8.575,9.647H5.359a7.508,7.508,0,1,1,3.151,6.11L6.989,17.3A9.647,9.647,0,1,0,12.863,0Z"
         transform="translate(19.295) rotate(90)"
diff --git a/packages/epo-react-lib/src/svg/icons/Search.tsx b/packages/epo-react-lib/src/svg/icons/Search.tsx
index 52607aac..564547c9 100644
--- a/packages/epo-react-lib/src/svg/icons/Search.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Search.tsx
@@ -15,9 +15,8 @@ const Search: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m34.953 33.202-9.1915-9.1923a14.125 14.125 0 1 0-2.3201 2.1174l9.2928 9.2936zm-27.559-10.732a10.987 10.987 0 1 1 7.7686 3.2168 10.998 10.998 0 0 1-7.7686-3.2168z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/ShareCopyUrl.tsx b/packages/epo-react-lib/src/svg/icons/ShareCopyUrl.tsx
index 712b8cc0..29d8cfbc 100644
--- a/packages/epo-react-lib/src/svg/icons/ShareCopyUrl.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ShareCopyUrl.tsx
@@ -15,9 +15,8 @@ const ShareCopyUrl: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M33.6,622.3q.181.241.384.467a5.574,5.574,0,0,1-.384-.467"
         transform="translate(-32.334 -598.851)"
diff --git a/packages/epo-react-lib/src/svg/icons/ShareEmail.tsx b/packages/epo-react-lib/src/svg/icons/ShareEmail.tsx
index 7d649a0f..33c8c967 100644
--- a/packages/epo-react-lib/src/svg/icons/ShareEmail.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ShareEmail.tsx
@@ -15,9 +15,8 @@ const ShareEmail: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M323.328,446.452h-27.04v-17.86h27.04Zm0-20.152h-27.04A2.288,2.288,0,0,0,294,428.588v17.864a2.288,2.288,0,0,0,2.288,2.288h27.04a2.288,2.288,0,0,0,2.288-2.288v-17.86a2.288,2.288,0,0,0-2.288-2.288"
         transform="translate(-283.808 -411.522)"
diff --git a/packages/epo-react-lib/src/svg/icons/ShareFacebook.tsx b/packages/epo-react-lib/src/svg/icons/ShareFacebook.tsx
index 9736469a..1c87372c 100644
--- a/packages/epo-react-lib/src/svg/icons/ShareFacebook.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ShareFacebook.tsx
@@ -15,9 +15,8 @@ const ShareFacebook: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M479.775,314.913V300.128H474.8v-5.762h4.975v-4.25c0-4.933,3.013-7.616,7.412-7.616a41.276,41.276,0,0,1,4.448.225v5.155h-3.051c-2.392,0-2.857,1.137-2.857,2.8v3.682h5.706l-.745,5.762h-4.961v14.785Z"
         transform="translate(-458.34 -272.707)"
diff --git a/packages/epo-react-lib/src/svg/icons/ShareToggle.tsx b/packages/epo-react-lib/src/svg/icons/ShareToggle.tsx
index ca401679..7e830ddc 100644
--- a/packages/epo-react-lib/src/svg/icons/ShareToggle.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ShareToggle.tsx
@@ -15,9 +15,8 @@ const ShareToggle: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M18.4985,15.2245a2.34071,2.34071,0,0,0-1.72.753l-8.936-3.831c.003-.049.008-.097.008-.147,0-.049-.005-.097-.008-.146l8.936-3.832a2.34555,2.34555,0,1,0-.629-1.595c0,.049.005.097.008.146l-8.936,3.832a2.3485,2.3485,0,1,0,0,3.191l8.936,3.832c-.003.048-.008.096-.008.146a2.349,2.349,0,1,0,2.349-2.349" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/ShareTwitter.tsx b/packages/epo-react-lib/src/svg/icons/ShareTwitter.tsx
index c1650a9d..e447d8d8 100644
--- a/packages/epo-react-lib/src/svg/icons/ShareTwitter.tsx
+++ b/packages/epo-react-lib/src/svg/icons/ShareTwitter.tsx
@@ -15,9 +15,8 @@ const ShareTwitter: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path
         d="M413.849,480.992q.014.336.014.676A14.85,14.85,0,0,1,391,494.179a10.539,10.539,0,0,0,7.731-2.163,5.228,5.228,0,0,1-4.878-3.626,5.231,5.231,0,0,0,2.357-.09,5.224,5.224,0,0,1-4.188-5.12v-.066a5.2,5.2,0,0,0,2.364.652,5.228,5.228,0,0,1-1.615-6.971,14.833,14.833,0,0,0,10.764,5.457,5.224,5.224,0,0,1,8.9-4.763,10.449,10.449,0,0,0,3.318-1.269,5.238,5.238,0,0,1-2.295,2.888,10.453,10.453,0,0,0,3-.822,10.619,10.619,0,0,1-2.607,2.7"
         transform="translate(-377.445 -459.339)"
diff --git a/packages/epo-react-lib/src/svg/icons/Team.tsx b/packages/epo-react-lib/src/svg/icons/Team.tsx
index 615d9126..bde25cf9 100644
--- a/packages/epo-react-lib/src/svg/icons/Team.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Team.tsx
@@ -15,9 +15,8 @@ const Team: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m11.9 12.2c1.2 0 2.1-0.9 2.1-2.1s-0.9-2.1-2.1-2.1-2.1 0.9-2.1 2.1 0.9 2.1 2.1 2.1z" />
       <path d="m19.7 12.3c1 0 1.8-0.8 1.8-1.8s-0.8-1.8-1.8-1.8-1.8 0.8-1.8 1.8 0.7 1.8 1.8 1.8z" />
       <path d="m23.4 16.4-0.5-1.8c-0.4-1.6-2.5-1.6-3.4-1.6s-3 0-3.4 1.6l-0.1 0.6-0.2-0.9c-0.5-1.8-2.8-1.8-3.9-1.8s-3.4 0-3.8 1.8l-0.2 0.9-0.2-0.7c-0.5-1.6-2.5-1.5-3.4-1.5s-3 0-3.4 1.6l-0.5 1.8h23z" />
diff --git a/packages/epo-react-lib/src/svg/icons/Temp.tsx b/packages/epo-react-lib/src/svg/icons/Temp.tsx
index 2ac12599..431c2fae 100644
--- a/packages/epo-react-lib/src/svg/icons/Temp.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Temp.tsx
@@ -15,9 +15,8 @@ const Temp: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m14.6 16.6v-13.6c0-1.7-1.4-3-3-3s-3 1.4-3 3v13.5c-1.6 1.7-1.6 4.3 0.1 5.9s4.3 1.6 5.9-0.1c1.5-1.5 1.5-4.1 0-5.7zm-3 6c-1.7 0-3.1-1.4-3.1-3.2 0-0.9 0.4-1.8 1.2-2.4v-14c0-1.1 0.9-2 2-2s2 0.9 2 2v14c1.3 1.1 1.5 3.1 0.4 4.4-0.7 0.8-1.6 1.2-2.5 1.2z" />
       <path d="m12.3 17.7v-6.1h-1.6v6.1c-1 0.4-1.5 1.6-1 2.6 0.4 1 1.6 1.5 2.6 1 1-0.4 1.5-1.6 1-2.6-0.1-0.5-0.5-0.8-1-1z" />
     </svg>
diff --git a/packages/epo-react-lib/src/svg/icons/Thumbtack.tsx b/packages/epo-react-lib/src/svg/icons/Thumbtack.tsx
index d2800bfa..8e9c1b3a 100644
--- a/packages/epo-react-lib/src/svg/icons/Thumbtack.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Thumbtack.tsx
@@ -15,9 +15,8 @@ const Thumbtack: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g transform="translate(-1442.963 821.797)">
         <path
           d="M3.725,4.9h0L3.1,4.883,0,.452.408.166,2.067,2.534.408.166.646,0l3.44,4.914Z"
diff --git a/packages/epo-react-lib/src/svg/icons/Time.tsx b/packages/epo-react-lib/src/svg/icons/Time.tsx
index 57b1eff8..029759f7 100644
--- a/packages/epo-react-lib/src/svg/icons/Time.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Time.tsx
@@ -15,9 +15,8 @@ const Time: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m11.8 1c-6 0-10.8 4.8-10.8 10.8s4.8 10.8 10.8 10.8 10.8-4.8 10.8-10.8-4.8-10.8-10.8-10.8zm0 19.8c-4.9 0-8.9-4-8.9-8.9s4-8.9 8.9-8.9 8.9 4 8.9 8.9c0.1 4.9-3.9 8.9-8.9 8.9z" />
       <path d="m17 15.4-5.4-3.1v-5.2c0-0.4-0.3-0.6-0.6-0.6-0.4 0-0.6 0.3-0.6 0.6v5.9l6 3.4c0.1 0.1 0.2 0.1 0.3 0.1 0.2 0 0.4-0.1 0.6-0.3 0.1-0.2 0-0.6-0.3-0.8z" />
     </svg>
diff --git a/packages/epo-react-lib/src/svg/icons/Timer.tsx b/packages/epo-react-lib/src/svg/icons/Timer.tsx
index ecebb5bc..cdc291a1 100644
--- a/packages/epo-react-lib/src/svg/icons/Timer.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Timer.tsx
@@ -15,9 +15,8 @@ const Timer: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <g fill="#1d1d1b">
         <path d="M20.14 8.3a19.038 19.038 0 0 0-9.276 2.4L8.728 7.654 12 5.359 9.828 2.253 0 9.138l2.176 3.106 3.276-2.3L7.6 13.011A19.114 19.114 0 1 0 20.14 8.3Zm0 32.266a13.133 13.133 0 1 1 13.132-13.13A13.148 13.148 0 0 1 20.14 40.569Z" />
         <path d="M18.138 7.031h4V4.08h4V0h-12v4.08h4Z" />
diff --git a/packages/epo-react-lib/src/svg/icons/Twitter.tsx b/packages/epo-react-lib/src/svg/icons/Twitter.tsx
index 177032ce..776dfbfc 100644
--- a/packages/epo-react-lib/src/svg/icons/Twitter.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Twitter.tsx
@@ -15,9 +15,8 @@ const Twitter: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M24.0005.3695a23.6305,23.6305,0,1,0,23.63,23.631A23.63105,23.63105,0,0,0,24.0005.3695m9.454,19.679c.009.204.014.408.014.614a13.49893,13.49893,0,0,1-20.78,11.372,9.59528,9.59528,0,0,0,7.027-1.965,4.75253,4.75253,0,0,1-4.434-3.297,4.72717,4.72717,0,0,0,2.143-.081,4.74886,4.74886,0,0,1-3.807-4.654v-.06a4.72689,4.72689,0,0,0,2.15.594,4.75353,4.75353,0,0,1-1.469-6.337,13.473,13.473,0,0,0,9.783,4.959,4.74928,4.74928,0,0,1,8.088-4.329,9.48,9.48,0,0,0,3.014-1.151,4.75657,4.75657,0,0,1-2.087,2.625,9.44836,9.44836,0,0,0,2.726-.747,9.63828,9.63828,0,0,1-2.368,2.457" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/User.tsx b/packages/epo-react-lib/src/svg/icons/User.tsx
index 67f19274..b5905bac 100644
--- a/packages/epo-react-lib/src/svg/icons/User.tsx
+++ b/packages/epo-react-lib/src/svg/icons/User.tsx
@@ -15,9 +15,8 @@ const User: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M32.084,18.41269a8.08345,8.08345,0,0,1-16.1669-.00284v-.001a8.08345,8.08345,0,1,1,16.1669.00382ZM46.5,24A22.5,22.5,0,1,1,24,1.5,22.52495,22.52495,0,0,1,46.5,24Zm-2.31577,0A20.18425,20.18425,0,1,0,8.55377,36.96708l.68755-2.5573c1.88-6.99547,10.802-6.82949,14.75827-6.82949,3.95638,0,12.87834-.16407,14.75834,6.82949l.6872,2.55846A20.08472,20.08472,0,0,0,44.18423,24Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/UserInverted.tsx b/packages/epo-react-lib/src/svg/icons/UserInverted.tsx
index 884eb3f4..e781b6c6 100644
--- a/packages/epo-react-lib/src/svg/icons/UserInverted.tsx
+++ b/packages/epo-react-lib/src/svg/icons/UserInverted.tsx
@@ -15,9 +15,8 @@ const UserInverted: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M32 1.1C14.9 1.1 1.1 14.9 1.1 32c0 17.1 13.8 30.9 30.9 30.9 17.1 0 30.9-13.8 30.9-30.9C62.9 15 49.1 1.1 32 1.1zm0 12c6.1 0 11 4.9 11 11S38 35 32 35c-6.1 0-11-4.9-11-11 0-6 4.9-10.9 11-10.9zm0 42.8c-7 0-13.7-3.1-18.2-8.5C16.1 42.8 20.9 40 26 40c.3 0 .6 0 .9.1 1.6.6 3.4.8 5.1.9 1.7 0 3.5-.3 5.1-.9.3-.1.6-.1.9-.1 5.2 0 9.9 2.9 12.3 7.4-4.6 5.4-11.3 8.5-18.3 8.5z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/Video.tsx b/packages/epo-react-lib/src/svg/icons/Video.tsx
index 2ca3809f..7604f77e 100644
--- a/packages/epo-react-lib/src/svg/icons/Video.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Video.tsx
@@ -15,9 +15,8 @@ const Video: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="m11.8 14.9c2.7 0 5-2.2 5-5 0-2.7-2.2-5-5-5-2.7 0-5 2.2-5 5s2.2 5 5 5zm-1.7-7.5 4.6 2.6-4.6 2.6v-5.2z" />
       <path d="M1.5,0.8v22.8h20.6V0.8H1.5z M20.1,16.7H3.4V2.8h16.7V16.7z" />
     </svg>
diff --git a/packages/epo-react-lib/src/svg/icons/Word.tsx b/packages/epo-react-lib/src/svg/icons/Word.tsx
index a14c0ab3..1cefd990 100644
--- a/packages/epo-react-lib/src/svg/icons/Word.tsx
+++ b/packages/epo-react-lib/src/svg/icons/Word.tsx
@@ -15,10 +15,8 @@ const Word: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
-
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M15.75 9.563V0H1.688A1.683 1.683 0 0 0 0 1.688v32.625A1.683 1.683 0 0 0 1.688 36h23.625A1.683 1.683 0 0 0 27 34.313V11.25h-9.562a1.692 1.692 0 0 1-1.688-1.687ZM19.765 18h1.68a.844.844 0 0 1 .823 1.034L19.6 30.846a.836.836 0 0 1-.823.654H16.1a.843.843 0 0 1-.816-.64c-1.814-7.277-1.462-5.709-1.8-7.77h-.035c-.077 1.005-.169 1.223-1.8 7.77a.843.843 0 0 1-.816.64H8.227a.842.842 0 0 1-.823-.661L4.746 19.027A.841.841 0 0 1 5.569 18h1.722a.843.843 0 0 1 .83.682c1.1 5.484 1.413 7.7 1.477 8.592.113-.717.513-2.3 2.067-8.627a.837.837 0 0 1 .823-.64h2.046a.843.843 0 0 1 .823.647c1.688 7.059 2.025 8.719 2.081 9.1-.014-.788-.183-1.252 1.519-9.084a.815.815 0 0 1 .808-.67ZM27 8.571V9h-9V0h.429a1.686 1.686 0 0 1 1.2.492l6.884 6.891A1.682 1.682 0 0 1 27 8.571Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/YouTube.tsx b/packages/epo-react-lib/src/svg/icons/YouTube.tsx
index f5491a1f..e0023ea4 100644
--- a/packages/epo-react-lib/src/svg/icons/YouTube.tsx
+++ b/packages/epo-react-lib/src/svg/icons/YouTube.tsx
@@ -15,9 +15,8 @@ const YouTube: FunctionComponent<SVGProps> = ({
     className,
   };
 
-  const mergedSvgProps = Object.assign(defaultProps, uniqueProps);
   return (
-    <svg {...mergedSvgProps}>
+    <svg {...{ ...defaultProps, ...uniqueProps }}>
       <path d="M46.6435,12.551a5.939,5.939,0,0,0-4.179-4.206c-3.685-.994-18.465-.994-18.465-.994s-14.778,0-18.464.994a5.93764,5.93764,0,0,0-4.178,4.206C.3695,16.26.3695,24,.3695,24s0,7.74.988,11.449a5.93764,5.93764,0,0,0,4.178,4.206c3.686.994,18.464.994,18.464.994s14.78,0,18.465-.994a5.939,5.939,0,0,0,4.179-4.206c.987-3.709.987-11.449.987-11.449s0-7.74-.987-11.449M19.1665,31.027V16.973L31.5185,24Z" />
     </svg>
   );
diff --git a/packages/epo-react-lib/src/svg/icons/defaultProps.ts b/packages/epo-react-lib/src/svg/icons/defaultProps.ts
index 9aa4394c..4776f5ba 100644
--- a/packages/epo-react-lib/src/svg/icons/defaultProps.ts
+++ b/packages/epo-react-lib/src/svg/icons/defaultProps.ts
@@ -1,5 +1,4 @@
 export default {
   xmlns: "http://www.w3.org/2000/svg",
   role: "presentation",
-  strokeWidth: 0,
 };