diff --git a/touch/ButtonArea.qml b/touch/ButtonArea.qml
index 4b37c91..cfd3282 100644
--- a/touch/ButtonArea.qml
+++ b/touch/ButtonArea.qml
@@ -20,19 +20,13 @@
 
 import QtQuick 2.0
 
-Rectangle {
-    id: buttonArea
-
-    signal clicked
-
-    property alias pressed: mouseArea.pressed
+MouseArea {
+    id: mouseArea
     property bool transparent: false
-    color: pressed?'#33ffffff':(transparent?'#00000000':'#88000000')
 
-    MouseArea {
-        id: mouseArea
+    Rectangle {
         anchors.fill: parent
-        onClicked: buttonArea.clicked();
+        color: mouseArea.pressed?'#33ffffff':(mouseArea.transparent?'#00000000':'#88000000')
+        visible: parent.enabled
     }
 }
-
diff --git a/touch/IconMenuItem.qml b/touch/IconMenuItem.qml
index e8599fc..def02e4 100644
--- a/touch/IconMenuItem.qml
+++ b/touch/IconMenuItem.qml
@@ -21,6 +21,8 @@
 import QtQuick 2.0
 
 ButtonArea {
+    id: iconMenuItem
+
     property alias text: label.text
     property alias iconSource: icon.source
 
@@ -31,6 +33,7 @@ ButtonArea {
     Image {
         id: icon
         anchors.centerIn: parent
+        opacity: iconMenuItem.enabled ? 1 : .2
     }
 
     PLabel {