diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 514e74c0..fea0da0f 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -15,7 +15,6 @@ declare module 'vue' {
     AddExistingUserModal: typeof import('./src/components/Modals/AddExistingUserModal.vue')['default']
     AddressIcon: typeof import('./src/components/Icons/AddressIcon.vue')['default']
     AddressModal: typeof import('./src/components/Modals/AddressModal.vue')['default']
-    Agents: typeof import('./src/components/Settings/Agents.vue')['default']
     AllModals: typeof import('./src/components/Activities/AllModals.vue')['default']
     AppHeader: typeof import('./src/components/Layouts/AppHeader.vue')['default']
     Apps: typeof import('./src/components/Apps.vue')['default']
@@ -138,7 +137,6 @@ declare module 'vue' {
     InboundCallIcon: typeof import('./src/components/Icons/InboundCallIcon.vue')['default']
     InboxIcon: typeof import('./src/components/Icons/InboxIcon.vue')['default']
     IndicatorIcon: typeof import('./src/components/Icons/IndicatorIcon.vue')['default']
-    InviteAgentPage: typeof import('./src/components/Settings/InviteAgentPage.vue')['default']
     InviteIcon: typeof import('./src/components/Icons/InviteIcon.vue')['default']
     InviteUserPage: typeof import('./src/components/Settings/InviteUserPage.vue')['default']
     KanbanIcon: typeof import('./src/components/Icons/KanbanIcon.vue')['default']
@@ -155,7 +153,6 @@ declare module 'vue' {
     ListIcon: typeof import('./src/components/Icons/ListIcon.vue')['default']
     ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default']
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
-    LucideCalendar: typeof import('~icons/lucide/calendar')['default']
     LucideInfo: typeof import('~icons/lucide/info')['default']
     LucidePlus: typeof import('~icons/lucide/plus')['default']
     LucideSearch: typeof import('~icons/lucide/search')['default']
@@ -190,7 +187,6 @@ declare module 'vue' {
     PlaybackSpeedOption: typeof import('./src/components/Activities/PlaybackSpeedOption.vue')['default']
     PlayIcon: typeof import('./src/components/Icons/PlayIcon.vue')['default']
     Popover: typeof import('./src/components/frappe-ui/Popover.vue')['default']
-    ProfileImageEditor: typeof import('./src/components/Settings/ProfileImageEditor.vue')['default']
     ProfileSettings: typeof import('./src/components/Settings/ProfileSettings.vue')['default']
     QuickEntryModal: typeof import('./src/components/Modals/QuickEntryModal.vue')['default']
     QuickFilterField: typeof import('./src/components/QuickFilterField.vue')['default']
diff --git a/frontend/src/components/Settings/ProfileImageEditor.vue b/frontend/src/components/Settings/ProfileImageEditor.vue
deleted file mode 100644
index 8703561b..00000000
--- a/frontend/src/components/Settings/ProfileImageEditor.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <FileUploader
-    @success="(file) => setUserImage(file.file_url)"
-    :validateFile="validateFile"
-  >
-    <template v-slot="{ file, progress, error, uploading, openFileSelector }">
-      <div class="flex flex-col items-center">
-        <button
-          class="group relative rounded-full border-2"
-          @click="openFileSelector"
-        >
-          <div
-            class="absolute inset-0 grid place-items-center rounded-full bg-gray-400/20 text-base text-ink-gray-5 transition-opacity"
-            :class="[
-              uploading ? 'opacity-100' : 'opacity-0 group-hover:opacity-100',
-              'drop-shadow-sm',
-            ]"
-          >
-            <span
-              class="inline-block rounded-md bg-surface-gray-7/60 px-2 py-1 text-ink-white"
-            >
-              {{
-                uploading
-                  ? `Uploading ${progress}%`
-                  : profile.user_image
-                  ? 'Change Image'
-                  : 'Upload Image'
-              }}
-            </span>
-          </div>
-          <img
-            v-if="profile.user_image"
-            class="h-64 w-64 rounded-full object-cover"
-            :src="profile.user_image"
-            alt="Profile Photo"
-          />
-          <div v-else class="h-64 w-64 rounded-full bg-surface-gray-2"></div>
-        </button>
-        <ErrorMessage class="mt-4" :message="error" />
-        <div class="mt-4 flex items-center gap-4">
-          <Button v-if="profile.user_image" @click="setUserImage(null)">
-            Remove
-          </Button>
-        </div>
-      </div>
-    </template>
-  </FileUploader>
-</template>
-<script setup>
-import { FileUploader } from 'frappe-ui'
-
-const profile = defineModel()
-
-function setUserImage(url) {
-  profile.value.user_image = url
-}
-
-function validateFile(file) {
-  let extn = file.name.split('.').pop().toLowerCase()
-  if (!['png', 'jpg'].includes(extn)) {
-    return 'Only PNG and JPG images are allowed'
-  }
-}
-</script>
diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index 919b3f6c..e22d532b 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -2,19 +2,65 @@
   <div class="flex h-full flex-col gap-8 p-8 text-ink-gray-9">
     <div class="flex-1 flex flex-col gap-8 mt-2 overflow-y-auto">
       <div v-if="profile" class="flex w-full items-center justify-between">
-        <div class="flex items-center gap-4">
-          <Avatar
-            class="!size-16"
-            :image="profile.user_image"
-            :label="profile.full_name"
-          />
-          <div class="flex flex-col gap-1">
-            <span class="text-2xl font-semibold text-ink-gray-9">{{
-              profile.full_name
-            }}</span>
-            <span class="text-base text-ink-gray-7">{{ profile.email }}</span>
-          </div>
-        </div>
+        <FileUploader
+          @success="(file) => updateImage(file.file_url)"
+          :validateFile="validateFile"
+        >
+          <template #default="{ openFileSelector, error: _error }">
+            <div class="flex items-center gap-4">
+              <div class="group relative !size-[66px]">
+                <Avatar
+                  class="!size-16"
+                  :image="profile.user_image"
+                  :label="profile.full_name"
+                />
+                <component
+                  :is="profile.user_image ? Dropdown : 'div'"
+                  v-bind="
+                    profile.user_image
+                      ? {
+                          options: [
+                            {
+                              icon: 'upload',
+                              label: profile.user_image
+                                ? __('Change image')
+                                : __('Upload image'),
+                              onClick: openFileSelector,
+                            },
+                            {
+                              icon: 'trash-2',
+                              label: __('Remove image'),
+                              onClick: () => updateImage(),
+                            },
+                          ],
+                        }
+                      : { onClick: openFileSelector }
+                  "
+                  class="!absolute bottom-0 left-0 right-0"
+                >
+                  <div
+                    class="z-1 absolute bottom-0.5 left-0 right-0.5 flex h-9 cursor-pointer items-center justify-center rounded-b-full bg-black bg-opacity-40 pt-3 opacity-0 duration-300 ease-in-out group-hover:opacity-100"
+                    style="
+                      -webkit-clip-path: inset(12px 0 0 0);
+                      clip-path: inset(12px 0 0 0);
+                    "
+                  >
+                    <CameraIcon class="size-4 cursor-pointer text-white" />
+                  </div>
+                </component>
+              </div>
+              <div class="flex flex-col gap-1">
+                <span class="text-2xl font-semibold text-ink-gray-9">
+                  {{ profile.full_name }}
+                </span>
+                <span class="text-base text-ink-gray-7">
+                  {{ profile.email }}
+                </span>
+                <ErrorMessage :message="__(_error)" />
+              </div>
+            </div>
+          </template>
+        </FileUploader>
         <Button
           :label="__('Change Password')"
           icon-left="lock"
@@ -24,113 +70,101 @@
           v-if="showChangePasswordModal"
           v-model="showChangePasswordModal"
         />
-        <Dialog
-          :options="{ title: __('Edit profile photo') }"
-          v-model="showEditProfilePhotoModal"
-        >
-          <template #body-content>
-            <ProfileImageEditor v-model="profile" />
-          </template>
-          <template #actions>
-            <Button
-              variant="solid"
-              class="w-full"
-              :loading="loading"
-              @click="updateUser"
-              :label="__('Save')"
-            />
-          </template>
-        </Dialog>
       </div>
       <div class="flex flex-col gap-4">
         <div class="flex justify-between gap-4">
           <FormControl
             class="w-full"
-            label="First name"
+            :label="__('First name')"
             v-model="profile.first_name"
           />
           <FormControl
             class="w-full"
-            label="Last name"
+            :label="__('Last name')"
             v-model="profile.last_name"
           />
         </div>
       </div>
     </div>
-    <div class="flex justify-between flex-row-reverse">
+    <div class="flex justify-between items-center">
+      <div>
+        <ErrorMessage :message="error" />
+      </div>
       <Button
         variant="solid"
         :label="__('Update')"
-        :loading="loading"
-        @click="updateUser"
+        :disabled="!dirty"
+        :loading="setUser.loading"
+        @click="setUser.submit()"
       />
-      <ErrorMessage :message="error" />
     </div>
   </div>
 </template>
 <script setup>
+import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
-import ProfileImageEditor from '@/components/Settings/ProfileImageEditor.vue'
 import { usersStore } from '@/stores/users'
-import { Dialog, Avatar, createResource, ErrorMessage, toast } from 'frappe-ui'
-import { useOnboarding } from 'frappe-ui/frappe'
+import {
+  Dropdown,
+  FileUploader,
+  Avatar,
+  createResource,
+  toast,
+} from 'frappe-ui'
 import { ref, computed, onMounted } from 'vue'
 
 const { getUser, users } = usersStore()
-const { updateOnboardingStep } = useOnboarding('frappecrm')
 
 const user = computed(() => getUser() || {})
 
-const showEditProfilePhotoModal = ref(false)
 const showChangePasswordModal = ref(false)
 
 const profile = ref({})
-const loading = ref(false)
 const error = ref('')
 
-function updateUser() {
-  loading.value = true
+const dirty = computed(() => {
+  return (
+    profile.value.first_name !== user.value.first_name ||
+    profile.value.last_name !== user.value.last_name
+  )
+})
 
-  let passwordUpdated = false
-
-  if (profile.value.new_password) {
-    passwordUpdated = true
-  }
-
-  const fieldname = {
-    first_name: profile.value.first_name,
-    last_name: profile.value.last_name,
-    user_image: profile.value.user_image,
-    email: profile.value.email,
-    new_password: profile.value.new_password,
-  }
-  createResource({
-    url: 'frappe.client.set_value',
-    params: {
+const setUser = createResource({
+  url: 'frappe.client.set_value',
+  makeParams() {
+    return {
       doctype: 'User',
       name: user.value.name,
-      fieldname,
-    },
-    auto: true,
-    onSuccess: () => {
-      if (passwordUpdated) {
-        updateOnboardingStep('setup_your_password')
-      }
-      loading.value = false
-      error.value = ''
-      profile.value.new_password = ''
-      showEditProfilePhotoModal.value = false
-      toast.success(__('Profile updated successfully'))
-      users.reload()
-    },
-    onError: (err) => {
-      loading.value = false
-      error.value = err.message
-    },
-  })
+      fieldname: {
+        first_name: profile.value.first_name,
+        last_name: profile.value.last_name,
+        user_image: profile.value.user_image,
+      },
+    }
+  },
+  onSuccess: () => {
+    error.value = ''
+    toast.success(__('Profile updated successfully'))
+    users.reload()
+  },
+  onError: (err) => {
+    error.value = err.messages[0] || __('Failed to update profile')
+  },
+})
+
+function updateImage(fileUrl = '') {
+  profile.value.user_image = fileUrl
+  setUser.submit()
 }
 
 onMounted(() => {
   profile.value = { ...user.value }
 })
+
+function validateFile(file) {
+  let extn = file.name.split('.').pop().toLowerCase()
+  if (!['png', 'jpg', 'jpeg'].includes(extn)) {
+    return __('Only PNG and JPG images are allowed')
+  }
+}
 </script>