diff --git a/src/qml/FlatButtonWithToolTip.qml b/src/qml/FlatButtonWithToolTip.qml
--- a/src/qml/FlatButtonWithToolTip.qml
+++ b/src/qml/FlatButtonWithToolTip.qml
@@ -23,17 +23,20 @@
 import QtQuick.Controls 2.3
 import org.kde.elisa 1.0
 
-Button {
+ToolButton {
     id: flatButtonWithToolTip
 
     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