diff --git a/data/interfaces/default/album.html b/data/interfaces/default/album.html
index c3609d07..bf52cc56 100644
--- a/data/interfaces/default/album.html
+++ b/data/interfaces/default/album.html
@@ -51,7 +51,7 @@
 	<div class="table_wrapper">
 		<div id="albumheader" class="clearfix">	
 			<div id="albumImg">
-				<img height="200" alt="" class="albumArt">
+				<img height="200" alt="" class="albumArt" src="/artwork/album/${album['AlbumID']}">
 			</div>
 			
 			<h1><a href="http://musicbrainz.org/release-group/${album['AlbumID']}">${album['AlbumTitle']}</a></h1>
@@ -151,17 +151,6 @@
 <%def name="javascriptIncludes()">
 	<script src="js/libs/jquery.dataTables.min.js"></script>
 	<script>
-	
-	function getAlbumArt() {
-		var id = "${album['AlbumID']}";
-		var name = "${album['AlbumTitle']}";
-		var image = $("div#albumImg img");
-		if ( !image.hasClass('done') ) {
-			image.addClass('done');
-			getArtwork(image,id,name,'album');
-		}
-	}
-	
 	function getAlbumInfo() {
 		var id = "${album['AlbumID']}";
 		var elem = $("#albumInfo");
@@ -192,7 +181,6 @@
 	
 	$(document).ready(function()	{
 		getAlbumInfo();
-		getAlbumArt();
 		initThisPage();
 	});
 
diff --git a/data/interfaces/default/artist.html b/data/interfaces/default/artist.html
index 5e0f5402..ba40cb49 100644
--- a/data/interfaces/default/artist.html
+++ b/data/interfaces/default/artist.html
@@ -161,28 +161,6 @@
 	<script src="js/libs/jquery.dataTables.min.js"></script>
 	
 	<script>
-	
-	function getArtistArt() {
-		var id = "${artist['ArtistID']}";
-		var name = "${artist['ArtistName']}";
-		var image = $("div#artistImg img#artistImage");
-		if ( !image.hasClass('done') ) {
-			image.addClass('done');
-			getArtwork(image,id,name,'artist');
-		}
-	}
-	
-	function getAlbumArt() {
-		$("table#album_table tr td#albumart").each(function(){	
-			var id = $(this).children('img').attr('id');
-			var image = $(this).children('img');
-			if ( !image.hasClass('done') ) {
-				image.addClass('done');
-				getThumb(image,id,'album');
-			}
-		});
-	}
-	
 	function getArtistBio() {
 		var id = "${artist['ArtistID']}";
 		var elem = $("#artistBio");
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 65a2e670..9148e578 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -26,17 +26,6 @@
 <%def name="javascriptIncludes()">
 	<script src="js/libs/jquery.dataTables.min.js"></script>
 	<script>
-	function getArtistArt() {
-        var nodes = document.getElementById("artist_table").getElementsByTagName("img");
-        $("#artist_table img").each(function(){	
-			var id = $(this).attr('id');
-			var image = $(this);
-			if ( !image.hasClass('done') ) {
-				image.addClass('done');
-				getThumb(image,id,'artist');
-			}
-		});
-	}
 	function initThisPage() {
 		$('#artist_table').dataTable({
 			"bDestroy": true,
diff --git a/data/interfaces/default/manageartists.html b/data/interfaces/default/manageartists.html
index 7945d8ed..d1956d3c 100644
--- a/data/interfaces/default/manageartists.html
+++ b/data/interfaces/default/manageartists.html
@@ -66,7 +66,7 @@
 			%>
 			<tr class="grade${grade}">
 				<td id="select"><input type="checkbox" name="${artist['ArtistID']}" class="checkbox" /></td>
-				<td id="albumart"><div id="artistImg"><img class="albumArt" id="${artist['ArtistID']}" height="50" width="50"></div></td>
+				<td id="albumart"><div id="artistImg"><img class="albumArt" id="${artist['ArtistID']}" src="/artwork/thumbs/artist/${artist['ArtistID']}" height="50" width="50"></div></td>
 				<td id="name"><span title="${artist['ArtistSortName']}"></span><a href="artistPage?ArtistID=${artist['ArtistID']}">${artist['ArtistName']}</a></td>
 				<td id="status">${artist['Status']}</td>	
 				<td id="album"><span title="${releasedate}"></span><a href="albumPage?AlbumID=${artist['AlbumID']}">${albumdisplay}</a></td>
@@ -86,19 +86,7 @@
 <%def name="javascriptIncludes()">
 	<script src="js/libs/jquery.dataTables.min.js"></script>
 	<script>
-	function getArtistArt() {
-		$("table#artist_table tr td#albumart #artistImg").each(function(){	
-			var id = $(this).children('img').attr('id');
-			var image = $(this).children('img');
-			if ( !image.hasClass('done') ) {
-				image.addClass('done');
-				getThumb(image,id,'artist');
-			}
-		});
-	}
-
 	function initThisPage() {
-		getArtistArt();
 		$('#artist_table').dataTable({	
 			"bDestroy":true,		
 			"aoColumns": [
diff --git a/data/interfaces/default/upcoming.html b/data/interfaces/default/upcoming.html
index c2d33583..585ac39b 100644
--- a/data/interfaces/default/upcoming.html
+++ b/data/interfaces/default/upcoming.html
@@ -90,17 +90,6 @@
 <%def name="javascriptIncludes()">
 	<script src="js/libs/jquery.dataTables.min.js"></script>
 	<script>
-	
-	function getAlbumArt() {
-		$("td#albumart img").each(function(){	
-			var id = $(this).attr('title');
-			var image = $(this);
-			if ( !image.hasClass('done') ) {
-				image.addClass('done');
-				getThumb(image,id,'album');
-			}
-		});
-	}
 	function initThisPage() {
 		
 		$('#wanted_table').dataTable({