diff --git a/src/frontend/src/CustomNodes/GenericNode/components/nodeIcon/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/nodeIcon/index.tsx
index a7d438372..e0343b786 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/nodeIcon/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/nodeIcon/index.tsx
@@ -39,9 +39,17 @@ export function NodeIcon({
     return (
       <div className="flex h-4 w-4 items-center justify-center">
         {isLucideIcon ? (
-          <IconComponent strokeWidth={ICON_STROKE_WIDTH} name={iconName} />
+          <IconComponent
+            strokeWidth={ICON_STROKE_WIDTH}
+            name={iconName}
+            className="h-4 w-4"
+          />
         ) : (
-          <IconComponent name={iconName} iconColor={iconColor} />
+          <IconComponent
+            name={iconName}
+            iconColor={iconColor}
+            className="h-4 w-4"
+          />
         )}
       </div>
     );
diff --git a/src/frontend/src/icons/AWS/AWS.jsx b/src/frontend/src/icons/AWS/AWS.jsx
index c78fcac5c..7a41cd1e5 100644
--- a/src/frontend/src/icons/AWS/AWS.jsx
+++ b/src/frontend/src/icons/AWS/AWS.jsx
@@ -5,8 +5,6 @@ const SvgAWS = (props) => (
     xmlns="http://www.w3.org/2000/svg"
     xmlSpace="preserve"
     id="Layer_1"
-    x={0}
-    y={0}
     style={{
       enableBackground: "new 0 0 304 182",
     }}
diff --git a/src/frontend/src/icons/AWSInverted/AWS.jsx b/src/frontend/src/icons/AWSInverted/AWS.jsx
index 7c6c46abf..a7bc6d24a 100644
--- a/src/frontend/src/icons/AWSInverted/AWS.jsx
+++ b/src/frontend/src/icons/AWSInverted/AWS.jsx
@@ -5,8 +5,6 @@ const SvgAWS = (props) => (
     xmlns="http://www.w3.org/2000/svg"
     xmlSpace="preserve"
     id="Layer_1"
-    x={0}
-    y={0}
     style={{
       enableBackground: "new 0 0 304 182",
     }}
diff --git a/src/frontend/src/icons/AstraDB/AstraDB.jsx b/src/frontend/src/icons/AstraDB/AstraDB.jsx
index 8ba383f82..468065213 100644
--- a/src/frontend/src/icons/AstraDB/AstraDB.jsx
+++ b/src/frontend/src/icons/AstraDB/AstraDB.jsx
@@ -2,12 +2,12 @@ import { stringToBool } from "@/utils/utils";
 
 const AstraSVG = (props) => (
   <svg
-    {...props}
     width="167"
     height="68"
     viewBox="0 0 167 68"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
+    {...props}
   >
     <path
       d="M60.2338 0.25H0.000244141V67.75H60.2338L75.365 56.0752V11.9248L60.2338 0.25ZM11.6732 11.9248H63.692V56.0874H11.6732V11.9248Z"
diff --git a/src/frontend/src/icons/DuckDuckGo/DuckDuckGo.jsx b/src/frontend/src/icons/DuckDuckGo/DuckDuckGo.jsx
index a2dc61b91..0cbe7a0cb 100644
--- a/src/frontend/src/icons/DuckDuckGo/DuckDuckGo.jsx
+++ b/src/frontend/src/icons/DuckDuckGo/DuckDuckGo.jsx
@@ -3,8 +3,6 @@ const SvgDuckDuckGo = ({ ...props }) => (
     xmlns="http://www.w3.org/2000/svg"
     viewBox="0 0 122.88 122.88"
     {...props}
-    height="1rem"
-    width="1rem"
   >
     <defs>
       <style>{".b{fill:#fff}"}</style>
diff --git a/src/frontend/src/icons/ElasticsearchStore/ElasticsearchLogo.jsx b/src/frontend/src/icons/ElasticsearchStore/ElasticsearchLogo.jsx
index bbf7c040a..9126c5f84 100644
--- a/src/frontend/src/icons/ElasticsearchStore/ElasticsearchLogo.jsx
+++ b/src/frontend/src/icons/ElasticsearchStore/ElasticsearchLogo.jsx
@@ -1,8 +1,6 @@
 const SvgElasticsearchLogo = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="24"
-    height="24"
     fill="none"
     stroke="currentColor"
     strokeLinecap="round"
@@ -10,6 +8,7 @@ const SvgElasticsearchLogo = (props) => (
     strokeWidth="2"
     className="icon icon-tabler icon-tabler-brand-elastic"
     viewBox="0 0 24 24"
+    {...props}
   >
     <path stroke="none" d="M0 0h24v24H0z"></path>
     <path d="M14 2a5 5 0 015 5c0 .712-.232 1.387-.5 2 1.894.042 3.5 1.595 3.5 3.5 0 1.869-1.656 3.4-3.5 3.5.333.625.5 1.125.5 1.5a2.5 2.5 0 01-2.5 2.5c-.787 0-1.542-.432-2-1-.786 1.73-2.476 3-4.5 3a5 5 0 01-4.583-7 3.5 3.5 0 01-.11-6.992h.195a2.5 2.5 0 012-4c.787 0 1.542.432 2 1 .786-1.73 2.476-3 4.5-3zM8.5 9l-3-1"></path>
diff --git a/src/frontend/src/icons/Exa/Exa.jsx b/src/frontend/src/icons/Exa/Exa.jsx
index 2e499ca08..adc268f61 100644
--- a/src/frontend/src/icons/Exa/Exa.jsx
+++ b/src/frontend/src/icons/Exa/Exa.jsx
@@ -1,11 +1,5 @@
 export const SvgExa = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="400"
-    height="400"
-    viewBox="0 0 400 400"
-    {...props}
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" {...props}>
     <path
       fill="none"
       fillOpacity="0"
diff --git a/src/frontend/src/icons/Firecrawl/FirecrawlLogo.jsx b/src/frontend/src/icons/Firecrawl/FirecrawlLogo.jsx
index f79173d13..cad13c902 100644
--- a/src/frontend/src/icons/Firecrawl/FirecrawlLogo.jsx
+++ b/src/frontend/src/icons/Firecrawl/FirecrawlLogo.jsx
@@ -1,11 +1,10 @@
 const SvgFirecrawlLogo = (props) => (
   <svg
     viewBox="-33 0 255 255"
-    width="24"
-    height="24"
     xmlns="http://www.w3.org/2000/svg"
     xmlnsXlink="http://www.w3.org/1999/xlink"
     preserveAspectRatio="xMidYMid"
+    {...props}
   >
     <defs>
       <style>
diff --git a/src/frontend/src/icons/GitLoader/GitLoader.jsx b/src/frontend/src/icons/GitLoader/GitLoader.jsx
index f1b291643..29741d793 100644
--- a/src/frontend/src/icons/GitLoader/GitLoader.jsx
+++ b/src/frontend/src/icons/GitLoader/GitLoader.jsx
@@ -1,8 +1,6 @@
 const GitLoaderIcon = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="32"
-    height="32"
     viewBox="0 0 32 32"
     fill="none"
     {...props}
diff --git a/src/frontend/src/icons/GridHorizontal/GridHorizontalIcon.jsx b/src/frontend/src/icons/GridHorizontal/GridHorizontalIcon.jsx
index bccb13832..4814101b2 100644
--- a/src/frontend/src/icons/GridHorizontal/GridHorizontalIcon.jsx
+++ b/src/frontend/src/icons/GridHorizontal/GridHorizontalIcon.jsx
@@ -2,8 +2,6 @@ const SVGGridHorizontalIcon = (props) => {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      width="24"
-      height="24"
       viewBox="0 0 24 24"
       fill="none"
       stroke="currentColor"
diff --git a/src/frontend/src/icons/Groq/GroqLogo.jsx b/src/frontend/src/icons/Groq/GroqLogo.jsx
index a25f40a56..9fa8cd7b4 100644
--- a/src/frontend/src/icons/Groq/GroqLogo.jsx
+++ b/src/frontend/src/icons/Groq/GroqLogo.jsx
@@ -3,8 +3,6 @@ const SvgGroqLogo = ({ ...props }) => (
     xmlns="http://www.w3.org/2000/svg"
     aria-label="groq logo"
     role="img"
-    width="48"
-    height="48"
     viewBox="0 0 24 24"
     fill="none"
     className="fill-foreground"
diff --git a/src/frontend/src/icons/HCD/HCD.jsx b/src/frontend/src/icons/HCD/HCD.jsx
index b6c3876de..b7e76ec89 100644
--- a/src/frontend/src/icons/HCD/HCD.jsx
+++ b/src/frontend/src/icons/HCD/HCD.jsx
@@ -2,8 +2,6 @@ import { stringToBool } from "@/utils/utils";
 
 const HCDSVG = (props) => (
   <svg
-    width="96"
-    height="96"
     viewBox="12 33 72 29"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/frontend/src/icons/Icosa/Icosa.jsx b/src/frontend/src/icons/Icosa/Icosa.jsx
index b985fc1f5..415aeb82b 100644
--- a/src/frontend/src/icons/Icosa/Icosa.jsx
+++ b/src/frontend/src/icons/Icosa/Icosa.jsx
@@ -1,4 +1,4 @@
-const SvgIcosa = ({ ...props }) => (
+const SvgIcosa = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     version="1.1"
@@ -6,6 +6,7 @@ const SvgIcosa = ({ ...props }) => (
     width="1.4em"
     height="1.4em"
     viewBox="0 0 676.47998 742.08002"
+    {...props}
   >
     <defs id="defs1" />
     <path
diff --git a/src/frontend/src/icons/JSicon/JSIcon.jsx b/src/frontend/src/icons/JSicon/JSIcon.jsx
index 42459bc09..0ccc8ddfc 100644
--- a/src/frontend/src/icons/JSicon/JSIcon.jsx
+++ b/src/frontend/src/icons/JSicon/JSIcon.jsx
@@ -1,7 +1,5 @@
 const SvgJSIcon = (props) => (
   <svg
-    width="16"
-    height="16"
     viewBox="0 0 16 16"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/frontend/src/icons/LMStudio/LMStudioIcon.jsx b/src/frontend/src/icons/LMStudio/LMStudioIcon.jsx
index 54b9dbf02..c56819d6a 100644
--- a/src/frontend/src/icons/LMStudio/LMStudioIcon.jsx
+++ b/src/frontend/src/icons/LMStudio/LMStudioIcon.jsx
@@ -4,6 +4,7 @@ const SvgLMStudio = (props) => (
     width="1.5em"
     height="1.5em"
     viewBox="0 0 271.68 271.44"
+    {...props}
   >
     <path
       fill="#4b28be"
diff --git a/src/frontend/src/icons/LangChain/LangChainIcon.jsx b/src/frontend/src/icons/LangChain/LangChainIcon.jsx
index aa5e98bec..e2dade733 100644
--- a/src/frontend/src/icons/LangChain/LangChainIcon.jsx
+++ b/src/frontend/src/icons/LangChain/LangChainIcon.jsx
@@ -2,8 +2,6 @@ const SvgLangChainIcon = (props) => (
   <svg
     viewBox="0 0 81 41"
     fill="none"
-    height="200"
-    width="400"
     xmlns="http://www.w3.org/2000/svg"
     {...props}
   >
diff --git a/src/frontend/src/icons/Langwatch/langwatch.jsx b/src/frontend/src/icons/Langwatch/langwatch.jsx
index 7e1089419..7bac6e333 100644
--- a/src/frontend/src/icons/Langwatch/langwatch.jsx
+++ b/src/frontend/src/icons/Langwatch/langwatch.jsx
@@ -1,8 +1,6 @@
 const SvgLangwatch = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="1080"
-    height="1080"
     fill="none"
     viewBox="0 0 42 52"
     {...props}
diff --git a/src/frontend/src/icons/MCP/McpIcon.jsx b/src/frontend/src/icons/MCP/McpIcon.jsx
index 8d4fef316..fcb354436 100644
--- a/src/frontend/src/icons/MCP/McpIcon.jsx
+++ b/src/frontend/src/icons/MCP/McpIcon.jsx
@@ -2,8 +2,6 @@ const SvgMcpIcon = (props) => {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
       viewBox="0 0 16 16"
       fill={props.isdark ? "white" : "black"}
       {...props}
diff --git a/src/frontend/src/icons/Maritalk/MaritalkIcon.jsx b/src/frontend/src/icons/Maritalk/MaritalkIcon.jsx
index 17c9aafb2..a4d56c5f8 100644
--- a/src/frontend/src/icons/Maritalk/MaritalkIcon.jsx
+++ b/src/frontend/src/icons/Maritalk/MaritalkIcon.jsx
@@ -3,8 +3,6 @@ const SvgMaritalkIcon = (props) => (
     version="1.1"
     xmlns="http://www.w3.org/2000/svg"
     viewBox="0 0 118 118"
-    width="118"
-    height="118"
     {...props}
   >
     <path
diff --git a/src/frontend/src/icons/Mem0/SvgMem.jsx b/src/frontend/src/icons/Mem0/SvgMem.jsx
index 4fcb83893..84299362b 100644
--- a/src/frontend/src/icons/Mem0/SvgMem.jsx
+++ b/src/frontend/src/icons/Mem0/SvgMem.jsx
@@ -3,8 +3,6 @@ import { stringToBool } from "@/utils/utils";
 export default function SvgMem0(props) {
   return (
     <svg
-      width="126pt"
-      height="127pt"
       viewBox="0 0 126 127"
       preserveAspectRatio="xMidYMid meet"
       xmlns="http://www.w3.org/2000/svg"
diff --git a/src/frontend/src/icons/Milvus/Milvus.jsx b/src/frontend/src/icons/Milvus/Milvus.jsx
index d93b1d9a8..238a10552 100644
--- a/src/frontend/src/icons/Milvus/Milvus.jsx
+++ b/src/frontend/src/icons/Milvus/Milvus.jsx
@@ -1,11 +1,5 @@
 export const SvgMilvus = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="1600"
-    height="1600"
-    viewBox="0 0 1600 1600"
-    {...props}
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1600 1600" {...props}>
     <path
       fill="none"
       fillOpacity="0"
diff --git a/src/frontend/src/icons/NotDiamond/NotDiamondIcon.jsx b/src/frontend/src/icons/NotDiamond/NotDiamondIcon.jsx
index 466405c52..f589f3ce2 100644
--- a/src/frontend/src/icons/NotDiamond/NotDiamondIcon.jsx
+++ b/src/frontend/src/icons/NotDiamond/NotDiamondIcon.jsx
@@ -1,8 +1,6 @@
 const SvgNotDiamondIcon = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="32"
-    height="20"
     viewBox="0 0 54 32"
     fill="none"
     {...props}
diff --git a/src/frontend/src/icons/Notion/NotionLogo.jsx b/src/frontend/src/icons/Notion/NotionLogo.jsx
index 944c44677..c48df3c7f 100644
--- a/src/frontend/src/icons/Notion/NotionLogo.jsx
+++ b/src/frontend/src/icons/Notion/NotionLogo.jsx
@@ -1,8 +1,6 @@
 const SvgNotionLogo = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="1.1em"
-    height="1.1em"
     fill="none"
     viewBox="0 0 100 100"
     {...props}
diff --git a/src/frontend/src/icons/Novita/novita.jsx b/src/frontend/src/icons/Novita/novita.jsx
index 479cd5e47..e6add2ee0 100644
--- a/src/frontend/src/icons/Novita/novita.jsx
+++ b/src/frontend/src/icons/Novita/novita.jsx
@@ -1,12 +1,11 @@
 const SvgNovita = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="30px"
-    height="30px"
     fill="currentColor"
     fillRule="evenodd"
     style={{ flex: "none", lineHeight: "1" }}
     viewBox="0 0 24 24"
+    {...props}
   >
     <path
       d="M9.167 4.17v5.665L0 19.003h9.167v-5.666l5.666 5.666H24z"
diff --git a/src/frontend/src/icons/Nvidia/nvidia.jsx b/src/frontend/src/icons/Nvidia/nvidia.jsx
index 2f5af5cba..3d072d3b5 100644
--- a/src/frontend/src/icons/Nvidia/nvidia.jsx
+++ b/src/frontend/src/icons/Nvidia/nvidia.jsx
@@ -7,8 +7,6 @@ const NvidiaSVG = (props) => (
     xmlns="http://www.w3.org/2000/svg"
     x="0px"
     y="0px"
-    width="351.46px"
-    height="258.785px"
     viewBox="35.188 31.512 351.46 258.785"
     enableBackground="new 35.188 31.512 351.46 258.785"
     {...props}
diff --git a/src/frontend/src/icons/Ollama/Ollama.jsx b/src/frontend/src/icons/Ollama/Ollama.jsx
index 8b604893a..bb8c56545 100644
--- a/src/frontend/src/icons/Ollama/Ollama.jsx
+++ b/src/frontend/src/icons/Ollama/Ollama.jsx
@@ -1,7 +1,5 @@
 export const SvgOllama = (props) => (
   <svg
-    width="646"
-    height="854"
     viewBox="0 0 646 854"
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/frontend/src/icons/OpenRouter/OpenRouterIcon.jsx b/src/frontend/src/icons/OpenRouter/OpenRouterIcon.jsx
index fd18f9241..cc63fa6fb 100644
--- a/src/frontend/src/icons/OpenRouter/OpenRouterIcon.jsx
+++ b/src/frontend/src/icons/OpenRouter/OpenRouterIcon.jsx
@@ -5,6 +5,7 @@ const SvgOpenRouter = (props) => (
     height="1em"
     viewBox="0 0 460 460"
     version="1.1"
+    {...props}
   >
     <path
       d="M 293.250 65.728 C 295.313 65.944, 298.688 65.944, 300.750 65.728 C 302.813 65.513, 301.125 65.336, 297 65.336 C 292.875 65.336, 291.188 65.513, 293.250 65.728 M 263.264 66.718 C 264.784 66.947, 267.034 66.941, 268.264 66.704 C 269.494 66.467, 268.250 66.279, 265.500 66.286 C 262.750 66.294, 261.744 66.488, 263.264 66.718 M 410.250 137.031 C 409.012 137.529, 408 138.133, 408 138.374 C 408 139.118, 411.998 137.812, 412.575 136.879 C 413.211 135.850, 413.184 135.852, 410.250 137.031 M 287.768 146.725 C 289.565 146.947, 292.265 146.943, 293.768 146.715 C 295.271 146.486, 293.800 146.304, 290.500 146.310 C 287.200 146.315, 285.971 146.502, 287.768 146.725 M 298.269 146.693 C 299.242 146.947, 300.592 146.930, 301.269 146.656 C 301.946 146.382, 301.150 146.175, 299.500 146.195 C 297.850 146.215, 297.296 146.439, 298.269 146.693 M 304.250 146.689 C 305.212 146.941, 306.788 146.941, 307.750 146.689 C 308.712 146.438, 307.925 146.232, 306 146.232 C 304.075 146.232, 303.288 146.438, 304.250 146.689 M 11.269 181.693 C 12.242 181.947, 13.592 181.930, 14.269 181.656 C 14.946 181.382, 14.150 181.175, 12.500 181.195 C 10.850 181.215, 10.296 181.439, 11.269 181.693 M 330.872 182.750 C 329.680 184.271, 329.697 184.354, 331 183.384 C 331.825 182.771, 333.175 182.019, 334 181.713 C 335.255 181.249, 335.234 181.145, 333.872 181.079 C 332.977 181.036, 331.627 181.787, 330.872 182.750 M 153.861 208.059 L 151.500 210.119 154.250 208.444 C 155.762 207.523, 157 206.597, 157 206.385 C 157 205.604, 156.165 206.050, 153.861 208.059 M 84.433 292.891 C 85.146 294.045, 89 296.374, 89 295.650 C 89 295.419, 87.820 294.457, 86.377 293.511 C 84.934 292.566, 84.059 292.287, 84.433 292.891 M 277.250 300.716 C 278.762 300.945, 281.238 300.945, 282.750 300.716 C 284.262 300.487, 283.025 300.300, 280 300.300 C 276.975 300.300, 275.738 300.487, 277.250 300.716 M 293.250 300.716 C 294.762 300.945, 297.238 300.945, 298.750 300.716 C 300.262 300.487, 299.025 300.300, 296 300.300 C 292.975 300.300, 291.738 300.487, 293.250 300.716 M 108.911 308.337 C 110.373 310.157, 116 314.442, 116 313.735 C 116 313.515, 114.088 311.815, 111.750 309.957 C 109.412 308.100, 108.135 307.370, 108.911 308.337 M 119.615 316.179 C 124.047 319.526, 124.905 319.793, 121.539 316.777 C 119.868 315.279, 118.102 314.042, 117.615 314.027 C 117.128 314.012, 118.028 314.981, 119.615 316.179 M 126.433 320.891 C 127.146 322.045, 131 324.374, 131 323.650 C 131 323.419, 129.820 322.457, 128.377 321.511 C 126.934 320.566, 126.059 320.287, 126.433 320.891 M 137 328.500 C 138.292 329.875, 139.574 331, 139.849 331 C 140.124 331, 139.292 329.875, 138 328.500 C 136.708 327.125, 135.426 326, 135.151 326 C 134.876 326, 135.708 327.125, 137 328.500 M 163.722 347.050 C 164.944 348.337, 166.138 349.189, 166.374 348.944 C 166.611 348.700, 165.611 347.648, 164.152 346.606 L 161.500 344.712 163.722 347.050 M 168.083 349.303 C 168.313 349.469, 169.850 350.396, 171.500 351.362 L 174.500 353.119 172.139 351.059 C 170.841 349.927, 169.303 349, 168.723 349 C 168.142 349, 167.854 349.136, 168.083 349.303 M 175 353.417 C 175 353.629, 176.575 354.732, 178.500 355.867 C 180.425 357.003, 182 357.581, 182 357.151 C 182 356.722, 180.425 355.619, 178.500 354.701 C 176.575 353.783, 175 353.206, 175 353.417 M 204 367.383 C 204 367.594, 205.111 367.979, 206.470 368.239 C 207.828 368.499, 208.702 368.326, 208.411 367.856 C 207.899 367.027, 204 366.610, 204 367.383 M 285.250 382.689 C 286.212 382.941, 287.788 382.941, 288.750 382.689 C 289.712 382.438, 288.925 382.232, 287 382.232 C 285.075 382.232, 284.288 382.438, 285.250 382.689 M 292.269 382.693 C 293.242 382.947, 294.592 382.930, 295.269 382.656 C 295.946 382.382, 295.150 382.175, 293.500 382.195 C 291.850 382.215, 291.296 382.439, 292.269 382.693 M 298.750 382.706 C 299.988 382.944, 302.012 382.944, 303.250 382.706 C 304.488 382.467, 303.475 382.272, 301 382.272 C 298.525 382.272, 297.512 382.467, 298.750 382.706"
diff --git a/src/frontend/src/icons/Postgres/Postgres.jsx b/src/frontend/src/icons/Postgres/Postgres.jsx
index 95059e729..ed604cdab 100644
--- a/src/frontend/src/icons/Postgres/Postgres.jsx
+++ b/src/frontend/src/icons/Postgres/Postgres.jsx
@@ -2,10 +2,9 @@ export const SvgPostgres = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     xmlnsXlink="http://www.w3.org/1999/xlink"
-    width="30"
-    height="30"
     version="1"
     viewBox="0 0 369 380.25"
+    {...props}
   >
     <defs>
       <filter id="a5834174ca" width="100%" height="100%" x="0%" y="0%">
diff --git a/src/frontend/src/icons/Python/Python.jsx b/src/frontend/src/icons/Python/Python.jsx
index 812683772..37a97f775 100644
--- a/src/frontend/src/icons/Python/Python.jsx
+++ b/src/frontend/src/icons/Python/Python.jsx
@@ -1,7 +1,5 @@
 export const SvgPython = (props) => (
   <svg
-    width="1080"
-    height="1080"
     version="1.0"
     viewBox="0 0 810 810"
     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/frontend/src/icons/QianFanChat/QianFanChat.jsx b/src/frontend/src/icons/QianFanChat/QianFanChat.jsx
index 6724a2b0d..9822466c1 100644
--- a/src/frontend/src/icons/QianFanChat/QianFanChat.jsx
+++ b/src/frontend/src/icons/QianFanChat/QianFanChat.jsx
@@ -1,11 +1,5 @@
 export const SvgQianFanChat = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width={1000}
-    height={1000}
-    viewBox="0 0 750 750"
-    {...props}
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 750 750" {...props}>
     <path
       fill="#00d263"
       d="M602.984 155.953c.024-.02.059-.043.086-.07L379.008 26.43l-37.793 21.71a86.37 86.37 0 0 0-5.809 3.028L95.051 189.543l106.808 61.68a26.254 26.254 0 0 0 26.223.015l53.691-30.91 69.95-40.273a53.06 53.06 0 0 1 52.933 0l55.02 31.675 67.738 38.997a26.257 26.257 0 0 0 26.184.011l107.093-61.566Zm0 0"
diff --git a/src/frontend/src/icons/Redis/Redis.jsx b/src/frontend/src/icons/Redis/Redis.jsx
index 6a3228c9b..3e5212286 100644
--- a/src/frontend/src/icons/Redis/Redis.jsx
+++ b/src/frontend/src/icons/Redis/Redis.jsx
@@ -2,8 +2,6 @@ export const SvgRedis = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     xmlnsXlink="http://www.w3.org/1999/xlink"
-    width="35"
-    height="35"
     version="1"
     viewBox="0 0 750 750"
     {...props}
diff --git a/src/frontend/src/icons/SambaNova/SambaNovaLogo.jsx b/src/frontend/src/icons/SambaNova/SambaNovaLogo.jsx
index 6a448c09f..c4e9edcf8 100644
--- a/src/frontend/src/icons/SambaNova/SambaNovaLogo.jsx
+++ b/src/frontend/src/icons/SambaNova/SambaNovaLogo.jsx
@@ -5,8 +5,6 @@ const SvgSambaNovaLogo = ({ ...props }) => (
     role="img"
     fill="none"
     viewBox="0 0 37 37"
-    width="48"
-    height="48"
     className="fill-foreground"
     {...props}
   >
diff --git a/src/frontend/src/icons/ScrapeGraphAI/ScrapeGraphAI.jsx b/src/frontend/src/icons/ScrapeGraphAI/ScrapeGraphAI.jsx
index 3fa4d83b6..1c1ce4a61 100644
--- a/src/frontend/src/icons/ScrapeGraphAI/ScrapeGraphAI.jsx
+++ b/src/frontend/src/icons/ScrapeGraphAI/ScrapeGraphAI.jsx
@@ -5,8 +5,6 @@ const ScrapeGraphAI = (props) => {
       version="1.1"
       xmlns="http://www.w3.org/2000/svg"
       xmlnsXlink="http://www.w3.org/1999/xlink"
-      width="400"
-      height="400"
       viewBox="0, 0, 400,400"
       {...props}
     >
diff --git a/src/frontend/src/icons/SearchHybrid/SearchHybridIcon.jsx b/src/frontend/src/icons/SearchHybrid/SearchHybridIcon.jsx
index 039efaa19..5bb3eadd3 100644
--- a/src/frontend/src/icons/SearchHybrid/SearchHybridIcon.jsx
+++ b/src/frontend/src/icons/SearchHybrid/SearchHybridIcon.jsx
@@ -1,10 +1,9 @@
 const SvgSearchHybridIcon = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="18"
-    height="18"
     viewBox="0 0 18 18"
     fill="none"
+    {...props}
   >
     <path d="M15.75 15.75L12.525 12.525L15.75 15.75Z" fill="currentColor" />
     <path
diff --git a/src/frontend/src/icons/SearchLexical/SearchLexicalIcon.jsx b/src/frontend/src/icons/SearchLexical/SearchLexicalIcon.jsx
index f1f7e849e..83a0ed9f9 100644
--- a/src/frontend/src/icons/SearchLexical/SearchLexicalIcon.jsx
+++ b/src/frontend/src/icons/SearchLexical/SearchLexicalIcon.jsx
@@ -1,10 +1,9 @@
 const SvgSearchLexicalIcon = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="18"
-    height="18"
     viewBox="0 0 18 18"
     fill="none"
+    {...props}
   >
     <path d="M15.75 15.75L12.525 12.525L15.75 15.75Z" fill="currentColor" />
     <path d="M3.75 15H5.25H6.75" fill="currentColor" />
diff --git a/src/frontend/src/icons/SearchVector/SearchVectorIcon.jsx b/src/frontend/src/icons/SearchVector/SearchVectorIcon.jsx
index 3820e9132..f25999e51 100644
--- a/src/frontend/src/icons/SearchVector/SearchVectorIcon.jsx
+++ b/src/frontend/src/icons/SearchVector/SearchVectorIcon.jsx
@@ -1,10 +1,9 @@
 const SvgSearchVectorIcon = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="18"
-    height="18"
     viewBox="0 0 18 18"
     fill="none"
+    {...props}
   >
     <path d="M15.75 15.75L12.525 12.525L15.75 15.75Z" fill="currentColor" />
     <path
diff --git a/src/frontend/src/icons/Spider/SpiderIcon.jsx b/src/frontend/src/icons/Spider/SpiderIcon.jsx
index 1d10d9fee..4efc1efd4 100644
--- a/src/frontend/src/icons/Spider/SpiderIcon.jsx
+++ b/src/frontend/src/icons/Spider/SpiderIcon.jsx
@@ -1,7 +1,5 @@
 const SvgSpiderIcon = (props) => (
   <svg
-    height="30"
-    width="30"
     viewBox="0 0 36 34"
     xmlns="http://www.w3.org/2000/svg"
     className="fill-accent-foreground transition-all group-hover:scale-110"
diff --git a/src/frontend/src/icons/Streamlit/SvgStreamlit.jsx b/src/frontend/src/icons/Streamlit/SvgStreamlit.jsx
index 0db3372c6..d1de3f010 100644
--- a/src/frontend/src/icons/Streamlit/SvgStreamlit.jsx
+++ b/src/frontend/src/icons/Streamlit/SvgStreamlit.jsx
@@ -1,8 +1,6 @@
 export default function SvgStreamlit(props) {
   return (
     <svg
-      width="301"
-      height="165"
       viewBox="0 0 301 165"
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
diff --git a/src/frontend/src/icons/TwelveLabs/TwelveLabsLogo.jsx b/src/frontend/src/icons/TwelveLabs/TwelveLabsLogo.jsx
index 4e715c61e..c1d82967c 100644
--- a/src/frontend/src/icons/TwelveLabs/TwelveLabsLogo.jsx
+++ b/src/frontend/src/icons/TwelveLabs/TwelveLabsLogo.jsx
@@ -1,8 +1,6 @@
 const SvgTwelveLogo = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="1em"
-    height="1em"
     viewBox="0 0 204 146.6"
     fill="none"
     {...props}
diff --git a/src/frontend/src/icons/Twitter X/TwitterX.jsx b/src/frontend/src/icons/Twitter X/TwitterX.jsx
index ec46eb97b..15df12800 100644
--- a/src/frontend/src/icons/Twitter X/TwitterX.jsx	
+++ b/src/frontend/src/icons/Twitter X/TwitterX.jsx	
@@ -1,12 +1,10 @@
 const TwitterXSVG = (props) => {
   return props.isdark === "true" ? (
     <svg
-      {...props}
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0,0,256,256"
-      width="30px"
-      height="30px"
       fillRule="nonzero"
+      {...props}
     >
       <g
         fill="#ffffff"
diff --git a/src/frontend/src/icons/Upstash/UpstashIcon.jsx b/src/frontend/src/icons/Upstash/UpstashIcon.jsx
index 792483325..5bbe383bd 100644
--- a/src/frontend/src/icons/Upstash/UpstashIcon.jsx
+++ b/src/frontend/src/icons/Upstash/UpstashIcon.jsx
@@ -1,7 +1,5 @@
 const UpstashIcon = (props) => (
   <svg
-    width="256px"
-    height="341px"
     viewBox="0 0 256 341"
     version="1.1"
     xmlns="http://www.w3.org/2000/svg"
diff --git a/src/frontend/src/icons/VectaraIcon/Vectara.jsx b/src/frontend/src/icons/VectaraIcon/Vectara.jsx
index 378dc6964..e70257ccf 100644
--- a/src/frontend/src/icons/VectaraIcon/Vectara.jsx
+++ b/src/frontend/src/icons/VectaraIcon/Vectara.jsx
@@ -2,10 +2,8 @@ export const SvgVectara = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
     xmlnsXlink="http://www.w3.org/1999/xlink"
-    width={1000}
     zoomAndPan="magnify"
     viewBox="0 0 750 749.999995"
-    height={1000}
     preserveAspectRatio="xMidYMid meet"
     {...props}
   >
diff --git a/src/frontend/src/icons/Wikipedia/Wikipedia.jsx b/src/frontend/src/icons/Wikipedia/Wikipedia.jsx
index 288f63596..84ea33be1 100644
--- a/src/frontend/src/icons/Wikipedia/Wikipedia.jsx
+++ b/src/frontend/src/icons/Wikipedia/Wikipedia.jsx
@@ -1,11 +1,5 @@
 const SvgWikipedia = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="103"
-    height="94"
-    viewBox="0 0 103 94"
-    {...props}
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 103 94" {...props}>
     <radialGradient
       id="SVGWIK_1_"
       cx="244.571"
diff --git a/src/frontend/src/icons/Youtube/youtube.jsx b/src/frontend/src/icons/Youtube/youtube.jsx
index 1b79ece7c..ae9917e4b 100644
--- a/src/frontend/src/icons/Youtube/youtube.jsx
+++ b/src/frontend/src/icons/Youtube/youtube.jsx
@@ -1,11 +1,5 @@
 const YouTubeIcon = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    {...props}
-    viewBox="0 0 1080 1080"
-    width="1080"
-    height="1080"
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080" {...props}>
     <g
       fill="None"
       fillOpacity="0.0"
diff --git a/src/frontend/src/icons/athena/athena.jsx b/src/frontend/src/icons/athena/athena.jsx
index d3bc71fba..6113eb6a9 100644
--- a/src/frontend/src/icons/athena/athena.jsx
+++ b/src/frontend/src/icons/athena/athena.jsx
@@ -6,8 +6,8 @@ export const AthenaComponent = ({ className, ...props }) => (
     height="239"
     viewBox="0 0 300 239"
     fill="none"
-    {...props}
     xmlns="http://www.w3.org/2000/svg"
+    {...props}
   >
     <path
       d="M275.757 193.713L300 234.575H275.757H251.515L275.757 193.713Z"
diff --git a/src/frontend/src/icons/github/github.jsx b/src/frontend/src/icons/github/github.jsx
index c3cb817db..887da8d82 100644
--- a/src/frontend/src/icons/github/github.jsx
+++ b/src/frontend/src/icons/github/github.jsx
@@ -1,10 +1,5 @@
 const Icon = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 30 30"
-    width="23px"
-    height="23px"
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30" {...props}>
     {" "}
     <path d="M15,3C8.373,3,3,8.373,3,15c0,5.623,3.872,10.328,9.092,11.63C12.036,26.468,12,26.28,12,26.047v-2.051 c-0.487,0-1.303,0-1.508,0c-0.821,0-1.551-0.353-1.905-1.009c-0.393-0.729-0.461-1.844-1.435-2.526 c-0.289-0.227-0.069-0.486,0.264-0.451c0.615,0.174,1.125,0.596,1.605,1.222c0.478,0.627,0.703,0.769,1.596,0.769 c0.433,0,1.081-0.025,1.691-0.121c0.328-0.833,0.895-1.6,1.588-1.962c-3.996-0.411-5.903-2.399-5.903-5.098 c0-1.162,0.495-2.286,1.336-3.233C9.053,10.647,8.706,8.73,9.435,8c1.798,0,2.885,1.166,3.146,1.481C13.477,9.174,14.461,9,15.495,9 c1.036,0,2.024,0.174,2.922,0.483C18.675,9.17,19.763,8,21.565,8c0.732,0.731,0.381,2.656,0.102,3.594 c0.836,0.945,1.328,2.066,1.328,3.226c0,2.697-1.904,4.684-5.894,5.097C18.199,20.49,19,22.1,19,23.313v2.734 c0,0.104-0.023,0.179-0.035,0.268C23.641,24.676,27,20.236,27,15C27,8.373,21.627,3,15,3z" />
   </svg>
diff --git a/src/frontend/src/icons/globe-ok/globe-ok.jsx b/src/frontend/src/icons/globe-ok/globe-ok.jsx
index 182723641..a8f9eb1aa 100644
--- a/src/frontend/src/icons/globe-ok/globe-ok.jsx
+++ b/src/frontend/src/icons/globe-ok/globe-ok.jsx
@@ -1,8 +1,6 @@
 const SvgGlobeOkIcon = (props) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
-    width="16"
-    height="16"
     fill="none"
     viewBox="0 0 16 16"
     {...props}
diff --git a/src/frontend/src/icons/gmail/gmail.jsx b/src/frontend/src/icons/gmail/gmail.jsx
index d92728117..7ba775956 100644
--- a/src/frontend/src/icons/gmail/gmail.jsx
+++ b/src/frontend/src/icons/gmail/gmail.jsx
@@ -1,10 +1,5 @@
 const Icon = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 48 48"
-    width="23px"
-    height="23px"
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" {...props}>
     <path
       fill="#4caf50"
       d="M45,16.2l-5,2.75l-5,4.75L35,40h7c1.657,0,3-1.343,3-3V16.2z"
diff --git a/src/frontend/src/icons/googlecalendar/googlecalendar.jsx b/src/frontend/src/icons/googlecalendar/googlecalendar.jsx
index 6a644ebda..6fb5e3edc 100644
--- a/src/frontend/src/icons/googlecalendar/googlecalendar.jsx
+++ b/src/frontend/src/icons/googlecalendar/googlecalendar.jsx
@@ -1,10 +1,5 @@
 const Icon = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 48 48"
-    width="23px"
-    height="23px"
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" {...props}>
     <rect width="22" height="22" x="13" y="13" fill="#fff" />
     <polygon
       fill="#1e88e5"
diff --git a/src/frontend/src/icons/mistral/mistralIcon.jsx b/src/frontend/src/icons/mistral/mistralIcon.jsx
index 095846b73..387de5d66 100644
--- a/src/frontend/src/icons/mistral/mistralIcon.jsx
+++ b/src/frontend/src/icons/mistral/mistralIcon.jsx
@@ -2,8 +2,6 @@ const SvgMistralIcon = (props) => (
   <svg
     viewBox="0 0 129 91"
     version="1.1"
-    width="32px"
-    height="32px"
     style={{
       fillRule: "evenodd",
       clipRule: "evenodd",
diff --git a/src/frontend/src/icons/outlook/outlook.jsx b/src/frontend/src/icons/outlook/outlook.jsx
index 57686b8ba..fc65815be 100644
--- a/src/frontend/src/icons/outlook/outlook.jsx
+++ b/src/frontend/src/icons/outlook/outlook.jsx
@@ -1,11 +1,5 @@
 const OutlookIconSVG = (props) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 48 48"
-    width="23px"
-    height="23px"
-    {...props}
-  >
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" {...props}>
     <path
       fill="#03A9F4"
       d="M21,31c0,1.104,0.896,2,2,2h17c1.104,0,2-0.896,2-2V16c0-1.104-0.896-2-2-2H23c-1.104,0-2,0.896-2,2V31z"
diff --git a/src/frontend/src/icons/xAI/xAIIcon.jsx b/src/frontend/src/icons/xAI/xAIIcon.jsx
index 24d398d16..210356e3b 100644
--- a/src/frontend/src/icons/xAI/xAIIcon.jsx
+++ b/src/frontend/src/icons/xAI/xAIIcon.jsx
@@ -2,14 +2,12 @@ import { stringToBool } from "@/utils/utils";
 
 const XAISVG = (props) => (
   <svg
-    {...props}
     fill={stringToBool(props.isdark) ? "#ffffff" : "#0A0A0A"}
     fillRule="evenodd"
-    height="1em"
     style={{ flex: "none", lineHeight: 1 }}
     viewBox="0 0 24 24"
-    width="1em"
     xmlns="http://www.w3.org/2000/svg"
+    {...props}
   >
     <title>Grok</title>
     <path d="M6.469 8.776L16.512 23h-4.464L2.005 8.776H6.47zm-.004 7.9l2.233 3.164L6.467 23H2l4.465-6.324zM22 2.582V23h-3.659V7.764L22 2.582zM22 1l-9.952 14.095-2.233-3.163L17.533 1H22z" />