diff --git a/customize.dist/src/less/mixins.less b/customize.dist/src/less/mixins.less
index 0719784b9..02088e0a3 100644
--- a/customize.dist/src/less/mixins.less
+++ b/customize.dist/src/less/mixins.less
@@ -76,8 +76,7 @@
         height: @width;
         justify-content: center;
         align-items: center;
-        margin-right: 5px;
-        border-radius: @width / 30px;
+        border-radius: @width / 2px;
         overflow: hidden;
         box-sizing: content-box;
     }
@@ -85,7 +84,7 @@
         .unselectable();
         background: white;
         color: black;
-        font-size: 40px;
+        font-size: @width/1.2;
     }
     .right-col {
         flex: 1;
diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less
index e5640e778..2681247c0 100644
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -111,8 +111,9 @@ body .userlist-drawer {
             padding: 5px;
             margin: 2px 0;
             background: rgba(0,0,0,0.1);
-            .avatar(50px);
+            .avatar(30px);
             .default, media-tag {
+                margin-right: 5px;
                 border: 1px solid black;
             }
         }
@@ -825,7 +826,10 @@ body .cryptpad-toolbar {
                     font-size: 32px;
                 }
                 &.avatar {
-                    .avatar(64px);
+                    .avatar(48px);
+                    media-tag {
+                        margin: 8px;
+                    }
                     border: 0;
                 }
             }
diff --git a/www/friends/main.less b/www/friends/main.less
index 816ce393d..b8a53fef0 100644
--- a/www/friends/main.less
+++ b/www/friends/main.less
@@ -67,7 +67,7 @@ body {
 }
 
 #friendList .friend, #messaging .header {
-    .avatar(50px);
+    .avatar(30px);
     &.avatar {
         display: flex;
     }
diff --git a/www/profile/main.less b/www/profile/main.less
index 480c25b73..f5140dd3f 100644
--- a/www/profile/main.less
+++ b/www/profile/main.less
@@ -30,7 +30,7 @@
             height: 300px;
             width: 300px;
             border: 1px solid black;
-            border-radius: 10px;
+            border-radius: 150px;
             overflow: hidden;
             position: relative;
             .delete {