diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 4498eb8..ce9caf7 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -643,13 +643,13 @@ void RosegardenGUIApp::setupActions()
     // MultiViewCommandHistory::attachView
     //
     new TDEToolBarPopupAction(i18n("Und&o"),
-                            "undo",
+                            "edit-undo",
                             TDEStdAccel::shortcut(TDEStdAccel::Undo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Undo));
 
     new TDEToolBarPopupAction(i18n("Re&do"),
-                            "redo",
+                            "edit-redo",
                             TDEStdAccel::shortcut(TDEStdAccel::Redo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Redo));
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index d064d0c..11df3bb 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -346,13 +346,13 @@ ControlEditorDialog::setupActions()
 
     // some adjustments
     new TDEToolBarPopupAction(i18n("Und&o"),
-                            "undo",
+                            "edit-undo",
                             TDEStdAccel::key(TDEStdAccel::Undo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Undo));
 
     new TDEToolBarPopupAction(i18n("Re&do"),
-                            "redo",
+                            "edit-redo",
                             TDEStdAccel::key(TDEStdAccel::Redo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Redo));
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 66d44a7..a4f4e5e 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -376,13 +376,13 @@ MarkerEditor::setupActions()
 
     // some adjustments
     new TDEToolBarPopupAction(i18n("Und&o"),
-                            "undo",
+                            "edit-undo",
                             TDEStdAccel::key(TDEStdAccel::Undo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Undo));
 
     new TDEToolBarPopupAction(i18n("Re&do"),
-                            "redo",
+                            "edit-redo",
                             TDEStdAccel::key(TDEStdAccel::Redo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Redo));
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 3435abd..1b31d7b 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -386,13 +386,13 @@ TriggerSegmentManager::setupActions()
 
     // some adjustments
     new TDEToolBarPopupAction(i18n("Und&o"),
-                            "undo",
+                            "edit-undo",
                             TDEStdAccel::key(TDEStdAccel::Undo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Undo));
 
     new TDEToolBarPopupAction(i18n("Re&do"),
-                            "redo",
+                            "edit-redo",
                             TDEStdAccel::key(TDEStdAccel::Redo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Redo));
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 0591a8c..bd47219 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -188,13 +188,13 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard)
     }
 
     new TDEToolBarPopupAction(i18n("Und&o"),
-                            "undo",
+                            "edit-undo",
                             TDEStdAccel::key(TDEStdAccel::Undo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Undo));
 
     new TDEToolBarPopupAction(i18n("Re&do"),
-                            "redo",
+                            "edit-redo",
                             TDEStdAccel::key(TDEStdAccel::Redo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Redo));
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 40937c2..8e2d837 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -316,13 +316,13 @@ BankEditorDialog::setupActions()
 
 
     new TDEToolBarPopupAction(i18n("Und&o"),
-                            "undo",
+                            "edit-undo",
                             TDEStdAccel::key(TDEStdAccel::Undo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Undo));
 
     new TDEToolBarPopupAction(i18n("Re&do"),
-                            "redo",
+                            "edit-redo",
                             TDEStdAccel::key(TDEStdAccel::Redo),
                             actionCollection(),
                             KStdAction::stdName(KStdAction::Redo));
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 0bc9b8d..d9981d4 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -225,13 +225,13 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent,
 
         // some adjustments
         new TDEToolBarPopupAction(i18n("Und&o"),
-                                "undo",
+                                "edit-undo",
                                 TDEStdAccel::shortcut(TDEStdAccel::Undo),
                                 actionCollection(),
                                 KStdAction::stdName(KStdAction::Undo));
 
         new TDEToolBarPopupAction(i18n("Re&do"),
-                                "redo",
+                                "edit-redo",
                                 TDEStdAccel::shortcut(TDEStdAccel::Redo),
                                 actionCollection(),
                                 KStdAction::stdName(KStdAction::Redo));