diff --git a/krename/ProgressDialog.cpp b/krename/ProgressDialog.cpp
index a7812aa..f254486 100644
--- a/krename/ProgressDialog.cpp
+++ b/krename/ProgressDialog.cpp
@@ -51,7 +51,7 @@ ProgressDialog::ProgressDialog( TQWidget* parent, const char* name, WFlags fl )
 
     resize( 400, 380 );
     setCaption( i18n("Progress") );
-    setIcon( BarIcon( "krename" ) );
+    setIcon( BarIcon( "edit_rename" ) );
 
     ProgressDialogLayout = new TQVBoxLayout( this, 11, 6 );
     Layout1 = new TQHBoxLayout( 0, 0, 6 );
diff --git a/krename/batchrenamer.cpp b/krename/batchrenamer.cpp
index bfebf35..06a83d3 100644
--- a/krename/batchrenamer.cpp
+++ b/krename/batchrenamer.cpp
@@ -336,7 +336,7 @@ void BatchRenamer::work( ProgressDialog* p )
         p->warning(i18n("%2 errors occurred!").arg(error));
 
     p->print(i18n("Elapsed time: %1 seconds").arg( t.elapsed()/1000 ), "kalarm");
-    p->print(i18n("KRename finished the renaming process."), "krename");
+    p->print(i18n("KRename finished the renaming process."), "edit_rename");
     p->print(i18n("Press close to quit!"));
     p->setRenamedFiles( renamedFiles, m_files.count() );
 
diff --git a/krename/confdialog.cpp b/krename/confdialog.cpp
index 07a7794..58497e0 100644
--- a/krename/confdialog.cpp
+++ b/krename/confdialog.cpp
@@ -72,7 +72,7 @@ void ConfDialog::setupTab1()
 void ConfDialog::setupTab2()
 {
     const TQString caption = i18n("KRename");
-    TQFrame* box = addPage( caption, caption, BarIcon("krename") );
+    TQFrame* box = addPage( caption, caption, BarIcon("edit_rename") );
     TQVBoxLayout* layout = new TQVBoxLayout( box );
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
diff --git a/krename/hi32-app-krename.png b/krename/hi32-app-krename.png
deleted file mode 100644
index 3aaa69a..0000000
Binary files a/krename/hi32-app-krename.png and /dev/null differ
diff --git a/krename/hi48-app-krename.png b/krename/hi48-app-krename.png
deleted file mode 100644
index fd25011..0000000
Binary files a/krename/hi48-app-krename.png and /dev/null differ
diff --git a/krename/krename.desktop b/krename/krename.desktop
index 4e3b029..0370015 100644
--- a/krename/krename.desktop
+++ b/krename/krename.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Exec=krename -caption "%c" %i %m %U
-Icon=krename
-MiniIcon=krename
+Icon=edit_rename
+MiniIcon=edit_rename
 X-DocPath=krename/index.html
 Comment=A batch renamer
 Terminal=false
diff --git a/krename/krename_dir.desktop b/krename/krename_dir.desktop
index 25757d4..6b43991 100644
--- a/krename/krename_dir.desktop
+++ b/krename/krename_dir.desktop
@@ -6,4 +6,4 @@ X-TDE-ServiceTypes=inode/directory
 [Desktop Action Rename]
 Exec=krename -r %U
 Name=Rename with KRename
-Icon=krename 
+Icon=edit_rename
diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp
index e62c81c..bf0e839 100644
--- a/krename/krenameimpl.cpp
+++ b/krename/krenameimpl.cpp
@@ -589,7 +589,7 @@ void KRenameImpl::setupFileTab1()
     help.append("[$dirname];;" + i18n("insert name of directory") );
     help.append("[$dirname.];;" + i18n("insert name of parent directory") );
     help.append("[#length-0];;" + i18n("insert the length of the input filename") );
-    helpDialogData->add( i18n("Built-in Functions:" ), &help, SmallIcon("krename"), true );
+    helpDialogData->add( i18n("Built-in Functions:" ), &help, SmallIcon("edit_rename"), true );
 
     help.clear();
     help.append( "\\$;;" + i18n("Insert '$'") );
@@ -601,7 +601,7 @@ void KRenameImpl::setupFileTab1()
     help.append( "\\[;;" + i18n("Insert '['") );
     help.append( "\\];;" + i18n("Insert ']'") );
     help.append( "\\#;;" + i18n("Insert '#'") );
-    helpDialogData->add( i18n("Special Characters:" ), &help, SmallIcon("krename") );
+    helpDialogData->add( i18n("Special Characters:" ), &help, SmallIcon("edit_rename") );
 
     /*
         //TODO: FIX this tooltip
diff --git a/krename/krenameservicemenu.desktop b/krename/krenameservicemenu.desktop
index d3a30df..7edb146 100644
--- a/krename/krenameservicemenu.desktop
+++ b/krename/krenameservicemenu.desktop
@@ -8,5 +8,5 @@ X-TDE-ExcludeServiceTypes=kdedevice/*
 [Desktop Action Rename]
 Name=Rename with KRename
 Exec=krename %F
-Icon=krename
+Icon=edit_rename
 
diff --git a/krename/lo16-app-krename.png b/krename/lo16-app-krename.png
deleted file mode 100644
index b1e3e93..0000000
Binary files a/krename/lo16-app-krename.png and /dev/null differ
diff --git a/krename/lo32-app-krename.png b/krename/lo32-app-krename.png
deleted file mode 100644
index 5c38249..0000000
Binary files a/krename/lo32-app-krename.png and /dev/null differ
diff --git a/krename/tabs.cpp b/krename/tabs.cpp
index 2cfbf3d..8d5aa72 100644
--- a/krename/tabs.cpp
+++ b/krename/tabs.cpp
@@ -36,7 +36,7 @@
 tabs::tabs(KRenameImpl* impl, TQRect r, TQWidget *parent, const char *name )
     : TQDialog(parent,name)
 {
-    setIcon( BarIcon( "krename" ) );
+    setIcon( BarIcon( "edit_rename" ) );
 
     TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 );
     TQHBoxLayout* buttons = new TQHBoxLayout( 0, 6, 6 );
diff --git a/krename/wizard.cpp b/krename/wizard.cpp
index 9796de4..c25fdba 100644
--- a/krename/wizard.cpp
+++ b/krename/wizard.cpp
@@ -37,7 +37,7 @@
 wizard::wizard( KRenameImpl* impl, TQRect r, TQWidget* parent,  const char* name )
     : KWizard( parent, name )
 {
-    setIcon( BarIcon( "krename" ) );
+    setIcon( BarIcon( "edit_rename" ) );
     menuBar = new KMenuBar(this);
 
     krename = impl ? impl : new KRenameImpl( this, menuBar, this->finishButton() );