diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index b84d234..207582d 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -5,7 +5,15 @@
 	<div class="row">
 		<div class="col-md-2">
 			<div class="account-picture-block text-center">
-				<img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br /><br />
+				<div class="row">
+					<div class="col-xs-12">
+						<!-- IF picture -->
+						<img id="user-current-picture" class="user-profile-picture" src="{picture}" />
+						<!-- ELSE -->
+						<div class="user-icon user-profile-picture" style="background-color: {icon:bgColor};">{icon:text}</div>
+						<!-- ENDIF picture -->
+					</div>
+				</div>
 				<a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a>
 				<br/><br/>
 				<!-- IF config.allowAccountDelete -->
diff --git a/templates/partials/modals/change_picture_modal.tpl b/templates/partials/modals/change_picture_modal.tpl
index 20435bf..aa24baa 100644
--- a/templates/partials/modals/change_picture_modal.tpl
+++ b/templates/partials/modals/change_picture_modal.tpl
@@ -6,9 +6,9 @@
 					<h3 id="change-picture">[[user:change_picture]]</h3>
 				</div>
 				<div class="modal-body">
-					<div id="gravatar-box">
-						<img id="user-gravatar-picture" src="" class="user-profile-picture">
-						<span class="user-picture-label">[[user:gravatar]]</span>
+					<div id="default-box">
+						<div class="user-icon user-profile-picture"></div>
+						<span class="user-picture-label">[[user:default_picture]]</span>
 						<i class='fa fa-check fa-2x'></i>
 					</div>
 					<br/>