2 files changed, 8 insertions, 6 deletions

diff --git a/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss b/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss
index c4fe5a59e..93bdaba57 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss
+++ b/client/src/app/shared/shared-actor-image-edit/actor-image-edit.scss
@@ -16,10 +16,12 @@
 }
 
 .actor-img-edit-button {
-  @include peertube-button-file(21px);
-  @include button-with-icon(19px);
+  @include peertube-button-file(30px);
   @include orange-button;
 
+  display: flex;
+  justify-content: center;
+  padding: 0;
   margin-top: 10px;
   margin-bottom: 5px;
   cursor: pointer;
@@ -30,6 +32,6 @@
   }
 
   my-global-icon {
-    right: 7px;
+    width: 19px;
   }
 }
diff --git a/client/src/app/shared/shared-main/account/actor.model.ts b/client/src/app/shared/shared-main/account/actor.model.ts
index 6be6b75d0..6e45ba588 100644
--- a/client/src/app/shared/shared-main/account/actor.model.ts
+++ b/client/src/app/shared/shared-main/account/actor.model.ts
@@ -21,11 +21,11 @@ export abstract class Actor implements ServerActor {
   isLocal: boolean
 
   static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size?: number) {
-    const avatars = actor.avatars.sort((a, b) => b.width - a.width)
+    const avatarsAscWidth = actor.avatars.sort((a, b) => a.width - b.width)
 
     const avatar = size
-      ? avatars.find(a => a.width >= size)
-      : avatars[0]
+      ? avatarsAscWidth.find(a => a.width >= size)
+      : avatarsAscWidth[avatarsAscWidth.length - 1] // Bigger one
 
     if (!avatar) return ''
     if (avatar.url) return avatar.url