diff --git a/less/topic.less b/less/topic.less
index 6772190..7cce7b4 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -58,10 +58,6 @@
 		}
 	}
 
-	.votes {
-		padding-right: 10px;
-	}
-
 	.bookmarked {
 		position: absolute;
 		top: 1px;
@@ -124,6 +120,7 @@
 	}
 
 	.moderator-tools {
+		margin-left: 10px;
 		font-size: 14px;
 
 		> a {
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 2dfd0f8..c18f743 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -60,20 +60,22 @@
 			<a component="post/quote" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:quote]]</a>
 		</span>
 
+		<!-- IF !reputation:disabled -->
+		<a component="post/upvote" href="#" class="<!-- IF posts.upvoted -->upvoted<!-- ENDIF posts.upvoted -->">
+			<i class="fa fa-chevron-up"></i>
+		</a>
+
 		<span class="votes">
-			<!-- IF !reputation:disabled -->
-			<a component="post/upvote" href="#" class="<!-- IF posts.upvoted -->upvoted<!-- ENDIF posts.upvoted -->">
-				<i class="fa fa-chevron-up"></i>
-			</a>
 			<span component="post/vote-count" data-votes="{posts.votes}">{posts.votes}</span>
-			<!-- IF !downvote:disabled -->
-			<a component="post/downvote" href="#" class="<!-- IF posts.downvoted -->downvoted<!-- ENDIF posts.downvoted -->">
-				<i class="fa fa-chevron-down"></i>
-			</a>
-			<!-- ENDIF !downvote:disabled -->
-			<!-- ENDIF !reputation:disabled -->
 		</span>
 
+		<!-- IF !downvote:disabled -->
+		<a component="post/downvote" href="#" class="<!-- IF posts.downvoted -->downvoted<!-- ENDIF posts.downvoted -->">
+			<i class="fa fa-chevron-down"></i>
+		</a>
+		<!-- ENDIF !downvote:disabled -->
+		<!-- ENDIF !reputation:disabled -->
+
 		<!-- IMPORT partials/topic/post-menu.tpl -->
 	</small>
 </div>