diff --git a/src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java b/src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
index bb29a73..6107564 100644
--- a/src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
+++ b/src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
@@ -278,11 +278,11 @@ public class FeedHandlers {
                 entries.add(entry);
 
                 if (filtered.size() == 1) {
-                    feed.setTitle(channel.getUploader());
+                    feed.setTitle("Piped - " + channel.getUploader());
                     SyndImage channelIcon = new SyndImageImpl();
                     channelIcon.setLink(Constants.FRONTEND_URL + "/channel/" + channel.getUploaderId());
                     channelIcon.setTitle(channel.getUploader());
-                    channelIcon.setUrl(channel.getUploaderAvatar());
+                    channelIcon.setUrl(rewriteURL(channel.getUploaderAvatar()));
                     feed.setIcon(channelIcon);
                     feed.setImage(channelIcon);
                 }
diff --git a/src/main/java/me/kavin/piped/utils/ChannelHelpers.java b/src/main/java/me/kavin/piped/utils/ChannelHelpers.java
index 63ecf0e..21a5c14 100644
--- a/src/main/java/me/kavin/piped/utils/ChannelHelpers.java
+++ b/src/main/java/me/kavin/piped/utils/ChannelHelpers.java
@@ -16,6 +16,8 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
+import static me.kavin.piped.utils.URLUtils.rewriteURL;
+
 public class ChannelHelpers {
 
     public static boolean isValidId(String id) {
@@ -82,12 +84,11 @@ public class ChannelHelpers {
         String contentText = String.format("Title: %s\nViews: %d\nId: %s\nDuration: %d\nIs YT Shorts: %b", video.getTitle(), video.getViews(), video.getId(), video.getDuration(), video.isShort());
         content.setValue(contentText);
 
-        String thumbnailContent = StringEscapeUtils.escapeXml11(
+        String thumbnailContent =
                 String.format("<div xmlns=\"http://www.w3.org/1999/xhtml\"><a href=\"%s\"><img src=\"%s\"/></a></div>",
-                        Constants.FRONTEND_URL + "/watch?v=" + video.getId()
-                        , video.getThumbnail()
-                )
-        );
+                        Constants.FRONTEND_URL + "/watch?v=" + video.getId(),
+                        StringEscapeUtils.escapeXml11(rewriteURL(video.getThumbnail()))
+                );
         thumbnail.setType("xhtml");
         thumbnail.setValue(thumbnailContent);