diff --git a/models/albumsmodel.cpp b/models/albumsmodel.cpp
index 6802a8e0d..e85e77932 100644
--- a/models/albumsmodel.cpp
+++ b/models/albumsmodel.cpp
@@ -268,7 +268,7 @@ QVariant AlbumsModel::data(const QModelIndex &index, int role) const
         default:
             return ActionModel::data(index, role);
         case Qt::DecorationRole:
-            return Icon(Song::Playlist==si->type ? "view-media-playlist" : "audio-x-generic");
+            return Song::Playlist==si->type ? Icons::self()->playlistIcon : Icons::self()->audioFileIcon;
         case Qt::ToolTipRole: {
             quint32 year=si->parent->songs.count() ? si->parent->songs.at(0)->year : 0;
             return si->parent->artist+QLatin1String("<br/>")+
diff --git a/mpd/mpdparseutils.cpp b/mpd/mpdparseutils.cpp
index 21b44d2d7..450198cc7 100644
--- a/mpd/mpdparseutils.cpp
+++ b/mpd/mpdparseutils.cpp
@@ -396,7 +396,8 @@ MusicLibraryItemRoot * MPDParseUtils::parseLibraryItems(const QByteArray &data,
 
             if (Song::Playlist==currentSong.type) {
                 ParsedCueFile cf;
-                if (canSplitCue && currentSong.file.endsWith(".cue", Qt::CaseInsensitive) && CueFile::parse(currentSong.file, mpdDir, cf.songs, cf.files)) {
+                if (canSplitCue && currentSong.file.endsWith(".cue", Qt::CaseInsensitive) && CueFile::parse(currentSong.file, mpdDir, cf.songs, cf.files) &&
+                    cf.files.count()<cf.songs.count()) {
                     if (albumItem) {
                         QMap<QString, Song> origFiles=albumItem->getSongs(cf.files);
                         if (origFiles.size()==cf.files.size()) {