diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift
index 25a510907..92f0de19c 100644
--- a/Shared/Article Rendering/ArticleRenderer.swift	
+++ b/Shared/Article Rendering/ArticleRenderer.swift	
@@ -140,7 +140,16 @@ private extension ArticleRenderer {
 		d["title"] = title
 
 		d["body"] = body
-		d["avatars"] = "<td class=\"header rightAlign avatar\"><img id=\"nnwImageIcon\" src=\"\(ArticleRenderer.imageIconScheme)://\(article.articleID)\" height=48 width=48 /></td>";
+
+		var components = URLComponents()
+		components.scheme = Self.imageIconScheme
+		components.path = article.articleID
+		if let imageIconURLString = components.string {
+			d["avatars"] = "<td class=\"header rightAlign avatar\"><img id=\"nnwImageIcon\" src=\"\(imageIconURLString)\" height=48 width=48 /></td>"
+		}
+		else {
+			d["avatars"] = ""
+		}
 
 		var feedLink = ""
 		if let feedTitle = article.webFeed?.nameForDisplay {
diff --git a/iOS/Article/ArticleIconSchemeHandler.swift b/iOS/Article/ArticleIconSchemeHandler.swift
index 2fa681a55..62fe0ee62 100644
--- a/iOS/Article/ArticleIconSchemeHandler.swift
+++ b/iOS/Article/ArticleIconSchemeHandler.swift
@@ -24,9 +24,11 @@ class ArticleIconSchemeHandler: NSObject, WKURLSchemeHandler {
 			urlSchemeTask.didFailWithError(URLError(.fileDoesNotExist))
 			return
 		}
-		
-		let articleID = url.absoluteString.stripping(prefix: "\(ArticleRenderer.imageIconScheme)://")
-		
+
+		guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
+			return
+		}
+		let articleID = components.path
 		guard let iconImage = coordinator.articleFor(articleID)?.iconImage() else {
 			urlSchemeTask.didFailWithError(URLError(.fileDoesNotExist))
 			return