diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json
index 9e650790be..8119ebcf41 100644
--- a/dashboard-ui/bower_components/iron-meta/.bower.json
+++ b/dashboard-ui/bower_components/iron-meta/.bower.json
@@ -25,14 +25,14 @@
     "web-component-tester": "*",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/PolymerElements/iron-meta",
+  "homepage": "https://github.com/polymerelements/iron-meta",
   "_release": "1.0.3",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.3",
     "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
   },
-  "_source": "git://github.com/PolymerElements/iron-meta.git",
+  "_source": "git://github.com/polymerelements/iron-meta.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-meta"
+  "_originalSource": "polymerelements/iron-meta"
 }
\ No newline at end of file
diff --git a/dashboard-ui/css/metadataeditor.css b/dashboard-ui/css/metadataeditor.css
index 11142ede77..1961f85516 100644
--- a/dashboard-ui/css/metadataeditor.css
+++ b/dashboard-ui/css/metadataeditor.css
@@ -193,15 +193,9 @@
 
 .editorTile {
     display: inline-block;
-    margin: 5px;
-    padding: 8px;
-    border: 1px solid #444;
-    background-image: -webkit-gradient(linear,left top,left bottom,from(#333),to(#2d2d2d));
-    background-image: -webkit-linear-gradient(#333,#2d2d2d);
-    background-image: -moz-linear-gradient(#333,#2d2d2d);
-    background-image: -ms-linear-gradient(#333,#2d2d2d);
-    background-image: -o-linear-gradient(#333,#2d2d2d);
-    background-image: linear-gradient(#333,#2d2d2d);
+    margin: 0 2em 2em 0;
+    text-align: center;
+    vertical-align: middle;
 }
 
 .imageEditorTile {
diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html
index 4b6809a655..25c2e573fb 100644
--- a/dashboard-ui/edititemimages.html
+++ b/dashboard-ui/edititemimages.html
@@ -22,37 +22,29 @@
                     <a href="#" data-role="button" class="ui-btn-active">${TabImages}</a>
                 </div>
 
-                <div style="margin: -25px 0 1em;">
+                <div style="margin: 0 0 1em;">
 
-                    <div style="display: inline-block;">
-                        <a class="lnkBrowseImages lnkBrowseAllImages hide" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="cloud" data-mini="true">${ButtonBrowseImages}</a>
-                    </div>
-                    <div style="display: inline-block;">
-                        <a href="#popupUpload" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="plus" data-mini="true">${ButtonUpload}</a>
-                    </div>
+                    <paper-button raised class="subdued btnBrowseAllImages"><iron-icon icon="cloud"></iron-icon><span>${ButtonBrowseImages}</span></paper-button>
+                    <paper-button raised class="subdued btnOpenUploadMenu"><iron-icon icon="add"></iron-icon><span>${ButtonUpload}</span></paper-button>
                 </div>
 
                 <div id="imagesContainer" style="display: none;">
-                    <div data-role="collapsible" data-mini="true" data-collapsed="false" class="imageEditorCollapsible" data-content-theme="false">
-                        <h3>${HeaderImages}</h3>
-                        <div id="images">
-                        </div>
+                    <h1>${HeaderImages}</h1>
+                    <div id="images">
                     </div>
+                    <br />
                 </div>
 
                 <div id="backdropsContainer" style="display: none;">
-                    <div data-role="collapsible" data-mini="true" data-collapsed="false" class="imageEditorCollapsible" data-content-theme="false">
-                        <h3>${HeaderBackdrops}</h3>
-                        <div id="backdrops">
-                        </div>
+                    <h1>${HeaderBackdrops}</h1>
+                    <div id="backdrops">
                     </div>
+                    <br />
                 </div>
 
                 <div id="screenshotsContainer" style="display: none;">
-                    <div data-role="collapsible" data-mini="true" data-collapsed="false" class="imageEditorCollapsible" data-content-theme="false">
-                        <h3>${Screenshots}</h3>
-                        <div id="screenshots">
-                        </div>
+                    <h1>${Screenshots}</h1>
+                    <div id="screenshots">
                     </div>
                 </div>
 
diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js
index 37cd753ac8..8196532c88 100644
--- a/dashboard-ui/scripts/edititemimages.js
+++ b/dashboard-ui/scripts/edititemimages.js
@@ -288,7 +288,9 @@
 
             html += '<div class="editorTile imageEditorTile">';
 
-            html += '<div style="height:144px;vertical-align:top;background-repeat:no-repeat;background-size:contain;background-image:url(\'' + LibraryBrowser.getImageUrl(currentItem, image.ImageType, image.ImageIndex, { height: 144 }) + '\');"></div>';
+            var height = 150;
+
+            html += '<div style="height:' + height + 'px;vertical-align:top;background-repeat:no-repeat;background-position:center center;background-size:contain;background-image:url(\'' + LibraryBrowser.getImageUrl(currentItem, image.ImageType, image.ImageIndex, { height: height }) + '\');"></div>';
 
             html += '<div>';
 
@@ -303,22 +305,22 @@
             if (image.ImageType == "Backdrop" || image.ImageType == "Screenshot") {
 
                 if (i > 0) {
-                    html += '<button type="button" data-icon="arrow-l" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.moveImage(\'' + image.ImageType + '\', ' + image.ImageIndex + ', ' + (i - 1) + ');" style="margin-bottom:0;">' + Globalize.translate('ButtonMoveLeft') + '</button>';
+                    html += '<paper-icon-button icon="chevron-left" onclick="EditItemImagesPage.moveImage(\'' + image.ImageType + '\', ' + image.ImageIndex + ', ' + (i - 1) + ');" title="' + Globalize.translate('ButtonMoveLeft') + '"></paper-icon-button>';
                 } else {
-                    html += '<button type="button" data-icon="arrow-l" data-mini="true" data-inline="true" data-iconpos="notext" style="margin-bottom:0;" disabled>' + Globalize.translate('ButtonMoveLeft') + '</button>';
+                    html += '<paper-icon-button icon="chevron-left" disabled title="' + Globalize.translate('ButtonMoveLeft') + '"></paper-icon-button>';
                 }
 
                 if (i < length - 1) {
-                    html += '<button type="button" data-icon="arrow-r" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.moveImage(\'' + image.ImageType + '\', ' + image.ImageIndex + ', ' + (i + 1) + ');" style="margin-bottom:0;">' + Globalize.translate('ButtonMoveRight') + '</button>';
+                    html += '<paper-icon-button icon="chevron-right" onclick="EditItemImagesPage.moveImage(\'' + image.ImageType + '\', ' + image.ImageIndex + ', ' + (i + 1) + ');" title="' + Globalize.translate('ButtonMoveRight') + '"></paper-icon-button>';
                 } else {
-                    html += '<button type="button" data-icon="arrow-r" data-mini="true" data-inline="true" data-iconpos="notext" style="margin-bottom:0;" disabled>' + Globalize.translate('ButtonMoveRight') + '</button>';
+                    html += '<paper-icon-button icon="chevron-right" disabled title="' + Globalize.translate('ButtonMoveRight') + '"></paper-icon-button>';
                 }
             }
 
-            html += '<button type="button" data-icon="delete" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.deleteImage(\'' + image.ImageType + '\', ' + (image.ImageIndex != null ? image.ImageIndex : "null") + ');" style="margin-bottom:0;">' + Globalize.translate('Delete') + '</button>';
+            html += '<paper-icon-button icon="delete" onclick="EditItemImagesPage.deleteImage(\'' + image.ImageType + '\', ' + (image.ImageIndex != null ? image.ImageIndex : "null") + ');" title="' + Globalize.translate('Delete') + '"></paper-icon-button>';
 
             if (imageProviders.length) {
-                html += '<button type="button" data-icon="cloud" data-mini="true" data-inline="true" data-iconpos="notext" onclick="EditItemImagesPage.showDownloadMenu(\'' + image.ImageType + '\');" style="margin-bottom:0;">' + Globalize.translate('ButtonBrowseOnlineImages') + '</button>';
+                html += '<paper-icon-button icon="cloud" onclick="EditItemImagesPage.showDownloadMenu(\'' + image.ImageType + '\');" title="' + Globalize.translate('ButtonBrowseOnlineImages') + '"></paper-icon-button>';
             }
 
             html += '</p>';
@@ -508,7 +510,11 @@
             browsableImageStartIndex = 0;
             browsableImageType = type;
 
-            $('.lnkBrowseImages', $.mobile.activePage).trigger('click');
+            var page = $.mobile.activePage;
+
+            selectedProvider = null;
+            $('.popupDownload', page).popup('open');
+            reloadBrowsableImages(page);
         };
     }
 
@@ -533,15 +539,6 @@
             }
         });
 
-        $('.lnkBrowseImages', page).on('click', function () {
-
-            selectedProvider = null;
-
-            $('.popupDownload', page).popup('open');
-
-            reloadBrowsableImages(page);
-        });
-
         $('#selectBrowsableImageType', page).on('change', function () {
 
             browsableImageType = this.value;
@@ -568,6 +565,18 @@
 
         $('.uploadItemImageForm').off('submit', onSubmit).on('submit', onSubmit);
 
+        $('.btnOpenUploadMenu', page).on('click', function() {
+
+            $('#popupUpload', page).popup('open');
+        });
+
+        $('.btnBrowseAllImages', page).on('click', function () {
+
+            selectedProvider = null;
+            browsableImageType = 'Primary';
+            $('.popupDownload', page).popup('open');
+            reloadBrowsableImages(page);
+        });
 
     }).on('pageshowready', "#editItemImagesPage", function () {
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 59eb498dd7..61c5cb1e3f 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -617,8 +617,6 @@ var Dashboard = {
 
             $(document.body).append(html);
 
-            document.body.classList.add('bodyWithPopupOpen');
-
             // This timeout is obviously messy but it's unclear how to determine when the webcomponent is ready for use
             // element onload never fires
             setTimeout(function () {
@@ -629,7 +627,6 @@ var Dashboard = {
                 $(dlg).on('iron-overlay-closed', function (e) {
                     var confirmed = this.closingReason.confirmed;
                     this.parentNode.removeChild(this);
-                    document.body.classList.remove('bodyWithPopupOpen');
 
                     if (callback) {
                         callback(confirmed);
diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js
index a05a75cf77..9e5c692d52 100644
--- a/dashboard-ui/scripts/tvpeople.js
+++ b/dashboard-ui/scripts/tvpeople.js
@@ -160,6 +160,7 @@
         }
 
         LibraryBrowser.loadSavedQueryValues(getSavedQueryKey(), query);
+        query.SortBy = "SortName";
 
         reloadItems(this);
 
diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html
index aed84c7cbc..d7746988e7 100644
--- a/dashboard-ui/thirdparty/emby-icons.html
+++ b/dashboard-ui/thirdparty/emby-icons.html
@@ -88,6 +88,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
             <g id="search"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /></g>
             <g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" /></g>
             <g id="chevron-left"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z" /></g>
+            <g id="chevron-right"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" /></g>
             <g id="pause"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z" /></g>
             <g id="stop"><path d="M6 6h12v12H6z" /></g>
             <g id="skip-next"><path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z" /></g>
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index b655f2978c..9539cff612 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -6735,6 +6735,8 @@ this._removeChildren();
 </script>
 
 
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,300,300italic,400italic,500,500italic,700,700italic">
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,700">
 <style is="custom-style">
 
   :root {
@@ -6751,7 +6753,7 @@ this._removeChildren();
     };
 
     --paper-font-common-code: {
-      font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
+      font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
       -webkit-font-smoothing: antialiased;
     };
 
@@ -6939,7 +6941,7 @@ this._removeChildren();
 
     --paper-font-code2: {
       /* @apply(--paper-font-common-code); */
-      font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
+      font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
       -webkit-font-smoothing: antialiased;
 
       font-size: 14px;
@@ -6949,7 +6951,7 @@ this._removeChildren();
 
     --paper-font-code1: {
       /* @apply(--paper-font-common-code); */
-      font-family: 'Inconsolata', 'Consolas', 'Source Code Pro', 'Monaco', 'Menlo', monospace;
+      font-family: 'Roboto Mono', 'Consolas', 'Menlo', monospace;
       -webkit-font-smoothing: antialiased;
 
       font-size: 14px;
@@ -17297,6 +17299,7 @@ paper-ripple {
             <g id="search"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path></g>
             <g id="menu"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path></g>
             <g id="chevron-left"><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"></path></g>
+            <g id="chevron-right"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"></path></g>
             <g id="pause"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"></path></g>
             <g id="stop"><path d="M6 6h12v12H6z"></path></g>
             <g id="skip-next"><path d="M6 18l8.5-6L6 6v12zM16 6v12h2V6h-2z"></path></g>