diff --git a/src/cdopener.cpp b/src/cdopener.cpp
index d664def..e232e6b 100755
--- a/src/cdopener.cpp
+++ b/src/cdopener.cpp
@@ -35,11 +35,11 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     config = _config;
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     // let the dialog look nice
     setCaption( i18n("Add CD tracks") );
-    setIcon( iconLoader->loadIcon("cdaudio_unmount",KIcon::Small) );
+    setIcon( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Small) );
 
     // the grid for all widgets in the dialog
     TQGridLayout* gridLayout = new TQGridLayout( this, 1, 1, 11, 6, "gridLayout" );
@@ -76,7 +76,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
              );
     //artistBox->addStretch();
     artistBox->addSpacing( 130 );
-//     pCDDB = new KPushButton( iconLoader->loadIcon("cdaudio_unmount",KIcon::Small), i18n("Request CDDB"), this, "pCDDB" );
+//     pCDDB = new KPushButton( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Small), i18n("Request CDDB"), this, "pCDDB" );
 //     topGridLayout->addWidget( pCDDB, 0, 8 );
 
     // set up the second row at the top
@@ -137,14 +137,14 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
 
     // add the up and down buttons
     pTrackUp = new KPushButton( " ", tagGroupBox, "pTrackUp" );
-    pTrackUp->setPixmap( iconLoader->loadIcon("up",KIcon::Toolbar) );
+    pTrackUp->setPixmap( iconLoader->loadIcon("up",TDEIcon::Toolbar) );
     pTrackUp->setAutoRepeat( true );
     connect( pTrackUp, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(trackUpPressed())
              );
     tagGridLayout->addWidget( pTrackUp, 0, 0 );
     pTrackDown = new KPushButton( " ", tagGroupBox, "pTrackDown" );
-    pTrackDown->setPixmap( iconLoader->loadIcon("down",KIcon::Toolbar) );
+    pTrackDown->setPixmap( iconLoader->loadIcon("down",TDEIcon::Toolbar) );
     pTrackDown->setAutoRepeat( true );
     connect( pTrackDown, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(trackDownPressed())
@@ -164,7 +164,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
                this, TQT_SLOT(trackTitleChanged(const TQString&))
              );
     pTrackTitleEdit = new KPushButton( " ", tagGroupBox, "pTrackTitleEdit" );
-    pTrackTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pTrackTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pTrackTitleEdit->setFixedSize( lTrackTitle->sizeHint().height(), lTrackTitle->sizeHint().height() );
     pTrackTitleEdit->hide();
     trackTitleBox->addWidget( pTrackTitleEdit );
@@ -183,7 +183,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
                this, TQT_SLOT(trackArtistChanged(const TQString&))
              );
     pTrackArtistEdit = new KPushButton( " ", tagGroupBox, "pTrackArtistEdit" );
-    pTrackArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pTrackArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pTrackArtistEdit->setFixedSize( lTrackArtist->sizeHint().height(), lTrackArtist->sizeHint().height() );
     pTrackArtistEdit->hide();
     trackArtistBox->addWidget( pTrackArtistEdit );
@@ -198,7 +198,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
                this, TQT_SLOT(trackComposerChanged(const TQString&))
              );
     pTrackComposerEdit = new KPushButton( " ", tagGroupBox, "pTrackComposerEdit" );
-    pTrackComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pTrackComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pTrackComposerEdit->setFixedSize( lTrackComposer->sizeHint().height(), lTrackComposer->sizeHint().height() );
     pTrackComposerEdit->hide();
     trackArtistBox->addWidget( pTrackComposerEdit );
@@ -218,7 +218,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
                this, TQT_SLOT(trackCommentChanged())
              );
     pTrackCommentEdit = new KPushButton( " ", tagGroupBox, "pTrackCommentEdit" );
-    pTrackCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pTrackCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pTrackCommentEdit->setFixedSize( lTrackTitle->sizeHint().height(), lTrackTitle->sizeHint().height() );
     pTrackCommentEdit->hide();
     trackCommentBox->addWidget( pTrackCommentEdit );
@@ -239,7 +239,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     gridLayout->addLayout( controlBox, 4, 0 );
 
     // add the control elements
-    pSaveCue = new KPushButton( iconLoader->loadIcon("filesave",KIcon::Small), i18n("Save cuesheet ..."), this, "pSaveCue" );
+    pSaveCue = new KPushButton( iconLoader->loadIcon("filesave",TDEIcon::Small), i18n("Save cuesheet ..."), this, "pSaveCue" );
     controlBox->addWidget( pSaveCue );
     connect( pSaveCue, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(saveCuesheetClicked())
@@ -247,16 +247,16 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     controlBox->addStretch();
 
     cAdd = new ComboButton( this, "cAdd" );
-    cAdd->insertItem( iconLoader->loadIcon("fileopen",KIcon::Small),i18n("Add all tracks") );
-    cAdd->insertItem( iconLoader->loadIcon("fileopen",KIcon::Small),i18n("Add selected tracks") );
+    cAdd->insertItem( iconLoader->loadIcon("fileopen",TDEIcon::Small),i18n("Add all tracks") );
+    cAdd->insertItem( iconLoader->loadIcon("fileopen",TDEIcon::Small),i18n("Add selected tracks") );
     RipperPlugin* plugin = config->getCurrentRipper();
-    if( plugin != 0 && plugin->rip.full_disc.enabled ) cAdd->insertItem( iconLoader->loadIcon("cdaudio_unmount",KIcon::Small),i18n("Add full CD as one file") );
+    if( plugin != 0 && plugin->rip.full_disc.enabled ) cAdd->insertItem( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Small),i18n("Add full CD as one file") );
     //cAdd->setSizeMode( ComboButton::Min );
     controlBox->addWidget( cAdd );
     connect( cAdd, TQT_SIGNAL(clicked(int)),
                this, TQT_SLOT(addClicked(int))
              );
-    pCancel = new KPushButton( iconLoader->loadIcon("cancel",KIcon::Small), i18n("Cancel"), this, "pCancel" );
+    pCancel = new KPushButton( iconLoader->loadIcon("cancel",TDEIcon::Small), i18n("Cancel"), this, "pCancel" );
     controlBox->addWidget( pCancel );
     connect( pCancel, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(reject())
diff --git a/src/configenvironmentpage.cpp b/src/configenvironmentpage.cpp
index d1b9ee2..7188927 100755
--- a/src/configenvironmentpage.cpp
+++ b/src/configenvironmentpage.cpp
@@ -25,7 +25,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T
     binaries = _binaries;
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     TQVBoxLayout* box = new TQVBoxLayout( parent, 0, 6 );
 
@@ -45,7 +45,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T
 
     TQVBoxLayout* directoriesMiddleBox = new TQVBoxLayout( directoriesBox );
     pDirUp = new KPushButton( "", parent, "pDirUp" );
-    pDirUp->setPixmap( iconLoader->loadIcon("up",KIcon::Toolbar) );
+    pDirUp->setPixmap( iconLoader->loadIcon("up",TDEIcon::Toolbar) );
     pDirUp->setEnabled( false );
     TQToolTip::add( pDirUp, i18n("Move selected directory one position up.\nThis effects which backend will be chosen, if there are several versions.") );
     directoriesMiddleBox->addWidget( pDirUp );
@@ -55,7 +55,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T
 
     directoriesMiddleBox->addStretch();
     pDirDown = new KPushButton( "", parent, "pDirDown" );
-    pDirDown->setPixmap( iconLoader->loadIcon("down",KIcon::Toolbar) );
+    pDirDown->setPixmap( iconLoader->loadIcon("down",TDEIcon::Toolbar) );
     pDirDown->setEnabled( false );
     TQToolTip::add( pDirDown, i18n("Move selected directory one position down.\nThis effects which backend will be chosen, if there are several versions.") );
     directoriesMiddleBox->addWidget( pDirDown );
@@ -64,13 +64,13 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap<TQString, T
              );
 
     TQVBoxLayout* directoriesRightBox = new TQVBoxLayout( directoriesBox );
-    pAddDirectory = new KPushButton( iconLoader->loadIcon("add",KIcon::Small), i18n("Add ..."), parent, "pAddDirectory" );
+    pAddDirectory = new KPushButton( iconLoader->loadIcon("add",TDEIcon::Small), i18n("Add ..."), parent, "pAddDirectory" );
     directoriesRightBox->addWidget( pAddDirectory );
     connect( pAddDirectory, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(addDirectory())
              );
 
-    pRemoveDirectory = new KPushButton( iconLoader->loadIcon("remove",KIcon::Small), i18n("Remove"), parent, "pRemoveDirectory" );
+    pRemoveDirectory = new KPushButton( iconLoader->loadIcon("remove",TDEIcon::Small), i18n("Remove"), parent, "pRemoveDirectory" );
     directoriesRightBox->addWidget( pRemoveDirectory );
     pRemoveDirectory->setEnabled( false );
     connect( pRemoveDirectory, TQT_SIGNAL(clicked()),
diff --git a/src/configgeneralpage.cpp b/src/configgeneralpage.cpp
index 64bfd5b..22ff4fd 100755
--- a/src/configgeneralpage.cpp
+++ b/src/configgeneralpage.cpp
@@ -26,7 +26,7 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c
     config = _config;
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     TQVBoxLayout* box = new TQVBoxLayout( parent, 0, 6 );
 
@@ -90,13 +90,13 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const c
     connect( lDir, TQT_SIGNAL(textChanged(const TQString&)),
                this, TQT_SLOT(cfgChanged())
              );*/
-    /*pDirInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), "", parent, "pDirInfo" );
+    /*pDirInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), "", parent, "pDirInfo" );
     TQToolTip::add( pDirInfo, i18n("Information about the wildcards.") );
     defaultDirBox->addWidget( pDirInfo );
     connect( pDirInfo, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(dirInfo())
              );*/
-//     pDirSelect = new KPushButton( iconLoader->loadIcon("folder",KIcon::Small), "", parent, "pDirSelect" );
+//     pDirSelect = new KPushButton( iconLoader->loadIcon("folder",TDEIcon::Small), "", parent, "pDirSelect" );
 //     TQToolTip::add( pDirSelect, i18n("Choose an output directory") );
 //     defaultDirBox->addWidget( pDirSelect );
 //     connect( pDirSelect, TQT_SIGNAL(clicked()),
diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp
index e3cc232..d8c7f64 100755
--- a/src/configpluginspage.cpp
+++ b/src/configpluginspage.cpp
@@ -32,7 +32,7 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const c
     config = _config;
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     TQVBoxLayout* box = new TQVBoxLayout( parent, 0, 6 );
 
@@ -47,19 +47,19 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const c
     refreshPlugins();
 
     TQVBoxLayout* pluginsRightBox = new TQVBoxLayout( pluginsBox );
-    pAddPlugin = new KPushButton( iconLoader->loadIcon("add",KIcon::Small), i18n("Add ..."), parent, "pAddPlugin" );
+    pAddPlugin = new KPushButton( iconLoader->loadIcon("add",TDEIcon::Small), i18n("Add ..."), parent, "pAddPlugin" );
     pluginsRightBox->addWidget( pAddPlugin );
     connect( pAddPlugin, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(getPlugin())
              );
-    pRemovePlugin = new KPushButton( iconLoader->loadIcon("remove",KIcon::Small), i18n("Remove"), parent, "pRemovePlugin" );
+    pRemovePlugin = new KPushButton( iconLoader->loadIcon("remove",TDEIcon::Small), i18n("Remove"), parent, "pRemovePlugin" );
     pRemovePlugin->setEnabled( false );
     pluginsRightBox->addWidget( pRemovePlugin );
     connect( pRemovePlugin, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(removePlugin())
              );
     pluginsRightBox->addStretch();
-    pAboutPlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("About"), parent, "pAboutPlugin" );
+    pAboutPlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), i18n("About"), parent, "pAboutPlugin" );
     pAboutPlugin->setEnabled( false );
     pluginsRightBox->addWidget( pAboutPlugin );
     connect( pAboutPlugin, TQT_SIGNAL(clicked()),
@@ -77,27 +77,27 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const c
                this, TQT_SLOT(onlinePluginsSelectionChanged(int))
              );
     TQVBoxLayout* onlinePluginsRightBox = new TQVBoxLayout( onlinePluginsBox );
-    pRefreshOnlinePlugins = new KPushButton( iconLoader->loadIcon("reload",KIcon::Small), i18n("Refresh"), parent, "pRefreshOnlinePlugins" );
+    pRefreshOnlinePlugins = new KPushButton( iconLoader->loadIcon("reload",TDEIcon::Small), i18n("Refresh"), parent, "pRefreshOnlinePlugins" );
     TQToolTip::add( pRefreshOnlinePlugins, i18n("Download the latest list of available plugins.") );
     onlinePluginsRightBox->addWidget( pRefreshOnlinePlugins );
     connect( pRefreshOnlinePlugins, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(refreshOnlinePlugins())
              );
     // TODO upgrade button
-//     pUpgradeOnlinePlugins = new KPushButton( iconLoader->loadIcon("filesave",KIcon::Small), i18n("Upgrade"), parent, "pUpgradeOnlinePlugins" );
+//     pUpgradeOnlinePlugins = new KPushButton( iconLoader->loadIcon("filesave",TDEIcon::Small), i18n("Upgrade"), parent, "pUpgradeOnlinePlugins" );
 //     pUpgradeOnlinePlugins->setEnabled( false );
 //     TQToolTip::add( pUpgradeOnlinePlugins, i18n("Download all plugins and install them into the soundKonverter directory.") );
 //     onlinePluginsRightBox->addWidget( pUpgradeOnlinePlugins );
 //     connect(pInstallAllOnlinePlugins,TQT_SIGNAL(clicked()),this,TQT_SLOT(upgradeOnlinePlugins()));
     onlinePluginsRightBox->addStretch();
-    pInstallOnlinePlugin = new KPushButton( iconLoader->loadIcon("filesave",KIcon::Small), i18n("Install"), parent, "pInstallOnlinePlugin" );
+    pInstallOnlinePlugin = new KPushButton( iconLoader->loadIcon("filesave",TDEIcon::Small), i18n("Install"), parent, "pInstallOnlinePlugin" );
     pInstallOnlinePlugin->setEnabled( false );
     TQToolTip::add( pInstallOnlinePlugin, i18n("Download the selected plugin and install it into the soundKonverter directory.") );
     onlinePluginsRightBox->addWidget( pInstallOnlinePlugin );
     connect( pInstallOnlinePlugin, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(getOnlinePlugin())
              );
-    pAboutOnlinePlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("About"), parent, "pAboutOnlinePlugin" );
+    pAboutOnlinePlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), i18n("About"), parent, "pAboutOnlinePlugin" );
     pAboutOnlinePlugin->setEnabled( false );
     onlinePluginsRightBox->addWidget( pAboutOnlinePlugin );
     connect( pAboutOnlinePlugin, TQT_SIGNAL(clicked()),
diff --git a/src/cuesheeteditor.cpp b/src/cuesheeteditor.cpp
index bb07fa6..65185fa 100755
--- a/src/cuesheeteditor.cpp
+++ b/src/cuesheeteditor.cpp
@@ -24,11 +24,11 @@ CuesheetEditor::CuesheetEditor( TQWidget *parent, const char *name, bool modal,
     // TODO can the cuesheet editor be extendet by more tags (composer), etc.
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     setCaption( i18n("Cuesheet Editor") );
     resize( 600, 400 );
-    setIcon( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    setIcon( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
 
     TQGridLayout *grid = new TQGridLayout( this, 4, 1, 11, 6 );
 
@@ -67,25 +67,25 @@ CuesheetEditor::CuesheetEditor( TQWidget *parent, const char *name, bool modal,
     TQHBoxLayout *buttonBox = new TQHBoxLayout();
     grid->addLayout( buttonBox, 3, 0 );
 
-    pHelp = new KPushButton( iconLoader->loadIcon("help",KIcon::Small), "", this, "pHelp" );
+    pHelp = new KPushButton( iconLoader->loadIcon("help",TDEIcon::Small), "", this, "pHelp" );
     buttonBox->addWidget( pHelp );
     connect( pHelp, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(help())
              );
 
-    pGenerate = new KPushButton( iconLoader->loadIcon("filenew",KIcon::Small), i18n("Generate"), this, "pGenerate" );
+    pGenerate = new KPushButton( iconLoader->loadIcon("filenew",TDEIcon::Small), i18n("Generate"), this, "pGenerate" );
     buttonBox->addWidget( pGenerate );
     connect( pGenerate, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(generate())
              );
 
-    pConvert = new KPushButton( iconLoader->loadIcon("run",KIcon::Small), i18n("Format"), this, "pConvert" );
+    pConvert = new KPushButton( iconLoader->loadIcon("run",TDEIcon::Small), i18n("Format"), this, "pConvert" );
     buttonBox->addWidget( pConvert );
     connect( pConvert, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(convert())
              );
 
-    pShift = new KPushButton( iconLoader->loadIcon("reload",KIcon::Small), i18n("Shift Title/Performer"), this, "pShift" );
+    pShift = new KPushButton( iconLoader->loadIcon("reload",TDEIcon::Small), i18n("Shift Title/Performer"), this, "pShift" );
     buttonBox->addWidget( pShift );
     connect( pShift, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(shift())
@@ -93,7 +93,7 @@ CuesheetEditor::CuesheetEditor( TQWidget *parent, const char *name, bool modal,
 
     buttonBox->addStretch();
 
-    pOk = new KPushButton(iconLoader->loadIcon("exit",KIcon::Small), i18n("Close"), this, "pOk" );
+    pOk = new KPushButton(iconLoader->loadIcon("exit",TDEIcon::Small), i18n("Close"), this, "pOk" );
     pOk->setFocus();
     buttonBox->addWidget( pOk );
     connect( pOk, TQT_SIGNAL(clicked()),
diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp
index ad80dfd..2d2dbe9 100755
--- a/src/dirdialog.cpp
+++ b/src/dirdialog.cpp
@@ -19,11 +19,11 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n
     : KDialog( parent, name, modal, f )
 {
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     setCaption( i18n("Add folder") );
     resize( 400, 235 );
-    setIcon( iconLoader->loadIcon("folder_open",KIcon::Small) );
+    setIcon( iconLoader->loadIcon("folder_open",TDEIcon::Small) );
 
     TQGridLayout* grid = new TQGridLayout( this, 4, 1, 11, 6 );
 
@@ -41,7 +41,7 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n
     lDirectory = new KLineEdit( this, "lDirectory" );
     directoryBox->addWidget( lDirectory );
 
-    pDirectory = new KPushButton( iconLoader->loadIcon("folder_open",KIcon::Small), "", this, "pDirectory" );
+    pDirectory = new KPushButton( iconLoader->loadIcon("folder_open",TDEIcon::Small), "", this, "pDirectory" );
     directoryBox->addWidget( pDirectory );
     connect( pDirectory, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(selectDirectoryClicked())
@@ -60,13 +60,13 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n
     TQVBoxLayout* fileTypesButtonsBox = new TQVBoxLayout();
     fileTypesBox->addLayout( fileTypesButtonsBox );
 
-    pSelectAll = new KPushButton( iconLoader->loadIcon("font",KIcon::Small), i18n("Select all"), this, "pSelectAll" );
+    pSelectAll = new KPushButton( iconLoader->loadIcon("font",TDEIcon::Small), i18n("Select all"), this, "pSelectAll" );
     fileTypesButtonsBox->addWidget( pSelectAll );
     connect( pSelectAll, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(selectAllClicked())
              );
 
-    pSelectNone = new KPushButton( iconLoader->loadIcon("empty",KIcon::Small), i18n("Select none"), this, "pSelectNone" );
+    pSelectNone = new KPushButton( iconLoader->loadIcon("empty",TDEIcon::Small), i18n("Select none"), this, "pSelectNone" );
     fileTypesButtonsBox->addWidget( pSelectNone );
     connect( pSelectNone, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(selectNoneClicked())
@@ -85,7 +85,7 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n
     TQHBoxLayout* buttonBox = new TQHBoxLayout();
     grid->addLayout( buttonBox, 2, 0 );
 
-    pOk = new KPushButton( iconLoader->loadIcon("folder_open",KIcon::Small), i18n("Open"), this, "pOk" );
+    pOk = new KPushButton( iconLoader->loadIcon("folder_open",TDEIcon::Small), i18n("Open"), this, "pOk" );
     buttonBox->addWidget( pOk );
     connect( pOk, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(okClicked())
@@ -93,7 +93,7 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n
 
     buttonBox->addStretch();
 
-    pCancel = new KPushButton( iconLoader->loadIcon("cancel",KIcon::Small),i18n("Cancel"), this, "pCancel" );
+    pCancel = new KPushButton( iconLoader->loadIcon("cancel",TDEIcon::Small),i18n("Cancel"), this, "pCancel" );
     pOk->setFocus();
     buttonBox->addWidget( pCancel );
     connect( pCancel, TQT_SIGNAL(clicked()),
diff --git a/src/logviewer.cpp b/src/logviewer.cpp
index 7bcc7fc..687e751 100755
--- a/src/logviewer.cpp
+++ b/src/logviewer.cpp
@@ -78,11 +78,11 @@ LogViewer::LogViewer( Logger* _logger, TQWidget *parent, const char *name, bool
              );
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     setCaption( i18n("Log Viewer") );
     resize( 600, 400 );
-    setIcon( iconLoader->loadIcon("view_text",KIcon::Small) );
+    setIcon( iconLoader->loadIcon("view_text",TDEIcon::Small) );
 
     TQGridLayout *grid = new TQGridLayout( this, 4, 1, 11, 6 );
 
@@ -99,7 +99,7 @@ LogViewer::LogViewer( Logger* _logger, TQWidget *parent, const char *name, bool
     TQHBoxLayout *buttonBox = new TQHBoxLayout();
     grid->addLayout( buttonBox, 3, 0 );
 
-    pReload = new KPushButton(iconLoader->loadIcon("reload",KIcon::Small), i18n("Reload"), this, "pReload" );
+    pReload = new KPushButton(iconLoader->loadIcon("reload",TDEIcon::Small), i18n("Reload"), this, "pReload" );
     buttonBox->addWidget( pReload );
     connect( pReload, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(refillLogs())
@@ -107,7 +107,7 @@ LogViewer::LogViewer( Logger* _logger, TQWidget *parent, const char *name, bool
 
     buttonBox->addStretch();
 
-    pOk = new KPushButton(iconLoader->loadIcon("exit",KIcon::Small), i18n("Close"), this, "pOk" );
+    pOk = new KPushButton(iconLoader->loadIcon("exit",TDEIcon::Small), i18n("Close"), this, "pOk" );
     pOk->setFocus();
     buttonBox->addWidget( pOk );
     connect( pOk, TQT_SIGNAL(clicked()),
diff --git a/src/options.cpp b/src/options.cpp
index fe1e3ab..acafaa9 100755
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -113,7 +113,7 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const
     optionsBox->addStretch();
 
 //     pPluginsNotify = new KPushButton( "", this, "pPluginsNotify");
-//     pPluginsNotify->setPixmap( TDEGlobal::iconLoader()->loadIcon("connect_creating",KIcon::Toolbar) );
+//     pPluginsNotify->setPixmap( TDEGlobal::iconLoader()->loadIcon("connect_creating",TDEIcon::Toolbar) );
 //     TQToolTip::add( pPluginsNotify, i18n("There are new plugin updates available.\nClick on this button in order to open the configuration dialog.") );
 //     pPluginsNotify->hide();
 //     pPluginsNotify->setPaletteBackgroundColor( TQColor(255,220,247) );
@@ -123,7 +123,7 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const
 //              );
 
     pBackendsNotify = new KPushButton( "", this, "pBackendsNotify");
-    pBackendsNotify->setPixmap( TDEGlobal::iconLoader()->loadIcon("kcmsystem",KIcon::Toolbar) );
+    pBackendsNotify->setPixmap( TDEGlobal::iconLoader()->loadIcon("kcmsystem",TDEIcon::Toolbar) );
     TQToolTip::add( pBackendsNotify, i18n("soundKonverter either found new backends or misses some.\nClick on this button in order to open the configuration dialog.") );
     pBackendsNotify->setShown( config->backendsChanged );
     config->backendsChanged = false;
diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp
index d6e6f41..0cb031d 100755
--- a/src/optionseditor.cpp
+++ b/src/optionseditor.cpp
@@ -41,18 +41,18 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     tagEngine = _tagEngine;
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     resize( 400, 350 );
     // TODO move the dialog beside the main window
-    setIcon( iconLoader->loadIcon("view_text",KIcon::Small) );
+    setIcon( iconLoader->loadIcon("view_text",TDEIcon::Small) );
 
-//     setButtonGuiItem( User2, KGuiItem(i18n("Previous"),iconLoader->loadIconSet("previous",KIcon::Small,16,true/*KDE3.5,false*/)) );
-//     setButtonGuiItem( User1, KGuiItem(i18n("Next"),iconLoader->loadIconSet("next",KIcon::Small,16,true/*KDE3.5,false*/)) );
-    setButtonGuiItem( Ok, KGuiItem(i18n("Close"),iconLoader->loadIconSet("exit",KIcon::Small,16,true/*KDE3.5,false*/)) );
+//     setButtonGuiItem( User2, KGuiItem(i18n("Previous"),iconLoader->loadIconSet("previous",TDEIcon::Small,16,true/*KDE3.5,false*/)) );
+//     setButtonGuiItem( User1, KGuiItem(i18n("Next"),iconLoader->loadIconSet("next",TDEIcon::Small,16,true/*KDE3.5,false*/)) );
+    setButtonGuiItem( Ok, KGuiItem(i18n("Close"),iconLoader->loadIconSet("exit",TDEIcon::Small,16,true/*KDE3.5,false*/)) );
 
     //// options page ////
-    conversionOptions = addPage( i18n("Conversion"), i18n("Conversion options"), iconLoader->loadIcon("soundkonverter",KIcon::Desktop) );
+    conversionOptions = addPage( i18n("Conversion"), i18n("Conversion options"), iconLoader->loadIcon("soundkonverter",TDEIcon::Desktop) );
     // the grid for all widgets in the main window
     TQGridLayout* conversionOptionsGridLayout = new TQGridLayout( conversionOptions, 1, 1, 0, 6, "conversionOptionsGridLayout" );
     // generate the options input area
@@ -76,7 +76,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
 
     //// tags page ////
-    tags = addPage( i18n("Tags"), i18n("Tags"), iconLoader->loadIcon("view_text",KIcon::Desktop) );
+    tags = addPage( i18n("Tags"), i18n("Tags"), iconLoader->loadIcon("view_text",TDEIcon::Desktop) );
     // the grid for all widgets in the main window
     TQGridLayout* tagsGridLayout = new TQGridLayout( tags, 1, 1, 0, 6, "tagsGridLayout" );
 
@@ -93,7 +93,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(titleChanged(const TQString&))
              );
     pTitleEdit = new KPushButton( " ", tags, "pTitleEdit" );
-    pTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pTitleEdit->setFixedSize( lTitle->sizeHint().height(), lTitle->sizeHint().height() );
     pTitleEdit->hide();
     titleBox->addWidget( pTitleEdit );
@@ -108,7 +108,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(numberChanged(int))
              );
     pNumberEdit = new KPushButton( " ", tags, "pNumberEdit" );
-    pNumberEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pNumberEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pNumberEdit->setFixedSize( iNumber->sizeHint().height(), iNumber->sizeHint().height() );
     pNumberEdit->hide();
     titleBox->addWidget( pNumberEdit );
@@ -128,7 +128,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(artistChanged(const TQString&))
              );
     pArtistEdit = new KPushButton( " ", tags, "pArtistEdit" );
-    pArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pArtistEdit->setFixedSize( lArtist->sizeHint().height(), lArtist->sizeHint().height() );
     pArtistEdit->hide();
     artistBox->addWidget( pArtistEdit );
@@ -143,7 +143,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(composerChanged(const TQString&))
              );
     pComposerEdit = new KPushButton( " ", tags, "pComposerEdit" );
-    pComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pComposerEdit->setFixedSize( lComposer->sizeHint().height(), lComposer->sizeHint().height() );
     pComposerEdit->hide();
     artistBox->addWidget( pComposerEdit );
@@ -163,7 +163,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(albumChanged(const TQString&))
              );
     pAlbumEdit = new KPushButton( " ", tags, "pAlbumEdit" );
-    pAlbumEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pAlbumEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pAlbumEdit->setFixedSize( lAlbum->sizeHint().height(), lAlbum->sizeHint().height() );
     pAlbumEdit->hide();
     albumBox->addWidget( pAlbumEdit );
@@ -183,7 +183,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(discChanged(int))
              );
     pDiscEdit = new KPushButton( " ", tags, "pDiscEdit" );
-    pDiscEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pDiscEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pDiscEdit->setFixedSize( iDisc->sizeHint().height(), iDisc->sizeHint().height() );
     pDiscEdit->hide();
     albumdataBox->addWidget( pDiscEdit );
@@ -199,7 +199,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(yearChanged(int))
              );
     pYearEdit = new KPushButton( " ", tags, "pYearEdit" );
-    pYearEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pYearEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pYearEdit->setFixedSize( iYear->sizeHint().height(), iYear->sizeHint().height() );
     pYearEdit->hide();
     albumdataBox->addWidget( pYearEdit );
@@ -220,7 +220,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(genreChanged(const TQString&))
              );
     pGenreEdit = new KPushButton( " ", tags, "pGenreEdit" );
-    pGenreEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pGenreEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pGenreEdit->setFixedSize( cGenre->sizeHint().height(), cGenre->sizeHint().height() );
     pGenreEdit->hide();
     albumdataBox->addWidget( pGenreEdit );
@@ -240,7 +240,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
                this, TQT_SLOT(commentChanged())
              );
     pCommentEdit = new KPushButton( " ", tags, "pCommentEdit" );
-    pCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
+    pCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pCommentEdit->setFixedSize( lTitle->sizeHint().height(), lTitle->sizeHint().height() );
     pCommentEdit->hide();
     commentBox->addWidget( pCommentEdit );
diff --git a/src/optionsrequester.cpp b/src/optionsrequester.cpp
index ec547ee..b2b36d3 100755
--- a/src/optionsrequester.cpp
+++ b/src/optionsrequester.cpp
@@ -21,7 +21,7 @@ OptionsRequester::OptionsRequester( Config* config, TQStringList list, TQWidget
     int row = 1;
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     TQGridLayout *grid = new TQGridLayout( this, 2, 1, 11, 6 );
 
@@ -53,10 +53,10 @@ OptionsRequester::OptionsRequester( Config* config, TQStringList list, TQWidget
 
     buttonBox->addStretch();
 
-    pCancel = new KPushButton( iconLoader->loadIcon("exit",KIcon::Small), i18n("Cancel"), this, "pCancel" );
+    pCancel = new KPushButton( iconLoader->loadIcon("exit",TDEIcon::Small), i18n("Cancel"), this, "pCancel" );
     buttonBox->addWidget( pCancel );
 
-    pOk = new KPushButton( iconLoader->loadIcon("apply",KIcon::Small), i18n("Ok"), this, "pOk" );
+    pOk = new KPushButton( iconLoader->loadIcon("apply",TDEIcon::Small), i18n("Ok"), this, "pOk" );
     buttonBox->addWidget( pOk );
 
     connect( pCancel, TQT_SIGNAL(clicked()),
diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp
index e2d35ae..e6f6131 100755
--- a/src/optionssimple.cpp
+++ b/src/optionssimple.cpp
@@ -28,7 +28,7 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed
     optionsDetailed = _optionsDetailed;
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     TQGridLayout *grid = new TQGridLayout( this, 3, 1, 6, 3 );
 
@@ -59,7 +59,7 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed
              );
     topBox->addSpacing( 3 );
     //pProfileRemove = new TDEToolBarButton( "editdelete", 1002, this, "pProfileRemove" );
-    pProfileRemove = new KPushButton( iconLoader->loadIcon("editdelete",KIcon::Small), i18n("Remove"), this, "pProfileRemove" );
+    pProfileRemove = new KPushButton( iconLoader->loadIcon("editdelete",TDEIcon::Small), i18n("Remove"), this, "pProfileRemove" );
     pProfileRemove->hide();
     TQToolTip::add( pProfileRemove, i18n("Remove the selected profile") );
     topBox->addWidget( pProfileRemove, 0, TQt::AlignVCenter );
@@ -67,7 +67,7 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed
                this, TQT_SLOT(profileRemove())
              );
     //pProfileInfo = new TDEToolBarButton( "messagebox_info", 1110, this, "pProfileInfo" );
-    pProfileInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("Info"), this, "pProfileInfo" );
+    pProfileInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), i18n("Info"), this, "pProfileInfo" );
     TQToolTip::add( pProfileInfo, i18n("Information about the selected profile") );
     topBox->addWidget( pProfileInfo, 0, TQt::AlignVCenter );
     connect( pProfileInfo, TQT_SIGNAL(clicked()),
@@ -87,7 +87,7 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed
              );
     topBox->addSpacing( 3 );
     //pFormatInfo = new TDEToolBarButton( "messagebox_info", 1111, this, "pFormatInfo" );
-    pFormatInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("Info"), this, "pFormatInfo" );
+    pFormatInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",TDEIcon::Small), i18n("Info"), this, "pFormatInfo" );
     TQToolTip::add( pFormatInfo, i18n("Information about the selected file format") );
     topBox->addWidget( pFormatInfo, 0, TQt::AlignVCenter );
     connect( pFormatInfo, TQT_SIGNAL(clicked()),
diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp
index f1473a8..a4ba49f 100755
--- a/src/outputdirectory.cpp
+++ b/src/outputdirectory.cpp
@@ -31,7 +31,7 @@ OutputDirectory::OutputDirectory( Config* _config, TQWidget* parent, const char*
     config = _config;
 
     // create an icon loader object for loading icons
-    KIconLoader *iconLoader = new KIconLoader();
+    TDEIconLoader *iconLoader = new TDEIconLoader();
 
     TQGridLayout *grid = new TQGridLayout( this, 1, 1, 0, 3, "grid" );
 
diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp
index 8c1a4e5..340aff9 100755
--- a/src/replaygainfilelist.cpp
+++ b/src/replaygainfilelist.cpp
@@ -126,7 +126,7 @@ void ReplayGainFileListItem::setType( Type type )
 
     if( type == Album ) {
         setOpen( true );
-        setPixmap( 0, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount",KIcon::Small) );
+        setPixmap( 0, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount",TDEIcon::Small) );
     }
 }
 
diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp
index da7bc4e..9dd378e 100755
--- a/src/replaygainscanner.cpp
+++ b/src/replaygainscanner.cpp
@@ -28,11 +28,11 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo
     logger = _logger;
 
     // create an icon loader object for loading icons
-    KIconLoader* iconLoader = new KIconLoader();
+    TDEIconLoader* iconLoader = new TDEIconLoader();
 
     setCaption( i18n("Replay Gain Tool") );
     resize( 600, 400 );
-    setIcon( iconLoader->loadIcon("soundkonverter_replaygain",KIcon::Small) );
+    setIcon( iconLoader->loadIcon("soundkonverter_replaygain",TDEIcon::Small) );
 
     TQGridLayout* grid = new TQGridLayout( this, 4, 1, 11, 6 );
 
@@ -40,8 +40,8 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo
     grid->addLayout( filterBox, 0, 0 );
 
     cAdd = new ComboButton( this, "cAdd" );
-    cAdd->insertItem( iconLoader->loadIcon("folder",KIcon::Small),i18n("Add Folder ...") );
-    cAdd->insertItem( iconLoader->loadIcon("sound",KIcon::Small),i18n("Add Files ...") );
+    cAdd->insertItem( iconLoader->loadIcon("folder",TDEIcon::Small),i18n("Add Folder ...") );
+    cAdd->insertItem( iconLoader->loadIcon("sound",TDEIcon::Small),i18n("Add Files ...") );
     filterBox->addWidget( cAdd );
     connect( cAdd, TQT_SIGNAL(clicked(int)),
                this, TQT_SLOT(addClicked(int))
@@ -99,21 +99,21 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo
     TQHBoxLayout* buttonBox = new TQHBoxLayout();
     grid->addLayout( buttonBox, 3, 0 );
 
-    pTagVisible = new KPushButton( iconLoader->loadIcon("apply",KIcon::Small), i18n("Tag untagged"), this, "pTagVisible" );
+    pTagVisible = new KPushButton( iconLoader->loadIcon("apply",TDEIcon::Small), i18n("Tag untagged"), this, "pTagVisible" );
     TQToolTip::add( pTagVisible, i18n("Calculate Replay Gain tag for all files in the file list without Replay Gain tag.") );
     buttonBox->addWidget( pTagVisible );
     connect( pTagVisible, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(calcReplayGainClicked())
              );
 
-    pRemoveTag = new KPushButton( iconLoader->loadIcon("cancel",KIcon::Small), i18n("Untag tagged"), this, "pRemoveTag" );
+    pRemoveTag = new KPushButton( iconLoader->loadIcon("cancel",TDEIcon::Small), i18n("Untag tagged"), this, "pRemoveTag" );
     TQToolTip::add( pRemoveTag, i18n("Remove the Replay Gain tag from all files in the file list.") );
     buttonBox->addWidget( pRemoveTag );
     connect( pRemoveTag, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(removeReplayGainClicked())
              );
 
-    pCancel = new KPushButton( iconLoader->loadIcon("cancel",KIcon::Small),i18n("Cancel"), this, "pCancel" );
+    pCancel = new KPushButton( iconLoader->loadIcon("cancel",TDEIcon::Small),i18n("Cancel"), this, "pCancel" );
     pCancel->hide();
     buttonBox->addWidget( pCancel );
     connect( pCancel, TQT_SIGNAL(clicked()),
@@ -122,7 +122,7 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo
 
     buttonBox->addStretch();
 
-    pOk = new KPushButton( iconLoader->loadIcon("exit",KIcon::Small), i18n("Close"), this, "pOk" );
+    pOk = new KPushButton( iconLoader->loadIcon("exit",TDEIcon::Small), i18n("Close"), this, "pOk" );
     pOk->setFocus();
     buttonBox->addWidget( pOk );
     connect( pOk, TQT_SIGNAL(clicked()),
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index 98b7544..c2e89a0 100755
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -104,7 +104,7 @@ soundKonverter::soundKonverter()
     systemTray->hide();
 
     // create an icon loader object for loading icons
-    KIconLoader *iconLoader = new KIconLoader();
+    TDEIconLoader *iconLoader = new TDEIconLoader();
 
     TQWidget* widget = new TQWidget( this, "widget" );
     setCentralWidget( widget );
@@ -232,10 +232,10 @@ soundKonverter::soundKonverter()
     //font.setWeight( TQFont::DemiBold );
     font.setPointSize( font.pointSize() + 1 );
     cAdd->setFont( font );
-    cAdd->insertItem( iconLoader->loadIcon("sound",KIcon::Toolbar), i18n("Add files ...") );
-    cAdd->insertItem( iconLoader->loadIcon("folder",KIcon::Toolbar), i18n("Add folder ...") );
-    cAdd->insertItem( iconLoader->loadIcon("cdaudio_unmount",KIcon::Toolbar), i18n("Add CD tracks ...") );
-    cAdd->insertItem( iconLoader->loadIcon("browser",KIcon::Toolbar), i18n("Add URL ...") );
+    cAdd->insertItem( iconLoader->loadIcon("sound",TDEIcon::Toolbar), i18n("Add files ...") );
+    cAdd->insertItem( iconLoader->loadIcon("folder",TDEIcon::Toolbar), i18n("Add folder ...") );
+    cAdd->insertItem( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Toolbar), i18n("Add CD tracks ...") );
+    cAdd->insertItem( iconLoader->loadIcon("browser",TDEIcon::Toolbar), i18n("Add URL ...") );
     addBox->addWidget( cAdd );
     connect( cAdd, TQT_SIGNAL(clicked(int)),
              TQT_TQOBJECT(this), TQT_SLOT(addClicked(int))
@@ -243,7 +243,7 @@ soundKonverter::soundKonverter()
 
     addBox->addSpacing( 18 );
 
-    pStart = new KPushButton( iconLoader->loadIcon("run",KIcon::Small), i18n("Start"), widget, "pStart" );
+    pStart = new KPushButton( iconLoader->loadIcon("run",TDEIcon::Small), i18n("Start"), widget, "pStart" );
     pStart->setFixedHeight( pStart->size().height() );
     pStart->setEnabled( false );
     addBox->addWidget( pStart );
@@ -251,7 +251,7 @@ soundKonverter::soundKonverter()
                TQT_TQOBJECT(fileList), TQT_SLOT(startConversion())
              );
 
-    pStop = new KPushButton( iconLoader->loadIcon("stop",KIcon::Small), i18n("Stop"), widget, "pStop" );
+    pStop = new KPushButton( iconLoader->loadIcon("stop",TDEIcon::Small), i18n("Stop"), widget, "pStop" );
     pStop->setFixedHeight( pStop->size().height() );
     pStop->hide();
     pStop->setPopup( stopActionMenu->popupMenu() );