Index: sources/gui/qml/components/ArrowButton.qml
===================================================================
diff -u -rd9ddce7c3ea52448a89932b02500226b521b835b -rd70b0372a4457f36abedd3034f237d6e0cafa111
--- sources/gui/qml/components/ArrowButton.qml	(.../ArrowButton.qml)	(revision d9ddce7c3ea52448a89932b02500226b521b835b)
+++ sources/gui/qml/components/ArrowButton.qml	(.../ArrowButton.qml)	(revision d70b0372a4457f36abedd3034f237d6e0cafa111)
@@ -1,6 +1,5 @@
 // Qt
 import QtQuick 2.12
-import QtGraphicalEffects 1.12
 
 import "qrc:/globals"
 import "qrc:/components"
@@ -27,9 +26,6 @@
     height          : iconSize + 20
     width           : height
     radius          : height
-    disabledColor   : Colors.buttonDisableColor
-    borderColor     : Colors.transparent
-    borderDisabledColor: Colors.transparent
 
     Image { id  : _iconImage
         anchors.centerIn: parent
@@ -41,15 +37,4 @@
         fillMode        : Image.PreserveAspectFit
         source          : iconImage
     }
-
-    layer.enabled: true
-    layer.effect: DropShadow { id: _dropShadow
-        horizontalOffset: 3
-        verticalOffset  : 3
-        radius          : 3.0
-        samples         : 7
-        color           : "#50000000"
-        source          : _root
-        anchors.fill    : _root
-    }
 }
Index: sources/gui/qml/components/ModalDialog.qml
===================================================================
diff -u -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d -rd70b0372a4457f36abedd3034f237d6e0cafa111
--- sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
+++ sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision d70b0372a4457f36abedd3034f237d6e0cafa111)
@@ -49,8 +49,10 @@
 
     closePolicy: Dialog.NoAutoClose
     Overlay.modal : Rectangle { id : _borderRect
-        anchors.fill: parent
-        color: Colors.borderDialog
+        anchors.fill    : parent
+        color           : "#B3000000"
+
+        Behavior on opacity { NumberAnimation { duration: 300} }
     }
 
     background: Rectangle { id: _backgroundRect
@@ -62,7 +64,6 @@
         if (autoHide && visible) {
             _autoHideAnimation.start()
         }
-        dimBackground.visible = _root.visible
     }
 
     NumberAnimation { id: _autoHideAnimation
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d -rd70b0372a4457f36abedd3034f237d6e0cafa111
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision d70b0372a4457f36abedd3034f237d6e0cafa111)
@@ -260,18 +260,6 @@
 
     Background {}
 
-    Rectangle {
-        id: dimBackground
-        objectName: "dimBackground"
-        color: "black"
-        anchors.fill: parent
-        z: 3
-        visible: false
-
-        Behavior on opacity { NumberAnimation { duration: 300} }
-        opacity : visible !== true ? 0.0 : 0.7
-    }
-
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml
===================================================================
diff -u -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d -rd70b0372a4457f36abedd3034f237d6e0cafa111
--- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml	(.../TreatmentFlowsComponent.qml)	(revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml	(.../TreatmentFlowsComponent.qml)	(revision d70b0372a4457f36abedd3034f237d6e0cafa111)
@@ -1,6 +1,7 @@
 
 // Qt
 import QtQuick 2.12
+import QtGraphicalEffects 1.12
 
 // Project
 
@@ -117,4 +118,15 @@
         color           : "orange"
         horizontalAlignment : Text.AlignHCenter
     }
+
+    layer.enabled   : _root.dropShadowEnabled
+    layer.effect    : DropShadow { id: _dropShadow
+        horizontalOffset: 3
+        verticalOffset  : 3
+        radius          : 3.0
+        samples         : 7
+        color           : "#50000000"
+        source          : _root
+        anchors.fill    : _root
+    }
 }
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r9f232c795f4a32cdd1daefb85f4ea5b0ff915415 -rd70b0372a4457f36abedd3034f237d6e0cafa111
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision 9f232c795f4a32cdd1daefb85f4ea5b0ff915415)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision d70b0372a4457f36abedd3034f237d6e0cafa111)
@@ -120,8 +120,8 @@
             radius          : 9
             text.textFormat : Text.RichText
             text.text       : buttonText
-            backgroundColor :  borderColor
-            textColor       : Colors.textButton
+            isDefault       : true
+
             text.font {
                 weight      : Font.DemiBold
                 pixelSize   : 20