diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml
index c1fc1602d0a2a4bea19efffb85df499d9836c229..ffc893b16d37dc23be06b24812ecb2a50f7f63d7 100644
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
@@ -1,4 +1,13 @@
 = render "events/event_last_push", event: @last_push
+
+- if current_user
+  %ul.nav.nav-pills.event_filter.pull-right
+    %li.pull-right
+      = link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
+        %i.fa.fa-rss
+        News Feed
+        
 = render 'shared/event_filter'
+%hr
 .content_list
 = spinner
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 75a7f071c1361c265bc4c86b53863cd48eb2aba3..c4a7800c463d970c0879e5885b6cde78acaf68e3 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -17,7 +17,17 @@
     %section.activities.col-md-8
       - if current_user
         = render "events/event_last_push", event: @last_push
+
+        - if current_user
+          %ul.nav.nav-pills.event_filter.pull-right
+            %li
+              = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
+                %i.fa.fa-rss
+                News Feed
+
         = render 'shared/event_filter'
+        %hr
+
       .content_list
       = spinner
     %aside.side.col-md-4
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 4464c51744aa77199b331d8effc9293ffbc8027a..864bda359b627ce43e99471aa4bb4bf87f580b1b 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -40,6 +40,7 @@
       %section.col-md-9
         = render "events/event_last_push", event: @last_push
         = render 'shared/event_filter'
+        %hr
         .content_list
         = spinner
       %aside.col-md-3.project-side
diff --git a/app/views/shared/_event_filter.html.haml b/app/views/shared/_event_filter.html.haml
index d07a9e2b92468860f9b77d3345b27dc6fff5e97c..334db60690d7fd4f1c6d2d5cace134a9be789093 100644
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
@@ -3,17 +3,3 @@
   = event_filter_link EventFilter.merged, 'Merge events'
   = event_filter_link EventFilter.comments, 'Comments'
   = event_filter_link EventFilter.team, 'Team'
-
-  - if current_user
-    - if current_controller?(:dashboard)
-      %li.pull-right
-        = link_to dashboard_path(:atom, { private_token: current_user.private_token }), class: 'rss-btn' do
-          %i.fa.fa-rss
-          News Feed
-
-    - if current_controller?(:groups)
-      %li.pull-right
-        = link_to group_path(@group, { format: :atom, private_token: current_user.private_token }), title: "Feed", class: 'rss-btn' do
-          %i.fa.fa-rss
-          News Feed
-%hr