diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 190fed124..478050b2f 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -6,6 +6,7 @@ Added:
 ▪ RSS Guard now can be compiled WITHOUT QtWebEngine module. Minimal Qt required was also lowered to 5.6.0.
 
 Changed:
+▪ Obtaining feed metadata including icons is now improved a bit.
 ▪ Big application core refactoring. Many functions rewritten, some bad code removed.
 
 Fixed:
diff --git a/src/network-web/networkfactory.cpp b/src/network-web/networkfactory.cpp
index 630747b95..9ffb3777a 100755
--- a/src/network-web/networkfactory.cpp
+++ b/src/network-web/networkfactory.cpp
@@ -132,7 +132,7 @@ QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList<QString> &u
   QNetworkReply::NetworkError network_result = QNetworkReply::UnknownNetworkError;
 
   foreach (const QString &url, urls) {
-    const QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(url.toHtmlEscaped());
+    const QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(QUrl(url).host());
     QByteArray icon_data;
     network_result =  performNetworkOperation(google_s2_with_url, timeout, QByteArray(), QString(), icon_data,
                                               QNetworkAccessManager::GetOperation).first;
diff --git a/src/services/standard/standardfeed.cpp b/src/services/standard/standardfeed.cpp
index 0d78ec213..4749083ac 100755
--- a/src/services/standard/standardfeed.cpp
+++ b/src/services/standard/standardfeed.cpp
@@ -222,7 +222,7 @@ QPair<StandardFeed*,QNetworkReply::NetworkError> StandardFeed::guessFeed(const Q
                                                                   password);
   result.second = network_result.first;
 
-  if (result.second == QNetworkReply::NoError) {
+  if (result.second == QNetworkReply::NoError || !feed_contents.isEmpty()) {
     // Feed XML was obtained, now we need to try to guess
     // its encoding before we can read further data.
     QString xml_schema_encoding;