diff --git a/kipi-plugins/calendar/calevents.cpp b/kipi-plugins/calendar/calevents.cpp
index ccdd39a..1e9c988 100644
--- a/kipi-plugins/calendar/calevents.cpp
+++ b/kipi-plugins/calendar/calevents.cpp
@@ -36,8 +36,8 @@ CalEvents::CalEvents(TQWidget *parent, const char *name)
  : CalEventsBase(parent, name)
 {
     TDEIconLoader * icons = new TDEIconLoader( TQString( "MenuDlg" ) );
-    ohBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
-    fhBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
+    ohBtn->setPixmap( icons->loadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
+    fhBtn->setPixmap( icons->loadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
 }
 
 
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index 47b515c..0cdfd34 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -479,7 +479,7 @@ void CameraUI::slotCameraDeleteSelected() {
 	return;
     }
     TQString warnMsg(i18n("About to delete these Image(s)\n" "Are you sure?"));
-    if(KMessageBox::warningContinueCancelList(this, warnMsg, deleteList, i18n("Warning"), KGuiItem(i18n("Delete"),"editdelete")) ==  KMessageBox::Continue) {
+    if(KMessageBox::warningContinueCancelList(this, warnMsg, deleteList, i18n("Warning"), KGuiItem(i18n("Delete"),"edit-delete")) ==  KMessageBox::Continue) {
 	CameraIconItem *item = static_cast<CameraIconItem*>(mIconView->firstItem());
         while(item) {
             CameraIconItem *nextItem = static_cast<CameraIconItem *>(item->nextItem());
diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp
index ffa1c57..b0837e6 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -136,7 +136,7 @@ EXIFEditDialog::EXIFEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac
     // ---------------------------------------------------------------
 
     d->page_caption  = addPage(i18n("Caption"), i18n("Caption Information"),
-                               BarIcon("editclear", TDEIcon::SizeMedium));
+                               BarIcon("edit-clear", TDEIcon::SizeMedium));
     d->captionPage   = new EXIFCaption(d->page_caption);
 
     d->page_datetime = addPage(i18n("Date & Time"), i18n("Date and Time"),
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index 7b4490b..a490c44 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -144,7 +144,7 @@ IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac
     // ---------------------------------------------------------------
 
     d->page_caption    = addPage(i18n("Caption"), i18n("Caption Information"),
-                                 BarIcon("editclear", TDEIcon::SizeMedium));
+                                 BarIcon("edit-clear", TDEIcon::SizeMedium));
     d->captionPage     = new IPTCCaption(d->page_caption);
 
     d->page_datetime   = addPage(i18n("Date & Time"), i18n("Date and Time Information"),
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index 312114c..aca9ce7 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -193,8 +193,8 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c
 
   // Set buttons icon
 
-  m_MPEGOutputBUTTONFilename->setIconSet( SmallIconSet( "fileopen" ) );
-  m_AudioInputBUTTONFilename->setIconSet( SmallIconSet( "fileopen" ) );
+  m_MPEGOutputBUTTONFilename->setIconSet( SmallIconSet( "document-open" ) );
+  m_AudioInputBUTTONFilename->setIconSet( SmallIconSet( "document-open" ) );
 
   // Signal/Slot connections
 
diff --git a/kipi-plugins/mpegencoder/optionsdialog.cpp b/kipi-plugins/mpegencoder/optionsdialog.cpp
index fe3dfb0..c8f7dc6 100644
--- a/kipi-plugins/mpegencoder/optionsdialog.cpp
+++ b/kipi-plugins/mpegencoder/optionsdialog.cpp
@@ -68,7 +68,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent)
   IMBinFolderEditFilename = new KLineEdit( IMBinFolderGroup );
   IMBinFolderEditFilename->setMinimumWidth( 300 );
   TQPushButton* IMBinFolderButtonFilename = new TQPushButton( IMBinFolderGroup );
-  IMBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
+  IMBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
   connect( IMBinFolderButtonFilename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotIMBinFolderFilenameDialog()));
 
   // MjpegTools binary programs folder
@@ -78,7 +78,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent)
   MJBinFolderEditFilename = new KLineEdit( MJBinFolderGroup );
   MJBinFolderEditFilename->setMinimumWidth( 300 );
   TQPushButton* MJBinFolderButtonFilename = new TQPushButton( MJBinFolderGroup );
-  MJBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
+  MJBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "document-open" ), TDEIcon::Toolbar ) );
   connect( MJBinFolderButtonFilename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMJBinFolderFilenameDialog()));
 }
 
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index ebe5576..59772f4 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -104,7 +104,7 @@ FrmPrintWizard::FrmPrintWizard(TQWidget *parent, const char *name )
   
   // setting-up icons on buttons
   BtnBrowseOutputPath->setText("");
-  BtnBrowseOutputPath->setIconSet( SmallIconSet( "fileopen" ) );
+  BtnBrowseOutputPath->setIconSet( SmallIconSet( "document-open" ) );
   BtnPrintOrderDown->setText("");
   BtnPrintOrderDown->setIconSet( SmallIconSet( "go-down" ) );
   BtnPrintOrderUp->setText("");
diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp
index 0098a41..3917287 100644
--- a/kipi-plugins/printwizard/plugin_printwizard.cpp
+++ b/kipi-plugins/printwizard/plugin_printwizard.cpp
@@ -65,7 +65,7 @@ void Plugin_PrintWizard::setup( TQWidget* widget )
     KIPI::Plugin::setup( widget );
 
     m_printAction =  new TDEAction (i18n("Print Wizard..."),
-                                  "fileprint",
+                                  "document-print",
                                   CTRL+Key_P,
                                   this,
                                   TQT_SLOT(slotActivate()),