diff --git a/src/renderer/src/components/EmojiIcon.tsx b/src/renderer/src/components/EmojiIcon.tsx
index 29249c8892..2e9600e399 100644
--- a/src/renderer/src/components/EmojiIcon.tsx
+++ b/src/renderer/src/components/EmojiIcon.tsx
@@ -1,4 +1,3 @@
-import { getLeadingEmoji } from '@renderer/utils'
 import { FC } from 'react'
 import styled from 'styled-components'
 
@@ -8,12 +7,10 @@ interface EmojiIconProps {
 }
 
 const EmojiIcon: FC<EmojiIconProps> = ({ emoji, className }) => {
-  const _emoji = getLeadingEmoji(emoji || '⭐️') || '⭐️'
-
   return (
     <Container className={className}>
-      <EmojiBackground>{_emoji}</EmojiBackground>
-      {_emoji}
+      <EmojiBackground>{emoji || '⭐️'}</EmojiBackground>
+      {emoji}
     </Container>
   )
 }
diff --git a/src/renderer/src/components/EmojiPicker/index.tsx b/src/renderer/src/components/EmojiPicker/index.tsx
index c9345c7253..eb8a90dbde 100644
--- a/src/renderer/src/components/EmojiPicker/index.tsx
+++ b/src/renderer/src/components/EmojiPicker/index.tsx
@@ -13,7 +13,7 @@ const EmojiPicker: FC<Props> = ({ onEmojiClick }) => {
     if (ref.current) {
       ref.current.addEventListener('emoji-click', (event: any) => {
         event.stopPropagation()
-        onEmojiClick(event.detail.emoji.unicode)
+        onEmojiClick(event.detail.unicode || event.detail.emoji.unicode)
       })
     }
   }, [onEmojiClick])
diff --git a/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx b/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
index 79882263de..c86e634fb0 100644
--- a/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
@@ -19,7 +19,7 @@ import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings'
 import { getDefaultModel, getDefaultTopic } from '@renderer/services/AssistantService'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { Assistant, AssistantsSortType } from '@renderer/types'
-import { uuid } from '@renderer/utils'
+import { getLeadingEmoji, uuid } from '@renderer/utils'
 import { hasTopicPendingRequests } from '@renderer/utils/queue'
 import { Dropdown, MenuProps } from 'antd'
 import { omit } from 'lodash'
@@ -151,7 +151,7 @@ const AssistantItem: FC<AssistantItemProps> = ({
           ) : (
             assistantIconType === 'emoji' && (
               <EmojiIcon
-                emoji={assistant.emoji || assistantName.slice(0, 1)}
+                emoji={assistant.emoji || getLeadingEmoji(assistantName)}
                 className={isPending && !isActive ? 'animation-pulse' : ''}
               />
             )
@@ -423,7 +423,6 @@ const MenuButton = styled.div`
   align-items: center;
   min-width: 22px;
   height: 22px;
-  min-width: 22px;
   min-height: 22px;
   border-radius: 11px;
   position: absolute;