diff --git a/resources/graphics/misc/rss.png b/resources/graphics/misc/rss.png
new file mode 100644
index 000000000..d8ad53d4b
Binary files /dev/null and b/resources/graphics/misc/rss.png differ
diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc
index af4d7f9a0..2597a2f5b 100644
--- a/resources/rssguard.qrc
+++ b/resources/rssguard.qrc
@@ -37,6 +37,7 @@
     <file>graphics/misc/reedah.png</file>
     <file>graphics/misc/theoldreader.png</file>
     <file>graphics/misc/tt-rss.png</file>
+    <file>graphics/misc/rss.png</file>
 
     <file>graphics/misc/flags/cs.png</file>
     <file>graphics/misc/flags/da.png</file>
diff --git a/src/librssguard/gui/dialogs/formaddaccount.cpp b/src/librssguard/gui/dialogs/formaddaccount.cpp
index e3a55940e..202aabf1a 100644
--- a/src/librssguard/gui/dialogs/formaddaccount.cpp
+++ b/src/librssguard/gui/dialogs/formaddaccount.cpp
@@ -58,11 +58,18 @@ ServiceEntryPoint* FormAddAccount::selectedEntryPoint() const {
 }
 
 void FormAddAccount::loadEntryPoints() {
+  int classic_row = 0, i = 0;
+
   for (const ServiceEntryPoint* entry_point : qAsConst(m_entryPoints)) {
+    if (entry_point->code() == QSL(SERVICE_CODE_STD_RSS)) {
+      classic_row = i;
+    }
+
     QListWidgetItem* item = new QListWidgetItem(entry_point->icon(), entry_point->name(), m_ui->m_listEntryPoints);
 
     item->setToolTip(entry_point->description());
+    i++;
   }
 
-  m_ui->m_listEntryPoints->setCurrentRow(m_entryPoints.size() - 1);
+  m_ui->m_listEntryPoints->setCurrentRow(classic_row);
 }
diff --git a/src/librssguard/services/standard/gui/formeditstandardaccount.cpp b/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
index eda119baa..683dd52ca 100644
--- a/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
+++ b/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
@@ -2,14 +2,14 @@
 
 #include "services/standard/gui/formeditstandardaccount.h"
 
-#include "miscellaneous/application.h"
 #include "database/databasefactory.h"
 #include "database/databasequeries.h"
+#include "miscellaneous/application.h"
 #include "miscellaneous/iconfactory.h"
 #include "services/standard/standardserviceroot.h"
 
 FormEditStandardAccount::FormEditStandardAccount(QWidget* parent)
-  : FormAccountDetails(qApp->icons()->fromTheme(QSL("rssguard")), parent) {}
+  : FormAccountDetails(qApp->icons()->miscIcon(QSL("rss")), parent) {}
 
 void FormEditStandardAccount::apply() {
   FormAccountDetails::apply();
diff --git a/src/librssguard/services/standard/standardserviceentrypoint.cpp b/src/librssguard/services/standard/standardserviceentrypoint.cpp
index c9b235c58..357a5396c 100644
--- a/src/librssguard/services/standard/standardserviceentrypoint.cpp
+++ b/src/librssguard/services/standard/standardserviceentrypoint.cpp
@@ -9,11 +9,11 @@
 #include "services/standard/standardserviceroot.h"
 
 QString StandardServiceEntryPoint::name() const {
-  return QObject::tr("Standard online feeds (RSS/ATOM/JSON)");
+  return QObject::tr("Classic feeds (RSS/ATOM/JSON)");
 }
 
 QString StandardServiceEntryPoint::description() const {
-  return QObject::tr("This service offers integration with standard online RSS/RDF/ATOM feeds and podcasts.");
+  return QObject::tr("This service offers integration with standard online RSS/RDF/ATOM/JSON feeds and podcasts.");
 }
 
 QString StandardServiceEntryPoint::author() const {
@@ -21,7 +21,7 @@ QString StandardServiceEntryPoint::author() const {
 }
 
 QIcon StandardServiceEntryPoint::icon() const {
-  return QIcon(APP_ICON_PATH);
+  return qApp->icons()->miscIcon(QSL("rss"));
 }
 
 QString StandardServiceEntryPoint::code() const {