diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 6da86341c1..7384804c9d 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -133,7 +133,11 @@
 			}
 		};
 
-		$div.addClass('icon-loading');
+		if (size < 32) {
+			$div.addClass('icon-loading-small');
+		} else {
+			$div.addClass('icon-loading');
+		}
 		img.width = size;
 		img.height = size;
 		img.src = url;
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
index 81f0b12e61..7c1bd72455 100644
--- a/core/js/placeholder.js
+++ b/core/js/placeholder.js
@@ -169,5 +169,6 @@
 		this.css('font-size', '');
 		this.html('');
 		this.removeClass('icon-loading');
+		this.removeClass('icon-loading-small');
 	};
 }(jQuery));