diff --git a/vrobbler/apps/scrobbles/static/images/not-found.png b/vrobbler/apps/scrobbles/static/images/not-found.png
new file mode 100644
index 0000000..53c3133
Binary files /dev/null and b/vrobbler/apps/scrobbles/static/images/not-found.png differ
diff --git a/vrobbler/templates/scrobbles/scrobble_list.html b/vrobbler/templates/scrobbles/scrobble_list.html
index bb2cf1d..d2be650 100644
--- a/vrobbler/templates/scrobbles/scrobble_list.html
+++ b/vrobbler/templates/scrobbles/scrobble_list.html
@@ -107,7 +107,7 @@
                                 {% if artists.0.thumbnail %}
                                 <a href="{{artists.0.get_absolute_url}}"><img lt="{{artists.0.name}}" src="{{artists.0.thumbnail.url}}" width="300px"></a>
                                 {% else %}
-                                <a href="{{artists.0.get_absolute_url}}"><img lt="{{artists.0.name}}" src="{% static "images/artist-placeholder.jpg" %}" width="300px"></a>
+                                <a href="{{artists.0.get_absolute_url}}"><img lt="{{artists.0.name}}" src="{% static "images/not-found.png" %}" width="300px"></a>
                                 {% endif %}
                             </div>
                         </div>
@@ -118,7 +118,7 @@
                                     {% if artists.1.thumbnail %}
                                     <a href="{{artists.1.get_absolute_url}}"><img lt="{{artists.1.name}}" src="{{artists.1.thumbnail.url}}" width="150px"></a>
                                     {% else %}
-                                    <a href="{{artists.1.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="150px"></a>
+                                    <a href="{{artists.1.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="150px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:50%">
@@ -126,7 +126,7 @@
                                     {% if artists.2.thumbnail %}
                                     <a href="{{artists.2.get_absolute_url}}"><img src="{{artists.2.thumbnail.url}}" width="150px"></a>
                                     {% else %}
-                                    <a href="{{artists.2.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="150px"></a>
+                                    <a href="{{artists.2.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="150px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:50%">
@@ -134,7 +134,7 @@
                                     {% if artists.3.thumbnail %}
                                     <a href="{{artists.3.get_absolute_url}}"><img src="{{artists.3.thumbnail.url}}" width="150px"></a>
                                     {% else %}
-                                    <a href="{{artists.3.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="150px"></a>
+                                    <a href="{{artists.3.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="150px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:50%">
@@ -142,7 +142,7 @@
                                     {% if artists.4.thumbnail %}
                                     <a href="{{artists.4.get_absolute_url}}"><img src="{{artists.4.thumbnail.url}}" width="150px"></a>
                                     {% else %}
-                                    <a href="{{artists.4.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="150px"></a>
+                                    <a href="{{artists.4.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="150px"></a>
                                     {% endif %}
                                 </div>
                             </div>
@@ -154,7 +154,7 @@
                                     {% if artists.5.thumbnail %}
                                     <a href="{{artists.5.get_absolute_url}}"><img src="{{artists.5.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.5.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.5.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -162,7 +162,7 @@
                                     {% if artists.6.thumbnail %}
                                     <a href="{{artists.6.get_absolute_url}}"><img src="{{artists.6.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.6.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.6.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -170,7 +170,7 @@
                                     {% if artists.7.thumbnail %}
                                     <a href="{{artists.7.get_absolute_url}}"><img src="{{artists.7.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.7.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.7.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -178,7 +178,7 @@
                                     {% if artists.8.thumbnail %}
                                     <a href="{{artists.8.get_absolute_url}}"><img src="{{artists.8.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.8.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.8.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -186,7 +186,7 @@
                                     {% if artists.9.thumbnail %}
                                     <a href="{{artists.9.get_absolute_url}}"><img src="{{artists.9.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.9.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.9.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -194,7 +194,7 @@
                                     {% if artists.10.thumbnail %}
                                     <a href="{{artists.10.get_absolute_url}}"><img src="{{artists.10.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.10.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.10.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -202,7 +202,7 @@
                                     {% if artists.11.thumbnail %}
                                     <a href="{{artists.11.get_absolute_url}}"><img src="{{artists.11.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.11.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.11.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -210,7 +210,7 @@
                                     {% if artists.12.thumbnail %}
                                     <a href="{{artists.12.get_absolute_url}}"><img src="{{artists.12.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.12.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.12.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -218,7 +218,7 @@
                                     {% if artists.13.thumbnail %}
                                     <a href="{{artists.13.get_absolute_url}}"><img src="{{artists.13.thumbnail.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{artists.13.get_absolute_url}}"><img src="{% static "images/artist-placeholder.jpg" %}" width="100px"></a>
+                                    <a href="{{artists.13.get_absolute_url}}"><img src="{% static "images/not-found.png" %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                             </div>
@@ -252,7 +252,7 @@
                                 {% if tracks.0.album.cover_image %}
                                 <a href="{{tracks.0.get_absolute_url}}"><img src="{{tracks.0.album.cover_image.url}}" width="300px"></a>
                                 {% else %}
-                                <a href="{{tracks.0.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="300px"></a>
+                                <a href="{{tracks.0.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="300px"></a>
                                 {% endif %}
                             </div>
                         </div>
@@ -263,7 +263,7 @@
                                     {% if tracks.1.album.cover_image %}
                                     <a href="{{tracks.1.get_absolute_url}}"><img src="{{tracks.1.album.cover_image.url}}" width="150px"></a>
                                     {% else %}
-                                    <a href="{{tracks.1.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="150px"></a>
+                                    <a href="{{tracks.1.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="150px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" style="width:50%">
@@ -271,7 +271,7 @@
                                     {% if tracks.2.album.cover_image %}
                                     <a href="{{tracks.2.get_absolute_url}}"><img src="{{tracks.2.album.cover_image.url}}" width="150px"></a>
                                     {% else %}
-                                    <a href="{{tracks.2.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="150px"></a>
+                                    <a href="{{tracks.2.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="150px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" style="width:50%">
@@ -279,7 +279,7 @@
                                     {% if tracks.3.album.cover_image %}
                                     <a href="{{tracks.3.get_absolute_url}}"><img src="{{tracks.3.album.cover_image.url}}" width="150px"></a>
                                     {% else %}
-                                    <a href="{{tracks.3.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="150px"></a>
+                                    <a href="{{tracks.3.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="150px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" style="width:50%">
@@ -287,7 +287,7 @@
                                     {% if tracks.4.album.cover_image %}
                                     <a href="{{tracks.4.get_absolute_url}}"><img src="{{tracks.4.album.cover_image.url}}" width="150px"></a>
                                     {% else %}
-                                    <a href="{{tracks.4.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="150px"></a>
+                                    <a href="{{tracks.4.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="150px"></a>
                                     {% endif %}
                                 </div>
                             </div>
@@ -299,7 +299,7 @@
                                     {% if tracks.5.album.cover_image %}
                                     <a href="{{tracks.5.get_absolute_url}}"><img src="{{tracks.5.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.5.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.5.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -307,7 +307,7 @@
                                     {% if tracks.6.album.cover_image %}
                                     <a href="{{tracks.6.get_absolute_url}}"><img src="{{tracks.6.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.6.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.6.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -315,7 +315,7 @@
                                     {% if tracks.7.album.cover_image %}
                                     <a href="{{tracks.7.get_absolute_url}}"><img src="{{tracks.7.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.7.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.7.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -323,7 +323,7 @@
                                     {% if tracks.8.album.cover_image %}
                                     <a href="{{tracks.8.get_absolute_url}}"><img src="{{tracks.8.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.8.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.8.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -331,7 +331,7 @@
                                     {% if tracks.9.album.cover_image %}
                                     <a href="{{tracks.9.get_absolute_url}}"><img src="{{tracks.9.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.9.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.9.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -339,7 +339,7 @@
                                     {% if tracks.10.album.cover_image %}
                                     <a href="{{tracks.10.get_absolute_url}}"><img src="{{tracks.10.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.10.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.10.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -347,7 +347,7 @@
                                     {% if tracks.11.album.cover_image %}
                                     <a href="{{tracks.11.get_absolute_url}}"><img src="{{tracks.11.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.11.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.11.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -355,7 +355,7 @@
                                     {% if tracks.12.album.cover_image %}
                                     <a href="{{tracks.12.get_absolute_url}}"><img src="{{tracks.12.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.12.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.12.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                                 <div class="image-wrapper" class="image-wrapper" style="width:33;">
@@ -363,7 +363,7 @@
                                     {% if tracks.13.album.cover_image %}
                                     <a href="{{tracks.13.get_absolute_url}}"><img src="{{tracks.13.album.cover_image.url}}" width="100px"></a>
                                     {% else %}
-                                    <a href="{{tracks.13.get_absolute_url}}"><img src="{% static 'images/track-placeholder.jpg' %}" width="100px"></a>
+                                    <a href="{{tracks.13.get_absolute_url}}"><img src="{% static 'images/not-found.png' %}" width="100px"></a>
                                     {% endif %}
                                 </div>
                             </div>