Update add folder and unread feed icons

Give both add folder and unread feed icons their own unique icons instead of sharing them with subscribe and all articles.

Signed-off-by: Greg Ross <greg@toolstack.com>

6 files changed, 18 insertions, 2 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 855092708..e8e77ddbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1
 
 ## [16.x.x]
 ### Changed
+- Updated "New Folder" and "All articles" icons to differentiate them from "Subscribe" and "All articles".
 
 ### Fixed
 
diff --git a/css/navigation.css b/css/navigation.css
index e9d2e6ac5..dda57038a 100644
--- a/css/navigation.css
+++ b/css/navigation.css
@@ -99,6 +99,14 @@
     background-image: url('../img/rss.svg') !important;
 }
 
+.icon-rss-unread {
+    background-image: url('../img/rss_unread.svg') !important;
+}
+
+.icon-add-folder {
+    background-image: url('../img/add_folder.svg') !important;
+}
+
 .icon-facebook {
     background-image: url('../img/facebook.svg') !important;
 }
diff --git a/img/add_folder.svg b/img/add_folder.svg
new file mode 100644
index 000000000..5446d8631
--- /dev/null
+++ b/img/add_folder.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path fill="#0082c9" d="m1.5 2c-0.25 0-0.5 0.25-0.5 0.5v11c0 0.26 0.24 0.5 0.5 0.5h13c0.26 0 0.5-0.241 0.5-0.5v-9c0-0.25-0.25-0.5-0.5-0.5h-6.5l-2-2z"/><path d="m 12.027454,13.54523 h -1.03402 V 10.960179 H 8.4083831 V 9.9261587 H 10.993434 V 7.3411085 h 1.03402 v 2.5850502 l 2.58505,-0.01448 v 1.0484963 h -2.58505 z" fill="#000000" style="stroke-width:0.51701;fill:#ffffff" /></svg>
diff --git a/img/rss_unread.svg b/img/rss_unread.svg
new file mode 100644
index 000000000..cb7e52eac
--- /dev/null
+++ b/img/rss_unread.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 98.918 100" xml:space="preserve" height="16" viewBox="0 0 16 16" width="16" version="1.0" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><g fill="#0082c9">
+<ellipse cx="13.566" rx="13.566" ry="13.714" transform="matrix(.14558 0 0 .144 .8 0.8)" cy="86.286"/>
+<path d="m10.345 15.2h-2.7976c0-3.727-3.021-6.7476-6.7474-6.7476v-2.7975c5.2719 0 9.5452 4.2733 9.5452 9.545z"/>
+<path d="m12.32 15.2c0-6.3624-5.1575-11.52-11.52-11.52v-2.88c7.9529 0 14.4 6.4472 14.4 14.4h-2.8799z"/>
+</g></svg>
diff --git a/templates/part.navigation.addfolder.php b/templates/part.navigation.addfolder.php
index 437c35c71..ead26beb5 100644
--- a/templates/part.navigation.addfolder.php
+++ b/templates/part.navigation.addfolder.php
@@ -1,7 +1,7 @@
 <li class="add-new">
     <div class="heading">
         <button
-            class="icon-add"
+            class="icon-add-folder"
             data-apps-slide-toggle="#new-folder"
             news-focus="#new-folder [name='folderName']">
                 <?php p($l->t('New Folder'))?>
diff --git a/templates/part.navigation.unreadfeed.php b/templates/part.navigation.unreadfeed.php
index ac92625af..4b45b6d06 100644
--- a/templates/part.navigation.unreadfeed.php
+++ b/templates/part.navigation.unreadfeed.php
@@ -4,7 +4,7 @@
     }"
     class="subscriptions-feed with-counter with-menu">
 
-    <a class="icon-rss" ng-href="#/items/unread/" >
+    <a class="icon-rss-unread" ng-href="#/items/unread/" >
        <?php p($l->t('Unread articles'))?>
     </a>