Index: sources/gui/qml/components/CloseButton.qml
===================================================================
diff -u -r9048646630717f980a852df54349805ba63773e0 -rb88eb4be4b18985df3d35f249ee3847250e63a91
--- sources/gui/qml/components/CloseButton.qml	(.../CloseButton.qml)	(revision 9048646630717f980a852df54349805ba63773e0)
+++ sources/gui/qml/components/CloseButton.qml	(.../CloseButton.qml)	(revision b88eb4be4b18985df3d35f249ee3847250e63a91)
@@ -34,8 +34,8 @@
     }
     Image { id  : _image
         source  : "qrc:/images/iClose"
-        width   : Variables.iconsDiameter
-        height  : Variables.iconsDiameter
+        width   : _root.width
+        height  : _root.height
         anchors.centerIn: parent
     }
     MouseArea {
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r0c448ff97fb2882b068cf6da24bbed375fc68f44 -rb88eb4be4b18985df3d35f249ee3847250e63a91
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 0c448ff97fb2882b068cf6da24bbed375fc68f44)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision b88eb4be4b18985df3d35f249ee3847250e63a91)
@@ -544,7 +544,7 @@
             }
 
             LabelUnitContainer { id: _bpMeasurementInterval
-                text        : qsTr("BP Measurement Interval")
+                text        : qsTr("Vitals Interval")
                 unitText    : Variables.unitTextDuration
                 valid       : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason
 
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -rbfdee4cd41dfc4609cbd6045e64217731433f79d -rb88eb4be4b18985df3d35f249ee3847250e63a91
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision bfdee4cd41dfc4609cbd6045e64217731433f79d)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml	(.../TreatmentAdjustmentVitals.qml)	(revision b88eb4be4b18985df3d35f249ee3847250e63a91)
@@ -31,6 +31,7 @@
                                             Math.round((Variables.applicationWidth - width) / 2)
     notification.textfontSize   : 20
     notification.visible        : vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText
+    notification.anchors.rightMargin: numPad.isOpened ? 10 : 0
 
     backgroundItemZ             :  numPad.isOpened ? 0 : -1
     backgroundItem  : [ NumPad  { id: _numPad
@@ -76,6 +77,7 @@
 
     onCloseClicked: {
         numPad.hide()
+        numPad.visible = false
         vTreatmentVitals.doSkip()
     }
 
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml
===================================================================
diff -u -r73da05e9b761c559cd4d6741e574fc0f40475ebc -rb88eb4be4b18985df3d35f249ee3847250e63a91
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml	(.../TreatmentAdjustmentVitalsInterval.qml)	(revision 73da05e9b761c559cd4d6741e574fc0f40475ebc)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml	(.../TreatmentAdjustmentVitalsInterval.qml)	(revision b88eb4be4b18985df3d35f249ee3847250e63a91)
@@ -44,7 +44,7 @@
             horizontalCenter: _root.contentItem.horizontalCenter
         }
 
-        text        : qsTr("BP Measurement Interval")
+        text        : qsTr("Vitals Interval")
         unitText    : Variables.unitTextDuration
         valid       : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason
         width       : Variables.adjustmentLabelUnitContainerWidth