Index: denali.qrc
===================================================================
diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r20a67175350b1c20f078bade73a77d48c4647832
--- denali.qrc	(.../denali.qrc)	(revision 7edcaf054062754370e0abd165f17ca9941b7d07)
+++ denali.qrc	(.../denali.qrc)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -20,9 +20,9 @@
         <file alias="iArrow">resources/images/ArrowRight.png</file>
         <file alias="iLogoDDT">resources/images/logo d Dark Transparent.png</file>
         <file alias="iClose">resources/images/Close.png</file>
-        <file alias="alarm.png">resources/images/alarm.png</file>
-        <file alias="bell.png">resources/images/bell.png</file>
-        <file alias="bell-off.png">resources/images/bell-off.png</file>
+        <file alias="iAlarm">resources/images/alarm.png</file>
+        <file alias="iBellOn">resources/images/bell.png</file>
+        <file alias="iBellOff">resources/images/bell-off.png</file>
         <file alias="iBack">resources/images/Back.png</file>
         <file alias="iPause">resources/images/Pause.png</file>
         <file alias="iResume">resources/images/Resume.png</file>
Index: sources/gui/qml/components/NotificationBar.qml
===================================================================
diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/gui/qml/components/NotificationBar.qml	(.../NotificationBar.qml)	(revision 7edcaf054062754370e0abd165f17ca9941b7d07)
+++ sources/gui/qml/components/NotificationBar.qml	(.../NotificationBar.qml)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -45,7 +45,7 @@
     function toggleSilence(silence, timeoutSec) {
         isSilenced = silence;
         muteTimeoutSec = !isSilenced ? 0 : timeoutSec;
-        _bell.source = isSilenced ? "qrc:/images/bell-off.png" : "qrc:/images/bell.png"
+        _bell.source = isSilenced ? "qrc:/images/iBellOff" : "qrc:/images/iBellOn"
     }
 
     function setFlashing(enable) {
@@ -66,7 +66,7 @@
 
     Image {
         id: _icon
-        source: "qrc:/images/alarm.png"
+        source: "qrc:/images/iAlarm"
         anchors.right: _text.left
         anchors.rightMargin: Variables.notificationBarIconMargin;
         anchors.verticalCenter: parent.verticalCenter;
@@ -85,7 +85,7 @@
 
     Image {
         id: _bell
-        source: isSilenced ? "qrc:/images/bell-off.png" : "qrc:/images/bell.png"
+        source: isSilenced ? "qrc:/images/iBellOff" : "qrc:/images/iBellOn"
         anchors.left: _root.left
         anchors.leftMargin: Variables.silenceIconMargin;
         anchors.verticalCenter: parent.verticalCenter;
Index: sources/gui/qml/components/RectSelectCreateTreatment.qml
===================================================================
diff -u -rfe1cc7af9637a8485b6948b50eb5fb06e4c83740 -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/gui/qml/components/RectSelectCreateTreatment.qml	(.../RectSelectCreateTreatment.qml)	(revision fe1cc7af9637a8485b6948b50eb5fb06e4c83740)
+++ sources/gui/qml/components/RectSelectCreateTreatment.qml	(.../RectSelectCreateTreatment.qml)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -44,7 +44,7 @@
         if (valid) {
             _text.color = Colors.textMain
         } else {
-            _text.color = Colors.createTrInvalidParam
+            _text.color = Colors.createTreatmentInvalidParam
         }
 
     }
Index: sources/gui/qml/components/SliderCreateTreatment.qml
===================================================================
diff -u -rfac59d7894468db257f120e58e19324a32fcbe0f -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/gui/qml/components/SliderCreateTreatment.qml	(.../SliderCreateTreatment.qml)	(revision fac59d7894468db257f120e58e19324a32fcbe0f)
+++ sources/gui/qml/components/SliderCreateTreatment.qml	(.../SliderCreateTreatment.qml)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -48,8 +48,8 @@
             _selected_value.color = Colors.textMain
             _text.color = Colors.textMain
         } else {
-            _selected_value.color = Colors.createTrInvalidParam
-            _text.color = Colors.createTrInvalidParam
+            _selected_value.color = Colors.createTreatmentInvalidParam
+            _text.color = Colors.createTreatmentInvalidParam
         }
     }
 
Index: sources/gui/qml/components/SliderDoubleCreateTreatment.qml
===================================================================
diff -u -rfac59d7894468db257f120e58e19324a32fcbe0f -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/gui/qml/components/SliderDoubleCreateTreatment.qml	(.../SliderDoubleCreateTreatment.qml)	(revision fac59d7894468db257f120e58e19324a32fcbe0f)
+++ sources/gui/qml/components/SliderDoubleCreateTreatment.qml	(.../SliderDoubleCreateTreatment.qml)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -62,8 +62,8 @@
             _lowTitle.color = Colors.textMain
             _lowSelectedValue.color = Colors.textMain
         } else {
-            _lowTitle.color = Colors.createTrInvalidParam
-            _lowSelectedValue.color = Colors.createTrInvalidParam
+            _lowTitle.color = Colors.createTreatmentInvalidParam
+            _lowSelectedValue.color = Colors.createTreatmentInvalidParam
         }
     }
 
@@ -72,8 +72,8 @@
             _highTitle.color = Colors.textMain
             _highSelectedValue.color = Colors.textMain
         } else {
-            _highTitle.color = Colors.createTrInvalidParam
-            _highSelectedValue.color = Colors.createTrInvalidParam
+            _highTitle.color = Colors.createTreatmentInvalidParam
+            _highSelectedValue.color = Colors.createTreatmentInvalidParam
         }
     }
 
Index: sources/gui/qml/dialogs/NotificationDialog.qml
===================================================================
diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision 7edcaf054062754370e0abd165f17ca9941b7d07)
+++ sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -65,12 +65,12 @@
 
         Image {
             id: _icon
-            source: "qrc:/images/alarm.png"
+            source: "qrc:/images/iAlarm"
             anchors.horizontalCenter: _title.horizontalCenter
             anchors.verticalCenter: _title.verticalCenter;
-            anchors.horizontalCenterOffset: -_title.width + Variables.dialogSVGIconOffset;
-            sourceSize.height: Variables.dialogSVGHeight;
-            sourceSize.width: Variables.dialogSVGWidth;
+            anchors.horizontalCenterOffset: -_title.width + Variables.dialogIconHorizontalOffset;
+            sourceSize.height: Variables.dialogIconHeight;
+            sourceSize.width: Variables.dialogIconWidth;
         }
 
         Text { id: _title
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/gui/qml/globals/Colors.qml	(.../Colors.qml)	(revision 7edcaf054062754370e0abd165f17ca9941b7d07)
+++ sources/gui/qml/globals/Colors.qml	(.../Colors.qml)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -23,83 +23,83 @@
  * whcih is going to be used in the project
  */
 QtObject {
-    readonly property color backgroundMain          : "#1A344D"
-    readonly property color backgroundButtonNormal  : "Transparent"
-    readonly property color backgroundButtonSelect  : "#438FEB"
-    readonly property color backgroundBtnSelectDark : "#214773"
-    readonly property color backgroundDialog        : "#254670"
-    readonly property color backgroundMenu          : "#14314C"
-    readonly property color backgroundMainMenu      : "#0D2639"
-    readonly property color backgroundDottedMenu    : "#64809D"
-    readonly property color backgroundSlider        : "#195187"
+    readonly property color backgroundMain                   : "#1A344D"
+    readonly property color backgroundButtonNormal           : "Transparent"
+    readonly property color backgroundButtonSelect           : "#438FEB"
+    readonly property color backgroundBtnSelectDark          : "#214773"
+    readonly property color backgroundDialog                 : "#254670"
+    readonly property color backgroundMenu                   : "#14314C"
+    readonly property color backgroundMainMenu               : "#0D2639"
+    readonly property color backgroundDottedMenu             : "#64809D"
+    readonly property color backgroundSlider                 : "#195187"
 
-    readonly property color backgroundUltrafiltrationButton : "#31568F"
-    readonly property color textValueUltrafiltrationButtonFg: "#98aec2"
+    readonly property color backgroundUltrafiltrationButton  : "#31568F"
+    readonly property color textValueUltrafiltrationButtonFg : "#98aec2"
 
 
-    readonly property color backgroundRangeRect     : "#3e546e"
-    readonly property color highlightProgressBar    : "#3d8eef"
-    readonly property color highlightMedProgressBar : "#1b2b3e"
-    readonly property color textProgressBar         : "#88a3c5"
+    readonly property color backgroundRangeRect              : "#3e546e"
+    readonly property color highlightProgressBar             : "#3d8eef"
+    readonly property color highlightMedProgressBar          : "#1b2b3e"
+    readonly property color textProgressBar                  : "#88a3c5"
 
-    readonly property color textRangeMarker         : "white"
-    readonly property color rangeMarker             : "white"
-    readonly property color rangeMarkerShort        : "#9fb6d1"
+    readonly property color textRangeMarker                  : "white"
+    readonly property color rangeMarker                      : "white"
+    readonly property color rangeMarkerShort                 : "#9fb6d1"
 
-    readonly property color textMain                : "#FCFCFC"
-    readonly property color textButton              : "#FCFCFC" //"#E8E8E8"
-    readonly property color textDisableButton       : "#607A91"
-    readonly property color textTickMark            : "#438FEB"
+    readonly property color textMain                         : "#FCFCFC"
+    readonly property color textButton                       : "#FCFCFC" //"#E8E8E8"
+    readonly property color textDisableButton                : "#607A91"
+    readonly property color textTickMark                     : "#438FEB"
 
-    readonly property color borderButton            : "#4290EC"     //K:D //"#438FEB"
-    readonly property color borderDisableButton     : "#607A91"
-    readonly property color boderSeparatorLine      : "#476982"
-    readonly property color borderDialog            : "transparent" // "#D01A344D" // "#D00F0F0F" //"#F51A344D"
+    readonly property color borderButton                     : "#4290EC"     //K:D //"#438FEB"
+    readonly property color borderDisableButton              : "#607A91"
+    readonly property color boderSeparatorLine               : "#476982"
+    readonly property color borderDialog                     : "transparent" // "#D01A344D" // "#D00F0F0F" //"#F51A344D"
 
-    readonly property color touchTextAreaTitle      : "#a0b6d0"
+    readonly property color touchTextAreaTitle               : "#a0b6d0"
 
-    readonly property color textTextRectTitle       : "#ffffff"
-    readonly property color textTextRectLabel       : "#e8e8e8"
-    readonly property color textTextRectExtra       : "#708795"
+    readonly property color textTextRectTitle                : "#ffffff"
+    readonly property color textTextRectLabel                : "#e8e8e8"
+    readonly property color textTextRectExtra                : "#708795"
 
-    readonly property color line                    : "#094266"
+    readonly property color line                             : "#094266"
 
-    readonly property color pressuresText           : "white"
-    readonly property color pressuresArterialBar    : "#31bcdb"
-    readonly property color pressuresVenousBar      : "#c568ed"
+    readonly property color pressuresText                    : "white"
+    readonly property color pressuresArterialBar             : "#31bcdb"
+    readonly property color pressuresVenousBar               : "#c568ed"
 
-    readonly property color fluidText               : "white"
-    readonly property color fluidValue              : "white"
-    readonly property color fluidUnit               : "#708795"
+    readonly property color fluidText                        : "white"
+    readonly property color fluidValue                       : "white"
+    readonly property color fluidUnit                        : "#708795"
 
-    readonly property color textNotificationNoneBg  : "white"
-    readonly property color textNotificationNoneFg  : "#1b2b3e"
+    readonly property color textNotificationNoneBg           : "white"
+    readonly property color textNotificationNoneFg           : "#1b2b3e"
 
-    readonly property color textNotificationLowBg   : "#f5a623"   // ?
-    readonly property color textNotificationLowFg   : "white"   // ?
+    readonly property color textNotificationLowBg            : "#f5a623"   // ?
+    readonly property color textNotificationLowFg            : "white"   // ?
 
-    readonly property color textNotificationMedBg   : "#f5a623"  // ?
-    readonly property color textNotificationMedFg   : "white"   // ?
+    readonly property color textNotificationMedBg            : "#f5a623"  // ?
+    readonly property color textNotificationMedFg            : "white"   // ?
 
-    readonly property color textNotificationHighBg  : "#c53b33" // red
-    readonly property color textNotificationHighFg  : "white"
+    readonly property color textNotificationHighBg           : "#c53b33" // red
+    readonly property color textNotificationHighFg           : "white"
 
-    readonly property color alarmTopBarHighBg       : "#831913"
-    readonly property color alarmTopBarHighFg       : "white"
+    readonly property color alarmTopBarHighBg                : "#831913"
+    readonly property color alarmTopBarHighFg                : "white"
 
-    readonly property color alarmTopBarMedBg        : "#db8f00"
-    readonly property color alarmTopBarMedFg        : "white"
+    readonly property color alarmTopBarMedBg                 : "#db8f00"
+    readonly property color alarmTopBarMedFg                 : "white"
 
-    readonly property color alarmTopBarLowBg        : "#db8f00"
-    readonly property color alarmTopBarLowFg        : "white"
+    readonly property color alarmTopBarLowBg                 : "#db8f00"
+    readonly property color alarmTopBarLowFg                 : "white"
 
-    readonly property color createTreatmentActive   : "#3d8eef"
-    readonly property color createTreatmentInactive : "#3e546e"
-    readonly property color createTreatmentNotReady : "#1f4974"
-    readonly property color createTreatmentReady    : "#438FEB"
-    readonly property color createTrTextNotReady    : "#507090"
-    readonly property color createTrTextReady       : "white"
-    readonly property color createTrInvalidParam    : "red"
+    readonly property color createTreatmentActive            : "#3d8eef"
+    readonly property color createTreatmentInactive          : "#3e546e"
+    readonly property color createTreatmentNotReady          : "#1f4974"
+    readonly property color createTreatmentReady             : "#438FEB"
+    readonly property color createTreatmentTextNotReady      : "#507090"
+    readonly property color createTreatmentTextReady         : "white"
+    readonly property color createTreatmentInvalidParam      : "red"
 
 
 }
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rfac59d7894468db257f120e58e19324a32fcbe0f -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision fac59d7894468db257f120e58e19324a32fcbe0f)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -23,12 +23,12 @@
  * which is going to be used in the project.
  */
 QtObject {
-    readonly property int applicationWidth      : 1280
-    readonly property int applicationHeight     : 800
-    readonly property int buttonSpacing         : 150
-    readonly property int dialogSVGHeight       : 50
-    readonly property int dialogSVGWidth        : 50
-    readonly property int dialogSVGIconOffset   : 25
+    readonly property int applicationWidth          : 1280
+    readonly property int applicationHeight         : 800
+    readonly property int buttonSpacing             : 150
+    readonly property int dialogIconHeight          : 50
+    readonly property int dialogIconWidth           : 50
+    readonly property int dialogIconHorizontalOffset: 25
     readonly property int headerHeight          : 100
 
     readonly property int mainMenuHeight        : 70
@@ -76,7 +76,7 @@
     readonly property int progressbarRectWidth  :  620
 
     readonly property int sliderTextMargin      : 20
-    readonly property int treatmentSpacing     : 60
+    readonly property int treatmentSpacing      : 60
 
     readonly property int notificationHeight    : 50
     readonly property int notificationIconSize  : 36
Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml
===================================================================
diff -u -rfac59d7894468db257f120e58e19324a32fcbe0f -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/gui/qml/pages/treatment/TreatmentCreate.qml	(.../TreatmentCreate.qml)	(revision fac59d7894468db257f120e58e19324a32fcbe0f)
+++ sources/gui/qml/pages/treatment/TreatmentCreate.qml	(.../TreatmentCreate.qml)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -318,7 +318,7 @@
                 text.text: qsTr("CONTINUE")
                 backgroundColor: Colors.createTreatmentNotReady
                 borderColor: Colors.createTreatmentNotReady
-                textColor: Colors.createTrTextNotReady
+                textColor: Colors.createTreatmentTextNotReady
                 button.onClicked: {
                     vCreateTreatment.saveTreatmentProfile = false;
                     if (vCreateTreatment.continueEnabled) {
@@ -330,11 +330,11 @@
                     if (enabled) {
                         backgroundColor = Colors.createTreatmentActive
                         borderColor = Colors.createTreatmentActive
-                        textColor = Colors.createTrTextReady
+                        textColor = Colors.createTreatmentTextReady
                     } else {
                         backgroundColor = Colors.createTreatmentNotReady
                         borderColor = Colors.createTreatmentNotReady
-                        textColor = Colors.createTrTextNotReady
+                        textColor = Colors.createTreatmentTextNotReady
                     }
                 }
             }
Index: sources/storage/filehandler.h
===================================================================
diff -u -r90d4b8ed818464463083ac39d28d80958bb2c1d9 -r20a67175350b1c20f078bade73a77d48c4647832
--- sources/storage/filehandler.h	(.../filehandler.h)	(revision 90d4b8ed818464463083ac39d28d80958bb2c1d9)
+++ sources/storage/filehandler.h	(.../filehandler.h)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -16,7 +16,6 @@
 
 // Qt
 #include <QString>
-#include <QPair>
 #include <QJsonObject>
 #include <QJsonDocument>
 class QDate;
Index: unittests/tst_views.h
===================================================================
diff -u -r7edcaf054062754370e0abd165f17ca9941b7d07 -r20a67175350b1c20f078bade73a77d48c4647832
--- unittests/tst_views.h	(.../tst_views.h)	(revision 7edcaf054062754370e0abd165f17ca9941b7d07)
+++ unittests/tst_views.h	(.../tst_views.h)	(revision 20a67175350b1c20f078bade73a77d48c4647832)
@@ -28,21 +28,23 @@
     explicit tst_views(QObject *parent = nullptr);
 private:
     QString datetimeFormat = "MM.dd.yyyy_HH.mm.ss";
+
+    void VCreateTreatment_init_ranges(QJsonObject &obj);
+    void VCreateTreatment_simulate_valid_parameters(View::VCreateTreatment &view);
+
 private slots:
     void VTreatmentAdjustmentsResponse_text_NoReason();
     void VTreatmentAdjustmentsResponse_text_WAReason();
 
     void VTreatmentAdjustmentUltrafiltrationState_text();
 
-    void VCreateTreatment_simulate_valid_parameters(View::VCreateTreatment &view);
     void VCreateTreatment_validation();
     void VCreateTreatment_validation_ranges();
     void VCreateTreatment_save();
     void VCreateTreatment_json();
     void VCreateTreatment_save_csv();
     void VCreateTreatment_enums();
     void VCreateTreatment_fw_validation_response();
-    void VCreateTreatment_init_ranges(QJsonObject &obj);
     void VCreateTreatment_load_parameter_ranges();
     void VCreateTreatment_check_init();
 };