diff --git a/res/icons/folder_up.png b/res/icons/folder_up.png
index 2499745c..38276450 100644
Binary files a/res/icons/folder_up.png and b/res/icons/folder_up.png differ
diff --git a/src/Config.h b/src/Config.h
index f53f0237..5f549296 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO					7
 #define VER_LAMEXP_TYPE						Alpha
 #define VER_LAMEXP_PATCH					6
-#define VER_LAMEXP_BUILD					1216
+#define VER_LAMEXP_BUILD					1217
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 7e5a0e38..8ff42a1c 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -2566,11 +2566,13 @@ void MainWindow::outputFolderViewClicked(const QModelIndex &index)
 		QString selectedDir = m_fileSystemModel->filePath(index);
 		if(selectedDir.length() < 3) selectedDir.append(QDir::separator());
 		ui->outputFolderLabel->setText(QDir::toNativeSeparators(selectedDir));
+		ui->outputFolderLabel->setToolTip(ui->outputFolderLabel->text());
 		m_settings->outputDir(selectedDir);
 	}
 	else
 	{
 		ui->outputFolderLabel->setText(QDir::toNativeSeparators(m_settings->outputDir()));
+		ui->outputFolderLabel->setToolTip(ui->outputFolderLabel->text());
 	}
 }
 
@@ -3096,16 +3098,16 @@ void MainWindow::outputFolderMouseEventOccurred(QWidget *sender, QEvent *event)
 		switch(event->type())
 		{
 		case QEvent::Enter:
-			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Raised);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
 			break;
 		case QEvent::MouseButtonPress:
-			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Sunken);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Sunken : QFrame::Plain);
 			break;
 		case QEvent::MouseButtonRelease:
-			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Raised);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Raised : QFrame::Plain);
 			break;
 		case QEvent::Leave:
-			dynamic_cast<QLabel*>(sender)->setFrameShadow(QFrame::Plain);
+			dynamic_cast<QLabel*>(sender)->setFrameShadow(ui->outputFolderView->isEnabled() ? QFrame::Plain : QFrame::Plain);
 			break;
 		}