diff --git a/public/persona.js b/public/persona.js
index efd2c6e..62de601 100644
--- a/public/persona.js
+++ b/public/persona.js
@@ -437,12 +437,16 @@ $(document).ready(function () {
 
 	function setupQuickReply() {
 		$(window).on('action:ajaxify.end', function (ev, data) {
-			if (data.url && data.url.match('^topic/') && config.enableQuickReply) {
-				require(['persona/quickreply'], function (quickreply) {
-					if (quickreply) {
-						quickreply.init();
-					}
-				});
+			if (data.url && data.url.match('^topic/')) {
+				if (config.enableQuickReply) {
+					require(['persona/quickreply'], function (quickreply) {
+						if (quickreply) {
+							quickreply.init();
+						}
+					}); 
+				}
+
+				$('.topic-main-buttons [title]').tooltip();
 			}
 		});
 	}
diff --git a/templates/partials/thread_tools.tpl b/templates/partials/thread_tools.tpl
index efce683..8f6ff59 100644
--- a/templates/partials/thread_tools.tpl
+++ b/templates/partials/thread_tools.tpl
@@ -1,6 +1,6 @@
 <!-- IF privileges.view_thread_tools -->
-<div class="btn-group thread-tools bottom-sheet">
-	<button title="[[topic:thread_tools.title]]" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button">
+<div title="[[topic:thread_tools.title]]" class="btn-group thread-tools bottom-sheet">
+	<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button">
 		<i class="fa fa-fw fa-gear"></i>
 	</button>
 	<ul class="dropdown-menu dropdown-menu-right"></ul>
diff --git a/templates/partials/topic/sort.tpl b/templates/partials/topic/sort.tpl
index 54f40fc..083a465 100644
--- a/templates/partials/topic/sort.tpl
+++ b/templates/partials/topic/sort.tpl
@@ -1,5 +1,5 @@
-<div class="btn-group bottom-sheet" component="thread/sort">
-	<button title="[[topic:sort_by]]" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button">
+<div title="[[topic:sort_by]]" class="btn-group bottom-sheet" component="thread/sort">
+	<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button">
 	<span><i class="fa fa-fw fa-sort"></i></span></button>
 	<ul class="dropdown-menu dropdown-menu-right">
 		<li><a href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest_to_newest]]</a></li>