diff --git a/less/topic.less b/less/topic.less
index 528ad73..276923b 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -143,9 +143,6 @@
 	}
 
 	.bookmarked {
-		position: absolute;
-		top: -2px;
-		right: 6px;
 		font-size: 16px;
 		color: darken(@post-highlight, 20%);
 		opacity: 0;
@@ -177,9 +174,8 @@
 
 	[component="post/parent"] {
 		border: 0;
-		font-size: 8px;
+		font-size: 10px;
 		background-color: #f0f0f0;
-		vertical-align: 1px;
 	}
 
 	.threaded-replies {
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 928d7e4..0936c3b 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -18,12 +18,6 @@
 		<!-- ENDIF posts.user.banned -->
 
 		<span class="visible-xs-inline-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block">
-			<a class="permalink" href="{config.relative_path}/post/{posts.pid}"><span class="timeago" title="{posts.timestampISO}"></span></a>
-
-			<i component="post/edit-indicator" class="fa fa-pencil-square<!-- IF privileges.posts:history --> pointer<!-- END --> edit-icon <!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"></i>
-
-			<small data-editor="{posts.editor.userslug}" component="post/editor" class="hidden">[[global:last_edited_by, {posts.editor.username}]] <span class="timeago" title="{posts.editedISO}"></span></small>
-
 			<!-- IF posts.toPid -->
 			<a component="post/parent" class="btn btn-xs btn-default hidden-xs" data-topid="{posts.toPid}" href="{config.relative_path}/post/{posts.toPid}"><i class="fa fa-reply"></i> @<!-- IF posts.parent.username -->{posts.parent.username}<!-- ELSE -->[[global:guest]]<!-- ENDIF posts.parent.username --></a>
 			<!-- ENDIF posts.toPid -->
@@ -37,9 +31,18 @@
 				<!-- ENDIF posts.user.custom_profile_info.length -->
 			</span>
 		</span>
-		<span class="bookmarked"><i class="fa fa-bookmark-o"></i></span>
 
 	</small>
+	<small class="pull-right">
+		<i component="post/edit-indicator" class="fa fa-pencil-square<!-- IF privileges.posts:history --> pointer<!-- END --> edit-icon <!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"></i>
+
+		<small data-editor="{posts.editor.userslug}" component="post/editor" class="hidden">[[global:last_edited_by, {posts.editor.username}]] <span class="timeago" title="{posts.editedISO}"></span></small>
+
+		<span class="visible-xs-inline-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block">
+			<a class="permalink" href="{config.relative_path}/post/{posts.pid}"><span class="timeago" title="{posts.timestampISO}"></span></a>
+		</span>
+		<span class="bookmarked"><i class="fa fa-bookmark-o"></i></span>
+	</small>
 </div>
 
 <br />
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index a17a66b..00efbca 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -57,7 +57,6 @@
 
 				<small class="hidden-xs"><span class="timeago" title="{topics.timestampISO}"></span> &bull; <a href="<!-- IF topics.user.userslug -->{config.relative_path}/user/{topics.user.userslug}<!-- ELSE -->#<!-- ENDIF topics.user.userslug -->">{topics.user.username}</a></small>
 				<small class="visible-xs-inline">
-					<i class="fa fa-reply"></i> &nbsp;
 					<!-- IF topics.teaser.timestamp -->
 					<span class="timeago" title="{topics.teaser.timestampISO}"></span>
 					<!-- ELSE -->