diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss
index db08ef1e..1a7ca8fb 100644
--- a/src/components/rich_content/rich_content.scss
+++ b/src/components/rich_content/rich_content.scss
@@ -49,7 +49,7 @@
   }
 
   .emoji {
-    display: inline-block;
+    display: inline-flex;
     width: var(--emoji-size, 32px);
     height: var(--emoji-size, 32px);
   }
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index fa3edacf..21fe6440 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -93,4 +93,9 @@
     }
   }
 }
+.still-image.emoji {
+  img {
+    height: unset;
+  }
+}
 </style>