diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css
index af106959e0..9b3f504beb 100644
--- a/src/assets/css/librarybrowser.css
+++ b/src/assets/css/librarybrowser.css
@@ -413,11 +413,14 @@
     align-items: center;
     align-content: center;
     position: sticky;
-    background-color: #101010;
     top: 0;
     z-index: 2;
 }
 
+.detailSticky {
+    background-color: #101010;
+}
+
 .infoWrapper {
     flex: 1 0 0;
 }
@@ -431,6 +434,9 @@
 
 .detailPageSecondaryContainer {
     margin: 1.25em 0;
+}
+
+.detailPageContent {
     display: flex;
     flex-direction: column;
     padding-left: 2%;
@@ -443,7 +449,6 @@
 }
 
 .detailImageContainer {
-    margin: 1.25em 0;
     position: sticky;
     top: 15%;
     float: left;
@@ -452,7 +457,6 @@
 
 .detailPagePrimaryContent {
     position: relative;
-    flex-grow: 1
 }
 
 .detailLogo {
@@ -494,7 +498,7 @@
 }
 
 @media all and (max-width:62.5em) {
-    .detailPageContent {
+    .detailPageWrapperContainer {
         position: relative
     }
 
@@ -705,13 +709,13 @@
     margin-bottom: 3.4em !important
 }
 
-.detailPageContent {
+.detailPageWrapperContainer {
     border-spacing: 0;
     border-collapse: collapse;
 }
 
 @media all and (max-width:62.5em) {
-    .detailPageContent-nodetailimg {
+    .detailPageWrapperContainer-nodetailimg {
         padding-top: 0;
     }
 }
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index 1a0b66c75a..8f8b3baf39 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -524,6 +524,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
 
     function reloadFromItem(instance, page, params, item, user) {
         var context = params.context;
+        page.querySelector(".detailPagePrimaryContainer").classList.add("detailSticky");
         renderName(item, page.querySelector(".nameContainer"), false, context);
         var apiClient = connectionManager.getApiClient(item.ServerId);
         renderSeriesTimerEditor(page, item, apiClient, user);
@@ -743,9 +744,9 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
 
         if ("Person" !== item.Type) {
             elem.classList.add("detailimg-hidemobile");
-            page.querySelector(".detailPageContent").classList.add("detailPageContent-nodetailimg");
+            page.querySelector(".detailPageWrapperContainer").classList.add("detailPageWrapperContainer-nodetailimg");
         } else {
-            page.querySelector(".detailPageContent").classList.remove("detailPageContent-nodetailimg");
+            page.querySelector(".detailPageWrapperContainer").classList.remove("detailPageWrapperContainer-nodetailimg");
         }
 
         var imageTags = item.ImageTags || {};
diff --git a/src/itemdetails.html b/src/itemdetails.html
index fbe0cc50de..4ac632b8b1 100644
--- a/src/itemdetails.html
+++ b/src/itemdetails.html
@@ -6,7 +6,7 @@
     </div>
 
     <div class="detailLogo"></div>
-    <div class="detailPageWrapperContainer">
+    <div class="detailPageWrapperContainer padded-bottom-page">
         <div class="detailPagePrimaryContainer padded-left padded-right">
             <div class="infoWrapper infoText">
                 <div class="nameContainer"></div>
@@ -107,8 +107,8 @@
                 </button>
             </div>
         </div>
-        <div class="detailImageContainer verticalSection-extrabottompadding padded-left"></div>
         <div class="detailPageSecondaryContainer">
+            <div class="detailImageContainer padded-left"></div>
             <div class="detailPageContent">
                 <div class="detailPagePrimaryContent padded-left padded-right">
                     <div class="detailSection" style="margin-bottom: 0;">
diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js
index 5d3c9dedb9..ea760900ec 100644
--- a/src/scripts/itembynamedetailpage.js
+++ b/src/scripts/itembynamedetailpage.js
@@ -99,7 +99,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
                     Limit: 10,
                     SortBy: "StartDate"
                 }, {
-                    shape: "backdrop",
+                    shape: "overflowBackdrop",
                     showTitle: true,
                     centerText: true,
                     overlayMoreButton: true,
@@ -121,7 +121,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
                     Limit: 10,
                     SortBy: "SortName"
                 }, {
-                    shape: "portrait",
+                    shape: "overflowPortrait",
                     showTitle: true,
                     centerText: true,
                     overlayMoreButton: true,
@@ -140,7 +140,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
                     Limit: 10,
                     SortBy: "SortName"
                 }, {
-                    shape: "portrait",
+                    shape: "overflowPortrait",
                     showTitle: true,
                     centerText: true,
                     overlayPlayButton: true
@@ -157,7 +157,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
                     Limit: 10,
                     SortBy: "SortName"
                 }, {
-                    shape: "portrait",
+                    shape: "overflowPortrait",
                     showTitle: true,
                     centerText: true,
                     overlayPlayButton: true
@@ -174,7 +174,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
                     Limit: 10,
                     SortBy: "SortName"
                 }, {
-                    shape: "portrait",
+                    shape: "overflowPortrait",
                     showTitle: true,
                     centerText: true,
                     overlayMoreButton: true
@@ -191,7 +191,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
                     SortOrder: "Descending",
                     SortBy: "ProductionYear,Sortname"
                 }, {
-                    shape: "square",
+                    shape: "overflowSquare",
                     playFromHere: true,
                     showTitle: true,
                     showYear: true,
@@ -211,7 +211,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
                     Limit: 8,
                     SortBy: "SortName"
                 }, {
-                    shape: "square",
+                    shape: "overflowSquare",
                     playFromHere: true,
                     showTitle: true,
                     showParentTitle: true,
@@ -231,7 +231,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
                     Limit: 6,
                     SortBy: "SortName"
                 }, {
-                    shape: "backdrop",
+                    shape: "overflowBackdrop",
                     showTitle: true,
                     showParentTitle: true,
                     centerText: true,