diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 140957046..be17578cf 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -121,7 +121,8 @@ if ( $action == 'save' ) {
           }
           $saferNewName = basename($_REQUEST['newMonitor']['Name']);
           $link_path = $NewStorage->Path().'/'.$saferNewName;
-          if ( !symlink($NewStorage->Path().'/'.$mid, $link_path) ) {
+          // Use a relative path for the target so the link continues to work from backups or directory changes.
+          if ( !symlink($mid, $link_path) ) {
             if ( ! ( file_exists($link_path) and is_link($link_path) ) ) {
               ZM\Warning('Unable to symlink ' . $NewStorage->Path().'/'.$mid . ' to ' . $NewStorage->Path().'/'.$saferNewName);
             }
diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index f0bd0b3ac..20bf6b87f 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -68,7 +68,7 @@ function processRows(rows) {
     row.Frames = '<a href="?view=frames&amp;eid=' + eid + '">' + row.Frames + '</a>';
     row.AlarmFrames = '<a href="?view=frames&amp;eid=' + eid + '">' + row.AlarmFrames + '</a>';
     row.MaxScore = '<a href="?view=frame&amp;eid=' + eid + '&amp;fid=0">' + row.MaxScore + '</a>';
-    row.Thumbnail = '<a href="?view=event&amp;eid=' + eid + filterQuery + sortQuery + '&amp;page=1">' + row.imgHtml + '</a>';
+    if ( WEB_LIST_THUMBS ) row.Thumbnail = '<a href="?view=event&amp;eid=' + eid + filterQuery + sortQuery + '&amp;page=1">' + row.imgHtml + '</a>';
   });
 
   return rows;
@@ -161,6 +161,9 @@ function getEventDetailModal(eid) {
 }
 
 function initPage() {
+  // Remove the thumbnail column from the DOM if thumbnails are off globally
+  if ( !WEB_LIST_THUMBS ) $j('th[data-field="Thumbnail"]').remove();
+
   // Load the delete confirmation modal into the DOM
   getDelConfirmModal();
 
diff --git a/web/skins/classic/views/js/events.js.php b/web/skins/classic/views/js/events.js.php
index 48f405dd7..207a6745e 100644
--- a/web/skins/classic/views/js/events.js.php
+++ b/web/skins/classic/views/js/events.js.php
@@ -11,3 +11,4 @@ var archivedString = "<?php echo translate('Archived') ?>";
 var emailedString = "<?php echo translate('Emailed') ?>";
 var yesString = "<?php echo translate('Yes') ?>";
 var noString = "<?php echo translate('No') ?>";
+var WEB_LIST_THUMBS = <?php echo ZM_WEB_LIST_THUMBS?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 176c85822..23629514e 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -946,7 +946,8 @@ function initPage() {
   });
 
   // Only enable the settings button for local cameras
-  settingsBtn.prop('disabled', !(monitorType == 'Local' && canViewControl));
+  settingsBtn.prop('disabled', !canViewControl);
+  if ( monitorType != 'Local' ) settingsBtn.hide();
 } // initPage
 
 // Kick everything off