diff --git a/src/cdopener.cpp b/src/cdopener.cpp
index d0ce817..a5b446f 100755
--- a/src/cdopener.cpp
+++ b/src/cdopener.cpp
@@ -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",TDEIcon::Small), i18n("Save cuesheet ..."), this, "pSaveCue" );
+    pSaveCue = new KPushButton( iconLoader->loadIcon("document-save",TDEIcon::Small), i18n("Save cuesheet ..."), this, "pSaveCue" );
     controlBox->addWidget( pSaveCue );
     connect( pSaveCue, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(saveCuesheetClicked())
@@ -247,8 +247,8 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     controlBox->addStretch();
 
     cAdd = new ComboButton( this, "cAdd" );
-    cAdd->insertItem( iconLoader->loadIcon("fileopen",TDEIcon::Small),i18n("Add all tracks") );
-    cAdd->insertItem( iconLoader->loadIcon("fileopen",TDEIcon::Small),i18n("Add selected tracks") );
+    cAdd->insertItem( iconLoader->loadIcon("document-open",TDEIcon::Small),i18n("Add all tracks") );
+    cAdd->insertItem( iconLoader->loadIcon("document-open",TDEIcon::Small),i18n("Add selected tracks") );
     RipperPlugin* plugin = config->getCurrentRipper();
     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 );
diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp
index 2664a37..0215ea7 100755
--- a/src/configpluginspage.cpp
+++ b/src/configpluginspage.cpp
@@ -84,13 +84,13 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const c
                this, TQT_SLOT(refreshOnlinePlugins())
              );
     // TODO upgrade button
-//     pUpgradeOnlinePlugins = new KPushButton( iconLoader->loadIcon("filesave",TDEIcon::Small), i18n("Upgrade"), parent, "pUpgradeOnlinePlugins" );
+//     pUpgradeOnlinePlugins = new KPushButton( iconLoader->loadIcon("document-save",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",TDEIcon::Small), i18n("Install"), parent, "pInstallOnlinePlugin" );
+    pInstallOnlinePlugin = new KPushButton( iconLoader->loadIcon("document-save",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 );
diff --git a/src/cuesheeteditor.cpp b/src/cuesheeteditor.cpp
index 70619f0..9fcb9a3 100755
--- a/src/cuesheeteditor.cpp
+++ b/src/cuesheeteditor.cpp
@@ -73,7 +73,7 @@ CuesheetEditor::CuesheetEditor( TQWidget *parent, const char *name, bool modal,
                this, TQT_SLOT(help())
              );
 
-    pGenerate = new KPushButton( iconLoader->loadIcon("filenew",TDEIcon::Small), i18n("Generate"), this, "pGenerate" );
+    pGenerate = new KPushButton( iconLoader->loadIcon("document-new",TDEIcon::Small), i18n("Generate"), this, "pGenerate" );
     buttonBox->addWidget( pGenerate );
     connect( pGenerate, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(generate())
diff --git a/src/filelist.cpp b/src/filelist.cpp
index abbce8d..fa28c9b 100755
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -171,7 +171,7 @@ FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _confi
     start = new TDEAction( i18n("Start conversion"), "system-run", 0, TQT_TQOBJECT(this), TQT_SLOT(convertSelectedItems()), actionCollection, "start_conversion" );
     stop = new TDEAction( i18n("Stop conversion"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(stopSelectedItems()), actionCollection, "stop_conversion" );
     remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
-    paste = new TDEAction( i18n("Paste"), "editpaste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" );  // TODO paste
+    paste = new TDEAction( i18n("Paste"), "edit-paste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" );  // TODO paste
 
     connect( TQT_TQOBJECT(this), TQT_SIGNAL(selectionChanged()),
                TQT_TQOBJECT(this), TQT_SLOT(itemsSelected())
diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp
index 2d526e8..b050b49 100755
--- a/src/optionsdetailed.cpp
+++ b/src/optionsdetailed.cpp
@@ -188,7 +188,7 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char
              );
     normalBottomBox->addSpacing( 18 );
 
-    pProfileSave = new TDEToolBarButton( "filesave", 1003, normalOptions, "pProfileSave" );
+    pProfileSave = new TDEToolBarButton( "document-save", 1003, normalOptions, "pProfileSave" );
     TQToolTip::add( pProfileSave, i18n("Save current options as a profile") );
     normalBottomBox->addWidget( pProfileSave, 0, TQt::AlignVCenter );
     connect( pProfileSave, TQT_SIGNAL(clicked()),
diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp
index 7824c3b..c5dbefe 100755
--- a/src/optionssimple.cpp
+++ b/src/optionssimple.cpp
@@ -58,8 +58,8 @@ OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed
                this, TQT_SLOT(somethingChanged())
              );
     topBox->addSpacing( 3 );
-    //pProfileRemove = new TDEToolBarButton( "editdelete", 1002, this, "pProfileRemove" );
-    pProfileRemove = new KPushButton( iconLoader->loadIcon("editdelete",TDEIcon::Small), i18n("Remove"), this, "pProfileRemove" );
+    //pProfileRemove = new TDEToolBarButton( "edit-delete", 1002, this, "pProfileRemove" );
+    pProfileRemove = new KPushButton( iconLoader->loadIcon("edit-delete",TDEIcon::Small), i18n("Remove"), this, "pProfileRemove" );
     pProfileRemove->hide();
     TQToolTip::add( pProfileRemove, i18n("Remove the selected profile") );
     topBox->addWidget( pProfileRemove, 0, TQt::AlignVCenter );
diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp
index 19d33cf..37a6506 100755
--- a/src/replaygainfilelist.cpp
+++ b/src/replaygainfilelist.cpp
@@ -213,8 +213,8 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config,
     calc_gain = new TDEAction( i18n("Calculate Replay Gain tags"), "apply", 0, TQT_TQOBJECT(this), TQT_SLOT(calcSelectedItemsGain()), actionCollection, "calc_album" );
     remove_gain = new TDEAction( i18n("Remove Replay Gain tags"), "cancel", 0, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItemsGain()), actionCollection, "remove_gain" );
     remove = new TDEAction( i18n("Remove"), "edittrash", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(removeSelectedItems()), actionCollection, "remove" );
-    paste = new TDEAction( i18n("Paste"), "editpaste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" );
-    newalbum = new TDEAction( i18n("New album"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(createNewAlbum()), actionCollection, "newalbum" );
+    paste = new TDEAction( i18n("Paste"), "edit-paste", 0, TQT_TQOBJECT(this), 0, actionCollection, "paste" );
+    newalbum = new TDEAction( i18n("New album"), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(createNewAlbum()), actionCollection, "newalbum" );
     open_albums = new TDEAction( i18n("Open all albums"), "view_tree", 0, TQT_TQOBJECT(this), TQT_SLOT(openAlbums()), actionCollection, "open_albums" );
     close_albums = new TDEAction( i18n("Cloase all albums"), "view_text", 0, TQT_TQOBJECT(this), TQT_SLOT(closeAlbums()), actionCollection, "close_albums" );
 
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index 8a6d83b..7e87a2d 100755
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -157,8 +157,8 @@ soundKonverter::soundKonverter()
     new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" );
     KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 
-    new TDEAction( i18n("L&oad file list"), "fileopen", 0, TQT_TQOBJECT(fileList), TQT_SLOT(load()), actionCollection(), "load" );
-    new TDEAction( i18n("Sa&ve file list"), "filesave", 0, TQT_TQOBJECT(fileList), TQT_SLOT(save()), actionCollection(), "save" );
+    new TDEAction( i18n("L&oad file list"), "document-open", 0, TQT_TQOBJECT(fileList), TQT_SLOT(load()), actionCollection(), "load" );
+    new TDEAction( i18n("Sa&ve file list"), "document-save", 0, TQT_TQOBJECT(fileList), TQT_SLOT(save()), actionCollection(), "save" );
 
     // TODO //KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(pasteFiles()), actionCollection() );