diff --git a/src/browsers/filebrowser/FileView.cpp b/src/browsers/filebrowser/FileView.cpp
--- a/src/browsers/filebrowser/FileView.cpp
+++ b/src/browsers/filebrowser/FileView.cpp
@@ -304,7 +304,7 @@
 
     // prevent bug 313003, require full metadata
     TrackLoader* dl = new TrackLoader( TrackLoader::FullMetadataRequired ); // auto-deletes itself
-    connect( dl, &TrackLoader::finished, this, &FileView::slotMoveTracks );
+    connect( dl, &TrackLoader::finished, this, &FileView::slotCopyTracks );
     dl->init( list.urlList() );
 }
 
diff --git a/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp b/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
--- a/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
+++ b/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
@@ -529,7 +529,7 @@
             return true; // Attempt to copy/move the next item in m_sources
         }
 
-        QFileInfo destInfo( dest.toDisplayString() );
+        QFileInfo destInfo( dest.toLocalFile() );
         QDir dir = destInfo.dir();
         if( !dir.exists() )
         {
diff --git a/src/dialogs/OrganizeCollectionDialog.cpp b/src/dialogs/OrganizeCollectionDialog.cpp
--- a/src/dialogs/OrganizeCollectionDialog.cpp
+++ b/src/dialogs/OrganizeCollectionDialog.cpp
@@ -26,7 +26,6 @@
 #include "core/support/Debug.h"
 #include "core-impl/meta/file/File.h"
 #include "dialogs/TrackOrganizer.h"
-#include "widgets/BoxWidget.h"
 #include "widgets/TokenPool.h"
 #include "ui_OrganizeCollectionDialogBase.h"
 
@@ -152,9 +151,14 @@
     if( tracks.size() > 0 )
         m_allTracks = tracks;
 
-    BoxWidget *mainVBox = new BoxWidget( true, this );
-    QWidget *mainContainer = new QWidget( mainVBox );
-    new QDialogButtonBox( buttonMask, mainVBox );
+    QWidget *mainContainer = new QWidget( this );
+    QDialogButtonBox* buttonBox = new QDialogButtonBox( buttonMask, this );
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &OrganizeCollectionDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &OrganizeCollectionDialog::reject);
+
+    QVBoxLayout* mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget( mainContainer );
+    mainLayout->addWidget( buttonBox );
 
     ui->setupUi( mainContainer );
 
diff --git a/src/transcoding/TranscodingAssistantDialog.cpp b/src/transcoding/TranscodingAssistantDialog.cpp
--- a/src/transcoding/TranscodingAssistantDialog.cpp
+++ b/src/transcoding/TranscodingAssistantDialog.cpp
@@ -45,22 +45,17 @@
     ui.setupUi( uiBase );
     setModal( true );
     setWindowTitle( i18n( "Transcode Tracks" ) );
-    setMinimumSize( 620, 480 );
+    setMinimumSize( 620, 500 );
     setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding );
 
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    QWidget *mainWidget = new QWidget(this);
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    mainLayout->addWidget(mainWidget);
+    QDialogButtonBox *buttonBox = this->buttonBox();
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
     okButton->setDefault(true);
     okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &AssistantDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &AssistantDialog::reject);
-    mainLayout->addWidget(uiBase);
     okButton->setText( i18n( "Transc&ode" ) );
     okButton->setEnabled( false );
-    mainLayout->addWidget(buttonBox);
 
     QString explanatoryText;
     QIcon justCopyIcon;
diff --git a/src/transcoding/TranscodingAssistantDialog.ui b/src/transcoding/TranscodingAssistantDialog.ui
--- a/src/transcoding/TranscodingAssistantDialog.ui
+++ b/src/transcoding/TranscodingAssistantDialog.ui
@@ -101,7 +101,7 @@
           </property>
           <property name="minimumSize">
            <size>
-            <width>160</width>
+            <width>200</width>
             <height>0</height>
            </size>
           </property>
diff --git a/src/transcoding/TranscodingPropertySliderWidget.cpp b/src/transcoding/TranscodingPropertySliderWidget.cpp
--- a/src/transcoding/TranscodingPropertySliderWidget.cpp
+++ b/src/transcoding/TranscodingPropertySliderWidget.cpp
@@ -35,8 +35,8 @@
     m_mainLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
 
     QBoxLayout *mainLayout = new QVBoxLayout( this );
-    QBoxLayout *secondaryTopLayout = new QHBoxLayout( this );
-    QBoxLayout *secondaryBotLayout = new QHBoxLayout( this );
+    QBoxLayout *secondaryTopLayout = new QHBoxLayout;
+    QBoxLayout *secondaryBotLayout = new QHBoxLayout;
     mainLayout->addWidget( m_mainLabel );
     mainLayout->addLayout( secondaryTopLayout );
     mainLayout->addLayout( secondaryBotLayout );
diff --git a/src/widgets/TokenDropTarget.cpp b/src/widgets/TokenDropTarget.cpp
--- a/src/widgets/TokenDropTarget.cpp
+++ b/src/widgets/TokenDropTarget.cpp
@@ -93,6 +93,8 @@
     QList< Token *> allTokens = tokensAtRow();
     foreach( Token* token, allTokens )
         delete token;
+
+    Q_EMIT changed();
 }
 
 int
@@ -204,8 +206,7 @@
 
     connect( token, &Token::changed, this, &TokenDropTarget::changed );
     connect( token, &Token::gotFocus, this, &TokenDropTarget::tokenSelected );
-    connect( token, &Token::destroyed, this, &TokenDropTarget::changed );
-    connect( token, &Token::destroyed, this, &TokenDropTarget::deleteEmptyRows );
+    connect( token, &Token::changed, this, &TokenDropTarget::deleteEmptyRows );
 
     Q_EMIT changed();
 }