diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss
index 1a7ca8fb..db08ef1e 100644
--- a/src/components/rich_content/rich_content.scss
+++ b/src/components/rich_content/rich_content.scss
@@ -49,7 +49,7 @@
   }
 
   .emoji {
-    display: inline-flex;
+    display: inline-block;
     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 34b4edec..ab3080c8 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -50,7 +50,7 @@
   img {
     width: 100%;
     height: 100%;
-    object-fit: cover;
+    object-fit: contain;
   }
 
   &.animated {
@@ -89,9 +89,4 @@
     }
   }
 }
-.still-image.emoji {
-  img {
-    height: unset;
-  }
-}
 </style>