2 files changed, 3 insertions, 3 deletions

diff --git a/framework/qml/IconButton.qml b/framework/qml/IconButton.qml
index 6c18ed0e..3be0b887 100644
--- a/framework/qml/IconButton.qml
+++ b/framework/qml/IconButton.qml
@@ -38,11 +38,11 @@ T.Button {
     background: Rectangle {
         color: Kube.Colors.focusedButtonColor
 
-        visible: root.hovered || root.activeFocus
+        visible: root.hovered || root.visualFocus
 
         Rectangle {
             anchors.fill: parent
-            visible: root.hovered || root.pressed || root.activeFocus
+            visible: root.hovered || root.pressed
             color: root.pressed ? Kube.Colors.textColor : Kube.Colors.viewBackgroundColor
             opacity: 0.2
         }
diff --git a/framework/qml/PositiveButton.qml b/framework/qml/PositiveButton.qml
index 4293d082..a3b68d26 100644
--- a/framework/qml/PositiveButton.qml
+++ b/framework/qml/PositiveButton.qml
@@ -38,7 +38,7 @@ T.Button {
         color: Colors.positiveColor
 
         border.width: 2
-        border.color: root.activeFocus && !root.pressed ? Colors.highlightColor : Colors.positiveColor
+        border.color: root.visualFocus && !root.pressed ? Colors.highlightColor : Colors.positiveColor
 
         Rectangle {
             anchors.fill: parent