diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusColorRadioButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusColorRadioButton.qml
index 6f0d385592..91d54192e6 100644
--- a/ui/StatusQ/src/StatusQ/Controls/StatusColorRadioButton.qml
+++ b/ui/StatusQ/src/StatusQ/Controls/StatusColorRadioButton.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.13
-import QtQuick.Controls 2.14
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 import StatusQ.Core.Theme 0.1
 
@@ -30,15 +30,13 @@ RadioButton {
             radius: width/2
             color: selectionColor
             border.color: StatusColors.colors['grey3']
+            border.width: 1
         }
     }
 
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
+    HoverHandler {
+        enabled: control.enabled
         cursorShape: Qt.PointingHandCursor
-        onPressed: mouse.accepted = false
     }
 }
 
diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusPickerButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusPickerButton.qml
index 3a6ad9bd3f..1c09ffb1d1 100644
--- a/ui/StatusQ/src/StatusQ/Controls/StatusPickerButton.qml
+++ b/ui/StatusQ/src/StatusQ/Controls/StatusPickerButton.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.14
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
@@ -76,11 +76,8 @@ Button {
         }
     }
 
-    // TODO: To remove when switch to Qt 5.15
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
+    HoverHandler {
+        enabled: root.enabled
         cursorShape: Qt.PointingHandCursor
-        onClicked: { root.clicked() }
     }
 }