diff --git a/src/components/emoji_reactions/emoji_reactions.scss b/src/components/emoji_reactions/emoji_reactions.scss
index 8ea45e1b4..f4b7d3fb0 100644
--- a/src/components/emoji_reactions/emoji_reactions.scss
+++ b/src/components/emoji_reactions/emoji_reactions.scss
@@ -41,7 +41,7 @@
     margin: 0;
 
     .reaction-emoji {
-      width: var(--emoji-size);
+      width: auto;
       height: var(--emoji-size);
       margin-right: 0.25em;
       line-height: var(--emoji-size);
@@ -55,7 +55,7 @@
     .reaction-emoji-content {
       max-width: 100%;
       max-height: 100%;
-      width: var(--emoji-size);
+      width: auto;
       height: var(--emoji-size);
       line-height: inherit;
       overflow: hidden;
diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss
index d2ec77dcb..b1a9337e0 100644
--- a/src/components/rich_content/rich_content.scss
+++ b/src/components/rich_content/rich_content.scss
@@ -73,7 +73,7 @@
 
   .emoji {
     display: inline-block;
-    width: var(--emoji-size, 32px);
+    width: auto;
     height: var(--emoji-size, 32px);
   }
 
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 909a014ce..9864cb302 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -299,7 +299,8 @@ export const parseAttachment = (data) => {
   }
 
   if (data.type !== 'unknown') {
-    output.type = data.type
+    // treat gifv like it is "video"
+    output.type = data.type === 'gifv' ? 'video' : data.type
   } else {
     output.type = fileTypeService.fileType(output.mimetype)
   }