diff --git a/src/lib/data/html/speeddial.html b/src/lib/data/html/speeddial.html
index 41f01ac32..62969910a 100644
--- a/src/lib/data/html/speeddial.html
+++ b/src/lib/data/html/speeddial.html
@@ -178,12 +178,12 @@ function boxEdited() {
     if (editingId == -1)
         return;
 
-    external.speedDial.urlFromUserInput($('#formUrl').attr("value"), function(newUrl) {
+    external.speedDial.urlFromUserInput($('#formUrl').val(), function(newUrl) {
         var box = document.getElementById('quickdial').getElementsByTagName('div')[editingId];
         var a = box.getElementsByTagName('a')[0];
         var originalUrl = a.getAttribute('href');
         setBoxUrl(editingId, newUrl);
-        setBoxTitle(editingId, $('#formTitle').attr("value"));
+        setBoxTitle(editingId, $('#formTitle').val());
         var changedUrl = a.getAttribute('href');
         var fetchTitleChecked = document.getElementById('fetchTitle').checked;
 
diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp
index 4a55f1cd2..8db3e7a3a 100644
--- a/src/lib/plugins/speeddial.cpp
+++ b/src/lib/plugins/speeddial.cpp
@@ -1,6 +1,6 @@
 /* ============================================================
-* QupZilla - WebKit based browser
-* Copyright (C) 2010-2016  David Rosca <nowrep@gmail.com>
+* QupZilla - Qt web browser
+* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -264,10 +264,6 @@ void SpeedDial::changed(const QString &allPages)
 
 void SpeedDial::loadThumbnail(const QString &url, bool loadTitle)
 {
-    if (url.isEmpty()) {
-        return;
-    }
-
     PageThumbnailer* thumbnailer = new PageThumbnailer(this);
     thumbnailer->setUrl(QUrl::fromEncoded(url.toUtf8()));
     thumbnailer->setLoadTitle(loadTitle);
@@ -342,7 +338,7 @@ void SpeedDial::thumbnailCreated(const QPixmap &pixmap)
     QString fileName = m_thumbnailsDir + QCryptographicHash::hash(url.toUtf8(), QCryptographicHash::Md4).toHex() + ".png";
 
     if (pixmap.isNull()) {
-        fileName = "qrc:/html/broken-page.png";
+        fileName = ":/html/broken-page.png";
         title = tr("Unable to load");
     }
     else {
diff --git a/src/lib/tools/pagethumbnailer.cpp b/src/lib/tools/pagethumbnailer.cpp
index 60f383ddb..ba8d0bd13 100644
--- a/src/lib/tools/pagethumbnailer.cpp
+++ b/src/lib/tools/pagethumbnailer.cpp
@@ -1,6 +1,6 @@
 /* ============================================================
-* QupZilla - WebKit based browser
-* Copyright (C) 2010-2014  David Rosca <nowrep@gmail.com>
+* QupZilla - Qt web browser
+* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 * ============================================================ */
 #include "pagethumbnailer.h"
 #include "scripts.h"
+#include "webview.h"
 
 #include <QTimer>
 #include <QApplication>
@@ -77,11 +78,10 @@ QString PageThumbnailer::title()
 
 void PageThumbnailer::start()
 {
-    if (m_view->rootObject()) {
+    if (m_view->rootObject() && WebView::isUrlValid(m_url)) {
         m_view->rootObject()->setProperty("url", m_url);
-    }
-    else {
-        QTimer::singleShot(0, this, [this]() {
+    } else {
+        QTimer::singleShot(500, this, [this]() {
             emit thumbnailCreated(QPixmap());
         });
     }
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 501b2394c..63dc036bd 100644
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -166,12 +166,11 @@ notRunning:
   SetOutPath "$INSTDIR\translations\qtwebengine_locales"
   File "translations\qtwebengine_locales\*"
 
-  SetOutPath "$INSTDIR\hunspell\doc"
-  File "wininstall\hunspell\doc\*"
+  SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc"
+  File "qtwebengine_dictionaries\doc\README-en-US.txt"
 
-  SetOutPath "$INSTDIR\hunspell"
-  File "wininstall\hunspell\en_US.aff"
-  File "wininstall\hunspell\en_US.dic"
+  SetOutPath "$INSTDIR\qtwebengine_dictionaries"
+  File "qtwebengine_dictionaries\en_US.bdic"
 
   call RegisterCapabilities
 SectionEnd
@@ -219,9 +218,10 @@ SectionGroupEnd
 Section $(TITLE_SecTranslations) SecTranslations
   SetOutPath "$INSTDIR\locale"
   File "locale\*.qm"
-  SetOutPath "$INSTDIR\hunspell"
-  File "wininstall\hunspell\*.aff"
-  File "wininstall\hunspell\*.dic"
+  SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc"
+  File "qtwebengine_dictionaries\doc\*"
+  SetOutPath "$INSTDIR\qtwebengine_dictionaries"
+  File "qtwebengine_dictionaries\*.bdic"
 SectionEnd
 
 Section $(TITLE_SecPlugins) SecPlugins