diff --git a/src/icon.ico b/src/icon.ico
deleted file mode 100644
index acd93a8a3..000000000
Binary files a/src/icon.ico and /dev/null differ
diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp
index cc7fe9015..165d0739f 100644
--- a/src/navigation/locationbar.cpp
+++ b/src/navigation/locationbar.cpp
@@ -215,7 +215,7 @@ void LocationBar::setPrivacy(bool state)
 void LocationBar::focusOutEvent(QFocusEvent* e)
 {
     QLineEdit::focusOutEvent(e);
-    if (!selectedText().isEmpty()  && e->reason() != Qt::TabFocusReason)
+    if (!selectedText().isEmpty() && e->reason() != Qt::TabFocusReason)
         return;
     setCursorPosition(0);
     hideGoButton();
@@ -232,7 +232,7 @@ void LocationBar::dropEvent(QDropEvent* event)
             return;
         }
     }
-    if (event->mimeData()->hasText()) {
+    else if (event->mimeData()->hasText()) {
         QUrl dropUrl = QUrl(event->mimeData()->text());
         if (WebView::isUrlValid(dropUrl)) {
             setText(dropUrl.toString());
diff --git a/src/network/networkmanager.cpp b/src/network/networkmanager.cpp
index 32c1c2953..e915d7413 100644
--- a/src/network/networkmanager.cpp
+++ b/src/network/networkmanager.cpp
@@ -90,6 +90,13 @@ void NetworkManager::sslError(QNetworkReply* reply, QList<QSslError> errors)
         reply->ignoreSslErrors(errors);
         return;
     }
+
+    QNetworkRequest request = reply->request();
+    QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100));
+    WebPage* webPage = (WebPage*)(v.value<void*>());
+    if (!webPage)
+        return;
+
     QString title = tr("SSL Certificate Error!");
     QString text1 = tr("The page you trying to access has following errors in SSL Certificate:");
 
@@ -112,9 +119,11 @@ void NetworkManager::sslError(QNetworkReply* reply, QList<QSslError> errors)
     QString message = QString(QLatin1String("<b>%1</b><p>%2</p><ul><li>%3</li></ul><p>%4</p>")).arg(title, text1, actions.join(QLatin1String("</li><li>")), text2);
 
     if (!actions.isEmpty())  {
-        QMessageBox::StandardButton button = QMessageBox::critical(p_QupZilla, tr("SSL Certificate Error"),
-                                                               message, QMessageBox::Yes | QMessageBox::No);
-        if (button != QMessageBox::Yes)
+//        QMessageBox::StandardButton button = QMessageBox::critical(p_QupZilla, tr("SSL Certificate Error"),
+//                                                               message, QMessageBox::Yes | QMessageBox::No);
+//        if (button != QMessageBox::Yes)
+//            return;
+        if (!webPage->javaScriptConfirm(webPage->mainFrame(), message))
             return;
     }
 
diff --git a/src/tools/buttonwithmenu.cpp b/src/tools/buttonwithmenu.cpp
index d5d8469ef..46631d7af 100644
--- a/src/tools/buttonwithmenu.cpp
+++ b/src/tools/buttonwithmenu.cpp
@@ -48,7 +48,7 @@ void ButtonWithMenu::removeItem(const Item &item)
     m_items.removeOne(item);
 
     if (*m_currentItem == item)
-        setActiveItem(m_items.takeFirst());
+        setActiveItem(m_items.first());
 
     generateMenu();
 }
diff --git a/src/tools/closedtabsmanager.cpp b/src/tools/closedtabsmanager.cpp
index e79567ef4..272b2b3fa 100644
--- a/src/tools/closedtabsmanager.cpp
+++ b/src/tools/closedtabsmanager.cpp
@@ -24,10 +24,8 @@ void ClosedTabsManager::saveView(WebView* view)
 ClosedTabsManager::Tab ClosedTabsManager::getFirstClosedTab()
 {
     Tab tab;
-    if (m_closedTabs.count() > 0) {
+    if (m_closedTabs.count() > 0)
         tab = m_closedTabs.takeFirst();
-        m_closedTabs.removeOne(tab);
-    }
 
     return tab;
 }