diff --git a/IceCubesApp/App/Tabs/Settings/AccountSettingView.swift b/IceCubesApp/App/Tabs/Settings/AccountSettingView.swift
index e7b587aa1..e62a66b3b 100644
--- a/IceCubesApp/App/Tabs/Settings/AccountSettingView.swift
+++ b/IceCubesApp/App/Tabs/Settings/AccountSettingView.swift
@@ -1,6 +1,7 @@
 import Account
 import AppAccount
 import DesignSystem
+import EmojiText
 import Env
 import Models
 import NetworkClient
@@ -107,7 +108,7 @@ struct AccountSettingsView: View {
       ToolbarItem(placement: .principal) {
         HStack {
           AvatarView(account.avatar, config: .embed)
-          Text(account.safeDisplayName)
+          EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
             .font(.headline)
         }
       }
diff --git a/Packages/Account/Sources/Account/Detail/Components/AccountDetailToolbar.swift b/Packages/Account/Sources/Account/Detail/Components/AccountDetailToolbar.swift
index 9d1ed232e..08b5d66c9 100644
--- a/Packages/Account/Sources/Account/Detail/Components/AccountDetailToolbar.swift
+++ b/Packages/Account/Sources/Account/Detail/Components/AccountDetailToolbar.swift
@@ -1,4 +1,5 @@
 import DesignSystem
+import EmojiText
 import Env
 import Models
 import NetworkClient
@@ -25,7 +26,8 @@ struct AccountDetailToolbar: ToolbarContent {
     ToolbarItem(placement: .principal) {
       if let account = account, displayTitle {
         VStack {
-          Text(account.displayName ?? "").font(.headline)
+          EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
+            .font(.headline)
           Text("account.detail.featured-tags-n-posts \(account.statusesCount ?? 0)")
             .font(.footnote)
             .foregroundStyle(.secondary)
diff --git a/Packages/Account/Sources/Account/Detail/MediaGrid/AccountDetailMediaGridView.swift b/Packages/Account/Sources/Account/Detail/MediaGrid/AccountDetailMediaGridView.swift
index 3ef780633..431de9f3f 100644
--- a/Packages/Account/Sources/Account/Detail/MediaGrid/AccountDetailMediaGridView.swift
+++ b/Packages/Account/Sources/Account/Detail/MediaGrid/AccountDetailMediaGridView.swift
@@ -1,4 +1,5 @@
 import DesignSystem
+import EmojiText
 import Env
 import MediaUI
 import Models
@@ -100,7 +101,13 @@ public struct AccountDetailMediaGridView: View {
         }
       }
     }
-    .navigationTitle(account.displayName ?? "")
+    .navigationBarTitleDisplayMode(.inline)
+    .toolbar {
+      ToolbarItem(placement: .principal) {
+        EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
+          .font(.headline)
+      }
+    }
     #if !os(visionOS)
       .scrollContentBackground(.hidden)
       .background(theme.primaryBackgroundColor)