diff --git a/templates/category.tpl b/templates/category.tpl
index 9c103c7..9570509 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -15,8 +15,8 @@
 
 		<span class="pull-right">
 			<!-- IMPORT partials/category/watch.tpl -->
-			<!-- IMPORT partials/category/tools.tpl -->
 			<!-- IMPORT partials/category/sort.tpl -->
+			<!-- IMPORT partials/category/tools.tpl -->
 		</span>
 	</div>
 
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 72bcbe1..de5c18b 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -16,14 +16,14 @@
 
 		<!-- IMPORT partials/topic/reply-button.tpl -->
 
-		<!-- IMPORT partials/topic/watch.tpl -->
-
 		<!-- IF loggedIn -->
 		<button component="topic/mark-unread" class="btn btn-default">
 			<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:mark_unread]]</span> <i class="fa fa-inbox"></i>
 		</button>
 		<!-- ENDIF loggedIn -->
 
+		<!-- IMPORT partials/topic/watch.tpl -->
+
 		<!-- IMPORT partials/topic/sort.tpl -->
 
 		<!-- IMPORT partials/thread_tools.tpl -->
diff --git a/templates/partials/topic/watch.tpl b/templates/partials/topic/watch.tpl
index 5a506ba..815f1d5 100644
--- a/templates/partials/topic/watch.tpl
+++ b/templates/partials/topic/watch.tpl
@@ -1,11 +1,14 @@
 <!-- IF config.loggedIn -->
 <div class="btn-group topic-watch-dropdown" component="topic/watch">
-	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><span class="visible-sm-inline visible-md-inline visible-lg-inline">
-		<span component="topic/following/menu" <!-- IF !isFollowing -->class="hidden"<!-- ENDIF !isFollowing -->><i class="fa fa-fw fa-bell"></i>[[topic:following]]</span>
-		<span component="topic/reading/menu" <!-- IF !isReading -->class="hidden"<!-- ENDIF !isReading -->><i class="fa fa-fw fa-eye"></i>[[topic:reading]]</span>
-		<span component="topic/ignoring/menu" <!-- IF !isIgnoring -->class="hidden"<!-- ENDIF !isIgnoring -->><i class="fa fa-fw fa-eye-slash"></i>[[topic:ignoring]]</span>
-	</span>
-	<span class="caret"></span></button>
+	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
+		<span component="topic/following/menu" <!-- IF !isFollowing -->class="hidden"<!-- ENDIF !isFollowing -->><i class="fa fa-fw fa-bell"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:following]]</span></span>
+
+		<span component="topic/reading/menu" <!-- IF !isReading -->class="hidden"<!-- ENDIF !isReading -->><i class="fa fa-fw fa-eye"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:reading]]</span></span>
+
+		<span component="topic/ignoring/menu" <!-- IF !isIgnoring -->class="hidden"<!-- ENDIF !isIgnoring -->><i class="fa fa-fw fa-eye-slash"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:ignoring]]</span></span>
+
+		<span class="caret"></span>
+	</button>
 	<ul class="dropdown-menu dropdown-menu-right">
 		<li><a href="#" component="topic/following"><i component="topic/following/check" class="fa fa-fw <!-- IF isFollowing -->fa-check<!-- ENDIF isFollowing -->"></i><i class="fa fa-fw fa-bell"></i> [[topic:following]]<p class="help-text"><small>[[topic:following.description]]</small></p></a></li>
 		<li><a href="#" component="topic/reading"><i component="topic/reading/check" class="fa fa-fw <!-- IF isReading -->fa-check<!-- ENDIF isReading -->"></i><i class="fa fa-fw fa-eye"></i> [[topic:reading]]<p class="help-text"><small>[[topic:reading.description]]</small></p></a></li>