33 files changed, 10 insertions, 10 deletions

diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 7488fec05..f81b8eb0d 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -522,7 +522,7 @@ TQPixmap KateDocument::configPagePixmap (uint number, int size) const
       return BarIcon("edit", size);
 
     case 4:
-      return BarIcon("rightjust", size);
+      return BarIcon("format-justify-right", size);
 
     case 5:
       return BarIcon("document-save", size);
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 5b71c92e8..f7977fac6 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -1051,10 +1051,10 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults )
 {
   setSorting( -1 ); // disable sorting, let the styles appear in their defined order
   addColumn( i18n("Context") );
-  addColumn( SmallIconSet("text_bold"), TQString::null );
-  addColumn( SmallIconSet("text_italic"), TQString::null );
-  addColumn( SmallIconSet("text_under"), TQString::null );
-  addColumn( SmallIconSet("text_strike"), TQString::null );
+  addColumn( SmallIconSet("format-text-bold"), TQString::null );
+  addColumn( SmallIconSet("format-text-italic"), TQString::null );
+  addColumn( SmallIconSet("format-text-underline"), TQString::null );
+  addColumn( SmallIconSet("format-text-strikethrough"), TQString::null );
   addColumn( i18n("Normal") );
   addColumn( i18n("Selected") );
   addColumn( i18n("Background") );
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index 494e52894..e68008470 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -54,10 +54,10 @@ KateSpell::~KateSpell()
 void KateSpell::createActions( TDEActionCollection* ac )
 {
    KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac );
-   TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "spellcheck", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
+   TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
    a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward"));
 
-   m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "spellcheck", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
+   m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
    m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text"));
 }
 
diff --git a/pics/crystalsvg/cr16-action-text_bold.png b/pics/crystalsvg/cr16-action-format-text-bold.png
index f64f38bc0..f64f38bc0 100644
--- a/pics/crystalsvg/cr16-action-text_bold.png
+++ b/pics/crystalsvg/cr16-action-format-text-bold.png
diff --git a/pics/crystalsvg/cr16-action-text_left.png b/pics/crystalsvg/cr16-action-format-text-direction-ltr.png
index 3d39abd15..3d39abd15 100644
--- a/pics/crystalsvg/cr16-action-text_left.png
+++ b/pics/crystalsvg/cr16-action-format-text-direction-ltr.png
diff --git a/pics/crystalsvg/cr16-action-text_right.png b/pics/crystalsvg/cr16-action-format-text-direction-rtl.png
index 75843f67a..75843f67a 100644
--- a/pics/crystalsvg/cr16-action-text_right.png
+++ b/pics/crystalsvg/cr16-action-format-text-direction-rtl.png
diff --git a/pics/crystalsvg/cr16-action-text_italic.png b/pics/crystalsvg/cr16-action-format-text-italic.png
index 8f825f961..8f825f961 100644
--- a/pics/crystalsvg/cr16-action-text_italic.png
+++ b/pics/crystalsvg/cr16-action-format-text-italic.png
diff --git a/pics/crystalsvg/cr16-action-text_strike.png b/pics/crystalsvg/cr16-action-format-text-strikethrough.png
index 0d5a9649d..0d5a9649d 100644
--- a/pics/crystalsvg/cr16-action-text_strike.png
+++ b/pics/crystalsvg/cr16-action-format-text-strikethrough.png
diff --git a/pics/crystalsvg/cr16-action-text_under.png b/pics/crystalsvg/cr16-action-format-text-underline.png
index 50944345e..50944345e 100644
--- a/pics/crystalsvg/cr16-action-text_under.png
+++ b/pics/crystalsvg/cr16-action-format-text-underline.png
diff --git a/pics/crystalsvg/cr16-action-spellcheck.png b/pics/crystalsvg/cr16-action-tools-check-spelling.png
index 6303389b4..6303389b4 100644
--- a/pics/crystalsvg/cr16-action-spellcheck.png
+++ b/pics/crystalsvg/cr16-action-tools-check-spelling.png
diff --git a/pics/crystalsvg/cr22-action-centrejust.png b/pics/crystalsvg/cr22-action-format-justify-center.png
index e10ef8dba..e10ef8dba 100644
--- a/pics/crystalsvg/cr22-action-centrejust.png
+++ b/pics/crystalsvg/cr22-action-format-justify-center.png
diff --git a/pics/crystalsvg/cr22-action-leftjust.png b/pics/crystalsvg/cr22-action-format-justify-left.png
index 8f17d4eac..8f17d4eac 100644
--- a/pics/crystalsvg/cr22-action-leftjust.png
+++ b/pics/crystalsvg/cr22-action-format-justify-left.png
diff --git a/pics/crystalsvg/cr22-action-rightjust.png b/pics/crystalsvg/cr22-action-format-justify-right.png
index cc3a9e6d4..cc3a9e6d4 100644
--- a/pics/crystalsvg/cr22-action-rightjust.png
+++ b/pics/crystalsvg/cr22-action-format-justify-right.png
diff --git a/pics/crystalsvg/cr22-action-text_bold.png b/pics/crystalsvg/cr22-action-format-text-bold.png
index 19dc64597..19dc64597 100644
--- a/pics/crystalsvg/cr22-action-text_bold.png
+++ b/pics/crystalsvg/cr22-action-format-text-bold.png
diff --git a/pics/crystalsvg/cr22-action-text_left.png b/pics/crystalsvg/cr22-action-format-text-direction-ltr.png
index 88c7c7e1d..88c7c7e1d 100644
--- a/pics/crystalsvg/cr22-action-text_left.png
+++ b/pics/crystalsvg/cr22-action-format-text-direction-ltr.png
diff --git a/pics/crystalsvg/cr22-action-text_right.png b/pics/crystalsvg/cr22-action-format-text-direction-rtl.png
index 7fea4e560..7fea4e560 100644
--- a/pics/crystalsvg/cr22-action-text_right.png
+++ b/pics/crystalsvg/cr22-action-format-text-direction-rtl.png
diff --git a/pics/crystalsvg/cr22-action-text_italic.png b/pics/crystalsvg/cr22-action-format-text-italic.png
index d21986da5..d21986da5 100644
--- a/pics/crystalsvg/cr22-action-text_italic.png
+++ b/pics/crystalsvg/cr22-action-format-text-italic.png
diff --git a/pics/crystalsvg/cr22-action-text_strike.png b/pics/crystalsvg/cr22-action-format-text-strikethrough.png
index 81a4cf93a..81a4cf93a 100644
--- a/pics/crystalsvg/cr22-action-text_strike.png
+++ b/pics/crystalsvg/cr22-action-format-text-strikethrough.png
diff --git a/pics/crystalsvg/cr22-action-text_under.png b/pics/crystalsvg/cr22-action-format-text-underline.png
index 8fccad370..8fccad370 100644
--- a/pics/crystalsvg/cr22-action-text_under.png
+++ b/pics/crystalsvg/cr22-action-format-text-underline.png
diff --git a/pics/crystalsvg/cr22-action-spellcheck.png b/pics/crystalsvg/cr22-action-tools-check-spelling.png
index b6ef313a8..b6ef313a8 100644
--- a/pics/crystalsvg/cr22-action-spellcheck.png
+++ b/pics/crystalsvg/cr22-action-tools-check-spelling.png
diff --git a/pics/crystalsvg/cr32-action-centrejust.png b/pics/crystalsvg/cr32-action-format-justify-center.png
index 6613559d1..6613559d1 100644
--- a/pics/crystalsvg/cr32-action-centrejust.png
+++ b/pics/crystalsvg/cr32-action-format-justify-center.png
diff --git a/pics/crystalsvg/cr32-action-leftjust.png b/pics/crystalsvg/cr32-action-format-justify-left.png
index def6784db..def6784db 100644
--- a/pics/crystalsvg/cr32-action-leftjust.png
+++ b/pics/crystalsvg/cr32-action-format-justify-left.png
diff --git a/pics/crystalsvg/cr32-action-rightjust.png b/pics/crystalsvg/cr32-action-format-justify-right.png
index 968cc1ce7..968cc1ce7 100644
--- a/pics/crystalsvg/cr32-action-rightjust.png
+++ b/pics/crystalsvg/cr32-action-format-justify-right.png
diff --git a/pics/crystalsvg/cr32-action-text_bold.png b/pics/crystalsvg/cr32-action-format-text-bold.png
index 7984923fe..7984923fe 100644
--- a/pics/crystalsvg/cr32-action-text_bold.png
+++ b/pics/crystalsvg/cr32-action-format-text-bold.png
diff --git a/pics/crystalsvg/cr32-action-text_left.png b/pics/crystalsvg/cr32-action-format-text-direction-ltr.png
index 54d22a3a0..54d22a3a0 100644
--- a/pics/crystalsvg/cr32-action-text_left.png
+++ b/pics/crystalsvg/cr32-action-format-text-direction-ltr.png
diff --git a/pics/crystalsvg/cr32-action-text_right.png b/pics/crystalsvg/cr32-action-format-text-direction-rtl.png
index 20dba5b8e..20dba5b8e 100644
--- a/pics/crystalsvg/cr32-action-text_right.png
+++ b/pics/crystalsvg/cr32-action-format-text-direction-rtl.png
diff --git a/pics/crystalsvg/cr32-action-text_italic.png b/pics/crystalsvg/cr32-action-format-text-italic.png
index 1a9baadb1..1a9baadb1 100644
--- a/pics/crystalsvg/cr32-action-text_italic.png
+++ b/pics/crystalsvg/cr32-action-format-text-italic.png
diff --git a/pics/crystalsvg/cr32-action-text_strike.png b/pics/crystalsvg/cr32-action-format-text-strikethrough.png
index f4c5d0459..f4c5d0459 100644
--- a/pics/crystalsvg/cr32-action-text_strike.png
+++ b/pics/crystalsvg/cr32-action-format-text-strikethrough.png
diff --git a/pics/crystalsvg/cr32-action-text_under.png b/pics/crystalsvg/cr32-action-format-text-underline.png
index e9ac03b96..e9ac03b96 100644
--- a/pics/crystalsvg/cr32-action-text_under.png
+++ b/pics/crystalsvg/cr32-action-format-text-underline.png
diff --git a/pics/crystalsvg/cr32-action-spellcheck.png b/pics/crystalsvg/cr32-action-tools-check-spelling.png
index 74e528b93..74e528b93 100644
--- a/pics/crystalsvg/cr32-action-spellcheck.png
+++ b/pics/crystalsvg/cr32-action-tools-check-spelling.png
diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp
index d7cf06eac..ae7af326f 100644
--- a/tdeparts/tests/plugin_spellcheck.cpp
+++ b/tdeparts/tests/plugin_spellcheck.cpp
@@ -12,7 +12,7 @@ PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name,
     : Plugin( parent, name )
 {
     (void) new TDEAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()),
-                        actionCollection(), "spellcheck" );
+                        actionCollection(), "tools-check-spelling" );
 }
 
 PluginSpellCheck::~PluginSpellCheck()
diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h
index e1e1fde05..b89c32c40 100644
--- a/tdeui/kstdaction_p.h
+++ b/tdeui/kstdaction_p.h
@@ -90,7 +90,7 @@ static const KStdActionInfo g_rgActionInfo[] =
 	{ AddBookmark,   TDEStdAccel::AddBookmark, "bookmark_add", I18N_NOOP("&Add Bookmark"), 0, "bookmark_add" },
 	{ EditBookmarks, TDEStdAccel::AccelNone, "bookmark_edit", I18N_NOOP("&Edit Bookmarks"), 0, "bookmark" },
 
-	{ Spelling,      TDEStdAccel::AccelNone, "tools_spelling", I18N_NOOP("&Spelling..."), 0, "spellcheck" },
+	{ Spelling,      TDEStdAccel::AccelNone, "tools_spelling", I18N_NOOP("&Spelling..."), 0, "tools-check-spelling" },
 
 	{ ShowMenubar,   TDEStdAccel::ShowMenubar, "options_show_menubar", I18N_NOOP("Show &Menubar"), 0, "showmenu" },
 	{ ShowToolbar,   TDEStdAccel::AccelNone, "options_show_toolbar", I18N_NOOP("Show &Toolbar"), 0, 0 },
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index 74b9f30cd..3ebb1375f 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -228,7 +228,7 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos )
       menu->changeItem( id - IdClear, SmallIconSet("edit-clear"), menu->text( id - IdClear) );
 
         menu->insertSeparator();
-        id = menu->insertItem( SmallIconSet( "spellcheck" ), i18n( "Check Spelling..." ),
+        id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ),
                                    this, TQT_SLOT( checkSpelling() ) );
 
         if( text().isEmpty() )