diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08809e1d6..41818a79d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -704,7 +704,9 @@ else(zmconfgen_result EQUAL 0)
 endif(zmconfgen_result EQUAL 0)
 
 # Install zm.conf
+if(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
+endif(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")
 
 # Uninstall target
 configure_file(
diff --git a/web/skins/classic/css/classic/views/montage.css b/web/skins/classic/css/classic/views/montage.css
index 1afd402a7..f37156633 100644
--- a/web/skins/classic/css/classic/views/montage.css
+++ b/web/skins/classic/css/classic/views/montage.css
@@ -23,6 +23,10 @@
     vertical-align: middle;
 }
 
+#monitors .imageFeed img {
+    border: 2px solid #ffffff;
+}
+
 #monitors .imageFeed img.idle {
     border: 2px solid #ffffff;
 }
diff --git a/web/skins/classic/css/dark/views/montage.css b/web/skins/classic/css/dark/views/montage.css
index 2ab11e409..9eba3c569 100644
--- a/web/skins/classic/css/dark/views/montage.css
+++ b/web/skins/classic/css/dark/views/montage.css
@@ -23,6 +23,10 @@
     vertical-align: middle;
 }
 
+#monitors .imageFeed img {
+    border: 2px solid #999999;
+}
+
 #monitors .imageFeed img.idle {
     border: 2px solid #999999;
 }
diff --git a/web/skins/classic/css/flat/views/montage.css b/web/skins/classic/css/flat/views/montage.css
index 1afd402a7..f37156633 100644
--- a/web/skins/classic/css/flat/views/montage.css
+++ b/web/skins/classic/css/flat/views/montage.css
@@ -23,6 +23,10 @@
     vertical-align: middle;
 }
 
+#monitors .imageFeed img {
+    border: 2px solid #ffffff;
+}
+
 #monitors .imageFeed img.idle {
     border: 2px solid #ffffff;
 }