diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 958f0f9edd..6da86341c1 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -110,9 +110,8 @@
 
 		// If the new image loads successfully set it.
 		img.onload = function() {
-			$div.text('');
-			$div.append(img);
 			$div.clearimageplaceholder();
+			$div.append(img);
 
 			if(typeof callback === 'function') {
 				callback();
@@ -127,7 +126,6 @@
 				$div.imageplaceholder(user, displayname);
 			} else {
 				setAvatarForUnknownUser($div);
-				$div.removeClass('icon-loading');
 			}
 
 			if(typeof callback === 'function') {
@@ -136,7 +134,6 @@
 		};
 
 		$div.addClass('icon-loading');
-		$div.show();
 		img.width = size;
 		img.height = size;
 		img.src = url;
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
index 5cf7b9095a..29f91b6698 100644
--- a/core/js/placeholder.js
+++ b/core/js/placeholder.js
@@ -156,6 +156,7 @@
 		this.css('text-align', '');
 		this.css('line-height', '');
 		this.css('font-size', '');
+		this.html('');
 		this.removeClass('icon-loading');
 	};
 }(jQuery));