diff --git a/public/templates/recent.tpl b/public/templates/recent.tpl
index 3542bde8a2..e9c86be854 100644
--- a/public/templates/recent.tpl
+++ b/public/templates/recent.tpl
@@ -24,49 +24,51 @@
 	<div class="{topic_row_size}">
 		<ul id="topics-container">
 		<!-- BEGIN topics -->
-		<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
-			<li class="category-item {topics.deleted-class}">
-				<div class="row">
-					<div class="col-md-12 col-xs-12 topic-row img-thumbnail">
+		<li class="category-item {topics.deleted-class}">
+			<div class="row">
+				<div class="col-md-12 col-xs-12 topic-row img-thumbnail">
 
-						<a href="../../topic/{topics.slug}">
-							<h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3>
-						</a>
-						<small>
-							<span class="topic-stats">
-								<span class="badge {topics.badgeclass}">{topics.postcount}</span> posts
-							</span>
-							<span class="topic-stats">
-								<span class="badge {topics.badgeclass}">{topics.viewcount}</span> views
-							</span>
+					<a href="../../topic/{topics.slug}">
+						<h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3>
+					</a>
+					<small>
+						<span class="topic-stats">
+							<span class="badge {topics.badgeclass}">{topics.postcount}</span> posts
+						</span>
+						<span class="topic-stats">
+							<span class="badge {topics.badgeclass}">{topics.viewcount}</span> views
+						</span>
+						|
+						<span> posted in
+							<a href="../../category/{topics.categorySlug}">
+								<i class="{topics.categoryIcon}"></i> {topics.categoryName}
+							</a>
+						</span>
 
-							<span class="pull-right hidden-xs">
-								<a href="/user/{topics.userslug}">
-									<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/>
-								</a>
+						<span class="pull-right hidden-xs">
+							<a href="/user/{topics.userslug}">
+								<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/>
+							</a>
 
-								<a href="../../topic/{topics.slug}">
-									<span>
-										posted <span class="timeago" title="{topics.relativeTime}"></span>
-									</span>
-								</a>
-								|
-								<a href="/user/{topics.teaser_userslug}">
-									<img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
-								</a>
-								<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
-									<span>
-									 	replied <span class="timeago" title="{topics.teaser_timestamp}"></span>
-									</span>
-								</a>
-							</span>
-						</small>
-
-
-					</div>
+							<a href="../../topic/{topics.slug}">
+								<span>
+									posted <span class="timeago" title="{topics.relativeTime}"></span>
+								</span>
+							</a>
+							|
+							<a href="/user/{topics.teaser_userslug}">
+								<img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
+							</a>
+							<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
+								<span>
+								 	replied <span class="timeago" title="{topics.teaser_timestamp}"></span>
+								</span>
+							</a>
+						</span>
+					</small>
 				</div>
-			</li>
-		</a>
+			</div>
+		</li>
 		<!-- END topics -->
 		</ul>
 	</div>
diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl
index 0f232b22cd..641df62c1b 100644
--- a/public/templates/unread.tpl
+++ b/public/templates/unread.tpl
@@ -19,46 +19,50 @@
 		<div class="{topic_row_size}">
 			<ul id="topics-container" data-next-start="{nextStart}">
 			<!-- BEGIN topics -->
-			<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
-				<li class="category-item {topics.deleted-class}">
-					<div class="row">
-						<div class="col-md-12 topic-row">
-							<a href="../../topic/{topics.slug}">
-								<h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3>
-							</a>
-							<small>
-								<span class="topic-stats">
-									<span class="badge {topics.badgeclass}">{topics.postcount}</span> posts
-								</span>
-								<span class="topic-stats">
-									<span class="badge {topics.badgeclass}">{topics.viewcount}</span> views
-								</span>
+			<li class="category-item {topics.deleted-class}">
+				<div class="row">
+					<div class="col-md-12 topic-row">
+						<a href="../../topic/{topics.slug}">
+							<h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3>
+						</a>
+						<small>
+							<span class="topic-stats">
+								<span class="badge {topics.badgeclass}">{topics.postcount}</span> posts
+							</span>
+							<span class="topic-stats">
+								<span class="badge {topics.badgeclass}">{topics.viewcount}</span> views
+							</span>
+							|
+							<span> posted in
+								<a href="../../category/{topics.categorySlug}">
+									<i class="{topics.categoryIcon}"></i> {topics.categoryName}
+								</a>
+							</span>
 
-								<span class="pull-right hidden-xs">
-									<a href="/user/{topics.userslug}">
-										<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/>
-									</a>
+							<span class="pull-right hidden-xs">
+								<a href="/user/{topics.userslug}">
+									<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/>
+								</a>
 
-									<a href="../../topic/{topics.slug}">
-										<span>
-											posted <span class="timeago" title="{topics.relativeTime}"></span>
-										</span>
-									</a>
-									|
-									<a href="/user/{topics.teaser_userslug}">
-										<img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
-									</a>
-									<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
-										<span>
-										 	replied <span class="timeago" title="{topics.teaser_timestamp}"></span>
-										</span>
-									</a>
-								</span>
-							</small>
-						</div>
+								<a href="../../topic/{topics.slug}">
+									<span>
+										posted <span class="timeago" title="{topics.relativeTime}"></span>
+									</span>
+								</a>
+								|
+								<a href="/user/{topics.teaser_userslug}">
+									<img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
+								</a>
+								<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
+									<span>
+									 	replied <span class="timeago" title="{topics.teaser_timestamp}"></span>
+									</span>
+								</a>
+							</span>
+						</small>
 					</div>
-				</li>
-			</a>
+				</div>
+			</li>
 			<!-- END topics -->
 			</ul>
 			<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>
diff --git a/src/categories.js b/src/categories.js
index d39dc1a729..df155d69f1 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -310,13 +310,7 @@ var RDB = require('./redis.js'),
 	};
 
 	Categories.getCategoryFields = function(cid, fields, callback) {
-		RDB.hmgetObject('category:' + cid, fields, function(err, data) {
-			if (err === null) {
-				callback(data);
-			} else {
-				winston.err(err);
-			}
-		});
+		RDB.hmgetObject('category:' + cid, fields, callback);
 	};
 
 	Categories.setCategoryField = function(cid, field, value) {
diff --git a/src/topics.js b/src/topics.js
index 94551b5350..571f57a545 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -306,7 +306,14 @@ var RDB = require('./redis.js'),
 				});
 			}
 
-			async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges], function(err, results) {
+			function getCategoryInfo(next) {
+				categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon'], function(err, categoryData) {
+					console.log(categoryData);
+					next(err, categoryData);
+				});
+			}
+
+			async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges, getCategoryInfo], function(err, results) {
 				callback({
 					username: results[0].username,
 					userslug: results[0].userslug,
@@ -314,7 +321,8 @@ var RDB = require('./redis.js'),
 					userbanned: results[0].banned,
 					hasread: results[1],
 					teaserInfo: results[2],
-					privileges: results[3]
+					privileges: results[3],
+					categoryData: results[4]
 				});
 			});
 		}
@@ -339,13 +347,15 @@ var RDB = require('./redis.js'),
 					topicData.username = topicInfo.username;
 					topicData.userslug = topicInfo.userslug;
 					topicData.picture = topicInfo.picture;
+					topicData.categoryIcon = topicInfo.categoryData.icon;
+					topicData.categoryName = topicInfo.categoryData.name;
+					topicData.categorySlug = topicInfo.categoryData.slug;
 					topicData.badgeclass = (topicInfo.hasread && current_user != 0) ? '' : 'badge-important';
 					topicData.teaser_text = topicInfo.teaserInfo.text || '',
 					topicData.teaser_username = topicInfo.teaserInfo.username || '';
 					topicData.teaser_userslug = topicInfo.teaserInfo.userslug || '';
 					topicData.teaser_userpicture = topicInfo.teaserInfo.picture || require('gravatar').url('', {}, https = nconf.get('https'));
 					topicData.teaser_pid = topicInfo.teaserInfo.pid;
-
 					topicData.teaser_timestamp = topicInfo.teaserInfo.timestamp ? (new Date(parseInt(topicInfo.teaserInfo.timestamp, 10)).toISOString()) : '';
 
 					if (isTopicVisible(topicData, topicInfo))