diff --git a/src/ContextView.qml b/src/ContextView.qml
--- a/src/ContextView.qml
+++ b/src/ContextView.qml
@@ -44,8 +44,8 @@
 
         Image {
             id: albumIcon
-            source: albumArtUrl
 
+            source: albumArtUrl.toString() === '' ? Qt.resolvedUrl(elisaTheme.defaultAlbumImage) : albumArtUrl
             Layout.preferredWidth: elisaTheme.coverImageSize
             Layout.preferredHeight: elisaTheme.coverImageSize
             Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
@@ -135,7 +135,7 @@
             Image {
                 id: artistJumpIcon
 
-                source: Qt.resolvedUrl(elisaTheme.artistImage)
+                source: Qt.resolvedUrl(elisaTheme.defaultArtistImage)
 
                 Layout.preferredWidth: elisaTheme.smallImageSize
                 Layout.preferredHeight: elisaTheme.smallImageSize
diff --git a/src/HeaderBar.qml b/src/HeaderBar.qml
--- a/src/HeaderBar.qml
+++ b/src/HeaderBar.qml
@@ -54,7 +54,7 @@
         Image {
             id: oldBackground
 
-            source: (oldImage ? oldImage : Qt.resolvedUrl('background.jpg'))
+            source: (oldImage ? oldImage : Qt.resolvedUrl(elisaTheme.defaultBackgroundImage))
 
             asynchronous: true
 
@@ -88,7 +88,7 @@
         Image {
             id: newBackground
 
-            source: (newImage ? newImage : Qt.resolvedUrl('background.jpg'))
+            source: (newImage ? newImage : Qt.resolvedUrl(elisaTheme.defaultBackgroundImage))
 
             asynchronous: true
 
@@ -187,7 +187,7 @@
 
                     asynchronous: true
 
-                    source: (oldImage ? oldImage : Qt.resolvedUrl(elisaTheme.albumCover))
+                    source: (oldImage ? oldImage : Qt.resolvedUrl(elisaTheme.defaultAlbumImage))
 
                     sourceSize {
                         width: contentZone.height * 0.9
@@ -204,7 +204,7 @@
 
                     asynchronous: true
 
-                    source: (newImage ? newImage : Qt.resolvedUrl(elisaTheme.albumCover))
+                    source: (newImage ? newImage : Qt.resolvedUrl(elisaTheme.defaultAlbumImage))
 
                     visible: false
                     opacity: 0
@@ -336,13 +336,13 @@
         PropertyAction {
             target: newBackground
             property: "source"
-            value: (newImage ? newImage : Qt.resolvedUrl('background.jpg'))
+            value: (newImage ? newImage : Qt.resolvedUrl(elisaTheme.defaultBackgroundImage))
         }
 
         PropertyAction {
             target: newMainIcon
             property: "source"
-            value: (newImage ? newImage : Qt.resolvedUrl(elisaTheme.albumCover))
+            value: (newImage ? newImage : Qt.resolvedUrl(elisaTheme.defaultAlbumImage))
         }
 
         ParallelAnimation {
@@ -374,13 +374,13 @@
         PropertyAction {
             target: oldBackground
             property: 'source'
-            value: (headerBar.oldImage ? headerBar.oldImage : Qt.resolvedUrl('background.jpg'))
+            value: (headerBar.oldImage ? headerBar.oldImage : Qt.resolvedUrl(elisaTheme.defaultBackgroundImage))
         }
 
         PropertyAction {
             target: oldMainIcon
             property: 'source'
-            value: (headerBar.oldImage ? headerBar.oldImage : Qt.resolvedUrl(elisaTheme.albumCover))
+            value: (headerBar.oldImage ? headerBar.oldImage : Qt.resolvedUrl(elisaTheme.defaultAlbumImage))
         }
 
         PropertyAction {
diff --git a/src/MediaAlbumDelegate.qml b/src/MediaAlbumDelegate.qml
--- a/src/MediaAlbumDelegate.qml
+++ b/src/MediaAlbumDelegate.qml
@@ -197,7 +197,7 @@
                         fillMode: Image.PreserveAspectFit
                         smooth: true
 
-                        source: (mediaServerEntry.image ? mediaServerEntry.image : Qt.resolvedUrl(elisaTheme.albumCover))
+                        source: (mediaServerEntry.image ? mediaServerEntry.image : Qt.resolvedUrl(elisaTheme.defaultAlbumImage))
 
                         asynchronous: true
 
diff --git a/src/MediaAlbumView.qml b/src/MediaAlbumView.qml
--- a/src/MediaAlbumView.qml
+++ b/src/MediaAlbumView.qml
@@ -102,7 +102,7 @@
             playerControl: topListing.playerControl
             artist: topListing.artistName
             album: topListing.albumName
-            image: (topListing.albumArtUrl ? topListing.albumArtUrl : elisaTheme.albumCover)
+            image: (topListing.albumArtUrl ? topListing.albumArtUrl : elisaTheme.defaultAlbumImage)
             tracksCount: topListing.tracksCount
 
             enqueueAction: Action {
diff --git a/src/MediaArtistAlbumView.qml b/src/MediaArtistAlbumView.qml
--- a/src/MediaArtistAlbumView.qml
+++ b/src/MediaArtistAlbumView.qml
@@ -67,7 +67,7 @@
             parentStackView: rootElement.stackView
             playList: rootElement.playListModel
             playerControl: rootElement.playerControl
-            image: Qt.resolvedUrl(elisaTheme.artistImage)
+            image: Qt.resolvedUrl(elisaTheme.defaultArtistImage)
 
             enqueueAction: Action {
                 text: i18nc("Add all tracks from artist to play list", "Enqueue")
diff --git a/src/MediaArtistDelegate.qml b/src/MediaArtistDelegate.qml
--- a/src/MediaArtistDelegate.qml
+++ b/src/MediaArtistDelegate.qml
@@ -163,7 +163,7 @@
                     Image {
                         id: artistDecoration
 
-                        source: Qt.resolvedUrl(elisaTheme.artistImage)
+                        source: Qt.resolvedUrl(elisaTheme.defaultArtistImage)
 
                         anchors.fill: parent
 
@@ -176,7 +176,7 @@
 
                         asynchronous: true
 
-                        layer.enabled: image == '' ? false : true
+                        layer.enabled: image === '' ? false : true
                         layer.effect: DropShadow {
                             radius: 10
                             spread: 0.1
diff --git a/src/MediaTrackDelegate.qml b/src/MediaTrackDelegate.qml
--- a/src/MediaTrackDelegate.qml
+++ b/src/MediaTrackDelegate.qml
@@ -146,7 +146,7 @@
                         fillMode: Image.PreserveAspectFit
                         smooth: true
 
-                        source: (coverImage ? coverImage : Qt.resolvedUrl(elisaTheme.albumCover))
+                        source: (coverImage ? coverImage : Qt.resolvedUrl(elisaTheme.defaultAlbumImage))
 
                         asynchronous: true
 
diff --git a/src/PlayListEntry.qml b/src/PlayListEntry.qml
--- a/src/PlayListEntry.qml
+++ b/src/PlayListEntry.qml
@@ -116,7 +116,7 @@
                     Image {
                         id: mainIcon
 
-                        source: (isValid ? (playListEntry.itemDecoration ? playListEntry.itemDecoration : Qt.resolvedUrl(elisaTheme.albumCover)) : Qt.resolvedUrl(elisaTheme.errorIcon))
+                        source: (isValid ? (playListEntry.itemDecoration ? playListEntry.itemDecoration : Qt.resolvedUrl(elisaTheme.defaultAlbumImage)) : Qt.resolvedUrl(elisaTheme.errorIcon))
 
                         Layout.minimumWidth: headerRow.height - 4
                         Layout.maximumWidth: headerRow.height - 4
diff --git a/src/Theme.qml b/src/Theme.qml
--- a/src/Theme.qml
+++ b/src/Theme.qml
@@ -21,8 +21,13 @@
 import QtQuick.Controls 1.4
 
 Item {
-    property string albumCover: 'image://icon/media-optical-audio'
-    property string artistImage: 'image://icon/view-media-artist'
+    property string defaultAlbumImage: 'image://icon/media-optical-audio'
+    property string defaultArtistImage: 'image://icon/view-media-artist'
+    property string defaultBackgroundImage: 'background.jpg'
+    property string artistIcon: 'image://icon/view-media-artist'
+    property string albumIcon: 'image://icon/media-album-cover'
+    property string playlistIcon: 'image://icon/amarok_playlist'
+    property string tracksIcon: 'image://icon/media-album-track'
     property string clearIcon: 'image://icon/edit-clear'
     property string skipBackwardIcon: 'image://icon/media-skip-backward'
     property string pauseIcon: 'image://icon/media-playback-pause'
diff --git a/src/ViewSelector.qml b/src/ViewSelector.qml
--- a/src/ViewSelector.qml
+++ b/src/ViewSelector.qml
@@ -168,10 +168,10 @@
 
                     Component.onCompleted:
                     {
-                        pageModel.insert(0, {"name": i18nc("Title of the view of the playlist", "Now Playing"), "iconName": "image://icon/amarok_playlist"})
-                        pageModel.insert(1, {"name": i18nc("Title of the view of all albums", "Albums"), "iconName": "image://icon/media-album-cover"})
-                        pageModel.insert(2, {"name": i18nc("Title of the view of all artists", "Artists"), "iconName": "image://icon/view-media-artist"})
-                        pageModel.insert(3, {"name": i18nc("Title of the view of all tracks", "Tracks"), "iconName": "image://icon/media-album-track"})
+                        pageModel.insert(0, {"name": i18nc("Title of the view of the playlist", "Now Playing"), "iconName": elisaTheme.playlistIcon})
+                        pageModel.insert(1, {"name": i18nc("Title of the view of all albums", "Albums"), "iconName": elisaTheme.albumIcon})
+                        pageModel.insert(2, {"name": i18nc("Title of the view of all artists", "Artists"), "iconName": elisaTheme.artistIcon})
+                        pageModel.insert(3, {"name": i18nc("Title of the view of all tracks", "Tracks"), "iconName": elisaTheme.tracksIcon})
 
                         viewModeView.currentIndex = 1
                     }
diff --git a/src/windows/WindowsTheme.qml b/src/windows/WindowsTheme.qml
--- a/src/windows/WindowsTheme.qml
+++ b/src/windows/WindowsTheme.qml
@@ -21,8 +21,13 @@
 import QtQuick.Controls 1.4
 
 Item {
-    property string albumCover: 'image://icon/media-optical-audio'
-    property string artistImage: 'image://icon/view-media-artist'
+    property string defaultAlbumImage: 'image://icon/media-optical-audio'
+    property string defaultArtistImage: 'image://icon/view-media-artist'
+    property string defaultBackgroundImage: 'background.jpg'
+    property string artistIcon: 'image://icon/view-media-artist'
+    property string albumIcon: 'image://icon/media-album-cover'
+    property string playlistIcon: 'image://icon/amarok_playlist'
+    property string tracksIcon: 'image://icon/media-album-track'
     property string clearIcon: 'image://icon/edit-clear'
     property string skipBackwardIcon: 'image://icon/media-skip-backward'
     property string pauseIcon: 'image://icon/media-playback-pause'