diff --git a/dashboard-ui/components/favoriteitems.js b/dashboard-ui/components/favoriteitems.js
index 19da9b3735..1416a3484b 100644
--- a/dashboard-ui/components/favoriteitems.js
+++ b/dashboard-ui/components/favoriteitems.js
@@ -40,8 +40,7 @@
             Recursive: true,
             Fields: "PrimaryImageAspectRatio,SyncInfo",
             CollapseBoxSetItems: false,
-            ExcludeLocationTypes: "Virtual",
-            EnableTotalRecordCount: false
+            ExcludeLocationTypes: "Virtual"
         };
 
         if (topParentId) {
diff --git a/dashboard-ui/components/imagedownloader/imagedownloader.template.html b/dashboard-ui/components/imagedownloader/imagedownloader.template.html
index 54222e7f30..94f29b1d8a 100644
--- a/dashboard-ui/components/imagedownloader/imagedownloader.template.html
+++ b/dashboard-ui/components/imagedownloader/imagedownloader.template.html
@@ -1,4 +1,4 @@
-<div style="text-align: center;display:flex; align-items: center; justify-content: center;margin: 0 0 1em 0;">
+<div style="text-align: center;display:flex; align-items: center; flex-wrap: wrap; justify-content: center;margin: 0 0 1em 0;">
     <div style="margin: 0;">
         <label for="selectImageProvider" style="display: inline-block;">${LabelSource}</label>
         <select id="selectImageProvider" style="padding-left:.5em;padding-right:0;display: inline-block;width:auto!important;">
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index ef7e2e41ae..2a99f45888 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -1127,7 +1127,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
 @media all and (max-height: 530px) {
 
     .alphabetPicker {
-        font-size: 84%;
+        font-size: 80%;
     }
 }
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 61bd7b0fbc..74bd8e1019 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2901,23 +2901,23 @@
 
                     if (showControls) {
 
-                        html += '<button is="paper-icon-button-light" class="btnPreviousPage" ' + (startIndex ? '' : 'disabled') + '><iron-icon icon="arrow-back"></iron-icon></button>';
-                        html += '<button is="paper-icon-button-light" class="btnNextPage" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '><iron-icon icon="arrow-forward"></iron-icon></button>';
+                        html += '<button is="paper-icon-button-light" class="btnPreviousPage autoSize" ' + (startIndex ? '' : 'disabled') + '><i class="md-icon">arrow_back</i></button>';
+                        html += '<button is="paper-icon-button-light" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '><i class="md-icon">arrow_forward</i></button>';
                     }
 
                     if (options.addLayoutButton) {
 
-                        html += '<button is="paper-icon-button-light" title="' + Globalize.translate('ButtonSelectView') + '" class="btnChangeLayout" data-layouts="' + (options.layouts || '') + '" onclick="LibraryBrowser.showLayoutMenu(this, \'' + (options.currentLayout || '') + '\');"><iron-icon icon="view-comfy"></iron-icon></button>';
+                        html += '<button is="paper-icon-button-light" title="' + Globalize.translate('ButtonSelectView') + '" class="btnChangeLayout autoSize" data-layouts="' + (options.layouts || '') + '" onclick="LibraryBrowser.showLayoutMenu(this, \'' + (options.currentLayout || '') + '\');"><i class="md-icon">view_comfy</i></button>';
                     }
 
                     if (options.sortButton) {
 
-                        html += '<button is="paper-icon-button-light" class="btnSort" title="' + Globalize.translate('ButtonSort') + '"><iron-icon icon="sort-by-alpha"></iron-icon></button>';
+                        html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + Globalize.translate('ButtonSort') + '"><i class="md-icon">sort_by_alpha</i></button>';
                     }
 
                     if (options.filterButton) {
 
-                        html += '<button is="paper-icon-button-light" class="btnFilter" title="' + Globalize.translate('ButtonFilter') + '"><iron-icon icon="filter-list"></iron-icon></button>';
+                        html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + Globalize.translate('ButtonFilter') + '"><i class="md-icon">filter_list</i></button>';
                     }
 
                     html += '</div>';
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index 883f895867..5b512a6483 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -39,7 +39,7 @@
                 Dashboard.onServerChanged(user.Id, result.AccessToken, apiClient);
                 Dashboard.navigate(newUrl);
 
-            }, function () {
+            }, function (response) {
 
                 $('#pw', page).val('');
                 $('#txtManualName', page).val('');
@@ -47,17 +47,27 @@
 
                 Dashboard.hideLoadingMsg();
 
-                setTimeout(function () {
+                if (response.status == 401) {
                     require(['toast'], function (toast) {
                         toast(Globalize.translate('MessageInvalidUser'));
                     });
-                }, 300);
+                } else {
+                    showServerConnectionFailure();
+                }
             });
 
         }
 
     };
 
+    function showServerConnectionFailure() {
+
+        Dashboard.alert({
+            message: Globalize.translate("MessageUnableToConnectToServer"),
+            title: Globalize.translate("HeaderConnectionFailure")
+        });
+    }
+
     function getApiClient() {
 
         var serverId = getParameterByName('serverid');