Index: sources/gui/qml/main.qml
===================================================================
diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea)
@@ -84,28 +84,7 @@
 
     // TODO : When Testing data on Setting screen is removed
     //        This needs to be moved into the Treatment______.qml
-    VAlarmStatus { id: vAlarmStatus
-        onRaiseAlarm: {
-            updateAlarm();
-            _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced
-            _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced,
-                                            vAlarmStatus.alarm_MuteTimeout);
-
-            if (isAlarmHighPriority()) {
-                _alarm_dialog.visible = true;
-                _alarm_bar.visible = false;
-            } else {
-                if (!_alarm_dialog.visible) {
-                    _alarm_bar.visible = true;
-                }
-            }
-        }
-
-        onHideAlarm: {
-            _alarm_bar.visible = false;
-            _alarm_dialog.visible = false;
-        }
-    }
+    VAlarmStatus                                { id: vAlarmStatus                                  }
     VPowerOff                                   { id: vPowerOff                                     }
     VHDOperationMode                            { id: vHDOperationMode                              }
     VTreatmentBloodFlow                         { id: vTreatmentBloodFlow                           }
@@ -176,7 +155,6 @@
 
         onClickedNotificationBar: {
             updateAlarm();
-            _alarm_bar.setFlashing(false);
             _alarm_bar.visible = false;
             _alarm_dialog.visible = true;
         }
@@ -199,21 +177,16 @@
 
     NotificationDialog { id: _alarm_dialog
         alarmID: -1
-        onClosed: {
-            _alarm_bar.visible = true;
-        }
+
         onClickedOkay: {
             _alarm_dialog.visible = false;
+            _alarm_bar.visible = true;
             vAlarmStatus.requestOkay(alarmID)
-            if (isAlarmHighPriority()) {
-                _alarm_bar.setFlashing(true);
-                return;
-            }
-            _alarm_bar.setFlashing(false);
         }
 
         onClickedSilence: {
             _alarm_dialog.visible = false;
+            _alarm_bar.visible = true;
             vAlarmStatus.requestSilence();
         }
     }
@@ -304,4 +277,27 @@
             }
         }
     }
+
+    Connections { target: vAlarmStatus
+        onRaiseAlarm: {
+            updateAlarm();
+            _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced
+            _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced,
+                                            vAlarmStatus.alarm_MuteTimeout);
+
+            if (isAlarmHighPriority()) {
+                _alarm_dialog.visible = true;
+                _alarm_bar.visible = false;
+            } else {
+                if (!_alarm_dialog.visible) {
+                    _alarm_bar.visible = true;
+                }
+            }
+        }
+
+        onNoAlarm: {
+            _alarm_bar.visible = false;
+            _alarm_dialog.visible = false;
+        }
+    }
 }