diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index 996538a..4842890 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -178,17 +178,19 @@
       {%- endautoescape -%}
     </div>
   </section>
-  <aside class="issue_action icon pull-xs-right">
+  <div class="issue_action icon pull-xs-right">
+    <div class="btn-group" role="group" aria-label="Basic example">
     <a class="btn btn-secondary btn-sm reply"
-      title="Reply to this comment - loose formating">
-      reply
+      title="Reply to the initial comment - loose formating">
+      <span class="oi" data-glyph="share-boxed">
     </a>
     {% if repo_admin or (
       g.fas_user and g.fas_user.username == comment.user.username) %}
     <a class="btn btn-secondary btn-sm" href="{{ url_for('edit_issue', username=username,
-              repo=repo.name, issueid=issueid) }}">
-    edit</a>
+              repo=repo.name, issueid=issueid) }}" title="Edit this issue">
+    <span class="oi" data-glyph="pencil"></span></a>
     {% endif %}
-  </aside>
+  </div>
+  </div>
 </div>
 {% endmacro %}