diff --git a/Html/metadataImages.html b/Html/metadataImages.html
index 5c9e7e02d2..b06a3205b7 100644
--- a/Html/metadataImages.html
+++ b/Html/metadataImages.html
@@ -30,44 +30,92 @@
                         </li>
                         <li>
                             <label>Enable additional image downloading:</label>
-                            <div data-role="controlgroup">
+                                
+                                <div data-role="collapsible">
+                                    <h3>Movies</h3>
+                                    <div data-role="controlgroup">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadMovieArt" name="chkDownloadMovieArt" />
+                                        <label for="chkDownloadMovieArt">Movie Art</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadMovieArt" name="chkDownloadMovieArt" />
-                                <label for="chkDownloadMovieArt">Movie Art</label>
+                                        <input type="checkbox" data-mini="true" id="chkDownloadMovieBanner" name="chkDownloadMovieBanner" />
+                                        <label for="chkDownloadMovieBanner">Movie Banner</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadMovieBanner" name="chkDownloadMovieBanner" />
-                                <label for="chkDownloadMovieBanner">Movie Banner</label>
+                                        <input type="checkbox" data-mini="true" id="chkDownloadMovieDisc" name="chkDownloadMovieDisc" />
+                                        <label for="chkDownloadMovieDisc">Movie Disc</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadMovieDisc" name="chkDownloadMovieDisc" />
-                                <label for="chkDownloadMovieDisc">Movie Disc</label>
+                                        <input type="checkbox" data-mini="true" id="chkDownloadMovieLogo" name="chkDownloadMovieLogo" />
+                                        <label for="chkDownloadMovieLogo">Movie Logo</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadMovieLogo" name="chkDownloadMovieLogo" />
-                                <label for="chkDownloadMovieLogo">Movie Logo</label>
+                                        <input type="checkbox" data-mini="true" id="chkDownloadMovieThumb" name="chkDownloadMovieThumb" />
+                                        <label for="chkDownloadMovieThumb">Movie Thumb</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadMovieThumb" name="chkDownloadMovieThumb" />
-                                <label for="chkDownloadMovieThumb">Movie Thumb</label>
+                                        
+                                    </div>
+                                </div>
 
-                                <input type="checkbox" data-mini="true" id="chKDownloadTVArt" name="chKDownloadTVArt" />
-                                <label for="chKDownloadTVArt">TV Series Art</label>
+                                <div data-role="collapsible">
+                                    <h3>TV Series</h3>
+                                    <div data-role="controlgroup">
+                                        <input type="checkbox" data-mini="true" id="chKDownloadTVArt" name="chKDownloadTVArt" />
+                                        <label for="chKDownloadTVArt">TV Series Art</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadTVBanner" name="chkDownloadTVBanner" />
-                                <label for="chkDownloadTVBanner">TV Series Banner</label>
+                                        <input type="checkbox" data-mini="true" id="chkDownloadTVBanner" name="chkDownloadTVBanner" />
+                                        <label for="chkDownloadTVBanner">TV Series Banner</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadTVLogo" name="chkDownloadTVLogo" />
-                                <label for="chkDownloadTVLogo">TV Series Logo</label>
+                                        <input type="checkbox" data-mini="true" id="chkDownloadTVLogo" name="chkDownloadTVLogo" />
+                                        <label for="chkDownloadTVLogo">TV Series Logo</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadTVThumb" name="chkDownloadTVThumb" />
-                                <label for="chkDownloadTVThumb">TV Series Thumb</label>
+                                        <input type="checkbox" data-mini="true" id="chkDownloadTVThumb" name="chkDownloadTVThumb" />
+                                        <label for="chkDownloadTVThumb">TV Series Thumb</label>
+                                    </div>
+                                </div>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadSeasonBackdrops" name="chkDownloadSeasonBackdrops" />
-                                <label for="chkDownloadSeasonBackdrops">TV Season Backdrops</label>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadSeasonBanner" name="chkDownloadSeasonBanner" />
-                                <label for="chkDownloadSeasonBanner">TV Season Banner</label>
+                                <div data-role="collapsible">
+                                    <h3>TV Seasons</h3>
+                                    <div data-role="controlgroup">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadSeasonBackdrops" name="chkDownloadSeasonBackdrops" />
+                                        <label for="chkDownloadSeasonBackdrops">TV Season Backdrops</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkDownloadSeasonBanner" name="chkDownloadSeasonBanner" />
+                                        <label for="chkDownloadSeasonBanner">TV Season Banner</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkDownloadSeasonThumb" name="chkDownloadSeasonThumb" />
+                                        <label for="chkDownloadSeasonThumb">TV Season Thumb</label>
+                                    </div>
+
+                                </div>
+
+                                <div data-role="collapsible">
+                                    <h3>Music Artists</h3>
+                                    <div data-role="controlgroup">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadArtistThumb" name="chkDownloadArtistThumb" />
+                                        <label for="chkDownloadArtistThumb">Music Artist Thumb (primary image)</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkDownloadArtistBackdrops" name="chkDownloadArtistBackdrops" />
+                                        <label for="chkDownloadArtistBackdrops">Music Artist Backdrops</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkDownloadArtistLogo" name="chkDownloadArtistLogo" />
+                                        <label for="chkDownloadArtistLogo">Music Artist Logo</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkDownloadArtistBanner" name="chkDownloadArtistBanner" />
+                                        <label for="chkDownloadArtistBanner">Music Artist Banner</label>
+                                    </div>
+
+                                </div>
+                                
+                                <div data-role="collapsible">
+                                    <h3>Music Albums</h3>
+                                    <div data-role="controlgroup">
+                                        <input type="checkbox" data-mini="true" id="chkDownloadAlbumPrimary" name="chkDownloadAlbumPrimary" />
+                                        <label for="chkDownloadAlbumPrimary">Music Album Cover</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkDownloadAlbumBackdrops" name="chkDownloadAlbumBackdrops" />
+                                        <label for="chkDownloadAlbumBackdrops">Music Album Backdrops</label>
+                                    </div>
+
+                                </div>
 
-                                <input type="checkbox" data-mini="true" id="chkDownloadSeasonThumb" name="chkDownloadSeasonThumb" />
-                                <label for="chkDownloadSeasonThumb">TV Season Thumb</label>
-                            </div>
                         </li>
                         <li>
                             <label for="selectTmdbPosterDownloadSize">Tmdb poster download size: </label>
diff --git a/Html/scripts/MetadataImagesPage.js b/Html/scripts/MetadataImagesPage.js
index c9f2523f7a..0dff46c398 100644
--- a/Html/scripts/MetadataImagesPage.js
+++ b/Html/scripts/MetadataImagesPage.js
@@ -20,18 +20,24 @@
         $('#chkRefreshItemImages', page).checked(config.RefreshItemImages).checkboxradio("refresh");
         $('#txtNumbackdrops', page).val(config.MaxBackdrops);
 
-        $('#chkDownloadMovieArt', page).checked(config.DownloadMovieArt).checkboxradio("refresh");
-        $('#chkDownloadMovieBanner', page).checked(config.DownloadMovieBanner).checkboxradio("refresh");
-        $('#chkDownloadMovieDisc', page).checked(config.DownloadMovieDisc).checkboxradio("refresh");
-        $('#chkDownloadMovieLogo', page).checked(config.DownloadMovieLogo).checkboxradio("refresh");
-        $('#chkDownloadMovieThumb', page).checked(config.DownloadMovieThumb).checkboxradio("refresh");
-        $('#chKDownloadTVArt', page).checked(config.DownloadTVArt).checkboxradio("refresh");
-        $('#chkDownloadTVBanner', page).checked(config.DownloadTVBanner).checkboxradio("refresh");
-        $('#chkDownloadTVLogo', page).checked(config.DownloadTVLogo).checkboxradio("refresh");
-        $('#chkDownloadTVThumb', page).checked(config.DownloadTVThumb).checkboxradio("refresh");
-        $('#chkDownloadSeasonBanner', page).checked(config.DownloadTVSeasonBanner).checkboxradio("refresh");
-        $('#chkDownloadSeasonThumb', page).checked(config.DownloadTVSeasonThumb).checkboxradio("refresh");
-        $('#chkDownloadSeasonBackdrops', page).checked(config.DownloadTVSeasonBackdrops).checkboxradio("refresh");
+        $('#chkDownloadMovieArt', page).checked(config.DownloadMovieImages.Art).checkboxradio("refresh");
+        $('#chkDownloadMovieBanner', page).checked(config.DownloadMovieImages.Banner).checkboxradio("refresh");
+        $('#chkDownloadMovieDisc', page).checked(config.DownloadMovieImages.Disc).checkboxradio("refresh");
+        $('#chkDownloadMovieLogo', page).checked(config.DownloadMovieImages.Logo).checkboxradio("refresh");
+        $('#chkDownloadMovieThumb', page).checked(config.DownloadMovieImages.Thumb).checkboxradio("refresh");
+        $('#chKDownloadTVArt', page).checked(config.DownloadSeriesImages.Art).checkboxradio("refresh");
+        $('#chkDownloadTVBanner', page).checked(config.DownloadSeriesImages.Banner).checkboxradio("refresh");
+        $('#chkDownloadTVLogo', page).checked(config.DownloadSeriesImages.Logo).checkboxradio("refresh");
+        $('#chkDownloadTVThumb', page).checked(config.DownloadSeriesImages.Thumb).checkboxradio("refresh");
+        $('#chkDownloadSeasonBanner', page).checked(config.DownloadSeasonImages.Banner).checkboxradio("refresh");
+        $('#chkDownloadSeasonThumb', page).checked(config.DownloadSeasonImages.Thumb).checkboxradio("refresh");
+        $('#chkDownloadSeasonBackdrops', page).checked(config.DownloadSeasonImages.Backdrops).checkboxradio("refresh");
+        $('#chkDownloadArtistThumb', page).checked(config.DownloadMusicArtistImages.Thumb).checkboxradio("refresh");
+        $('#chkDownloadArtistBackdrops', page).checked(config.DownloadMusicArtistImages.Backdrops).checkboxradio("refresh");
+        $('#chkDownloadArtistLogo', page).checked(config.DownloadMusicArtistImages.Logo).checkboxradio("refresh");
+        $('#chkDownloadArtistBanner', page).checked(config.DownloadMusicArtistImages.Banner).checkboxradio("refresh");
+        $('#chkDownloadAlbumPrimary', page).checked(config.DownloadMusicAlbumImages.Primary).checkboxradio("refresh");
+        $('#chkDownloadAlbumBackdrops', page).checked(config.DownloadMusicAlbumImages.Backdrops).checkboxradio("refresh");
 
         Dashboard.hideLoadingMsg();
     },
@@ -50,18 +56,24 @@
             config.RefreshItemImages = $('#chkRefreshItemImages', form).checked();
             config.MaxBackdrops = $('#txtNumbackdrops', form).val();
 
-            config.DownloadMovieArt = $('#chkDownloadMovieArt', form).checked();
-            config.DownloadMovieBanner = $('#chkDownloadMovieBanner', form).checked();
-            config.DownloadMovieDisc = $('#chkDownloadMovieDisc', form).checked();
-            config.DownloadMovieLogo = $('#chkDownloadMovieLogo', form).checked();
-            config.DownloadMovieThumb = $('#chkDownloadMovieThumb', form).checked();
-            config.DownloadTVArt = $('#chKDownloadTVArt', form).checked();
-            config.DownloadTVBanner = $('#chkDownloadTVBanner', form).checked();
-            config.DownloadTVLogo = $('#chkDownloadTVLogo', form).checked();
-            config.DownloadTVThumb = $('#chkDownloadTVThumb', form).checked();
-            config.DownloadTVSeasonBanner = $('#chkDownloadSeasonBanner', form).checked();
-            config.DownloadTVSeasonThumb = $('#chkDownloadSeasonThumb', form).checked();
-            config.DownloadTVSeasonBackdrops = $('#chkDownloadSeasonBackdrops', form).checked();
+            config.DownloadMovieImages.Art = $('#chkDownloadMovieArt', form).checked();
+            config.DownloadMovieImages.Banner = $('#chkDownloadMovieBanner', form).checked();
+            config.DownloadMovieImages.Disc = $('#chkDownloadMovieDisc', form).checked();
+            config.DownloadMovieImages.Logo = $('#chkDownloadMovieLogo', form).checked();
+            config.DownloadMovieImages.Thumb = $('#chkDownloadMovieThumb', form).checked();
+            config.DownloadSeriesImages.Art = $('#chKDownloadTVArt', form).checked();
+            config.DownloadSeriesImages.Banner = $('#chkDownloadTVBanner', form).checked();
+            config.DownloadSeriesImages.Logo = $('#chkDownloadTVLogo', form).checked();
+            config.DownloadSeriesImages.Thumb = $('#chkDownloadTVThumb', form).checked();
+            config.DownloadSeasonImages.Banner = $('#chkDownloadSeasonBanner', form).checked();
+            config.DownloadSeasonImages.Thumb = $('#chkDownloadSeasonThumb', form).checked();
+            config.DownloadSeasonImages.Backdrops = $('#chkDownloadSeasonBackdrops', form).checked();
+            config.DownloadMusicArtistImages.Backdrops = $('#chkDownloadArtistBackdrops', form).checked();
+            config.DownloadMusicArtistImages.Logo = $('#chkDownloadArtistLogo', form).checked();
+            config.DownloadMusicArtistImages.Thumb = $('#chkDownloadArtistThumb', form).checked();
+            config.DownloadMusicArtistImages.Banner = $('#chkDownloadArtistBanner', form).checked();
+            config.DownloadMusicAlbumImages.Primary = $('#chkDownloadAlbumPrimary', form).checked();
+            config.DownloadMusicAlbumImages.Backdrops = $('#chkDownloadAlbumBackdrops', form).checked();
 
             ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
         });