diff --git a/templates/partials/topic/post-menu-list.tpl b/templates/partials/topic/post-menu-list.tpl
index fa53244..5e5c41e 100644
--- a/templates/partials/topic/post-menu-list.tpl
+++ b/templates/partials/topic/post-menu-list.tpl
@@ -29,6 +29,14 @@
 </li>
 <!-- END posts.tools -->
 
+<!-- IF posts.display_history -->
+<li role="presentation">
+	<a component="post/view-history" role="menuitem" tabindex="-1" href="#">
+		<span class="menu-icon"><i class="fa fa-history"></i></span> [[topic:view-history]]
+	</a>
+</li>
+<!-- END -->
+
 <!-- IF posts.display_move_tools -->
 <li role="presentation">
 	<a component="post/move" role="menuitem" tabindex="-1" href="#">
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index ede4514..29e64ea 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -25,7 +25,7 @@
 		<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 class="fa fa-pencil-square pointer edit-icon <!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"></i>
+			<i component="post/edit-indicator" class="fa fa-pencil-square pointer 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>