diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 772d4be1a..049df4ba9 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -664,9 +664,13 @@ function initPage() {
       console.log(analyse_frames);
       analyse_frames = !analyse_frames;
       if (analyse_frames) {
-        analyseBtn.toggleClass('btn-primary');
+        analyseBtn.addClass('btn-primary');
+        analyseBtn.removeClass('btn-secondary');
+        analyseBtn.attr('title', translate['Showing Analysis']);
       } else {
-        analyseBtn.toggleClass('btn-secondary');
+        analyseBtn.removeClass('btn-primaryary');
+        analyseBtn.addClass('btn-secondary');
+        analyseBtn.attr('title', translate['Not Showing Analysis']);
       }
       for ( var i = 0, length = monitors.length; i < length; i++ ) {
         monitors[i].show_analyse_frames(analyse_frames);
diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index ddaadf605..0c94a90ee 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -122,3 +122,7 @@ var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 var refreshApplet = <?php echo (canStreamApplet() && $streamMode == "jpeg")?'true':'false' ?>;
 var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;
 
+var translate = {
+  "Showing Analysis": '<?php echo translate('Showing Analysis'); ?>',
+  "Not Showing Analysis": '<?php echo translate('Not Showing Analysis'); ?>'
+};
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index 9b6e3dc24..5031c316f 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -169,13 +169,13 @@ if ( count($other_zones) ) {
               <?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
             </div>
             <div id="StreamControlButtons">
-              <button type="button" id="analyseBtn" class="btn btn-primary" title="<?php echo translate('Show Analysis') ?>">
+              <button type="button" id="analyseBtn" class="btn btn-primary" title="<?php echo translate('Showing Analysis') ?>">
                 <i class="material-icons md-18">assessment</i>
               </button>
-              <button type="button" id="pauseBtn" title="<?php echo translate('Pause') ?>">
+              <button type="button" id="pauseBtn" class="btn btn-primary" title="<?php echo translate('Pause') ?>">
                 <i class="material-icons md-18">pause</i>
               </button>
-              <button type="button" id="playBtn" title="<?php echo translate('Play') ?>">
+              <button type="button" id="playBtn" class="btn btn-primary" title="<?php echo translate('Play') ?>">
                 <i class="material-icons md-18">play_arrow</i>
               </button>
             </div>