diff --git a/src/qml/TopNotificationItem.qml b/src/qml/TopNotificationItem.qml
--- a/src/qml/TopNotificationItem.qml
+++ b/src/qml/TopNotificationItem.qml
@@ -17,8 +17,7 @@
 
 import QtQuick 2.7
 import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.2
-import QtQuick.Controls 1.4 as Controls1
+import QtQuick.Controls 2.3
 import org.kde.elisa 1.0
 
 FocusScope {
@@ -31,9 +30,9 @@
 
     property alias itemMessage: notificationText.text
     property alias itemMainButtonText: mainButton.text
-    property alias itemMainButtonIconName: mainButton.iconName
+    property alias itemMainButtonIconName: mainButton.icon.name
     property alias itemSecondaryButtonText: secondaryButton.text
-    property alias itemSecondaryButtonIconName: secondaryButton.iconName
+    property alias itemSecondaryButtonIconName: secondaryButton.icon.name
     property var parentList
 
     MouseArea {
@@ -60,7 +59,7 @@
             opacity: (topItem.height - height) / height
         }
 
-        Controls1.Button {
+        Button {
             id: mainButton
 
             Layout.leftMargin: elisaTheme.layoutHorizontalMargin
@@ -83,7 +82,7 @@
             }
         }
 
-        Controls1.Button {
+        Button {
             id: secondaryButton
 
             Layout.leftMargin: elisaTheme.layoutHorizontalMargin
@@ -111,15 +110,18 @@
         }
     }
 
-    Controls1.ToolButton {
+    Action {
+        id: closeAction
+        icon.name: 'dialog-close'
+        onTriggered: close()
+    }
+
+    FlatButtonWithToolTip {
+        action: closeAction
         anchors.top: parent.top
         anchors.right: parent.right
 
         visible: topItem.height > height
         opacity: (topItem.height - height) / height
-
-        iconName: 'dialog-close'
-
-        onClicked: close()
     }
 }