diff --git a/app/components/Emoji/Emoji.tsx b/app/components/Emoji/Emoji.tsx
new file mode 100644
index 00000000000..da35d9fef1a
--- /dev/null
+++ b/app/components/Emoji/Emoji.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { Text, StyleProp, TextStyle, ImageStyle } from 'react-native';
+
+import useShortnameToUnicode from '../../lib/hooks/useShortnameToUnicode';
+import CustomEmoji from '../../containers/EmojiPicker/CustomEmoji';
+import { ICustomEmoji } from '../../definitions/IEmoji';
+
+interface IEmojiProps {
+	emoji: string | ICustomEmoji;
+	style?: StyleProp<TextStyle | ImageStyle>;
+	size?: number;
+}
+
+const Emoji = ({ emoji, style, size = 16 }: IEmojiProps) => {
+	const { formatShortnameToUnicode } = useShortnameToUnicode(true);
+
+	if (typeof emoji === 'string') {
+		const trimmed = emoji.trim();
+
+		const isColonShortname = /^:[^:\s]+:$/.test(trimmed);
+		const isBareShortname = /^[a-z0-9_+\-]+$/i.test(trimmed);
+
+		const leading = emoji.match(/^\s*/)?.[0] ?? '';
+		const trailing = emoji.match(/\s*$/)?.[0] ?? '';
+
+		let converted: string;
+		if (isColonShortname) {
+			converted = formatShortnameToUnicode(trimmed);
+		} else if (isBareShortname) {
+			converted = formatShortnameToUnicode(`:${trimmed}:`);
+		} else {
+			converted = emoji;
+		}
+
+		return <Text style={[{ fontSize: size }, style as StyleProp<TextStyle>]}>{`${leading}${converted}${trailing}`}</Text>;
+	}
+
+	return <CustomEmoji style={[{ width: size, height: size }, style as StyleProp<ImageStyle>]} emoji={emoji} />;
+};
+
+export default Emoji;
diff --git a/app/containers/EmojiPicker/Emoji.tsx b/app/containers/EmojiPicker/Emoji.tsx
index 434fd3d1c63..6048f5d3888 100644
--- a/app/containers/EmojiPicker/Emoji.tsx
+++ b/app/containers/EmojiPicker/Emoji.tsx
@@ -1,17 +1,11 @@
 import React from 'react';
-import { Text } from 'react-native';
 
-import useShortnameToUnicode from '../../lib/hooks/useShortnameToUnicode';
-import styles from './styles';
-import CustomEmoji from './CustomEmoji';
+import Emoji from '../../components/Emoji/Emoji';
 import { IEmojiProps } from './interfaces';
+import styles from './styles';
 
-export const Emoji = ({ emoji }: IEmojiProps): React.ReactElement => {
-	const { formatShortnameToUnicode } = useShortnameToUnicode(true);
-	const unicodeEmoji = formatShortnameToUnicode(`:${emoji}:`);
+export const EmojiPickerEmoji = ({ emoji }: IEmojiProps): React.ReactElement => (
+	<Emoji emoji={emoji} style={typeof emoji === 'string' ? styles.categoryEmoji : styles.customCategoryEmoji} />
+);
 
-	if (typeof emoji === 'string') {
-		return <Text style={styles.categoryEmoji}>{unicodeEmoji}</Text>;
-	}
-	return <CustomEmoji style={styles.customCategoryEmoji} emoji={emoji} />;
-};
+export { Emoji };
diff --git a/app/containers/UIKit/__snapshots__/UiKitModal.test.tsx.snap b/app/containers/UIKit/__snapshots__/UiKitModal.test.tsx.snap
index 21b5638a37e..163b4230373 100644
--- a/app/containers/UIKit/__snapshots__/UiKitModal.test.tsx.snap
+++ b/app/containers/UIKit/__snapshots__/UiKitModal.test.tsx.snap
@@ -3769,16 +3769,14 @@ exports[`Story Snapshots: ModalSectionSelects should match snapshot 1`] = `
               style={
                 [
                   {
-                    "color": "#2F343D",
-                  },
-                  {
-                    "backgroundColor": "transparent",
-                    "fontFamily": "Inter",
-                    "fontSize": 16,
-                    "fontWeight": "400",
-                    "lineHeight": 22,
-                    "textAlign": "left",
+                    "fontSize": 15,
                   },
+                  [
+                    {
+                      "color": "#2F343D",
+                    },
+                    {},
+                  ],
                 ]
               }
             >
diff --git a/app/containers/markdown/__snapshots__/Markdown.test.tsx.snap b/app/containers/markdown/__snapshots__/Markdown.test.tsx.snap
index af00378f8ac..0a45328b821 100644
--- a/app/containers/markdown/__snapshots__/Markdown.test.tsx.snap
+++ b/app/containers/markdown/__snapshots__/Markdown.test.tsx.snap
@@ -485,16 +485,14 @@ exports[`Story Snapshots: Emoji should match snapshot 1`] = `
           style={
             [
               {
-                "color": "#2F343D",
-              },
-              {
-                "backgroundColor": "transparent",
-                "fontFamily": "Inter",
-                "fontSize": 16,
-                "fontWeight": "400",
-                "lineHeight": 22,
-                "textAlign": "left",
+                "fontSize": 15,
               },
+              [
+                {
+                  "color": "#2F343D",
+                },
+                {},
+              ],
             ]
           }
         >
@@ -504,16 +502,14 @@ exports[`Story Snapshots: Emoji should match snapshot 1`] = `
           style={
             [
               {
-                "color": "#2F343D",
-              },
-              {
-                "backgroundColor": "transparent",
-                "fontFamily": "Inter",
-                "fontSize": 16,
-                "fontWeight": "400",
-                "lineHeight": 22,
-                "textAlign": "left",
+                "fontSize": 15,
               },
+              [
+                {
+                  "color": "#2F343D",
+                },
+                {},
+              ],
             ]
           }
         >
@@ -523,16 +519,14 @@ exports[`Story Snapshots: Emoji should match snapshot 1`] = `
           style={
             [
               {
-                "color": "#2F343D",
-              },
-              {
-                "backgroundColor": "transparent",
-                "fontFamily": "Inter",
-                "fontSize": 16,
-                "fontWeight": "400",
-                "lineHeight": 22,
-                "textAlign": "left",
+                "fontSize": 15,
               },
+              [
+                {
+                  "color": "#2F343D",
+                },
+                {},
+              ],
             ]
           }
         >
@@ -597,23 +591,27 @@ exports[`Story Snapshots: Emoji should match snapshot 1`] = `
           style={
             [
               {
-                "color": "#2F343D",
-              },
-              {
-                "backgroundColor": "transparent",
-                "fontFamily": "Inter",
-                "fontSize": 16,
-                "fontWeight": "400",
-                "lineHeight": 22,
-                "textAlign": "left",
+                "fontSize": 15,
               },
-              {},
-              false,
+              [
+                {
+                  "color": "#2F343D",
+                },
+                {
+                  "backgroundColor": "transparent",
+                  "fontFamily": "Inter",
+                  "fontSize": 16,
+                  "fontWeight": "400",
+                  "lineHeight": 22,
+                  "textAlign": "left",
+                },
+                {},
+                false,
+              ],
             ]
           }
         >
-           
-          😂
+            😂
         </Text>
         <Text
           accessibilityLabel=" "
@@ -636,23 +634,27 @@ exports[`Story Snapshots: Emoji should match snapshot 1`] = `
           style={
             [
               {
-                "color": "#2F343D",
+                "fontSize": 15,
               },
-              {
-                "backgroundColor": "transparent",
-                "fontFamily": "Inter",
-                "fontSize": 16,
-                "fontWeight": "400",
-                "lineHeight": 22,
-                "textAlign": "left",
-              },
-              {},
-              false,
+              [
+                {
+                  "color": "#2F343D",
+                },
+                {
+                  "backgroundColor": "transparent",
+                  "fontFamily": "Inter",
+                  "fontSize": 16,
+                  "fontWeight": "400",
+                  "lineHeight": 22,
+                  "textAlign": "left",
+                },
+                {},
+                false,
+              ],
             ]
           }
         >
-           
-          👍
+            👍
         </Text>
       </Text>
     </Text>
@@ -860,16 +862,14 @@ exports[`Story Snapshots: Emoji should match snapshot 1`] = `
         style={
           [
             {
-              "color": "#2F343D",
-            },
-            {
-              "backgroundColor": "transparent",
-              "fontFamily": "Inter",
               "fontSize": 30,
-              "fontWeight": "400",
-              "lineHeight": 43,
-              "textAlign": "left",
             },
+            [
+              {
+                "color": "#2F343D",
+              },
+              {},
+            ],
           ]
         }
       >
@@ -879,18 +879,23 @@ exports[`Story Snapshots: Emoji should match snapshot 1`] = `
         style={
           [
             {
-              "color": "#2F343D",
-            },
-            {
-              "backgroundColor": "transparent",
-              "fontFamily": "Inter",
               "fontSize": 30,
-              "fontWeight": "400",
-              "lineHeight": 43,
-              "textAlign": "left",
             },
-            {},
-            false,
+            [
+              {
+                "color": "#2F343D",
+              },
+              {
+                "backgroundColor": "transparent",
+                "fontFamily": "Inter",
+                "fontSize": 30,
+                "fontWeight": "400",
+                "lineHeight": 43,
+                "textAlign": "left",
+              },
+              {},
+              false,
+            ],
           ]
         }
       >
diff --git a/app/containers/markdown/components/emoji/Emoji.tsx b/app/containers/markdown/components/emoji/Emoji.tsx
index 7aee7e4d7f0..c065419b46e 100644
--- a/app/containers/markdown/components/emoji/Emoji.tsx
+++ b/app/containers/markdown/components/emoji/Emoji.tsx
@@ -1,16 +1,15 @@
 import React, { useContext } from 'react';
-import { Text, useWindowDimensions } from 'react-native';
+import { useWindowDimensions } from 'react-native';
 import { Emoji as EmojiProps } from '@rocket.chat/message-parser';
 
-import Plain from '../Plain';
 import useShortnameToUnicode from '../../../../lib/hooks/useShortnameToUnicode';
 import { useTheme } from '../../../../theme';
 import styles from '../../styles';
-import CustomEmoji from '../../../EmojiPicker/CustomEmoji';
 import MarkdownContext from '../../contexts/MarkdownContext';
 import { useAppSelector } from '../../../../lib/hooks';
 import { getUserSelector } from '../../../../selectors/login';
 import { useResponsiveLayout } from '../../../../lib/hooks/useResponsiveLayout/useResponsiveLayout';
+import EmojiRenderer from '../../../../components/Emoji/Emoji';
 
 interface IEmojiProps {
 	block: EmojiProps;
@@ -42,7 +41,13 @@ const Emoji = ({ block, isBigEmoji, style = {}, index, isAvatar = false }: IEmoj
 	const convertAsciiEmoji = useAppSelector(state => getUserSelector(state)?.settings?.preferences?.convertAsciiEmoji);
 
 	if ('unicode' in block) {
-		return <Text style={[{ color: colors.fontDefault }, isBigEmoji ? styles.textBig : styles.text]}>{block.unicode}</Text>;
+		return (
+			<EmojiRenderer
+				emoji={block.unicode}
+				size={isBigEmoji ? 30 * fontScale : 15 * fontScale}
+				style={[{ color: colors.fontDefault }, style]}
+			/>
+		);
 	}
 
 	const emojiToken = getEmojiToken(block, isAvatar);
@@ -68,20 +73,20 @@ const Emoji = ({ block, isBigEmoji, style = {}, index, isAvatar = false }: IEmoj
 	};
 
 	if (emoji) {
-		return <CustomEmoji style={[isBigEmoji ? customEmojiBigSize : customEmojiSize, style]} emoji={emoji} />;
+		return <EmojiRenderer style={[isBigEmoji ? customEmojiBigSize : customEmojiSize, style]} emoji={emoji} />;
 	}
 
 	return (
-		<Text
+		<EmojiRenderer
+			emoji={`${spaceLeft}${displayAsciiEmoji ? block.value!.value : emojiUnicode}`}
+			size={isBigEmoji ? 30 * fontScale : 15 * fontScale}
 			style={[
 				{ color: colors.fontDefault },
 				isBigEmoji && emojiToken !== emojiUnicode ? styles.textBig : styles.text,
 				style,
 				isAvatar && avatarStyle
-			]}>
-			{spaceLeft}
-			{displayAsciiEmoji ? <Plain value={block.value!.value} /> : emojiUnicode}
-		</Text>
+			]}
+		/>
 	);
 };
 
diff --git a/app/containers/message/__snapshots__/Message.test.tsx.snap b/app/containers/message/__snapshots__/Message.test.tsx.snap
index 8d51bac9b82..0b6423e589d 100644
--- a/app/containers/message/__snapshots__/Message.test.tsx.snap
+++ b/app/containers/message/__snapshots__/Message.test.tsx.snap
@@ -1522,27 +1522,32 @@ exports[`Story Snapshots: Avatar should match snapshot 1`] = `
                   style={
                     [
                       {
-                        "color": "#2F343D",
-                      },
-                      {
-                        "backgroundColor": "transparent",
-                        "fontFamily": "Inter",
-                        "fontSize": 16,
-                        "fontWeight": "400",
-                        "lineHeight": 22,
-                        "textAlign": "left",
-                      },
-                      {
-                        "borderRadius": 4,
-                        "height": 36,
-                        "width": 36,
-                      },
-                      {
-                        "fontSize": 30,
-                        "lineHeight": 30,
-                        "textAlign": "center",
-                        "textAlignVertical": "center",
+                        "fontSize": 15,
                       },
+                      [
+                        {
+                          "color": "#2F343D",
+                        },
+                        {
+                          "backgroundColor": "transparent",
+                          "fontFamily": "Inter",
+                          "fontSize": 16,
+                          "fontWeight": "400",
+                          "lineHeight": 22,
+                          "textAlign": "left",
+                        },
+                        {
+                          "borderRadius": 4,
+                          "height": 36,
+                          "width": 36,
+                        },
+                        {
+                          "fontSize": 30,
+                          "lineHeight": 30,
+                          "textAlign": "center",
+                          "textAlignVertical": "center",
+                        },
+                      ],
                     ]
                   }
                 >
@@ -21178,16 +21183,14 @@ exports[`Story Snapshots: Emojis should match snapshot 1`] = `
                         style={
                           [
                             {
-                              "color": "#2F343D",
-                            },
-                            {
-                              "backgroundColor": "transparent",
-                              "fontFamily": "Inter",
                               "fontSize": 30,
-                              "fontWeight": "400",
-                              "lineHeight": 43,
-                              "textAlign": "left",
                             },
+                            [
+                              {
+                                "color": "#2F343D",
+                              },
+                              {},
+                            ],
                           ]
                         }
                       >
@@ -21197,16 +21200,14 @@ exports[`Story Snapshots: Emojis should match snapshot 1`] = `
                         style={
                           [
                             {
-                              "color": "#2F343D",
-                            },
-                            {
-                              "backgroundColor": "transparent",
-                              "fontFamily": "Inter",
                               "fontSize": 30,
-                              "fontWeight": "400",
-                              "lineHeight": 43,
-                              "textAlign": "left",
                             },
+                            [
+                              {
+                                "color": "#2F343D",
+                              },
+                              {},
+                            ],
                           ]
                         }
                       >
@@ -21519,16 +21520,14 @@ exports[`Story Snapshots: Emojis should match snapshot 1`] = `
                         style={
                           [
                             {
-                              "color": "#2F343D",
-                            },
-                            {
-                              "backgroundColor": "transparent",
-                              "fontFamily": "Inter",
                               "fontSize": 30,
-                              "fontWeight": "400",
-                              "lineHeight": 43,
-                              "textAlign": "left",
                             },
+                            [
+                              {
+                                "color": "#2F343D",
+                              },
+                              {},
+                            ],
                           ]
                         }
                       >
@@ -22575,16 +22574,14 @@ exports[`Story Snapshots: Emojis should match snapshot 1`] = `
                         style={
                           [
                             {
-                              "color": "#2F343D",
-                            },
-                            {
-                              "backgroundColor": "transparent",
-                              "fontFamily": "Inter",
                               "fontSize": 30,
-                              "fontWeight": "400",
-                              "lineHeight": 43,
-                              "textAlign": "left",
                             },
+                            [
+                              {
+                                "color": "#2F343D",
+                              },
+                              {},
+                            ],
                           ]
                         }
                       >
@@ -22950,16 +22947,14 @@ exports[`Story Snapshots: Emojis should match snapshot 1`] = `
                           style={
                             [
                               {
-                                "color": "#2F343D",
-                              },
-                              {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "Inter",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "lineHeight": 22,
-                                "textAlign": "left",
+                                "fontSize": 15,
                               },
+                              [
+                                {
+                                  "color": "#2F343D",
+                                },
+                                {},
+                              ],
                             ]
                           }
                         >
@@ -22986,16 +22981,14 @@ exports[`Story Snapshots: Emojis should match snapshot 1`] = `
                           style={
                             [
                               {
-                                "color": "#2F343D",
-                              },
-                              {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "Inter",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "lineHeight": 22,
-                                "textAlign": "left",
+                                "fontSize": 15,
                               },
+                              [
+                                {
+                                  "color": "#2F343D",
+                                },
+                                {},
+                              ],
                             ]
                           }
                         >
@@ -23005,16 +22998,14 @@ exports[`Story Snapshots: Emojis should match snapshot 1`] = `
                           style={
                             [
                               {
-                                "color": "#2F343D",
-                              },
-                              {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "Inter",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "lineHeight": 22,
-                                "textAlign": "left",
+                                "fontSize": 15,
                               },
+                              [
+                                {
+                                  "color": "#2F343D",
+                                },
+                                {},
+                              ],
                             ]
                           }
                         >
@@ -23341,16 +23332,14 @@ exports[`Story Snapshots: EmojisLargeFont should match snapshot 1`] = `
                         style={
                           [
                             {
-                              "color": "#2F343D",
-                            },
-                            {
-                              "backgroundColor": "transparent",
-                              "fontFamily": "Inter",
                               "fontSize": 30,
-                              "fontWeight": "400",
-                              "lineHeight": 43,
-                              "textAlign": "left",
                             },
+                            [
+                              {
+                                "color": "#2F343D",
+                              },
+                              {},
+                            ],
                           ]
                         }
                       >
@@ -23360,16 +23349,14 @@ exports[`Story Snapshots: EmojisLargeFont should match snapshot 1`] = `
                         style={
                           [
                             {
-                              "color": "#2F343D",
-                            },
-                            {
-                              "backgroundColor": "transparent",
-                              "fontFamily": "Inter",
                               "fontSize": 30,
-                              "fontWeight": "400",
-                              "lineHeight": 43,
-                              "textAlign": "left",
                             },
+                            [
+                              {
+                                "color": "#2F343D",
+                              },
+                              {},
+                            ],
                           ]
                         }
                       >
@@ -23682,16 +23669,14 @@ exports[`Story Snapshots: EmojisLargeFont should match snapshot 1`] = `
                         style={
                           [
                             {
-                              "color": "#2F343D",
-                            },
-                            {
-                              "backgroundColor": "transparent",
-                              "fontFamily": "Inter",
                               "fontSize": 30,
-                              "fontWeight": "400",
-                              "lineHeight": 43,
-                              "textAlign": "left",
                             },
+                            [
+                              {
+                                "color": "#2F343D",
+                              },
+                              {},
+                            ],
                           ]
                         }
                       >
@@ -24738,16 +24723,14 @@ exports[`Story Snapshots: EmojisLargeFont should match snapshot 1`] = `
                         style={
                           [
                             {
-                              "color": "#2F343D",
-                            },
-                            {
-                              "backgroundColor": "transparent",
-                              "fontFamily": "Inter",
                               "fontSize": 30,
-                              "fontWeight": "400",
-                              "lineHeight": 43,
-                              "textAlign": "left",
                             },
+                            [
+                              {
+                                "color": "#2F343D",
+                              },
+                              {},
+                            ],
                           ]
                         }
                       >
@@ -25113,16 +25096,14 @@ exports[`Story Snapshots: EmojisLargeFont should match snapshot 1`] = `
                           style={
                             [
                               {
-                                "color": "#2F343D",
-                              },
-                              {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "Inter",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "lineHeight": 22,
-                                "textAlign": "left",
+                                "fontSize": 15,
                               },
+                              [
+                                {
+                                  "color": "#2F343D",
+                                },
+                                {},
+                              ],
                             ]
                           }
                         >
@@ -25149,16 +25130,14 @@ exports[`Story Snapshots: EmojisLargeFont should match snapshot 1`] = `
                           style={
                             [
                               {
-                                "color": "#2F343D",
-                              },
-                              {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "Inter",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "lineHeight": 22,
-                                "textAlign": "left",
+                                "fontSize": 15,
                               },
+                              [
+                                {
+                                  "color": "#2F343D",
+                                },
+                                {},
+                              ],
                             ]
                           }
                         >
@@ -25168,16 +25147,14 @@ exports[`Story Snapshots: EmojisLargeFont should match snapshot 1`] = `
                           style={
                             [
                               {
-                                "color": "#2F343D",
-                              },
-                              {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "Inter",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "lineHeight": 22,
-                                "textAlign": "left",
+                                "fontSize": 15,
                               },
+                              [
+                                {
+                                  "color": "#2F343D",
+                                },
+                                {},
+                              ],
                             ]
                           }
                         >
@@ -74134,18 +74111,23 @@ exports[`Story Snapshots: ShowButtonAsAttachment should match snapshot 1`] = `
                           style={
                             [
                               {
-                                "color": "#2F343D",
-                              },
-                              {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "Inter",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "lineHeight": 22,
-                                "textAlign": "left",
+                                "fontSize": 15,
                               },
-                              {},
-                              false,
+                              [
+                                {
+                                  "color": "#2F343D",
+                                },
+                                {
+                                  "backgroundColor": "transparent",
+                                  "fontFamily": "Inter",
+                                  "fontSize": 16,
+                                  "fontWeight": "400",
+                                  "lineHeight": 22,
+                                  "textAlign": "left",
+                                },
+                                {},
+                                false,
+                              ],
                             ]
                           }
                         >
@@ -75128,18 +75110,23 @@ exports[`Story Snapshots: ShowButtonAsAttachmentLargeFont should match snapshot
                           style={
                             [
                               {
-                                "color": "#2F343D",
+                                "fontSize": 15,
                               },
-                              {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "Inter",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "lineHeight": 22,
-                                "textAlign": "left",
-                              },
-                              {},
-                              false,
+                              [
+                                {
+                                  "color": "#2F343D",
+                                },
+                                {
+                                  "backgroundColor": "transparent",
+                                  "fontFamily": "Inter",
+                                  "fontSize": 16,
+                                  "fontWeight": "400",
+                                  "lineHeight": 22,
+                                  "textAlign": "left",
+                                },
+                                {},
+                                false,
+                              ],
                             ]
                           }
                         >