diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 723850dd02..7fb97cd782 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -3,7 +3,7 @@
 		<a href="/" itemprop="url"><span itemprop="title">Home</span></a>
 	</li>
 	<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
-		<span itemprop="title">{category_name}</span>
+		<span itemprop="title">{category_name} <a target="_blank" href="../{category_id}.rss"><i class="icon-rss-sign"></i></a></span>
 	</li>
 	<div id="category_active_users"></div>
 </ol>
@@ -12,7 +12,6 @@
 	<button id="new_post" class="btn btn-primary btn-lg {show_topic_button}">New Topic</button>
 
 	<div class="inline-block pull-right">
-		<a target="_blank" href="../{category_id}.rss"><i class="icon-rss-sign icon-2x"></i></a>&nbsp;
 		<a href="#" id="facebook-share"><i class="icon-facebook-sign icon-2x"></i></a>&nbsp;
 		<a href="#" id="twitter-intent"><i class="icon-twitter-sign icon-2x"></i></a>&nbsp;
 		<a href="#" id="google-share"><i class="icon-google-plus-sign icon-2x"></i></a>&nbsp;
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index f7f829b6bb..b2cf94910b 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -6,7 +6,7 @@
 		<a href="/category/{category_slug}" itemprop="url"><span itemprop="title">{category_name}</span></a>
 	</li>
 	<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
-		<span itemprop="title">{topic_name}</span>
+		<span itemprop="title">{topic_name} <a target="_blank" href="../{topic_id}.rss"><i class="icon-rss-sign"></i></a></span>
 	</li>
 	<div id="thread_active_users" class="hidden-xs"></div>
 </ol>
@@ -21,7 +21,9 @@
 						<a class="main-avatar" href="/users/{main_posts.userslug}">
 							<img src="{main_posts.picture}" align="left" class="img-thumbnail" width=150 height=150 /><br />
 						</a>
-						<h3><p id="topic_title_{main_posts.pid}" class="topic-title">{topic_name}</p></h3>
+						<h3>
+							<p id="topic_title_{main_posts.pid}" class="topic-title">{topic_name}</p>
+						</h3>
 
 						<div class="topic-buttons" >
 							<div class="btn-group">