diff --git a/resources/comments.scss b/resources/comments.scss
index b4586a7d5..85290afdb 100644
--- a/resources/comments.scss
+++ b/resources/comments.scss
@@ -144,11 +144,6 @@ a {
         display: flex;
     }
 
-    .gravatar {
-        width: 75px;
-        max-width: 75px;
-    }
-
     .gravatar-mobile {
         display: none;
     }
@@ -164,9 +159,9 @@ a {
     }
 
     @media (max-width: 760px) {
-        .gravatar {
-            width: 10px;
-            max-width: 10px;
+        img.user-gravatar {
+            display: inline-block;
+            border-radius: 2px;
         }
 
         .gravatar-mobile {
diff --git a/resources/ticket.scss b/resources/ticket.scss
index db6858d52..255322ee0 100644
--- a/resources/ticket.scss
+++ b/resources/ticket.scss
@@ -162,9 +162,7 @@ div.ticket-title {
         width: 130px;
     }
 
-    .gravatar {
-        width: 80px;
-        display: block;
+    img.user-gravatar {
         margin: 0 auto;
     }
 
diff --git a/resources/users.scss b/resources/users.scss
index 1809c9e49..92f0f83f8 100644
--- a/resources/users.scss
+++ b/resources/users.scss
@@ -117,6 +117,7 @@ tr:target {
 img.user-gravatar {
     display: block;
     border-radius: 6px;
+    background-color: white;
 }
 
 .user-content {
diff --git a/templates/comments/list.html b/templates/comments/list.html
index 1d96fcf17..f4efc28f0 100644
--- a/templates/comments/list.html
+++ b/templates/comments/list.html
@@ -43,7 +43,7 @@
                             </div>
                             {% with author=node.author, user=node.author.user %}
                                 <a href="{{ url('user_page', user.username) }}" class="user gravatar-main">
-                                    <img src="{{ gravatar(author, 135) }}" class="gravatar">
+                                    <img src="{{ gravatar(author, 75) }}" class="user-gravatar">
                                 </a>
                             {% endwith %}
                         </div>
@@ -52,7 +52,7 @@
                                 <span>
                                     {% with author=node.author, user=node.author.user %}
                                         <a href="{{ url('user_page', user.username) }}" class="user gravatar-mobile">
-                                            <img src="{{ gravatar(author, 135) }}" class="gravatar">
+                                            <img src="{{ gravatar(author, 10) }}" class="user-gravatar">
                                         </a>
                                     {% endwith %}
                                     {{ link_user(node.author) }}&nbsp;
diff --git a/templates/ticket/message.html b/templates/ticket/message.html
index aa6744545..7c4c65923 100644
--- a/templates/ticket/message.html
+++ b/templates/ticket/message.html
@@ -1,7 +1,7 @@
 <section id="message-{{ message.id }}" class="ticket-message">
     <div class="info">
         <a href="{{ url('user_page', message.user.user.username) }}" class="user">
-            <img src="{{ gravatar(message.user, 135) }}" class="gravatar">
+            <img src="{{ gravatar(message.user, 80) }}" class="user-gravatar">
         </a>
     </div>
     <div class="detail">
diff --git a/templates/ticket/ticket.html b/templates/ticket/ticket.html
index 59e077f2b..76847f847 100644
--- a/templates/ticket/ticket.html
+++ b/templates/ticket/ticket.html
@@ -165,7 +165,7 @@
             <section class="ticket-message new-message">
                 <div class="info">
                     <a href="{{ url('user_page', request.user.username) }}" class="user">
-                        <img src="{{ gravatar(request.user, 135) }}" class="gravatar">
+                        <img src="{{ gravatar(request.user, 80) }}" class="user-gravatar">
                     </a>
                 </div>
                 <div class="detail">
diff --git a/templates/user/user-base.html b/templates/user/user-base.html
index 32e9d212e..8965e1b80 100644
--- a/templates/user/user-base.html
+++ b/templates/user/user-base.html
@@ -11,7 +11,7 @@
 {% block body %}
     <div class="user-info-page">
         <div class="user-sidebar">
-            <img src="{{ gravatar(user, 135) }}" width="135px" height="135px" class="user-gravatar">
+            <img src="{{ gravatar(user, 135) }}" class="user-gravatar">
             <br>
 
             <div><b>