Index: sources/gui/qml/dialogs/CalibrationDialog.qml
===================================================================
diff -u -r969fb65fb9857c0a6a84cb9f7d591d16de40e898 -rbb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43
--- sources/gui/qml/dialogs/CalibrationDialog.qml	(.../CalibrationDialog.qml)	(revision 969fb65fb9857c0a6a84cb9f7d591d16de40e898)
+++ sources/gui/qml/dialogs/CalibrationDialog.qml	(.../CalibrationDialog.qml)	(revision bb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43)
@@ -81,24 +81,38 @@
     }
 
     header: Item { id : _headerRect
-        implicitHeight: Variables.adjustmentHeaderHeight
+        implicitHeight: Variables.alarmDialogHeaderHeight
 
         TitleText { id : _titleText
-            text: qsTr("Edit %1 (%2)").arg(titleText).arg(componentName)
+            text: qsTr("Edit %1").arg(titleText)
             font {
                 pixelSize   : Fonts.fontPixelSection
                 weight      : Font.Medium
             }
             color   : Colors.offWhite
             width   : _root.width - Variables.defaultMargin * 2
-            height  : parent.height
+            height  : parent.height / 2
             anchors {
                 bottom              : parent.bottom
                 horizontalCenter    : parent.horizontalCenter
-                margins             : Variables.defaultMargin
+                margins             : Variables.defaultMargin * 2
             }
         }
 
+        Text {
+            visible: _root.componentName !== ""
+
+            text    : ("(%1)").arg(componentName)
+            color   : Colors.offWhite
+            font {
+                pixelSize   : Fonts.fontPixelTextRectTitle
+            }
+            anchors {
+                top             : _titleText.bottom
+                horizontalCenter: parent.horizontalCenter
+            }
+        }
+
         CloseButton { id : _closeButton
             anchors {
                 right           : parent.right