diff --git a/app/javascript/flavours/glitch/components/avatar.js b/app/javascript/flavours/glitch/components/avatar.js
index c5e9072c4..e3a838523 100644
--- a/app/javascript/flavours/glitch/components/avatar.js
+++ b/app/javascript/flavours/glitch/components/avatar.js
@@ -57,14 +57,14 @@ export default class Avatar extends React.PureComponent {
       backgroundSize: `${size}px ${size}px`,
     };
 
+    let imageSrc = staticSrc;
     if (hovering || animate) {
-      style.backgroundImage = `url(${src})`;
-    } else {
-      style.backgroundImage = `url(${staticSrc})`;
+      imageSrc = src;
     }
 
     return (
-      <div
+      <img
+        src={imageSrc}
         className={computedClass}
         onMouseEnter={this.handleMouseEnter}
         onMouseLeave={this.handleMouseLeave}
diff --git a/app/javascript/flavours/glitch/components/avatar_composite.js b/app/javascript/flavours/glitch/components/avatar_composite.js
index e30dfe68a..3c2a5a22d 100644
--- a/app/javascript/flavours/glitch/components/avatar_composite.js
+++ b/app/javascript/flavours/glitch/components/avatar_composite.js
@@ -67,6 +67,8 @@ export default class AvatarComposite extends React.PureComponent {
       }
     }
 
+    const imageSrc = account.get(animate ? 'avatar' : 'avatar_static');
+
     const style = {
       left: left,
       top: top,
@@ -74,8 +76,6 @@ export default class AvatarComposite extends React.PureComponent {
       bottom: bottom,
       width: `${width}%`,
       height: `${height}%`,
-      backgroundSize: 'cover',
-      backgroundImage: `url(${account.get(animate ? 'avatar' : 'avatar_static')})`,
     };
 
     return (
@@ -86,7 +86,7 @@ export default class AvatarComposite extends React.PureComponent {
         title={`@${account.get('acct')}`}
         key={account.get('id')}
       >
-        <div style={style} data-avatar-of={`@${account.get('acct')}`} />
+        <img src={imageSrc} style={style} data-avatar-of={`@${account.get('acct')}`} />
       </a>
     );
   }
diff --git a/app/javascript/mastodon/components/avatar.js b/app/javascript/mastodon/components/avatar.js
index 570505833..aa8b96895 100644
--- a/app/javascript/mastodon/components/avatar.js
+++ b/app/javascript/mastodon/components/avatar.js
@@ -53,14 +53,14 @@ export default class Avatar extends React.PureComponent {
       backgroundSize: `${size}px ${size}px`,
     };
 
+    let imageSrc = staticSrc;
     if (hovering || animate) {
-      style.backgroundImage = `url(${src})`;
-    } else {
-      style.backgroundImage = `url(${staticSrc})`;
+      imageSrc = src;
     }
 
     return (
-      <div
+      <img
+        src={imageSrc}
         className={className}
         onMouseEnter={this.handleMouseEnter}
         onMouseLeave={this.handleMouseLeave}