diff --git a/nepalingo-web/package.json b/nepalingo-web/package.json
index 3638f47..be10438 100644
--- a/nepalingo-web/package.json
+++ b/nepalingo-web/package.json
@@ -23,6 +23,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-ga4": "^2.1.0",
+    "react-icons": "^5.2.1",
     "react-router-dom": "^6.24.1",
     "react-supabase": "^0.2.0",
     "swr": "^2.2.5"
diff --git a/nepalingo-web/pnpm-lock.yaml b/nepalingo-web/pnpm-lock.yaml
index 2e3eeaa..760d250 100644
--- a/nepalingo-web/pnpm-lock.yaml
+++ b/nepalingo-web/pnpm-lock.yaml
@@ -41,6 +41,9 @@ importers:
       react-ga4:
         specifier: ^2.1.0
         version: 2.1.0
+      react-icons:
+        specifier: ^5.2.1
+        version: 5.2.1(react@18.3.1)
       react-router-dom:
         specifier: ^6.24.1
         version: 6.24.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -1842,6 +1845,11 @@ packages:
   react-ga4@2.1.0:
     resolution: {integrity: sha512-ZKS7PGNFqqMd3PJ6+C2Jtz/o1iU9ggiy8Y8nUeksgVuvNISbmrQtJiZNvC/TjDsqD0QlU5Wkgs7i+w9+OjHhhQ==}
 
+  react-icons@5.2.1:
+    resolution: {integrity: sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw==}
+    peerDependencies:
+      react: '*'
+
   react-is@16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
@@ -4166,6 +4174,10 @@ snapshots:
 
   react-ga4@2.1.0: {}
 
+  react-icons@5.2.1(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+
   react-is@16.13.1: {}
 
   react-refresh@0.14.2: {}
diff --git a/nepalingo-web/src/App.tsx b/nepalingo-web/src/App.tsx
index c4dcd31..6f1f737 100644
--- a/nepalingo-web/src/App.tsx
+++ b/nepalingo-web/src/App.tsx
@@ -12,6 +12,7 @@ import { PrivateRoutes } from "@/components/PrivateRoutes";
 import FeedbackForm from "@/components/FeedbackForm";
 import TestYourself from "@/pages/TestYourself";
 import SignUp from "./pages/SignUp";
+import ProfilePage from "@/pages/ProfilePage";
 
 const App: React.FC = () => {
   const TrackingID = import.meta.env.VITE_GOOGLE_ANALYTICS_TRACKING_ID;
@@ -38,6 +39,7 @@ const App: React.FC = () => {
             <Route path="/flashcard" element={<FlashcardPage />} />
             <Route path="/dictionary" element={<DictionaryPage />} />
             <Route path="/test-yourself" element={<TestYourself />} />
+            <Route path="/profile-edit" element={<ProfilePage />} />
           </Route>
         </Routes>
       </Router>
diff --git a/nepalingo-web/src/components/ProfileEditForm.tsx b/nepalingo-web/src/components/ProfileEditForm.tsx
new file mode 100644
index 0000000..4684040
--- /dev/null
+++ b/nepalingo-web/src/components/ProfileEditForm.tsx
@@ -0,0 +1,153 @@
+import React, { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+import { supabaseClient } from "@/config/supabase-client";
+import { useAuth} from "@/hooks/Auth";
+import CustomTextInput from "./CustomTextInput";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faUser, faPen, faCamera } from "@fortawesome/free-solid-svg-icons";
+
+const ProfileEditForm: React.FC = () => {
+  const navigate = useNavigate();
+  const { user, refetchUser } = useAuth();
+  const [avatarUrl, setAvatarUrl] = useState(
+    user?.user_metadata.avatar_url || ""
+  );
+  const [username, setUsername] = useState(user?.user_metadata.username || "");
+  const [status, setStatus] = useState(user?.user_metadata.status || "");
+  const [isDragging, setIsDragging] = useState(false);
+
+  const handleAvatarChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (e.target.files && e.target.files[0]) {
+      const file = e.target.files[0];
+      const filePath = `public/${file.name}`;
+
+      // Upload file to Supabase Storage
+      const { data, error: uploadError } = await supabaseClient.storage
+        .from('Avatars') 
+        .upload(filePath, file);
+
+      if (uploadError) {
+        console.error('Error uploading file:', uploadError.message);
+        return;
+      }
+
+      // Construct the URL of the uploaded file
+      const uploadedAvatarUrl = `https://your-supabase-instance.supabase.co/storage/v1/object/public/avatars/${file.name}`;
+      setAvatarUrl(uploadedAvatarUrl);
+    }
+  };
+
+  const handleDrop = async (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    setIsDragging(false);
+    if (e.dataTransfer.files && e.dataTransfer.files[0]) {
+      const file = e.dataTransfer.files[0];
+      const filePath = `public/${file.name}`;
+
+      // Upload file to Supabase Storage
+      const { data, error: uploadError } = await supabaseClient.storage
+        .from('Avatars') 
+        .upload(filePath, file);
+
+      if (uploadError) {
+        console.error('Error uploading file:', uploadError.message);
+        return;
+      }
+
+      // Construct the URL of the uploaded file
+      const uploadedAvatarUrl = `https://your-supabase-instance.supabase.co/storage/v1/object/public/avatars/${file.name}`;
+      setAvatarUrl(uploadedAvatarUrl);
+    }
+  };
+
+  const handleDragOver = (e: React.DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    setIsDragging(true);
+  };
+
+  const handleDragLeave = () => setIsDragging(false);
+
+  const handleSaveChanges = async () => {
+    if (!user) return;
+
+    // Update user metadata in Supabase
+    const { error } = await supabaseClient.auth.updateUser({
+      data: {
+        username, // Update username directly in Supabase
+        avatar_url: avatarUrl,
+        status,
+      },
+    });
+
+  
+    // Refetch user data to update UI
+    await refetchUser();
+
+    // Navigate to the home page
+    navigate("/");
+  };
+
+  return (
+    <div className="flex flex-col items-center justify-center min-h-screen bg-black text-white">
+      <div
+        className={`relative w-40 h-40 rounded-full overflow-hidden group cursor-pointer ${isDragging ? "border-4 border-dashed border-white" : "border-2 border-gray-600"}`}
+        onDragOver={handleDragOver}
+        onDrop={handleDrop}
+        onDragLeave={handleDragLeave}
+      >
+        <img
+          src={avatarUrl || "/default-avatar.png"}
+          alt="User Avatar"
+          className="w-full h-full object-cover"
+        />
+        <div className="absolute inset-0 flex items-center justify-center bg-black bg-opacity-50 rounded-full opacity-0 group-hover:opacity-100 transition-opacity duration-200">
+          <FontAwesomeIcon icon={faCamera} className="text-white text-xl" />
+        </div>
+        <input
+          type="file"
+          accept="image/*"
+          onChange={handleAvatarChange}
+          className="absolute inset-0 opacity-0 cursor-pointer"
+        />
+      </div>
+
+      <div className="mt-8 w-3/4 max-w-xl">
+        <CustomTextInput
+          label="Username"
+          name="username"
+          required
+          autoComplete="name"
+          placeholder="eg: bird24"
+          iconProps={{
+            icon: faUser,
+            className: "text-white",
+          }}
+          value={username}
+          onChange={(e) => setUsername(e.target.value)}
+        />
+
+        <CustomTextInput
+          label="Status"
+          name="status"
+          required
+          autoComplete="status"
+          placeholder="Enter your status"
+          iconProps={{
+            icon: faPen,
+            className: "text-white",
+          }}
+          value={status}
+          onChange={(e) => setStatus(e.target.value)}
+        />
+
+        <button
+          onClick={handleSaveChanges}
+          className="w-full mt-6 bg-primary text-white p-3 rounded-lg hover:bg-secondary transition duration-200"
+        >
+          Save Changes
+        </button>
+      </div>
+    </div>
+  );
+};
+export default ProfileEditForm;
diff --git a/nepalingo-web/src/components/UserAvatar.tsx b/nepalingo-web/src/components/UserAvatar.tsx
index e7dda8d..8434ce2 100644
--- a/nepalingo-web/src/components/UserAvatar.tsx
+++ b/nepalingo-web/src/components/UserAvatar.tsx
@@ -1,17 +1,38 @@
-import React from "react";
+import React, { HTMLAttributes } from "react";
 import { useAuth } from "@/hooks/Auth";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faPen } from "@fortawesome/free-solid-svg-icons";
 
-const UserAvatar: React.FC = () => {
+interface UserAvatarProps extends HTMLAttributes<HTMLDivElement> {
+  showPenOnHover?: boolean;
+}
+
+const UserAvatar: React.FC<UserAvatarProps> = ({
+  onClick,
+  showPenOnHover = false,
+  ...props
+}) => {
   const { user } = useAuth();
   const username = user?.user_metadata?.username;
   const avatarUrl = `https://robohash.org/${username}.png?set=set4`;
 
   return (
-    <img
-      src={avatarUrl}
-      alt="User Avatar"
-      className="w-full h-full rounded-full"
-    />
+    <div
+      className={`relative w-full h-full ${showPenOnHover ? "group cursor-pointer" : ""}`}
+      onClick={onClick}
+      {...props}
+    >
+      <img
+        src={avatarUrl}
+        alt="User Avatar"
+        className="w-full h-full rounded-full"
+      />
+      {showPenOnHover && (
+        <div className="absolute inset-0 flex items-center justify-center bg-black bg-opacity-50 rounded-full opacity-0 group-hover:opacity-100 transition-opacity duration-200">
+          <FontAwesomeIcon icon={faPen} className="text-white" />
+        </div>
+      )}
+    </div>
   );
 };
 
diff --git a/nepalingo-web/src/components/header/UserProfile.tsx b/nepalingo-web/src/components/header/UserProfile.tsx
index 546806a..97206e1 100644
--- a/nepalingo-web/src/components/header/UserProfile.tsx
+++ b/nepalingo-web/src/components/header/UserProfile.tsx
@@ -4,13 +4,17 @@ import { StreakContext } from "@/hooks/StreakContext";
 import { getPhrase } from "@/components/header/StreakPhrase";
 import { useAuth } from "@/hooks/Auth";
 import fire from "@/assets/fire.svg";
+import { useNavigate } from "react-router-dom";
+import { supabaseClient } from "@/config/supabase-client"; // Import Supabase client
 
 const UserProfile: React.FC = () => {
   const [isOpen, setIsOpen] = useState(false);
+  const [status, setStatus] = useState<string | null>(null);
   const { user, signOut } = useAuth();
   const { currentStreak, longestStreak } = useContext(StreakContext);
   const phrase = getPhrase(currentStreak);
   const dropdownRef = useRef<HTMLDivElement>(null);
+  const navigate = useNavigate();
 
   const toggleMenu = () => {
     setIsOpen(!isOpen);
@@ -25,6 +29,10 @@ const UserProfile: React.FC = () => {
     }
   };
 
+  const handleAvatarClick = () => {
+    navigate("/profile-edit");
+  };
+
   useEffect(() => {
     document.addEventListener("mousedown", handleClickOutside);
     return () => {
@@ -32,6 +40,27 @@ const UserProfile: React.FC = () => {
     };
   }, []);
 
+  // Fetch the status from the UpdateUser table
+  useEffect(() => {
+    const fetchStatus = async () => {
+      if (user) {
+        const { data, error } = await supabaseClient
+          .from("updateUser")
+          .select("status")
+          .eq("username", user.user_metadata.username)
+          .single();
+
+        if (error) {
+          console.error("Error fetching status:", error.message);
+        } else {
+          setStatus(data?.status || ""); // Set status or empty string
+        }
+      }
+    };
+
+    fetchStatus();
+  }, [user]);
+
   return (
     <div className="relative inline-block text-left" ref={dropdownRef}>
       <button
@@ -46,8 +75,12 @@ const UserProfile: React.FC = () => {
       {isOpen && (
         <div className="absolute right-0 z-10 mt-2 w-64 rounded-lg shadow-lg bg-[#2B2B2B] p-4">
           <div className="flex flex-col items-center">
-            <div className="w-16 h-16">
-              <UserAvatar />
+            <p className="text-sm text-gray-400">
+              My moto: <span className="text-sm text-white">{status}</span>
+            </p>
+
+            <div className="w-16 h-16 mt-1">
+              <UserAvatar onClick={handleAvatarClick} showPenOnHover />
             </div>
             <span className="mt-1 text-white font-primary font-black">
               {user?.user_metadata?.username}
diff --git a/nepalingo-web/src/hooks/Auth.tsx b/nepalingo-web/src/hooks/Auth.tsx
index 88d309d..42d4e0e 100644
--- a/nepalingo-web/src/hooks/Auth.tsx
+++ b/nepalingo-web/src/hooks/Auth.tsx
@@ -17,6 +17,7 @@ type AuthContextProps = {
     data: SignUpWithPasswordCredentials,
   ) => Promise<AuthTokenResponsePassword>;
   resetPasswordEmail: (email: string) => Promise<{ error: Error | null }>;
+  refetchUser: () => Promise<void>; // Added refetchUser
 };
 
 const AuthContext = createContext<AuthContextProps>({
@@ -29,6 +30,7 @@ const AuthContext = createContext<AuthContextProps>({
     supabaseClient.auth.resetPasswordForEmail(email, {
       redirectTo: "https://www.nepalingo.com/reset-password",
     }),
+  refetchUser: async () => {}, // Added refetchUser
 });
 
 export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
@@ -63,6 +65,19 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
     };
   }, []);
 
+  const refetchUser = async () => {
+    const {
+      data: { session },
+      error,
+    } = await supabaseClient.auth.getSession();
+    if (error) {
+      console.error("Error fetching user:", error.message);
+      return;
+    }
+    setSession(session);
+    setUser(session?.user || null);
+  };
+
   const value: AuthContextProps = {
     session,
     user,
@@ -73,6 +88,7 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
       supabaseClient.auth.resetPasswordForEmail(email, {
         redirectTo: "https://www.nepalingo.com/reset-password",
       }),
+    refetchUser, // Include refetchUser in the context
   };
 
   return (
diff --git a/nepalingo-web/src/hooks/StreakContext.tsx b/nepalingo-web/src/hooks/StreakContext.tsx
index 8498ad8..9a702d6 100644
--- a/nepalingo-web/src/hooks/StreakContext.tsx
+++ b/nepalingo-web/src/hooks/StreakContext.tsx
@@ -5,7 +5,7 @@ import React, {
   useEffect,
   ReactNode,
 } from "react";
-import { supabaseClient } from "@/config/supabase-client";
+  import { supabaseClient } from "@/config/supabase-client";
 import { useAuth } from "@/hooks/Auth";
 
 interface StreakContextProps {
diff --git a/nepalingo-web/src/pages/ProfilePage.tsx b/nepalingo-web/src/pages/ProfilePage.tsx
new file mode 100644
index 0000000..dd60c7c
--- /dev/null
+++ b/nepalingo-web/src/pages/ProfilePage.tsx
@@ -0,0 +1,16 @@
+// src/pages/ProfileEditPage.tsx
+import React from "react";
+import ProfileEditForm from "@/components/ProfileEditForm";
+
+const ProfileEditPage: React.FC = () => {
+  return (
+    <div className="min-h-screen bg-black-100 flex items-center justify-center p-4">
+      <div className="w-full max-w-lg bg-white shadow-lg rounded-lg p-6">
+        <h1 className="text-3xl font-bold mb-6">Edit Profile</h1>
+        <ProfileEditForm />
+      </div>
+    </div>
+  );
+};
+
+export default ProfileEditPage;