diff --git a/Changelog.md b/Changelog.md
index 985e18f0c..315cc0976 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@
 * Remove reference from reshares when original post is deleted [#7578](https://github.com/diaspora/diaspora/pull/7578)
 * Merge migrations from before 0.6.0.0 to CreateSchema [#7580](https://github.com/diaspora/diaspora/pull/7580)
 * Remove auto detection of languages with highlightjs [#7591](https://github.com/diaspora/diaspora/pull/7591)
+* Move enable/disable notification icon [#7592](https://github.com/diaspora/diaspora/pull/7592)
 
 ## Bug fixes
 * Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
diff --git a/app/assets/templates/post-controls_tpl.jst.hbs b/app/assets/templates/post-controls_tpl.jst.hbs
index 560f366f4..4e6238391 100644
--- a/app/assets/templates/post-controls_tpl.jst.hbs
+++ b/app/assets/templates/post-controls_tpl.jst.hbs
@@ -3,12 +3,6 @@
     <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>
   {{#if participation}}
     <a href="#" rel="nofollow" class="destroy_participation" title="{{t "stream.disable_post_notifications"}}">
       <i class="entypo-bell"></i>
@@ -18,6 +12,12 @@
       <i class="entypo-bell"></i>
     </a>
   {{/if}}
+  <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>
diff --git a/app/assets/templates/single-post-viewer/single-post-moderation_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-moderation_tpl.jst.hbs
index d81f6a14b..f58389501 100644
--- a/app/assets/templates/single-post-viewer/single-post-moderation_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer/single-post-moderation_tpl.jst.hbs
@@ -5,12 +5,6 @@
         <i class="entypo-trash"></i>
       </a>
     {{else}}
-      <a href="#" data-type="Post" class="post_report" title="{{t "report.name"}}">
-        <i class="entypo-warning"></i>
-      </a>
-      <a href="#" data-type="post" class="block_user" title="{{t "ignore"}}">
-        <i class="entypo-block"></i>
-      </a>
       {{#if participation}}
         <a href="#" data-type="nofollow" class="destroy_participation" title="{{t "stream.disable_post_notifications"}}">
           <i class="entypo-bell"></i>
@@ -20,6 +14,12 @@
           <i class="entypo-bell"></i>
         </a>
       {{/if}}
+      <a href="#" data-type="Post" class="post_report" title="{{t "report.name"}}">
+        <i class="entypo-warning"></i>
+      </a>
+      <a href="#" data-type="post" class="block_user" title="{{t "ignore"}}">
+        <i class="entypo-block"></i>
+      </a>
       <a href="#" data-type="post" class="hide_post" title="{{t "stream.hide"}}">
         <i class="entypo-cross"></i>
       </a>