various icon updates; use new icons in feed tree

2 files changed, 10 insertions, 10 deletions

diff --git a/classes/feeds.php b/classes/feeds.php
index 0edd99abb..d9c772c9c 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -328,7 +328,7 @@ class Feeds extends Handler_Protected {
 				}
 
 				if (feeds::feedHasIcon($feed_id)) {
-					$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
+					$feed_icon_img = "<img class=\"icon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
 				} else {
 					$feed_icon_img = "<i class='icon-syndicate material-icons'>rss_feed</i>";
 				}
@@ -449,7 +449,7 @@ class Feeds extends Handler_Protected {
 							$vf_catchup_link = "<a class='catchup' onclick='Feeds.catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
 
 							$feed_icon_src = Feeds::getFeedIcon($feed_id);
-							$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"$feed_icon_src\">";
+							$feed_icon_img = "<img class=\"icon\" src=\"$feed_icon_src\">";
 
 							$reply['content'] .= "<div data-feed-id='$feed_id' class='feed-title'>".
 								"<div style=\"float : right\">$feed_icon_img</div>".
@@ -1492,22 +1492,22 @@ class Feeds extends Handler_Protected {
 	static function getFeedIcon($id) {
 		switch ($id) {
 			case 0:
-				return "images/archive.png";
+				return "archive";
 				break;
 			case -1:
-				return "images/star.png";
+				return "star";
 				break;
 			case -2:
-				return "images/feed.png";
+				return "rss_feed";
 				break;
 			case -3:
-				return "images/fresh.png";
+				return "new_releases";
 				break;
 			case -4:
-				return "images/folder.png";
+				return "inbox";
 				break;
 			case -6:
-				return "images/time.png";
+				return "cached";
 				break;
 			default:
 				if ($id < LABEL_BASE_INDEX) {
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 4ad0841bf..a3f8d6506 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -160,9 +160,9 @@ class Pref_Users extends Handler_Protected {
 					$icon_file = ICONS_URL."/".$line["id"].".ico";
 
 					if (file_exists($icon_file) && filesize($icon_file) > 0) {
-						$feed_icon = "<img class=\"tinyFeedIcon\" src=\"$icon_file\">";
+						$feed_icon = "<img class=\"icon\" src=\"$icon_file\">";
 					} else {
-						$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+						$feed_icon = "<img class=\"icon\" src=\"images/blank_icon.gif\">";
 					}
 
 					print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";