Index: src/playlist/playlisttab.cpp
===================================================================
--- src/playlist/playlisttab.cpp	(revision 1134989)
+++ src/playlist/playlisttab.cpp	(working copy)
@@ -21,6 +21,7 @@
 #include "playlisttab.h"
 
 #include <QBoxLayout>
+#include <QToolBar>
 #include <QKeyEvent>
 #include <QListView>
 #include <QSplitter>
@@ -447,33 +448,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);
 
@@ -500,28 +503,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);
 
@@ -616,6 +621,7 @@
 	fileWidget->setFilter(MediaWidget::extensionFilter());
 	fileWidget->setMode(KFile::Files | KFile::ExistingOnly);
 	fileWidgetSplitter->setStretchFactor(1, 1);
+	fileWidget->setMinimumWidth(40);
 
 	// KFileWidget creates a KUrlComboBox without layout (!), which steals the focus:
 	//     kDebug() << QApplication::focusWidget();