diff --git a/bibletime/frontend/cmanageindiceswidget.cpp b/bibletime/frontend/cmanageindiceswidget.cpp
index 3bf855f..6157123 100644
--- a/bibletime/frontend/cmanageindiceswidget.cpp
+++ b/bibletime/frontend/cmanageindiceswidget.cpp
@@ -74,7 +74,7 @@ void CManageIndicesWidget::initView()
 	m_autoDeleteOrphanedIndicesBox->setChecked( CBTConfig::get( CBTConfig::autoDeleteOrphanedIndices ) );
 
 	// icons for our buttons
-	m_createIndicesButton->setIconSet(SmallIcon("folder_new", 16));
+	m_createIndicesButton->setIconSet(SmallIcon("folder-new", 16));
 	m_deleteIndicesButton->setIconSet(SmallIcon("remove", 16));
 
 	// connect our signals/slots
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
index ef2dbce..2b6c71d 100644
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -110,7 +110,7 @@ namespace BookshelfManager {
 		layout->addWidget(m_swordAddPathButton, 3,3);
 
 		m_swordRemovePathButton = new TQPushButton(i18n("Remove Entry"), page);
-		m_swordRemovePathButton->setIconSet(SmallIcon("editdelete", 16));
+		m_swordRemovePathButton->setIconSet(SmallIcon("edit-delete", 16));
 		connect(m_swordRemovePathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordRemoveClicked()));
 		layout->addWidget(m_swordRemovePathButton, 4,3);
 
@@ -161,7 +161,7 @@ the module remote installation feature!</b>")
 		layout->addWidget(deleteSourceButton, 2, 1, TQt::AlignLeft);
 
 		TQPushButton* addSourceButton = new TQPushButton(i18n("Add library"), m_installSourcePage);
-		addSourceButton->setIconSet(SmallIcon("folder_new", 16));
+		addSourceButton->setIconSet(SmallIcon("folder-new", 16));
 		connect(addSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installAddSource()));
 		layout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft);
 
diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp
index 12f5eb3..1460622 100644
--- a/bibletime/frontend/searchdialog/csearchanalysis.cpp
+++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp
@@ -83,7 +83,7 @@ void CSearchAnalysisDialog::initView() {
 	TQVBoxLayout* layout = new TQVBoxLayout(plainPage(),0);
 
 	TQPushButton* button = new TQPushButton(plainPage(), "button");
-	button->setIconSet(SmallIconSet("filesave"));
+	button->setIconSet(SmallIconSet("document-save"));
 	button->setText(i18n("Save search analysis as HTML"));
 	button->setFixedSize(button->sizeHint());
 	layout->addWidget(button);
diff --git a/bibletime/util/cresmgr.cpp b/bibletime/util/cresmgr.cpp
index 94dedbe..ef1c3d1 100644
--- a/bibletime/util/cresmgr.cpp
+++ b/bibletime/util/cresmgr.cpp
@@ -185,7 +185,7 @@ namespace CResMgr {
 			namespace closeAll {
 				TQString tooltip;
 
-				const TQString icon        = "fileclose";
+				const TQString icon        = "window-close";
 				const TDEShortcut accel     = TQt::CTRL + TQt::ALT + TQt::Key_W;
 				const char* actionName    = "windowCloseAll_action";
 			}
@@ -331,13 +331,13 @@ namespace CResMgr {
 
 
 				namespace copyMenu {
-					const TQString icon = "editcopy";
+					const TQString icon = "edit-copy";
 				}
 				namespace saveMenu {
-					const TQString icon = "filesave";
+					const TQString icon = "document-save";
 				}
 				namespace printMenu {
-					const TQString icon = "fileprint";
+					const TQString icon = "document-print";
 				}
 			}
 			namespace foundItems {
@@ -345,13 +345,13 @@ namespace CResMgr {
 
 
 				namespace copyMenu {
-					const TQString icon = "editcopy";
+					const TQString icon = "edit-copy";
 				}
 				namespace saveMenu {
-					const TQString icon = "filesave";
+					const TQString icon = "document-save";
 				}
 				namespace printMenu {
-					const TQString icon = "fileprint";
+					const TQString icon = "document-print";
 				}
 			}
 			namespace textPreview {
@@ -447,13 +447,13 @@ namespace CResMgr {
 			}
 
 			namespace copyMenu {
-				const TQString icon = "editcopy";
+				const TQString icon = "edit-copy";
 			}
 			namespace saveMenu {
-				const TQString icon = "filesave";
+				const TQString icon = "document-save";
 			}
 			namespace printMenu {
-				const TQString icon = "fileprint";
+				const TQString icon = "document-print";
 			}
 		}
 		namespace commentaryWindow {
@@ -478,13 +478,13 @@ namespace CResMgr {
 			}
 
 			namespace copyMenu {
-				const TQString icon = "editcopy";
+				const TQString icon = "edit-copy";
 			}
 			namespace saveMenu {
-				const TQString icon = "filesave";
+				const TQString icon = "document-save";
 			}
 			namespace printMenu {
-				const TQString icon = "fileprint";
+				const TQString icon = "document-print";
 			}
 		}
 		namespace bookWindow {
@@ -498,7 +498,7 @@ namespace CResMgr {
 			namespace saveText {
 				TQString tooltip;
 
-				const TQString icon      = "filesave";
+				const TQString icon      = "document-save";
 				const TDEShortcut accel   = KKeySequence();
 				const char* actionName  = "writeWindow_saveText";
 			}
@@ -512,7 +512,7 @@ namespace CResMgr {
 			namespace deleteEntry {
 				TQString tooltip;
 
-				const TQString icon      = "editdelete";
+				const TQString icon      = "edit-delete";
 				const TDEShortcut accel   = KKeySequence();
 				const char* actionName  = "writeWindow_deleteEntry";
 			}
@@ -673,7 +673,7 @@ namespace CResMgr {
 			const char* actionName    = "GMsearch_action";
 		}
 		namespace newFolder {
-			const TQString icon = "folder_new";
+			const TQString icon = "folder-new";
 		}
 		namespace changeFolder {
 			const TQString icon = "folder";
@@ -698,7 +698,7 @@ namespace CResMgr {
 			const TQString icon = "bookmark";
 		}
 		namespace printBookmarks {
-			const TQString icon = "fileprint";
+			const TQString icon = "document-print";
 		}
 		namespace deleteItems {
 			const TQString icon = "filedelete";