diff --git a/braindump/plugins/webshape/WebShapeConfigWidget.ui b/braindump/plugins/webshape/WebShapeConfigWidget.ui
index 9efd67cf444..a9178079699 100644
--- a/braindump/plugins/webshape/WebShapeConfigWidget.ui
+++ b/braindump/plugins/webshape/WebShapeConfigWidget.ui
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WebShapeConfigWidget</class>
  <widget class="QWidget" name="WebShapeConfigWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>166</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>URL:</string>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="KLineEdit" name="urlEdit"/>
+    <widget class="QLineEdit" name="urlEdit"/>
    </item>
    <item row="2" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>257</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="0" colspan="2">
     <widget class="QCheckBox" name="useCache">
      <property name="text">
       <string>Use a cache copy</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/braindump/src/forms/wdgsectionsbox.ui b/braindump/src/forms/wdgsectionsbox.ui
index 47c683febf5..ef02225f74b 100644
--- a/braindump/src/forms/wdgsectionsbox.ui
+++ b/braindump/src/forms/wdgsectionsbox.ui
@@ -1,195 +1,195 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgSectionsBox</class>
  <widget class="QWidget" name="WdgSectionsBox">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>336</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="KLineEdit" name="searchLine"/>
+      <widget class="QLineEdit" name="searchLine"/>
      </item>
      <item>
       <widget class="QToolButton" name="bnViewMode"/>
      </item>
     </layout>
    </item>
    <item>
     <widget class="KoDocumentSectionView" name="listSections" native="true"/>
    </item>
    <item>
     <layout class="QHBoxLayout">
      <item>
       <widget class="QToolButton" name="bnAdd">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>32</width>
          <height>22</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Create a new whiteboard</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="popupMode">
         <enum>QToolButton::MenuButtonPopup</enum>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="bnDuplicate">
        <property name="minimumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Duplicate whiteboard</string>
        </property>
        <property name="whatsThis">
         <string>Duplicate the currently selected whiteboard</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="bnLower">
        <property name="minimumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Move whiteboard down</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="bnRaise">
        <property name="minimumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Move whiteboard up</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>151</width>
          <height>22</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QToolButton" name="bnDelete">
        <property name="minimumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
          <width>22</width>
          <height>22</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Delete the whiteboard</string>
        </property>
        <property name="text">
         <string/>
        </property>
        <property name="autoRaise">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KoDocumentSectionView</class>
    <extends></extends>
    <header location="global">KoDocumentSectionView.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/braindump/src/import/ToolDocker_p.h b/braindump/src/import/ToolDocker_p.h
index f45914fe478..9c90f0dcaf7 100644
--- a/braindump/src/import/ToolDocker_p.h
+++ b/braindump/src/import/ToolDocker_p.h
@@ -1,193 +1,193 @@
 /* This file is part of the KDE project
  *
  * Copyright (c) 2010-2011 C. Boemann <cbo@boemann.dk>
  * Copyright (c) 2005-2006 Boudewijn Rempt <boud@valdyas.org>
  * Copyright (c) 2006 Thomas Zander <zander@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library 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
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 #ifndef ToolDocker_p_h
 #define ToolDocker_p_h
 
 #include "ToolDocker.h"
 
 #include <KoDockWidgetTitleBar.h>
 
 #include <KoIcon.h>
 
 #include <klocale.h>
 
 #include <QPointer>
 #include <QGridLayout>
 #include <QScrollArea>
 #include <QScrollBar>
 #include <QLabel>
 #include <QSet>
 #include <QAction>
 #include <QStyleOptionFrame>
 #include <QToolButton>
 #include <QTabWidget>
 
 class ToolDocker::Private
 {
 public:
     Private(ToolDocker *dock)
         : q(dock)
         , tabbed(false)
         , hasTitle(false)
         , lockIcon(koIconName("object-locked"))
         , unlockIcon(koIconName("object-unlocked"))
         , tabIcon(koIconName("tab-new"))
         , unTabIcon(koIconName("tab-close"))
     {
     }
 
     QList<QPointer<QWidget> > currentWidgetList;
     QSet<QWidget *> currentAuxWidgets;
     QScrollArea *scrollArea;
     QWidget *hiderWidget; // non current widgets are hidden by being children of this
     QWidget *housekeeperWidget;
     QGridLayout *housekeeperLayout;
     ToolDocker *q;
     Qt::DockWidgetArea dockingArea;
     bool tabbed :1;
     bool hasTitle :1;
-    KIcon lockIcon;
-    KIcon unlockIcon;
-    KIcon tabIcon;
-    KIcon unTabIcon;
+    QIcon lockIcon;
+    QIcon unlockIcon;
+    QIcon tabIcon;
+    QIcon unTabIcon;
     QToolButton *lockButton;
     QToolButton *tabButton;
 
     void recreateLayout(const QList<QPointer<QWidget> > &optionWidgetList) {
         foreach(QPointer<QWidget> widget, currentWidgetList) {
             widget->setParent(hiderWidget);
         }
         qDeleteAll(currentAuxWidgets);
         currentAuxWidgets.clear();
 
         currentWidgetList = optionWidgetList;
 
         if(tabbed && currentWidgetList.size() > 1) {
             QTabWidget *t;
             housekeeperLayout->addWidget(t = new QTabWidget(), 0, 0);
             currentAuxWidgets.insert(t);
             foreach(QWidget * widget, currentWidgetList) {
                 if(widget->objectName().isEmpty()) {
                     Q_ASSERT(!(widget->objectName().isEmpty()));
                     continue; // skip this docker in release build when assert don't crash
                 }
                 t->addTab(widget, widget->windowTitle());
             }
         } else {
             int cnt = 0;
             switch(dockingArea) {
             case Qt::TopDockWidgetArea:
             case Qt::BottomDockWidgetArea:
                 housekeeperLayout->setHorizontalSpacing(2);
                 housekeeperLayout->setVerticalSpacing(0);
                 foreach(QWidget * widget, currentWidgetList) {
                     QFrame *s;
                     QLabel *l;
                     if(widget->objectName().isEmpty()) {
                         continue; // skip this docker in release build when assert don't crash
                     }
                     housekeeperLayout->addWidget(l = new QLabel(widget->windowTitle()), 0, 2 * cnt);
                     currentAuxWidgets.insert(l);
                     housekeeperLayout->addWidget(widget, 1, 2 * cnt);
                     widget->show();
                     if(widget != currentWidgetList.last()) {
                         housekeeperLayout->addWidget(s = new QFrame(), 0, 2 * cnt + 1, 2, 1);
                         s->setFrameShape(QFrame::VLine);
                         currentAuxWidgets.insert(s);
                     }
                     cnt++;
                 }
                 break;
             case Qt::LeftDockWidgetArea:
             case Qt::RightDockWidgetArea:
                 housekeeperLayout->setHorizontalSpacing(0);
                 housekeeperLayout->setVerticalSpacing(2);
                 cnt = 0;
                 foreach(QWidget * widget, currentWidgetList) {
                     QFrame *s;
                     QLabel *l;
                     if(widget->objectName().isEmpty()) {
                         Q_ASSERT(!(widget->objectName().isEmpty()));
                         continue; // skip this docker in release build when assert don't crash
                     }
                     housekeeperLayout->addWidget(l = new QLabel(widget->windowTitle()), 3 * cnt, 0);
                     currentAuxWidgets.insert(l);
                     housekeeperLayout->addWidget(widget, 3 * cnt + 1, 0);
                     widget->show();
                     if(widget != currentWidgetList.last()) {
                         housekeeperLayout->addWidget(s = new QFrame(), 3 * cnt + 2, 0);
                         s->setFrameShape(QFrame::HLine);
                         currentAuxWidgets.insert(s);
                     }
                     cnt++;
                 }
                 break;
             default:
                 break;
             }
         }
         housekeeperLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
         housekeeperLayout->invalidate();
     }
 
     void locationChanged(Qt::DockWidgetArea area) {
         dockingArea = area;
         recreateLayout(currentWidgetList);
     }
 
     void toggleLock() {
         if(!hasTitle) {
             q->setTitleBarWidget(new KoDockWidgetTitleBar(q));
             hasTitle = true;
             lockButton->setIcon(unlockIcon);
             tabButton->setVisible(true);
             // parent hack to keep it clickable
             tabButton->setParent(q);
             tabButton->show();
             lockButton->setParent(0);
             lockButton->setParent(q);
             lockButton->show();
         } else {
             q->setTitleBarWidget(new QWidget());
             hasTitle = false;
             lockButton->setIcon(lockIcon);
             tabButton->setVisible(false);
             // parent hack to keep it clickable
             tabButton->setParent(0);
             lockButton->setParent(0);
             lockButton->setParent(q);
             lockButton->show();
         }
         q->resizeEvent(0);
     }
     void toggleTab() {
         if(!tabbed) {
             tabbed = true;
             tabButton->setIcon(unTabIcon);
         } else {
             tabbed = false;
             tabButton->setIcon(tabIcon);
         }
         recreateLayout(currentWidgetList);
     }
 };
 #endif