diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml
index eb58d66773..46092e4153 100644
--- a/resources/qml/Account/AccountWidget.qml
+++ b/resources/qml/Account/AccountWidget.qml
@@ -16,30 +16,19 @@ Button
     implicitHeight: UM.Theme.getSize("main_window_header").height
     implicitWidth: UM.Theme.getSize("main_window_header").height
 
-    AvatarImage
+    background: AvatarImage
     {
         id: avatar
 
-        width: Math.round(0.8 * parent.width)
-        height: Math.round(0.8 * parent.height)
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
+        width: Math.round(0.8 * accountWidget.width)
+        height: Math.round(0.8 * accountWidget.height)
+        anchors.verticalCenter: accountWidget.verticalCenter
+        anchors.horizontalCenter: accountWidget.horizontalCenter
 
         source: loggedIn ? profile["profile_image_url"] : UM.Theme.getImage("avatar_no_user")
         outlineColor: loggedIn ? UM.Theme.getColor("account_widget_outline_active") : UM.Theme.getColor("account_widget_outline_inactive")
     }
 
-    MouseArea
-    {
-        id: mouseArea
-        anchors.fill: parent
-        onPressed: mouse.accepted = false
-        hoverEnabled: true
-        cursorShape: accountWidget.enabled ? (hovered ? Qt.PointingHandCursor : Qt.ArrowCursor) : Qt.ForbiddenCursor
-    }
-
-    background: Item {}
-
     onClicked: popup.opened ? popup.close() : popup.open()
 
     Popup
diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index a8ad94474e..a1c03af143 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -68,6 +68,5 @@ Button
         anchors.fill: parent
         onPressed: mouse.accepted = false
         hoverEnabled: true
-        cursorShape: button.enabled ? (hovered ? Qt.PointingHandCursor : Qt.ArrowCursor) : Qt.ForbiddenCursor
     }
 }