diff --git a/libs/ui/widgets/kis_iconwidget.cc b/libs/ui/widgets/kis_iconwidget.cc
index 988b188ccd..d3454b9152 100644
--- a/libs/ui/widgets/kis_iconwidget.cc
+++ b/libs/ui/widgets/kis_iconwidget.cc
@@ -1,86 +1,95 @@
 /*
  *  Copyright (c) 2000 Matthias Elter  <elter@kde.org>
  *  Copyright (c) 2003 Patrick Julien  <freak@codepimps.org>
  *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.g
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "widgets/kis_iconwidget.h"
 
 #include <QPainter>
 #include <QIcon>
 #include <QStyleOption>
 #include <resources/KoResource.h>
 #include <KoResourceServerAdapter.h>
 
 
 KisIconWidget::KisIconWidget(QWidget *parent, const char *name)
     : KisPopupButton(parent)
 {
     setObjectName(name);
     m_resource = 0;
 }
 
 void KisIconWidget::slotSetItem(KoResource * resource)
 {
     m_resource = resource;
     update();
 }
 
 void KisIconWidget::paintEvent(QPaintEvent *event)
 {
     QPushButton::paintEvent(event);
 
     QPainter p(this);
 
     const qint32 cw = width();
     const qint32 ch = height();
     const qint32 border = 3;
     const qint32 iconWidth = cw - (border*2);
     const qint32 iconHeight = ch - (border*2);
 
     // Round off the corners of the preview
     QRegion clipRegion(border, border, iconWidth, iconHeight);
     clipRegion -= QRegion(border, border, 1, 1);
     clipRegion -= QRegion(cw-border-1, border, 1, 1);
     clipRegion -= QRegion(cw-border-1, ch-border-1, 1, 1);
     clipRegion -= QRegion(border, ch-border-1, 1, 1);
 
     p.setClipRegion(clipRegion);
     p.setClipping(true);
 
     p.setBrush(Qt::white);
     p.drawRect(QRect(0,0,cw,ch));
 
     if (m_resource) {
         p.drawImage(QRect(border, border, iconWidth, iconHeight), m_resource->image());
     }
 
     p.setClipping(false);
 }
 
 void KisIconWidget::setResourceAdapter(QSharedPointer<KoAbstractResourceServerAdapter> adapter)
 {
     Q_ASSERT(adapter);
-    adapter->connectToResourceServer();
-    connect(adapter.data(), SIGNAL(resourceChanged(KoResource*)), this, SLOT(slotAdapterResourceChanged(KoResource*)));
+    m_adapter = adapter;
+    m_adapter->connectToResourceServer();
+    connect(m_adapter.data(), SIGNAL(resourceChanged(KoResource*)), this, SLOT(slotAdapterResourceChanged(KoResource*)));
+    connect(m_adapter.data(), SIGNAL(removingResource(KoResource*)), this, SLOT(slotAdapterResourceRemoved(KoResource*)));
 }
 
 void KisIconWidget::slotAdapterResourceChanged(KoResource* resource)
 {
     if (m_resource == resource) {
         update();
     }
 }
+
+void KisIconWidget::slotAdapterResourceRemoved(KoResource* resource)
+{
+    if (m_resource == resource) {
+        m_resource = 0;
+    }
+}
diff --git a/libs/ui/widgets/kis_iconwidget.h b/libs/ui/widgets/kis_iconwidget.h
index 7cd56f120a..480c3f51cd 100644
--- a/libs/ui/widgets/kis_iconwidget.h
+++ b/libs/ui/widgets/kis_iconwidget.h
@@ -1,56 +1,58 @@
 /*
  *  Copyright (c) 2000 Matthias Elter  <elter@kde.org>
  *  Copyright (c) 2003 Patrick Julien  <freak@codepimps.org>
  *
  *  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
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KIS_ICONWIDGET_H_
 #define KIS_ICONWIDGET_H_
 
 #include <widgets/kis_popup_button.h>
 
 class KoResource;
 class KoAbstractResourceServerAdapter;
 
 /**
  * The icon widget is used in the control box where the current color and brush
  * are shown.
  */
 class KisIconWidget : public KisPopupButton
 {
 
     Q_OBJECT
 
 public:
     KisIconWidget(QWidget *parent = 0, const char *name = 0);
 
     /**
      * Set an resource server adapter that the widget will observe.
      */
     void setResourceAdapter(QSharedPointer<KoAbstractResourceServerAdapter> adapter);
 public Q_SLOTS:
     void slotSetItem(KoResource * resource);
     void slotAdapterResourceChanged(KoResource * resource);
+    void slotAdapterResourceRemoved(KoResource * resource);
 
 protected:
     virtual void paintEvent(QPaintEvent *);
 
 private:
     KoResource *m_resource;
+    QSharedPointer<KoAbstractResourceServerAdapter> m_adapter;
 };
 
 #endif // KIS_ICONWIDGET_H_