build icon url server side

src/main/webapp/templates/_category.html

@@ -30,7 +30,7 @@
 			</div>
 			<a ng-click="feedClicked(feed.id)" class="feed-link"
 				ng-class="{error: feed.message && feed.errorCount > 10, selected: (feed.id == selectedId && selectedType == 'feed'), unread: feed.unread }">
-				<favicon url="feed.feedLink" />
+				<favicon url="feed.iconUrl" />
 				{{feed.name}} {{feedCountLabel(feed)}}
 			</a>
 		</li>

src/main/webapp/templates/feeds.view.html

@@ -15,7 +15,7 @@
 						<i ng-class="{'icon-star icon-star-yellow': entry.starred, 'icon-star-empty': !entry.starred}"
 							class="pointer"></i>
 					</span>
-					<favicon url="entry.feedLink" />
+					<favicon url="entry.iconUrl" />
 					{{entry.feedName}}
 				</span>
 				<span class="entry-date visible-desktop">{{entry.date | entryDate}}</span>