diff --git a/less/topic.less b/less/topic.less
index 276923b..56693d9 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -22,14 +22,8 @@
 		> span {
 			text-transform: uppercase;
 			color: @gray-light;
-			font-size: 12px;
 			display: inline-block;
 			margin-top: 8px;
-
-			> span {
-				vertical-align: middle;
-				margin-right: 8px;
-			}
 		}
 
 		.topic-title {
@@ -38,8 +32,7 @@
 	}
 
 	[component="topic/labels"] {
-		vertical-align: -3px;
-		font-size: 16px;
+		font-size: 20px;
 		color: @text-muted;
 	}
 
@@ -149,12 +142,6 @@
 		.transition(0.75s ease-in-out opacity);
 	}
 
-	[component="post/header"] {
-		.fa {
-			margin-top: 7px;
-		}
-	}
-
 	[component="post/anchor"] {
 		position: relative;
 		top: -@post-padding;
diff --git a/templates/topic.tpl b/templates/topic.tpl
index d85804f..1f8dbb5 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -7,17 +7,18 @@
 	<div class="topic <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
 		<div class="topic-header">
 			<h1 component="post/header" class="" itemprop="name">
-				<span class="topic-title" component="topic/title">{title}</span>
+				<span class="topic-title" component="topic/title">
+					<span component="topic/labels">
+						<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->" title="[[topic:pinned]]"></i>
+						<i component="topic/locked" class="fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->" title="[[topic:locked]]"></i>
+						<i class="fa fa-arrow-circle-right <!-- IF !oldCid -->hidden<!-- ENDIF !oldCid -->" title="[[topic:moved]]"></i>
+						{{{each icons}}}@value{{{end}}}
+					</span>
+					{title}
+				</span>
 			</h1>
 
 			<div class="topic-info clearfix">
-				<div component="topic/labels" class="inline-block">
-					<i component="topic/pinned" class="pull-left fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->" title="[[topic:pinned]]"></i>
-					<i component="topic/locked" class="pull-left fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->" title="[[topic:locked]]"></i>
-					<i class="pull-left fa fa-arrow-circle-right <!-- IF !oldCid -->hidden<!-- ENDIF !oldCid -->" title="[[topic:moved]]"></i>
-					{{{each icons}}}@value{{{end}}}
-				</div>
-
 				<div class="category-item inline-block">
 					{{{ if category.icon }}}
 					<div role="presentation" class="icon pull-left" style="{{{ if category.bgColor }}}background-color: {category.bgColor};{{{end}}}; {{{ if category.color}}}color: {category.color};{{{end}}}">