diff --git a/public/scss/admin/admin.scss b/public/scss/admin/admin.scss
index 12290457c2..e8f084894c 100644
--- a/public/scss/admin/admin.scss
+++ b/public/scss/admin/admin.scss
@@ -219,13 +219,13 @@ body {
 
 [component="category-selector"] {
 	.category-item > .icon {
-		min-width: 23px;
-		min-height: 23px;
+		width: 22px;
+		height: 22px;
 		font-size: 10px;
 		line-height: 12px;
 		padding: 5px;
-		margin-right: 5px;
 		border-radius: 50%;
+		display: inline-block;
 	}
 
 	.category-dropdown-menu {
diff --git a/public/scss/admin/manage/categories.scss b/public/scss/admin/manage/categories.scss
index ff0650691e..92bc822616 100644
--- a/public/scss/admin/manage/categories.scss
+++ b/public/scss/admin/manage/categories.scss
@@ -78,7 +78,6 @@ div.categories {
 			width: 24px;
 			height: 24px;
 			border-radius: 50%;
-			line-height: 24px;
 			text-align: center;
 			vertical-align: bottom;
 			background-size: cover;
diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js
index 8b6a6fb0f4..bc7a06e9cf 100644
--- a/public/src/client/topic/threadTools.js
+++ b/public/src/client/topic/threadTools.js
@@ -16,6 +16,8 @@ define('forum/topic/threadTools', [
 	ThreadTools.init = function (tid, topicContainer) {
 		renderMenu(topicContainer);
 
+		$('.topic-main-buttons [title]').tooltip();
+
 		// function topicCommand(method, path, command, onComplete) {
 		topicContainer.on('click', '[component="topic/delete"]', function () {
 			topicCommand('del', '/state', 'delete');
diff --git a/src/views/admin/partials/categories/select-category.tpl b/src/views/admin/partials/categories/select-category.tpl
index c778b0a359..3c807dfa9b 100644
--- a/src/views/admin/partials/categories/select-category.tpl
+++ b/src/views/admin/partials/categories/select-category.tpl
@@ -16,9 +16,9 @@
 					<a class="dropdown-item" role="menuitem">{categories.level}
 						<span component="category-markup">
 							<div class="category-item d-inline-block">
-								<div role="presentation" class="icon float-start" style="{function.generateCategoryBackground}">
+								<span role="presentation" class="icon" style="{function.generateCategoryBackground}">
 									<i class="fa fa-fw {./icon}"></i>
-								</div>
+								</span>
 								{./name}
 							</div>
 						</span>
diff --git a/src/views/admin/partials/groups/privileges-select-category.tpl b/src/views/admin/partials/groups/privileges-select-category.tpl
index 76f3578cb4..3cb24f4b48 100644
--- a/src/views/admin/partials/groups/privileges-select-category.tpl
+++ b/src/views/admin/partials/groups/privileges-select-category.tpl
@@ -14,9 +14,9 @@
 			<a class="dropdown-item" role="menuitem">{categories.level}
 				<span component="category-markup">
 					<div class="category-item d-inline-block">
-						<div role="presentation" class="icon float-start" style="{function.generateCategoryBackground}">
+						<span role="presentation" class="icon" style="{function.generateCategoryBackground}">
 							<i class="fa fa-fw {./icon}"></i>
-						</div>
+						</span>
 						{./name}
 					</div>
 				</span>