diff --git a/Thermo.Active/wwwroot/assets/styles/base/modals.less b/Thermo.Active/wwwroot/assets/styles/base/modals.less
index c98de89e..569f945b 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/modals.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/modals.less
@@ -3578,11 +3578,14 @@
     display: flex;
     justify-content: center;
     align-items: center;
+    &:active{
+      background-image: linear-gradient(to bottom,#002680,  #1756ad);
+
+    }
   }
 
   button:disabled {
     background-color: #002680 !important;
-    ;
     filter: grayscale(100%);
   }
 
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index 4f9cfc07..3ca1c81e 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -3758,6 +3758,9 @@ article .box .body {
   justify-content: center;
   align-items: center;
 }
+.imageViewerZoom button:active {
+  background-image: linear-gradient(to bottom, #002680, #1756ad);
+}
 .imageViewerZoom button:disabled {
   background-color: #002680 !important;
   filter: grayscale(100%);
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
index 9e63f34b..9e58fcc8 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.ts
@@ -35,6 +35,11 @@ export default class Thermocamera extends Vue {
   timeoutLastTakenImage = 0;
   timeCamDiff = " ";
 
+  tcamBTNStatus:{
+    enabled: boolean,
+    visible: boolean
+  } = {enabled : false, visible: true};
+
   TCamData: {
     imageSize: { x: number, y: number },
     rangeTemperature: { max: number, min: number },
@@ -45,12 +50,10 @@ export default class Thermocamera extends Vue {
 
   @Watch("warmers", { deep: true })
   async ChangedTemps() {
-
-
-    this.btnModeEnabled = false;
+    this.tcamBTNStatus.enabled = false;
     for (const ch of store.state.warmers.channels) {
-      if (ch.tCamTempSet > 0) {
-        this.btnModeEnabled = true;
+      if (ch.tCamTempSet > 0 && ch.tCamActive) {
+        this.tcamBTNStatus.enabled = true;
         break;
       }
     }
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.vue
index 926d780e..b774ca0d 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/thermocamera.vue
@@ -79,7 +79,7 @@
 
 					<div class="input-area grid left">
 						<label>{{'warmers_thermoprophet_Enabled' | localize('Thermoprophet')}}</label>
-						<toggle-button v-model="thermocameraModeBTN"></toggle-button>
+						<toggle-button v-model="thermocameraModeBTN" :status="tcamBTNStatus"></toggle-button>
 					</div>
 
 					<!-- <div class="input-area left grid">
@@ -125,7 +125,7 @@
 				</div>
 
 				<div class="tm-controls">
-					<button class="btn btn-info square" @click="forceTakeImage()">
+					<button class="btn btn-info square" @click="forceTakeImage()" :disabled="this.thermocameraModeBTN">
 						<img src="/assets/icons/png/takesnap.png" />
 					</button>
 					<button class="btn btn-info square" @click="openImageModal()">
@@ -148,7 +148,7 @@
 				</div>
 
 				<div class="buttons">
-					<button class="btn btn-info square icon" @click="zoomIn()">
+					<button class="btn btn-info square icon" @click="zoomIn()" >
 						<i class="fa fa-search-plus"></i>
 					</button>
 					<button class="btn btn-info square icon" @click="zoomReset()">
diff --git a/Thermo.Active/wwwroot/src/modules/base-components/modal-image.ts b/Thermo.Active/wwwroot/src/modules/base-components/modal-image.ts
index 7e421045..20a93616 100644
--- a/Thermo.Active/wwwroot/src/modules/base-components/modal-image.ts
+++ b/Thermo.Active/wwwroot/src/modules/base-components/modal-image.ts
@@ -16,7 +16,7 @@ export default class ModalImage extends Vue {
 
     content: string = "";
     title: string = "";
-
+    
     mounted() {
       this.content = ModalHelper.modalImage.content;
       this.title = ModalHelper.modalImage.title;
diff --git a/Thermo.Active/wwwroot/src/modules/base-components/zoom-image.ts b/Thermo.Active/wwwroot/src/modules/base-components/zoom-image.ts
index c27068c9..bcace891 100644
--- a/Thermo.Active/wwwroot/src/modules/base-components/zoom-image.ts
+++ b/Thermo.Active/wwwroot/src/modules/base-components/zoom-image.ts
@@ -1,6 +1,7 @@
 import Vue from "vue";
 import { Prop, Component } from "vue-property-decorator";
 import { warmersService } from "@/services/warmersService";
+import { store } from '@/store';
 
 @Component([])
 export default class ZoomImage extends Vue {
@@ -43,6 +44,10 @@ export default class ZoomImage extends Vue {
   }
 
 
+  get thermocameraModeBTN(): boolean {
+    return (store.state.warmers.tCamStatus.thermoCamOnOff);
+  }
+  
   close() {
     this.$emit("close");
   }
diff --git a/Thermo.Active/wwwroot/src/modules/base-components/zoom-image.vue b/Thermo.Active/wwwroot/src/modules/base-components/zoom-image.vue
index 4757e544..25e8f2ab 100644
--- a/Thermo.Active/wwwroot/src/modules/base-components/zoom-image.vue
+++ b/Thermo.Active/wwwroot/src/modules/base-components/zoom-image.vue
@@ -16,7 +16,7 @@
       <button @click="close"><i class="fa fa-chevron-left" ></i></button>
     </div>
     <div class="btngroup2" v-if="true">
-      <button @click="forceTakeImage()">
+      <button @click="forceTakeImage()" :disabled="thermocameraModeBTN">
         <img src="/assets/icons/png/takesnap.png" />
       </button>
     </div>