diff --git a/src/core/networkfactory.cpp b/src/core/networkfactory.cpp
index 74067201b..c65dfc2f5 100644
--- a/src/core/networkfactory.cpp
+++ b/src/core/networkfactory.cpp
@@ -14,7 +14,11 @@ NetworkFactory::NetworkFactory() {
 QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QString &url,
                                                          int timeout,
                                                          QIcon &output) {
+#if QT_VERSION >= 0x050000
+  QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(url.toHtmlEscaped());
+#else
   QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(Qt::escape(url));
+#endif
   QByteArray icon_data;
 
   QNetworkReply::NetworkError network_result =  downloadFeedFile(google_s2_with_url,
diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp
index 86a97cf00..48cd8fd76 100755
--- a/src/gui/formsettings.cpp
+++ b/src/gui/formsettings.cpp
@@ -468,9 +468,13 @@ void FormSettings::loadDataStorage() {
     m_ui->m_spinMysqlPort->setValue(Settings::instance()->value(APP_CFG_DB, "mysql_port", APP_DB_MYSQL_PORT).toInt());
   }
 
-  m_ui->m_cmbDatabaseDriver->setCurrentIndex(m_ui->m_cmbDatabaseDriver->findData(Settings::instance()->value(APP_CFG_DB,
-                                                                                                             "database_driver",
-                                                                                                             APP_DB_DRIVER_SQLITE).toString()));
+  int index_current_backend = m_ui->m_cmbDatabaseDriver->findData(Settings::instance()->value(APP_CFG_DB,
+                                                                                              "database_driver",
+                                                                                              APP_DB_DRIVER_SQLITE).toString());
+
+  if (index_current_backend >= 0) {
+    m_ui->m_cmbDatabaseDriver->setCurrentIndex(index_current_backend);
+  }
 }
 
 void FormSettings::saveDataStorage() {
@@ -507,9 +511,9 @@ void FormSettings::saveDataStorage() {
 
 void FormSettings::mysqlTestConnection() {
   int error_code = DatabaseFactory::instance()->mysqlTestConnection(m_ui->m_txtMysqlHostname->lineEdit()->text(),
-                                                                m_ui->m_spinMysqlPort->value(),
-                                                                m_ui->m_txtMysqlUsername->lineEdit()->text(),
-                                                                m_ui->m_txtMysqlPassword->lineEdit()->text());
+                                                                    m_ui->m_spinMysqlPort->value(),
+                                                                    m_ui->m_txtMysqlUsername->lineEdit()->text(),
+                                                                    m_ui->m_txtMysqlPassword->lineEdit()->text());
 
   // Let's interpret the result.
   m_ui->m_lblMysqlTestResult->setText(DatabaseFactory::instance()->mysqlInterpretErrorCode(error_code));