diff --git a/smb4k/configdlg/smb4ksambaoptions.cpp b/smb4k/configdlg/smb4ksambaoptions.cpp
index 79ef628..a1503e2 100644
--- a/smb4k/configdlg/smb4ksambaoptions.cpp
+++ b/smb4k/configdlg/smb4ksambaoptions.cpp
@@ -448,7 +448,7 @@ Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )
   custom_rm_layout->setSpacing( 5 );
 
   KPushButton *remove_custom =  new KPushButton( KGuiItem( i18n( "Remove" ), "remove" ), custom_rm, "CustomRemoveItem" );
-  KPushButton *rm_all_custom =  new KPushButton( KGuiItem( i18n( "Remove All" ), "editdelete" ), custom_rm, "CustomRemoveAllItems" );
+  KPushButton *rm_all_custom =  new KPushButton( KGuiItem( i18n( "Remove All" ), "edit-delete" ), custom_rm, "CustomRemoveAllItems" );
 
   TQSpacerItem *spacer6 =        new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Preferred );
 
diff --git a/smb4k/configdlg/smb4ksuperuseroptions.cpp b/smb4k/configdlg/smb4ksuperuseroptions.cpp
index 924a8c0..388a9ed 100644
--- a/smb4k/configdlg/smb4ksuperuseroptions.cpp
+++ b/smb4k/configdlg/smb4ksuperuseroptions.cpp
@@ -64,7 +64,7 @@ Smb4KSuperUserOptions::Smb4KSuperUserOptions( TQWidget *parent, const char *name
   (void) new TQCheckBox( i18n( "Use super user privileges to mount and unmount shares" ), suid_actions, "kcfg_AlwaysUseSuperUser" );
 
   TQSpacerItem *spacer1 =        new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Preferred );
-  KGuiItem remove_item =        KGuiItem(  i18n( "Remove Entries" ), "editdelete",
+  KGuiItem remove_item =        KGuiItem(  i18n( "Remove Entries" ), "edit-delete",
                                 i18n( "Remove entries from the configuration file" ),
                                 i18n( "Depending on your choice under \"Programs\", all entries that were written by Smb4K will be removed either from /etc/super.tab or /etc/sudoers. Additionally, all your choices under \"Actions\" will be cleared." ) );
   KPushButton *remove =         new KPushButton( remove_item, this, "RemoveButton" );
diff --git a/smb4k/core/smb4khomesshareshandler.cpp b/smb4k/core/smb4khomesshareshandler.cpp
index 5148dbf..e8cefcc 100644
--- a/smb4k/core/smb4khomesshareshandler.cpp
+++ b/smb4k/core/smb4khomesshareshandler.cpp
@@ -71,7 +71,7 @@ const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWid
   TQString username = TQString();
 
   m_dlg = new KDialogBase( KDialogBase::Plain, i18n( "Specify User" ), KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, parent, name, true, true );
-  m_dlg->setButtonGuiItem( KDialogBase::User1, KGuiItem( i18n( "Clear List" ), "editdelete", 0, 0 ) );
+  m_dlg->setButtonGuiItem( KDialogBase::User1, KGuiItem( i18n( "Clear List" ), "edit-delete", 0, 0 ) );
   m_dlg->enableButton( KDialogBase::Ok, false );
   m_dlg->enableButton( KDialogBase::User1, false );
 
diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp
index 7a5ecbf..4551933 100644
--- a/smb4k/dialogs/smb4kbookmarkeditor.cpp
+++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp
@@ -73,7 +73,7 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
 
   (void) new TDEAction( i18n( "&Remove" ), "remove", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" );
 
-  (void) new TDEAction( i18n( "Remove &All" ), "editdelete", CTRL+Key_X, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" );
+  (void) new TDEAction( i18n( "Remove &All" ), "edit-delete", CTRL+Key_X, TQT_TQOBJECT(this), TQT_SLOT( slotDeleteAllClicked() ), m_collection, "remove_all_bookmarks" );
 
   slotLoadBookmarks();
 
diff --git a/smb4k/searchdlg/smb4ksearchdialog.cpp b/smb4k/searchdlg/smb4ksearchdialog.cpp
index e102bf7..4e4e2c1 100644
--- a/smb4k/searchdlg/smb4ksearchdialog.cpp
+++ b/smb4k/searchdlg/smb4ksearchdialog.cpp
@@ -55,7 +55,7 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *parent, const char *name )
   m_tool_bar->insertSeparator();
 
   m_tool_bar->insertButton( "edit-find", Search, false, i18n( "Search" ) );
-  m_tool_bar->insertButton( "editdelete", Clear, false, i18n( "Clear" ) );
+  m_tool_bar->insertButton( "edit-delete", Clear, false, i18n( "Clear" ) );
   m_tool_bar->insertButton( "button_ok", Add, false, i18n( "Add" ) );
 
   // List view