diff --git a/package.json b/package.json
index fc138b0b..96201922 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "generate-docs": "ts-node scripts/generate-docs.ts",
     "replace-docs": "ts-node scripts/replacer.ts",
     "copy": "cp -R src/v2/styles/* dist/v2/scss",
-    "compile-to-css": "sass src/v2/styles/index.scss dist/v2/css/index.css --style compressed && sass src/v2/styles/index.layout.scss dist/v2/css/index.layout.css --style compressed",
+    "compile-to-css": "sass src/v2/styles/index.scss dist/v2/css/index.css --style compressed && sass src/v2/styles/index.layout.scss dist/v2/css/index.layout.css --style compressed && sass src/v2/styles/_emoji-replacement.scss dist/v2/css/emoji-replacement.css --style compressed",
     "bundle-sass": "echo '\u001b[34mℹ\u001b[0m Compiling scss files to css bundle' && sass src/v1/index.scss dist/css/index.css --style compressed && echo '\u001b[32m✓\u001b[0m Finished bundling css'",
     "copy-assets": "echo '\u001b[34mℹ\u001b[0m Copying assets to distributed directory' && cp -R src/assets dist/assets && echo '\u001b[32m✓\u001b[0m Finished copying assets'",
     "copy-styles": "echo '\u001b[34mℹ\u001b[0m Copying scss files to distributed directory' && cp -R src/v1 dist/scss && echo '\u001b[32m✓\u001b[0m Finished copying styles'",
diff --git a/src/v1/_base.scss b/src/v1/_base.scss
index 950ff2d4..bc2f7e27 100644
--- a/src/v1/_base.scss
+++ b/src/v1/_base.scss
@@ -105,47 +105,6 @@
   }
 }
 
-/* declare a font faces for our Emoji Replacement font, based on the default font used by Stream Chat React */
-
-$emoji-flag-unicode-range: U+1F1E6-1F1FF;
-
-/* png based woff for most browsers */
-@font-face {
-  font-family: ReplaceFlagEmojiPNG;
-  src: url('#{$assetsPath}/NotoColorEmoji-flags.woff2') format('woff2');
-  /* using the unicode-range attribute to limit the reach of the Flag Emoji web font to only flags */
-  unicode-range: $emoji-flag-unicode-range;
-}
-
-/* svg based for firefox */
-@font-face {
-  font-family: ReplaceFlagEmojiSVG;
-  src: url('#{$assetsPath}/EmojiOneColor.woff2') format('woff2');
-  unicode-range: $emoji-flag-unicode-range;
-}
-
-.str-chat--windows-flags {
-  .str-chat__textarea__textarea,
-  .str-chat__message-text-inner *,
-  .str-chat__emoji-item--entity,
-  .emoji-mart-emoji-native * {
-    font-family: ReplaceFlagEmojiPNG, var(--second-font), sans-serif;
-    font-display: swap;
-  }
-}
-
-@-moz-document url-prefix('') {
-  .str-chat--windows-flags {
-    .str-chat__textarea__textarea,
-    .str-chat__message-text-inner *,
-    .str-chat__emoji-item--entity,
-    .emoji-mart-emoji-native * {
-      font-family: ReplaceFlagEmojiSVG, var(--second-font), sans-serif;
-      font-display: swap;
-    }
-  }
-}
-
 .str-chat-channel-list {
   float: left;
 }
diff --git a/src/v2/styles/index.layout.scss b/src/v2/styles/index.layout.scss
index 43697008..bbf99c6e 100755
--- a/src/v2/styles/index.layout.scss
+++ b/src/v2/styles/index.layout.scss
@@ -1,5 +1,4 @@
 @use 'base';
-@use 'emoji-replacement';
 @use 'global-layout-variables';
 
 @use 'Avatar/Avatar-layout';