diff --git a/src/_h5ai/client/images/page.svg b/src/_h5ai/client/images/page.svg
index 99737814..202a9dd7 100644
--- a/src/_h5ai/client/images/page.svg
+++ b/src/_h5ai/client/images/page.svg
@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg7384"
    height="12"
    width="12"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="page.svg">
+   version="1.1">
   <g
      id="layer14"
      transform="matrix(0.68005728,0,0,0.70728284,-313.86652,-213.11037)">
     <path
        id="path1234"
        style="text-indent:0;text-transform:none;block-progression:tb;color:#555555;fill:#555555"
-       d="m 479.1751,323.93034 0,-15.55248 -4.41139,-4.24158 -13.23419,-10e-6 1e-5,19.79407 m 2.94093,-1.41387 -10e-6,-15.55248 7.35234,10e-6 0,4.24159 4.41139,0 -10e-6,11.31088"
+       d="m 479.17511,316.86104 0,-9.89704 -4.41139,-4.24158 -13.23419,-10e-6 10e-6,14.13863 m 2.94093,-10e-6 -10e-6,-11.3109 7.35234,10e-6 0,4.24159 4.41139,0 -1e-5,7.0693"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccccc" />
   </g>
diff --git a/src/_h5ai/client/js/inc/ext/preview.js b/src/_h5ai/client/js/inc/ext/preview.js
index ab5e25ea..962eb87d 100644
--- a/src/_h5ai/client/js/inc/ext/preview.js
+++ b/src/_h5ai/client/js/inc/ext/preview.js
@@ -73,7 +73,9 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor
 		onExit = function () {
 
 			$(window).off('keydown', onKeydown);
-			$('#pv-overlay').stop(true, true).fadeOut(200);
+			$('#pv-overlay').stop(true, true).fadeOut(200, function () {
+				$('#pv-content').empty();
+			});
 		},
 
 		onNext = function () {
@@ -97,7 +99,6 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor
 			$('#pv-overlay .hof').stop(true, true).fadeIn(200);
 
 			if (isFullscreen) {
-
 				userAliveTimeoutId = setTimeout(function () {
 
 					$('#pv-overlay .hof').stop(true, true).fadeOut(2000);
@@ -122,20 +123,18 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor
 			if (key === 27) { // esc
 				event.preventDefault();
 				event.stopImmediatePropagation();
-				$('#pv-bar-close, #pv-close-area').addClass('hover');
-				setTimeout(function () { $('#pv-bar-close, #pv-close-area').removeClass('hover'); }, delay);
 				onExit();
 			} else if (key === 8 || key === 37) { // backspace, left
 				event.preventDefault();
 				event.stopImmediatePropagation();
-				$('#pv-bar-prev, #pv-prev-area').addClass('hover');
-				setTimeout(function () { $('#pv-bar-prev, #pv-prev-area').removeClass('hover'); }, delay);
+				$('#pv-bar-prev').addClass('hover');
+				setTimeout(function () { $('#pv-bar-prev').removeClass('hover'); }, delay);
 				onPrevious();
 			} else if (key === 13 || key === 32 || key === 39) { // enter, space, right
 				event.preventDefault();
 				event.stopImmediatePropagation();
-				$('#pv-bar-next, #pv-next-area').addClass('hover');
-				setTimeout(function () { $('#pv-bar-next, #pv-next-area').removeClass('hover'); }, delay);
+				$('#pv-bar-next').addClass('hover');
+				setTimeout(function () { $('#pv-bar-next').removeClass('hover'); }, delay);
 				onNext();
 			} else if (key === 70) { // f
 				event.preventDefault();
@@ -146,16 +145,6 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor
 			}
 		},
 
-		enter = function () {
-
-			onEnter();
-		},
-
-		exit = function () {
-
-			onExit();
-		},
-
 		setIndex = function (idx, total) {
 
 			if (_.isNumber(idx)) {
@@ -179,7 +168,7 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor
 			$('#pv-buttons .bar-left').remove();
 			_.each(labels, function (label) {
 
-				$('<li />')
+				$('<li/>')
 					.addClass('bar-left bar-label')
 					.text(label)
 					.appendTo('#pv-buttons');
@@ -232,7 +221,7 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor
 
 					if (event.type === 'click') {
 						if (event.target.id === 'pv-overlay' || event.target.id === 'pv-content') {
-							exit();
+							onExit();
 						}
 					}
 					event.stopImmediatePropagation();
@@ -244,8 +233,8 @@ modulejs.define('ext/preview', ['_', '$', 'core/settings', 'core/resource', 'cor
 	init();
 
 	return {
-		enter: enter,
-		exit: exit,
+		enter: onEnter,
+		exit: onExit,
 		setIndex: setIndex,
 		setRawLink: setRawLink,
 		setLabels: setLabels,