diff --git a/drive/api/files.py b/drive/api/files.py
index dfe2a581..00ef8290 100644
--- a/drive/api/files.py
+++ b/drive/api/files.py
@@ -940,4 +940,4 @@ def get_translate():
         l["old_name"]: l["name"]
         for l in frappe.get_list("Drive File", fields=["old_name", "name"])
         if l["old_name"]
-    }
+    }
\ No newline at end of file
diff --git a/frontend/src/assets/images/icons/default-avatar.png b/frontend/src/assets/images/icons/default-avatar.png
new file mode 100644
index 00000000..9e22b89e
Binary files /dev/null and b/frontend/src/assets/images/icons/default-avatar.png differ
diff --git a/frontend/src/components/ActivityTree.vue b/frontend/src/components/ActivityTree.vue
index 75ce22ca..0a066ccd 100644
--- a/frontend/src/components/ActivityTree.vue
+++ b/frontend/src/components/ActivityTree.vue
@@ -12,11 +12,15 @@
         :key="activity"
         class="flex items-start justify-start py-3 gap-x-2"
       >
-        <Avatar
-          size="md"
-          :image="activity.user_image"
-          :label="activity.full_name"
-        />
+      <Avatar
+        shape="circle"
+        :image="userData.value[row.owner]?.user_image || require('@/assets/images/icons/default-avatar.png')"
+        label="userData.value[row.owner]?.full_name || row.owner"
+        size="sm"
+      />
+
+
+    
         <div class="flex flex-col items-start justify-center">
           <span class="text-sm text-gray-900">{{ activity.message }}</span>
           <span class="text-xs text-gray-600 mb-3">{{
diff --git a/frontend/src/components/ActivityTreeShare.vue b/frontend/src/components/ActivityTreeShare.vue
index 89357eee..d4897d61 100644
--- a/frontend/src/components/ActivityTreeShare.vue
+++ b/frontend/src/components/ActivityTreeShare.vue
@@ -10,7 +10,7 @@
   >
     <Avatar
       size="xs"
-      :image="activity.share_user_image"
+      :image="user?.user_image || require('@/assets/images/icons/default-avatar.png')"
       :label="
         activity.share_user_fullname
           ? activity.share_user_fullname
diff --git a/frontend/src/components/ListView.vue b/frontend/src/components/ListView.vue
index f1d57de6..08f6791f 100644
--- a/frontend/src/components/ListView.vue
+++ b/frontend/src/components/ListView.vue
@@ -66,6 +66,7 @@
     :event="rowEvent"
   />
 </template>
+
 <script setup>
 import {
   ListHeader,
@@ -135,12 +136,11 @@ const selectedColumns = [
         ? "You"
         : userData.value[row.owner]?.full_name || row.owner,
     prefix: ({ row }) => {
+      // Fallback to default avatar if no image is available
       return h(Avatar, {
         shape: "circle",
-        image: userData.value[row.owner]?.user_image,
-        label:
-          userData.value[row.owner]?.full_name ||
-          userData.value[row.owner]?.email,
+        image: userData.value[row.owner]?.user_image || 'path_to_default_avatar_image',
+        label: userData.value[row.owner]?.full_name || userData.value[row.owner]?.email,
         size: "sm",
       })
     },
diff --git a/frontend/src/components/RenameDialog.vue b/frontend/src/components/RenameDialog.vue
index f9324a13..ca3ede19 100644
--- a/frontend/src/components/RenameDialog.vue
+++ b/frontend/src/components/RenameDialog.vue
@@ -2,12 +2,15 @@
   <Dialog v-model="open" :options="{ title: 'Rename', size: 'xs' }">
     <template #body-content>
       <div class="flex items-center justify-center">
+        <!-- Input field for new name -->
         <Input
           v-model="newName"
           class="w-full"
           type="text"
           @keyup.enter="submit"
         />
+        
+        <!-- File extension display (if any) -->
         <span
           v-if="entity.file_ext"
           :variant="'subtle'"
@@ -18,8 +21,15 @@
           {{ entity.file_ext.toUpperCase().slice(1) }}
         </span>
       </div>
+
+      <!-- Inline error message (if any) -->
+      <p v-if="errorMsg" class="text-sm text-red-600 mt-2">{{ errorMsg }}</p>
+
+      <!-- Rename Button -->
       <div class="flex mt-8">
-        <Button variant="solid" class="w-full" @click="submit"> Rename </Button>
+        <Button variant="solid" class="w-full" @click="submit" :disabled="isSubmitting">
+          Rename
+        </Button>
       </div>
     </template>
   </Dialog>
@@ -27,7 +37,8 @@
 
 <script setup>
 import { ref, computed } from "vue"
-import { Dialog, Input } from "frappe-ui"
+import { useToast } from "frappe-ui"
+import { Dialog, Input, Button } from "frappe-ui"
 import { useRoute } from "vue-router"
 import { useStore } from "vuex"
 import { rename } from "@/resources/files"
@@ -35,11 +46,16 @@ import { rename } from "@/resources/files"
 const props = defineProps({ modelValue: String })
 const emit = defineEmits(["update:modelValue", "success"])
 const store = useStore()
+const toast = useToast()
 
+// Reactive states
 const entity = computed(() => store.state.activeEntity)
 const newName = ref("")
 const ext = ref("")
+const errorMsg = ref("") // For inline error message
+const isSubmitting = ref(false) // To disable button during submission
 
+// Initialize newName and ext based on entity data
 if (entity.value.is_group || entity.value.document) {
   newName.value = entity.value.title
   if (useRoute().meta.documentPage) {
@@ -55,6 +71,7 @@ if (entity.value.is_group || entity.value.document) {
   }
 }
 
+// Computed property to control Dialog open state
 const open = computed({
   get: () => {
     return props.modelValue === "rn"
@@ -65,14 +82,60 @@ const open = computed({
   },
 })
 
-const submit = () => {
-  emit("success", {
-    name: entity.value.name,
-    title: newName.value + (ext.value ? "." + ext.value : ""),
-  })
-  rename.submit({
-    entity_name: entity.value.name,
-    new_title: newName.value + (ext.value ? "." + ext.value : ""),
-  })
+// Submit function to rename the file
+const submit = async () => {
+  const new_title = newName.value + (ext.value ? "." + ext.value : "")
+
+  // Prevent double submission
+  if (isSubmitting.value) return
+
+  try {
+    isSubmitting.value = true // Disable the button during submission
+
+    // Call backend validation
+    await frappe.call("drive.files.validate_rename", {
+      entity_name: entity.value.name,
+      new_title,
+    })
+
+    // Emit success and rename the file
+    emit("success", {
+      name: entity.value.name,
+      title: new_title,
+    })
+
+    rename.submit({
+      entity_name: entity.value.name,
+      new_title,
+    })
+
+    // Reset error message on success
+    errorMsg.value = ""
+  } catch (err) {
+    // Show Toast notification for global feedback
+    toast.show({
+      title: "Rename Failed",
+      description: err.message || "A file with that name already exists.",
+      status: "error",
+    })
+
+    // Show inline error message
+    errorMsg.value = err.message || "Rename failed. Please try another name."
+  } finally {
+    isSubmitting.value = false // Re-enable button after submission
+  }
 }
 </script>
+
+<style scoped>
+/* Optional styling for error message */
+.text-sm {
+  font-size: 0.875rem;
+}
+.text-red-600 {
+  color: #e53e3e;
+}
+.mt-2 {
+  margin-top: 0.5rem;
+}
+</style>
diff --git a/frontend/src/components/UsersBar.vue b/frontend/src/components/UsersBar.vue
index 2e590ecb..4c52ec61 100644
--- a/frontend/src/components/UsersBar.vue
+++ b/frontend/src/components/UsersBar.vue
@@ -22,7 +22,7 @@
               borderRadius: '100%',
               borderColor: user.color,
             }"
-            :image="user.avatar"
+            :image="user?.user_image || require('@/assets/images/icons/default-avatar.png')"
             :label="user.name"
             :title="user.name"
           />