diff --git a/public/css/topic.less b/public/css/topic.less
index 2d6aa63cbc..a89e53c0bc 100644
--- a/public/css/topic.less
+++ b/public/css/topic.less
@@ -28,10 +28,6 @@
 		padding: 10px;
 	}
 
-	img {
-		margin: 5px;
-	}
-
 	.profile-block {
 		background: #fafafa;
 		margin-right: -11px;
@@ -107,7 +103,7 @@
 			color: white;
 			position: relative;
 			float: left;
-			margin-right: 15px;
+			margin-right: 25px;
 			margin-bottom: 0px;
 			padding-bottom: 0px;
 			text-align: center;
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index ed5d07aeec..9d716a1e3d 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -25,7 +25,7 @@
 			<div class="span12">
 				<div class="post-block">
 					<a class="main-avatar" href="/users/{main_posts.userslug}">
-						<img src="{main_posts.picture}?s=80&default=identicon" align="left" /><br />
+						<img src="{main_posts.picture}" align="left" class="img-polaroid"/><br />
 						<div class="hover-overlay">
 							{main_posts.username}<br />
 							<i class="icon-star"></i><span class="user_rep_{main_posts.uid}">{main_posts.user_rep}</span>
@@ -73,7 +73,7 @@
 			<div class="span1 profile-image-block visible-desktop">
 				<!--<i class="icon-spinner icon-spin icon-2x pull-left"></i>-->
 				<a href="/users/{posts.userslug}">
-					<img src="{posts.picture}?s=80&default=identicon" align="left" />
+					<img src="{posts.picture}" align="left" class="img-polaroid"/>
 				</a>
 				<i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span>
 				<div id="ids_{posts.pid}_{posts.uid}" class="chat hidden-phone" title="Chat"><i class="icon-comment"></i></div>
diff --git a/src/user.js b/src/user.js
index 10e3bdc415..71b18642d2 100644
--- a/src/user.js
+++ b/src/user.js
@@ -233,10 +233,11 @@ var utils = require('./../public/src/utils.js'),
 	};
 
 	User.createGravatarURLFromEmail = function(email) {
-		if (!email) email = utils.generateUUID();
+		if (!email) 
+			email = utils.generateUUID();
 		var md5sum = crypto.createHash('md5');
 		md5sum.update(email.toLowerCase().trim());
-		var gravatarURL = 'http://www.gravatar.com/avatar/' + md5sum.digest('hex') + '?default=identicon';
+		var gravatarURL = 'http://www.gravatar.com/avatar/' + md5sum.digest('hex') + '?default=identicon&s=128';
 		return gravatarURL;
 	}