diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 10a0be72a..250dcf928 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -291,13 +291,22 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
           <tr>
             <td class="colId"><?php echo count($displayMonitors) ?></td>
             <td class="colLeftButtons" colspan="<?php echo $left_columns -1?>">
-              <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
-              <!--<input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor(this);"
-              <?php echo  (canEdit( 'Monitors' ) && !$user['MonitorIds']) ? '' : ' disabled="disabled"' ?>
-              />-->
-<?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
-              <input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/>
-              <input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/>
+              <button name="addBtn" onclick="addMonitor(this);"
+              <?php echo (canEdit('Monitors') && !$user['MonitorIds']) ? '' : ' disabled="disabled"' ?>
+              >
+              <?php echo translate('AddNewMonitor') ?>
+              </button>
+              <button name="cloneBtn" onclick="addMonitor(this);"
+              <?php echo (canEdit('Monitors') && !$user['MonitorIds']) ? '' : ' disabled="disabled"' ?>
+              style="display:none;">
+              <?php echo translate('CloneMonitor') ?>
+              </button>
+              <button name="editBtn" onclick="editMonitor(this);" disabled="disabled">
+              <?php echo translate('Edit') ?>
+              </button>
+              <button name="deleteBtn" onclick="deleteMonitor(this);" disabled="disabled">
+              <?php echo translate('Delete') ?>
+              </button>
             </td>
 <?php
   foreach ( array_keys( $eventCounts ) as $i ) {
diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js
index 2121b6e39..e4bf24258 100644
--- a/web/skins/classic/views/js/console.js
+++ b/web/skins/classic/views/js/console.js
@@ -1,22 +1,34 @@
-var jsTranslatedAddText;
-var jsTranslatedCloneText;
 
 function setButtonStates( element ) {
   var form = element.form;
   var checked = 0;
-  for ( var i = 0; i < form.elements.length; i++ ) {
-    if ( form.elements[i].type == "checkbox" ) {
-      if ( form.elements[i].checked ) {
-        if ( checked++ > 1 )
-          break;
-      }
+  // We want to know if 1 or more monitors are checked
+  for ( var i=0; i < form.elements.length; i++ ) {
+    if (
+      form.elements[i].type=="checkbox"
+      &&
+      form.elements[i].name=="markMids[]"
+      &&
+      form.elements[i].checked
+    ) {
+      if ( checked++ > 1 )
+        break;
     }
   }
   $(element).closest("tr").toggleClass("danger");
-  form.editBtn.disabled = checked ? false : true;
-  form.addBtn.value = (checked==1) ? jsTranslatedCloneText:jsTranslatedAddText;
-
-  form.deleteBtn.disabled = (checked==0);
+  if ( checked ) {
+    form.editBtn.disabled = false;
+    form.deleteBtn.disabled = false;
+    if ( checked == 1 ) {
+      $j(form.cloneBtn).css('display','inline');
+    } else {
+      form.cloneBtn.hide();
+    }
+  } else {
+    form.cloneBtn.hide();
+    form.editBtn.disabled = true;
+    form.deleteBtn.disabled = true;
+  }
 }
 
 function addMonitor(element) {
diff --git a/web/skins/classic/views/js/console.js.php b/web/skins/classic/views/js/console.js.php
index 006cfc565..f5e65332d 100644
--- a/web/skins/classic/views/js/console.js.php
+++ b/web/skins/classic/views/js/console.js.php
@@ -18,5 +18,3 @@ if ( ZM_CHECK_FOR_UPDATES && canEdit('System') && ZM_DYN_LAST_VERSION && ( verNu
 ?>
 var showVersionPopup = <?php echo isset($showVersionPopup )?'true':'false' ?>;
 var showDonatePopup = <?php echo isset($showDonatePopup )?'true':'false' ?>;
-var translatedAddText = "<?php echo translate('AddNewMonitor') ?>";
-var translatedCloneText = "<?php echo translate('CloneMonitor') ?>";