diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24557886f..bc4a225ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,6 +182,9 @@ set(plasma_LIB_SRCS
 )
 
 set (plasmaqgv_LIB_SRCS
+    #FIXME: this is duplicated with libplasma because iconwidget requires it!
+    private/themedwidgetinterface.cpp
+
     graphicsview/graphicsviewappletprivate.cpp
     animator.cpp
     animations/animation.cpp
diff --git a/tooltipmanager.cpp b/tooltipmanager.cpp
index e5839a498..27bc47df8 100644
--- a/tooltipmanager.cpp
+++ b/tooltipmanager.cpp
@@ -248,10 +248,6 @@ void ToolTipManager::setContent(QGraphicsWidget *widget, const ToolTipContent &d
             //look if the data prefers aother graphicswidget, otherwise use the one used as event catcher
             QGraphicsWidget *referenceWidget = data.graphicsWidget() ? data.graphicsWidget() : widget;
             Corona *corona = qobject_cast<Corona *>(referenceWidget->scene());
-            if (!corona) {
-                // fallback to the corona we were given
-                corona = m_corona;
-            }
 
             if (corona) {
                 d->tipWidget->moveTo(corona->popupPosition(referenceWidget, d->tipWidget->size(), Qt::AlignCenter));
@@ -408,10 +404,6 @@ void ToolTipManagerPrivate::showToolTip()
     tipWidget->prepareShowing();
     QGraphicsWidget *referenceWidget = tooltip.value().graphicsWidget() ? tooltip.value().graphicsWidget() : currentWidget;
     Corona *corona = qobject_cast<Corona *>(referenceWidget->scene());
-    if (!corona) {
-        // fallback to the corona we were given
-        corona = q->m_corona;
-    }
 
     if (corona) {
         tipWidget->moveTo(corona->popupPosition(referenceWidget, tipWidget->size(), Qt::AlignCenter));