diff --git a/app/assets/stylesheets/generic/avatar.scss b/app/assets/stylesheets/generic/avatar.scss
index 4f038b977e2..4e0e546872b 100644
--- a/app/assets/stylesheets/generic/avatar.scss
+++ b/app/assets/stylesheets/generic/avatar.scss
@@ -2,8 +2,9 @@
   float: left;
   margin-right: 12px;
   width: 40px;
-  padding: 1px;
-  @include border-radius(4px);
+  height: 40px;
+  padding: 0;
+  @include border-radius($avatar_radius);
 
   &.avatar-inline {
     float: none;
diff --git a/app/assets/stylesheets/generic/timeline.scss b/app/assets/stylesheets/generic/timeline.scss
index ee3bf9c1b2d..f92a79f7a5f 100644
--- a/app/assets/stylesheets/generic/timeline.scss
+++ b/app/assets/stylesheets/generic/timeline.scss
@@ -42,7 +42,7 @@
         background: #fff;
         color: #737881;
         float: left;
-        @include border-radius(40px);
+        @include border-radius($avatar_radius);
         @include box-shadow(0 0 0 3px #EEE);
         overflow: hidden;
 
diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss
index 32fde32c42d..6bbce70a782 100644
--- a/app/assets/stylesheets/main/variables.scss
+++ b/app/assets/stylesheets/main/variables.scss
@@ -57,3 +57,5 @@ $list-font-size: 15px;
  * Sidebar navigation width
  */
 $sidebar_width: 230px;
+
+$avatar_radius: 50%;
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index a5098b6da5b..047617e54ba 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -140,7 +140,7 @@ header {
     img {
       width: 26px;
       height: 26px;
-      @include border-radius(4px);
+      @include border-radius($avatar_radius);
     }
   }
 
diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss
index 086875582f3..0ab62b7ae49 100644
--- a/app/assets/stylesheets/sections/profile.scss
+++ b/app/assets/stylesheets/sections/profile.scss
@@ -102,12 +102,3 @@
     }
   }
 }
-
-.profile-groups-avatars {
-  margin: 0 5px 10px 0;
-
-  img {
-    width: 50px;
-    height: 50px;
-  }
-}
diff --git a/app/views/users/_groups.html.haml b/app/views/users/_groups.html.haml
index ea008c2dede..b9bd6aa3763 100644
--- a/app/views/users/_groups.html.haml
+++ b/app/views/users/_groups.html.haml
@@ -1,3 +1,4 @@
-- groups.each do |group|
-  = link_to group, class: 'profile-groups-avatars', :title => group.name do
-    - image_tag group_icon(group.path)
+.clearfix
+  - groups.each do |group|
+    = link_to group, class: 'profile-groups-avatars', title: group.name do
+      = image_tag group_icon(group.path), class: 'avatar s40'