Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rc25c6f4c14dd48a77d863b0af4c708cb781db91c -rf8e37a0cbb537edceebee7a7c5f2676f497d1e26
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision c25c6f4c14dd48a77d863b0af4c708cb781db91c)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision f8e37a0cbb537edceebee7a7c5f2676f497d1e26)
@@ -2,32 +2,21 @@
 
 import "qrc:/globals"
 import "qrc:/components"
-import "qrc:/"
 
 Rectangle { id: _root
 
     property alias menuHidden               : _headerMenu.hidden
     property alias headerMenuIndex          : _headerMenu.index
 
     width   : Variables.applicationWidth
-    height  : Variables.notificationHeight
+    height  : Variables.headerHeight
     clip    : true
 
     gradient: Gradient {
         GradientStop { position: 0.2; color: Qt.lighter(Colors.backgroundMain, 1.2) }
         GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.2) }
     }
 
-    onMenuHiddenChanged: {
-        if (menuHidden) {
-            headerMenuIndex = 0
-        }
-    }
-
-    function updateModel(list) {
-        _headerMenu.updateModel(list)
-    }
-
     Item { id: _dateTimeItem
         width   : Variables.headerBarDateTimeWidth
         anchors {
@@ -117,21 +106,12 @@
         titlePixelSize  : 32
         backgroundColor : Colors.transparent
         highlightHeight : 15
-    }
+        isMainTreatment : true
 
-    SDCProgressItem              { id: _sdcProgressItem
-        // TODO: disable this later. this is only for diagnostic purpose.
-        onDoubleClicked : {
-            if ( _GuiView.dryDemoMode ) {
-                let dryDemoTempID = 99
-                let id = vConfirm.id
-                vConfirm.id = dryDemoTempID
-                vConfirm.doConfirm( true  )
-                vConfirm.id = id
+        onHiddenChanged: {
+            if (hidden) {
+                index = 0
             }
-            else {
-                _diagnosticsDialog.open()
-            }
         }
     }