diff --git a/src/coreservices.cpp b/src/coreservices.cpp
index 8523ee8ae99..e37a798ce27 100644
--- a/src/coreservices.cpp
+++ b/src/coreservices.cpp
@@ -16,6 +16,7 @@
 #include "engine/enginemaster.h"
 #include "library/coverartcache.h"
 #include "library/library.h"
+#include "library/library_prefs.h"
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "mixer/playerinfo.h"
@@ -375,7 +376,7 @@ void CoreServices::initialize(QApplication* pApp) {
 
     // Scan the library for new files and directories
     bool rescan = pConfig->getValue<bool>(
-            ConfigKey("[Library]", "RescanOnStartup"));
+            library::prefs::kRescanOnStartupConfigKey);
     // rescan the library if we get a new plugin
     QList<QString> prev_plugins_list =
             pConfig->getValueString(
diff --git a/src/library/dao/playlistdao.cpp b/src/library/dao/playlistdao.cpp
index 805739967f8..c38fcc81ecf 100644
--- a/src/library/dao/playlistdao.cpp
+++ b/src/library/dao/playlistdao.cpp
@@ -227,7 +227,7 @@ void PlaylistDAO::deletePlaylist(const int playlistId) {
     }
 }
 
-int PlaylistDAO::deleteAllPlaylistsWithFewerTracks(
+int PlaylistDAO::deleteAllUnlockedPlaylistsWithFewerTracks(
         PlaylistDAO::HiddenType type, int minNumberOfTracks) {
     VERIFY_OR_DEBUG_ASSERT(minNumberOfTracks > 0) {
         return 0; // nothing to do, probably unintended invocation
@@ -238,7 +238,7 @@ int PlaylistDAO::deleteAllPlaylistsWithFewerTracks(
             "SELECT id FROM Playlists  "
             "WHERE (SELECT count(playlist_id) FROM PlaylistTracks WHERE "
             "Playlists.ID = PlaylistTracks.playlist_id) < :length AND "
-            "Playlists.hidden = :hidden"));
+            "Playlists.hidden = :hidden AND Playlists.locked = 0"));
     query.bindValue(":hidden", static_cast<int>(type));
     query.bindValue(":length", minNumberOfTracks);
     if (!query.exec()) {
diff --git a/src/library/dao/playlistdao.h b/src/library/dao/playlistdao.h
index e7fa7354ab5..a5bda75b62f 100644
--- a/src/library/dao/playlistdao.h
+++ b/src/library/dao/playlistdao.h
@@ -58,7 +58,8 @@ class PlaylistDAO : public QObject, public virtual DAO {
     /// Delete Playlists with fewer entries then "length"
     /// Needs to be called inside a transaction.
     /// @return number of deleted playlists, -1 on error
-    int deleteAllPlaylistsWithFewerTracks(PlaylistDAO::HiddenType type, int minNumberOfTracks);
+    int deleteAllUnlockedPlaylistsWithFewerTracks(PlaylistDAO::HiddenType type,
+            int minNumberOfTracks);
     // Rename a playlist
     void renamePlaylist(const int playlistId, const QString& newName);
     // Lock or unlock a playlist
diff --git a/src/library/library_prefs.cpp b/src/library/library_prefs.cpp
index b3b1e3d7316..38b6a4d17e1 100644
--- a/src/library/library_prefs.cpp
+++ b/src/library/library_prefs.cpp
@@ -13,16 +13,36 @@ const ConfigKey mixxx::library::prefs::kLegacyDirectoryConfigKey =
 const QString mixxx::library::prefs::kConfigGroup =
         QStringLiteral("[Library]");
 
+const ConfigKey mixxx::library::prefs::kRescanOnStartupConfigKey =
+        ConfigKey{
+                mixxx::library::prefs::kConfigGroup,
+                QStringLiteral("RescanOnStartup")};
+
 const ConfigKey mixxx::library::prefs::kKeyNotationConfigKey =
         ConfigKey{
                 mixxx::library::prefs::kConfigGroup,
                 QStringLiteral("key_notation")};
 
+const ConfigKey mixxx::library::prefs::kTrackDoubleClickActionConfigKey =
+        ConfigKey{
+                mixxx::library::prefs::kConfigGroup,
+                QStringLiteral("TrackLoadAction")};
+
 const ConfigKey mixxx::library::prefs::kEditMetadataSelectedClickConfigKey =
         ConfigKey{
                 mixxx::library::prefs::kConfigGroup,
                 QStringLiteral("EditMetadataSelectedClick")};
 
+const ConfigKey mixxx::library::prefs::kHistoryMinTracksToKeepConfigKey =
+        ConfigKey{
+                mixxx::library::prefs::kConfigGroup,
+                QStringLiteral("history_min_tracks_to_keep")};
+
+const ConfigKey mixxx::library::prefs::kHistoryTrackDuplicateDistanceConfigKey =
+        ConfigKey{
+                mixxx::library::prefs::kConfigGroup,
+                QStringLiteral("history_track_duplicate_distance")};
+
 const ConfigKey mixxx::library::prefs::kSearchDebouncingTimeoutMillisConfigKey =
         ConfigKey{
                 mixxx::library::prefs::kConfigGroup,
@@ -39,3 +59,8 @@ const ConfigKey mixxx::library::prefs::kSyncSeratoMetadataConfigKey =
         ConfigKey{
                 mixxx::library::prefs::kConfigGroup,
                 QStringLiteral("SeratoMetadataExport")};
+
+const ConfigKey mixxx::library::prefs::kUseRelativePathOnExportConfigKey =
+        ConfigKey{
+                mixxx::library::prefs::kConfigGroup,
+                QStringLiteral("UseRelativePathOnExport")};
diff --git a/src/library/library_prefs.h b/src/library/library_prefs.h
index cf3bf3b6cb3..d79c7c74a42 100644
--- a/src/library/library_prefs.h
+++ b/src/library/library_prefs.h
@@ -12,12 +12,24 @@ extern const ConfigKey kLegacyDirectoryConfigKey;
 
 extern const QString kConfigGroup;
 
+extern const ConfigKey kRescanOnStartupConfigKey;
+
 extern const ConfigKey kKeyNotationConfigKey;
 
+extern const ConfigKey kTrackDoubleClickActionConfigKey;
+
 extern const ConfigKey kSearchDebouncingTimeoutMillisConfigKey;
 
 extern const ConfigKey kEditMetadataSelectedClickConfigKey;
 
+extern const ConfigKey kHistoryMinTracksToKeepConfigKey;
+
+const int kHistoryMinTracksToKeepDefault = 1;
+
+extern const ConfigKey kHistoryTrackDuplicateDistanceConfigKey;
+
+const int kHistoryTrackDuplicateDistanceDefault = 6;
+
 const bool kEditMetadataSelectedClickDefault = false;
 
 extern const ConfigKey kSyncTrackMetadataConfigKey;
@@ -26,6 +38,8 @@ extern const ConfigKey kSyncSeratoMetadataConfigKey;
 
 extern const ConfigKey kSyncSeratoMetadataConfigKey;
 
+extern const ConfigKey kUseRelativePathOnExportConfigKey;
+
 } // namespace prefs
 
 } // namespace library
diff --git a/src/library/trackset/baseplaylistfeature.cpp b/src/library/trackset/baseplaylistfeature.cpp
index 8219477a3e1..d833f650c13 100644
--- a/src/library/trackset/baseplaylistfeature.cpp
+++ b/src/library/trackset/baseplaylistfeature.cpp
@@ -7,6 +7,7 @@
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/export/trackexportwizard.h"
 #include "library/library.h"
+#include "library/library_prefs.h"
 #include "library/parser.h"
 #include "library/parsercsv.h"
 #include "library/parserm3u.h"
@@ -31,6 +32,8 @@ const ConfigKey kConfigKeyLastImportExportPlaylistDirectory(
 
 } // anonymous namespace
 
+using namespace mixxx::library::prefs;
+
 BasePlaylistFeature::BasePlaylistFeature(
         Library* pLibrary,
         UserSettingsPointer pConfig,
@@ -568,7 +571,7 @@ void BasePlaylistFeature::slotExportPlaylist() {
 
     // check config if relative paths are desired
     bool useRelativePath = m_pConfig->getValue<bool>(
-            ConfigKey("[Library]", "UseRelativePathOnExport"));
+            kUseRelativePathOnExportConfigKey);
 
     if (fileLocation.endsWith(".csv", Qt::CaseInsensitive)) {
         ParserCsv::writeCSVFile(fileLocation, pPlaylistTableModel.data(), useRelativePath);
diff --git a/src/library/trackset/crate/cratefeature.cpp b/src/library/trackset/crate/cratefeature.cpp
index fcdb49db3ed..d7b1c516f21 100644
--- a/src/library/trackset/crate/cratefeature.cpp
+++ b/src/library/trackset/crate/cratefeature.cpp
@@ -9,6 +9,7 @@
 
 #include "library/export/trackexportwizard.h"
 #include "library/library.h"
+#include "library/library_prefs.h"
 #include "library/parser.h"
 #include "library/parsercsv.h"
 #include "library/parserm3u.h"
@@ -42,6 +43,8 @@ const ConfigKey kConfigKeyLastImportExportCrateDirectoryKey(
 
 } // anonymous namespace
 
+using namespace mixxx::library::prefs;
+
 CrateFeature::CrateFeature(Library* pLibrary,
         UserSettingsPointer pConfig)
         : BaseTrackSetFeature(pLibrary, pConfig, "CRATEHOME", QStringLiteral("crates")),
@@ -739,7 +742,7 @@ void CrateFeature::slotExportPlaylist() {
     // check config if relative paths are desired
     bool useRelativePath =
             m_pConfig->getValue<bool>(
-                    ConfigKey("[Library]", "UseRelativePathOnExport"));
+                    kUseRelativePathOnExportConfigKey);
 
     // Create list of files of the crate
     // Create a new table model since the main one might have an active search.
diff --git a/src/library/trackset/setlogfeature.cpp b/src/library/trackset/setlogfeature.cpp
index 5cadbb723f7..c2af49459fd 100644
--- a/src/library/trackset/setlogfeature.cpp
+++ b/src/library/trackset/setlogfeature.cpp
@@ -6,6 +6,7 @@
 
 #include "control/controlobject.h"
 #include "library/library.h"
+#include "library/library_prefs.h"
 #include "library/playlisttablemodel.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
@@ -23,6 +24,8 @@ namespace {
 constexpr int kNumToplevelHistoryEntries = 5;
 }
 
+using namespace mixxx::library::prefs;
+
 SetlogFeature::SetlogFeature(
         Library* pLibrary,
         UserSettingsPointer pConfig)
@@ -36,13 +39,11 @@ SetlogFeature::SetlogFeature(
                           /*keep deleted tracks*/ true),
                   QStringLiteral("SETLOGHOME"),
                   QStringLiteral("history")),
-          m_playlistId(kInvalidPlaylistId) {
-    // clear old empty entries
-    ScopedTransaction transaction(pLibrary->trackCollectionManager()
-                                          ->internalCollection()
-                                          ->database());
-    m_playlistDao.deleteAllPlaylistsWithFewerTracks(PlaylistDAO::HiddenType::PLHT_SET_LOG, 1);
-    transaction.commit();
+          m_playlistId(kInvalidPlaylistId),
+          m_pLibrary(pLibrary),
+          m_pConfig(pConfig) {
+    // remove unneeded entries
+    deleteAllUnlockedPlaylistsWithFewerTracks();
 
     //construct child model
     m_pSidebarModel->setRootItem(TreeItem::newRoot(this));
@@ -72,6 +73,8 @@ SetlogFeature::~SetlogFeature() {
             m_playlistDao.tracksInPlaylist(m_playlistId) == 0) {
         m_playlistDao.deletePlaylist(m_playlistId);
     }
+    // Also clean history up when shutting down in case the track threshold changed
+    deleteAllUnlockedPlaylistsWithFewerTracks();
 }
 
 QVariant SetlogFeature::title() {
@@ -88,6 +91,18 @@ void SetlogFeature::bindLibraryWidget(
     m_libraryWidget = QPointer(libraryWidget);
 }
 
+void SetlogFeature::deleteAllUnlockedPlaylistsWithFewerTracks() {
+    ScopedTransaction transaction(m_pLibrary->trackCollectionManager()
+                                          ->internalCollection()
+                                          ->database());
+    int minTrackCount = m_pConfig->getValue(
+            kHistoryMinTracksToKeepConfigKey,
+            kHistoryMinTracksToKeepDefault);
+    m_playlistDao.deleteAllUnlockedPlaylistsWithFewerTracks(PlaylistDAO::HiddenType::PLHT_SET_LOG,
+            minTrackCount);
+    transaction.commit();
+}
+
 void SetlogFeature::onRightClick(const QPoint& globalPos) {
     Q_UNUSED(globalPos);
     m_lastRightClickedIndex = QModelIndex();
@@ -279,6 +294,8 @@ void SetlogFeature::slotGetNewPlaylist() {
         qDebug() << "Setlog playlist Creation Failed";
         qDebug() << "An unknown error occurred while creating playlist: "
                  << set_log_name;
+    } else {
+        m_recentTracks.clear();
     }
 
     reloadChildModel(m_playlistId); // For moving selection
@@ -366,8 +383,10 @@ void SetlogFeature::slotPlayingTrackChanged(TrackPointer currentPlayingTrack) {
         m_recentTracks.push_front(currentPlayingTrackId);
 
         // Keep a window of 6 tracks (inspired by 2 decks, 4 samplers)
-        constexpr int kRecentTrackWindow = 6;
-        while (m_recentTracks.size() > kRecentTrackWindow) {
+        const unsigned int recentTrackWindow = m_pConfig->getValue(
+                kHistoryTrackDuplicateDistanceConfigKey,
+                kHistoryTrackDuplicateDistanceDefault);
+        while (m_recentTracks.size() > recentTrackWindow) {
             m_recentTracks.pop_back();
         }
     }
diff --git a/src/library/trackset/setlogfeature.h b/src/library/trackset/setlogfeature.h
index a477a61be25..b66c0145e26 100644
--- a/src/library/trackset/setlogfeature.h
+++ b/src/library/trackset/setlogfeature.h
@@ -7,6 +7,8 @@
 #include "library/trackset/baseplaylistfeature.h"
 #include "preferences/usersettings.h"
 
+class Library;
+
 class SetlogFeature : public BasePlaylistFeature {
     Q_OBJECT
 
@@ -40,6 +42,7 @@ class SetlogFeature : public BasePlaylistFeature {
     void slotPlaylistTableRenamed(int playlistId, const QString& newName) override;
 
   private:
+    void deleteAllUnlockedPlaylistsWithFewerTracks();
     void reloadChildModel(int playlistId);
     QString getRootViewHtml() const override;
 
@@ -48,4 +51,6 @@ class SetlogFeature : public BasePlaylistFeature {
     QAction* m_pStartNewPlaylist;
     int m_playlistId;
     QPointer<WLibrary> m_libraryWidget;
+    Library* m_pLibrary;
+    UserSettingsPointer m_pConfig;
 };
diff --git a/src/preferences/dialog/dlgpreflibrary.cpp b/src/preferences/dialog/dlgpreflibrary.cpp
index 87fed403014..ee0802c7937 100644
--- a/src/preferences/dialog/dlgpreflibrary.cpp
+++ b/src/preferences/dialog/dlgpreflibrary.cpp
@@ -191,6 +191,9 @@ void DlgPrefLibrary::initializeDirList() {
 
 void DlgPrefLibrary::slotResetToDefaults() {
     checkBox_library_scan->setChecked(false);
+    spinbox_history_track_duplicate_distance->setValue(
+            kHistoryTrackDuplicateDistanceDefault);
+    spinbox_history_min_tracks_to_keep->setValue(1);
     checkBox_SyncTrackMetadata->setChecked(false);
     checkBox_SeratoMetadataExport->setChecked(false);
     checkBox_use_relative_path->setChecked(false);
@@ -199,8 +202,8 @@ void DlgPrefLibrary::slotResetToDefaults() {
     checkBox_show_itunes->setChecked(true);
     checkBox_show_traktor->setChecked(true);
     checkBox_show_rekordbox->setChecked(true);
-    radioButton_dbclick_bottom->setChecked(false);
     checkBoxEditMetadataSelectedClicked->setChecked(kEditMetadataSelectedClickDefault);
+    radioButton_dbclick_bottom->setChecked(false);
     radioButton_dbclick_top->setChecked(false);
     radioButton_dbclick_deck->setChecked(true);
     spinBoxRowHeight->setValue(Library::kDefaultRowHeightPx);
@@ -212,13 +215,22 @@ void DlgPrefLibrary::slotResetToDefaults() {
 void DlgPrefLibrary::slotUpdate() {
     initializeDirList();
     checkBox_library_scan->setChecked(m_pConfig->getValue(
-            ConfigKey("[Library]","RescanOnStartup"), false));
+            kRescanOnStartupConfigKey, false));
+
+    spinbox_history_track_duplicate_distance->setValue(m_pConfig->getValue(
+            kHistoryTrackDuplicateDistanceConfigKey,
+            kHistoryTrackDuplicateDistanceDefault));
+    spinbox_history_min_tracks_to_keep->setValue(m_pConfig->getValue(
+            kHistoryMinTracksToKeepConfigKey,
+            kHistoryMinTracksToKeepDefault));
+
     checkBox_SyncTrackMetadata->setChecked(
             m_pConfig->getValue(kSyncTrackMetadataConfigKey, false));
     checkBox_SeratoMetadataExport->setChecked(
             m_pConfig->getValue(kSyncSeratoMetadataConfigKey, false));
     checkBox_use_relative_path->setChecked(m_pConfig->getValue(
-            ConfigKey("[Library]","UseRelativePathOnExport"), false));
+            kUseRelativePathOnExportConfigKey, false));
+
     checkBox_show_rhythmbox->setChecked(m_pConfig->getValue(
             ConfigKey("[Library]","ShowRhythmboxLibrary"), true));
     checkBox_show_banshee->setChecked(m_pConfig->getValue(
@@ -233,7 +245,7 @@ void DlgPrefLibrary::slotUpdate() {
             ConfigKey("[Library]", "ShowSeratoLibrary"), true));
 
     switch (m_pConfig->getValue<int>(
-            ConfigKey("[Library]", "TrackLoadAction"),
+            kTrackDoubleClickActionConfigKey,
             static_cast<int>(TrackDoubleClickAction::LoadToDeck))) {
     case static_cast<int>(TrackDoubleClickAction::AddToAutoDJBottom):
         radioButton_dbclick_bottom->setChecked(true);
@@ -245,8 +257,8 @@ void DlgPrefLibrary::slotUpdate() {
         radioButton_dbclick_ignore->setChecked(true);
         break;
     default:
-            radioButton_dbclick_deck->setChecked(true);
-            break;
+        radioButton_dbclick_deck->setChecked(true);
+        break;
     }
 
     bool editMetadataSelectedClick = m_pConfig->getValue(
@@ -383,16 +395,24 @@ void DlgPrefLibrary::slotSeratoMetadataExportClicked(bool checked) {
 }
 
 void DlgPrefLibrary::slotApply() {
-    m_pConfig->set(ConfigKey("[Library]","RescanOnStartup"),
-                ConfigValue((int)checkBox_library_scan->isChecked()));
+    m_pConfig->set(kRescanOnStartupConfigKey,
+            ConfigValue((int)checkBox_library_scan->isChecked()));
+
+    m_pConfig->set(kHistoryTrackDuplicateDistanceConfigKey,
+            ConfigValue(spinbox_history_track_duplicate_distance->value()));
+    m_pConfig->set(kHistoryMinTracksToKeepConfigKey,
+            ConfigValue(spinbox_history_min_tracks_to_keep->value()));
+
     m_pConfig->set(
             kSyncTrackMetadataConfigKey,
             ConfigValue{checkBox_SyncTrackMetadata->isChecked()});
     m_pConfig->set(
             kSyncSeratoMetadataConfigKey,
             ConfigValue{checkBox_SeratoMetadataExport->isChecked()});
-    m_pConfig->set(ConfigKey("[Library]","UseRelativePathOnExport"),
-                ConfigValue((int)checkBox_use_relative_path->isChecked()));
+
+    m_pConfig->set(kUseRelativePathOnExportConfigKey,
+            ConfigValue((int)checkBox_use_relative_path->isChecked()));
+
     m_pConfig->set(ConfigKey("[Library]","ShowRhythmboxLibrary"),
                 ConfigValue((int)checkBox_show_rhythmbox->isChecked()));
     m_pConfig->set(ConfigKey("[Library]","ShowBansheeLibrary"),
@@ -405,6 +425,7 @@ void DlgPrefLibrary::slotApply() {
                 ConfigValue((int)checkBox_show_rekordbox->isChecked()));
     m_pConfig->set(ConfigKey("[Library]", "ShowSeratoLibrary"),
             ConfigValue((int)checkBox_show_serato->isChecked()));
+
     int dbclick_status;
     if (radioButton_dbclick_bottom->isChecked()) {
         dbclick_status = static_cast<int>(TrackDoubleClickAction::AddToAutoDJBottom);
@@ -415,8 +436,8 @@ void DlgPrefLibrary::slotApply() {
     } else { // radioButton_dbclick_ignore
         dbclick_status = static_cast<int>(TrackDoubleClickAction::Ignore);
     }
-    m_pConfig->set(ConfigKey("[Library]","TrackLoadAction"),
-                ConfigValue(dbclick_status));
+    m_pConfig->set(kTrackDoubleClickActionConfigKey,
+            ConfigValue(dbclick_status));
 
     m_pConfig->set(kEditMetadataSelectedClickConfigKey,
             ConfigValue(checkBoxEditMetadataSelectedClicked->checkState()));
diff --git a/src/preferences/dialog/dlgpreflibrary.h b/src/preferences/dialog/dlgpreflibrary.h
index ff4f2aa4fda..6a2f12310a4 100644
--- a/src/preferences/dialog/dlgpreflibrary.h
+++ b/src/preferences/dialog/dlgpreflibrary.h
@@ -5,7 +5,6 @@
 #include <QWidget>
 #include <memory>
 
-#include "defs_urls.h"
 #include "library/library_decl.h"
 #include "preferences/dialog/dlgpreferencepage.h"
 #include "preferences/dialog/ui_dlgpreflibrarydlg.h"
diff --git a/src/preferences/dialog/dlgpreflibrarydlg.ui b/src/preferences/dialog/dlgpreflibrarydlg.ui
index f08d8af052f..c20e4e0c24c 100644
--- a/src/preferences/dialog/dlgpreflibrarydlg.ui
+++ b/src/preferences/dialog/dlgpreflibrarydlg.ui
@@ -16,50 +16,13 @@
   <layout class="QVBoxLayout" name="verticalLayout">
 
    <item>
-    <widget class="QGroupBox" name="groupBoxLibrary">
+    <widget class="QGroupBox" name="groupBox_MusicDirectories">
      <property name="title">
-      <string>Library</string>
+      <string>Music Directories</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel3_2">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>10</height>
-         </size>
-        </property>
-        <property name="font">
-         <font/>
-        </property>
-        <property name="text">
-         <string>Music Directories:</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-        <property name="buddy">
-         <cstring>dirList</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QPushButton" name="PushButtonRemoveDir">
-        <property name="font">
-         <font/>
-        </property>
-        <property name="toolTip">
-         <string>If removed, Mixxx will no longer watch this directory and its subdirectories for new tracks.</string>
-        </property>
-        <property name="text">
-         <string>Remove</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" rowspan="3">
+     <layout class="QGridLayout" name="gridLayout_music_directories">
+
+      <item row="0" column="0" rowspan="3">
        <widget class="QListView" name="dirList">
         <property name="editTriggers">
          <set>QAbstractItemView::NoEditTriggers</set>
@@ -75,7 +38,8 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
+
+      <item row="0" column="1">
        <widget class="QPushButton" name="PushButtonAddDir">
         <property name="font">
          <font/>
@@ -88,7 +52,8 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+
+      <item row="1" column="1">
        <widget class="QPushButton" name="PushButtonRelocateDir">
         <property name="toolTip">
          <string>If an existing music directory is moved, Mixxx doesn't know where to find the audio files in it. Choose Relink to select the music directory in its new location. &lt;br/&gt; This will re-establish the links to the audio files in the Mixxx library.</string>
@@ -98,6 +63,32 @@
         </property>
        </widget>
       </item>
+
+      <item row="2" column="1">
+       <widget class="QPushButton" name="PushButtonRemoveDir">
+        <property name="font">
+         <font/>
+        </property>
+        <property name="toolTip">
+         <string>If removed, Mixxx will no longer watch this directory and its subdirectories for new tracks.</string>
+        </property>
+        <property name="text">
+         <string>Remove</string>
+        </property>
+       </widget>
+      </item>
+
+      <item row="3" column="0" colspan="2">
+       <widget class="QCheckBox" name="checkBox_library_scan">
+        <property name="text">
+         <string>Rescan directories on start-up</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+
      </layout>
     </widget>
    </item>
@@ -110,7 +101,7 @@
      <property name="flat">
       <bool>false</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
+     <layout class="QGridLayout" name="gridLayout_audio_formats">
       <item row="0" column="0">
        <widget class="QLabel" name="builtInFormats">
         <property name="text">
@@ -130,7 +121,7 @@
      <property name="title">
       <string>Track Metadata Synchronization</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_3">
+     <layout class="QGridLayout" name="gridLayout_metadata">
       <item row="0" column="0" colspan="2">
        <widget class="QCheckBox" name="checkBox_SyncTrackMetadata">
         <property name="text">
@@ -154,37 +145,153 @@
      </layout>
     </widget>
    </item>
+
    <item>
-    <widget class="QGroupBox" name="groupBox_Miscellaneous">
+    <widget class="QGroupBox" name="groupBox_TrackTableView">
      <property name="title">
-      <string>Miscellaneous</string>
+      <string>Track Table View</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <item row="0" column="0" colspan="2">
-       <widget class="QCheckBox" name="checkBox_library_scan">
+     <layout class="QGridLayout" name="gridLayout_track_table_view">
+
+      <item row="1" column="0" colspan="2">
+       <widget class="QCheckBox" name="checkBoxEditMetadataSelectedClicked">
+        <property name="text">
+         <string>Edit metadata after clicking selected track</string>
+        </property>
+       </widget>
+      </item>
+
+      <item row="2" column="0">
+       <widget class="QLabel" name="doubeClickActionLabel">
+        <property name="text">
+         <string>Track Double-Click Action:</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+
+      <item row="3" column="0">
+       <widget class="QRadioButton" name="radioButton_dbclick_deck">
         <property name="text">
-         <string>Rescan library on start-up</string>
+         <string>Load track to next available deck</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
+      <item row="4" column="0">
+       <widget class="QRadioButton" name="radioButton_dbclick_bottom">
+        <property name="text">
+         <string>Add track to Auto DJ queue (bottom)</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QRadioButton" name="radioButton_dbclick_top">
+        <property name="text">
+         <string>Add track to Auto DJ queue (top)</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QRadioButton" name="radioButton_dbclick_ignore">
+        <property name="text">
+         <string>Ignore</string>
+        </property>
+       </widget>
+      </item>
+
+     </layout>
+    </widget>
+   </item><!-- Track Table View -->
+
+   <item>
+    <widget class="QGroupBox" name="groupBox_History">
+     <property name="title">
+      <string>Session History</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_history">
+
       <item row="1" column="0" colspan="2">
-       <widget class="QCheckBox" name="checkBoxEditMetadataSelectedClicked">
+       <widget class="QLabel" name="label_history_track_duplicate_distance">
         <property name="text">
-         <string>Edit metadata after clicking selected track</string>
+         <string>Track duplicate distance</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
+      <item row="1" column="2">
+       <widget class="QSpinBox" name="spinbox_history_track_duplicate_distance">
+        <property name="toolTip">
+         <string>When playing a track again log it to the session history only if more than N other tracks have been played in the meantime</string>
+        </property>
+        <property name="minimum">
+         <number>0</number>
+        </property>
+        <property name="maximum">
+         <number>99</number>
+        </property>
+        <property name="value">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+
       <item row="2" column="0" colspan="2">
+       <widget class="QLabel" name="label_history_cleanup">
+        <property name="toolTip">
+         <string>History playlist with less than N tracks will be deleted&lt;br/&gt;&lt;br/&gt;Note: the cleanup will be performed during startup and shutdown of Mixxx.</string>
+        </property>
+        <property name="text">
+         <string>Delete history playlist with less than N tracks</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QSpinBox" name="spinbox_history_min_tracks_to_keep">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>99</number>
+        </property>
+        <property name="value">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+
+     </layout>
+    </widget>
+   </item><!-- History -->
+
+   <item>
+    <widget class="QGroupBox" name="groupBox_Miscellaneous">
+     <property name="title">
+      <string>Miscellaneous</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_misc">
+
+      <item row="0" column="0" colspan="2">
        <widget class="QCheckBox" name="checkBox_use_relative_path">
         <property name="text">
          <string>Use relative paths for playlist export if possible</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
+
+      <item row="1" column="0">
        <widget class="QLabel" name="rowHeightLabel">
         <property name="text">
          <string>Library Row Height:</string>
@@ -194,7 +301,7 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2">
+      <item row="1" column="1" colspan="2">
        <widget class="QSpinBox" name="spinBoxRowHeight">
         <property name="suffix">
          <string> px</string>
@@ -210,7 +317,8 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
+
+      <item row="2" column="0">
        <widget class="QLabel" name="libraryFontLabel">
         <property name="text">
          <string>Library Font:</string>
@@ -220,21 +328,22 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
+      <item row="2" column="1">
        <widget class="QLineEdit" name="libraryFont">
         <property name="readOnly">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="4" column="2">
+      <item row="2" column="2">
        <widget class="QToolButton" name="libraryFontButton">
         <property name="text">
          <string>...</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
+
+      <item row="3" column="0">
        <widget class="QLabel" name="searchDebouncingTimeoutLabel">
         <property name="text">
          <string>Search-as-you-type timeout:</string>
@@ -244,67 +353,24 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="1" colspan="2">
+      <item row="3" column="1" colspan="2">
        <widget class="QSpinBox" name="searchDebouncingTimeoutSpinBox">
         <property name="suffix">
          <string> ms</string>
         </property>
        </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
 
-   <item>
-    <widget class="QGroupBox" name="groupBox_4">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="title">
-      <string extracomment="Sets default action when double-clicking a track in the library.">Track Double-Click Action</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_dblick">
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="radioButton_dbclick_deck">
-        <property name="text">
-         <string>Load track to next available deck</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QRadioButton" name="radioButton_dbclick_bottom">
-        <property name="text">
-         <string>Add track to Auto DJ queue (bottom)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QRadioButton" name="radioButton_dbclick_top">
-        <property name="text">
-         <string>Add track to Auto DJ queue (top)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QRadioButton" name="radioButton_dbclick_ignore">
-        <property name="text">
-         <string>Ignore</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
 
    <item>
-    <widget class="QGroupBox" name="groupBox_3">
+    <widget class="QGroupBox" name="groupBox_external_libraries">
      <property name="title">
       <string>External Libraries</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_6">
+     <layout class="QGridLayout" name="gridLayout_external_libraries">
       <item row="0" column="0">
        <widget class="QCheckBox" name="checkBox_show_rhythmbox">
         <property name="text">
@@ -389,13 +455,13 @@
    <item>
     <widget class="QGroupBox" name="groupBox_settingsDir">
      <property name="title">
-      <string>Settings Folder</string>
+      <string>Settings Directory</string>
      </property>
      <layout class="QVBoxLayout" name="vlayout_settingsDir">
       <item>
        <widget class="QLabel" name="label_settingsDir">
         <property name="text">
-         <string>The Mixxx settings folder contains the library database, various configuration files, log files, track analysis data, as well as custom controller mappings.</string>
+         <string>The Mixxx settings directory contains the library database, various configuration files, log files, track analysis data, as well as custom controller mappings.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -459,19 +525,21 @@
   <tabstop>PushButtonAddDir</tabstop>
   <tabstop>PushButtonRelocateDir</tabstop>
   <tabstop>PushButtonRemoveDir</tabstop>
+  <tabstop>checkBox_library_scan</tabstop>
   <tabstop>checkBox_SyncTrackMetadata</tabstop>
   <tabstop>checkBox_SeratoMetadataExport</tabstop>
-  <tabstop>checkBox_library_scan</tabstop>
   <tabstop>checkBoxEditMetadataSelectedClicked</tabstop>
+  <tabstop>radioButton_dbclick_deck</tabstop>
+  <tabstop>radioButton_dbclick_bottom</tabstop>
+  <tabstop>radioButton_dbclick_top</tabstop>
+  <tabstop>radioButton_dbclick_ignore</tabstop>
+  <tabstop>spinbox_history_track_duplicate_distance</tabstop>
+  <tabstop>spinbox_history_min_tracks_to_keep</tabstop>
   <tabstop>checkBox_use_relative_path</tabstop>
   <tabstop>spinBoxRowHeight</tabstop>
   <tabstop>libraryFont</tabstop>
   <tabstop>libraryFontButton</tabstop>
   <tabstop>searchDebouncingTimeoutSpinBox</tabstop>
-  <tabstop>radioButton_dbclick_deck</tabstop>
-  <tabstop>radioButton_dbclick_bottom</tabstop>
-  <tabstop>radioButton_dbclick_top</tabstop>
-  <tabstop>radioButton_dbclick_ignore</tabstop>
   <tabstop>checkBox_show_rhythmbox</tabstop>
   <tabstop>checkBox_show_banshee</tabstop>
   <tabstop>checkBox_show_itunes</tabstop>
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 4060ca8d011..d3ba4262afd 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -352,9 +352,9 @@ void WTrackTableView::initTrackMenu() {
 
 // slot
 void WTrackTableView::slotMouseDoubleClicked(const QModelIndex& index) {
-    // Read the current TrackLoadAction settings
+    // Read the current TrackDoubleClickAction setting
     int doubleClickActionConfigValue =
-            m_pConfig->getValue(ConfigKey("[Library]", "TrackLoadAction"),
+            m_pConfig->getValue(mixxx::library::prefs::kTrackDoubleClickActionConfigKey,
                     static_cast<int>(DlgPrefLibrary::TrackDoubleClickAction::LoadToDeck));
     DlgPrefLibrary::TrackDoubleClickAction doubleClickAction =
             static_cast<DlgPrefLibrary::TrackDoubleClickAction>(