diff --git a/part.cpp b/part.cpp
index 23068a79a..c7403b847 100644
--- a/part.cpp
+++ b/part.cpp
@@ -348,8 +348,8 @@ m_cliPresentation(false), m_generatorGuiClient(0)
     m_saveAs = KStandardAction::saveAs( this, SLOT( slotSaveFileAs() ), ac );
     ac->addAction("save",m_saveAs);
     m_saveAs->setEnabled( false );
+
     QAction * prefs = KStandardAction::preferences( this, SLOT( slotPreferences() ), ac);
-    ac->addAction("preferences", prefs);
     if ( parent && ( parent->objectName() == QLatin1String( "okular::Shell" ) ) )
     {
         prefs->setText( i18n( "Configure okular..." ) );
@@ -360,10 +360,12 @@ m_cliPresentation(false), m_generatorGuiClient(0)
         prefs->setText( i18n( "Configure Viewer..." ) );
     }
 
-    QAction * genPrefs = KStandardAction::preferences( this, SLOT( slotGeneratorPreferences() ), ac );
-    ac->addAction("generator_prefs", genPrefs);
+    KAction * genPrefs = new KAction( ac );
+    ac->addAction("options_configure_generators", genPrefs);
     genPrefs->setText( i18n( "Configure Backends..." ) );
+    genPrefs->setIcon( KIcon( "configure" ) );
     genPrefs->setEnabled( m_document->configurableGenerators() > 0 );
+    connect( genPrefs, SIGNAL( triggered( bool ) ), this, SLOT( slotGeneratorPreferences() ) );
 
     m_printPreview = KStandardAction::printPreview( this, SLOT( slotPrintPreview() ), ac );
     m_printPreview->setEnabled( false );
diff --git a/part.rc b/part.rc
index c02b3749d..73f957e87 100644
--- a/part.rc
+++ b/part.rc
@@ -70,8 +70,8 @@
   </Menu>
   <Menu name="settings"><text>&amp;Settings</text>
     <Action name="show_leftpanel" group="show_merge"/>
-    <Action name="generator_prefs" group="configure_merge"/>
-    <Action name="preferences"/>
+    <Action name="options_configure_generators" group="configure_merge"/>
+    <Action name="options_configure"/>
   </Menu>
   <Menu name="help"><text>&amp;Help</text>
     <Action name="help_about_backend" group="about_merge"/>
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index 3d55e4fd5..21108d587 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -346,9 +346,9 @@ void PageView::setupBaseActions( KActionCollection * ac )
     connect( d->aZoom, SIGNAL( triggered(QAction *) ), this, SLOT( slotZoom() ) );
     updateZoomText();
 
-    d->aZoomIn = ac->addAction( KStandardAction::ZoomIn, "view_zoom_in", this, SLOT( slotZoomIn() ) );
+    d->aZoomIn = KStandardAction::zoomIn( this, SLOT( slotZoomIn() ), ac );
 
-    d->aZoomOut = ac->addAction( KStandardAction::ZoomOut, "view_zoom_out", this, SLOT( slotZoomOut() ) );
+    d->aZoomOut = KStandardAction::zoomOut( this, SLOT( slotZoomOut() ), ac );
 }
 
 void PageView::setupActions( KActionCollection * ac )