diff --git a/part.cpp b/part.cpp
index fca8b873b..bd96a28a2 100644
--- a/part.cpp
+++ b/part.cpp
@@ -230,7 +230,7 @@ m_cliPresentation(false), m_generatorGuiClient(0)
     //	KToolBar * rtb = new KToolBar( rightContainer, "mainToolBarSS" );
     //	rightLayout->addWidget( rtb );
     m_topMessage = new PageViewTopMessage( rightContainer );
-    m_topMessage->setup( i18n( "This document has embedded files. <a href=\"okular:/embeddedfiles\">Click here to see them</a> or go to File -> Embedded Files." ), KIcon( "attach" ) );
+    m_topMessage->setup( i18n( "This document has embedded files. <a href=\"okular:/embeddedfiles\">Click here to see them</a> or go to File -> Embedded Files." ), KIcon( "mail-attachment" ) );
     connect( m_topMessage, SIGNAL( action() ), this, SLOT( slotShowEmbeddedFiles() ) );
     rightLayout->addWidget( m_topMessage );
     m_formsMessage = new PageViewTopMessage( rightContainer );
@@ -327,13 +327,13 @@ m_cliPresentation(false), m_generatorGuiClient(0)
 
     m_prevBookmark = ac->addAction("previous_bookmark");
     m_prevBookmark->setText(i18n( "Previous Bookmark" ));
-    m_prevBookmark->setIcon(KIcon( "edit-find-previous" ));
+    m_prevBookmark->setIcon(KIcon( "go-up-search" ));
     m_prevBookmark->setWhatsThis( i18n( "Go to the previous bookmarked page" ) );
     connect( m_prevBookmark, SIGNAL( triggered() ), this, SLOT( slotPreviousBookmark() ) );
 
     m_nextBookmark = ac->addAction("next_bookmark");
     m_nextBookmark->setText(i18n( "Next Bookmark" ));
-    m_nextBookmark->setIcon(KIcon( "edit-find-next" ));
+    m_nextBookmark->setIcon(KIcon( "go-down-search" ));
     m_nextBookmark->setWhatsThis( i18n( "Go to the next bookmarked page" ) );
     connect( m_nextBookmark, SIGNAL( triggered() ), this, SLOT( slotNextBookmark() ) );
 
@@ -378,7 +378,7 @@ m_cliPresentation(false), m_generatorGuiClient(0)
 
     m_showLeftPanel = ac->add<KToggleAction>("show_leftpanel");
     m_showLeftPanel->setText(i18n( "Show &Navigation Panel"));
-    m_showLeftPanel->setIcon(KIcon( "show_side_panel" ));
+    m_showLeftPanel->setIcon(KIcon( "view-sidetree" ));
     connect( m_showLeftPanel, SIGNAL( toggled( bool ) ), this, SLOT( slotShowLeftPanel() ) );
     m_showLeftPanel->setShortcut( Qt::Key_F7 );
     m_showLeftPanel->setChecked( Okular::Settings::showLeftPanel() );
@@ -403,13 +403,13 @@ m_cliPresentation(false), m_generatorGuiClient(0)
 
     m_showEmbeddedFiles = ac->addAction("embedded_files");
     m_showEmbeddedFiles->setText(i18n("&Embedded Files"));
-//     m_showEmbeddedFiles->setIcon( KIcon( "attach" ) );
+//     m_showEmbeddedFiles->setIcon( KIcon( "mail-attachment" ) );
     connect(m_showEmbeddedFiles, SIGNAL(triggered()), this, SLOT(slotShowEmbeddedFiles()));
     m_showEmbeddedFiles->setEnabled( false );
 
     m_showPresentation = ac->addAction("presentation");
     m_showPresentation->setText(i18n("P&resentation"));
-    m_showPresentation->setIcon( KIcon( "document-start-presentation" ) );
+    m_showPresentation->setIcon( KIcon( "media-playback-start-presentation" ) );
     connect(m_showPresentation, SIGNAL(triggered()), this, SLOT(slotShowPresentation()));
     m_showPresentation->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_P ) );
     m_showPresentation->setEnabled( false );
@@ -997,7 +997,7 @@ void Part::updateBookmarksActions()
         if ( m_document->bookmarkManager()->isBookmarked( m_document->currentPage() ) )
         {
             m_addBookmark->setText( i18n( "Remove Bookmark" ) );
-            m_addBookmark->setIcon( KIcon( "bookmark" ) ); // ### 'bookmark-remove' or similar
+            m_addBookmark->setIcon( KIcon( "bookmark-delete" ) );
         }
         else
         {
@@ -1365,7 +1365,7 @@ void Part::slotShowMenu(const Okular::Page *page, const QPoint &point)
     {
         popup->addTitle( i18n( "Page %1", page->number() + 1 ) );
         if ( m_document->bookmarkManager()->isBookmarked( page->number() ) )
-            removeBookmark = popup->addAction( KIcon("bookmark"), i18n("Remove Bookmark") );
+            removeBookmark = popup->addAction( KIcon("bookmark-delete"), i18n("Remove Bookmark") );
         else
             addBookmark = popup->addAction( KIcon("bookmark-new"), i18n("Add Bookmark") );
         if ( m_pageView->canFitPageWidth() )
diff --git a/ui/annotationwidgets.cpp b/ui/annotationwidgets.cpp
index 071ab8bb7..58b73f13f 100644
--- a/ui/annotationwidgets.cpp
+++ b/ui/annotationwidgets.cpp
@@ -239,8 +239,8 @@ QWidget * StampAnnotationWidget::widget()
     // FIXME!!! use the standard names instead (when we'll have the artwork)
     m_pixmapSelector->addItem( i18n( "okular" ), "graphics-viewer-document" );
     m_pixmapSelector->addItem( i18n( "Bookmark" ), "bookmark" );
-    m_pixmapSelector->addItem( i18n( "KDE" ), "start-here" );
-    m_pixmapSelector->addItem( i18n( "Information" ), "document-properties" );
+    m_pixmapSelector->addItem( i18n( "KDE" ), "kde" );
+    m_pixmapSelector->addItem( i18n( "Information" ), "help-about" );
 #if 0
     m_pixmapSelector->addItem( i18n( "Approved" ), "Approved" );
     m_pixmapSelector->addItem( i18n( "As Is" ), "AsIs" );
diff --git a/ui/bookmarklist.cpp b/ui/bookmarklist.cpp
index c5feb2c55..db6631632 100644
--- a/ui/bookmarklist.cpp
+++ b/ui/bookmarklist.cpp
@@ -176,7 +176,7 @@ void BookmarkList::slotContextMenu( const QPoint& p )
 
     KMenu menu( this );
     QAction * gotobm = menu.addAction( i18n( "Go to This Bookmark" ) );
-    QAction * editbm = menu.addAction( KIcon( "edit" ), i18n( "Rename Bookmark" ) );
+    QAction * editbm = menu.addAction( KIcon( "edit-rename" ), i18n( "Rename Bookmark" ) );
     QAction * removebm = menu.addAction( KIcon( "list-remove" ), i18n( "Remove Bookmark" ) );
     QAction * res = menu.exec( QCursor::pos() );
     if ( !res )