diff --git a/src/components/dialogs/GroupDialog/GroupDialogInfoTab.vue b/src/components/dialogs/GroupDialog/GroupDialogInfoTab.vue
index db7ec6c5..1f1a8631 100644
--- a/src/components/dialogs/GroupDialog/GroupDialogInfoTab.vue
+++ b/src/components/dialogs/GroupDialog/GroupDialogInfoTab.vue
@@ -373,10 +373,9 @@
         formatDateFilter,
         getFaviconUrl,
         hasGroupPermission,
-        openExternalLink,
-        userImage,
-        userStatusClass
+        openExternalLink
     } from '../../../shared/utils';
+    import { useUserDisplay } from '../../../composables/useUserDisplay';
     import { refreshInstancePlayerCount } from '../../../coordinators/instanceCoordinator';
     import { useGalleryStore, useGroupStore, useInstanceStore, useLocationStore } from '../../../stores';
     import { useGroupCalendarEvents } from './useGroupCalendarEvents';
@@ -397,6 +396,7 @@
     });
 
     const { t } = useI18n();
+    const { userImage, userStatusClass } = useUserDisplay();
 
     const { groupDialog } = storeToRefs(useGroupStore());
     const { lastLocation } = storeToRefs(useLocationStore());
diff --git a/src/components/dialogs/UserDialog/UserDialogInfoTab.vue b/src/components/dialogs/UserDialog/UserDialogInfoTab.vue
index 12586d13..03fd0180 100644
--- a/src/components/dialogs/UserDialog/UserDialogInfoTab.vue
+++ b/src/components/dialogs/UserDialog/UserDialogInfoTab.vue
@@ -493,11 +493,10 @@
         isRealInstance,
         openExternalLink,
         timeToText,
-        userImage,
         userOnlineFor,
-        userOnlineForTimestamp,
-        userStatusClass
+        userOnlineForTimestamp
     } from '../../../shared/utils';
+    import { useUserDisplay } from '../../../composables/useUserDisplay';
     import { refreshInstancePlayerCount } from '../../../coordinators/instanceCoordinator';
     import {
         useAdvancedSettingsStore,
@@ -532,6 +531,7 @@
 
     const { lastLocation } = storeToRefs(useLocationStore());
     const { showFullscreenImageDialog } = useGalleryStore();
+    const { userImage, userStatusClass } = useUserDisplay();
 
     const bioCache = ref({
         userId: null,
diff --git a/src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue b/src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue
index 99f92f38..8f32f792 100644
--- a/src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue
+++ b/src/components/dialogs/UserDialog/UserDialogMutualFriendsTab.vue
@@ -71,7 +71,8 @@
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
-    import { compareByDisplayName, compareByFriendOrder, compareByLastActiveRef, userImage } from '../../../shared/utils';
+    import { compareByDisplayName, compareByFriendOrder, compareByLastActiveRef } from '../../../shared/utils';
+    import { useUserDisplay } from '../../../composables/useUserDisplay';
     import { database } from '../../../services/database';
     import { processBulk } from '../../../services/request';
     import { useOptionKeySelect } from '../../../composables/useOptionKeySelect';
@@ -81,6 +82,7 @@
     import { showUserDialog } from '../../../coordinators/userCoordinator';
 
     const { t } = useI18n();
+    const { userImage } = useUserDisplay();
 
     const userStore = useUserStore();
     const { userDialog, currentUser } = storeToRefs(userStore);
diff --git a/src/components/dialogs/UserDialog/UserSummaryHeader.vue b/src/components/dialogs/UserDialog/UserSummaryHeader.vue
index ab41beef..3e3ca713 100644
--- a/src/components/dialogs/UserDialog/UserSummaryHeader.vue
+++ b/src/components/dialogs/UserDialog/UserSummaryHeader.vue
@@ -267,7 +267,7 @@
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
-    import { formatDateFilter, languageClass, openDiscordProfile, userImage } from '../../../shared/utils';
+    import { formatDateFilter, languageClass, openDiscordProfile } from '../../../shared/utils';
     import { useUserDisplay } from '../../../composables/useUserDisplay';
     import { Popover, PopoverContent, PopoverTrigger } from '../../ui/popover';
     import { useGalleryStore, useUserStore } from '../../../stores';
@@ -305,7 +305,7 @@
     const { userDialog, currentUser } = storeToRefs(useUserStore());
 
     const { showFullscreenImageDialog } = useGalleryStore();
-    const { userStatusClass } = useUserDisplay();
+    const { userImage, userStatusClass } = useUserDisplay();
 
     const profileImageError = ref(false);
     const userIconError = ref(false);
diff --git a/src/views/Search/Search.vue b/src/views/Search/Search.vue
index b2273858..666d5e6a 100644
--- a/src/views/Search/Search.vue
+++ b/src/views/Search/Search.vue
@@ -318,13 +318,13 @@
     import { useI18n } from 'vue-i18n';
 
     import {
-        useAdvancedSettingsStore,
         useAppearanceSettingsStore,
         useAuthStore,
         useAvatarProviderStore,
         useSearchStore
     } from '../../stores';
-    import { convertFileUrlToImageUrl, languageClass, userImage } from '../../shared/utils';
+    import { convertFileUrlToImageUrl, languageClass } from '../../shared/utils';
+    import { useUserDisplay } from '../../composables/useUserDisplay';
     import { showAvatarDialog } from '../../coordinators/avatarCoordinator';
     import { showGroupDialog } from '../../coordinators/groupCoordinator';
     import { showUserDialog } from '../../coordinators/userCoordinator';
@@ -338,13 +338,13 @@
     const { avatarRemoteDatabaseProviderList, avatarRemoteDatabaseProvider, isAvatarProviderDialogVisible } =
         storeToRefs(useAvatarProviderStore());
     const { setAvatarProvider } = useAvatarProviderStore();
-    const { avatarRemoteDatabase } = storeToRefs(useAdvancedSettingsStore());
 
     const { searchText, searchUserResults } = storeToRefs(useSearchStore());
     const { clearSearch } = useSearchStore();
     const { cachedConfig } = storeToRefs(useAuthStore());
 
     const { t } = useI18n();
+    const { userImage } = useUserDisplay();
 
     const activeSearchTab = ref('user');