diff --git a/src/frontend/src/components/inputComponent/index.tsx b/src/frontend/src/components/inputComponent/index.tsx
index b9ed74dc2..5c0ffe93e 100644
--- a/src/frontend/src/components/inputComponent/index.tsx
+++ b/src/frontend/src/components/inputComponent/index.tsx
@@ -4,7 +4,7 @@ import { useEffect, useRef, useState } from "react";
 import { InputComponentType } from "../../types/components";
 import { handleKeyDown } from "../../utils/reactflowUtils";
 import { classNames, cn } from "../../utils/utils";
-import IconComponent from "../genericIconComponent";
+import ForwardedIconComponent from "../genericIconComponent";
 import {
   Command,
   CommandEmpty,
@@ -19,7 +19,7 @@ import { Popover, PopoverContentWithoutPortal } from "../ui/popover";
 export default function InputComponent({
   autoFocus = false,
   onBlur,
-  value,
+  value = "",
   onChange,
   disabled,
   required = false,
@@ -42,7 +42,7 @@ export default function InputComponent({
 
   // Clear component state
   useEffect(() => {
-    if (disabled && value !== "") {
+    if (disabled && value && onChange && value !== "") {
       onChange("");
     }
   }, [disabled]);
@@ -75,7 +75,7 @@ export default function InputComponent({
             )}
             placeholder={password && editNode ? "Key" : placeholder}
             onChange={(e) => {
-              onChange(e.target.value);
+              onChange && onChange(e.target.value);
             }}
             onCopy={(e) => {
               e.preventDefault();
@@ -95,25 +95,30 @@ export default function InputComponent({
                 ref={refInput}
                 type="text"
                 onBlur={onInputLostFocus}
-                value={value}
+                value={
+                  selectedOption !== "" || !onChange ? selectedOption : value
+                }
                 autoFocus={autoFocus}
-                disabled={disabled || selectedOption !== ""}
+                disabled={disabled}
                 onClick={() => {
-                  selectedOption !== "" && setShowOptions(true);
+                  (selectedOption !== "" || !onChange) && setShowOptions(true);
                 }}
                 required={required}
                 className={classNames(
-                  password && !pwdVisible && value !== ""
+                  password &&
+                    selectedOption === "" &&
+                    !pwdVisible &&
+                    value !== ""
                     ? " text-clip password "
                     : "",
                   editNode ? " input-edit-node " : "",
-                  password && editNode ? "pr-8" : "",
-                  password && !editNode ? "pr-10" : "",
+                  password && selectedOption === "" && editNode ? "pr-8" : "",
+                  password && selectedOption === "" && !editNode ? "pr-10" : "",
                   className!
                 )}
                 placeholder={password && editNode ? "Key" : placeholder}
                 onChange={(e) => {
-                  onChange(e.target.value);
+                  onChange && onChange(e.target.value);
                 }}
                 onKeyDown={(e) => {
                   handleKeyDown(e, value, "");
@@ -148,7 +153,7 @@ export default function InputComponent({
                           setShowOptions(false);
                         }}
                       >
-                        <IconComponent
+                        <ForwardedIconComponent
                           name="Check"
                           className={cn(
                             "mr-2 h-4 w-4 text-primary",
@@ -169,11 +174,11 @@ export default function InputComponent({
           </Popover>
           <div
             className={cn(
-              "pointer-events-auto absolute inset-y-0 h-full w-full",
-              selectedOption !== "" ? "" : "hidden"
+              "pointer-events-auto absolute inset-y-0 h-full w-full cursor-pointer",
+              selectedOption !== "" || !onChange ? "" : "hidden"
             )}
             onClick={
-              selectedOption !== ""
+              selectedOption !== "" || !onChange
                 ? (e) => {
                     setShowOptions((old) => !old);
                     e.preventDefault();
@@ -187,21 +192,30 @@ export default function InputComponent({
 
       <span
         className={cn(
-          password ? "right-8" : "right-0",
-          "absolute inset-y-0 flex items-center pr-2"
+          password && selectedOption === "" ? "right-8" : "right-0",
+          "absolute inset-y-0 flex items-center pr-2.5"
         )}
       >
         <button
           onClick={() => {
             setShowOptions(!showOptions);
           }}
-          className="text-muted-foreground hover:text-accent-foreground"
+          className={cn(
+            selectedOption !== ""
+              ? "text-medium-indigo"
+              : "text-muted-foreground",
+            "hover:text-accent-foreground"
+          )}
         >
-          <IconComponent name="Globe" className="h-4 w-4" aria-hidden="true" />
+          <ForwardedIconComponent
+            name="Globe"
+            className={"h-4 w-4"}
+            aria-hidden="true"
+          />
         </button>
       </span>
 
-      {password && (
+      {password && selectedOption === "" && (
         <button
           type="button"
           tabIndex={-1}
@@ -217,6 +231,7 @@ export default function InputComponent({
           }}
         >
           {password &&
+            selectedOption === "" &&
             (pwdVisible ? (
               <svg
                 xmlns="http://www.w3.org/2000/svg"
diff --git a/src/frontend/src/pages/globalVariablesPage/components/addNewVariableButton.tsx b/src/frontend/src/pages/globalVariablesPage/components/addNewVariableButton.tsx
index 51f88ddf0..d2ab94134 100644
--- a/src/frontend/src/pages/globalVariablesPage/components/addNewVariableButton.tsx
+++ b/src/frontend/src/pages/globalVariablesPage/components/addNewVariableButton.tsx
@@ -1,4 +1,5 @@
 import { useState } from "react";
+import ForwardedIconComponent from "../../../components/genericIconComponent";
 import InputComponent from "../../../components/inputComponent";
 import { Button } from "../../../components/ui/button";
 import { Input } from "../../../components/ui/input";
@@ -10,7 +11,7 @@ import { useGlobalVariablesStore } from "../../../stores/globalVariables";
 
 //TODO IMPLEMENT FORM LOGIC
 
-export default function AddNewVariableButton({children}): JSX.Element {
+export default function AddNewVariableButton({ children }): JSX.Element {
   const [key, setKey] = useState("");
   const [value, setValue] = useState("");
   const [provider, setProvider] = useState("");
@@ -35,42 +36,45 @@ export default function AddNewVariableButton({children}): JSX.Element {
   return (
     <BaseModal open={open} setOpen={setOpen} size="x-small">
       <BaseModal.Header
-        description={"write a text variable to use anywhere on your flow"}
+        description={"Write a text global variable to use in any flow."}
       >
-        <span>Create a new Variable</span>
+        <span className="pr-2"> Create Variable </span>
+        <ForwardedIconComponent
+          name="Globe"
+          className="h-6 w-6 pl-1 text-primary "
+          aria-hidden="true"
+        />
       </BaseModal.Header>
-      <BaseModal.Trigger>
-        {children}
-      </BaseModal.Trigger>
+      <BaseModal.Trigger>{children}</BaseModal.Trigger>
       <BaseModal.Content>
-        <div className="flex gap-4 h-full w-full flex-col align-middle">
-            <Label>Variable name </Label>
-            <Input
-              value={key}
-              onChange={(e) => {
-                setKey(e.target.value);
-              }}
-              placeholder="Insert a name for the variable..."
-            ></Input>
-            <Label>Provider (optional) </Label>
-            <InputComponent
-              value={provider}
-              onChange={(e) => {
-                setProvider(e);
-              }}
-              password={false}
-              options={["OPENAI_API_KEY", "ANTHROPIC_API_KEY"]}
-              placeholder="Choose a provider between the environment variables..."
-            ></InputComponent>
-            <Label>Variable Value </Label>
-            <Textarea
-              value={value}
-              onChange={(e) => {
-                setValue(e.target.value);
-              }}
-              placeholder="Insert a value for the variable..."
-              className="w-full resize-none custom-scroll"
-            />
+        <div className="flex h-full w-full flex-col gap-4 align-middle">
+          <Label>Variable name </Label>
+          <Input
+            value={key}
+            onChange={(e) => {
+              setKey(e.target.value);
+            }}
+            placeholder="Insert a name for the variable..."
+          ></Input>
+          <Label>Provider (optional) </Label>
+          <InputComponent
+            setSelectedOption={(e) => {
+              setProvider(e);
+            }}
+            selectedOption={provider}
+            password={false}
+            options={["OPENAI_API_KEY", "ANTHROPIC_API_KEY"]}
+            placeholder="Choose a provider between the environment variables..."
+          ></InputComponent>
+          <Label>Variable Value </Label>
+          <Textarea
+            value={value}
+            onChange={(e) => {
+              setValue(e.target.value);
+            }}
+            placeholder="Insert a value for the variable..."
+            className="w-full resize-none custom-scroll"
+          />
         </div>
       </BaseModal.Content>
       <BaseModal.Footer>
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index bf561f471..e3bce8704 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -7,9 +7,9 @@ import { sourceHandleType, targetHandleType } from "./../flow/index";
 export type InputComponentType = {
   autoFocus?: boolean;
   onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
-  value: string;
+  value?: string;
   disabled?: boolean;
-  onChange: (value: string) => void;
+  onChange?: (value: string) => void;
   password: boolean;
   required?: boolean;
   isForm?: boolean;