diff --git a/app/assets/images/feed_icon.png b/app/assets/images/feed_icon.png
new file mode 100644
index 00000000..d384eac7
Binary files /dev/null and b/app/assets/images/feed_icon.png differ
diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
index 19350a41..9c52f058 100644
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
@@ -75,6 +75,31 @@ header .topbar-inner {
 .two-column {
   .page-title, #content {
     @include columns(11);
+    h1.title {
+      float: left;
+    }
+    .feed {
+      float: right;
+      margin-top: 5px;
+
+      a {
+        display: block;
+        height: 24px;
+        background: url('feed_icon.png') no-repeat 6px 4px;
+        color: #4c8acd;
+        font-size: 11px;
+        text-align: right;
+        border: 1px solid #eee;
+        line-height: 25px;
+        padding: 0 8px 0 25px;
+        @include border-radius(3px);
+
+        &:hover {
+          background: #f3f3f3 url('feed_icon.png') no-repeat 6px 4px;
+          text-decoration: none;
+        }
+      }
+    }
   }
 
   #sidebar {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 75851201..383cd89a 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -58,6 +58,8 @@
             %h1.title
               = title
               %small= yield :subtitle
+            .feed
+              = yield :feed
 
         #content{:class => @content_class}
           = yield
diff --git a/app/views/questions/index.html.haml b/app/views/questions/index.html.haml
index 023ee08c..82fbbcbe 100644
--- a/app/views/questions/index.html.haml
+++ b/app/views/questions/index.html.haml
@@ -15,6 +15,9 @@
   - else
     = render :partial => "shared/support_blurb"
 
+- content_for :feed do
+  = link_to "Feed", questions_url(format: :atom)
+
 %ul.questions
   = render :partial => "list", :collection => collection