diff --git a/applet.cpp b/applet.cpp
index 56bf3ae2e..d7c8ffbbe 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -584,9 +584,9 @@ void AppletPrivate::positionMessageOverlay()
 void AppletPrivate::destroyMessageOverlay()
 {
     if (messageDialog) {
-        messageDialog->animatedHide(Plasma::locationToInverseDirection(q->location()));
-        //messageDialog->deleteLater();
-        messageDialog = 0;
+        messageDialog.data()->animatedHide(Plasma::locationToInverseDirection(q->location()));
+        //messageDialog.data()->deleteLater();
+        messageDialog.clear();
     }
 
     if (!messageOverlay) {
@@ -1088,18 +1088,18 @@ void Applet::showMessage(const QIcon &icon, const QString &message, const Messag
         }
 
         if (d->messageDialog) {
-            delete d->messageDialog->graphicsWidget();
+            delete d->messageDialog.data()->graphicsWidget();
         } else {
             d->messageDialog = new Plasma::Dialog;
         }
 
         ToolTipManager::self()->hide(this);
-        KWindowSystem::setOnAllDesktops(d->messageDialog->winId(), true);
-        KWindowSystem::setState(d->messageDialog->winId(), NET::SkipTaskbar | NET::SkipPager);
-        d->messageDialog->setGraphicsWidget(mainWidget);
-        connect(d->messageDialog, SIGNAL(destroyed(QObject*)), mainWidget, SLOT(deleteLater()));
+        KWindowSystem::setOnAllDesktops(d->messageDialog.data()->winId(), true);
+        KWindowSystem::setState(d->messageDialog.data()->winId(), NET::SkipTaskbar | NET::SkipPager);
+        d->messageDialog.data()->setGraphicsWidget(mainWidget);
+        connect(d->messageDialog.data(), SIGNAL(destroyed(QObject*)), mainWidget, SLOT(deleteLater()));
     } else {
-        delete d->messageDialog;
+        delete d->messageDialog.data();
         d->createMessageOverlay();
         d->messageOverlay->opacity = 0.8;
         QGraphicsLinearLayout *l = new QGraphicsLinearLayout(d->messageOverlay);
@@ -1109,11 +1109,11 @@ void Applet::showMessage(const QIcon &icon, const QString &message, const Messag
     if (d->messageDialog) {
         QPoint pos = geometry().topLeft().toPoint();
         if (corona) {
-            pos = corona->popupPosition(this, d->messageDialog->size());
+            pos = corona->popupPosition(this, d->messageDialog.data()->size());
         }
 
-        d->messageDialog->move(pos);
-        d->messageDialog->animatedShow(locationToDirection(location()));
+        d->messageDialog.data()->move(pos);
+        d->messageDialog.data()->animatedShow(locationToDirection(location()));
     } else {
         d->messageOverlay->show();
     }
diff --git a/popupapplet.cpp b/popupapplet.cpp
index 1441eaf16..13281c56d 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -120,10 +120,10 @@ void PopupApplet::setWidget(QWidget *widget)
 {
     if (d->widget) {
         if (d->dialog) {
-            d->dialog->setGraphicsWidget(0);
+            d->dialog.data()->setGraphicsWidget(0);
             QVBoxLayout *lay = 0;
 
-            QLayout *existingLayout = d->dialog->layout();
+            QLayout *existingLayout = d->dialog.data()->layout();
             if (existingLayout) {
                 lay = dynamic_cast<QVBoxLayout *>(existingLayout);
                 if (!lay) {
@@ -133,7 +133,7 @@ void PopupApplet::setWidget(QWidget *widget)
 
             if (!lay) {
                 lay = new QVBoxLayout;
-                d->dialog->setLayout(lay);
+                d->dialog.data()->setLayout(lay);
             }
 
             lay->removeWidget(d->widget);
@@ -159,7 +159,7 @@ void PopupApplet::setGraphicsWidget(QGraphicsWidget *graphicsWidget)
 {
     if (d->graphicsWidget) {
         if (d->dialog) {
-            d->dialog->setGraphicsWidget(graphicsWidget);
+            d->dialog.data()->setGraphicsWidget(graphicsWidget);
         } else {
             QGraphicsLinearLayout *lay = static_cast<QGraphicsLinearLayout *>(layout());
             lay->removeAt(0);
@@ -183,7 +183,7 @@ void PopupAppletPrivate::checkExtenderAppearance(Plasma::FormFactor f)
         }
 
         if (dialog) {
-            dialog->setGraphicsWidget(extender);
+            dialog.data()->setGraphicsWidget(extender);
         }
     }
 }
@@ -250,17 +250,16 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
             }
 
             if (dialog) {
-                if (dialog->layout() && qWidget) {
+                if (dialog.data()->layout() && qWidget) {
                     //we don't want to delete Widget inside the dialog layout
-                    dialog->layout()->removeWidget(qWidget);
+                    dialog.data()->layout()->removeWidget(qWidget);
                 }
 
                 if (qWidget) {
                     qWidget->setParent(0);
                 }
 
-                delete dialog;
-                dialog = 0;
+                delete dialog.data();
             }
 
             if (!lay) {
@@ -348,27 +347,27 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
                     //could that cast ever fail??
                     if (corona) {
                         corona->addOffscreenWidget(gWidget);
-                        dialog->setGraphicsWidget(gWidget);
+                        dialog.data()->setGraphicsWidget(gWidget);
                         gWidget->resize(gWidget->preferredSize());
                     }
 
-                    dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (gWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
+                    dialog.data()->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (gWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
                 } else if (qWidget) {
-                    QVBoxLayout *l_layout = new QVBoxLayout(dialog);
+                    QVBoxLayout *l_layout = new QVBoxLayout(dialog.data());
                     l_layout->setSpacing(0);
                     l_layout->setMargin(0);
                     l_layout->addWidget(qWidget);
-                    dialog->adjustSize();
-                    dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (qWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
+                    dialog.data()->adjustSize();
+                    dialog.data()->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | (qWidget->windowFlags() & Qt::X11BypassWindowManagerHint));
                 } else {
-                    dialog->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
+                    dialog.data()->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
                 }
 
-                KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
-                dialog->installEventFilter(q);
+                KWindowSystem::setState(dialog.data()->winId(), NET::SkipTaskbar | NET::SkipPager);
+                dialog.data()->installEventFilter(q);
 
-                QObject::connect(dialog, SIGNAL(dialogResized()), q, SLOT(dialogSizeChanged()));
-                QObject::connect(dialog, SIGNAL(dialogVisible(bool)), q, SLOT(dialogStatusChanged(bool)));
+                QObject::connect(dialog.data(), SIGNAL(dialogResized()), q, SLOT(dialogSizeChanged()));
+                QObject::connect(dialog.data(), SIGNAL(dialogVisible(bool)), q, SLOT(dialogStatusChanged(bool)));
             }
 
             if (icon && lay) {
@@ -410,7 +409,7 @@ void PopupApplet::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 
 bool PopupApplet::eventFilter(QObject *watched, QEvent *event)
 {
-    if (!d->passive && watched == d->dialog && (event->type() == QEvent::WindowDeactivate)) {
+    if (!d->passive && watched == d->dialog.data() && (event->type() == QEvent::WindowDeactivate)) {
         d->popupLostFocus = true;
         hidePopup();
         QTimer::singleShot(100, this, SLOT(clearPopupLostFocus()));
@@ -428,7 +427,7 @@ bool PopupApplet::eventFilter(QObject *watched, QEvent *event)
     }
     */
 
-    if (watched == d->dialog && event->type() == QEvent::ContextMenu) {
+    if (watched == d->dialog.data() && event->type() == QEvent::ContextMenu) {
         //pass it up to the applet
         //well, actually we have to pass it to the *containment*
         //because all the code for showing an applet's contextmenu is actually in Containment.
@@ -462,7 +461,7 @@ void PopupApplet::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
         if (mimeData && qobject_cast<Extender*>(graphicsWidget())) {
             //We want to hide the popup if we're not moving onto the popup AND it is not the popup
             //we started.
-            if (d->dialog && !d->dialog->geometry().contains(event->screenPos()) &&
+            if (d->dialog && !d->dialog.data()->geometry().contains(event->screenPos()) &&
                 mimeData->extenderItem()->extender() != qobject_cast<Extender*>(graphicsWidget())) {
                 //We actually try to hide the popup, with a call to showPopup, with a smal timeout,
                 //so if the user moves into the popup fast enough, it remains open (the extender
@@ -490,7 +489,7 @@ void PopupApplet::showPopup(uint popupDuration)
     if (d->dialog) {
         // move the popup before its fist show, even if the show isn't triggered by
         // a click, this should fix the first random position seen in some widgets
-        if (!d->dialog->isVisible()) {
+        if (!d->dialog.data()->isVisible()) {
             d->internalTogglePopup();
         }
 
@@ -513,9 +512,9 @@ void PopupApplet::hidePopup()
 {
     if (d->dialog) {
         if (location() != Floating) {
-            d->dialog->animatedHide(locationToInverseDirection(location()));
+            d->dialog.data()->animatedHide(locationToInverseDirection(location()));
         } else {
-            d->dialog->hide();
+            d->dialog.data()->hide();
         }
     }
 }
@@ -546,13 +545,12 @@ bool PopupApplet::isPassivePopup() const
 
 bool PopupApplet::isPopupShowing() const
 {
-    return d->dialog && d->dialog->isVisible();
+    return d->dialog && d->dialog.data()->isVisible();
 }
 
 PopupAppletPrivate::PopupAppletPrivate(PopupApplet *applet)
         : q(applet),
           icon(0),
-          dialog(0),
           proxy(0),
           widget(0),
           graphicsWidget(0),
@@ -570,7 +568,7 @@ PopupAppletPrivate::~PopupAppletPrivate()
         proxy->setWidget(0);
     }
 
-    delete dialog;
+    delete dialog.data();
     delete icon;
 }
 
@@ -589,14 +587,14 @@ void PopupAppletPrivate::internalTogglePopup()
         timer->stop();
     }
 
-    if (dialog->isVisible()) {
+    if (dialog.data()->isVisible()) {
         if (q->location() != Floating) {
-            dialog->animatedHide(locationToInverseDirection(q->location()));
+            dialog.data()->animatedHide(locationToInverseDirection(q->location()));
         } else {
-            dialog->hide();
+            dialog.data()->hide();
         }
 
-        dialog->clearFocus();
+        dialog.data()->clearFocus();
     } else {
         if (q->graphicsWidget() &&
             q->graphicsWidget() == static_cast<Applet*>(q)->d->extender &&
@@ -608,17 +606,17 @@ void PopupAppletPrivate::internalTogglePopup()
         ToolTipManager::self()->hide(q);
         updateDialogPosition();
 
-        KWindowSystem::setOnAllDesktops(dialog->winId(), true);
-        KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
+        KWindowSystem::setOnAllDesktops(dialog.data()->winId(), true);
+        KWindowSystem::setState(dialog.data()->winId(), NET::SkipTaskbar | NET::SkipPager);
 
         if (q->location() != Floating) {
-            dialog->animatedShow(locationToDirection(q->location()));
+            dialog.data()->animatedShow(locationToDirection(q->location()));
         } else {
-            dialog->show();
+            dialog.data()->show();
         }
 
-        if (!(dialog->windowFlags() & Qt::X11BypassWindowManagerHint)) {
-            KWindowSystem::activateWindow(dialog->winId());
+        if (!(dialog.data()->windowFlags() & Qt::X11BypassWindowManagerHint)) {
+            KWindowSystem::activateWindow(dialog.data()->winId());
         }
     }
 }
@@ -640,8 +638,8 @@ void PopupAppletPrivate::dialogSizeChanged()
     if (dialog) {
         KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
         KConfigGroup sizeGroup(mainGroup, "PopupApplet");
-        sizeGroup.writeEntry("DialogHeight", dialog->height());
-        sizeGroup.writeEntry("DialogWidth", dialog->width());
+        sizeGroup.writeEntry("DialogHeight", dialog.data()->height());
+        sizeGroup.writeEntry("DialogWidth", dialog.data()->width());
 
         updateDialogPosition();
 
@@ -674,9 +672,9 @@ void PopupAppletPrivate::updateDialogPosition()
 
     int preferredWidth = 0;
     int preferredHeight = 0;
-    if (dialog->graphicsWidget()) {
-        preferredWidth = dialog->graphicsWidget()->preferredSize().width();
-        preferredHeight = dialog->graphicsWidget()->preferredSize().height();
+    if (dialog.data()->graphicsWidget()) {
+        preferredWidth = dialog.data()->graphicsWidget()->preferredSize().width();
+        preferredHeight = dialog.data()->graphicsWidget()->preferredSize().height();
     }
 
     const int width = qMin(sizeGroup.readEntry("DialogWidth", preferredWidth),
@@ -687,27 +685,27 @@ void PopupAppletPrivate::updateDialogPosition()
     QSize saved(width, height);
 
     if (saved.isNull()) {
-        saved = dialog->sizeHint();
+        saved = dialog.data()->sizeHint();
     } else {
-        saved = saved.expandedTo(dialog->minimumSizeHint());
+        saved = saved.expandedTo(dialog.data()->minimumSizeHint());
     }
 
-    if (saved.width() != dialog->width() || saved.height() != dialog->height()) {
-        dialog->resize(saved);
+    if (saved.width() != dialog.data()->width() || saved.height() != dialog.data()->height()) {
+        dialog.data()->resize(saved);
     }
 
-    QSize s = dialog->size();
+    QSize s = dialog.data()->size();
     QPoint pos = view->mapFromScene(q->scenePos());
 
     pos = corona->popupPosition(q, s);
 
     bool reverse = false;
     if (q->formFactor() == Plasma::Vertical) {
-        if (view->mapToGlobal(view->mapFromScene(q->scenePos())).y() + q->size().height()/2 < pos.y() + dialog->size().width()/2) {
+        if (view->mapToGlobal(view->mapFromScene(q->scenePos())).y() + q->size().height()/2 < pos.y() + dialog.data()->size().width()/2) {
             reverse = true;
         }
     } else {
-        if (view->mapToGlobal(view->mapFromScene(q->scenePos())).x() + q->size().width()/2 < pos.x() + dialog->size().width()/2) {
+        if (view->mapToGlobal(view->mapFromScene(q->scenePos())).x() + q->size().width()/2 < pos.x() + dialog.data()->size().width()/2) {
             reverse = true;
         }
     }
@@ -715,9 +713,9 @@ void PopupAppletPrivate::updateDialogPosition()
     switch (q->location()) {
     case BottomEdge:
         if (pos.x() >= q->pos().x()) {
-            dialog->setResizeHandleCorners(Dialog::NorthEast);
+            dialog.data()->setResizeHandleCorners(Dialog::NorthEast);
         } else {
-            dialog->setResizeHandleCorners(Dialog::NorthWest);
+            dialog.data()->setResizeHandleCorners(Dialog::NorthWest);
         }
 
         if (reverse) {
@@ -728,9 +726,9 @@ void PopupAppletPrivate::updateDialogPosition()
         break;
     case TopEdge:
         if (pos.x() >= q->pos().x()) {
-            dialog->setResizeHandleCorners(Dialog::SouthEast);
+            dialog.data()->setResizeHandleCorners(Dialog::SouthEast);
         } else {
-            dialog->setResizeHandleCorners(Dialog::SouthWest);
+            dialog.data()->setResizeHandleCorners(Dialog::SouthWest);
         }
 
         if (reverse) {
@@ -741,9 +739,9 @@ void PopupAppletPrivate::updateDialogPosition()
         break;
     case LeftEdge:
         if (pos.y() >= q->pos().y()) {
-            dialog->setResizeHandleCorners(Dialog::SouthEast);
+            dialog.data()->setResizeHandleCorners(Dialog::SouthEast);
         } else {
-            dialog->setResizeHandleCorners(Dialog::NorthEast);
+            dialog.data()->setResizeHandleCorners(Dialog::NorthEast);
         }
 
         if (reverse) {
@@ -755,9 +753,9 @@ void PopupAppletPrivate::updateDialogPosition()
 
     case RightEdge:
         if (pos.y() >= q->pos().y()) {
-            dialog->setResizeHandleCorners(Dialog::SouthWest);
+            dialog.data()->setResizeHandleCorners(Dialog::SouthWest);
         } else {
-            dialog->setResizeHandleCorners(Dialog::NorthWest);
+            dialog.data()->setResizeHandleCorners(Dialog::NorthWest);
         }
 
         if (reverse) {
@@ -767,10 +765,10 @@ void PopupAppletPrivate::updateDialogPosition()
         }
         break;
     default:
-        dialog->setResizeHandleCorners(Dialog::NorthEast);
+        dialog.data()->setResizeHandleCorners(Dialog::NorthEast);
     }
 
-    dialog->move(pos);
+    dialog.data()->move(pos);
 }
 
 } // Plasma namespace
diff --git a/private/applet_p.h b/private/applet_p.h
index 4e6821f01..8333b172a 100644
--- a/private/applet_p.h
+++ b/private/applet_p.h
@@ -140,7 +140,7 @@ public:
     Plasma::Constraints pendingConstraints;
 
     // overlays and messages
-    QPointer<Plasma::Dialog> messageDialog;
+    QWeakPointer<Plasma::Dialog> messageDialog;
     AppletOverlayWidget *messageOverlay;
     QGraphicsProxyWidget *messageOverlayProxy;
     Plasma::BusyWidget *busyWidget;
diff --git a/private/popupapplet_p.h b/private/popupapplet_p.h
index 37ef19a0c..a103936d0 100644
--- a/private/popupapplet_p.h
+++ b/private/popupapplet_p.h
@@ -42,7 +42,7 @@ public:
 
     PopupApplet *q;
     Plasma::IconWidget *icon;
-    QPointer<Plasma::Dialog> dialog;
+    QWeakPointer<Plasma::Dialog> dialog;
     QGraphicsProxyWidget *proxy;
     QWidget *widget;
     QGraphicsWidget *graphicsWidget;
diff --git a/private/tooltip.cpp b/private/tooltip.cpp
index d25dc9456..5e8449d46 100644
--- a/private/tooltip.cpp
+++ b/private/tooltip.cpp
@@ -134,7 +134,6 @@ class ToolTipPrivate
         : text(0),
           imageLabel(0),
           preview(0),
-          source(0),
           timeline(0),
           direction(Plasma::Up),
           autohide(true)
@@ -144,7 +143,7 @@ class ToolTipPrivate
     QLabel *imageLabel;
     WindowPreview *preview;
     FrameSvg *background;
-    QPointer<QObject> source;
+    QWeakPointer<QObject> source;
     QTimeLine *timeline;
     QPoint to;
     QPoint from;
@@ -204,7 +203,7 @@ void ToolTip::hideEvent(QHideEvent *e)
 {
     QWidget::hideEvent(e);
     if (d->source) {
-        QMetaObject::invokeMethod(d->source, "toolTipHidden");
+        QMetaObject::invokeMethod(d->source.data(), "toolTipHidden");
     }
 }
 
diff --git a/svg.cpp b/svg.cpp
index e4680a8b0..4e4a492e0 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -67,7 +67,6 @@ class SvgPrivate
     public:
         SvgPrivate(Svg *svg)
             : q(svg),
-              theme(0),
               renderer(0),
               lastModified(0),
               multipleImages(false),
@@ -181,7 +180,7 @@ class SvgPrivate
                 theme = Plasma::Theme::defaultTheme();
             }
 
-            return theme;
+            return theme.data();
         }
 
         QPixmap findInCache(const QString &elementId, const QSizeF &s = QSizeF())
@@ -303,7 +302,7 @@ class SvgPrivate
                 s_renderers.erase(s_renderers.find(path));
 
                 if (theme) {
-                    theme->releaseRectsCache(path);
+                    theme.data()->releaseRectsCache(path);
                 }
             }
 
@@ -412,7 +411,7 @@ class SvgPrivate
         static QHash<QString, SharedSvgRenderer::Ptr> s_renderers;
 
         Svg *q;
-        QPointer<Theme> theme;
+        QWeakPointer<Theme> theme;
         QHash<QString, QRectF> localRectCache;
         SharedSvgRenderer::Ptr renderer;
         QString themePath;
@@ -597,7 +596,7 @@ bool Svg::isUsingRenderingCache() const
 void Svg::setTheme(Plasma::Theme *theme)
 {
     if (d->theme) {
-        disconnect(d->theme, 0, this, 0);
+        disconnect(d->theme.data(), 0, this, 0);
     }
 
     d->theme = theme;
@@ -610,7 +609,7 @@ void Svg::setTheme(Plasma::Theme *theme)
 
 Theme *Svg::theme() const
 {
-    return d->theme;
+    return d->theme ? d->theme.data() : Theme::defaultTheme();
 }
 
 } // Plasma namespace