Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rb55cd9ea96a465115044a79bb768c7445461f2a2
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision b55cd9ea96a465115044a79bb768c7445461f2a2)
@@ -518,7 +518,7 @@
 void MessageDispatcher::onAdjustment(const AdjustAlarmVolumeRequestData &vData)
 {
     QVariantList mData;
-    mData += vData.volume ;
+    mData += vData.volume;
     onActionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData);
 }
 
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rb55cd9ea96a465115044a79bb768c7445461f2a2
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision b55cd9ea96a465115044a79bb768c7445461f2a2)
@@ -102,7 +102,7 @@
             ID_AlarmClearedConditionRsp         = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus
             ID_AlarmSilenceReq                  = 0x3200, // 50
             ID_AlarmUserActionReq               = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD
-            ID_AlarmVolumeSetReq                = 0x8A00, // 138
+            ID_AlarmVolumeSetReq                = 0x4E00, // 78
 
             // Pre-Treatment Parameters
             ID_TreatmentCreateReq               = 0x3500, // 53
Index: sources/gui/qml/pages/SettingsAlarmVolume.qml
===================================================================
diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rb55cd9ea96a465115044a79bb768c7445461f2a2
--- sources/gui/qml/pages/SettingsAlarmVolume.qml	(.../SettingsAlarmVolume.qml)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
+++ sources/gui/qml/pages/SettingsAlarmVolume.qml	(.../SettingsAlarmVolume.qml)	(revision b55cd9ea96a465115044a79bb768c7445461f2a2)
@@ -25,6 +25,7 @@
         }
 
         onClicked: {
+            vAlarmVolume.doCancelAlarmVolume()
             _root.clickedBack()
         }
     }
@@ -37,7 +38,7 @@
         }
 
         onClicked: {
-            vAlarmVolume.doSetAlarmVolume(_volume.value)
+            vAlarmVolume.doConfirmAlarmVolume()
             _root.clickedBack()
         }
     }
@@ -108,20 +109,13 @@
                 right: _volume.right
             }
         }
-
-
-        NotificationBarSmall { id: _notification
-            imageAutoSize: true
-            height  : 25
-            color: "transparent"
-            imageSource : ""
-            text        : vAlarmVolume.status
-            textColor: Colors.textMain
-            textfontSize: Fonts.fontPixelTextRectExtra
-            anchors {
-                top: _volume.bottom
-                bottomMargin: Variables.settingsMargin
-            }
+    }
+    onVisibleChanged: {
+        if (visible) {
+            vAlarmVolume.editingAlarmVolume = true
+        } else {
+            vAlarmVolume.editingAlarmVolume = false
         }
+
     }
 }
Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rb55cd9ea96a465115044a79bb768c7445461f2a2
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision b55cd9ea96a465115044a79bb768c7445461f2a2)
@@ -183,15 +183,15 @@
             onClicked: {
                 push(_alarmVolume)
             }
-//            visible: vServiceMode.isServiceMode
+            visible: vServiceMode.isServiceMode
         }
         SettingsItem { id: _itemBrightness
             title   : qsTr("Brightness")
             onClicked: {
                 vBrightness.doGetBrightness()
                 push(_brightness)
             }
-//            visible: vServiceMode.isServiceMode
+            visible: vServiceMode.isServiceMode
         }
     }
 
Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h
===================================================================
diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rb55cd9ea96a465115044a79bb768c7445461f2a2
--- sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
+++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision b55cd9ea96a465115044a79bb768c7445461f2a2)
@@ -502,17 +502,17 @@
  *
  * |   MSG  | CAN ID | Type | Ack | Src | Dest | Description                 |
  * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------------:|
- * |        | 0x100  | Req  | Y   | UI  | All  | HD Set Alarm Volume Request |
+ * | 0x4E00 | 0x100  | Req  | Y   | UI  | All  | HD Set Alarm Volume Request |
  *
  * | Payload  ||
  * |          ||
- * | #1:(N/A) | \ref None |
+ * | #1:(U32) volume | \ref Alarm Volume |
  *
  */
 class MAdjustAlarmVolumeReq : public MModel {
 public:
 
-    quint32 volume = 1; // the requested volume, 1..5
+    quint32 volume;
 
     // coco begin validated : Has been validated manually.
     // This object is used statically for now, kept the logic for later usage.
@@ -521,7 +521,7 @@
     }
     // coco end
     static QString toString(const QVariantList &vParameters) {
-        return MModel::toString("HDAlarmVolume", vParameters);
+        return MModel::toString("AlarmVolume", vParameters);
     }
 
     static Can::Can_Id canid () { return Can::eChlid_UI_HD; }
Index: sources/view/VAlarmVolume.cpp
===================================================================
diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rb55cd9ea96a465115044a79bb768c7445461f2a2
--- sources/view/VAlarmVolume.cpp	(.../VAlarmVolume.cpp)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
+++ sources/view/VAlarmVolume.cpp	(.../VAlarmVolume.cpp)	(revision b55cd9ea96a465115044a79bb768c7445461f2a2)
@@ -25,26 +25,48 @@
 }
 
 /*!
- * \brief VAlarmVolume::doRequestChangeAlarmVolume
+ * \brief VAlarmVolume::doSetAlarmVolume
  * Sends a request to change the alarm volume
  * \param vVolume
  */
 void VAlarmVolume::doSetAlarmVolume(const quint32 &vVolume)
 {
-    if (vVolume >= alarmVolumeMinimum() && vVolume <= alarmVolumeMaximum())
-    {
-        AdjustAlarmVolumeRequestData data;
-        data.volume = vVolume;
-        emit didAdjustment(data);
-    }
+    alarmVolumeTemp(vVolume);
+    AdjustAlarmVolumeRequestData data;
+    data.volume = alarmVolumeTemp();
+    emit didAdjustment(data);
 }
 
 /*!
+ * \brief VAlarmVolume::doConfirmAlarmVolume
+ * Sets the alarm volume to the last volume level selected by the user
+ */
+void VAlarmVolume::doConfirmAlarmVolume()
+{
+    alarmVolume(alarmVolumeTemp());
+    AdjustAlarmVolumeRequestData data;
+    data.volume = alarmVolume();
+    emit didAdjustment(data);
+}
+
+/*!
+ * \brief VAlarmVolume::doCancelAlarmVolume
+ * Reverts the alarm volume setting back to before editing began
+ */
+void VAlarmVolume::doCancelAlarmVolume()
+{
+    AdjustAlarmVolumeRequestData data;
+    data.volume = alarmVolume();
+    emit didAdjustment(data);
+}
+
+/*!
  * \brief VAlarmVolume::onActionReceive
- * When we receive a broadcast of the alarm volume
+ * When we receive a broadcast of the alarm volume from the HD
  * \param vData - (AlarmVolumeData) the alarm volume information
  */
 void VAlarmVolume::onActionReceive(const AlarmVolumeData &vData)
 {
-    alarmVolume(vData.mAlarmVolume);
+    if (!editingAlarmVolume())
+        alarmVolume(vData.mAlarmVolume);
 }
Index: sources/view/VAlarmVolume.h
===================================================================
diff -u -rbd560752aaa76183f168f0af6ad97b75b6b57c79 -rb55cd9ea96a465115044a79bb768c7445461f2a2
--- sources/view/VAlarmVolume.h	(.../VAlarmVolume.h)	(revision bd560752aaa76183f168f0af6ad97b75b6b57c79)
+++ sources/view/VAlarmVolume.h	(.../VAlarmVolume.h)	(revision b55cd9ea96a465115044a79bb768c7445461f2a2)
@@ -30,15 +30,17 @@
 VIEW_DEC_CLASS(VAlarmVolume)
 VIEW_DEC_SLOT(AlarmVolumeData)
 
-
 protected:
-    PROPERTY(QString, status, "")
     PROPERTY(quint32, alarmVolume, 5)
+    PROPERTY(quint32, alarmVolumeTemp, 5)
     PROPERTY(quint32, alarmVolumeMinimum, 1)
     PROPERTY(quint32, alarmVolumeMaximum, 5)
+    PROPERTY(bool,    editingAlarmVolume, false)
 
 public slots:
     void doSetAlarmVolume(const quint32 &vVolume);
+    void doConfirmAlarmVolume();
+    void doCancelAlarmVolume();
 
 signals:
     void didAdjustment(const AdjustAlarmVolumeRequestData &vData);