diff --git a/Changelog.md b/Changelog.md
index 1a957fa40..c058c7ccb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -99,6 +99,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Unify not connected pages (sign in, sign up, forgot password) [#5391](https://github.com/diaspora/diaspora/pull/5391)
 * Port remaining stream pages to Bootstrap [#5715](https://github.com/diaspora/diaspora/pull/5715)
 * Partial Backbone port of the notification dropdown [#5707](https://github.com/diaspora/diaspora/pull/5707)
+* Add rounded corners for avatars [#5733](https://github.com/diaspora/diaspora/pull/5733)
 
 ## Bug fixes
 * orca cannot see 'Add Contact' button [#5158](https://github.com/diaspora/diaspora/pull/5158)
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index 4e153d491..0f078ecba 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -31,6 +31,8 @@ a { color : $link-blue  }
 .icon-blue  { background-image: image_url("img/glyphicons-halflings-blue.png");  }
 
 .avatar {
+  border-radius: 4px;
+
   &.micro {
     height: 20px;
     width: 20px;
@@ -40,6 +42,12 @@ a { color : $link-blue  }
     height: 35px;
     width: 35px;
   }
+
+  &.medium {
+    height: auto;
+    width: auto;
+    max-width: 75px;
+  }
 }
 
 .author-name {
diff --git a/app/assets/stylesheets/new_styles/_settings.scss b/app/assets/stylesheets/new_styles/_settings.scss
index d5324108c..f0679ed8a 100644
--- a/app/assets/stylesheets/new_styles/_settings.scss
+++ b/app/assets/stylesheets/new_styles/_settings.scss
@@ -13,5 +13,8 @@
 }
 
 #profile_photo_upload .avatar {
-	max-width: 150px;
-}
\ No newline at end of file
+  height: auto;
+  width: auto;
+  max-width: 200px;
+  margin-bottom: 10px;
+}
diff --git a/app/assets/stylesheets/single-post-view.scss b/app/assets/stylesheets/single-post-view.scss
index f931fc61f..3a371efbb 100644
--- a/app/assets/stylesheets/single-post-view.scss
+++ b/app/assets/stylesheets/single-post-view.scss
@@ -20,9 +20,6 @@
           line-height: $font-size-text;
         }
       }
-      .avatar.medium {
-        max-width: 75px;
-      }
       .bd {
         padding-left: 10px;
       }
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index 2c2bb2d86..0361701e0 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -72,7 +72,7 @@
       <div class="user-menu-more-indicator">
         ▼
       </div>
-      <img alt="{{current_user.name}}" class="user-menu-avatar" src="{{current_user.avatar.small}}" title="{{current_user.name}}" />
+      <img alt="{{current_user.name}}" class="avatar user-menu-avatar" src="{{current_user.avatar.small}}" title="{{current_user.name}}" />
       <a class="user-name" href="#">{{current_user.name}}</a>
     </li>
     <li class="user-menu-item"><a href="/people/{{current_user.guid}}">{{t "header.profile"}}</a></li>
diff --git a/app/views/photos/_new_profile_photo.haml b/app/views/photos/_new_profile_photo.haml
index 2c6b50b0c..af526be04 100644
--- a/app/views/photos/_new_profile_photo.haml
+++ b/app/views/photos/_new_profile_photo.haml
@@ -58,7 +58,7 @@
     window.onload = createUploader;
 
 #profile_photo_upload
-  = owner_image_tag(:thumb_medium)
+  = owner_image_tag(:thumb_large)
 
   .clearfix