diff --git a/public/css/topic.less b/public/css/topic.less
index a92a5e221a..1bd3cbf9e9 100644
--- a/public/css/topic.less
+++ b/public/css/topic.less
@@ -6,7 +6,6 @@
 	clear: both;
 
 	.profile-image-block {
-		background: white;
 		display: inline-block;
 		text-align: center;
 		font-size: 12px;
@@ -22,14 +21,13 @@
 	}
 
 	.profile-block, .post-block {
-		border: 1px solid #f0f0f0;
+		border: 1px solid rgba(0, 0, 0, 0.06);
 		border-radius: 5px;
-		
 		padding: 10px;
 	}
 
 	.profile-block {
-		background: #fafafa;
+		background: rgba(0, 0, 0, 0.02);
 		margin-right: -11px;
 		margin-left: -11px;
 		margin-bottom: -11px;
@@ -62,7 +60,7 @@
 				padding-left: 15px;
 				padding-right: 15px; 
 				border: none;
-				border-left: 1px solid #f0f0f0;
+				border-left: 1px solid rgba(0, 0, 0, 0.06);
 				cursor: pointer;
 				background: none;
 				font-size: 12px;
@@ -77,7 +75,6 @@
 				//theme this to make it yellow eventually
 			}
 		}
-		background: #fff;
 	}
 
 	&.deleted {
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 4b64a9fe2e..682e3db238 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -84,11 +84,11 @@
 					<div class="post-signature">{posts.signature}</div>
 					<div class="profile-block">
 						<span class="post-buttons">
-							<button id="ids_{posts.pid}_{posts.uid}" class="edit {posts.display_moderator_tools} hidden-phone" title="Edit"><i class="icon-pencil"></i></button>
-							<button id="ids_{posts.pid}_{posts.uid}" class="delete {posts.display_moderator_tools} hidden-phone" title="Delete"><i class="icon-trash"></i></button>
-							<button id="quote_{posts.pid}_{posts.uid}" class="quote hidden-phone" title="Quote"><i class="icon-quote-left"></i></button>
-							<button id="favs_{posts.pid}_{posts.uid}" class="favourite hidden-phone" title="Favourite"><span class="post_rep_{posts.pid}">{posts.post_rep} </span><i class="{posts.fav_star_class}"></i></button>
-							<button class="post_reply" title="Reply"><i class="icon-reply"></i></button>
+							<button id="ids_{posts.pid}_{posts.uid}" class="edit {posts.display_moderator_tools} btn-link hidden-phone" title="Edit"><i class="icon-pencil"></i></button>
+							<button id="ids_{posts.pid}_{posts.uid}" class="delete {posts.display_moderator_tools} btn-link hidden-phone" title="Delete"><i class="icon-trash"></i></button>
+							<button id="quote_{posts.pid}_{posts.uid}" class="quote btn-link hidden-phone" title="Quote"><i class="icon-quote-left"></i></button>
+							<button id="favs_{posts.pid}_{posts.uid}" class="favourite btn-link hidden-phone" title="Favourite"><span class="post_rep_{posts.pid}">{posts.post_rep} </span><i class="{posts.fav_star_class}"></i></button>
+							<button class="post_reply btn-link" title="Reply"><i class="icon-reply"></i></button>
 						</span>
 						<img class="hidden-desktop" src="{posts.picture}?s=10&default=identicon" align="left" /> posted by <strong><a class="username-field" href="/users/{posts.userslug}">{posts.username}</a></strong> {posts.relativeTime} ago
 						<span class="{posts.edited-class} hidden-phone">| last edited by <strong><a href="/users/{posts.editorslug}">{posts.editorname}</a></strong> {posts.relativeEditTime} ago</span>