diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 5a43208068..aa3ec707e3 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -33,6 +33,7 @@
  - [Daniel Hartung](https://github.com/dhartung)
  - [Ryan Hartzell](https://github.com/ryan-hartzell)
  - [Thibault Nocchi](https://github.com/ThibaultNocchi)
+ - [MrTimscampi](https://github.com/MrTimscampi)
 
 # Emby Contributors
 
diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css
index 1b5b9ded6d..7a3e0ada68 100644
--- a/src/assets/css/librarybrowser.css
+++ b/src/assets/css/librarybrowser.css
@@ -522,6 +522,7 @@
 
 .layout-tv .detailPagePrimaryContainer {
     position: relative;
+    top: 0;
 }
 
 .detailSticky {
diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css
index cb7cab3885..7e2855c85c 100644
--- a/src/components/cardbuilder/card.css
+++ b/src/components/cardbuilder/card.css
@@ -370,8 +370,8 @@ button::-moz-focus-inner {
     text-align: center;
 }
 
-.cardImageIcon {
-    font-size: 5em !important;
+.cardImageContainer .cardImageIcon {
+    font-size: 5em;
     color: inherit;
 }
 
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index 23ac93676e..29d7455bc9 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -1500,6 +1500,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                     return '<i class="cardImageIcon material-icons">movie</i>'
                 case 'Series':
                     return '<i class="cardImageIcon material-icons">tv</i>'
+                case 'Book':
+                    return '<i class="cardImageIcon material-icons">book</i>'
+                case 'Folder':
+                    return '<i class="cardImageIcon material-icons">folder</i>'
             }
 
             if (options && options.defaultCardImageIcon) {
diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js
index a8bd4c6200..c81ac6bf18 100644
--- a/src/components/indicators/indicators.js
+++ b/src/components/indicators/indicators.js
@@ -152,9 +152,12 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
         if (item.Type === 'Video') {
             return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">videocam</i></div>';
         }
-        if (item.Type === 'Folder' || item.Type === 'PhotoAlbum') {
+        if (item.Type === 'Folder') {
             return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">folder</i></div>';
         }
+        if (item.Type === 'PhotoAlbum') {
+            return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon photo_album"></i></div>';
+        }
         if (item.Type === 'Photo') {
             return '<div class="indicator videoIndicator"><i class="material-icons indicatorIcon">photo</i></div>';
         }