diff --git a/shell/main.cpp b/shell/main.cpp
index cb240cc73abbec639b8153f843de869c8a8b58b3..27a998ba3b2bdd451e6a3ed7f8689b424509e8c0 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -34,14 +34,11 @@ int main(int argc, char** argv)
     KLocalizedString::setApplicationDomain("okular");
 
     KAboutData aboutData = okularAboutData();
-
-    app.setApplicationName(aboutData.applicationData().componentName());
-    app.setApplicationDisplayName(aboutData.applicationData().displayName());
-    app.setApplicationVersion(aboutData.version());
-    app.setOrganizationDomain(QStringLiteral("kde.org"));
+    KAboutData::setApplicationData(aboutData);
+    // set icon for shells which do not use desktop file metadata
+    QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular")));
 
     QCommandLineParser parser;
-    KAboutData::setApplicationData(aboutData);
     // The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility
     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
     parser.addVersionOption();
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index 28cf77df9d92b92a33f427217a1438bc452c0eb0..acacfb9047e678b99bb8a1cdcefbfeac0ac9c3d1 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -400,7 +400,9 @@ PageView::PageView( QWidget *parent, Okular::Document *document )
     viewport()->setMouseTracking( true );
     viewport()->setAutoFillBackground( false );
     // the apparently "magic" value of 20 is the same used internally in QScrollArea
+    verticalScrollBar()->setCursor( Qt::ArrowCursor );
     verticalScrollBar()->setSingleStep( 20 );
+    horizontalScrollBar()->setCursor( Qt::ArrowCursor );
     horizontalScrollBar()->setSingleStep( 20 );
 
     // conntect the padding of the viewport to pixmaps requests