diff --git a/web/components/chat/ChatUserMessage/emojiMatcher.ts b/web/components/chat/ChatUserMessage/emojiMatcher.ts
index d3b354221..82d3b80fe 100644
--- a/web/components/chat/ChatUserMessage/emojiMatcher.ts
+++ b/web/components/chat/ChatUserMessage/emojiMatcher.ts
@@ -11,7 +11,7 @@ interface options {
   className: string;
 }
 
-const emojiPattern = '\\p{RGI_Emoji}+';
+const emojiPattern = '\\p{RGI_Emoji}';
 
 const regexSupportsUnicodeSets = (() => {
   // Using a variable for regexpFlags to avoid eslint error about the flag
diff --git a/web/styles/globals.scss b/web/styles/globals.scss
index a121df12e..b2657bdf9 100644
--- a/web/styles/globals.scss
+++ b/web/styles/globals.scss
@@ -124,11 +124,10 @@ body {
 }
 
 .emoji {
-  display: inline-block;
   font-size: 30px;
   height: 30px;
   line-height: 30px;
-  margin-left: 5px;
-  margin-right: 5px;
+  margin-left: 2px;
+  margin-right: 2px;
   vertical-align: middle;
 }