diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
index ba2c15a64..78d32eea2 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
@@ -1,4 +1,4 @@
-﻿define(['components/paperdialoghelper', 'paper-dialog', 'paper-input', 'paper-fab', 'paper-item-body'], function () {
+﻿define(['components/paperdialoghelper', 'paper-dialog', 'paper-input', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
 
     var currentDeferred;
     var hasChanges;
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
index 94f4cf769..c21a0f451 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
@@ -1,4 +1,4 @@
-﻿define(['components/paperdialoghelper', 'paper-fab', 'paper-item-body'], function () {
+﻿define(['components/paperdialoghelper', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
 
     var currentDeferred;
     var hasChanges;
diff --git a/dashboard-ui/components/subtitleeditor/subtitleeditor.js b/dashboard-ui/components/subtitleeditor/subtitleeditor.js
index a827fce4a..5fff1d30f 100644
--- a/dashboard-ui/components/subtitleeditor/subtitleeditor.js
+++ b/dashboard-ui/components/subtitleeditor/subtitleeditor.js
@@ -1,4 +1,4 @@
-﻿define(['components/paperdialoghelper', 'paper-fab', 'paper-item-body'], function () {
+﻿define(['components/paperdialoghelper', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
 
     var currentItem;
 
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 4dab7fc02..dcf04f32d 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -4,7 +4,7 @@
     <title>${TitleServer}</title>
 </head>
 <body>
-    <div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab,paper-item-body">
+    <div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index c10a0df5a..71c72a4d2 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -4,7 +4,7 @@
     <title></title>
 </head>
 <body>
-    <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents,paper-fab,paper-item-body">
+    <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents,paper-fab,paper-item-body,paper-icon-item">
 
         <div id="tvShowsTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 57b77a978..b91ffb70e 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -4,7 +4,7 @@
     <title>${TitleLiveTV}</title>
 </head>
 <body>
-    <div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab,paper-item-body">
+    <div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab,paper-item-body,paper-icon-item">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 9c3d0e8ed..4dd34ad13 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -5,7 +5,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paper-checkbox,paper-fab,paper-item-body" data-backbutton="true" data-menubutton="false">
+    <div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paper-checkbox,paper-fab,paper-item-body,paper-icon-item" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
             <form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html
index 759073aee..64fad7208 100644
--- a/dashboard-ui/mypreferencesmenu.html
+++ b/dashboard-ui/mypreferencesmenu.html
@@ -5,7 +5,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,paper-fab,paper-item-body">
+    <div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,paper-fab,paper-item-body,paper-icon-item">
 
         <div data-role="content">
             <div class="readOnlyContent" style="margin: 0 auto;">
diff --git a/dashboard-ui/mysyncjob.html b/dashboard-ui/mysyncjob.html
index 56e292af7..e3cd4e23a 100644
--- a/dashboard-ui/mysyncjob.html
+++ b/dashboard-ui/mysyncjob.html
@@ -4,7 +4,7 @@
     <title>${TitleSync}</title>
 </head>
 <body>
-    <div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="jqmcollapsible,scripts/syncjob,paper-fab,paper-item-body" data-backbutton="true" data-menubutton="false">
+    <div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="jqmcollapsible,scripts/syncjob,paper-fab,paper-item-body,paper-icon-item" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/scripts/devices.js b/dashboard-ui/scripts/devices.js
index 3341ad810..17a5eafee 100644
--- a/dashboard-ui/scripts/devices.js
+++ b/dashboard-ui/scripts/devices.js
@@ -88,7 +88,7 @@
 
         })).then(function (result) {
 
-            require(['paper-fab', 'paper-item-body'], function () {
+            require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
                 load(page, result.Items);
             });
 
diff --git a/dashboard-ui/scripts/livetvcomponents.js b/dashboard-ui/scripts/livetvcomponents.js
index 8350b59f3..697373b49 100644
--- a/dashboard-ui/scripts/livetvcomponents.js
+++ b/dashboard-ui/scripts/livetvcomponents.js
@@ -4,7 +4,7 @@
 
         return new Promise(function (resolve, reject) {
 
-            require(['paper-fab', 'paper-item-body'], function () {
+            require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
                 var html = '';
 
                 var index = '';
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 0a38c8300..50ad77db4 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -109,7 +109,7 @@
 
         }).then(function (result) {
 
-            require(['paper-fab', 'paper-item-body'], function () {
+            require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
                 renderRecordingGroups(page, result.Items);
             });
         });
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index fc756f277..26ceb9579 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -104,7 +104,7 @@
 
         ApiClient.getLiveTvSeriesTimers(query).then(function (result) {
 
-            require(['paper-fab', 'paper-item-body'], function () {
+            require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
                 renderTimers(page, result.Items);
             });
 
diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js
index 536fd6633..a89747208 100644
--- a/dashboard-ui/scripts/notifications.js
+++ b/dashboard-ui/scripts/notifications.js
@@ -108,7 +108,7 @@
             });
         }
 
-        require(['humanedate', 'paper-fab', 'paper-item-body'], function () {
+        require(['humanedate', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
             for (var i = 0, length = list.length; i < length; i++) {
 
                 var notification = list[i];
diff --git a/dashboard-ui/scripts/notificationsettings.js b/dashboard-ui/scripts/notificationsettings.js
index d7b90e30b..73cea213f 100644
--- a/dashboard-ui/scripts/notificationsettings.js
+++ b/dashboard-ui/scripts/notificationsettings.js
@@ -66,7 +66,7 @@
 
         var page = this;
 
-        require(['paper-fab', 'paper-item-body'], function () {
+        require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
             reload(page);
         });
     });
diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js
index 85357b66b..a2e6cdd22 100644
--- a/dashboard-ui/scripts/registrationservices.js
+++ b/dashboard-ui/scripts/registrationservices.js
@@ -97,7 +97,7 @@
 
     function showPlaybackOverlay(deferred) {
 
-        require(['components/paperdialoghelper', 'paper-fab', 'paper-item-body'], function () {
+        require(['components/paperdialoghelper', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
 
             var dlg = PaperDialogHelper.createDialog({});
 
diff --git a/dashboard-ui/scripts/scheduledtaskspage.js b/dashboard-ui/scripts/scheduledtaskspage.js
index 5282691f4..33903a667 100644
--- a/dashboard-ui/scripts/scheduledtaskspage.js
+++ b/dashboard-ui/scripts/scheduledtaskspage.js
@@ -280,7 +280,7 @@
 
         startInterval();
 
-        require(['paper-fab', 'paper-progress', 'paper-item-body'], function () {
+        require(['paper-fab', 'paper-progress', 'paper-item-body', 'paper-icon-item'], function () {
             reloadList(page);
         });
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 91cc9f2c4..bc3cccb35 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2005,9 +2005,6 @@ var AppInfo = {};
         deps.push('paper-button');
         deps.push('paper-icon-button');
 
-        // TODO: These need to be removed
-        deps.push('paper-icon-item');
-
         require(deps, function () {
 
             // TODO: This needs to be deprecated, but it's used heavily
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index 212825969..5adc2cf91 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver,paper-fab,paper-item-body">
+    <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver,paper-fab,paper-item-body,paper-icon-item">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/syncjob.html b/dashboard-ui/syncjob.html
index 48d3e7233..539d1430d 100644
--- a/dashboard-ui/syncjob.html
+++ b/dashboard-ui/syncjob.html
@@ -4,7 +4,7 @@
     <title>${TitleSync}</title>
 </head>
 <body>
-    <div id="syncJobPage" data-role="page" class="page type-interior syncConfigurationPage syncJobPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="jqmcontrolgroup,scripts/syncjob,paper-fab,paper-item-body">
+    <div id="syncJobPage" data-role="page" class="page type-interior syncConfigurationPage syncJobPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="jqmcontrolgroup,scripts/syncjob,paper-fab,paper-item-body,paper-icon-item">
 
         <div data-role="content">
             <div class="content-primary">
