diff --git a/.gitignore b/.gitignore
index 03eed1556..e62432745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -265,4 +265,8 @@ chroma*/*
 stuff/*
 src/frontend/playwright-report/index.html
 *.bak
-prof/*
\ No newline at end of file
+prof/*
+.langchain.db-shm
+.langchain.db-wal
+langflow.db-shm
+langflow.db-wal
diff --git a/src/backend/base/langflow/components/inputs/ChatInput.py b/src/backend/base/langflow/components/inputs/ChatInput.py
index 150d5f2af..28cbc5529 100644
--- a/src/backend/base/langflow/components/inputs/ChatInput.py
+++ b/src/backend/base/langflow/components/inputs/ChatInput.py
@@ -2,6 +2,8 @@ from typing import Optional
 
 from langflow.base.io.chat import ChatComponent
 from langflow.schema.message import Message
+from langflow.field_typing import Text
+from typing import Union
 
 
 class ChatInput(ChatComponent):
@@ -26,7 +28,7 @@ class ChatInput(ChatComponent):
         input_value: Optional[str] = None,
         files: Optional[list[str]] = None,
         session_id: Optional[str] = None,
-    ) -> Message:
+    ) -> Union[Message, Text]:
         return super().build_with_record(
             sender=sender,
             sender_name=sender_name,
diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json
index 14729dfcb..7e7c3bbba 100644
--- a/src/frontend/package-lock.json
+++ b/src/frontend/package-lock.json
@@ -48,7 +48,7 @@
         "file-saver": "^2.0.5",
         "framer-motion": "^11.0.6",
         "lodash": "^4.17.21",
-        "lucide-react": "^0.331.0",
+        "lucide-react": "^0.394.0",
         "million": "^3.0.6",
         "moment": "^2.29.4",
         "openseadragon": "^4.1.1",
@@ -8613,9 +8613,9 @@
       }
     },
     "node_modules/lucide-react": {
-      "version": "0.331.0",
-      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.331.0.tgz",
-      "integrity": "sha512-CHFJ0ve9vaZ7bB2VRAl27SlX1ELh6pfNC0jS96qGpPEEzLkLDGq4pDBFU8RhOoRMqsjXqTzLm9U6bZ1OcIHq7Q==",
+      "version": "0.394.0",
+      "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.394.0.tgz",
+      "integrity": "sha512-PzTbJ0bsyXRhH59k5qe7MpTd5MxlpYZUcM9kGSwvPGAfnn0J6FElDwu2EX6Vuh//F7y60rcVJiFQ7EK9DCMgfw==",
       "peerDependencies": {
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0"
       }
diff --git a/src/frontend/package.json b/src/frontend/package.json
index bb7efd38d..efcdd4b43 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -43,7 +43,7 @@
     "file-saver": "^2.0.5",
     "framer-motion": "^11.0.6",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.331.0",
+    "lucide-react": "^0.394.0",
     "million": "^3.0.6",
     "moment": "^2.29.4",
     "openseadragon": "^4.1.1",
diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx
index bcb14e890..6838d3a42 100644
--- a/src/frontend/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx
@@ -110,7 +110,7 @@ export default function GenericNode({
   };
 
   const renderIconStatus = () => {
-    return iconStatus;
+    return <div className="cursor-help">{iconStatus}</div>;
   };
 
   const getNodeBorderClassName = (
@@ -518,30 +518,6 @@ export default function GenericNode({
             {showNode && (
               <>
                 <div className="flex flex-shrink-0 items-center gap-2">
-                  <Button
-                    onClick={() => {
-                      if (buildStatus === BuildStatus.BUILDING || isBuilding)
-                        return;
-                      setValidationStatus(null);
-                      buildFlow({ stopNodeId: data.id });
-                    }}
-                    variant="none"
-                    size="none"
-                    className="group p-1"
-                  >
-                    <div
-                      data-testid={
-                        `button_run_` + data?.node?.display_name.toLowerCase()
-                      }
-                    >
-                      <IconComponent
-                        name="Play"
-                        className={
-                          "h-5 w-5 fill-current stroke-2 text-muted-foreground transition-all group-hover:text-medium-indigo group-hover/node:opacity-100"
-                        }
-                      />
-                    </div>
-                  </Button>
                   <ShadTooltip
                     content={
                       buildStatus === BuildStatus.BUILDING ? (
@@ -573,6 +549,30 @@ export default function GenericNode({
                   >
                     {renderIconStatus()}
                   </ShadTooltip>
+                  <Button
+                    onClick={() => {
+                      if (buildStatus === BuildStatus.BUILDING || isBuilding)
+                        return;
+                      setValidationStatus(null);
+                      buildFlow({ stopNodeId: data.id });
+                    }}
+                    variant="none"
+                    size="none"
+                    className="group p-1"
+                  >
+                    <div
+                      data-testid={
+                        `button_run_` + data?.node?.display_name.toLowerCase()
+                      }
+                    >
+                      <IconComponent
+                        name="Play"
+                        className={
+                          "h-5 w-5 fill-current stroke-2 text-muted-foreground transition-all group-hover:text-medium-indigo group-hover/node:opacity-100"
+                        }
+                      />
+                    </div>
+                  </Button>
                 </div>
               </>
             )}
diff --git a/src/frontend/src/CustomNodes/hooks/use-icons-status.tsx b/src/frontend/src/CustomNodes/hooks/use-icons-status.tsx
index 807c25aa8..923943e03 100644
--- a/src/frontend/src/CustomNodes/hooks/use-icons-status.tsx
+++ b/src/frontend/src/CustomNodes/hooks/use-icons-status.tsx
@@ -1,4 +1,7 @@
+import ForwardedIconComponent from "../../components/genericIconComponent";
+import Checkmark from "../../components/ui/checkmark";
 import Loading from "../../components/ui/loading";
+import Xmark from "../../components/ui/xmark";
 import { BuildStatus } from "../../constants/enums";
 import { VertexBuildTypeAPI } from "../../types/api";
 import { cn } from "../../utils/utils";
@@ -21,18 +24,29 @@ const useIconStatus = (
       return <Loading className="text-medium-indigo" />;
     } else {
       return (
-        <div
-          className={cn(
-            "h-4 w-4 shrink-0 cursor-pointer rounded-full",
-            conditionSuccess
-              ? "bg-status-green"
-              : conditionInactive
-                ? "bg-status-gray"
-                : conditionError
-                  ? "bg-status-red"
-                  : "bg-muted-foreground/40",
+        <>
+          {conditionSuccess ? (
+            <Checkmark
+              className="h-6 w-6 stroke-2 text-status-green transition-all"
+              isVisible={true}
+            />
+          ) : conditionInactive ? (
+            <ForwardedIconComponent
+              name="Ellipsis"
+              className="h-6 w-6 fill-current stroke-2 text-status-gray opacity-30"
+            />
+          ) : conditionError ? (
+            <Xmark
+              isVisible={true}
+              className="h-6 w-6 fill-current stroke-2 text-status-red"
+            />
+          ) : (
+            <ForwardedIconComponent
+              name="Ellipsis"
+              className="h-6 w-6 fill-current stroke-2 text-status-gray opacity-70"
+            />
           )}
-        />
+        </>
       );
     }
   };
diff --git a/src/frontend/src/components/ui/checkmark.tsx b/src/frontend/src/components/ui/checkmark.tsx
index 3a6ba7208..e28b66963 100644
--- a/src/frontend/src/components/ui/checkmark.tsx
+++ b/src/frontend/src/components/ui/checkmark.tsx
@@ -7,7 +7,7 @@ export default function Checkmark({ initial = true, isVisible, className }) {
           xmlns="http://www.w3.org/2000/svg"
           fill="none"
           viewBox="0 0 24 24"
-          strokeWidth={1.5}
+          strokeWidth={2}
           stroke="currentColor"
           className={"CheckIcon " + className}
         >
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index d9453641e..43e92bfe2 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -40,6 +40,7 @@ import {
   Download,
   DownloadCloud,
   Edit,
+  Ellipsis,
   Eraser,
   ExternalLink,
   Eye,
@@ -530,6 +531,7 @@ export const nodeIconsLucide: iconsType = {
   ScreenShare,
   Code,
   Type,
+  Ellipsis,
   Braces,
   FlaskConical,
   AlertCircle,