diff --git a/web/includes/functions.php b/web/includes/functions.php
index 2d0b9c681..ac9ce3104 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2076,7 +2076,7 @@ function cache_bust( $file ) {
   # Use the last modified timestamp to create a link that gets a different filename
   # To defeat caching.  Should probably use md5 hash
   $parts = pathinfo($file);
-  $cacheFile = 'cache/'.$parts['filename'].'-'.filemtime($file).'.'.$parts['extension'];
+  $cacheFile = 'cache/'.$parts['filename'].'-'.$_COOKIE['zmCSS'].'-'.filemtime($file).'.'.$parts['extension'];
   if ( file_exists( ZM_PATH_WEB.'/'.$cacheFile ) or symlink( ZM_PATH_WEB.'/'.$file, ZM_PATH_WEB.'/'.$cacheFile ) ) {
     return $cacheFile;
   } else {
@@ -2213,6 +2213,7 @@ function getStreamMode( ) {
     $streamMode = 'single';
     Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
   }
+  return $streamMode;
 } // end function getStreamMode
 
 function folder_size($dir) {
diff --git a/web/skins/classic/css/classic/views/event.css b/web/skins/classic/css/classic/views/event.css
index 1a9ed51fa..c855311f4 100644
--- a/web/skins/classic/css/classic/views/event.css
+++ b/web/skins/classic/css/classic/views/event.css
@@ -149,9 +149,9 @@ span.noneCue {
 }
 
 .dvrControls input {
-    height: 20px;
-    width: 28px;
-    padding-bottom: 3px;
+    height: 1.5em;
+    width: 2em;
+    padding: 0 ;
     margin: 0 3px;
 }
 
diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css
index 51703babf..1cef117e2 100644
--- a/web/skins/classic/css/dark/skin.css
+++ b/web/skins/classic/css/dark/skin.css
@@ -518,7 +518,6 @@ input[type=submit]:disabled {
 .sidebar {
   position: absolute;
   top: 0;
-  bottom: 0;
   left: 0;
   z-index: 1000;
   display: block;
diff --git a/web/skins/classic/css/dark/views/event.css b/web/skins/classic/css/dark/views/event.css
index 9e98507d1..299f711e0 100644
--- a/web/skins/classic/css/dark/views/event.css
+++ b/web/skins/classic/css/dark/views/event.css
@@ -131,9 +131,9 @@ span.noneCue {
 }
 
 .dvrControls input {
-    height: 20px;
-    width: 28px;
-    padding-bottom: 3px;
+    height: 1.5em;
+    width: 2em;
+    padding: 0;
     margin: 0 3px;
 }
 
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 889057f93..1c1d56cea 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -65,6 +65,7 @@ if ( $tab == 'skins' ) {
   $current_css = $_COOKIE['zmCSS'];
   if ( isset($_GET['css-choice']) and ( $_GET['css-choice'] != $current_css ) ) {
     setcookie('zmCSS',$_GET['css-choice'], time()+3600*24*30*12*10 );
+    array_map('unlink', glob(ZM_PATH_WEB.'/cache/*')); //cleanup symlinks from cache_bust
     //header("Location: index.php?view=options&tab=skins&reset_parent=1");
     $reload = true;
   }