diff --git a/luna/src/components/Input/Input.stories.tsx b/luna/src/components/Input/Input.stories.tsx
index 4d6b519c..e78b80c4 100644
--- a/luna/src/components/Input/Input.stories.tsx
+++ b/luna/src/components/Input/Input.stories.tsx
@@ -29,6 +29,16 @@ export const Idle: StoryObj<typeof Wrapper> = {
   },
 };
 
+export const IdelWithValue: StoryObj<typeof Wrapper> = {
+  args: {
+    id: "name",
+    label: ar["global.form.email.label"],
+    placeholder: ar["global.form.email.placeholder"],
+    value: "لايت اسبيس",
+    onChange: () => {},
+  },
+};
+
 export const Error: StoryObj<typeof Wrapper> = {
   args: {
     id: "name",
@@ -38,4 +48,15 @@ export const Error: StoryObj<typeof Wrapper> = {
   },
 };
 
+export const ErrorWithValue: StoryObj<typeof Wrapper> = {
+  args: {
+    id: "name",
+    label: ar["global.form.email.label"],
+    placeholder: ar["global.form.email.placeholder"],
+    error: ar["errors.email.invlaid"],
+    value: "لايت اسبيس",
+    onChange: () => {},
+  },
+};
+
 export default meta;
diff --git a/luna/src/components/Input/Input.tsx b/luna/src/components/Input/Input.tsx
index 51635241..4fa759d4 100644
--- a/luna/src/components/Input/Input.tsx
+++ b/luna/src/components/Input/Input.tsx
@@ -1,7 +1,8 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { ChangeHandler } from "react-hook-form";
 import { motion, AnimatePresence } from "framer-motion";
 import cn from "classnames";
+import ErrorOutlined from "@/icons/ErrorOutlined";
 
 export const Input: React.FC<{
   id: string;
@@ -13,6 +14,7 @@ export const Input: React.FC<{
   onBlur?: ChangeHandler;
   name?: string;
   error?: string | null;
+  value?: string;
 }> = ({
   label,
   type,
@@ -23,6 +25,7 @@ export const Input: React.FC<{
   onBlur,
   name,
   error,
+  value,
 }) => {
   return (
     <div className="ui-flex ui-flex-col ui-w-full">
@@ -34,24 +37,28 @@ export const Input: React.FC<{
       >
         {label}
       </label>
-      <input
-        id={id}
-        type={type}
-        name={name}
-        autoComplete={autoComplete}
-        onChange={onChange}
-        onBlur={onBlur}
-        className={cn(
-          "ui-bg-inputbg ui-py-[10px] ui-px-lg ui-rounded-2xl  ui-h-[72px] ui-font-cairo placeholder:ui-text-arxl placeholder:ui-font-medium ui-leading-normal",
-          "ui-text-arxl ui-font-bold ui-leading-normal ui-border focus:ui-outline-none focus:ui-border-blue-normal",
-          {
-            "ui-bg-red-light ui-border-red-border focus:ui-border-red-border":
-              !!error,
-            "ui-border-transparent": !error,
-          }
-        )}
-        placeholder={placeholder}
-      />
+      <div className="ui-w-full ui-relative">
+        <input
+          id={id}
+          type={type}
+          name={name}
+          value={value}
+          autoComplete={autoComplete}
+          onChange={onChange}
+          onBlur={onBlur}
+          className={cn(
+            "ui-w-full ui-bg-inputbg ui-py-[10px] ui-px-lg ui-rounded-2xl  ui-h-[72px] ui-font-cairo placeholder:ui-text-arxl placeholder:ui-font-medium ui-leading-normal",
+            "ui-text-arxl ui-font-bold ui-leading-normal ui-border focus:ui-outline-none focus:ui-border-blue-normal",
+            {
+              "ui-bg-red-light ui-border-red-border focus:ui-border-red-border":
+                !!error,
+              "ui-border-transparent": !error,
+            }
+          )}
+          placeholder={placeholder}
+        />
+        <ErrorIcon error={!!error} />
+      </div>
       <AnimatePresence mode="wait" initial={false}>
         {error ? <InputError message={error} key={label} /> : null}
       </AnimatePresence>
@@ -59,17 +66,36 @@ export const Input: React.FC<{
   );
 };
 
+function framerError(y: string | number) {
+  return {
+    initial: { opacity: 0, y: 10 },
+    animate: { opacity: 1, y },
+    exit: { opacity: 0, y: 10 },
+    transition: { duration: 0.2 },
+  };
+}
+
 const InputError: React.FC<{ message: string }> = ({ message }) => {
+  const framer = useMemo(() => framerError(0), []);
   return (
-    <motion.p className="ui-text-arsm ui-text-red-400" {...framerError}>
+    <motion.p className="ui-text-arsm ui-text-red-400" {...framer}>
       {message}
     </motion.p>
   );
 };
 
-const framerError = {
-  initial: { opacity: 0, y: 10 },
-  animate: { opacity: 1, y: 0 },
-  exit: { opacity: 0, y: 10 },
-  transition: { duration: 0.2 },
-} as const;
+const ErrorIcon: React.FC<{ error: boolean }> = ({ error }) => {
+  const framer = useMemo(() => framerError("-50%"), []);
+  return (
+    <AnimatePresence mode="wait" initial={false}>
+      {error ? (
+        <motion.div
+          className="ui-absolute ui-top-1/2 ui-left-lg ui-transform -ui-translate-y-1/2"
+          {...framer}
+        >
+          <ErrorOutlined />
+        </motion.div>
+      ) : null}
+    </AnimatePresence>
+  );
+};
diff --git a/luna/src/icons/ErrorOutlined.tsx b/luna/src/icons/ErrorOutlined.tsx
new file mode 100644
index 00000000..b3142218
--- /dev/null
+++ b/luna/src/icons/ErrorOutlined.tsx
@@ -0,0 +1,17 @@
+import { SVGProps } from "react";
+
+const ErrorOutlined = (props: SVGProps<SVGSVGElement>) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width={24}
+    height={24}
+    fill="none"
+    {...props}
+  >
+    <path
+      fill="#EE3024"
+      d="M11 15h2v2h-2v-2Zm0-8h2v6h-2V7Zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2ZM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8Z"
+    />
+  </svg>
+);
+export default ErrorOutlined;