diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss
index 08f8b6fd5..f99fe12ff 100644
--- a/app/assets/stylesheets/stream_element.scss
+++ b/app/assets/stylesheets/stream_element.scss
@@ -1,5 +1,5 @@
 #main_stream .stream_element,
-#main_stream > div > .photo {
+.photo {
   & > .media {
     margin: 0px;
   }
@@ -9,23 +9,22 @@
   }
 }
 
-#main_stream > div > .photo {
-  & > .media {
+.photo {
+  > .media {
     overflow: visible;
     position: relative;
-    > .bd {
-      position: relative;
-      overflow: inherit;
-      > .control-icons {
-        border-radius: 4px;
-        position: absolute;
-        right: 6px;
-        text-align: center;
-        top: 1px;
-      }
+
+    .control-icons {
+      background: $white;
+      border-radius: 4px;
+      padding-left: 4px;
+      position: absolute;
+      right: 4px;
+      text-align: center;
+      top: 1px;
     }
-    &:hover > .bd > .control-icons { background: $white; }
   }
+
   .thumbnail {
     background: $white;
     border-radius: 0;
diff --git a/app/assets/templates/photo_tpl.jst.hbs b/app/assets/templates/photo_tpl.jst.hbs
index b648f2be9..683aa3de2 100644
--- a/app/assets/templates/photo_tpl.jst.hbs
+++ b/app/assets/templates/photo_tpl.jst.hbs
@@ -1,29 +1,28 @@
 <div class="media">
-  <div class="bd">
-    {{#if loggedIn}}
-      <div class="control-icons">
-        {{#if authorIsCurrentUser}}
-          <a href="#" rel="nofollow" class="delete remove_post" title="{{t "delete"}}">
-            <i class="entypo-trash"></i>
-          </a>
-        {{else}}
-          <a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}">
-            <i class="entypo-warning"></i>
-          </a>
-          <a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
-            <i class="entypo-block"></i>
-          </a>
-          <a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
-            <i class="entypo-cross"></i>
-          </a>
-        {{/if}}
-      </div>
-    {{/if}}
+  {{#if loggedIn}}
+    <div class="control-icons">
+      {{#if authorIsCurrentUser}}
+        <a href="#" rel="nofollow" class="delete remove_post" title="{{t "delete"}}">
+          <i class="entypo-trash"></i>
+        </a>
+      {{else}}
+        <a href="#" rel="nofollow" data-type="Post" class="post_report" title="{{t "report.name"}}">
+          <i class="entypo-warning"></i>
+        </a>
+        <a href="#" rel="nofollow" class="block_user" title="{{t "ignore"}}">
+          <i class="entypo-block"></i>
+        </a>
+        <a href="#" rel="nofollow" class="delete hide_post" title="{{t "stream.hide"}}">
+          <i class="entypo-cross"></i>
+        </a>
+      {{/if}}
+    </div>
+  {{/if}}
+
+  <a href="{{sizes.large}}" class="thumbnail img-thumbnail photo-link gallery-picture">
+    <img src="{{sizes.large}}" class="photo big-photo">
+  </a>
 
-    <a href="{{sizes.large}}" class="thumbnail img-thumbnail photo-link gallery-picture">
-      <img src="{{sizes.large}}" class="photo big-photo">
-    </a>
-  </div>
   <div class="card-footer">
     <div class="footer-container">
       {{#if status_message}}