diff --git a/src/lib/appManagers/appMessagesManager.ts b/src/lib/appManagers/appMessagesManager.ts
index a06bd064..8a6030c4 100644
--- a/src/lib/appManagers/appMessagesManager.ts
+++ b/src/lib/appManagers/appMessagesManager.ts
@@ -2645,7 +2645,10 @@ export class AppMessagesManager {
             } else if(document.type === 'round') {
               addPart('AttachRound', undefined, message.message);
             } else if(document.type === 'sticker') {
-              addPart(undefined, ((plain ? document.stickerEmojiRaw : document.stickerEmoji) || ''));
+              if(document.stickerEmojiRaw) {
+                addPart(undefined, (plain ? document.stickerEmojiRaw : document.stickerEmoji) + ' ');
+              }
+              
               addPart('AttachSticker');
               text = '';
             } else if(document.type === 'audio') {
diff --git a/src/scss/partials/_chat.scss b/src/scss/partials/_chat.scss
index fee4a169..9fe477ad 100644
--- a/src/scss/partials/_chat.scss
+++ b/src/scss/partials/_chat.scss
@@ -947,10 +947,10 @@ $chat-helper-size: 36px;
 			} */
 		}
 
-		span.emoji {
+		/* span.emoji {
 			margin: 0 .125rem;
 			// font-size: .8rem;
-		}
+		} */
 	}
 
 	.new-message-wrapper {
diff --git a/src/scss/partials/_chatBubble.scss b/src/scss/partials/_chatBubble.scss
index 6e5e3055..9b79cb38 100644
--- a/src/scss/partials/_chatBubble.scss
+++ b/src/scss/partials/_chatBubble.scss
@@ -450,7 +450,7 @@ $bubble-margin: .25rem;
   img.emoji {
     height: 18px;
     width: 18px;
-    margin: 0 .05rem;
+    // margin: 0 .05rem;
     vertical-align: bottom;
   }
 
@@ -2437,8 +2437,8 @@ $bubble-margin: .25rem;
       width: .875rem;
     }
 
-    img.emoji {
+    /* img.emoji {
       margin: 0 .125rem;
-    }
+    } */
   }
 }
diff --git a/src/scss/partials/_chatPinned.scss b/src/scss/partials/_chatPinned.scss
index f23c6981..a9ff5ed5 100644
--- a/src/scss/partials/_chatPinned.scss
+++ b/src/scss/partials/_chatPinned.scss
@@ -133,11 +133,11 @@
   user-select: none;
   /* padding: .25rem; */
 
-  &.is-media {
+  /* &.is-media {
     .emoji:first-child {
       margin: 0 .25rem 0 0;
     }
-  }
+  } */
   
   &-content {
     flex-grow: 1;
diff --git a/src/scss/style.scss b/src/scss/style.scss
index d5a44090..3a1e3822 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -874,7 +874,7 @@ not screen and (                min-resolution: 2dppx) {
 img.emoji {
   width: 18px;
   height: 18px;
-  margin: 0 .125rem;
+  // margin: 0 .125rem;
 
   display: inline-block;
   /* width: 100%;