diff --git a/dashboard-ui/css/chromecast.css b/dashboard-ui/css/chromecast.css
index a548d66e08..4cfb5db89b 100644
--- a/dashboard-ui/css/chromecast.css
+++ b/dashboard-ui/css/chromecast.css
@@ -1,4 +1,4 @@
-.btnCastImage {
+.btnCastImage:not(.btnCastIcon) {
     background-color: transparent;
     background-size: 100%;
     background-repeat: no-repeat;
@@ -17,10 +17,18 @@
     background-image: url(images/chromecast/ic_media_route_on_holo_dark.png);
 }
 
+.btnActiveCast i {
+    color: #2ad !important;
+}
+
 .btnDisabledCast .btnCastImage {
     background-image: url(images/chromecast/ic_media_route_disabled_holo_dark.png);
 }
 
+.btnDisabledCast i {
+    color: #555;
+}
+
 .btnCast {
     white-space: nowrap;
 }
@@ -38,8 +46,12 @@
     overflow: hidden;
 }
 
+.btnCastIcon .headerSelectedPlayer {
+    top: 0;
+}
+
 @media all and (max-width: 1000px) {
     .headerSelectedPlayer {
         display: none;
     }
-}
\ No newline at end of file
+}
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 1f04799f66..6dfe34fa08 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -31,21 +31,25 @@
 
         html += '<div class="viewMenuSecondary">';
 
-        if (user.localUser) {
+        var btnCastVisible = user.localUser ? '' : 'visibility:hidden;';
 
-            html += '<button id="btnCast" class="btnCast btnDefaultCast headerButton headerButtonRight" type="button" data-role="none"><div class="headerSelectedPlayer"></div><div class="btnCastImage"></div></button>';
-
-            html += '<button onclick="Search.showSearchPanel($.mobile.activePage);" type="button" data-role="none" class="headerButton headerButtonRight headerSearchButton"><div class="fa fa-search" style="font-size:21px;"></div></button>';
+        if (!AppInfo.enableHeaderImages) {
+            html += '<button id="btnCast" class="btnCast btnCastIcon btnDefaultCast headerButton headerButtonRight" type="button" data-role="none" style="' + btnCastVisible + '">';
+            html += '<div class="headerSelectedPlayer"></div><i class="fa fa-wifi"></i>';
+            html += '</button>';
         } else {
-            html += '<button id="btnCast" class="btnCast btnDefaultCast headerButton headerButtonRight" type="button" data-role="none" style="visibility:hidden;"><div class="headerSelectedPlayer"></div><div class="btnCastImage"></div></button>';
+            html += '<button id="btnCast" class="btnCast btnDefaultCast headerButton headerButtonRight" type="button" data-role="none" style="' + btnCastVisible + '"><div class="headerSelectedPlayer"></div><div class="btnCastImage"></div></button>';
+        }
 
+        if (user.localUser) {
+            html += '<button onclick="Search.showSearchPanel($.mobile.activePage);" type="button" data-role="none" class="headerButton headerButtonRight headerSearchButton"><div class="fa fa-search" style="font-size:21px;"></div></button>';
         }
 
         if (user.name) {
 
             html += '<a class="headerButton headerButtonRight headerUserButton" href="#" onclick="Dashboard.showUserFlyout(this);">';
 
-            if (user.imageUrl) {
+            if (user.imageUrl && AppInfo.enableUserImage) {
 
                 var userButtonHeight = 26;
 
@@ -100,7 +104,7 @@
     }
 
     function updateViewMenuBarHeadroom(page, viewMenuBar) {
-        
+
         if ($(page).hasClass('libraryPage')) {
             viewMenuBar.removeClass('headroomDisabled');
         } else {
@@ -277,12 +281,13 @@
                     'mypreferencesdisplay.html?userId=' + user.localUser.Id :
                     (user.localUser ? 'index.html' : '#');
 
-                var paddingLeft = user.imageUrl ? 'padding-left:.7em;' : '';
+                var hasUserImage = user.imageUrl && AppInfo.enableUserImage;
+                var paddingLeft = hasUserImage ? 'padding-left:.7em;' : '';
                 html += '<a style="margin-top:0;' + paddingLeft + 'display:block;color:#fff;text-decoration:none;font-size:16px;font-weight:400!important;background: #000;" href="' + userHref + '">';
 
                 var imgWidth = 44;
 
-                if (user.imageUrl) {
+                if (hasUserImage) {
                     var url = user.imageUrl;
 
                     if (user.supportsImageParams) {
@@ -539,7 +544,7 @@
             $('.libraryViewNav', page).addClass('bottomLibraryViewNav');
             $(page).addClass('noSecondaryNavPage');
         } else {
-            
+
             $('.libraryViewNav', page).each(function () {
 
                 initHeadRoom(this);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 9d53a13ac0..73a7e4b659 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -638,7 +638,7 @@ var Dashboard = {
 
             var imgWidth = 48;
 
-            if (user.imageUrl) {
+            if (user.imageUrl && AppInfo.enableUserImage) {
                 var url = user.imageUrl;
 
                 if (user.supportsImageParams) {
@@ -1479,13 +1479,15 @@ var AppInfo = {};
             AppInfo.isTouchPreferred = true;
         }
 
+        var isCordova = Dashboard.isRunningInCordova();
+
         if ($.browser.safari) {
 
             if ($.browser.mobile) {
                 AppInfo.hasLowImageBandwidth = true;
             }
 
-            if (Dashboard.isRunningInCordova()) {
+            if (isCordova) {
                 AppInfo.enableBottomTabs = true;
                 AppInfo.resetOnLibraryChange = true;
             }
@@ -1508,9 +1510,12 @@ var AppInfo = {};
             AppInfo.enableMovieTrailersTab = true;
         }
 
-        if (!Dashboard.isRunningInCordova()) {
+        if (!isCordova) {
             AppInfo.enableFooterNotifications = true;
         }
+
+        AppInfo.enableUserImage = !AppInfo.hasLowImageBandwidth || !isCordova;
+        AppInfo.enableHeaderImages = AppInfo.enableUserImage;
     }
 
     function initializeApiClient(apiClient) {
@@ -1579,7 +1584,9 @@ var AppInfo = {};
 
     function onReady() {
 
-        //FastClick.attach(document.body);
+        if ($.browser.safari) {
+            //FastClick.attach(document.body);
+        }
 
         if (AppInfo.hasLowImageBandwidth) {
             $(document.body).addClass('largeCardMargin');