diff --git a/Mac/Browser.swift b/Mac/Browser.swift
index dfcbb1571..5f8b7a0ee 100644
--- a/Mac/Browser.swift
+++ b/Mac/Browser.swift
@@ -43,7 +43,7 @@ struct Browser {
 	/// - Note: Some browsers (specifically Chromium-derived ones) will ignore the request
 	///   to open in the background.
 	static func open(_ urlString: String, inBackground: Bool) {
-		if let url = URL(string: urlString) {
+		if let url = URL(unicodeString: urlString) {
 			if let defaultBrowser = defaultBrowser {
 				defaultBrowser.openURL(url, inBackground: inBackground)
 			} else {
diff --git a/Mac/Inspector/WebFeedInspectorViewController.swift b/Mac/Inspector/WebFeedInspectorViewController.swift
index ce0b608c0..ee4779a0d 100644
--- a/Mac/Inspector/WebFeedInspectorViewController.swift
+++ b/Mac/Inspector/WebFeedInspectorViewController.swift
@@ -167,11 +167,11 @@ private extension WebFeedInspectorViewController {
 	}
 
 	func updateHomePageURL() {
-		homePageURLTextField?.stringValue = feed?.homePageURL ?? ""
+		homePageURLTextField?.stringValue = feed?.homePageURL?.decodedURLString ?? ""
 	}
 
 	func updateFeedURL() {
-		urlTextField?.stringValue = feed?.url ?? ""
+		urlTextField?.stringValue = feed?.url.decodedURLString ?? ""
 	}
 
 	func updateNotifyAboutNewArticles() {
diff --git a/Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift b/Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift
index 82fcf2301..b05eacbcd 100644
--- a/Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift
+++ b/Mac/MainWindow/AddFeed/AddWebFeedWindowController.swift
@@ -91,7 +91,7 @@ class AddWebFeedWindowController : NSWindowController, AddFeedWindowController {
 			cancelSheet()
 			return;
 		}
-		guard let url = URL(string: normalizedURLString) else {
+		guard let url = URL(unicodeString: normalizedURLString) else {
 			cancelSheet()
 			return
 		}
diff --git a/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift b/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift
index 9b3f358f4..4dfd0ea7d 100644
--- a/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift
+++ b/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift
@@ -145,16 +145,16 @@ private extension SidebarViewController {
 		}
 
 		if let homePageURL = webFeed.homePageURL, let _ = URL(string: homePageURL) {
-			let item = menuItem(NSLocalizedString("Open Home Page", comment: "Command"), #selector(openHomePageFromContextualMenu(_:)), homePageURL)
+			let item = menuItem(NSLocalizedString("Open Home Page", comment: "Command"), #selector(openHomePageFromContextualMenu(_:)), homePageURL.decodedURLString ?? homePageURL)
 			menu.addItem(item)
 			menu.addItem(NSMenuItem.separator())
 		}
 
-		let copyFeedURLItem = menuItem(NSLocalizedString("Copy Feed URL", comment: "Command"), #selector(copyURLFromContextualMenu(_:)), webFeed.url)
+		let copyFeedURLItem = menuItem(NSLocalizedString("Copy Feed URL", comment: "Command"), #selector(copyURLFromContextualMenu(_:)), webFeed.url.decodedURLString ?? webFeed.url)
 		menu.addItem(copyFeedURLItem)
 
 		if let homePageURL = webFeed.homePageURL {
-			let item = menuItem(NSLocalizedString("Copy Home Page URL", comment: "Command"), #selector(copyURLFromContextualMenu(_:)), homePageURL)
+			let item = menuItem(NSLocalizedString("Copy Home Page URL", comment: "Command"), #selector(copyURLFromContextualMenu(_:)), homePageURL.decodedURLString ?? homePageURL)
 			menu.addItem(item)
 		}
 		menu.addItem(NSMenuItem.separator())
diff --git a/iOS/Add/AddWebFeedViewController.swift b/iOS/Add/AddWebFeedViewController.swift
index 1ae74f070..99f7e55f2 100644
--- a/iOS/Add/AddWebFeedViewController.swift
+++ b/iOS/Add/AddWebFeedViewController.swift
@@ -92,7 +92,7 @@ class AddWebFeedViewController: UITableViewController, AddContainerViewControlle
 		let urlString = urlTextField.text ?? ""
 		let normalizedURLString = urlString.normalizedURL
 		
-		guard !normalizedURLString.isEmpty, let url = URL(string: normalizedURLString) else {
+		guard !normalizedURLString.isEmpty, let url = URL(unicodeString: normalizedURLString) else {
 			delegate?.processingDidCancel()
 			return
 		}
diff --git a/iOS/Inspector/WebFeedInspectorViewController.swift b/iOS/Inspector/WebFeedInspectorViewController.swift
index bb3522edf..578b03a02 100644
--- a/iOS/Inspector/WebFeedInspectorViewController.swift
+++ b/iOS/Inspector/WebFeedInspectorViewController.swift
@@ -50,8 +50,8 @@ class WebFeedInspectorViewController: UITableViewController {
 		notifyAboutNewArticlesSwitch.setOn(webFeed.isNotifyAboutNewArticles ?? false, animated: false)
 		alwaysShowReaderViewSwitch.setOn(webFeed.isArticleExtractorAlwaysOn ?? false, animated: false)
 
-		homePageLabel.text = webFeed.homePageURL
-		feedURLLabel.text = webFeed.url
+		homePageLabel.text = webFeed.homePageURL?.decodedURLString
+		feedURLLabel.text = webFeed.url.decodedURLString
 		
 		NotificationCenter.default.addObserver(self, selector: #selector(webFeedIconDidBecomeAvailable(_:)), name: .WebFeedIconDidBecomeAvailable, object: nil)
 		
diff --git a/submodules/RSWeb b/submodules/RSWeb
index 72754ca5b..0cee6eafd 160000
--- a/submodules/RSWeb
+++ b/submodules/RSWeb
@@ -1 +1 @@
-Subproject commit 72754ca5b699af22c80d4326ca7ad74ec4a22c89
+Subproject commit 0cee6eafda53e27ee6a4e1249a27a8b9d79d2aed