diff --git a/data/data.qrc b/data/data.qrc
index 88f96384f..cd4b56e34 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -10,8 +10,8 @@
         <file>misc/oauthsuccess.html</file>
         <file>pictures/strawberry.png</file>
         <file>pictures/strawberry-faded.png</file>
-        <file>pictures/noalbumart.png</file>
         <file>pictures/nomusic.png</file>
+        <file>pictures/cdcase.png</file>
         <file>pictures/musicbrainz.png</file>
         <file>pictures/tiny-play.png</file>
         <file>pictures/tiny-pause.png</file>
diff --git a/data/icons.qrc b/data/icons.qrc
index 08abfcaad..346971ffd 100644
--- a/data/icons.qrc
+++ b/data/icons.qrc
@@ -63,7 +63,6 @@
         <file>icons/128x128/media-rewind.png</file>
         <file>icons/128x128/media-stop.png</file>
         <file>icons/128x128/nvidia.png</file>
-        <file>icons/128x128/play2.png</file>
         <file>icons/128x128/realtek.png</file>
         <file>icons/128x128/search.png</file>
         <file>icons/128x128/soundcard.png</file>
@@ -151,7 +150,6 @@
         <file>icons/64x64/media-rewind.png</file>
         <file>icons/64x64/media-stop.png</file>
         <file>icons/64x64/nvidia.png</file>
-        <file>icons/64x64/play2.png</file>
         <file>icons/64x64/pulseaudio.png</file>
         <file>icons/64x64/realtek.png</file>
         <file>icons/64x64/search.png</file>
@@ -242,7 +240,6 @@
         <file>icons/48x48/media-rewind.png</file>
         <file>icons/48x48/media-stop.png</file>
         <file>icons/48x48/nvidia.png</file>
-        <file>icons/48x48/play2.png</file>
         <file>icons/48x48/pulseaudio.png</file>
         <file>icons/48x48/realtek.png</file>
         <file>icons/48x48/search.png</file>
@@ -332,7 +329,6 @@
         <file>icons/32x32/media-rewind.png</file>
         <file>icons/32x32/media-stop.png</file>
         <file>icons/32x32/nvidia.png</file>
-        <file>icons/32x32/play2.png</file>
         <file>icons/32x32/pulseaudio.png</file>
         <file>icons/32x32/realtek.png</file>
         <file>icons/32x32/search.png</file>
@@ -424,7 +420,6 @@
         <file>icons/22x22/media-rewind.png</file>
         <file>icons/22x22/media-stop.png</file>
         <file>icons/22x22/nvidia.png</file>
-        <file>icons/22x22/play2.png</file>
         <file>icons/22x22/pulseaudio.png</file>
         <file>icons/22x22/realtek.png</file>
         <file>icons/22x22/search.png</file>
diff --git a/data/icons/128x128/play2.png b/data/icons/128x128/play2.png
deleted file mode 100644
index 566356265..000000000
Binary files a/data/icons/128x128/play2.png and /dev/null differ
diff --git a/data/icons/22x22/play2.png b/data/icons/22x22/play2.png
deleted file mode 100644
index 2ea18a217..000000000
Binary files a/data/icons/22x22/play2.png and /dev/null differ
diff --git a/data/icons/32x32/play2.png b/data/icons/32x32/play2.png
deleted file mode 100644
index 38a3159a9..000000000
Binary files a/data/icons/32x32/play2.png and /dev/null differ
diff --git a/data/icons/48x48/play2.png b/data/icons/48x48/play2.png
deleted file mode 100644
index 2fbb5e101..000000000
Binary files a/data/icons/48x48/play2.png and /dev/null differ
diff --git a/data/icons/64x64/play2.png b/data/icons/64x64/play2.png
deleted file mode 100644
index bbc09e14b..000000000
Binary files a/data/icons/64x64/play2.png and /dev/null differ
diff --git a/data/icons/full/play2.png b/data/icons/full/play2.png
deleted file mode 100644
index 5c8c97a2f..000000000
Binary files a/data/icons/full/play2.png and /dev/null differ
diff --git a/data/pictures/cdcase.png b/data/pictures/cdcase.png
new file mode 100644
index 000000000..c92576389
Binary files /dev/null and b/data/pictures/cdcase.png differ
diff --git a/data/pictures/noalbumart.jpg b/data/pictures/noalbumart.jpg
deleted file mode 100644
index 287005a7e..000000000
Binary files a/data/pictures/noalbumart.jpg and /dev/null differ
diff --git a/data/pictures/noalbumart.png b/data/pictures/noalbumart.png
deleted file mode 100644
index 18920fc83..000000000
Binary files a/data/pictures/noalbumart.png and /dev/null differ
diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp
index 5f6195c55..f6f273735 100644
--- a/src/covermanager/albumcoverchoicecontroller.cpp
+++ b/src/covermanager/albumcoverchoicecontroller.cpp
@@ -95,7 +95,7 @@ void AlbumCoverChoiceController::SetApplication(Application *app) {
   app_ = app;
 
   cover_fetcher_ = new AlbumCoverFetcher(app_->cover_providers(), this);
-  cover_searcher_ = new AlbumCoverSearcher(QIcon(":/pictures/noalbumart.png"), app, this);
+  cover_searcher_ = new AlbumCoverSearcher(QIcon(":/pictures/cdcase.png"), app, this);
   cover_searcher_->Init(cover_fetcher_);
 
   connect(cover_fetcher_, SIGNAL(AlbumCoverFetched(quint64, QImage, CoverSearchStatistics)), this, SLOT(AlbumCoverFetched(quint64, QImage, CoverSearchStatistics)));
diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp
index 4c041bb0c..3236d4f5d 100644
--- a/src/covermanager/albumcovermanager.cpp
+++ b/src/covermanager/albumcovermanager.cpp
@@ -97,7 +97,7 @@ AlbumCoverManager::AlbumCoverManager(Application *app, CollectionBackend *collec
       cover_exporter_(new AlbumCoverExporter(this)),
       artist_icon_(IconLoader::Load("folder-sound" )),
       all_artists_icon_(IconLoader::Load("vinyl" )),
-      no_cover_icon_(":/pictures/noalbumart.png"),
+      no_cover_icon_(":/pictures/cdcase.png"),
       no_cover_image_(GenerateNoCoverImage(no_cover_icon_)),
       no_cover_item_icon_(QPixmap::fromImage(no_cover_image_)),
       context_menu_(new QMenu(this)),
@@ -119,8 +119,8 @@ AlbumCoverManager::AlbumCoverManager(Application *app, CollectionBackend *collec
 
   album_cover_choice_controller_->SetApplication(app_);
 
-  // Get a square version of noalbumart.png
-  QImage nocover(":/pictures/noalbumart.png");
+  // Get a square version of cdcase.png
+  QImage nocover(":/pictures/cdcase.png");
   nocover = nocover.scaled(120, 120, Qt::KeepAspectRatio, Qt::SmoothTransformation);
   QImage square_nocover(120, 120, QImage::Format_ARGB32);
   square_nocover.fill(0);
@@ -128,7 +128,7 @@ AlbumCoverManager::AlbumCoverManager(Application *app, CollectionBackend *collec
   p.setOpacity(0.4);
   p.drawImage((120 - nocover.width()) / 2, (120 - nocover.height()) / 2, nocover);
   p.end();
-//  no_cover_item_icon_ = QPixmap::fromImage(square_nocover);
+  // no_cover_item_icon_ = QPixmap::fromImage(square_nocover);
 
   cover_searcher_ = new AlbumCoverSearcher(no_cover_item_icon_, app_, this);
   cover_export_ = new AlbumCoverExport(this);
@@ -876,7 +876,7 @@ QString AlbumCoverManager::EffectiveAlbumArtistName(const QListWidgetItem &item)
 
 QImage AlbumCoverManager::GenerateNoCoverImage(const QIcon &no_cover_icon) const {
 
-  // Get a square version of noalbumart.png with some transparency:
+  // Get a square version of cdcase.png with some transparency:
   QImage nocover = no_cover_icon.pixmap(no_cover_icon.availableSizes().last()).toImage();
   nocover = nocover.scaled(120, 120, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 
diff --git a/src/covermanager/currentartloader.cpp b/src/covermanager/currentartloader.cpp
index a557c14d2..fca3a6a17 100644
--- a/src/covermanager/currentartloader.cpp
+++ b/src/covermanager/currentartloader.cpp
@@ -40,16 +40,18 @@ CurrentArtLoader::CurrentArtLoader(Application *app, QObject *parent)
       app_(app),
     temp_file_pattern_(QDir::tempPath() + "/strawberry-art-XXXXXX.jpg"),
     id_(0)
-{
+  {
+
   options_.scale_output_image_ = false;
   options_.pad_output_image_ = false;
-  //QIcon nocover = IconLoader::Load("nocover");
-  //options_.default_output_image_ = nocover.pixmap(nocover.availableSizes().last()).toImage();
-  options_.default_output_image_ = QImage(":/pictures/noalbumart.png");
+  // QIcon nocover = IconLoader::Load("cdcase");
+  // options_.default_output_image_ = nocover.pixmap(nocover.availableSizes().last()).toImage();
+  options_.default_output_image_ = QImage(":/pictures/cdcase.png");
 
   connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64, QImage)), SLOT(TempArtLoaded(quint64, QImage)));
 
   connect(app_->playlist_manager(), SIGNAL(CurrentSongChanged(Song)), SLOT(LoadArt(Song)));
+
 }
 
 CurrentArtLoader::~CurrentArtLoader() {}
diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp
index 6a6047c22..c15236afd 100644
--- a/src/dialogs/edittagdialog.cpp
+++ b/src/dialogs/edittagdialog.cpp
@@ -102,11 +102,11 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent)
       cover_art_id_(0),
       cover_art_is_set_(false),
     results_dialog_(new TrackSelectionDialog(this))
-{
+  {
 
-  //QIcon nocover = IconLoader::Load("nocover");
-  //cover_options_.default_output_image_ = AlbumCoverLoader::ScaleAndPad(cover_options_,  nocover.pixmap(nocover.availableSizes().last()).toImage());
-  cover_options_.default_output_image_ = AlbumCoverLoader::ScaleAndPad(cover_options_, QImage(":/pictures/noalbumart.png"));
+  // QIcon nocover = IconLoader::Load("cdcase");
+  // cover_options_.default_output_image_ = AlbumCoverLoader::ScaleAndPad(cover_options_, nocover.pixmap(nocover.availableSizes().last()).toImage());
+  cover_options_.default_output_image_ = AlbumCoverLoader::ScaleAndPad(cover_options_, QImage(":/pictures/cdcase.png"));
 
   connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64,QImage,QImage)), SLOT(ArtLoaded(quint64,QImage,QImage)));