diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index 53a143c8bc01f26bcc136d5f96f0799cc38b32eb..8a989994e16cc507d049431216636cc8bce6c062 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -3170,8 +3170,10 @@ a.github-fork {
 		text-align: right;
 		padding-left: 20px;
 	}
-	button {
+	.button {
 		min-width: 120px;
+		cursor: pointer;
+		text-align: center;
 	}
 	input[type=file] {
 		position: absolute !important;
@@ -3181,6 +3183,7 @@ a.github-fork {
 		height: 100%;
 		opacity: 0;
 		z-index: 10000;
+		cursor: pointer;
 		* {
 			cursor: pointer;
 		}
diff --git a/client/views/avatar/prompt.html b/client/views/avatar/prompt.html
index edd657bac905cc215d8e9bf069783e855277b741..e2d5669d8b7f23cfed3a84d69dcaa8fe288327bf 100644
--- a/client/views/avatar/prompt.html
+++ b/client/views/avatar/prompt.html
@@ -29,16 +29,30 @@
 		</header>
 		<div>
 			<div class="avatar-suggestions">
-				{{#if suggestions.ready}}
-					<div class="avatar-suggestion-item">
-						{{> avatar username=initialsUsername }}
-						{{#with service='initials'}}
-							<div class="action">
-								<button type="button" class="button primary select-service">{{_ "Use_initials_avatar" }}</button>
-							</div>
+				<div class="avatar-suggestion-item">
+					{{> avatar username=initialsUsername }}
+					{{#with service='initials'}}
+						<div class="action">
+							<button type="button" class="button primary select-service">{{_ "Use_initials_avatar" }}</button>
+						</div>
+					{{/with}}
+				</div>
+				<div class="avatar-suggestion-item">
+					<div style="background-image: url({{upload.blob}});" class="avatar {{#unless upload}}question-mark icon-upload{{/unless}}">
+					</div>
+					<div class="action">
+						{{#with upload}}
+							<button type="button" class="button primary select-service">{{_ "Use_uploaded_avatar"}}</button>
 						{{/with}}
+						{{#unless upload}}
+							<div class="button primary">{{_ "Select_file"}}
+								<input type="file" class="avatar-file-input" accept="image/*">
+							</div>
+						{{/unless}}
 					</div>
+				</div>
 
+				{{#if suggestions.ready}}
 					{{> avatarSuggestion suggestions.avatars.gravatar}}
 					{{> avatarSuggestion suggestions.avatars.facebook}}
 					{{> avatarSuggestion suggestions.avatars.google}}
@@ -58,20 +72,7 @@
 						{{> avatarSuggestionLogin 'linkedin'}}
 					{{/unless}}
 
-					<div class="avatar-suggestion-item">
-						<div style="background-image: url({{upload.blob}});" class="avatar {{#unless upload}}question-mark icon-upload{{/unless}}">
-						</div>
-						<div class="action">
-							{{#with upload}}
-								<button type="button" class="button primary select-service">{{_ "Use_uploaded_avatar"}}</button>
-							{{/with}}
-							{{#unless upload}}
-								<button type="button" class="button primary">{{_ "Select_file"}}
-									<input type="file" class="avatar-file-input" accept="image/*">
-								</button>
-							{{/unless}}
-						</div>
-					</div>
+					
 				{{else}}
 					{{_ "Loading_suggestion"}}
 				{{/if}}