diff --git a/dashboard-ui/css/images/clients/mb.png b/dashboard-ui/css/images/clients/mb.png
index 33d1c37cd..2c58b4b11 100644
Binary files a/dashboard-ui/css/images/clients/mb.png and b/dashboard-ui/css/images/clients/mb.png differ
diff --git a/dashboard-ui/css/images/mblogoicon.png b/dashboard-ui/css/images/mblogoicon.png
index 9762648d3..40d150174 100644
Binary files a/dashboard-ui/css/images/mblogoicon.png and b/dashboard-ui/css/images/mblogoicon.png differ
diff --git a/dashboard-ui/css/images/touchicon.png b/dashboard-ui/css/images/touchicon.png
index b4913edce..7774a4834 100644
Binary files a/dashboard-ui/css/images/touchicon.png and b/dashboard-ui/css/images/touchicon.png differ
diff --git a/dashboard-ui/css/images/touchicon114.png b/dashboard-ui/css/images/touchicon114.png
index 33d1c37cd..2c58b4b11 100644
Binary files a/dashboard-ui/css/images/touchicon114.png and b/dashboard-ui/css/images/touchicon114.png differ
diff --git a/dashboard-ui/css/images/touchicon72.png b/dashboard-ui/css/images/touchicon72.png
index 438758fdb..30953f2cf 100644
Binary files a/dashboard-ui/css/images/touchicon72.png and b/dashboard-ui/css/images/touchicon72.png differ
diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index d0c1fb54d..8903e2194 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -30,7 +30,6 @@
                         <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
                         <option value="librarytiles">${OptionMyLibrary}</option>
                         <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
-                        <option value="librarybuttons">${OptionMyLibraryButtons}</option>
                         <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                     </select>
@@ -43,7 +42,6 @@
                         <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
                         <option value="librarytiles">${OptionMyLibrary}</option>
                         <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
-                        <option value="librarybuttons">${OptionMyLibraryButtons}</option>
                         <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                         <option value="none">${OptionNone}</option>
@@ -57,7 +55,6 @@
                         <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
                         <option value="librarytiles">${OptionMyLibrary}</option>
                         <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
-                        <option value="librarybuttons">${OptionMyLibraryButtons}</option>
                         <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                         <option value="none">${OptionNone}</option>
@@ -71,7 +68,6 @@
                         <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
                         <option value="librarytiles">${OptionMyLibrary}</option>
                         <option value="smalllibrarytiles">${OptionMyLibrarySmall}</option>
-                        <option value="librarybuttons">${OptionMyLibraryButtons}</option>
                         <option value="folders">${OptionLibraryFolders}</option>
                         <option value="resume">${OptionResumablemedia}</option>
                         <option value="none">${OptionNone}</option>
diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js
index 956f4e012..7fa2e060a 100644
--- a/dashboard-ui/scripts/channelitems.js
+++ b/dashboard-ui/scripts/channelitems.js
@@ -137,6 +137,7 @@
             html = LibraryBrowser.getPosterViewHtml({
                 items: result.Items,
                 shape: "auto",
+                defaultShape: 'square',
                 context: 'channels',
                 showTitle: true,
                 centerText: true,
diff --git a/dashboard-ui/scripts/channelslatest.js b/dashboard-ui/scripts/channelslatest.js
index f2ea51bd1..01f80738e 100644
--- a/dashboard-ui/scripts/channelslatest.js
+++ b/dashboard-ui/scripts/channelslatest.js
@@ -47,6 +47,7 @@
             html += LibraryBrowser.getPosterViewHtml({
                 items: result.Items,
                 shape: 'auto',
+                defaultShape: 'square',
                 showTitle: true,
                 centerText: true,
                 context: 'channels',
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index afa2d66bb..ddec628be 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -14,90 +14,6 @@
         return deferred.promise();
     }
 
-    function createMediaLinks(options) {
-
-        var html = "";
-
-        var items = options.items;
-
-        // "My Library" backgrounds
-        for (var i = 0, length = items.length; i < length; i++) {
-
-            var item = items[i];
-
-            var imgUrl;
-
-            switch (item.CollectionType) {
-                case "movies":
-                    imgUrl = "css/images/items/folders/movies.png";
-                    break;
-                case "music":
-                    imgUrl = "css/images/items/folders/music.png";
-                    break;
-                case "photos":
-                    imgUrl = "css/images/items/folders/photos.png";
-                    break;
-                case "livetv":
-                case "tvshows":
-                    imgUrl = "css/images/items/folders/tv.png";
-                    break;
-                case "games":
-                    imgUrl = "css/images/items/folders/games.png";
-                    break;
-                case "trailers":
-                    imgUrl = "css/images/items/folders/movies.png";
-                    break;
-                case "adultvideos":
-                case "homevideos":
-                    imgUrl = "css/images/items/folders/homevideos.png";
-                    break;
-                case "musicvideos":
-                    imgUrl = "css/images/items/folders/musicvideos.png";
-                    break;
-                case "books":
-                    imgUrl = "css/images/items/folders/books.png";
-                    break;
-                case "channels":
-                    imgUrl = "css/images/items/folders/channels.png";
-                    break;
-                case "boxsets":
-                default:
-                    imgUrl = "css/images/items/folders/folder.png";
-                    break;
-            }
-
-            var cssClass = "posterItem";
-            cssClass += ' ' + options.shape + 'PosterItem';
-
-            if (item.CollectionType) {
-                cssClass += ' ' + item.CollectionType + 'PosterItem';
-            }
-
-            var href = item.url || LibraryBrowser.getHref(item, options.context);
-
-            html += '<a data-itemid="' + item.Id + '" class="' + cssClass + '" href="' + href + '">';
-
-            var style = "";
-
-            if (imgUrl) {
-                style += 'background-image:url(\'' + imgUrl + '\');';
-            }
-
-            var imageCssClass = 'posterItemImage';
-
-            html += '<div class="' + imageCssClass + '" style="' + style + '">';
-            html += '</div>';
-
-            html += "<div class='posterItemDefaultText posterItemText'>";
-            html += item.Name;
-            html += "</div>";
-
-            html += "</a>";
-        }
-
-        return html;
-    }
-
     function getDefaultSection(index) {
 
         switch (index) {
@@ -109,38 +25,13 @@
             case 2:
                 return 'latestmedia';
             case 3:
-                return 'latestchannelmedia';
+                return '';
             default:
                 return '';
         }
 
     }
 
-    function loadlibraryButtons(elem, userId, index) {
-
-        getUserViews(userId).done(function (items) {
-
-            var html = '<br/>';
-
-            if (index) {
-                html += '<h1 class="listHeader">' + Globalize.translate('HeaderMyLibrary') + '</h1>';
-            }
-            html += '<div>';
-            html += createMediaLinks({
-                items: items,
-                shape: 'myLibrary',
-                showTitle: true,
-                centerText: true
-
-            });
-            html += '</div>';
-
-            $(elem).html(html);
-
-            handleLibraryLinkNavigations(elem);
-        });
-    }
-
     function loadRecentlyAdded(elem, userId) {
 
         var screenWidth = $(window).width();
@@ -224,7 +115,9 @@
 
             if (items.length) {
 
-                html += '<h1 class="listHeader">' + Globalize.translate('HeaderMyLibrary') + '</h1>';
+                var cssClass = index ? 'listHeader' : 'listHeader firstListHeader';
+
+                html += '<h1 class="' + cssClass + '">' + Globalize.translate('HeaderMyLibrary') + '</h1>';
 
                 html += '<div>';
                 html += LibraryBrowser.getPosterViewHtml({
@@ -326,23 +219,21 @@
         var section = displayPreferences.CustomPrefs['home' + index] || getDefaultSection(index);
 
         var elem = $('.section' + index, page);
-        
+
         if (section == 'latestmedia') {
             loadRecentlyAdded(elem, userId);
         }
         else if (section == 'librarytiles') {
             loadLibraryTiles(elem, userId, 'backdrop', index);
         }
-        else if (section == 'smalllibrarytiles') {
+        else if (section == 'smalllibrarytiles' || section == 'librarybuttons') {
             loadLibraryTiles(elem, userId, 'miniBackdrop', index);
         }
         else if (section == 'resume') {
             loadResume(elem, userId);
         }
-        else if (section == 'librarybuttons') {
-            loadlibraryButtons(elem, userId, index);
 
-        } else if (section == 'folders') {
+        else if (section == 'folders') {
             loadLibraryFolders(elem, userId, 'backdrop', index);
 
         } else if (section == 'latestchannelmedia') {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 1ef79dfcd..b2d9745fd 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -515,9 +515,12 @@
                     options.shape = 'banner';
                     options.coverImage = true;
                 }
-                else {
+                else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 0.6666667) < .2) {
                     options.shape = 'portrait';
                 }
+                else {
+                    options.shape = options.defaultShape || 'portrait';
+                }
             }
 
             for (var i = 0, length = items.length; i < length; i++) {