diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index cb8a220..bab5e18 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -62,24 +62,38 @@
 {% endmacro %}
 
 
-{% macro show_comment(user, date, content, id) %}
+{% macro show_comment(comment, id, repo, username, issueid, form) %}
   <section class="issue_comment">
     <header id="comment-{{ id }}">
-      {{ user.user | avatar(16) | safe }}
-      <a href="{{ url_for('view_user', username=user.user)}}">
-        {{ user.user }}
-      </a> - <span title="{{ date }}">{{ date | humanize}}</span>
+      {{ comment.user.user | avatar(16) | safe }}
+      <a href="{{ url_for('view_user', username=comment.user.user)}}">
+        {{ comment.user.user }}
+      </a> - <span title="{{ date }}">{{ comment.date_created | humanize}}</span>
       <a class="headerlink" title="Permalink to this headline"
         href="#comment-{{ id }}">¶</a>
       <aside class="issue_action">
         <a class="reply" title="Reply to this comment - loose formating">
           reply
         </a>
+        {% if id != 0 and g.fas_user and (
+            g.fas_user.username == comment.user.username or repo_admin) %}
+        <a href="{{ url_for('remove_comment', repo=repo.name,
+                             issueid=issueid, commentid=comment.id,
+                             username=username, csrf_token=form.csrf_token.current_token) }}"
+            onclick="return confirm('Do you really want to remove this comment');"
+            title="Remove comment">
+            <span class="icon icon-remove blue"></span>
+        </a>
+        {% endif %}
       </aside>
     </header>
     <div class="comment_body">
       {% autoescape false %}
-        {{ content | markdown }}
+      {% if id == 0 %}
+      {{ comment.content | markdown }}
+      {% else %}
+      {{ comment.comment | markdown }}
+      {% endif %}
       {% endautoescape %}
     </div>
   </section>
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index c6857bb..bc70d6c 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -4,6 +4,11 @@
 {% block title %}Issue #{{ issueid }} - {{ repo.name }}{% endblock %}
 {%block tag %}home{% endblock %}
 
+{% block header %}
+<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css"
+  rel="stylesheet">
+{% endblock %}
+
 {% block repo %}
 
 {% if authenticated and form %}
@@ -90,12 +95,11 @@
     {% endif %}
 </section>
 
-{{ show_comment(issue.user, issue.date_created, issue.content, 0) }}
+{{ show_comment(issue, 0, repo, username, issueid, form) }}
 
 {% if issue.comments %}
   {% for comment in issue.comments %}
-    {{ show_comment(comment.user, comment.date_created, comment.comment,
-        loop.index) }}
+    {{ show_comment(comment, loop.index, repo, username, issueid, form) }}
   {% endfor %}
 {% endif %}
 
diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py
index dce6193..af4ed7c 100644
--- a/tests/test_progit_flask_ui_issues.py
+++ b/tests/test_progit_flask_ui_issues.py
@@ -618,7 +618,7 @@ class PagureFlaskIssuestests(tests.Modeltests):
             self.assertEqual(output.data.count(
                 '<option selected value="Open">Open</option>'), 1)
             self.assertEqual(output.data.count(
-                '<div class="comment_body">\n        '
+                '<div class="comment_body">\n      '
                 '<p>We should work on this!</p>'), 1)
 
         # Project w/o issue tracker