diff --git a/app/assets/javascripts/sitewide/user_avatar.js b/app/assets/javascripts/sitewide/user_avatar.js
index c6e7d3efa..08cc942c4 100644
--- a/app/assets/javascripts/sitewide/user_avatar.js
+++ b/app/assets/javascripts/sitewide/user_avatar.js
@@ -10,5 +10,5 @@ function userAvatar(url, initials, title) {
               </div>`;
   }
 
-  return `<div class="relative w-6 h-6" title="${title}">${avatar}</div>`;
+  return `<div class="relative w-6 h-6 shrink-0" title="${title}">${avatar}</div>`;
 }
diff --git a/app/assets/javascripts/users/settings/teams/invite_users_modal.js b/app/assets/javascripts/users/settings/teams/invite_users_modal.js
index afde6d223..d583e8f21 100644
--- a/app/assets/javascripts/users/settings/teams/invite_users_modal.js
+++ b/app/assets/javascripts/users/settings/teams/invite_users_modal.js
@@ -31,13 +31,13 @@
       delimiter: true,
       optionClass: 'users-dropdown-list',
       optionLabel: (data) => {
-        return `<img class="item-avatar" src="${data.params.avatar_url}"/>
+        return `<span class="mr-2">${userAvatar(data.params.avatar_url, data.params.initials)}</span>
                 ${data.label}
                 <span class="item-email pull-right">${data.params.email}</span>`;
       },
       tagLabel: (data) => {
         if (data.params) {
-          return `<img class="item-avatar" src="${data.params.avatar_url}"/> ${data.label}`;
+          return `<span class="mr-2">${userAvatar(data.params.avatar_url, data.params.initials)}</span> ${data.label}`;
         }
         return data.label;
       },
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 582c84eb8..b9ae48308 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -446,7 +446,9 @@ class RepositoriesController < ApplicationController
                               label: u.full_name,
                               value: u.id,
                               params: {
-                                email: u.email, avatar_url: u.avatar_url('icon_small')
+                                email: u.email,
+                                avatar_url: (u.avatar.attached? ? u.avatar_url('icon_small') : nil),
+                                initials: u.initials
                               }
                             }
                           end }
diff --git a/app/javascript/vue/repository_filter/filters/repositoryUserValue.vue b/app/javascript/vue/repository_filter/filters/repositoryUserValue.vue
index 306e328fb..19089cba7 100644
--- a/app/javascript/vue/repository_filter/filters/repositoryUserValue.vue
+++ b/app/javascript/vue/repository_filter/filters/repositoryUserValue.vue
@@ -67,8 +67,8 @@
         this.value = value
       },
       renderOption(data) {
-        return `<span class="user-filter-option" title="${data.label.trim()} | ${data.params.email}">
-                  <img class="item-avatar" src="${data.params.avatar_url}"/>
+        return `<span class="user-filter-option flex gap-2 items-center" title="${data.label.trim()} | ${data.params.email}">
+                  ${userAvatar(data.params.avatar_url, data.params.initials)}
                   ${data.label}
                 </span>`;
       }
diff --git a/app/javascript/vue/shared/user_avatar.vue b/app/javascript/vue/shared/user_avatar.vue
index 7c99f7ebf..7b327c553 100644
--- a/app/javascript/vue/shared/user_avatar.vue
+++ b/app/javascript/vue/shared/user_avatar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative w-6 h-6" :title="title">
+  <div class="relative w-6 h-6 shrink-0" :title="title">
       <img v-if="avatarUrl" src="avatarUrl" class="rounded-full w-full h-full" />
       <div v-else class="w-full h-full rounded-full border border-sn-light-grey  bg-sn-super-light-grey flex justify-center items-center">
         <span class="text-[.625rem] leading-3 font-normal">
diff --git a/app/views/shared/_user_avatar.html.erb b/app/views/shared/_user_avatar.html.erb
index 1dc459083..0a68dead4 100644
--- a/app/views/shared/_user_avatar.html.erb
+++ b/app/views/shared/_user_avatar.html.erb
@@ -1,5 +1,5 @@
 <% title = user.full_name unless defined?(title)%>
-<div class="relative w-6 h-6" title="<%= title %>">
+<div class="relative w-6 h-6 shrink-0" title="<%= title %>">
   <% if user.avatar.attached? %>
     <%= image_tag avatar_path(user, :icon_small), class: 'rounded-full w-full h-full' %>
   <% else %>