diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json
index bb825a587..f18616611 100644
--- a/src/frontend/package-lock.json
+++ b/src/frontend/package-lock.json
@@ -12085,4 +12085,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/src/components/headerComponent/components/menuBar/index.tsx b/src/frontend/src/components/headerComponent/components/menuBar/index.tsx
index 5d60f9fac..db6fa5b2c 100644
--- a/src/frontend/src/components/headerComponent/components/menuBar/index.tsx
+++ b/src/frontend/src/components/headerComponent/components/menuBar/index.tsx
@@ -14,7 +14,7 @@ import useAlertStore from "../../../../stores/alertStore";
 import useFlowStore from "../../../../stores/flowStore";
 import useFlowsManagerStore from "../../../../stores/flowsManagerStore";
 import { cn } from "../../../../utils/utils";
-import Tooltip from "../../../TooltipComponent";
+import ShadTooltip from "../../../ShadTooltipComponent";
 import IconComponent from "../../../genericIconComponent";
 import { Button } from "../../../ui/button";
 
@@ -125,8 +125,8 @@ export const MenuBar = ({
           setOpen={setOpenSettings}
         ></FlowSettingsModal>
       </div>
-      <Tooltip
-        title={
+      <ShadTooltip
+        content={
           "Last saved at " +
           new Date(currentFlow.updated_at ?? "").toLocaleString("en-US", {
             hour: "numeric",
@@ -134,8 +134,10 @@ export const MenuBar = ({
             second: "numeric",
           })
         }
+        side="bottom"
+        styleClasses="cursor-default"
       >
-        <div className="flex items-center gap-1.5 text-sm text-muted-foreground">
+        <div className="flex cursor-default items-center gap-1.5 text-sm text-muted-foreground">
           <IconComponent
             name={isBuilding || saveLoading ? "Loader2" : "CheckCircle2"}
             className={cn(
@@ -145,7 +147,7 @@ export const MenuBar = ({
           />
           {printByBuildStatus()}
         </div>
-      </Tooltip>
+      </ShadTooltip>
     </div>
   ) : (
     <></>
diff --git a/src/frontend/src/modals/genericModal/index.tsx b/src/frontend/src/modals/genericModal/index.tsx
index 2f7a07905..dac86baa4 100644
--- a/src/frontend/src/modals/genericModal/index.tsx
+++ b/src/frontend/src/modals/genericModal/index.tsx
@@ -182,7 +182,7 @@ export default function GenericModal({
           {myModalTitle}
         </span>
         <IconComponent
-          name="FileText"
+          name={myModalTitle === "Edit Prompt" ? "TerminalSquare" : "FileText"}
           className="h-6 w-6 pl-1 text-primary "
           aria-hidden="true"
         />
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index cac19cc16..97c3e5ec2 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -226,7 +226,7 @@ export default function NodeToolbarComponent({
                     id={"code-input-node-toolbar-" + name}
                   />
                 </div>
-                <IconComponent name="Code2" className="h-4 w-4" />
+                <IconComponent name="TerminalSquare" className="h-4 w-4" />
               </button>
             </ShadTooltip>
           ) : (