Index: sources/gui/qml/dialogs/NotificationDialog.qml
===================================================================
diff -u -r0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29 -r19acf57838bc97979052d626f3e05d46310b6335
--- sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision 0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29)
+++ sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision 19acf57838bc97979052d626f3e05d46310b6335)
@@ -44,7 +44,7 @@
 
     property bool  resumeVisible        : false
     property bool  rinsebackVisible     : false
-    property bool  temporaryBreakVisible: alarmID === 3   // TODO -- ONLY FOR DEMO - nned to update fw message and add
+    property bool  temporaryBreakVisible: false
     property bool  endVisible           : false
     property bool  okVisible            : false
     property bool  minVisible           : true
@@ -158,6 +158,11 @@
             interactive : false
             clip        : true
 
+            onCurrentIndexChanged: {
+                var item = model.get(_listView.currentIndex)
+                _root.figureImageSource = item.image
+            }
+
             delegate: Item { id: _delegateControl
                 width   : _listView.width
                 height  : Variables.instructionHeight
@@ -210,12 +215,7 @@
 
                 MouseArea {
                     anchors.fill: parent
-                    onClicked: {
-                        if (_listView.currentIndex !== index) {
-                            _listView.currentIndex = index
-                            _root.figureImageSource = model.image
-                        }
-                    }
+                    onClicked: _listView.currentIndex = index
                 }
             }
         }