diff --git a/accountdialog.cpp b/accountdialog.cpp
index 0c67e8d81..bd930c048 100644
--- a/accountdialog.cpp
+++ b/accountdialog.cpp
@@ -49,7 +49,6 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kseparator.h>
-#include <kapplication.h>
 #include <kprotocolinfo.h>
 #include <kiconloader.h>
 #include <kmenu.h>
@@ -926,7 +925,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
   button->setFixedSize( 22, 22 );
   button->setIcon(
-      kapp->iconLoader()->loadIconSet( "reload", K3Icon::Small, 0 ) );
+      KIconLoader::global()->loadIconSet( "reload", K3Icon::Small, 0 ) );
   connect( button, SIGNAL(clicked()), this, SLOT(slotReloadNamespaces()) );
   button->setWhatsThis(
       i18n("Reload the namespaces from the server. This overwrites any changes.") );
@@ -940,7 +939,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.personalNS->setReadOnly( true );
   mImap.editPNS = new QToolButton( listbox );
   mImap.editPNS->setIcon(
-      kapp->iconLoader()->loadIconSet( "edit", K3Icon::Small, 0 ) );
+      KIconLoader::global()->loadIconSet( "edit", K3Icon::Small, 0 ) );
   mImap.editPNS->setAutoRaise( true );
   mImap.editPNS->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
   mImap.editPNS->setFixedSize( 22, 22 );
@@ -952,7 +951,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.otherUsersNS->setReadOnly( true );
   mImap.editONS = new QToolButton( listbox );
   mImap.editONS->setIcon(
-      kapp->iconLoader()->loadIconSet( "edit", K3Icon::Small, 0 ) );
+      KIconLoader::global()->loadIconSet( "edit", K3Icon::Small, 0 ) );
   mImap.editONS->setAutoRaise( true );
   mImap.editONS->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
   mImap.editONS->setFixedSize( 22, 22 );
@@ -964,7 +963,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
   mImap.sharedNS->setReadOnly( true );
   mImap.editSNS = new QToolButton( listbox );
   mImap.editSNS->setIcon(
-      kapp->iconLoader()->loadIconSet( "edit", K3Icon::Small, 0 ) );
+      KIconLoader::global()->loadIconSet( "edit", K3Icon::Small, 0 ) );
   mImap.editSNS->setAutoRaise( true );
   mImap.editSNS->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
   mImap.editSNS->setFixedSize( 22, 22 );
@@ -2297,7 +2296,7 @@ NamespaceEditDialog::NamespaceEditDialog( QWidget *parent,
     edit->setText( it.key() );
     QToolButton* button = new QToolButton( grid );
     button->setIcon(
-      kapp->iconLoader()->loadIconSet( "editdelete", K3Icon::Small, 0 ) );
+      KIconLoader::global()->loadIconSet( "editdelete", K3Icon::Small, 0 ) );
     button->setAutoRaise( true );
     button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
     button->setFixedSize( 22, 22 );
diff --git a/folderrequester.cpp b/folderrequester.cpp
index c9c9be000..5a7c139eb 100644
--- a/folderrequester.cpp
+++ b/folderrequester.cpp
@@ -59,7 +59,7 @@ FolderRequester::FolderRequester( QWidget *parent, KMFolderTree *tree )
   hlay->addWidget( edit );
 
   QToolButton* button = new QToolButton( this );
-  button->setIcon( kapp->iconLoader()->loadIconSet( "folder", K3Icon::Small, 0 ) );
+  button->setIcon( KIconLoader::global()->loadIconSet( "folder", K3Icon::Small, 0 ) );
   hlay->addWidget( button );
   connect( button, SIGNAL(clicked()), this, SLOT(slotOpenDialog()) );
 
diff --git a/kmail_part.cpp b/kmail_part.cpp
index 68d88df8e..93de1908c 100644
--- a/kmail_part.cpp
+++ b/kmail_part.cpp
@@ -102,7 +102,7 @@ KMailPart::KMailPart(QWidget *parentWidget, QObject *parent, const QStringList &
   QWidget *canvas = new QWidget( parentWidget );
   canvas->setFocusPolicy(Qt::ClickFocus);
   setWidget(canvas);
-  kapp->iconLoader()->addAppDir("kmail");
+  KIconLoader::global()->addAppDir("kmail");
 #if 0
   //It's also possible to make a part out of a readerWin
   KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() );
@@ -117,7 +117,7 @@ KMailPart::KMailPart(QWidget *parentWidget, QObject *parent, const QStringList &
   mReaderWin->setFocusPolicy(Qt::ClickFocus);
   mStatusBar  = new KMailStatusBarExtension(this);
   //new KParts::SideBarExtension( kmkernel->mainWin()-mainKMWidget()->leftFrame(), this );
-  kapp->iconLoader()->addAppDir("kmail");
+  KIconLoader::global()->addAppDir("kmail");
   setXMLFile( "kmail_part.rc" );
   kmkernel->inboxFolder()->close();
 #else
@@ -135,7 +135,7 @@ KMailPart::KMailPart(QWidget *parentWidget, QObject *parent, const QStringList &
   connect( mainWidget->folderTree(), SIGNAL(nameChanged(KMFolderTreeItem*)),
            this, SLOT(slotNameChanged(KMFolderTreeItem*)) );
 
-  kapp->iconLoader()->addAppDir( "kmail" );
+  KIconLoader::global()->addAppDir( "kmail" );
   setXMLFile( "kmail_part.rc" );
 #endif
 
diff --git a/kmfoldertree.cpp b/kmfoldertree.cpp
index 9e6c4b523..fc64ee1fa 100644
--- a/kmfoldertree.cpp
+++ b/kmfoldertree.cpp
@@ -145,7 +145,7 @@ QPixmap KMFolderTreeItem::normalIcon(int size) const
   if (mFolder && mFolder->useCustomIcons() ) {
     icon = mFolder->normalIconPath();
   }
-  KIconLoader * il = kapp->iconLoader();
+  KIconLoader * il = KIconLoader::global();
   QPixmap pm = il->loadIcon( icon, K3Icon::Small, size,
                              K3Icon::DefaultState, 0, true );
   if ( mFolder && pm.isNull() ) {
@@ -165,7 +165,7 @@ QPixmap KMFolderTreeItem::unreadIcon(int size) const
     || kmkernel->folderIsDraftOrOutbox( mFolder ) )
     pm = normalIcon( size );
 
-  KIconLoader * il = kapp->iconLoader();
+  KIconLoader * il = KIconLoader::global();
   if ( mFolder && mFolder->useCustomIcons() ) {
     pm = il->loadIcon( mFolder->unreadIconPath(), K3Icon::Small, size,
                        K3Icon::DefaultState, 0, true );
diff --git a/kmmsgpart.cpp b/kmmsgpart.cpp
index 5acd3f605..bff48e12e 100644
--- a/kmmsgpart.cpp
+++ b/kmmsgpart.cpp
@@ -5,7 +5,6 @@
 #include <kmimetype.h>
 #include <kdebug.h>
 #include <kcodecs.h>
-#include <kapplication.h>
 
 #include "kmmsgpart.h"
 #include "kmkernel.h"
@@ -402,7 +401,7 @@ QString KMMessagePart::iconName() const
   } 
  
   fileName =
-    kapp->iconLoader()->iconPath( fileName, K3Icon::Desktop );
+    KIconLoader::global()->iconPath( fileName, K3Icon::Desktop );
   return fileName;
 }
 
diff --git a/kmstartup.cpp b/kmstartup.cpp
index 07592bc19..5e381559e 100644
--- a/kmstartup.cpp
+++ b/kmstartup.cpp
@@ -29,7 +29,6 @@
 #include <kmessagebox.h>
 #include <kcrash.h>
 #include <kglobal.h>
-#include <kapplication.h>
 #include <kaboutdata.h>
 #include <kiconloader.h>
 
@@ -224,7 +223,7 @@ void insertLibraryCataloguesAndIcons() {
   };
 
   KLocale * l = KGlobal::locale();
-  KIconLoader * il = kapp->iconLoader();
+  KIconLoader * il = KIconLoader::global();
   for ( unsigned int i = 0 ; i < sizeof catalogues / sizeof *catalogues ; ++i ) {
     l->insertCatalog( catalogues[i] );
     il->addAppDir( catalogues[i] );
diff --git a/objecttreeparser.cpp b/objecttreeparser.cpp
index b5c51b28c..f2367d4d1 100644
--- a/objecttreeparser.cpp
+++ b/objecttreeparser.cpp
@@ -79,7 +79,6 @@
 #include <khtml_part.h>
 #include <ktemporaryfile.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kcodecs.h>
@@ -2581,11 +2580,11 @@ QString ObjectTreeParser::quotedHTML( const QString& s, bool decorate )
       // Cache Icons
       if ( mCollapseIcon.isEmpty() ) {
         mCollapseIcon= LinkLocator::pngToDataUrl(
-            kapp->iconLoader()->iconPath( "quotecollapse",0 ));
+            KIconLoader::global()->iconPath( "quotecollapse",0 ));
       }
       if ( mExpandIcon.isEmpty() )
         mExpandIcon= LinkLocator::pngToDataUrl(
-            kapp->iconLoader()->iconPath( "quoteexpand",0 ));
+            KIconLoader::global()->iconPath( "quoteexpand",0 ));
     }
 
     for (int p=0; p<line.length(); p++) {
diff --git a/recipientspicker.cpp b/recipientspicker.cpp
index 1204568f3..55d53bd75 100644
--- a/recipientspicker.cpp
+++ b/recipientspicker.cpp
@@ -56,7 +56,7 @@ void RecipientItem::setDistributionList( KABC::DistributionList *list )
 {
   mDistributionList = list;
 
-  mIcon = kapp->iconLoader()->loadIcon( "kdmconfig", K3Icon::Small );
+  mIcon = KIconLoader::global()->loadIcon( "kdmconfig", K3Icon::Small );
 
   mKey = 'D' + list->name();
 }
@@ -71,7 +71,7 @@ void RecipientItem::setAddressee( const KABC::Addressee &a,
   if ( !img.isNull() )
     mIcon = QPixmap::fromImage( img.scaled( 20, 20, Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
   else
-    mIcon = kapp->iconLoader()->loadIcon( "personal", K3Icon::Small );
+    mIcon = KIconLoader::global()->loadIcon( "personal", K3Icon::Small );
 
   mKey = 'A' + a.preferredEmail();
 }