--- src/playlist/playlisttab.cpp.orig	2016-06-30 17:20:32.000000000 +0200
+++ src/playlist/playlisttab.cpp	2016-08-10 17:26:40.388513777 +0200
@@ -29,6 +29,7 @@
 #include <QAction>
 #include <QBoxLayout>
 #include <QFileDialog>
+#include <QToolBar>
 #include <QKeyEvent>
 #include <QListView>
 #include <QMenu>
@@ -450,33 +451,35 @@
 	QBoxLayout *sideLayout = new QVBoxLayout(widget);
 	sideLayout->setMargin(0);
 
+	QToolBar *ToolBarLayout= new QToolBar();
 	QBoxLayout *boxLayout = new QHBoxLayout();
 
 	QToolButton *toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(newAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
 	toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(renameAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
 	toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(removePlaylistAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
 	toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(savePlaylistAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
 	toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(savePlaylistAsAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
+	boxLayout->addWidget(ToolBarLayout);
 	boxLayout->addStretch();
 	sideLayout->addLayout(boxLayout);
 
@@ -503,28 +506,30 @@
 	sideLayout = new QVBoxLayout(widget);
 	sideLayout->setMargin(0);
 
+	ToolBarLayout= new QToolBar();
 	boxLayout = new QHBoxLayout();
 
 	toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(repeatAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
 	toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(randomAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
 	toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(removeTrackAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
 	toolButton = new QToolButton(widget);
 	toolButton->setDefaultAction(clearAction);
 	toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-	boxLayout->addWidget(toolButton);
+	ToolBarLayout->addWidget(toolButton);
 
+	boxLayout->addWidget(ToolBarLayout);
 	boxLayout->addStretch();
 	sideLayout->addLayout(boxLayout);
 
@@ -619,6 +624,7 @@
 	fileWidget->setFilter(MediaWidget::extensionFilter());
 	fileWidget->setMode(KFile::Files | KFile::ExistingOnly);
 	fileWidgetSplitter->setStretchFactor(1, 1);
+	fileWidget->setMinimumWidth(40);
 
 	// KFileWidget creates a QUrlComboBox without layout (!), which steals the focus:
 	//     kDebug() << QApplication::focusWidget();