diff --git a/src/views/AuthApp.jsx b/src/views/AuthApp.jsx
index 5adfc21..631d184 100644
--- a/src/views/AuthApp.jsx
+++ b/src/views/AuthApp.jsx
@@ -52,7 +52,8 @@ function AuthApp() {
       theme={{
         token: {
           colorPrimary: colorPrimary,
-          borderRadius: borderRadius
+          borderRadius: borderRadius,
+          fontFamily: "-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,'Noto Sans',sans-serif,'Noto Color Emoji','Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol'",
         },
         algorithm: theme.defaultAlgorithm,
       }}
diff --git a/src/views/Conversations/Components/Input/Emoji.jsx b/src/views/Conversations/Components/Input/Emoji.jsx
index 157eb6e..a885db3 100644
--- a/src/views/Conversations/Components/Input/Emoji.jsx
+++ b/src/views/Conversations/Components/Input/Emoji.jsx
@@ -16,13 +16,13 @@ const InputTemplate = ({ mobile, disabled = false, inputEmoji }) => {
         placement={mobile === undefined ? 'right' : 'top'}
         overlayInnerStyle={{ padding: 0, borderRadius: '8px' }}
         forceRender={true}
-        content={<EmojiPicker skinTonesDisabled={true} emojiStyle='google' onEmojiClick={handlePickEmoji} />}
-        // title='😀'
+        content={<EmojiPicker skinTonesDisabled={true} emojiStyle='native' onEmojiClick={handlePickEmoji} className='chatwindow-wrapper' />}
+        // title='😃'
         trigger='click'
         open={openPopup}
         onOpenChange={setOpenPopup}>
         <Button type='text' className=' px-1' size={'middle'} disabled={disabled}>
-          😀
+        😃
         </Button>
       </Popover>
     </>
diff --git a/src/views/Conversations/Conversations.css b/src/views/Conversations/Conversations.css
index 3f8fba6..6961c4b 100644
--- a/src/views/Conversations/Conversations.css
+++ b/src/views/Conversations/Conversations.css
@@ -122,9 +122,10 @@
 .chatwindow-wrapper .referrer-msg,
 .chatwindow-wrapper .rce-mbox-reply-message,
 .chatwindow-wrapper .emoji,
+.chatwindow-wrapper .epr-emoji-native,
 .chatwindow-wrapper .ant-input-textarea-affix-wrapper.ant-input-affix-wrapper >textarea.ant-input
 {
-    font-family: 'Open Sans', 'Noto Sans',"Noto Color Emoji", 'Apple Color Emoji', 'Twemoji Mozilla', 'Segoe UI Emoji', 'Segoe UI Symbol', 'EmojiOne Color', 'Android Emoji', Arial, sans-serif;
+    font-family: 'Open Sans', 'Noto Sans',"Noto Color Emoji", 'Apple Color Emoji', 'Twemoji Mozilla', 'Segoe UI Emoji', 'Segoe UI Symbol', 'EmojiOne Color', 'Android Emoji', Arial, sans-serif!important;
     font-weight: 400;
 }
 .chatwindow-wrapper .rce-mbox-text a{