diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp
--- a/src/filewidgets/kdiroperator.cpp
+++ b/src/filewidgets/kdiroperator.cpp
@@ -1883,22 +1883,23 @@
     connect(action, SIGNAL(triggered(bool)), this, SLOT(deleteSelected()));
 
     // the sort menu actions
-    KActionMenu *sortMenu = new KActionMenu(i18n("Sorting"), this);
+    KActionMenu *sortMenu = new KActionMenu(i18n("Sort by"), this);
     d->actionCollection->addAction(QStringLiteral("sorting menu"),  sortMenu);
+    sortMenu->setIcon(QIcon::fromTheme(QStringLiteral("itemize")));
 
-    KToggleAction *byNameAction = new KToggleAction(i18n("By Name"), this);
+    KToggleAction *byNameAction = new KToggleAction(i18n("Name"), this);
     d->actionCollection->addAction(QStringLiteral("by name"), byNameAction);
     connect(byNameAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotSortByName()));
 
-    KToggleAction *bySizeAction = new KToggleAction(i18n("By Size"), this);
+    KToggleAction *bySizeAction = new KToggleAction(i18n("Size"), this);
     d->actionCollection->addAction(QStringLiteral("by size"), bySizeAction);
     connect(bySizeAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotSortBySize()));
 
-    KToggleAction *byDateAction = new KToggleAction(i18n("By Date"), this);
+    KToggleAction *byDateAction = new KToggleAction(i18n("Date"), this);
     d->actionCollection->addAction(QStringLiteral("by date"), byDateAction);
     connect(byDateAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotSortByDate()));
 
-    KToggleAction *byTypeAction = new KToggleAction(i18n("By Type"), this);
+    KToggleAction *byTypeAction = new KToggleAction(i18n("Type"), this);
     d->actionCollection->addAction(QStringLiteral("by type"), byTypeAction);
     connect(byTypeAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotSortByType()));
 
diff --git a/src/filewidgets/kfilewidget.cpp b/src/filewidgets/kfilewidget.cpp
--- a/src/filewidgets/kfilewidget.cpp
+++ b/src/filewidgets/kfilewidget.cpp
@@ -362,11 +362,9 @@
     QVBoxLayout *opsWidgetLayout = new QVBoxLayout(d->opsWidget);
     opsWidgetLayout->setMargin(0);
     opsWidgetLayout->setSpacing(0);
-    //d->toolbar = new KToolBar(this, true);
-    d->toolbar = new KToolBar(d->opsWidget, true);
+    d->toolbar = new KToolBar(this, true);
     d->toolbar->setObjectName(QStringLiteral("KFileWidget::toolbar"));
     d->toolbar->setMovable(false);
-    opsWidgetLayout->addWidget(d->toolbar);
 
     d->model = new KFilePlacesModel(this);
 
@@ -486,7 +484,6 @@
                             "<li>the Places navigation panel</li>"
                             "<li>file previews</li>"
                             "<li>separating folders from files</li></ul></qt>"));
-    menu->addAction(coll->action(QStringLiteral("sorting menu")));
     menu->addAction(coll->action(QStringLiteral("view menu")));
     menu->addSeparator();
     menu->addAction(coll->action(QStringLiteral("decoration menu")));
@@ -542,6 +539,7 @@
     d->toolbar->addAction(coll->action(QStringLiteral("detailed tree view")));
     d->toolbar->addAction(separator2);
     d->toolbar->addAction(coll->action(QStringLiteral("inline preview")));
+    d->toolbar->addAction(coll->action(QStringLiteral("sorting menu")));
     d->toolbar->addWidget(midSpacer);
     d->toolbar->addAction(furtherAction);
     d->toolbar->addWidget(d->iconSizeSlider);
@@ -553,6 +551,14 @@
     d->toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);
     d->toolbar->setMovable(false);
 
+    // Tweak the look and feel of the sort menu button
+    foreach(QToolButton* button, d->toolbar->findChildren<QToolButton*>()) {
+        if (button->defaultAction() == coll->action(QStringLiteral("sorting menu"))) {
+            button->setPopupMode(QToolButton::InstantPopup);
+        }
+    }
+
+
     KUrlCompletion *pathCompletionObj = new KUrlCompletion(KUrlCompletion::DirCompletion);
     pathCombo->setCompletionObject(pathCompletionObj);
     pathCombo->setAutoDeleteCompletionObject(true);
@@ -1401,6 +1407,7 @@
 
     boxLayout = new QVBoxLayout(q);
     boxLayout->setMargin(0); // no additional margin to the already existing
+    boxLayout->addWidget(toolbar);
 
     placesViewSplitter = new QSplitter(q);
     placesViewSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);