diff --git a/src/Components/Counters/ExtraCountersBar.tsx b/src/Components/Counters/ExtraCountersBar.tsx
index b26b69d..2d2da25 100644
--- a/src/Components/Counters/ExtraCountersBar.tsx
+++ b/src/Components/Counters/ExtraCountersBar.tsx
@@ -32,7 +32,7 @@ const ExtraCountersGrid = styled.div<{ rotation: number }>`
         height: 100%;
         width: auto;
         bottom: auto;
-        right: 0;
+        right: -6px;
       `;
     }
   }}
diff --git a/src/Components/LifeCounter/LifeCounter.tsx b/src/Components/LifeCounter/LifeCounter.tsx
index b605ed4..51815b5 100644
--- a/src/Components/LifeCounter/LifeCounter.tsx
+++ b/src/Components/LifeCounter/LifeCounter.tsx
@@ -210,9 +210,26 @@ const LifeCounter = ({
     }
   }, [showStartingPlayer]);
 
-  const size = 30;
-  const fontSize = `${size}vmin`;
-  const strokeWidth = `${size / 20}vmin`;
+  player.settings.rotation === Rotation.SideFlipped ||
+    player.settings.rotation === Rotation.Side;
+
+  const size =
+    player.settings.rotation === Rotation.SideFlipped ||
+    player.settings.rotation === Rotation.Side
+      ? 15
+      : 30;
+
+  const fontSize =
+    player.settings.rotation === Rotation.SideFlipped ||
+    player.settings.rotation === Rotation.Side
+      ? `${size}vmax`
+      : `${size}vmin`;
+
+  const strokeWidth =
+    player.settings.rotation === Rotation.SideFlipped ||
+    player.settings.rotation === Rotation.Side
+      ? `${size / 20}vmax`
+      : `${size / 20}vmin`;
 
   return (
     <LifeCounterContentWrapper backgroundColor={backgroundColor}>
diff --git a/src/Components/PlayerMenu/PlayerMenu.tsx b/src/Components/PlayerMenu/PlayerMenu.tsx
index c1c13ff..4436953 100644
--- a/src/Components/PlayerMenu/PlayerMenu.tsx
+++ b/src/Components/PlayerMenu/PlayerMenu.tsx
@@ -13,6 +13,8 @@ const PlayerMenuWrapper = styled.div<{
   width: 100%;
   height: 100%;
   background-color: rgba(20, 20, 20, 0.9);
+  align-items: center;
+  justify-content: center;
   z-index: 2;
   ${(props) => {
     if (
diff --git a/src/Components/PlayerMenu/Settings.tsx b/src/Components/PlayerMenu/Settings.tsx
index 77e1bd3..f562287 100644
--- a/src/Components/PlayerMenu/Settings.tsx
+++ b/src/Components/PlayerMenu/Settings.tsx
@@ -16,12 +16,10 @@ const SettingsContainer = styled.div<{
 }>`
   display: flex;
   flex-direction: row;
-  flex-wrap: wrap;
   justify-content: space-evenly;
   align-items: center;
-  gap: 2vmin;
   height: 100%;
-  width: 100%;
+  width: 80%;
   ${(props) => {
     if (
       props.rotation === Rotation.SideFlipped ||
@@ -29,6 +27,8 @@ const SettingsContainer = styled.div<{
     ) {
       return css`
         flex-direction: column-reverse;
+        height: 100%;
+        width: 100%;
         /* padding-top: 36px; */
       `;
     } else {
@@ -200,18 +200,18 @@ const Settings = ({ player, onChange, resetCurrentGame }: SettingsProps) => {
               checked={player.settings.usePartner}
               icon={
                 <PartnerTax
-                  size="4vmax"
+                  size="6vmax"
                   color="black"
                   stroke="white"
-                  stroke-width="10"
+                  stroke-width="30"
                 />
               }
               checkedIcon={
                 <PartnerTax
-                  size="4vmax"
+                  size="6vmax"
                   color={player.color}
                   stroke="white"
-                  stroke-width="10"
+                  stroke-width="30"
                 />
               }
               onChange={handleSettingsChange}
@@ -225,18 +225,18 @@ const Settings = ({ player, onChange, resetCurrentGame }: SettingsProps) => {
             checked={player.settings.usePoison}
             icon={
               <Poison
-                size="4vmax"
+                size="6vmax"
                 color="black"
                 stroke="white"
-                stroke-width="7"
+                stroke-width="30"
               />
             }
             checkedIcon={
               <Poison
-                size="4vmax"
+                size="6vmax"
                 color={player.color}
                 stroke="white"
-                stroke-width="7"
+                stroke-width="30"
               />
             }
             onChange={handleSettingsChange}
@@ -249,18 +249,18 @@ const Settings = ({ player, onChange, resetCurrentGame }: SettingsProps) => {
             checked={player.settings.useEnergy}
             icon={
               <Energy
-                size="4vmax"
+                size="6vmax"
                 color="black"
                 stroke="white"
-                stroke-width="15"
+                stroke-width="30"
               />
             }
             checkedIcon={
               <Energy
-                size="4vmax"
+                size="6vmax"
                 color={player.color}
                 stroke="white"
-                stroke-width="15"
+                stroke-width="30"
               />
             }
             onChange={handleSettingsChange}
@@ -273,18 +273,18 @@ const Settings = ({ player, onChange, resetCurrentGame }: SettingsProps) => {
             checked={player.settings.useExperience}
             icon={
               <Experience
-                size="4vmax"
+                size="6vmax"
                 color="black"
                 stroke="white"
-                stroke-width="30"
+                stroke-width="50"
               />
             }
             checkedIcon={
               <Experience
-                size="4vmax"
+                size="6vmax"
                 color={player.color}
                 stroke="white"
-                stroke-width="30"
+                stroke-width="50"
               />
             }
             onChange={handleSettingsChange}
diff --git a/src/Icons/generated/CommanderTax.tsx b/src/Icons/generated/CommanderTax.tsx
index 70d7afd..cd04561 100644
--- a/src/Icons/generated/CommanderTax.tsx
+++ b/src/Icons/generated/CommanderTax.tsx
@@ -13,16 +13,16 @@ const CommanderTax = ({
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
+      width={props.size || 16}
+      height={props.size || 16}
       fill="currentColor"
       paintOrder="stroke fill markers"
-      viewBox="0 0 325 325"
-      height={props.size || 16}
-      width={props.size || 16}
+      viewBox="0 0 524 524"
       aria-labelledby={titleId}
       {...props}
     >
       {title ? <title id={titleId}>{title}</title> : null}
-      <path d="M162 168c-40.9 0-74-33.1-74-74s33.1-74 74-74 74 33.1 74 74-33.1 74-74 74zM159.9 351.8c-11.4.3-22.5.7-33.2 1.2-10.6.6-20.8 1.3-30.5 1.8-9.6.5-18.8.6-27.2.5-8.4-.6-16.1-1.6-23-3.4-6.9-2.3-12.9-5.5-18.1-9.5-5-4.7-9.1-10.4-12.2-16.9-3.1-7.1-5.2-15-6.3-23.4-1.1-8.8-1.2-17.9-.4-27.1.8-9.2 2.4-17.7 4.7-25.3 2.2-7.4 5.2-13.9 8.8-19.5 3.6-5.3 7.8-9.9 12.8-13.6 4.8-3.7 10.5-6.9 16.8-9.5 6.4-2.9 13.6-5.4 21.5-7.6 7.9-2.4 16.6-4.6 26-6.5 9.4-2.1 19.4-3.8 29.9-5 10.6-1.3 21.7-2 33-2s22.4.7 33 2c10.5 1.2 20.6 2.9 30 5 9.4 1.9 18.2 4.1 26.2 6.5 7.9 2.3 15.2 4.8 21.7 7.6 6.4 2.7 12.2 5.8 17.1 9.5 5.1 3.8 9.4 8.3 12.9 13.7 3.7 5.5 6.7 12.1 8.9 19.5 2.3 7.7 3.8 16.2 4.5 25.3.7 9.2.4 18.3-.9 27.1-1.3 8.4-3.6 16.2-6.8 23.3-3.4 6.4-7.8 11.9-13.1 16.4-5.5 3.9-11.8 6.9-19 9.1-7.3 1.6-15.4 2.6-24.1 3-8.8.1-18.3-.1-28.2-.5-10-.4-20.5-.9-31.4-1.3-10.8-.3-22-.5-33.4-.4z" />
+      <path d="M256 23.9c-1.9.4-5.5 1.8-7.9 3.2-5.1 2.8-130.3 133.3-135.8 141.5-5.4 8.1-7.5 14.7-8.1 25.5-.5 11.3.7 17.6 5.2 26.9 3.7 7.8 13.8 18.4 21.1 22.1 2.8 1.4 20.4 7.5 39.3 13.4 18.8 6 33.7 11.2 33 11.6-.7.3-24.2 9.3-52.3 19.9-32.8 12.4-52.9 20.5-56.3 22.7-6 4-12 10.7-15.6 17.4-1.5 2.7-9.7 31.1-20.6 71.5C41.3 461.3 39.9 467 40.3 473c.9 12.3 7.2 21.7 18.5 27.2l6.7 3.3H262c190.8 0 196.7-.1 202-1.9 7.5-2.6 15.9-11 18.8-18.9 4.1-10.8 3.9-11.8-15.3-81.5-9.6-35-18.7-66.6-20.2-70.1-3.4-8.3-13-18.6-21-22.8-3.2-1.7-27.9-11.5-55-21.9-27.1-10.4-48.9-19.2-48.5-19.5.4-.4 15.1-5.3 32.7-10.8 17.6-5.6 34.5-11.4 37.5-12.9 11.4-5.6 23-20.5 25.9-33.2 2.7-11.5.7-27.5-4.7-37.3-3.6-6.7-5.2-8.5-73.7-80.2-45.1-47.2-61.4-63.7-65.1-65.7-5.3-2.8-13.7-4.1-19.4-2.9zm32.5 97.6c9.3 1.8 31.6 8.3 32.9 9.5 1.6 1.5-12.1 43.6-18.3 56.5-6 12.3-16.1 27.7-22.6 34.7-7.3 7.7-16.8 10.3-26.6 7.5-7.3-2.2-11.4-5.8-19.6-17.4-16.1-22.8-22.4-36.2-29.9-64.3-2.4-9-4.1-16.7-3.6-17 2.3-2.1 30.7-9.3 44.7-11.4 6.3-.9 35.2.3 43 1.9zM325.1 225l62.1-31.1-.7 3.3c-1 4.7-2.1 6.4-5.8 9.1-1.7 1.3-28.8 16-60.1 32.7-51.8 27.7-57.1 30.2-59.6 29.3-5.3-2-114.5-60.6-116.9-62.7-2.5-2.2-5.1-7.4-5.1-10.1 0-1.1 18.7 7.8 62 29.5l61.9 31 62.2-31zm-194 131.4c1.1 3 .1 11.2-8.7 69.9-5.4 36.7-10.2 66.3-10.5 65.9-.4-.4-3-8-5.8-16.9l-5.1-16.2 11-57.8c6.1-31.8 11.4-58.5 11.6-59.3.5-1.4 4.6 6.4 7.5 14.4zm280.8 44.2 11.2 58.1-5.2 16.6c-2.9 9.2-5.6 16.4-6 15.9-.3-.4-5-30.4-10.4-66.7l-9.8-66 3.9-8.7c2.2-4.8 4.2-8.4 4.5-8 .4.4 5.7 26.8 11.8 58.8z" />
     </svg>
   );
 };
diff --git a/src/Icons/generated/PartnerTax.tsx b/src/Icons/generated/PartnerTax.tsx
index 3c5c6bb..530242d 100644
--- a/src/Icons/generated/PartnerTax.tsx
+++ b/src/Icons/generated/PartnerTax.tsx
@@ -13,18 +13,16 @@ const PartnerTax = ({
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
+      width={props.size || 16}
+      height={props.size || 16}
       fill="currentColor"
       paintOrder="stroke fill markers"
-      viewBox="0 -50 380 390"
-      height={props.size || 16}
-      width={props.size || 16}
+      viewBox="0 0 524 524"
       aria-labelledby={titleId}
       {...props}
     >
       {title ? <title id={titleId}>{title}</title> : null}
-      <path d="M144.5 18.6c-1.1.3-4.7.9-8 1.5s-10 3.1-15 5.5C101.9 35.1 87.3 53 82 73.6c-2.7 10.5-2.7 26.3 0 36.8 6.3 24.6 25.9 45 50.5 52.5 10.3 3.1 29.3 3.5 39.5.8 25.3-6.7 46.5-28 53.1-53.4 2.7-10.5 2.7-26 0-36.4-8.4-32.9-39.1-56.4-72.5-55.8-3.3.1-7 .3-8.1.5z" />
-      <path d="M215.8 24.7c-1.6.2-2.8.8-2.8 1.2 0 .4 2.1 2.7 4.6 5.1 13.3 13 21.9 31 24.4 51.4 1.6 12.1.8 22.8-2.5 34.1-4.3 14.9-10.7 25.8-21.3 36.7-3.6 3.7-6.3 7-6 7.3.3.4 4.6.9 9.5 1.2 12.2.8 23.1-1.5 35.2-7.4 7.8-3.7 10.9-5.9 17.7-12.7 6.8-6.8 9-9.9 12.7-17.7 5-10.2 7.7-21.2 7.7-30.9s-2.7-20.7-7.7-30.9c-3.7-7.8-5.9-10.9-12.7-17.7-6.8-6.8-9.9-9-17.7-12.7-13.4-6.5-28-9-41.1-7zM125.5 185.5c-16.4 1.8-28.5 4-45 8-38.4 9.4-55 18.1-66 34.5-15.9 23.6-19.2 70.9-6.7 96l2.7 5.5 143.1.3 143.2.2 2.2-3.7c6-10.1 9.3-26 9.3-44.3 0-22.2-4.8-40.8-14-54.3-10.6-15.6-28-24.7-64.6-33.6-37.9-9.3-71.8-12.1-104.2-8.6z" />
-      <path d="M272.1 193.5c8.2 3 21 9.7 26.7 14 15.4 11.6 25.2 31.4 28.7 58 3 23 .9 44.7-6.2 63.1-.4 1.2 3.3 1.4 22 1.4h22.6l3-6.3c11.6-23.7 10.1-65.1-3.1-88.7-4.6-8.1-15.2-17.9-24.5-22.7-12.7-6.6-34.2-13.3-56.6-17.8-14-2.7-18.2-3.1-12.6-1z" />
+      <path d="M196.7 79.1c-2.1.5-5 1.5-6.5 2.3-3.3 1.8-17.6 16.3-59.3 60.1-60 63.1-60.2 63.3-62.2 78.5-1.7 13.3 1.4 24.2 10 34.7 6.5 7.9 10.6 9.9 40.8 19.8 29.9 9.8 33 11 30.5 11.9-.8.3-8 3.1-16 6.1-8 3.1-19.7 7.5-26 9.9-20.7 7.9-40.3 15.7-45 18.1-2.6 1.3-7.2 5.1-10.2 8.4-6.6 7.1-7.2 8.7-17.9 47.6-19.1 69.1-21.3 78.3-20.3 84.8 1.6 9.6 7.1 16.9 16.3 21.7l4 2 233.6-.2 233.7-.3 3.3-3.7c5.2-5.6 5.3-7.6 1.6-22.3-5.9-23.2-13.2-47.9-15.3-51.3-3.3-5.3-7.3-7.5-30-16.3-12-4.6-21.8-8.6-21.8-8.9 0-.3 6.6-2.7 14.8-5.4 16.2-5.3 19.9-7.5 23.8-14.3 3.4-5.6 3.7-13.7.8-20-1.9-4.2-32.4-37.2-52.7-57.1-9-8.8-9.6-9.2-13.8-9.2-2.4.1-5.4.6-6.5 1.3-1.8 1-17.1 16.5-46 46.6l-7.2 7.5-3.3-3.5c-7.4-7.7-11.5-9.6-79.6-35.9-9-3.5-16.3-6.7-16.3-7.1 0-.4 12.5-4.8 27.8-9.8 16.3-5.3 29.6-10.2 32.2-11.9 6-3.8 13.3-11.8 16.3-17.8 7-13.9 5.4-33.5-3.8-45.3-7.2-9.1-103-109.8-110.2-115.7-5.8-4.8-13.2-6.7-19.6-5.3zm34.8 84.4c5.5 1.4 12.2 3.3 14.9 4.2l4.8 1.5-.6 4.6c-1 7.4-11.3 36.9-16.3 46.8-2.5 5.1-7.6 13.4-11.3 18.5-5.4 7.6-7.7 9.9-12 12.1-6.8 3.6-12.8 3.7-19.7.3-5.8-2.9-9.3-6.8-18.2-20.5-8.2-12.5-13.2-23.1-17.5-37.1-5.1-17-6.4-23.8-4.6-24.9.8-.5 7.9-2.5 15.9-4.4 8.1-1.9 15.5-3.8 16.6-4 1.1-.3 10.1-.3 20-.1 15.1.4 19.6.8 28 3zm-76.1 88.4 46.9 23.5 51.8-25.9c28.5-14.3 52.1-25.7 52.4-25.3.8.8-1.8 7-3.6 8.4-3.9 3.1-93.1 50.5-98.6 52.5-3.1 1-4.2.6-19-7.1-23.6-12.4-66.7-35.6-75.5-40.7-7.6-4.4-11.8-8.5-11.8-11.6 0-2.4 4.5-.3 57.4 26.2zM418.5 318c12 1.2 19.5 3.5 19.5 5.9 0 3.7-7.2 22.7-11 29.2-5.4 9.1-9.9 12.9-15.2 12.9-3.7 0-4.7-.6-8.7-4.8-5.3-5.5-12-17.7-15-27.6-3.2-10.5-3.1-11.3 3.2-13.1 12.1-3.5 15-3.8 27.2-2.5zM88.6 354.5c1.4 3.2 2.4 7.5 2.4 10.1 0 6-14 102.3-15.7 107.8-.5 1.8-.6 1.8-1.5.1-1.4-2.4-7.8-23.3-7.8-25.4-.1-3.8 18.5-98.1 19.2-98.1.5 0 2 2.5 3.4 5.5zm239.8 43.3c5.3 26.8 9.6 49.4 9.6 50.1 0 2.1-9.2 28.1-9.9 28.1-.4 0-1.9-7.8-3.4-17.3-1.4-9.4-5.4-34.7-8.7-56l-6-38.8 3.4-7.4c1.9-4.1 3.9-7.5 4.4-7.5.5 0 5.3 21.9 10.6 48.8zm136.5-43.3c-3 2.9-50.1 27.5-52.5 27.5-1.1 0-8.6-3.6-16.9-8.1-8.2-4.4-18.9-10.1-23.7-12.6-8-4.2-10.8-6.7-9.3-8.2.3-.3 11.7 5 25.3 11.8l24.7 12.3 27-13.5c25.2-12.6 31.2-14.8 25.4-9.2zm-86.6 25.1c4.3 1.4 7.7 2.8 7.5 3-.2.2-3.4 1.5-7.1 2.9l-6.6 2.5-1.6-5.2c-.8-2.8-1.5-5.3-1.5-5.5 0-.6 1.7-.2 9.3 2.3zm100.1 62.8 4.5 23.4-2.3 6.9c-2.9 8.4-2.5 9.8-7.6-24.5-3.7-25.3-3.8-26.5-2.2-29.8 1.5-3.2 1.7-3.3 2.4-1.5.4 1.1 2.7 12.6 5.2 25.5z" />
     </svg>
   );
 };
diff --git a/src/Icons/generated/Poison.tsx b/src/Icons/generated/Poison.tsx
index 3a043c6..63a2a18 100644
--- a/src/Icons/generated/Poison.tsx
+++ b/src/Icons/generated/Poison.tsx
@@ -13,16 +13,17 @@ const Poison = ({
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      fill="currentColor"
-      paintOrder="stroke fill markers"
-      viewBox="0 0 152.667 223"
-      height={props.size || 16}
       width={props.size || 16}
+      height={props.size || 16}
+      fill="currentColor"
+      overflow="visible"
+      paintOrder="stroke fill markers"
+      viewBox="0 0 524 524"
       aria-labelledby={titleId}
       {...props}
     >
       {title ? <title id={titleId}>{title}</title> : null}
-      <path d="M57.9 18.75V200.7l21.6-18.3V0M68.7 41.85C30.759 41.85 0 68.08 0 100.309c0 32.313 30.758 58.543 68.7 58.543 37.942 0 68.7-26.23 68.7-58.543 0-32.23-30.758-58.459-68.7-58.459zm.15 91.5c-21.373 0-38.7-14.531-38.7-32.474S47.477 68.4 68.85 68.4s38.7 14.532 38.7 32.475-17.327 32.475-38.7 32.475z" />
+      <path d="M261.6 32.1 228 57.2v60.5l-6.7 1.2c-16.1 2.9-39.8 10.8-54.6 18.2-9.7 4.9-27.4 17-36.5 24.9-24.3 21.3-40.6 49-46.3 79-1.6 8.3-1.6 33.5 0 42 4.3 22.8 16.3 46.9 32.3 64.6 26 28.9 60 47.5 104 56.9l7.8 1.6.2 55.8.3 55.7 34-25.2 34-25.2.5-30.8.5-30.8 10.5-2.2c27-5.6 54.2-17.8 75.5-33.8 77.9-58.4 77.4-158.4-1.2-216.5-22.5-16.7-46.6-27.2-77-33.7l-8.3-1.7V62.3c0-30.8-.4-55.3-.9-55.3s-16 11.3-34.5 25.1zM228 262v89l-2.7-.6c-5.3-1.3-14.8-5.1-23.8-9.7-31-15.5-50.5-41.7-53.4-71.4-2.5-25.1 6.9-48.5 27-67.8 9.4-9 15.7-13.4 27.6-19.4 7.8-3.9 21.4-9 24.1-9.1.9 0 1.2 18.5 1.2 89zm76.1-86.9c33.2 10.8 58.9 34.5 68.6 63.4 2.5 7.4 2.7 9.2 2.7 23.5 0 14.2-.3 16.2-2.8 23.5-6.7 19.6-18.7 35-37.3 47.8-7.1 4.9-25.9 14-33 16l-5.3 1.5v-88.9c0-48.9.2-88.9.3-88.9.2 0 3.3.9 6.8 2.1z" />
     </svg>
   );
 };
diff --git a/src/Icons/svgs/CommanderTax.svg b/src/Icons/svgs/CommanderTax.svg
index bda0ae3..1c957fd 100644
--- a/src/Icons/svgs/CommanderTax.svg
+++ b/src/Icons/svgs/CommanderTax.svg
@@ -1,19 +1,26 @@
-<svg
-        version="1.2"
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 325 325"
-        fill='currentColor'
-        paint-order='stroke fill markers'
-      >
-        <title>CommanderTaxIcon</title>
-        <path
-          id="Lager 1"
-          className="s0"
-          d="m162 168c-40.9 0-74-33.1-74-74 0-40.9 33.1-74 74-74 40.9 0 74 33.1 74 74 0 40.9-33.1 74-74 74z"
-        />
-        <path
-          id="Form 1"
-          className="s0"
-          d="m159.9 351.8c-11.4 0.3-22.5 0.7-33.2 1.2-10.6 0.6-20.8 1.3-30.5 1.8-9.6 0.5-18.8 0.6-27.2 0.5-8.4-0.6-16.1-1.6-23-3.4-6.9-2.3-12.9-5.5-18.1-9.5-5-4.7-9.1-10.4-12.2-16.9-3.1-7.1-5.2-15-6.3-23.4-1.1-8.8-1.2-17.9-0.4-27.1 0.8-9.2 2.4-17.7 4.7-25.3 2.2-7.4 5.2-13.9 8.8-19.5 3.6-5.3 7.8-9.9 12.8-13.6 4.8-3.7 10.5-6.9 16.8-9.5 6.4-2.9 13.6-5.4 21.5-7.6 7.9-2.4 16.6-4.6 26-6.5 9.4-2.1 19.4-3.8 29.9-5 10.6-1.3 21.7-2 33-2 11.3 0 22.4 0.7 33 2 10.5 1.2 20.6 2.9 30 5 9.4 1.9 18.2 4.1 26.2 6.5 7.9 2.3 15.2 4.8 21.7 7.6 6.4 2.7 12.2 5.8 17.1 9.5 5.1 3.8 9.4 8.3 12.9 13.7 3.7 5.5 6.7 12.1 8.9 19.5 2.3 7.7 3.8 16.2 4.5 25.3 0.7 9.2 0.4 18.3-0.9 27.1-1.3 8.4-3.6 16.2-6.8 23.3-3.4 6.4-7.8 11.9-13.1 16.4-5.5 3.9-11.8 6.9-19 9.1-7.3 1.6-15.4 2.6-24.1 3-8.8 0.1-18.3-0.1-28.2-0.5-10-0.4-20.5-0.9-31.4-1.3-10.8-0.3-22-0.5-33.4-0.4z"
-        />
-      </svg>
\ No newline at end of file
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="60px" height="60px" viewBox="0 0 524.000000 524.000000"
+    preserveAspectRatio="xMidYMid meet" fill='currentColor' paint-order='stroke fill markers'>
+
+    <g transform="translate(0.000000,524.000000) scale(0.100000,-0.100000)" fill="currentColor" stroke="none">
+        <path d="M2560 5001 c-19 -4 -55 -18 -79 -32 -51 -28 -1303 -1333 -1358 -1415
+-54 -81 -75 -147 -81 -255 -5 -113 7 -176 52 -269 37 -78 138 -184 211 -221
+28 -14 204 -75 393 -134 188 -60 337 -112 330 -116 -7 -3 -242 -93 -523 -199
+-328 -124 -529 -205 -563 -227 -60 -40 -120 -107 -156 -174 -15 -27 -97 -311
+-206 -715 -167 -617 -181 -674 -177 -734 9 -123 72 -217 185 -272 l67 -33
+1965 0 c1908 0 1967 1 2020 19 75 26 159 110 188 189 41 108 39 118 -153 815
+-96 350 -187 666 -202 701 -34 83 -130 186 -210 228 -32 17 -279 115 -550 219
+-271 104 -489 192 -485 195 4 4 151 53 327 108 176 56 345 114 375 129 114 56
+230 205 259 332 27 115 7 275 -47 373 -36 67 -52 85 -737 802 -451 472 -614
+637 -651 657 -53 28 -137 41 -194 29z m325 -976 c93 -18 316 -83 329 -95 16
+-15 -121 -436 -183 -565 -60 -123 -161 -277 -226 -347 -73 -77 -168 -103 -266
+-75 -73 22 -114 58 -196 174 -161 228 -224 362 -299 643 -24 90 -41 167 -36
+170 23 21 307 93 447 114 63 9 352 -3 430 -19z m366 -1035 l621 311 -7 -33
+c-10 -47 -21 -64 -58 -91 -17 -13 -288 -160 -601 -327 -518 -277 -571 -302
+-596 -293 -53 20 -1145 606 -1169 627 -25 22 -51 74 -51 101 0 11 187 -78 620
+-295 l619 -310 622 310z m-1940 -1314 c11 -30 1 -112 -87 -699 -54 -367 -102
+-663 -105 -659 -4 4 -30 80 -58 169 l-51 162 110 578 c61 318 114 585 116 593
+5 14 46 -64 75 -144z m2808 -442 l112 -581 -52 -166 c-29 -92 -56 -164 -60
+-159 -3 4 -50 304 -104 667 l-98 660 39 87 c22 48 42 84 45 80 4 -4 57 -268
+118 -588z" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/Icons/svgs/PartnerTax.svg b/src/Icons/svgs/PartnerTax.svg
index df62b86..72e87d8 100644
--- a/src/Icons/svgs/PartnerTax.svg
+++ b/src/Icons/svgs/PartnerTax.svg
@@ -1,34 +1,37 @@
-<svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 -50 380 390"
-        fill='currentColor'
-        paint-order='stroke fill markers'
-      >
-        <g transform="translate(0.000000, 330.000000) scale(0.100000,-0.100000)">
-          <path
-            d="M1445 3114 c-11 -3 -47 -9 -80 -15 -33 -6 -100 -31 -150 -55 -196
--95 -342 -274 -395 -480 -27 -105 -27 -263 0 -368 63 -246 259 -450 505 -525
-103 -31 293 -35 395 -8 253 67 465 280 531 534 27 105 27 260 0 364 -84 329
--391 564 -725 558 -33 -1 -70 -3 -81 -5z"
-          />
-          <path
-            d="M2158 3053 c-16 -2 -28 -8 -28 -12 0 -4 21 -27 46 -51 133 -130 219
--310 244 -514 16 -121 8 -228 -25 -341 -43 -149 -107 -258 -213 -367 -36 -37
--63 -70 -60 -73 3 -4 46 -9 95 -12 122 -8 231 15 352 74 78 37 109 59 177 127
-68 68 90 99 127 177 50 102 77 212 77 309 0 97 -27 207 -77 309 -37 78 -59
-109 -127 177 -68 68 -99 90 -177 127 -134 65 -280 90 -411 70z"
-          />
-          <path
-            d="M1255 1445 c-164 -18 -285 -40 -450 -80 -384 -94 -550 -181 -660
--345 -159 -236 -192 -709 -67 -960 l27 -55 1431 -3 1432 -2 22 37 c60 101 93
-260 93 443 0 222 -48 408 -140 543 -106 156 -280 247 -646 336 -379 93 -718
-121 -1042 86z"
-          />
-          <path
-            d="M2721 1365 c82 -30 210 -97 267 -140 154 -116 252 -314 287 -580 30
--230 9 -447 -62 -631 -4 -12 33 -14 220 -14 l226 0 30 63 c116 237 101 651
--31 887 -46 81 -152 179 -245 227 -127 66 -342 133 -566 178 -140 27 -182 31
--126 10z"
-          />
-        </g>
-      </svg>
\ No newline at end of file
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="524.000000pt" height="524.000000pt"
+    viewBox="0 0 524.000000 524.000000" preserveAspectRatio="xMidYMid meet" fill='currentColor'
+    paint-order='stroke fill markers'>
+
+    <g transform="translate(0.000000,524.000000) scale(0.100000,-0.100000)" fill="currentColor" stroke="none">
+        <path d="M1967 4449 c-21 -5 -50 -15 -65 -23 -33 -18 -176 -163 -593 -601
+-600 -631 -602 -633 -622 -785 -17 -133 14 -242 100 -347 65 -79 106 -99 408
+-198 299 -98 330 -110 305 -119 -8 -3 -80 -31 -160 -61 -80 -31 -197 -75 -260
+-99 -207 -79 -403 -157 -450 -181 -26 -13 -72 -51 -102 -84 -66 -71 -72 -87
+-179 -476 -191 -691 -213 -783 -203 -848 16 -96 71 -169 163 -217 l40 -20
+2336 2 2337 3 33 37 c52 56 53 76 16 223 -59 232 -132 479 -153 513 -33 53
+-73 75 -300 163 -120 46 -218 86 -218 89 0 3 66 27 148 54 162 53 199 75 238
+143 34 56 37 137 8 200 -19 42 -324 372 -527 571 -90 88 -96 92 -138 92 -24
+-1 -54 -6 -65 -13 -18 -10 -171 -165 -460 -466 l-72 -75 -33 35 c-74 77 -115
+96 -796 359 -90 35 -163 67 -163 71 0 4 125 48 278 98 163 53 296 102 322 119
+60 38 133 118 163 178 70 139 54 335 -38 453 -72 91 -1030 1098 -1102 1157
+-58 48 -132 67 -196 53z m348 -844 c55 -14 122 -33 149 -42 l48 -15 -6 -46
+c-10 -74 -113 -369 -163 -468 -25 -51 -76 -134 -113 -185 -54 -76 -77 -99
+-120 -121 -68 -36 -128 -37 -197 -3 -58 29 -93 68 -182 205 -82 125 -132 231
+-175 371 -51 170 -64 238 -46 249 8 5 79 25 159 44 81 19 155 38 166 40 11 3
+101 3 200 1 151 -4 196 -8 280 -30z m-761 -884 l469 -235 518 259 c285 143
+521 257 524 253 8 -8 -18 -70 -36 -84 -39 -31 -931 -505 -986 -525 -31 -10
+-42 -6 -190 71 -236 124 -667 356 -755 407 -76 44 -118 85 -118 116 0 24 45 3
+574 -262z m2631 -661 c120 -12 195 -35 195 -59 0 -37 -72 -227 -110 -292 -54
+-91 -99 -129 -152 -129 -37 0 -47 6 -87 48 -53 55 -120 177 -150 276 -32 105
+-31 113 32 131 121 35 150 38 272 25z m-3299 -365 c14 -32 24 -75 24 -101 0
+-60 -140 -1023 -157 -1078 -5 -18 -6 -18 -15 -1 -14 24 -78 233 -78 254 -1 38
+185 981 192 981 5 0 20 -25 34 -55z m2398 -433 c53 -268 96 -494 96 -501 0
+-21 -92 -281 -99 -281 -4 0 -19 78 -34 173 -14 94 -54 347 -87 560 l-60 388
+34 74 c19 41 39 75 44 75 5 0 53 -219 106 -488z m1365 433 c-30 -29 -501 -275
+-525 -275 -11 0 -86 36 -169 81 -82 44 -189 101 -237 126 -80 42 -108 67 -93
+82 3 3 117 -50 253 -118 l247 -123 270 135 c252 126 312 148 254 92z m-866
+-251 c43 -14 77 -28 75 -30 -2 -2 -34 -15 -71 -29 l-66 -25 -16 52 c-8 28 -15
+53 -15 55 0 6 17 2 93 -23z m1001 -628 l45 -234 -23 -69 c-29 -84 -25 -98 -76
+245 -37 253 -38 265 -22 298 15 32 17 33 24 15 4 -11 27 -126 52 -255z" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/Icons/svgs/Poison.svg b/src/Icons/svgs/Poison.svg
index 9bf30a7..71b77b7 100644
--- a/src/Icons/svgs/Poison.svg
+++ b/src/Icons/svgs/Poison.svg
@@ -1,11 +1,17 @@
- <svg
-        xmlns="http://www.w3.org/2000/svg"
-        xmlSpace="preserve"
-        viewBox="0 0 152.667 223"
-        fill='currentColor'
-        paint-order='stroke fill markers'
-      >
-        <g transform="translate(0.000000,0.000000) scale(0.900000,0.900000)">
-          <path d="M64.333 20.833V223l24-20.333V0M76.334 46.5C34.176 46.5 0 75.644 0 111.454c0 35.904 34.176 65.048 76.334 65.048 42.157 0 76.333-29.144 76.333-65.048 0-35.81-34.176-64.954-76.333-64.954zm.166 101.667c-23.748 0-43-16.146-43-36.083S52.752 76 76.5 76s43 16.147 43 36.083-19.252 36.084-43 36.084z" />
-        </g>
-      </svg>
\ No newline at end of file
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="60px" height="60px" viewBox="0 0 524.000000 524.000000"
+    preserveAspectRatio="xMidYMid meet" overflow="visible" fill='currentColor' paint-order='stroke fill markers'>
+
+    <g transform="translate(0.000000,524.000000) scale(0.100000,-0.100000)" fill="currentColor" stroke="none">
+        <path d="M2616 4919 l-336 -251 0 -302 0 -303 -67 -12 c-161 -29 -398 -108
+-546 -182 -97 -49 -274 -170 -365 -249 -243 -213 -406 -490 -463 -790 -16 -83
+-16 -335 0 -420 43 -228 163 -469 323 -646 260 -289 600 -475 1040 -569 l78
+-16 2 -558 3 -557 340 252 340 252 5 308 5 308 105 22 c270 56 542 178 755
+338 779 584 774 1584 -12 2165 -225 167 -466 272 -770 337 l-83 17 0 554 c0
+308 -4 553 -9 553 -5 0 -160 -113 -345 -251z m-336 -2299 l0 -890 -27 6 c-53
+13 -148 51 -238 97 -310 155 -505 417 -534 714 -25 251 69 485 270 678 94 90
+157 134 276 194 78 39 214 90 241 91 9 0 12 -185 12 -890z m761 869 c332 -108
+589 -345 686 -634 25 -74 27 -92 27 -235 0 -142 -3 -162 -28 -235 -67 -196
+-187 -350 -373 -478 -71 -49 -259 -140 -330 -160 l-53 -15 0 889 c0 489 2 889
+3 889 2 0 33 -9 68 -21z" />
+    </g>
+</svg
\ No newline at end of file
diff --git a/src/Types/Icon.ts b/src/Types/Icon.ts
deleted file mode 100644
index cda9896..0000000
--- a/src/Types/Icon.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type IconProps = {
-  size?: string;
-  color?: string;
-  active?: boolean;
-  opacity?: number;
-  showStroke?: boolean;
-};
diff --git a/src/assets/react.svg b/src/assets/react.svg
deleted file mode 100644
index 6c87de9..0000000
--- a/src/assets/react.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
\ No newline at end of file