diff --git a/src/components/views/messages/ReactionsRowButton.tsx b/src/components/views/messages/ReactionsRowButton.tsx
index 3b165b9a61f..3b04fe71f7b 100644
--- a/src/components/views/messages/ReactionsRowButton.tsx
+++ b/src/components/views/messages/ReactionsRowButton.tsx
@@ -18,6 +18,7 @@ import React from "react";
 import classNames from "classnames";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
+import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from "../../../languageHandler";
 import { formatCommaSeparatedList } from "../../../utils/FormattingUtils";
 import dis from "../../../dispatcher/dispatcher";
@@ -130,9 +131,18 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
                 onMouseOver={this.onMouseOver}
                 onMouseLeave={this.onMouseLeave}
             >
-                <span className="mx_ReactionsRowButton_content" aria-hidden="true">
-                    {content}
-                </span>
+                {content.startsWith("mxc://") ? (
+                    <img
+                        className="mx_ReactionsRowButton_content"
+                        src={MatrixClientPeg.get().mxcUrlToHttp(content)}
+                        width="20"
+                        height="20"
+                    />
+                ) : (
+                    <span className="mx_ReactionsRowButton_content" aria-hidden="true">
+                        {content}
+                    </span>
+                )}
                 <span className="mx_ReactionsRowButton_count" aria-hidden="true">
                     {count}
                 </span>
diff --git a/src/components/views/messages/ReactionsRowButtonTooltip.tsx b/src/components/views/messages/ReactionsRowButtonTooltip.tsx
index c665f60620a..e2e0b8f6f98 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.tsx
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.tsx
@@ -32,6 +32,16 @@ interface IProps {
     visible: boolean;
 }
 
+const getCustomReactionName = (reactionEvents: Set<MatrixEvent>) => {
+    for (const event of reactionEvents) {
+        if (event.event.content?.["com.beeper.reaction.shortcode"]) {
+            return event.event.content?.["com.beeper.reaction.shortcode"];
+        }
+    }
+
+    return '';
+};
+
 export default class ReactionsRowButtonTooltip extends React.PureComponent<IProps> {
     public static contextType = MatrixClientContext;
     public context!: React.ContextType<typeof MatrixClientContext>;
@@ -48,7 +58,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent<IProp
                 const name = member?.name ?? reactionEvent.getSender()!;
                 senders.push(name);
             }
-            const shortName = unicodeToShortcode(content);
+            const shortName = unicodeToShortcode(content) || getCustomReactionName(reactionEvents);
             tooltipLabel = (
                 <div>
                     {_t(