diff --git a/assets/styles/components/_comment.scss b/assets/styles/components/_comment.scss
index 02b406985..17c874c90 100644
--- a/assets/styles/components/_comment.scss
+++ b/assets/styles/components/_comment.scss
@@ -86,7 +86,7 @@ $comment-margin-sm: .3rem;
     grid-area: avatar;
     display: none;
     margin: 0;
-   
+
 
     img{
       width: 30px;
diff --git a/assets/styles/components/_user.scss b/assets/styles/components/_user.scss
index 64039e854..614e5d090 100644
--- a/assets/styles/components/_user.scss
+++ b/assets/styles/components/_user.scss
@@ -41,6 +41,11 @@
   }
 }
 
+.user-avatar {
+  display: inline-block;
+  overflow: hidden;
+}
+
 .user-inline {
   img {
     border-radius: 50%;
diff --git a/templates/components/user_avatar.html.twig b/templates/components/user_avatar.html.twig
index 1b25bc76a..c37d1ad62 100644
--- a/templates/components/user_avatar.html.twig
+++ b/templates/components/user_avatar.html.twig
@@ -4,7 +4,8 @@
        href="{{ path('user_overview', {username: user.username}) }}">
         {% endif %}
         {% if user.avatar %}
-            <img width="{{ width }}" height="{{ height }}"
+            <img class="user-avatar"
+                 width="{{ width }}" height="{{ height }}"
                  style="max-width: {{ width }}px; max-height: {{ height }}px;"
                  src="{{ asset(user.avatar.filePath) | imagine_filter('avatar_thumb') }}"
                  alt="{{ user.username ~' '~ 'avatar'|trans|lower }}">
diff --git a/templates/components/user_inline.html.twig b/templates/components/user_inline.html.twig
index 18c87416a..2aab13705 100644
--- a/templates/components/user_inline.html.twig
+++ b/templates/components/user_inline.html.twig
@@ -4,9 +4,10 @@
    class="user-inline"
    title="{{ user.username|username(true) }}">
     {% if user.avatar and showAvatar %}
-        <img width="30" height="30"
+        <img class="user-avatar"
+             width="30" height="30"
              src="{{ asset(user.avatar.filePath) | imagine_filter('avatar_thumb') }}"
-             alt="{{ user.username ~ ' avatar' }}">
+             alt="{{ user.username ~' '~ 'avatar'|trans|lower }}">
     {% endif %}
     {{ user.apPreferredUsername ?? user.username|username -}}
-</a>
\ No newline at end of file
+</a>
diff --git a/templates/entry/_info.html.twig b/templates/entry/_info.html.twig
index 32962a797..895034e03 100644
--- a/templates/entry/_info.html.twig
+++ b/templates/entry/_info.html.twig
@@ -3,7 +3,8 @@
     <div class="row">
         {% if entry.user.avatar %}
             <figure>
-                <img width="100" height="100"
+                <img class="user-avatar"
+                     width="100" height="100"
                      src="{{ asset(entry.user.avatar.filePath) | imagine_filter('avatar_thumb') }}"
                      alt="{{ entry.user.username ~' '~ 'avatar'|trans|lower }}">
             </figure>
diff --git a/templates/magazine/_moderators_sidebar.html.twig b/templates/magazine/_moderators_sidebar.html.twig
index e7c16eb6c..838ec9c12 100644
--- a/templates/magazine/_moderators_sidebar.html.twig
+++ b/templates/magazine/_moderators_sidebar.html.twig
@@ -4,7 +4,8 @@
         {% for moderator in magazine.moderators|slice(0, 5) %}
             <li>
                 {% if moderator.user.avatar %}
-                    <img width="30"
+                    <img class="user-avatar"
+                         width="30"
                          height="30"
                          src="{{ asset(moderator.user.avatar.filePath) | imagine_filter('avatar_thumb') }}"
                          alt="{{ moderator.user.username ~ ' ' ~ 'avatar'|trans|lower }}">
diff --git a/templates/post/_info.html.twig b/templates/post/_info.html.twig
index b4c164682..ce3e8d75f 100644
--- a/templates/post/_info.html.twig
+++ b/templates/post/_info.html.twig
@@ -3,7 +3,8 @@
     <div class="row">
         {% if post.user.avatar %}
             <figure>
-                <img width="100" height="100"
+                <img class="user-avatar"
+                     width="100" height="100"
                      src="{{ asset(post.user.avatar.filePath) | imagine_filter('avatar_thumb') }}"
                      alt="{{ post.user.username ~' '~ 'avatar'|trans|lower }}">
             </figure>
diff --git a/templates/user/_info.html.twig b/templates/user/_info.html.twig
index 78084d025..02655bb65 100644
--- a/templates/user/_info.html.twig
+++ b/templates/user/_info.html.twig
@@ -4,7 +4,8 @@
         <div class="row">
             {% if user.avatar %}
                 <figure>
-                    <img width="100" height="100"
+                    <img class="user-avatar"
+                         width="100" height="100"
                          src="{{ asset(user.avatar.filePath) | imagine_filter('avatar_thumb') }}"
                          alt="{{ user.username ~' '~ 'avatar'|trans|lower }}">
                 </figure>
diff --git a/templates/user/_list.html.twig b/templates/user/_list.html.twig
index 922c102f5..73dd011cf 100644
--- a/templates/user/_list.html.twig
+++ b/templates/user/_list.html.twig
@@ -13,7 +13,8 @@
                         <li>
                             {% if user.avatar %}
                                 <figure>
-                                    <img width="32" height="32"
+                                    <img class="user-avatar"
+                                         width="32" height="32"
                                          src="{{ asset(user.avatar.filePath) | imagine_filter('avatar_thumb') }}"
                                          alt="{{ user.username ~' '~ 'avatar'|trans|lower }}">
                                 </figure>