diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css
index dad492e4..87938e18 100644
--- a/data/interfaces/default/css/tautulli.css
+++ b/data/interfaces/default/css/tautulli.css
@@ -3134,6 +3134,37 @@ div.dataTables_info {
     -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
     box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
 }
+.channel-thumbnail-popover {
+    z-index: 2000;
+    padding: 0;
+    border: 0;
+}
+.channel-thumbnail-popover.popover.left {
+    margin-left: -15px;
+}
+.channel-thumbnail-popover.popover.right {
+    margin-left: 15px;
+}
+.channel-thumbnail-popover .popover-content {
+    color: #000;
+    padding: 0;
+}
+.channel-thumbnail {
+    background-color: #868b8b;
+    background-position: center;
+    background-size: cover;
+    background-origin: content-box;
+    background-repeat: no-repeat;
+    height: 50px;
+    width: 50px;
+    padding: 3px;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+}
+.channel-thumbnail-popover .arrow:after {
+    border-right-color: #868b8b !important;
+}
 .edit-user-toggles,
 .edit-library-toggles {
     padding-right: 10px;
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index e2fe56c1..82e0eb36 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -563,6 +563,7 @@
                             $(instance).removeClass('updated-temp');
                         } else {
                             $(instance).find('[data-toggle=tooltip]').tooltip('destroy');
+                            $(instance).find('[data-toggle=popover]').popover('destroy');
                             $(instance).remove();
                         }
                     });
@@ -603,9 +604,9 @@
                     trigger: 'hover',
                     placement: 'right',
                     delay: 50,
-                    template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
+                    template: '<div class="popover channel-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
                     content: function () {
-                        return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px; padding: 3px;" />';
+                        return '<div class="channel-thumbnail" style="background-image: url(' + $(this).data('img') + ');" />';
                     }
                 });
                 $('#terminate-button-' + session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 });