Index: sources/gui/qml/dialogs/AlarmListDialog.qml
===================================================================
diff -u -rf8e37a0cbb537edceebee7a7c5f2676f497d1e26 -rf7d7e8b10c7626f3c6b8450876721a452ebd730f
--- sources/gui/qml/dialogs/AlarmListDialog.qml	(.../AlarmListDialog.qml)	(revision f8e37a0cbb537edceebee7a7c5f2676f497d1e26)
+++ sources/gui/qml/dialogs/AlarmListDialog.qml	(.../AlarmListDialog.qml)	(revision f7d7e8b10c7626f3c6b8450876721a452ebd730f)
@@ -31,37 +31,37 @@
     property alias titleText            : _title.text;
     property alias titleBarForeground   : _title.color
     property alias titleBarBackground   : _titleBar.color
-    property alias isSilenced           : _muteButton.isSilenced
-    property alias timeout              : _muteButton.timeout
+    property alias isSilenced           : _headerButtonGroup.isSilenced
+    property alias timeout              : _headerButtonGroup.timeout
     property int   alarmID              : -1
     property bool  minVisible           : true
 
-    radius  : Variables.dialogRadius
+    property color contentbackgroundColor   : Colors.alarmDialog
+    property int   headerOverlap            : 30
 
+    backgroundColor : contentbackgroundColor
+    radius  : Variables.alarmDialogRadius
+
     signal muteClicked()
     signal minimizeClicked()
+    signal listClicked()
     signal itemClicked(int vIndex)
 
-    property bool  titleFading : false
-    Fader {
-        fadingProperyTarget : _root
-        fadingProperyRunning:  titleFading
-        fadingProperyName   : "titleBarBackground"
-        fadingProperyValue  :  titleBarBackground
-    }
-
     Rectangle { id: _titleBar
         color   : Colors.backgroundButtonSelect
-        height  : Variables.mainMenuHeight
+        height  : Variables.alarmDialogHeaderHeight + _root.headerOverlap
         width   : _root.width
         radius  : _root.radius
+        clip    : true
 
         Image {
             id: _icon
             source: "qrc:/images/iList"
-            anchors.horizontalCenter: _title.horizontalCenter
-            anchors.verticalCenter: _title.verticalCenter
-            anchors.horizontalCenterOffset: -_title.width + Variables.dialogIconHorizontalOffset;
+            anchors {
+                verticalCenter  : _title.verticalCenter
+                right           : _title.left
+                rightMargin      : Variables.defaultMargin
+            }
             height  : Variables.alarmListIconDiameter
             width   : Variables.alarmListIconDiameter
         }
@@ -70,7 +70,13 @@
             color: Colors.textMain
             font.pixelSize: Fonts.fontPixelTitle
             text: qsTr("Alarm list")
-            anchors.centerIn: _titleBar;
+
+            anchors {
+                verticalCenter      :  _titleBar.verticalCenter
+                verticalCenterOffset: (_root.headerOverlap / 2) * -1
+                left           : _titleBar.left
+                leftMargin     : Variables.defaultMargin * 5
+            }
         }
 
         MouseArea { id: _minimizeArea
@@ -79,72 +85,66 @@
             onClicked   : _root.minimizeClicked()
         }
 
-        UpDownButton {
-            isUp                : false
-            isList              : ! _root.minVisible
+        AlarmButtonRow { id: _headerButtonGroup
             anchors {
                 verticalCenter  : _titleBar.verticalCenter
+                verticalCenterOffset: (_root.headerOverlap / 2) * -1
                 right           : _titleBar.right
-                rightMargin     : Variables.silenceIconMargin
+                rightMargin     : Variables.defaultMargin * 2
             }
-            onClicked: _root.minimizeClicked()
-        }
 
-        MuteButton { id: _muteButton
-            anchors {
-                verticalCenter  : _titleBar.verticalCenter
-                left            : _titleBar.left
-                leftMargin      : Variables.silenceIconMargin
-            }
-            onClicked: _root.muteClicked()
+            isMinButton         : true
+            backgroundColor     : _titleBar.color
+            minMaxVisible       : _root.minVisible
+
+            onMuteClicked       : _root.muteClicked()
+            onMinMaxClicked     : _root.minimizeClicked()
+            onListClicked       : _root.listClicked()
         }
     }
 
-    Text { id: _desc
-        visible : ! vAlarmActiveList.adjustment_Accepted
-        text    :   vAlarmActiveList.status
-        objectName: "_NotificationDialog_Description"
-        color: Colors.textMain
-        font.pixelSize: Fonts.fontPixelButton
+    Rectangle { id: _content
+        color   : _root.contentbackgroundColor
+        clip    : true
         anchors {
-            horizontalCenter: parent.horizontalCenter;
-            verticalCenter: parent.verticalCenter;
+            fill            : parent
+            topMargin       : _titleBar.height + 2 - _root.headerOverlap
+            bottomMargin    : _root.headerOverlap
         }
-    }
 
-    ScrollBar {
-        visible     : vAlarmActiveList.adjustment_Accepted && ( flickable.height < flickable.contentHeight )
-        anchors.fill: _flickable
-        flickable   : _flickable
-        backColor   : Colors.backgroundDialog
-    }
-
-    Flickable { id  : _flickable
-        clip        : true
-        visible     : vAlarmActiveList.adjustment_Accepted
-        anchors {
-            top             : _titleBar.bottom
-            topMargin       : Variables.minVGap
-            bottom          : _root.bottom
-            bottomMargin    : Variables.mainMenuHeight + Variables.minVGap
-            horizontalCenter: parent.horizontalCenter
+        Text { id: _desc
+            visible : ! vAlarmActiveList.adjustment_Accepted
+            text    :  vAlarmActiveList.status
+            objectName: "_NotificationDialog_Description"
+            color: Colors.alarmDialogText
+            font.pixelSize: Fonts.fontPixelButton
+            anchors {
+                horizontalCenter: parent.horizontalCenter;
+                verticalCenter: parent.verticalCenter;
+            }
         }
-        width        : Variables.dialogWidth  - Variables.minVGap  * 2                      // * 2 : for each side
-        height       : Variables.dialogHeight - Variables.minVGap  * 2 - _titleBar.height   // * 2 : for each side
-        contentWidth : width
-        contentHeight: _alarmGrid.height
 
         TouchGrid { id: _alarmGrid
+            anchors {
+                top             : _content.top
+                topMargin       : Variables.minVGap
+                bottom          : _root.bottom
+                bottomMargin    : Variables.mainMenuHeight + Variables.minVGap
+                horizontalCenter: parent.horizontalCenter
+            }
+            visible         : vAlarmActiveList.adjustment_Accepted
+
             alignCenter     : false
-            height          : rowCount * ( rowSpacing + itemHeight  )
-            width           : parent.width
+            width           : _content.width   - Variables.minVGap  * 2                          // * 2 : for each side
+            height          : _content.height  - Variables.minVGap  * 2 - _titleBar.height      // * 2 : for each side
             colCount        : 1
             rowCount        : vAlarmActiveList.alarmIDs.length
-            itemHeight      : 80
-            itemWidth       : Variables.dialogWidth - Variables.minVGap * (2 + 1)           // * 2 : for each side & the +1 to not cover the scrollbar
+            itemHeight      : 75
+            itemWidth       : _content.width  - Variables.minVGap * (2 + 1)           // * 2 : for each side & the +1 to not cover the scrollbar
             rowSpacing      : 0
             colSpacing      : 0
-            lineColor       : Colors.backgroundMain
+            lineColor       : Colors.alarmDialogText
+            textColor       : Colors.alarmDialogText
             itemsText       : vAlarmActiveList.alarmIDs
             itemsValue      : vAlarmActiveList.alarmTexts
             itemsTouchable  : [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  ]