Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml
===================================================================
diff -u -r3f45841f8e2fa936666f8de8e2a02fe19fb39a8d -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c
--- sources/gui/qml/pages/treatment/TreatmentTrends.qml	(.../TreatmentTrends.qml)	(revision 3f45841f8e2fa936666f8de8e2a02fe19fb39a8d)
+++ sources/gui/qml/pages/treatment/TreatmentTrends.qml	(.../TreatmentTrends.qml)	(revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c)
@@ -47,25 +47,6 @@
         readonly property int historyTimeWidth      : 50
     }
 
-    component ScrollButton: TouchRect { id: _scrollButton
-        objectName                  : "_scrollButton"
-        property alias iconSource   : _iconImage.source
-        anchors.verticalCenter      : parent.verticalCenter
-        width                       : _private.scrollButtonWidth
-        height                      : _private.scrollButtonWidth
-        border.color                : Colors.transparent
-        backgroundColor             : Colors.transparent
-
-        Image { id: _iconImage
-            objectName          : "_iconImage"
-            anchors.centerIn    : parent
-            height              : 35
-            width               : 35
-            fillMode            : Image.PreserveAspectFit
-            source              : "qrc:/images/iArrowLeft"
-        }
-    }
-
     component Header: Rectangle { id: _header
         objectName                      : "_header"
         property alias label            : _labelText.text
@@ -365,11 +346,11 @@
                 ListView { id: _paramList
                     objectName: "_paramList"
                     readonly property int visibleParamCount: _paramArea.isExpanded ? 7 : 5
-                    readonly property int modelCount: model.count ?? 0
+                    readonly property int modelCount: _paramList.count ?? 0
                     
                     anchors {
                         fill        : parent
-                        rightMargin : (Math.max(0, visibleParamCount - model.count) * _private.paramWidth)
+                        rightMargin : (Math.max(0, visibleParamCount - _paramList.count) * _private.paramWidth)
                     }
                     orientation                 : ListView.Horizontal
                     layoutDirection             : Qt.RightToLeft
@@ -474,20 +455,22 @@
                 direction   : ScrollBar2.Horizontal
                 scrollColor : "#606060"
                 flickable   : _paramList
-                opacity     : _paramList.model.count > _paramList.visibleParamCount
+                opacity     : _paramList.count > _paramList.visibleParamCount
                                 || _paramList.flicking || _paramList.dragging ? 1 : 0
 
                 Behavior on opacity { NumberAnimation { duration: 200 } }
             }
 
-            ScrollButton { id: _leftScrollButton
+            ArrowButton { id: _leftScrollButton
                 objectName: "_leftScrollButton"
                 anchors {
                     right           : _paramListArea.left
                     verticalCenter  : _paramTopHeader.verticalCenter
                 }
                 touchable   : _paramList.atXBeginning === false
-                iconSource  : touchable ? "qrc:/images/iArrowLeft" : "qrc:/images/iArrowLeftDisabled"
+                iconImage   : touchable ? "qrc:/images/iArrowLeft" : "qrc:/images/iArrowLeftDisabled"
+                isDefault   : false
+                borderColor : Colors.transparent
 
                 onClicked: {
                     if (_paramList.atXBeginning === false) {
@@ -496,15 +479,17 @@
                 }
             }
 
-            ScrollButton { id: _rightScrollButton
+            ArrowButton { id: _rightScrollButton
                 objectName: "_rightScrollButton"
                 anchors {
                     right           : parent.right
                     rightMargin     : _private.paramAreaRightMargin // Variables.defaultMargin
                     verticalCenter  : _paramTopHeader.verticalCenter
                 }
                 touchable   : _paramList.atXEnd === false
-                iconSource  : touchable ? "qrc:/images/iArrowRight" : "qrc:/images/iArrowRightDisabled"
+                iconImage   : touchable ? "qrc:/images/iArrowRight" : "qrc:/images/iArrowRightDisabled"
+                isDefault   : false
+                borderColor : Colors.transparent
 
                 onClicked: {
                     if (_paramList.atXEnd === false) {
@@ -623,7 +608,7 @@
 
             ListView { id: _historyList
                 objectName: "_historyList"
-                readonly property int modelCount: model.count ?? 0
+                readonly property int modelCount: _paramList.count ?? 0
 
                 anchors {
                     top         : _timeArea.bottom