diff --git a/app/assets/stylesheets/stream_element.css.scss b/app/assets/stylesheets/stream_element.css.scss
index ac7f35c66..b7cfe0708 100644
--- a/app/assets/stylesheets/stream_element.css.scss
+++ b/app/assets/stylesheets/stream_element.css.scss
@@ -133,17 +133,17 @@
     padding-top: 10px;
 
     .controls {
-      .comment_delete {
+      .comment_delete, .comment_report {
         @include transition(opacity);
         @include opacity(0);
       }
     }
     &:hover {
       .controls {
-        .comment_delete {
+        .comment_delete, .comment_report {
           @include opacity(0.3);
         }
-        .comment_delete:hover {
+        .comment_delete:hover, .comment_report:hover {
           @include opacity(1);
         }
       }
diff --git a/app/assets/templates/comment_tpl.jst.hbs b/app/assets/templates/comment_tpl.jst.hbs
index de65d6d64..98dd06045 100644
--- a/app/assets/templates/comment_tpl.jst.hbs
+++ b/app/assets/templates/comment_tpl.jst.hbs
@@ -7,14 +7,15 @@
 
   <div class="bd">
     <div class="controls">
+    {{#unless authorIsCurrentUser}}
+      <a href="#" data-type="comment" class="comment_report" title="{{t "report.name"}}">
+        <div class="icons-report"/>
+      </a>
+    {{/unless}}
     {{#if canRemove}}
       <a href="#" class="delete comment_delete" title="{{t "delete"}}">
         <div alt="Deletelabel" class="icons-deletelabel" />
       <a/>
-    {{else}}
-      <a href="#" data-type="comment" class="comment_report" title="{{t "report.name"}}">
-        <div class="icons-report control_icon"/>
-      </a>
     {{/if}}
     </div>