diff --git a/src/knowit.cpp b/src/knowit.cpp
index 97f50e9..5a64430 100644
--- a/src/knowit.cpp
+++ b/src/knowit.cpp
@@ -126,12 +126,12 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name),
    KStdAction::paste(TQT_TQOBJECT(Edit), TQT_SLOT(paste()), actionCollection());
    actionUndo = KStdAction::undo(TQT_TQOBJECT(Edit), TQT_SLOT(undo()), actionCollection());
    actionRedo = KStdAction::redo(TQT_TQOBJECT(Edit), TQT_SLOT(redo()), actionCollection());
-   actionBold = new TDEToggleAction(i18n("Toggle &bold"), "text_bold",
+   actionBold = new TDEToggleAction(i18n("Toggle &bold"), "format-text-bold",
       "Ctrl+B", TQT_TQOBJECT(this), TQT_SLOT(slotEditBold()), actionCollection(), "edit_bold");
-   actionItalic = new TDEToggleAction(i18n("Toggle &italic"), "text_italic",
+   actionItalic = new TDEToggleAction(i18n("Toggle &italic"), "format-text-italic",
       "Ctrl+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditItalic()), actionCollection(),
       "edit_italic");
-   actionUnderline = new TDEToggleAction(i18n("Toggle &underline"), "text_under",
+   actionUnderline = new TDEToggleAction(i18n("Toggle &underline"), "format-text-underline",
       "Ctrl+U", TQT_TQOBJECT(this), TQT_SLOT(slotEditUnderline()), actionCollection(),
       "edit_underline");
    new TDEAction(i18n("&Text color..."), "color_line", "Ctrl+#", TQT_TQOBJECT(this),
@@ -156,9 +156,9 @@ Knowit::Knowit(TQWidget*, const char *name) : TDEMainWindow(0, name),
    KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection());
    new TDEAction(i18n("&Go to &note..."), "goto", "Ctrl+G", TQT_TQOBJECT(this),
       TQT_SLOT(slotEditGoTo()), actionCollection(), "goto_note");
-   actionEditAlignLeft = new TDEToggleAction(i18n("Align &left"), "text_left", "Ctrl+L", TQT_TQOBJECT(this),
+   actionEditAlignLeft = new TDEToggleAction(i18n("Align &left"), "format-text-direction-ltr", "Ctrl+L", TQT_TQOBJECT(this),
       TQT_SLOT(slotEditAlignLeft()), actionCollection(), "edit_align_left");
-   actionEditAlignRight = new TDEToggleAction(i18n("Align &right"), "text_right", "Ctrl+R",
+   actionEditAlignRight = new TDEToggleAction(i18n("Align &right"), "format-text-direction-rtl", "Ctrl+R",
       TQT_TQOBJECT(this), TQT_SLOT(slotEditAlignRight()), actionCollection(), "edit_align_right");
    actionEditAlignJustify = new TDEToggleAction(i18n("&Justify"), "text_block", "Ctrl+J",
       TQT_TQOBJECT(this), TQT_SLOT(slotEditAlignJustify()), actionCollection(), "edit_align_justify");
diff --git a/src/knowitpref.cpp b/src/knowitpref.cpp
index f5d5131..bbc4b97 100644
--- a/src/knowitpref.cpp
+++ b/src/knowitpref.cpp
@@ -276,13 +276,13 @@ KnowitPreferences::KnowitPreferences()
     insertDateColorButton = new KColorButton(TQColor("Blue"), tmpBox, "InsertDateColorButton");
     insertDateFormatEdit = new KLineEdit(tmpBox, "InsertDateFormatEdit");
     insertDateItalicButton = new TQToolButton(tmpBox,"InsertDateItalicButton");
-    insertDateItalicButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_italic", TDEIcon::Toolbar)));
+    insertDateItalicButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("format-text-italic", TDEIcon::Toolbar)));
     insertDateItalicButton->setToggleButton(true);
     insertDateBoldButton = new TQToolButton(tmpBox,"InsertDateBoldButton");
-    insertDateBoldButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_bold", TDEIcon::Toolbar)));
+    insertDateBoldButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("format-text-bold", TDEIcon::Toolbar)));
     insertDateBoldButton->setToggleButton(true);
     insertDateUnderlineButton = new TQToolButton(tmpBox, "InsertDateUnderlineButton");
-    insertDateUnderlineButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("text_under", TDEIcon::Toolbar)));    
+    insertDateUnderlineButton->setIconSet(TQIconSet(TDEGlobal::iconLoader()->loadIcon("format-text-underline", TDEIcon::Toolbar)));    
     insertDateUnderlineButton->setToggleButton(true);
     insertDateColorButton->setFixedSize(insertDateBoldButton->sizeHint());
     insertDateFormatEdit->setMinimumWidth(6*insertDateBoldButton->sizeHint().width());