diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp
index 8e254e8..5a1a175 100644
--- a/libk3b/tools/k3bmultichoicedialog.cpp
+++ b/libk3b/tools/k3bmultichoicedialog.cpp
@@ -67,7 +67,7 @@ static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon)
     break;
   }
  
-  TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+  TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
  
   if (ret.isNull())
     return TQMessageBox::standardIcon(icon);
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index 6c906d0..b8f6d38 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -209,10 +209,10 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
 
   if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD )
     d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "dvd_unmount",
-									 KIcon::NoGroup, KIcon::SizeMedium ) );
+									 TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
   else
     d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount",
-									 KIcon::NoGroup, KIcon::SizeMedium ) );
+									 TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 
   adjustSize();
 
diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp
index edea8b0..c3276b4 100644
--- a/src/k3bflatbutton.cpp
+++ b/src/k3bflatbutton.cpp
@@ -52,7 +52,7 @@ K3bFlatButton::K3bFlatButton( TDEAction* a, TQWidget *parent, const char *name )
 
   setText( a->text() );
   TQToolTip::add( this, a->toolTip() );
-  setPixmap( TDEGlobal::iconLoader()->loadIcon( a->icon(), KIcon::NoGroup, 32 ) );
+  setPixmap( TDEGlobal::iconLoader()->loadIcon( a->icon(), TDEIcon::NoGroup, 32 ) );
   connect( this, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) );
 }
 
diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp
index a2345a2..6b61023 100644
--- a/src/k3bjobprogressosd.cpp
+++ b/src/k3bjobprogressosd.cpp
@@ -118,7 +118,7 @@ void K3bJobProgressOSD::renderOSD()
 
   // calculate needed size 
   if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
-    TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "k3b", KIcon::NoGroup, 32 );
+    TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "k3b", TDEIcon::NoGroup, 32 );
     int margin = 10;
     int textWidth = fontMetrics().width( m_text );
 
diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp
index ad217d4..a6329b1 100644
--- a/src/k3bpassivepopup.cpp
+++ b/src/k3bpassivepopup.cpp
@@ -72,7 +72,7 @@ static TQPixmap themedMessageBoxIcon( K3bPassivePopup::MessageType mt )
     break;
   }
 
-  TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
+  TQPixmap ret = TDEApplication::kApplication()->iconLoader()->loadIcon(icon_name, TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
   
   if( ret.isNull() )
     return TQMessageBox::standardIcon( qIcon );
diff --git a/src/k3bsidepanel.cpp b/src/k3bsidepanel.cpp
index 2c8526e..eeef7a3 100644
--- a/src/k3bsidepanel.cpp
+++ b/src/k3bsidepanel.cpp
@@ -91,7 +91,7 @@ void K3bSidePanel::addButton( TQFrame* frame, TDEAction* a )
     TQToolButton* b = new TQToolButton( frame );
     b->setTextLabel( a->toolTip(), true );
     b->setTextLabel( a->text(), false );
-    b->setIconSet( a->iconSet(KIcon::Small) );
+    b->setIconSet( a->iconSet(TDEIcon::Small) );
     b->setUsesTextLabel( true );
     b->setAutoRaise( true );
     b->setTextPosition( TQToolButton::BesideIcon );
diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp
index 8e9dd36..85b7d7c 100644
--- a/src/misc/k3bcdcopydialog.cpp
+++ b/src/misc/k3bcdcopydialog.cpp
@@ -114,7 +114,7 @@ K3bCdCopyDialog::K3bCdCopyDialog( TQWidget *parent, const char *name, bool modal
   groupCopies->setInsideSpacing( spacingHint() );
   groupCopies->setInsideMargin( marginHint() );
   TQLabel* pixLabel = new TQLabel( groupCopies );
-  pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
+  pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
   pixLabel->setScaledContents( false );
   m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies );
 
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index 0ffe095..8770004 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -252,7 +252,7 @@ void K3bCdImageWritingDialog::setupGui()
   groupCopies->setInsideSpacing( spacingHint() );
   groupCopies->setInsideMargin( marginHint() );
   TQLabel* pixLabel = new TQLabel( groupCopies );
-  pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
+  pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
   pixLabel->setScaledContents( false );
   m_spinCopies = new TQSpinBox( groupCopies );
   m_spinCopies->setMinValue( 1 );
diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp
index c80c1e3..92a3782 100644
--- a/src/misc/k3bdvdcopydialog.cpp
+++ b/src/misc/k3bdvdcopydialog.cpp
@@ -114,7 +114,7 @@ K3bDvdCopyDialog::K3bDvdCopyDialog( TQWidget* parent, const char* name, bool mod
   groupCopies->setInsideSpacing( spacingHint() );
   groupCopies->setInsideMargin( marginHint() );
   TQLabel* pixLabel = new TQLabel( groupCopies );
-  pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
+  pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
   pixLabel->setScaledContents( false );
   m_spinCopies = new TQSpinBox( groupCopies );
   m_spinCopies->setMinValue( 1 );
diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp
index 242ab1a..63f552b 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -195,7 +195,7 @@ void K3bIsoImageWritingDialog::setupGui()
   groupCopies->setInsideSpacing( spacingHint() );
   groupCopies->setInsideMargin( marginHint() );
   TQLabel* pixLabel = new TQLabel( groupCopies );
-  pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
+  pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
   pixLabel->setScaledContents( false );
   m_spinCopies = new TQSpinBox( groupCopies );
   m_spinCopies->setMinValue( 1 );
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 27c9f8f..200de08 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -70,10 +70,10 @@ K3bExternalBinWidget::K3bExternalBinViewItem::K3bExternalBinViewItem( K3bExterna
 
 void K3bExternalBinWidget::K3bExternalBinViewItem::setDefault( bool b )
 {
-  static TQPixmap s_emptyPix( (int)KIcon::SizeSmall, (int)KIcon::SizeSmall );
+  static TQPixmap s_emptyPix( (int)TDEIcon::SizeSmall, (int)TDEIcon::SizeSmall );
   static bool s_emptyPixInitialized = false;
   if( !s_emptyPixInitialized ) {
-    s_emptyPix.setMask( TQBitmap( (int)KIcon::SizeSmall, (int)KIcon::SizeSmall, true ) );
+    s_emptyPix.setMask( TQBitmap( (int)TDEIcon::SizeSmall, (int)TDEIcon::SizeSmall, true ) );
     s_emptyPixInitialized = true;
   }
 
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index d6f2df3..54e3f45 100644
--- a/src/option/k3boptiondialog.cpp
+++ b/src/option/k3boptiondialog.cpp
@@ -127,7 +127,7 @@ void K3bOptionDialog::slotDefault()
 void K3bOptionDialog::setupBurningPage()
 {
   TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"),
-			   TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", KIcon::NoGroup, KIcon::SizeMedium ) );
+			   TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 
   TQGridLayout* _frameLayout = new TQGridLayout( frame );
   _frameLayout->setSpacing( 0 );
@@ -141,7 +141,7 @@ void K3bOptionDialog::setupBurningPage()
 void K3bOptionDialog::setupProgramsPage()
 {
   TQFrame* frame = addPage( i18n("Programs"), i18n("Setup External Programs"),
-			   TDEGlobal::instance()->iconLoader()->loadIcon( "exec", KIcon::NoGroup, KIcon::SizeMedium ) );
+			   TDEGlobal::instance()->iconLoader()->loadIcon( "exec", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 
   TQGridLayout* _frameLayout = new TQGridLayout( frame );
   _frameLayout->setSpacing( 0 );
@@ -155,7 +155,7 @@ void K3bOptionDialog::setupProgramsPage()
 void K3bOptionDialog::setupCddbPage()
 {
   TQFrame* frame = addPage( i18n("CDDB"), i18n("Setup the CDDB Server"),
-			   TDEGlobal::instance()->iconLoader()->loadIcon( "connect_established", KIcon::NoGroup, KIcon::SizeMedium ) );
+			   TDEGlobal::instance()->iconLoader()->loadIcon( "connect_established", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 
   TQGridLayout* mainGrid = new TQGridLayout( frame );
   mainGrid->setSpacing(0);
@@ -173,7 +173,7 @@ void K3bOptionDialog::setupCddbPage()
 void K3bOptionDialog::setupDevicePage()
 {
   TQFrame* frame = addPage( i18n("Devices"), i18n("Setup Devices"),
-			   TDEGlobal::instance()->iconLoader()->loadIcon( "blockdevice", KIcon::NoGroup, KIcon::SizeMedium ) );
+			   TDEGlobal::instance()->iconLoader()->loadIcon( "blockdevice", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 
   TQHBoxLayout* box = new TQHBoxLayout( frame );
   box->setSpacing(0);
@@ -186,7 +186,7 @@ void K3bOptionDialog::setupDevicePage()
 void K3bOptionDialog::setupMiscPage()
 {
   TQFrame* frame = addPage( i18n("Misc"), i18n("Miscellaneous Settings"),
-			   TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) );
+			   TDEGlobal::instance()->iconLoader()->loadIcon( "misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 
   TQVBoxLayout* box = new TQVBoxLayout( frame );
   box->setSpacing( 0 );
@@ -201,7 +201,7 @@ void K3bOptionDialog::setupNotifyPage()
 {
   TQFrame* frame = addPage( i18n("Notifications"), i18n("System Notifications"),
 			   TDEGlobal::instance()->iconLoader()->loadIcon( "knotify", 
-									KIcon::NoGroup, KIcon::SizeMedium ) );
+									TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
   TQVBoxLayout* box = new TQVBoxLayout( frame );
   box->setSpacing( 0 );
   box->setMargin( 0 );
@@ -215,7 +215,7 @@ void K3bOptionDialog::setupPluginPage()
 {
   TQFrame* frame = addPage( i18n("Plugins"), i18n("K3b Plugin Configuration"),
 			   TDEGlobal::instance()->iconLoader()->loadIcon( "gear",
-									KIcon::NoGroup, KIcon::SizeMedium ) );
+									TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
   TQVBoxLayout* box = new TQVBoxLayout( frame );
   box->setSpacing( 0 );
   box->setMargin( 0 );
@@ -229,7 +229,7 @@ void K3bOptionDialog::setupThemePage()
 {
   TQFrame* frame = addPage( i18n("Themes"), i18n("K3b GUI Themes"),
 			   TDEGlobal::instance()->iconLoader()->loadIcon( "style",
-									KIcon::NoGroup, KIcon::SizeMedium ) );
+									TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
   TQVBoxLayout* box = new TQVBoxLayout( frame );
   box->setSpacing( 0 );
   box->setMargin( 0 );
diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp
index d20838b..3e21a54 100644
--- a/src/projects/k3baudiotracktrmlookupdialog.cpp
+++ b/src/projects/k3baudiotracktrmlookupdialog.cpp
@@ -57,7 +57,7 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, co
 
   m_infoLabel = new TQLabel( plainPage() );
   TQLabel* pixLabel = new TQLabel( plainPage() );
-  pixLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) );
+  pixLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "musicbrainz", TDEIcon::NoGroup, 64 ) );
   pixLabel->setScaledContents( false );
 
   m_busyWidget = new K3bBusyWidget( plainPage() );
diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp
index c3648ca..183f47c 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -92,7 +92,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
 
   if( K3bFileItem* fileItem = dynamic_cast<K3bFileItem*>(dataItem) ) {
     KFileItem kFileItem( KFileItem::Unknown, KFileItem::Unknown, KURL::fromPathOrURL(fileItem->localPath()) );
-    labelMimeType->setPixmap( kFileItem.pixmap(KIcon::SizeLarge) );
+    labelMimeType->setPixmap( kFileItem.pixmap(TDEIcon::SizeLarge) );
     if( fileItem->isSymLink() )
       m_labelType->setText( i18n("Link to %1").arg(kFileItem.mimeComment()) );
     else
@@ -116,7 +116,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
 			  i18n("and 1 directory", "and %n directories", dirItem->numDirs()) + ")" );
   }
   else {
-    labelMimeType->setPixmap( DesktopIcon("unknown", KIcon::SizeLarge) );
+    labelMimeType->setPixmap( DesktopIcon("unknown", TDEIcon::SizeLarge) );
     m_labelType->setText( i18n("Special file") );
     m_labelLocalName->hide();
     m_labelLocalLocation->hide();
diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp
index f8dff4f..1534363 100644
--- a/src/projects/k3bdataviewitem.cpp
+++ b/src/projects/k3bdataviewitem.cpp
@@ -210,9 +210,9 @@ void K3bDataFileViewItem::init( K3bFileItem* file )
   // determine the mimetype
   m_pMimeType = KMimeType::findByURL( KURL::fromPathOrURL(file->localPath()) );
   if( !m_pMimeType )
-    setPixmap( 0, DesktopIcon( "unknown", 16, KIcon::DefaultState ) );
+    setPixmap( 0, DesktopIcon( "unknown", 16, TDEIcon::DefaultState ) );
   else
-    setPixmap( 0, m_pMimeType->pixmap( KURL::fromPathOrURL(file->localPath()), KIcon::Desktop, 16, KIcon::DefaultState ) );
+    setPixmap( 0, m_pMimeType->pixmap( KURL::fromPathOrURL(file->localPath()), TDEIcon::Desktop, 16, TDEIcon::DefaultState ) );
 }
 
 
diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp
index 980c0f7..299b415 100644
--- a/src/projects/k3bmovixlistview.cpp
+++ b/src/projects/k3bmovixlistview.cpp
@@ -63,7 +63,7 @@ K3bMovixFileViewItem::K3bMovixFileViewItem( K3bMovixDoc* doc,
   : K3bMovixListViewItem( doc, item, parent, after ),
     KFileItem( 0, 0, KURL::fromPathOrURL(item->localPath()) )
 {
-  setPixmap( 1, KFileItem::pixmap( 16, KIcon::DefaultState ) );
+  setPixmap( 1, KFileItem::pixmap( 16, TDEIcon::DefaultState ) );
   setEditor( 1, LINE );
 }
 
diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp
index bd8a16c..8c17340 100644
--- a/src/projects/k3bprojectburndialog.cpp
+++ b/src/projects/k3bprojectburndialog.cpp
@@ -290,7 +290,7 @@ void K3bProjectBurnDialog::prepareGui()
   groupCopies->setInsideSpacing( spacingHint() );
   groupCopies->setInsideMargin( marginHint() );
   TQLabel* pixLabel = new TQLabel( groupCopies );
-  pixLabel->setPixmap( SmallIcon( "cdcopy", KIcon::SizeMedium ) );
+  pixLabel->setPixmap( SmallIcon( "cdcopy", TDEIcon::SizeMedium ) );
   pixLabel->setScaledContents( false );
   m_spinCopies = new TQSpinBox( 1, 999, 1, groupCopies );
 
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index 007d20f..58c7d5e 100644
--- a/src/projects/k3bvcdtrackdialog.cpp
+++ b/src/projects/k3bvcdtrackdialog.cpp
@@ -73,9 +73,9 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& t
         m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) );
 
         if ( selectedTrack->isSegment() )
-            m_labelMimeType->setPixmap( SmallIcon( "image", KIcon::SizeMedium ) );
+            m_labelMimeType->setPixmap( SmallIcon( "image", TDEIcon::SizeMedium ) );
         else
-            m_labelMimeType->setPixmap( SmallIcon( "video", KIcon::SizeMedium ) );
+            m_labelMimeType->setPixmap( SmallIcon( "video", TDEIcon::SizeMedium ) );
 
         fillGui();
     }
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index 4d03c64..e0ac27e 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -193,7 +193,7 @@ protected:
 	  preW = h*16/9;
 
 	p->drawRect( ( w - preW ) / 2, ( height() - h ) / 2, preW, h );
-	TQPixmap noIcon = TDEApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true );
+	TQPixmap noIcon = TDEApplication::kApplication()->iconLoader()->loadIcon( "no", TDEIcon::NoGroup, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0, true );
 	p->drawPixmap( ( w - noIcon.width() ) / 2, ( height() - noIcon.height() ) / 2, noIcon );
       }
       else {