diff --git a/krusader/kractions.cpp b/krusader/kractions.cpp
--- a/krusader/kractions.cpp
+++ b/krusader/kractions.cpp
@@ -39,6 +39,7 @@
 #include <KWidgetsAddons/KToggleAction>
 #include <KWidgetsAddons/KToolBarPopupAction>
 #include <KXmlGui/KToggleToolBarAction>
+#include <KXmlGui/KXMLGUIFactory>
 
 #include "defaults.h"
 #include "krusader.h"
@@ -193,8 +194,8 @@
 
     actShowStatusBar = KStandardAction::showStatusbar(SLOTS, SLOT(toggleStatusbar()), krusaderApp->actionCollection());
     KStandardAction::quit(krusaderApp, SLOT(close()), krusaderApp->actionCollection());
-    KStandardAction::configureToolbars(SLOTS, SLOT(configToolbar()), krusaderApp->actionCollection());
-    KStandardAction::keyBindings(SLOTS, SLOT(configKeys()), krusaderApp->actionCollection());
+    KStandardAction::configureToolbars(krusaderApp, SLOT(configureToolbars()), krusaderApp->actionCollection());
+    KStandardAction::keyBindings(krusaderApp->guiFactory(), SLOT(configureShortcuts()), krusaderApp->actionCollection());
 
     // the toggle actions
     NEW_KTOGGLEACTION(actToggleFnkeys, i18n("Show &FN Keys Bar"), 0, 0, SLOTS,  SLOT(toggleFnkeys()), "toggle fn bar");
diff --git a/krusader/krslots.h b/krusader/krslots.h
--- a/krusader/krslots.h
+++ b/krusader/krslots.h
@@ -85,8 +85,6 @@
     void swapPanels();
     void showHiddenFiles(bool show);
     void toggleSwapSides();
-    void configToolbar();
-    void configKeys();
     void toggleStatusbar();
     void toggleTerminal();
     void compareSetup();
@@ -120,7 +118,6 @@
     void slotQueueManager();
     void applicationStateChanged();
     void jsConsole();
-    void saveNewToolbarConfig();
 
 protected slots:
     void configChanged(bool isGUIRestartNeeded);
diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp
--- a/krusader/krslots.cpp
+++ b/krusader/krslots.cpp
@@ -49,9 +49,6 @@
 #include <KIconThemes/KIconLoader>
 #include <KWidgetsAddons/KToggleAction>
 #include <KWidgetsAddons/KMessageBox>
-#include <KXmlGui/KEditToolBar>
-#include <KXmlGui/KShortcutsDialog>
-#include <KXmlGui/KToolBar>
 
 #ifdef __KJSEMBED__
 #include <kjsembed/jsconsolewidget.h>
@@ -497,31 +494,6 @@
         KMessageBox::error(0, i18n("Error executing %1.", proc.program()[0]));
 }
 
-// settings slots
-void KRslots::configToolbar()
-{
-    KConfigGroup cg(KSharedConfig::openConfig(), QString());
-    krApp->saveMainWindowSettings(cg);
-    QPointer<KEditToolBar> dlg = new KEditToolBar(krApp->factory());
-    connect(dlg, SIGNAL(newToolBarConfig()), this, SLOT(saveNewToolbarConfig()));
-    if (dlg->exec()) {
-        krApp->updateGUI();
-    }
-    delete dlg;
-}
-
-void KRslots::saveNewToolbarConfig()
-{
-    KConfigGroup cg(KSharedConfig::openConfig(), QString());
-    krApp->applyMainWindowSettings(cg);
-    krApp->updateGUI();
-}
-
-void KRslots::configKeys()
-{
-    KShortcutsDialog::configure(krApp->actionCollection(), KShortcutsEditor::LetterShortcutsAllowed, krMainWindow);
-}
-
 void KRslots::slotSplit()
 {
     QStringList list;