diff --git a/templates/partials/category/watch.tpl b/templates/partials/category/watch.tpl
index 1ffc870..5298319 100644
--- a/templates/partials/category/watch.tpl
+++ b/templates/partials/category/watch.tpl
@@ -1,10 +1,13 @@
-<!-- IF loggedIn -->
-<button type="button" class="btn btn-default btn-success watch <!-- IF !isIgnored -->hidden<!-- ENDIF !isIgnored -->">
-	<i class="fa fa-eye"></i>
-	<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:watch]]</span>
-</button>
-<button type="button" class="btn btn-default btn-warning ignore <!-- IF isIgnored -->hidden<!-- ENDIF isIgnored -->">
-	<i class="fa fa-eye-slash"></i>
-	<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[category:ignore]]</span>
-</button>
-<!-- ENDIF loggedIn -->
\ No newline at end of file
+<!-- 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="category/watching/menu" <!-- IF isIgnored -->class="hidden"<!-- ENDIF isIgnored -->><i class="fa fa-fw fa-eye"></i>[[category:watching]]</span>
+		<span component="category/ignoring/menu" <!-- IF !isIgnored -->class="hidden"<!-- ENDIF !isIgnored -->><i class="fa fa-fw fa-eye-slash"></i>[[category:ignoring]]</span>
+	</span>
+	<span class="caret"></span></button>
+	<ul class="dropdown-menu dropdown-menu-right">
+		<li><a href="#" component="category/watching"><i component="category/watching/check" class="fa fa-fw <!-- IF !isIgnored -->fa-check<!-- ENDIF !isIgnored -->"></i><i class="fa fa-fw fa-eye"></i> [[category:watching]]<p class="help-text"><small>[[category:watching.description]]</small></p></a></li>
+		<li><a href="#" component="category/ignoring"><i component="category/ignoring/check" class="fa fa-fw <!-- IF isIgnored -->fa-check<!-- ENDIF isIgnored -->"></i><i class="fa fa-fw fa-eye-slash"></i> [[category:ignoring]]<p class="help-text"><small>[[category:ignoring.description]]</small></p></a></li>
+	</ul>
+</div>
+<!-- ENDIF config.loggedIn -->
\ No newline at end of file