[Basket-devel] [PATCH] Ran adapt-to-icon-spec.py.

[Kelvie W. <ke...@ie...>]

The version of the script is the version from:
svn://anonsvn.kde.org/home/kde/trunk/KDE/kdesdk@822619

It is likely that more substitutions will be added to that script later.
---
 src/backup.cpp          |    4 ++--
 src/basket.cpp          |   10 +++++-----
 src/basketlistview.cpp  |    2 +-
 src/basketstatusbar.cpp |    2 +-
 src/bnpview.cpp         |   46 +++++++++++++++++++++++-----------------------
 src/filter.cpp          |    2 +-
 src/htmlexporter.cpp    |    2 +-
 src/likeback.cpp        |    2 +-
 src/noteedit.cpp        |   12 ++++++------
 src/notefactory.cpp     |    4 ++--
 src/settings.cpp        |    2 +-
 src/tagsedit.cpp        |   20 ++++++++++----------
 12 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/backup.cpp b/src/backup.cpp
index dec8227..1555ac1 100644
--- a/src/backup.cpp
+++ b/src/backup.cpp
@@ -150,7 +150,7 @@ void BackupDialog::moveToAnotherFolder()
 					0,
 					"<qt>" + i18n("The folder <b>%1</b> is not empty. Do you want to override it?").arg(folder),
 					i18n("Override Folder?"),
-					KGuiItem(i18n("&Override"), "filesave")
+					KGuiItem(i18n("&Override"), "document-save")
 				);
 				if (result == KMessageBox::No)
 					return;
@@ -201,7 +201,7 @@ void BackupDialog::backup()
 				"<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?")
 					.arg(KUrl(destination).fileName()),
 				i18n("Override File?"),
-				KGuiItem(i18n("&Override"), "filesave")
+				KGuiItem(i18n("&Override"), "document-save")
 			);
 			if (result == KMessageBox::Cancel)
 				return;
diff --git a/src/basket.cpp b/src/basket.cpp
index 5e0c0c9..8a3d251 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -3433,10 +3433,10 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
 	KMenu menu(this);
 	if (tag->countStates() == 1) {
 		menu.addTitle(/*SmallIcon(state->icon()), */tag->name());
-		menu.insertItem( SmallIconSet("editdelete"), i18n("&Remove"),             1 );
+		menu.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"),             1 );
 		menu.insertItem( SmallIconSet("configure"),  i18n("&Customize..."),       2 );
 		menu.insertSeparator();
-		menu.insertItem( SmallIconSet("filter"),     i18n("&Filter by this Tag"), 3 );
+		menu.insertItem( SmallIconSet("search-filter"),     i18n("&Filter by this Tag"), 3 );
 	} else {
 		menu.addTitle(tag->name());
 		Q3ValueList<State*>::iterator it;
@@ -3463,7 +3463,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
 		}
 		menu.insertSeparator();
 		KAction *act = new KAction(&menu);
-        act->setIcon(KIcon("editdelete"));
+        act->setIcon(KIcon("edit-delete"));
         act->setText(i18n("&Remove"));
         act->setShortcut(sequenceOnDelete ? sequence : QKeySequence());
 		menu.addAction(act);
@@ -3476,12 +3476,12 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
 		menu.insertSeparator();
 
 		menu.addAction(new KAction(
-				   KIcon("filter"),
+				   KIcon("search-filter"),
 				   i18n("&Filter by this Tag"),
 				   &menu)
 		    );
 		menu.addAction(new KAction(
-				   KIcon("filter"),
+				   KIcon("search-filter"),
 				   i18n("Filter by this &State"),
 				   &menu)
 		    );
diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp
index 8c451b1..2913194 100644
--- a/src/basketlistview.cpp
+++ b/src/basketlistview.cpp
@@ -592,7 +592,7 @@ void BasketListViewItem::paintCell(QPainter *painter, const QColorGroup &/*color
 	}
 	if (showLoadingIcon) {
 		QPixmap icon = KIconLoader::global()->loadIcon(
-            "find", KIconLoader::NoGroup, 16, KIconLoader::DefaultState,
+            "edit-find", KIconLoader::NoGroup, 16, KIconLoader::DefaultState,
             QStringList(), 0L, /*canReturnNull=*/false
             );
 		thePainter.drawPixmap(effectiveWidth, 0, icon);
diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp
index 14c5421..89ba950 100644
--- a/src/basketstatusbar.cpp
+++ b/src/basketstatusbar.cpp
@@ -88,7 +88,7 @@ void BasketStatusBar::setupStatusBar()
 //	addWidget( m_lockStatus, 0, true );
     m_lockStatus->installEventFilter(this);
 
-	m_savedStatusPixmap = SmallIcon("filesave");
+	m_savedStatusPixmap = SmallIcon("document-save");
 	m_savedStatus = new QLabel(parent);
 	m_savedStatus->setPixmap(m_savedStatusPixmap);
 	m_savedStatus->setFixedSize(m_savedStatus->sizeHint());
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index 1dad00d..4b07273 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -567,7 +567,7 @@ void BNPView::setupActions()
 
     a = ac->addAction("edit_delete", this, SLOT(delNote()));
     a->setText(i18n("D&elete"));
-    a->setIcon(KIcon("editdelete"));
+    a->setIcon(KIcon("edit-delete"));
     a->setShortcut(KShortcut("Delete"));
     m_actDelNote = a;
 
@@ -601,7 +601,7 @@ void BNPView::setupActions()
 
     m_actOpenNote = ac->addAction(KStandardAction::Open, "note_open",
 				  this, SLOT(openNote()));
-    m_actOpenNote->setIcon(KIcon("window_new"));
+    m_actOpenNote->setIcon(KIcon("window-new"));
     m_actOpenNote->setText(i18n("&Open"));
     m_actOpenNote->setShortcut(KShortcut("F9"));
 
@@ -629,25 +629,25 @@ void BNPView::setupActions()
 
     a = ac->addAction("note_move_top", this, SLOT(moveOnTop()));
     a->setText(i18n("Move on &Top"));
-    a->setIcon(KIcon("2uparrow"));
+    a->setIcon(KIcon("arrow-up-double"));
     a->setShortcut(KShortcut("Ctrl+Shift+Home"));
     m_actMoveOnTop = a;
 
     a = ac->addAction("note_move_up", this, SLOT(moveNoteUp()));
     a->setText(i18n("Move &Up"));
-    a->setIcon(KIcon("1uparrow"));
+    a->setIcon(KIcon("arrow-up"));
     a->setShortcut(KShortcut("Ctrl+Shift+Up"));
     m_actMoveNoteUp = a;
 
     a = ac->addAction("note_move_down", this, SLOT(moveNoteDown()));
     a->setText(i18n("Move &Down"));
-    a->setIcon(KIcon("1downarrow"));
+    a->setIcon(KIcon("arrow-down"));
     a->setShortcut(KShortcut("Ctrl+Shift+Down"));
     m_actMoveNoteDown = a;
 
     a = ac->addAction("note_move_bottom", this, SLOT(moveOnBottom()));
     a->setText(i18n("Move on &Bottom"));
-    a->setIcon(KIcon("2downarrow"));
+    a->setIcon(KIcon("arrow-down-double"));
     a->setShortcut(KShortcut("Ctrl+Shift+End"));
     m_actMoveOnBottom = a;
 
@@ -708,7 +708,7 @@ void BNPView::setupActions()
 
     a = ac->addAction("insert_from_file");
     a->setText(i18n("Load From &File..."));
-    a->setIcon(KIcon("fileimport"));
+    a->setIcon(KIcon("document-import"));
     m_actLoadFile = a;
 
 //	connect( m_actInsertText,     SIGNAL(activated()), insertEmptyMapper, SLOT(map()) );
@@ -779,7 +779,7 @@ void BNPView::setupActions()
 
     a = ac->addAction("basket_new", this, SLOT(askNewBasket()));
     a->setText(i18n("&New Basket..."));
-    a->setIcon(KIcon((runInsideKontact ? "basket" : "filenew")));
+    a->setIcon(KIcon((runInsideKontact ? "basket" : "document-new")));
     a->setShortcut(KStandardShortcut::shortcut(KStandardShortcut::New));
     actNewBasket = a;
 
@@ -793,7 +793,7 @@ void BNPView::setupActions()
     actNewSiblingBasket = a;
 
     KActionMenu *newBasketMenu = new KActionMenu(i18n("&New"), ac);
-    newBasketMenu->setIcon(KIcon("filenew"));
+    newBasketMenu->setIcon(KIcon("document-new"));
     ac->addAction("basket_new_menu", newBasketMenu);
 
     newBasketMenu->addAction(actNewBasket);
@@ -834,7 +834,7 @@ void BNPView::setupActions()
     KToggleAction *toggleAct = NULL;
     toggleAct = new KToggleAction(i18n("&Filter"), ac);
     ac->addAction("edit_filter", toggleAct);
-    toggleAct->setIcon(KIcon("filter"));
+    toggleAct->setIcon(KIcon("search-filter"));
     toggleAct->setShortcut(KStandardShortcut::shortcut(KStandardShortcut::Find));
     m_actShowFilter = toggleAct;
 
@@ -844,7 +844,7 @@ void BNPView::setupActions()
     toggleAct = new KToggleAction(ac);
     ac->addAction("edit_filter_all_baskets", toggleAct);
     toggleAct->setText(i18n("Filter all &Baskets"));
-    toggleAct->setIcon(KIcon("find"));
+    toggleAct->setIcon(KIcon("edit-find"));
     toggleAct->setShortcut(KShortcut("Ctrl+Shift+F"));
     m_actFilterAllBaskets = toggleAct;
 
@@ -861,25 +861,25 @@ void BNPView::setupActions()
 
     a = ac->addAction("go_basket_previous", this, SLOT(goToPreviousBasket()));
     a->setText(i18n( "&Previous Basket" ));
-    a->setIcon(KIcon("up"));
+    a->setIcon(KIcon("go-up"));
     a->setShortcut(KShortcut("Alt+Up"));
     m_actPreviousBasket = a;
 
     a = ac->addAction("go_basket_next", this, SLOT(goToNextBasket()));
     a->setText(i18n( "&Next Basket" ));
-    a->setIcon(KIcon("down"));
+    a->setIcon(KIcon("go-down"));
     a->setShortcut(KShortcut("Alt+Down"));
     m_actNextBasket = a;
 
     a = ac->addAction("go_basket_fold", this, SLOT(foldBasket()));
     a->setText(i18n( "&Fold Basket" ));
-    a->setIcon(KIcon("back"));
+    a->setIcon(KIcon("go-previous"));
     a->setShortcut(KShortcut("Alt+Left"));
     m_actFoldBasket = a;
 
     a = ac->addAction("go_basket_expand", this, SLOT(expandBasket()));
     a->setText(i18n( "&Expand Basket" ));
-    a->setIcon(KIcon("forward"));
+    a->setIcon(KIcon("go-next"));
     a->setShortcut(KShortcut("Alt+Right"));
     m_actExpandBasket = a;
 
@@ -887,7 +887,7 @@ void BNPView::setupActions()
    // FOR_BETA_PURPOSE:
     a = ac->addAction("beta_convert_texts", this, SLOT(convertTexts()));
     a->setText(i18n("Convert text notes to rich text notes"));
-    a->setIcon(KIcon("compfile"));
+    a->setIcon(KIcon("run-build-file"));
     m_convertTexts = a;
 #endif
 
@@ -1709,7 +1709,7 @@ void BNPView::updateNotesActions()
 }
 } else if (m_type != Color) {
 	popupMenu->insertSeparator();
-	popupMenu->insertItem( SmallIconSet("filesaveas"), i18n("&Save a copy as..."), this, SLOT(slotSaveAs()), 0, 10 );
+	popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save a copy as..."), this, SLOT(slotSaveAs()), 0, 10 );
 }*/
 }
 
@@ -2005,7 +2005,7 @@ void BNPView::delBasket()
 													 .arg(Tools::textToHTMLWithoutP(basket->basketName())),
 											 i18n("Remove Basket")
 #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x
-													 , KGuiItem(i18n("&Remove Basket"), "editdelete"), KStandardGuiItem::cancel());
+													 , KGuiItem(i18n("&Remove Basket"), "edit-delete"), KStandardGuiItem::cancel());
 #else
 		                    );
 #endif
@@ -2021,7 +2021,7 @@ void BNPView::delBasket()
 				basketsList,
 				i18n("Remove Children Baskets")
 #if KDE_IS_VERSION( 3, 2, 90 ) // KDE 3.3.x
-						, KGuiItem(i18n("&Remove Children Baskets"), "editdelete"));
+						, KGuiItem(i18n("&Remove Children Baskets"), "edit-delete"));
 #else
 		);
 #endif
@@ -2104,7 +2104,7 @@ void BNPView::saveAsArchive()
 				"<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?")
 					.arg(KUrl(destination).fileName()),
 				i18n("Override File?"),
-				KGuiItem(i18n("&Override"), "filesave")
+				KGuiItem(i18n("&Override"), "document-save")
 			);
 			if (result == KMessageBox::Cancel)
 				return;
@@ -2653,13 +2653,13 @@ void BNPView::populateTagsMenu(KMenu &menu, Note *referenceNote)
 	}
 
 	menu.insertSeparator();
-//	menu.insertItem( /*SmallIconSet("editdelete"),*/ "&Assign new Tag...", 1 );
-	//id = menu.insertItem( SmallIconSet("editdelete"), "&Remove All", -2 );
+//	menu.insertItem( /*SmallIconSet("edit-delete"),*/ "&Assign new Tag...", 1 );
+	//id = menu.insertItem( SmallIconSet("edit-delete"), "&Remove All", -2 );
 	//if (referenceNote->states().isEmpty())
 	//	menu.setItemEnabled(id, false);
 //	menu.insertItem( SmallIconSet("configure"),  "&Customize...", 3 );
 	menu.addAction( new KAction(i18n("&Assign new Tag..."), &menu));
-	menu.addAction( new KAction(KIcon("editdelete"), i18n("&Remove All"), &menu));
+	menu.addAction( new KAction(KIcon("edit-delete"), i18n("&Remove All"), &menu));
 	menu.addAction( new KAction(KIcon("configure"), i18n("&Customize..."), &menu));
 
 	menu.setItemEnabled(1, enable);
diff --git a/src/filter.cpp b/src/filter.cpp
index 2960876..da66781 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -54,7 +54,7 @@ FilterBar::FilterBar(QWidget *parent, const char *name)
 
 	// Create every widgets:
 	QIcon resetIconSet = KIconLoader::global()->loadIconSet("locationbar_erase", KIconLoader::Toolbar);
-	QIcon inAllIconSet = KIconLoader::global()->loadIconSet("find",              KIconLoader::Toolbar);
+	QIcon inAllIconSet = KIconLoader::global()->loadIconSet("edit-find",              KIconLoader::Toolbar);
 
 
 	m_resetButton        = new QToolButton(this);
diff --git a/src/htmlexporter.cpp b/src/htmlexporter.cpp
index 24bf455..2f503a8 100644
--- a/src/htmlexporter.cpp
+++ b/src/htmlexporter.cpp
@@ -72,7 +72,7 @@ HTMLExporter::HTMLExporter(Basket *basket)
 				"<qt>" + i18n("The file <b>%1</b> already exists. Do you really want to override it?")
 					.arg(KUrl(destination).fileName()),
 				i18n("Override File?"),
-				KGuiItem(i18n("&Override"), "filesave")
+				KGuiItem(i18n("&Override"), "document-save")
 			);
 			if (result == KMessageBox::Cancel)
 				return;
diff --git a/src/likeback.cpp b/src/likeback.cpp
index 6815083..0c2c23c 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -752,7 +752,7 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const QString &initialCo
 	enableButtonOk(false);
 	connect( m_comment, SIGNAL(textChanged()), this, SLOT(commentChanged()) );
 
-	setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail_generic"));
+	setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail"));
 
 	resize(QSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(sizeHint()));
 
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 47f30ac..115de0f 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -856,21 +856,21 @@ void InlineEditors::initToolBars(KActionCollection *ac)
 	ta = new KToggleAction(ac);
 	ac->addAction("richtext_bold", ta);
 	ta->setText(i18n("Bold"));
-	ta->setIcon(KIcon("text_bold"));
+	ta->setIcon(KIcon("format-text-bold"));
 	ta->setShortcut(KShortcut("Ctrl+B"));
 	richTextBold = ta;
 
 	ta = new KToggleAction(ac);
 	ac->addAction("richtext_italic", ta);
 	ta->setText(i18n("Italic"));
-	ta->setIcon(KIcon("text_italic"));
+	ta->setIcon(KIcon("format-text-italic"));
 	ta->setShortcut(KShortcut("Ctrl+I"));
 	richTextItalic = ta;
 
 	ta = new KToggleAction(ac);
 	ac->addAction("richtext_underline", ta);
 	ta->setText(i18n("Underline"));
-	ta->setIcon(KIcon("text_under"));
+	ta->setIcon(KIcon("format-text-underline"));
 	ta->setShortcut(KShortcut("Ctrl+U"));
 	richTextUnderline = ta;
 
@@ -910,7 +910,7 @@ void InlineEditors::initToolBars(KActionCollection *ac)
 	ta = new KToggleAction(ac);
 	ac->addAction("richtext_block", ta);
 	ta->setText(i18n("Justified"));
-	ta->setIcon(KIcon("text_block"));
+	ta->setIcon(KIcon("format-justify-fill"));
 	richTextJustified = ta;
 
 	QActionGroup *alignmentGroup = new QActionGroup(this);
@@ -922,14 +922,14 @@ void InlineEditors::initToolBars(KActionCollection *ac)
 	ta = new KToggleAction(ac);
 	ac->addAction("richtext_undo", ta);
 	ta->setText(i18n("Undo"));
-	ta->setIcon(KIcon("undo"));
+	ta->setIcon(KIcon("edit-undo"));
 	ta->setShortcut(KShortcut(""));
 	richTextUndo = ta;
 
 	ta = new KToggleAction(ac);
 	ac->addAction("richtext_redo", ta);
 	ta->setText(i18n("Redo"));
-	ta->setIcon(KIcon("redo"));
+	ta->setIcon(KIcon("edit-redo"));
 	richTextRedo = ta;
 
 	disableRichTextToolBar();
diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index 9be603a..bb64b7e 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -506,10 +506,10 @@ Note* NoteFactory::dropURLs(KUrl::List urls, Basket *parent, QDropEvent::Action
 			if (shouldAsk) {
 				KMenu menu(parent);
 				QList<QAction *> actList;
-				actList << new KAction(KIcon("goto"),
+				actList << new KAction(KIcon("go-jump"),
 						       i18n("&Move Here\tShift"),
 						       &menu)
-					<< new KAction(KIcon("editcopy"),
+					<< new KAction(KIcon("edit-copy"),
 						       i18n("&Copy Here\tCtrl"),
 						       &menu)
 					<< new KAction(KIcon("www"),
diff --git a/src/settings.cpp b/src/settings.cpp
index 14af088..ee9cae8 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -798,7 +798,7 @@ NotesAppearancePage::NotesAppearancePage(QWidget * parent, const char * name)
 
 	m_soundLook       = new LinkLookEditWidget(this, i18n("Conference audio record"),                         "sound",       tabs);
 	m_fileLook        = new LinkLookEditWidget(this, i18n("Annual report"),                                   "document",    tabs);
-	m_localLinkLook   = new LinkLookEditWidget(this, i18n("Home folder"),                                     "folder_home", tabs);
+	m_localLinkLook   = new LinkLookEditWidget(this, i18n("Home folder"),                                     "user-home", tabs);
 	m_networkLinkLook = new LinkLookEditWidget(this, "www.kde.org",             KMimeType::iconNameForUrl(KUrl("http://www.kde.org")), tabs);
 	m_launcherLook    = new LinkLookEditWidget(this, i18n("Launch %1").arg(KGlobal::mainComponent().aboutData()->programName()), "basket",      tabs);
 	tabs->addTab(m_soundLook,       i18n("&Sounds")       );
diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
index 2ea8b31..199a855 100644
--- a/src/tagsedit.cpp
+++ b/src/tagsedit.cpp
@@ -364,9 +364,9 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT
 	m_tags->setSorting(-1); // Sort column -1, so disabled sorting
 	m_tags->setResizeMode(Q3ListView::LastColumn);
 
-	m_moveUp    = new KPushButton( KGuiItem("", "1uparrow"),   mainWidget() );
-	m_moveDown  = new KPushButton( KGuiItem("", "1downarrow"), mainWidget() );
-	m_deleteTag = new KPushButton( KGuiItem("", "editdelete"), mainWidget() );
+	m_moveUp    = new KPushButton( KGuiItem("", "arrow-up"),   mainWidget() );
+	m_moveDown  = new KPushButton( KGuiItem("", "arrow-down"), mainWidget() );
+	m_deleteTag = new KPushButton( KGuiItem("", "edit-delete"), mainWidget() );
 
 	QToolTip::add( m_moveUp,    i18n("Move Up (Ctrl+Shift+Up)")     );
 	QToolTip::add( m_moveDown,  i18n("Move Down (Ctrl+Shift+Down)") );
@@ -426,7 +426,7 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT
 	m_emblem = new KIconButton(emblemWidget);
 	m_emblem->setIconType(KIconLoader::NoGroup, KIconLoader::Action);
 	m_emblem->setIconSize(16);
-	m_emblem->setIcon("editdelete");
+	m_emblem->setIcon("edit-delete");
 	m_removeEmblem = new QPushButton(i18nc("Remove tag emblem", "Remo&ve"), emblemWidget);
 	QLabel *emblemLabel = new QLabel(m_emblem, i18n("&Emblem:"), stateWidget);
 	connect( m_removeEmblem, SIGNAL(clicked()), this, SLOT(removeEmblem()) ); // m_emblem.resetIcon() is not a slot!
@@ -450,26 +450,26 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT
 	backgroundColorLayout->addWidget(m_backgroundColor);
 	backgroundColorLayout->addStretch();
 
-	QIcon boldIconSet = KIconLoader::global()->loadIconSet("text_bold", KIconLoader::Small);
+	QIcon boldIconSet = KIconLoader::global()->loadIconSet("format-text-bold", KIconLoader::Small);
 	m_bold = new QPushButton(boldIconSet, "", stateWidget);
 	m_bold->setToggleButton(true);
 	int size = qMax(m_bold->sizeHint().width(), m_bold->sizeHint().height());
 	m_bold->setFixedSize(size, size); // Make it square!
 	QToolTip::add(m_bold, i18n("Bold"));
 
-	QIcon underlineIconSet = KIconLoader::global()->loadIconSet("text_under", KIconLoader::Small);
+	QIcon underlineIconSet = KIconLoader::global()->loadIconSet("format-text-underline", KIconLoader::Small);
 	m_underline = new QPushButton(underlineIconSet, "", stateWidget);
 	m_underline->setToggleButton(true);
 	m_underline->setFixedSize(size, size); // Make it square!
 	QToolTip::add(m_underline, i18n("Underline"));
 
-	QIcon italicIconSet = KIconLoader::global()->loadIconSet("text_italic", KIconLoader::Small);
+	QIcon italicIconSet = KIconLoader::global()->loadIconSet("format-text-italic", KIconLoader::Small);
 	m_italic = new QPushButton(italicIconSet, "", stateWidget);
 	m_italic->setToggleButton(true);
 	m_italic->setFixedSize(size, size); // Make it square!
 	QToolTip::add(m_italic, i18n("Italic"));
 
-	QIcon strikeIconSet = KIconLoader::global()->loadIconSet("text_strike", KIconLoader::Small);
+	QIcon strikeIconSet = KIconLoader::global()->loadIconSet("format-text-strikethrough", KIconLoader::Small);
 	m_strike = new QPushButton(strikeIconSet, "", stateWidget);
 	m_strike->setToggleButton(true);
 	m_strike->setFixedSize(size, size); // Make it square!
@@ -921,14 +921,14 @@ void TagsEditDialog::deleteTag()
 			this,
 			i18n("Deleting the tag will remove it from every note it is currently assigned to."),
 			i18n("Confirm Delete Tag"),
-			KGuiItem(i18n("Delete Tag"), "editdelete")
+			KGuiItem(i18n("Delete Tag"), "edit-delete")
 		);
 	else if (item->stateCopy() && item->stateCopy()->oldState)
 		result = KMessageBox::warningContinueCancel(
 			this,
 			i18n("Deleting the state will remove the tag from every note the state is currently assigned to."),
 			i18n("Confirm Delete State"),
-			KGuiItem(i18n("Delete State"), "editdelete")
+			KGuiItem(i18n("Delete State"), "edit-delete")
 		);
 	if (result != KMessageBox::Continue)
 		return;
-- 
1.5.6.GIT