diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp
index 3025715..32fbda0 100644
--- a/src/collectionfieldsdialog.cpp
+++ b/src/collectionfieldsdialog.cpp
@@ -82,10 +82,10 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa
   TQHBox* hb1 = new TQHBox(fieldsGroup);
   hb1->setSpacing(KDialog::spacingHint());
   m_btnNew = new KPushButton(i18n("New Field", "&New"), hb1);
-  m_btnNew->setIconSet(BarIcon(TQString::fromLatin1("filenew"), TDEIcon::SizeSmall));
+  m_btnNew->setIconSet(BarIcon(TQString::fromLatin1("document-new"), TDEIcon::SizeSmall));
   TQWhatsThis::add(m_btnNew, i18n("Add a new field to the collection"));
   m_btnDelete = new KPushButton(i18n("Delete Field", "&Delete"), hb1);
-  m_btnDelete->setIconSet(BarIconSet(TQString::fromLatin1("editdelete"), TDEIcon::SizeSmall));
+  m_btnDelete->setIconSet(BarIconSet(TQString::fromLatin1("edit-delete"), TDEIcon::SizeSmall));
   TQWhatsThis::add(m_btnDelete, i18n("Remove a field from the collection"));
 
   connect(m_btnNew, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew()) );
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index f406c5f..4e961fd 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -526,7 +526,7 @@ void ConfigDialog::setupFetchPage() {
   // these icons are rather arbitrary, but seem to vaguely fit
   TQVBoxLayout* vlay = new TQVBoxLayout(l);
   KPushButton* newSourceBtn = new KPushButton(i18n("&New..."), frame);
-  newSourceBtn->setIconSet(SmallIconSet(TQString::fromLatin1("filenew")));
+  newSourceBtn->setIconSet(SmallIconSet(TQString::fromLatin1("document-new")));
   TQWhatsThis::add(newSourceBtn, i18n("Click to add a new data source."));
   m_modifySourceBtn = new KPushButton(i18n("&Modify..."), frame);
   m_modifySourceBtn->setIconSet(SmallIconSet(TQString::fromLatin1("network")));
diff --git a/src/controller.cpp b/src/controller.cpp
index d4a1599..904b124 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -432,7 +432,7 @@ void Controller::slotDeleteSelectedEntries() {
     TQString str = i18n("Do you really want to delete this entry?");
     TQString dontAsk = TQString::fromLatin1("DeleteEntry");
     int ret = KMessageBox::warningContinueCancel(Kernel::self()->widget(), str, i18n("Delete Entry"),
-                                                 KGuiItem(i18n("&Delete"), TQString::fromLatin1("editdelete")), dontAsk);
+                                                 KGuiItem(i18n("&Delete"), TQString::fromLatin1("edit-delete")), dontAsk);
     if(ret != KMessageBox::Continue) {
       m_working = false;
       return;
@@ -447,7 +447,7 @@ void Controller::slotDeleteSelectedEntries() {
     TQString dontAsk = TQString::fromLatin1("DeleteMultipleBooks");
     int ret = KMessageBox::warningContinueCancelList(Kernel::self()->widget(), str, names,
                                                      i18n("Delete Multiple Entries"),
-                                                     KGuiItem(i18n("&Delete"), TQString::fromLatin1("editdelete")), dontAsk);
+                                                     KGuiItem(i18n("&Delete"), TQString::fromLatin1("edit-delete")), dontAsk);
     if(ret != KMessageBox::Continue) {
       m_working = false;
       return;
diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp
index 2f60d9c..003dedb 100644
--- a/src/fetchdialog.cpp
+++ b/src/fetchdialog.cpp
@@ -607,7 +607,7 @@ void FetchDialog::slotEditMultipleISBN() {
   m_isbnTextEdit = new KTextEdit(box, "isbn text edit");
   m_isbnTextEdit->setText(m_isbnList.join(TQChar('\n')));
   TQWhatsThis::add(m_isbnTextEdit, s);
-  KPushButton* fromFileBtn = new KPushButton(SmallIconSet(TQString::fromLatin1("fileopen")),
+  KPushButton* fromFileBtn = new KPushButton(SmallIconSet(TQString::fromLatin1("document-open")),
                                              i18n("&Load From File..."), box);
   TQWhatsThis::add(fromFileBtn, i18n("<qt>Load the list from a text file.</qt>"));
   connect(fromFileBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotLoadISBNList()));
diff --git a/src/filterview.cpp b/src/filterview.cpp
index 5048f38..2e724e4 100644
--- a/src/filterview.cpp
+++ b/src/filterview.cpp
@@ -66,7 +66,7 @@ void FilterView::contextMenuRequested(TQListViewItem* item_, const TQPoint& poin
     TDEPopupMenu menu(this);
     menu.insertItem(SmallIconSet(TQString::fromLatin1("filter")),
                     i18n("Modify Filter"), this, TQT_SLOT(slotModifyFilter()));
-    menu.insertItem(SmallIconSet(TQString::fromLatin1("editdelete")),
+    menu.insertItem(SmallIconSet(TQString::fromLatin1("edit-delete")),
                     i18n("Delete Filter"), this, TQT_SLOT(slotDeleteFilter()));
     menu.exec(point_);
   }
diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp
index 85030d4..e580a8d 100644
--- a/src/gui/stringmapdialog.cpp
+++ b/src/gui/stringmapdialog.cpp
@@ -55,9 +55,9 @@ StringMapDialog::StringMapDialog(const TQMap<TQString, TQString>& map_, TQWidget
   KButtonBox* bb = new KButtonBox(box);
   bb->addStretch();
   TQPushButton* btn = bb->addButton(i18n("&Set"), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()));
-  btn->setIconSet(BarIcon(TQString::fromLatin1("filenew"), TDEIcon::SizeSmall));
+  btn->setIconSet(BarIcon(TQString::fromLatin1("document-new"), TDEIcon::SizeSmall));
   btn = bb->addButton(i18n("&Delete"), TQT_TQOBJECT(this), TQT_SLOT(slotDelete()));
-  btn->setIconSet(BarIcon(TQString::fromLatin1("editdelete"), TDEIcon::SizeSmall));
+  btn->setIconSet(BarIcon(TQString::fromLatin1("edit-delete"), TDEIcon::SizeSmall));
 
   l->addWidget(box);
   l->addStretch(1);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 54aac95..563fc1a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -188,8 +188,8 @@ void MainWindow::initActions() {
 
   TDEActionMenu* fileNewMenu = new TDEActionMenu(actionCollection(), "file_new_collection");
   fileNewMenu->setText(i18n("New"));
-//  fileNewMenu->setIconSet(BarIconSet(TQString::fromLatin1("filenew"))); // doesn't work
-  fileNewMenu->setIconSet(BarIcon(TQString::fromLatin1("filenew")));
+//  fileNewMenu->setIconSet(BarIconSet(TQString::fromLatin1("document-new"))); // doesn't work
+  fileNewMenu->setIconSet(BarIcon(TQString::fromLatin1("document-new")));
   fileNewMenu->setToolTip(i18n("Create a new collection"));
   fileNewMenu->setDelayed(false);
 
@@ -291,7 +291,7 @@ void MainWindow::initActions() {
 
   action = new TDEAction(actionCollection(), "new_custom_collection");
   action->setText(i18n("New C&ustom Collection"));
-  action->setIconSet(UserIconSet(TQString::fromLatin1("filenew")));
+  action->setIconSet(UserIconSet(TQString::fromLatin1("document-new")));
   action->setToolTip(i18n("Create a new custom collection"));
   fileNewMenu->insert(action);
   connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map()));
@@ -599,7 +599,7 @@ void MainWindow::initActions() {
   /*************************************************
    * Collection menu
    *************************************************/
-  m_newEntry = new TDEAction(i18n("&New Entry..."), TQString::fromLatin1("filenew"), CTRL + Key_N,
+  m_newEntry = new TDEAction(i18n("&New Entry..."), TQString::fromLatin1("document-new"), CTRL + Key_N,
                                TQT_TQOBJECT(this), TQT_SLOT(slotNewEntry()),
                                actionCollection(), "coll_new_entry");
   m_newEntry->setToolTip(i18n("Create a new entry"));
@@ -607,15 +607,15 @@ void MainWindow::initActions() {
                             TQT_TQOBJECT(this), TQT_SLOT(slotShowEntryEditor()),
                             actionCollection(), "coll_edit_entry");
   m_editEntry->setToolTip(i18n("Edit the selected entries"));
-  m_copyEntry = new TDEAction(i18n("D&uplicate Entry"), TQString::fromLatin1("editcopy"), CTRL + Key_Y,
+  m_copyEntry = new TDEAction(i18n("D&uplicate Entry"), TQString::fromLatin1("edit-copy"), CTRL + Key_Y,
                             Controller::self(), TQT_SLOT(slotCopySelectedEntries()),
                             actionCollection(), "coll_copy_entry");
   m_copyEntry->setToolTip(i18n("Copy the selected entries"));
-  m_deleteEntry = new TDEAction(i18n("&Delete Entry"), TQString::fromLatin1("editdelete"), CTRL + Key_D,
+  m_deleteEntry = new TDEAction(i18n("&Delete Entry"), TQString::fromLatin1("edit-delete"), CTRL + Key_D,
                               Controller::self(), TQT_SLOT(slotDeleteSelectedEntries()),
                               actionCollection(), "coll_delete_entry");
   m_deleteEntry->setToolTip(i18n("Delete the selected entries"));
-  m_mergeEntry = new TDEAction(i18n("&Merge Entries"), TQString::fromLatin1("editcopy"), CTRL + Key_G,
+  m_mergeEntry = new TDEAction(i18n("&Merge Entries"), TQString::fromLatin1("edit-copy"), CTRL + Key_G,
                               Controller::self(), TQT_SLOT(slotMergeSelectedEntries()),
                               actionCollection(), "coll_merge_entry");
   m_mergeEntry->setToolTip(i18n("Merge the selected entries"));
@@ -634,7 +634,7 @@ void MainWindow::initActions() {
                                actionCollection(), "coll_checkin");
   m_checkInEntry->setToolTip(i18n("Check-in the selected items"));
 
-  action = new TDEAction(i18n("&Rename Collection..."), TQString::fromLatin1("editclear"), CTRL + Key_R,
+  action = new TDEAction(i18n("&Rename Collection..."), TQString::fromLatin1("edit-clear"), CTRL + Key_R,
                        TQT_TQOBJECT(this), TQT_SLOT(slotRenameCollection()),
                        actionCollection(), "coll_rename_collection");
   action->setToolTip(i18n("Rename the collection"));
@@ -659,7 +659,7 @@ void MainWindow::initActions() {
   action = new TDEAction(actionCollection(), "cite_clipboard");
   action->setText(i18n("Copy Bibtex to Cli&pboard"));
   action->setToolTip(i18n("Copy bibtex citations to the clipboard"));
-  action->setIcon(TQString::fromLatin1("editpaste"));
+  action->setIcon(TQString::fromLatin1("edit-paste"));
   connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map()));
   citeMapper->setMapping(action, Cite::CiteClipboard);