diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx
index e6efcef8..f80cc8b5 100644
--- a/src/shared/components/comment/comment-node.tsx
+++ b/src/shared/components/comment/comment-node.tsx
@@ -436,15 +436,13 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
                         <>
                           {!this.myComment && (
                             <>
-                              <button className="btn btn-link btn-animate">
-                                <Link
-                                  className="text-muted"
-                                  to={`/create_private_message/${cv.creator.id}`}
-                                  title={i18n.t("message").toLowerCase()}
-                                >
-                                  <Icon icon="mail" />
-                                </Link>
-                              </button>
+                              <Link
+                                className="btn btn-link btn-animate text-muted"
+                                to={`/create_private_message/${cv.creator.id}`}
+                                title={i18n.t("message").toLowerCase()}
+                              >
+                                <Icon icon="mail" />
+                              </Link>
                               <button
                                 className="btn btn-link btn-animate text-muted"
                                 onClick={linkEvent(
diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 5ba53132..5a271943 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -649,29 +649,27 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get commentsButton() {
     const post_view = this.props.post_view;
     return (
-      <button className="btn btn-link text-muted py-0 pl-0">
-        <Link
-          className="text-muted"
-          title={i18n.t("number_of_comments", {
+      <Link
+        className="btn btn-link text-muted py-0 pl-0 text-muted"
+        title={i18n.t("number_of_comments", {
+          count: Number(post_view.counts.comments),
+          formattedCount: Number(post_view.counts.comments),
+        })}
+        to={`/post/${post_view.post.id}?scrollToComments=true`}
+      >
+        <Icon icon="message-square" classes="mr-1" inline />
+        <span className="mr-2">
+          {i18n.t("number_of_comments", {
             count: Number(post_view.counts.comments),
-            formattedCount: Number(post_view.counts.comments),
+            formattedCount: numToSI(post_view.counts.comments),
           })}
-          to={`/post/${post_view.post.id}?scrollToComments=true`}
-        >
-          <Icon icon="message-square" classes="mr-1" inline />
-          <span className="mr-2">
-            {i18n.t("number_of_comments", {
-              count: Number(post_view.counts.comments),
-              formattedCount: numToSI(post_view.counts.comments),
-            })}
+        </span>
+        {this.unreadCount && (
+          <span className="small text-warning">
+            ({this.unreadCount} {i18n.t("new")})
           </span>
-          {this.unreadCount && (
-            <span className="small text-warning">
-              ({this.unreadCount} {i18n.t("new")})
-            </span>
-          )}
-        </Link>
-      </button>
+        )}
+      </Link>
     );
   }