diff --git a/src/qml/FlatButtonWithToolTip.qml b/src/qml/FlatButtonWithToolTip.qml
--- a/src/qml/FlatButtonWithToolTip.qml
+++ b/src/qml/FlatButtonWithToolTip.qml
@@ -28,12 +28,15 @@
 
     activeFocusOnTab: true
 
-    Keys.onReturnPressed: onClicked
-    Accessible.onPressAction: onClicked
+    Keys.onReturnPressed: action.trigger()
+    Accessible.onPressAction: action.trigger()
 
     flat: true
     display: AbstractButton.IconOnly
 
+    icon.width: elisaTheme.smallControlButtonSize
+    icon.height: elisaTheme.smallControlButtonSize
+
     ToolTip.visible: hovered
     ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval
     ToolTip.text: flatButtonWithToolTip.action.text