diff --git a/backend/__init__.py b/backend/__init__.py
index 9b4ca4e2..791f4a83 100644
--- a/backend/__init__.py
+++ b/backend/__init__.py
@@ -126,7 +126,7 @@ def changedetection_app(config=None, datastore_o=None):
             fg.link(href='https://changedetection.io')
 
             for watch in sorted_watches:
-                if watch['unviewed']:
+                if not watch['viewed']:
                     fe = fg.add_entry()
                     fe.title(watch['url'])
                     fe.link(href=watch['url'])
diff --git a/backend/static/css/styles.css b/backend/static/css/styles.css
index 9dd75dbb..180ac5ef 100644
--- a/backend/static/css/styles.css
+++ b/backend/static/css/styles.css
@@ -248,4 +248,8 @@ footer {
     background: #fff;
     color: #444;
     text-align: center;
+}
+
+#feed-icon {
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/backend/templates/watch-overview.html b/backend/templates/watch-overview.html
index 1cb044da..a2cd8c19 100644
--- a/backend/templates/watch-overview.html
+++ b/backend/templates/watch-overview.html
@@ -15,13 +15,9 @@
         <!-- user/pass r = requests.get('https://api.github.com/user', auth=('user', 'pass')) -->
     </form>
     <div>
-
+        <a href="/" class="pure-button button-tag {{'active' if not active_tag }}">All</a>
         {% for tag in tags %}
-        {% if tag == "" %}
-        <a href="/" class="pure-button button-tag {{'active' if active_tag == tag }}">All</a>
-        {% else %}
         <a href="/?tag={{ tag}}" class="pure-button button-tag {{'active' if active_tag == tag }}">{{ tag }}</a>
-        {% endif %}
         {% endfor %}
     </div>
 
@@ -71,8 +67,6 @@
                 </td>
             </tr>
             {% endfor %}
-
-
             </tbody>
         </table>
         <ul id="post-list-buttons">
@@ -85,6 +79,9 @@
                <a href="/api/checknow{% if active_tag%}?tag={{active_tag}}{%endif%}" class="pure-button button-tag ">Recheck
                 all {% if active_tag%}in "{{active_tag}}"{%endif%}</a>
             </li>
+            <li>
+                <a href="{{ url_for('index', tag=active_tag , rss=true)}}"><img id="feed-icon" src="/static/images/Generic_Feed-icon.svg" height="15px"></a>
+            </li>
         </ul>
     </div>
 </div>