diff --git a/less/topic.less b/less/topic.less
index 96e135c..206d2fc 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -2,7 +2,7 @@
 	h1 {
 		line-height: 40px;
 		margin-bottom: 30px;
-		
+
 		.topic-title {
 			font-size: 28px;
 			color:inherit;
@@ -121,9 +121,10 @@
 
 	.post-tools {
 		text-transform: lowercase;
-		>:before {
+		a::before {
 			content: "\2022\0020";
 		}
+
 		a {
 			.pointer;
 		}
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index a50e804..b8486ef 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -23,7 +23,9 @@
 			<span class="post-tools">
 				<a component="post/reply" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
 				<a component="post/quote" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:quote]]</a>
-				<!-- IF posts.toPid --><a component="post/parent" href="#" class="no-select" data-index="{posts.parent.index}"><i class="fa fa-reply"></i> @{posts.parent.username}</a><!-- ENDIF posts.toPid -->
+				<!-- IF posts.toPid -->
+				<button component="post/parent" class="btn btn-xs" data-topid="{posts.toPid}"><i class="fa fa-reply"></i> @{posts.parent.username} <i class="fa fa-caret-down"></i></button>
+				<!-- ENDIF posts.toPid -->
 			</span>
 			<span>
 				<!-- IF posts.user.custom_profile_info.length -->
@@ -54,7 +56,11 @@
 </div>
 
 <br />
+
 <div class="content" component="post/content" itemprop="text">
+	<!-- IF posts.toPid -->
+	<div class="well hidden" data-topid="{posts.toPid}" component="post/parent/content"></div>
+	<!-- ENDIF posts.toPid -->
 	{posts.content}
 </div>
 <!-- IF posts.user.signature -->