4 files changed, 10 insertions, 1 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 9aa7693d..8fb15b5a 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -447,6 +447,12 @@ TabWindowList Application::tabWindowList()
 }
 
 
+WebAppList Application::webAppList()
+{
+    return m_webApps;
+}
+
+
 bool Application::eventFilter(QObject* watched, QEvent* event)
 {
     // Track which window was activated most recently to prefer it on window choosing
diff --git a/src/application.h b/src/application.h
index a80c9fa3..e7153831 100644
--- a/src/application.h
+++ b/src/application.h
@@ -70,6 +70,8 @@ public:
     TabWindow *tabWindow();
     TabWindowList tabWindowList();
 
+    WebAppList webAppList();
+    
     void bookmarksToolbarToggled(bool);
 
 public Q_SLOTS:
diff --git a/src/icons/iconmanager.cpp b/src/icons/iconmanager.cpp
index 33c62893..49d637ad 100644
--- a/src/icons/iconmanager.cpp
+++ b/src/icons/iconmanager.cpp
@@ -74,7 +74,7 @@ IconManager::IconManager(QObject *parent)
 KIcon IconManager::iconForUrl(const KUrl &url)
 {
     // first things first.. avoid infinite loop at startup
-    if (url.isEmpty() || rApp->tabWindowList().isEmpty())
+    if (url.isEmpty() || (rApp->tabWindowList().isEmpty() && rApp->webAppList().isEmpty()))
         return KIcon("text-html");
 
     QByteArray encodedUrl = url.toEncoded();
diff --git a/src/webtab/webpage.cpp b/src/webtab/webpage.cpp
index cd1f41e8..a501c4bb 100644
--- a/src/webtab/webpage.cpp
+++ b/src/webtab/webpage.cpp
@@ -178,6 +178,7 @@ WebPage::WebPage(QWidget *parent, bool isPrivateBrowsing)
     // protocol handler signals
     connect(&_protHandler, SIGNAL(downloadUrl(KUrl)), this, SLOT(downloadUrl(KUrl)));
 
+    // TODO: Remove me and implement an icon retriever for each tab
     connect(IconManager::self(), SIGNAL(iconChanged()), mainFrame(), SIGNAL(iconChanged()));
 }