diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 9784a5d3c7..584042f6fd 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -1,4 +1,4 @@
-<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="emby-collapsible,scripts/metadataimagespage,jqmcheckbox,paper-checkbox,paper-input,paper-fab,paper-icon-item,paper-item-body">
+<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="emby-collapsible,scripts/metadataimagespage,paper-checkbox,paper-input,paper-fab,paper-icon-item,paper-item-body">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
index 26f6e44ca9..c0968f2df8 100644
--- a/dashboard-ui/scripts/metadataimagespage.js
+++ b/dashboard-ui/scripts/metadataimagespage.js
@@ -144,80 +144,66 @@
         var html = '';
 
         if (!plugins.length) {
-            $('.imageFetchers', page).html(html).hide().trigger('create');
+            $('.imageFetchers', page).html(html).hide();
             return;
         }
 
         var i, length, plugin, id;
 
-        html += '<div class="ui-controlgroup-label" style="margin-bottom:0;padding-left:2px;">' + Globalize.translate('LabelImageFetchers') + '</div>';
-
-        html += '<div style="display:inline-block;vertical-align:top;">';
-        html += '<div data-role="controlgroup" class="imageFetcherGroup">';
+        html += '<div class="paperCheckboxListLabel">' + Globalize.translate('LabelImageFetchers') + '</div>';
+        html += '<div class="paperList">';
 
         for (i = 0, length = plugins.length; i < length; i++) {
 
             plugin = plugins[i];
 
-            id = 'chkImageFetcher' + i;
-
             var isChecked = config.DisabledImageFetchers.indexOf(plugin.Name) == -1 ? ' checked="checked"' : '';
 
-            html += '<input class="chkImageFetcher" type="checkbox" name="' + id + '" id="' + id + '" data-pluginname="' + plugin.Name + '" data-mini="true"' + isChecked + '>';
-            html += '<label for="' + id + '">' + plugin.Name + '</label>';
-        }
+            html += '<paper-icon-item class="imageFetcherItem" data-pluginname="' + plugin.Name + '">';
 
-        html += '</div>';
-        html += '</div>';
+            html += '<paper-checkbox class="chkImageFetcher" data-pluginname="' + plugin.Name + '" item-icon' + isChecked + '></paper-checkbox>';
 
-        if (plugins.length > 1) {
-            html += '<div style="display:inline-block;vertical-align:top;margin-left:5px;">';
+            html += '<paper-item-body>';
 
-            for (i = 0, length = plugins.length; i < length; i++) {
+            html += '<div>';
+            html += plugin.Name;
+            html += '</div>';
 
-                html += '<div>';
+            html += '</paper-item-body>';
 
-                if (i > 0) {
-                    html += '<paper-icon-button class="btnUp" data-pluginindex="' + i + '" icon="keyboard-arrow-up" title="' + Globalize.translate('ButtonUp') + '" style="padding:3px 8px;"></paper-icon-button>';
-                } else {
-                    html += '<paper-icon-button disabled class="btnUp" data-pluginindex="' + i + '" icon="keyboard-arrow-up" title="' + Globalize.translate('ButtonUp') + '" style="padding:3px 8px;"></paper-icon-button>';
-                }
+            html += '<paper-icon-button class="btnUp" icon="keyboard-arrow-up" title="' + Globalize.translate('ButtonUp') + '" style="padding:3px 8px;"></paper-icon-button>';
+            html += '<paper-icon-button class="btnDown" icon="keyboard-arrow-down" title="' + Globalize.translate('ButtonDown') + '" style="padding:3px 8px;"></paper-icon-button>';
 
-                if (i < (plugins.length - 1)) {
-                    html += '<paper-icon-button class="btnDown" data-pluginindex="' + i + '" icon="keyboard-arrow-down" title="' + Globalize.translate('ButtonDown') + '" style="padding:3px 8px;"></paper-icon-button>';
-                } else {
-                    html += '<paper-icon-button disabled class="btnDown" data-pluginindex="' + i + '" icon="keyboard-arrow-down" title="' + Globalize.translate('ButtonDown') + '" style="padding:3px 8px;"></paper-icon-button>';
-                }
-                html += '</div>';
-            }
+            html += '</paper-icon-item>';
         }
 
         html += '</div>';
         html += '<div class="fieldDescription">' + Globalize.translate('LabelImageFetchersHelp') + '</div>';
 
-        var elem = $('.imageFetchers', page).html(html).show().trigger('create');
+        var elem = $('.imageFetchers', page).html(html).show();
 
         $('.btnDown', elem).on('click', function () {
-            var index = parseInt(this.getAttribute('data-pluginindex'));
 
-            var elemToMove = $('.imageFetcherGroup .ui-checkbox', page)[index];
+            var elemToMove = $(this).parents('.imageFetcherItem')[0];
 
-            var insertAfter = $(elemToMove).next('.ui-checkbox')[0];
+            var insertAfter = $(elemToMove).next('.imageFetcherItem')[0];
 
-            elemToMove.parentNode.removeChild(elemToMove);
-            $(elemToMove).insertAfter(insertAfter);
+            if (insertAfter) {
+                elemToMove.parentNode.removeChild(elemToMove);
+                $(elemToMove).insertAfter(insertAfter);
+            }
         });
 
         $('.btnUp', elem).on('click', function () {
 
-            var index = parseInt(this.getAttribute('data-pluginindex'));
+            var elemToMove = $(this).parents('.imageFetcherItem')[0];
 
-            var elemToMove = $('.imageFetcherGroup .ui-checkbox', page)[index];
+            var insertBefore = $(elemToMove).prev('.imageFetcherItem')[0];
 
-            var insertBefore = $(elemToMove).prev('.ui-checkbox')[0];
-
-            elemToMove.parentNode.removeChild(elemToMove);
-            $(elemToMove).insertBefore(insertBefore);
+            if (insertBefore) {
+                elemToMove.parentNode.removeChild(elemToMove);
+                $(elemToMove).insertBefore(insertBefore);
+            }
         });
     }
 
@@ -230,7 +216,7 @@
         var html = '';
 
         if (!plugins.length) {
-            $('.metadataSavers', page).html(html).hide().trigger('create');
+            $('.metadataSavers', page).html(html).hide();
             return;
         }
 
@@ -261,11 +247,11 @@
         var html = '';
 
         if (!plugins.length) {
-            $('.metadataFetchers', page).html(html).hide().trigger('create');
+            $('.metadataFetchers', page).html(html).hide();
             return;
         }
 
-        var i, length, plugin, id;
+        var i, length, plugin;
 
         html += '<div class="paperCheckboxListLabel">' + Globalize.translate('LabelMetadataDownloaders') + '</div>';
         html += '<div class="paperList">';
@@ -297,7 +283,7 @@
         html += '</div>';
         html += '<div class="fieldDescription">' + Globalize.translate('LabelMetadataDownloadersHelp') + '</div>';
 
-        var elem = $('.metadataFetchers', page).html(html).show().trigger('create');
+        var elem = $('.metadataFetchers', page).html(html).show();
 
         $('.btnDown', elem).on('click', function () {
 
@@ -333,7 +319,7 @@
         var html = '';
 
         if (plugins.length < 2) {
-            $('.metadataReaders', page).html(html).hide().trigger('create');
+            $('.metadataReaders', page).html(html).hide();
             return;
         }
 
@@ -431,7 +417,9 @@
 
         });
 
-        config.DisabledImageFetchers = $('.chkImageFetcher:not(:checked)', form).get().map(function (c) {
+        config.DisabledImageFetchers = $('.chkImageFetcher', form).get().filter(function (c) {
+            return !c.checked;
+        }).map(function (c) {
 
             return c.getAttribute('data-pluginname');