diff --git a/less/search.less b/less/search.less
index e836bc0..0f26e1b 100644
--- a/less/search.less
+++ b/less/search.less
@@ -9,6 +9,10 @@
 	}
 }
 
+.search-result-title {
+	font-weight: 600;
+}
+
 .search-result-text {
 	max-height: 250px;
 	overflow: hidden;
@@ -42,6 +46,14 @@
 	.quick-search-title {
 		font-weight: 600;
 	}
+
+	.snippet {
+		word-break: break-word;
+		white-space: normal;
+	}
+}
+
+.quick-search-results, .search-results {
 	.post-info {
 		font-size: 12px;
 		.fa-stack {
@@ -49,9 +61,4 @@
 			border-radius: 50%;
 		}
 	}
-
-	.snippet {
-		word-break: break-word;
-		white-space: normal;
-	}
 }
diff --git a/templates/search.tpl b/templates/search.tpl
index 680679a..e9a2ba9 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -163,7 +163,7 @@
 	</div>
 
 	<div class="row">
-		<div id="results" class="col-md-12" data-search-query="{search_query}">
+		<div id="results" class="search-results col-md-12" data-search-query="{search_query}">
 			<!-- IF matchCount -->
 			<div class="alert alert-info">[[search:results_matching, {matchCount}, {search_query}, {time}]] </div>
 			<!-- ELSE -->
@@ -175,10 +175,9 @@
 			{{{each posts}}}
 			<div class="topic-row panel panel-default clearfix">
 				<div class="panel-body">
-
-					<a href="{config.relative_path}/post/{posts.pid}" class="search-result-text">
-						<h4>{posts.topic.title}</h4>
-					</a>
+					<a href="{config.relative_path}/user/{posts.user.userslug}">{buildAvatar(posts.user, "sm", true)}</a>
+					<span class="search-result-text search-result-title"><a href="{config.relative_path}/post/{posts.pid}">{posts.topic.title}</a></span>
+					<br/>
 					<!-- IF showAsPosts -->
 					<div class="search-result-text">
 						{posts.content}
@@ -186,11 +185,9 @@
 					</div>
 					<!-- ENDIF showAsPosts -->
 
-					<small>
-						<span class="pull-right post-preview-footer">
-							<a href="{config.relative_path}/user/{posts.user.userslug}">{buildAvatar(posts.user, "sm", true)}</a>
-							<a href="{config.relative_path}/category/{posts.category.slug}">[[global:posted_in, {posts.category.name}]] <i class="fa {posts.category.icon}"></i> <span class="timeago" title="{posts.timestampISO}"></span></a>
-						</span>
+					<small class="post-info pull-right">
+						<a href="{config.relative_path}/category/{posts.category.slug}"><span class="fa-stack" style="{function.generateCategoryBackground, posts.category}"><i style="color:{posts.category.color};" class="fa {posts.category.icon} fa-stack-1x"></i></span> {posts.category.name}</a> &bull;
+						<span class="timeago" title="{posts.timestampISO}"></span>
 					</small>
 				</div>
 			</div>