diff --git a/less/topic.less b/less/topic.less
index 132ae29..addcef2 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -99,14 +99,19 @@
 		vertical-align: -40%;
 	}
 
-	.thread-sort {
+	h1 {
+		.btn-group, .btn {
+			margin-left: 15px;
+		}
+
 		.btn {
 			background: @body-bg;
 			text-transform: uppercase;
 			font-weight: 600;
-			box-shadow: none;
+			box-shadow: none !important;
 			font-size: 11px;
 			color: @gray-light;
+			padding: 0;
 		}
 	}
 }
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 9c79ee4..303c627 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -3,6 +3,14 @@
 
 	<h1 component="post/header" itemprop="name"><i class="fa fa-thumb-tack hide"></i> <i class="fa fa-lock hide"></i> {title}
 		<!-- IMPORT partials/thread_sort.tpl -->
+
+		<button component="topic/follow" class="btn">
+			<!-- IF isFollowing -->
+			<span>[[topic:unwatch]]</span> <i class="fa fa-eye-slash"></i>
+			<!-- ELSE -->
+			[[topic:watch]]</span> <i class="fa fa-eye"></i>
+			<!-- ENDIF isFollowing -->
+		</button>
 		
 		<span class="browsing-users hidden pull-right">
 			<span>[[category:browsing]]</span>