diff --git a/src/qml/FlatButtonWithToolTip.qml b/src/qml/FlatButtonWithToolTip.qml
--- a/src/qml/FlatButtonWithToolTip.qml
+++ b/src/qml/FlatButtonWithToolTip.qml
@@ -29,12 +29,11 @@
     activeFocusOnTab: true
 
     Keys.onReturnPressed: action.trigger()
+    Accessible.onPressAction: action.trigger()
 
     flat: true
     display: AbstractButton.IconOnly
 
-    Accessible.onPressAction: onClicked
-
     ToolTip.visible: hovered
     ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval
     ToolTip.text: flatButtonWithToolTip.action.text
diff --git a/src/qml/MediaPlayListView.qml b/src/qml/MediaPlayListView.qml
--- a/src/qml/MediaPlayListView.qml
+++ b/src/qml/MediaPlayListView.qml
@@ -17,8 +17,7 @@
  */
 
 import QtQuick 2.5
-import QtQuick.Controls 2.2
-import QtQuick.Controls 1.3 as Controls1
+import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.2
 import Qt.labs.platform 1.0 as PlatformDialog
@@ -39,42 +38,42 @@
     Accessible.role: Accessible.Pane
     Accessible.name: viewTitle.text
 
-    Controls1.Action {
+    Action {
         id: clearPlayList
         text: i18nc("Remove all tracks from play list", "Clear Playlist")
-        iconName: 'edit-clear-all'
+        icon.name: 'edit-clear-all'
         enabled: elisa.mediaPlayList ? elisa.mediaPlayList.tracksCount > 0 : false
         onTriggered: elisa.mediaPlayList.clearPlayList()
     }
 
-    Controls1.Action {
+    Action {
         id: showCurrentTrack
         text: i18nc("Show currently played track inside playlist", "Show Current Track")
-        iconName: 'media-show-active-track-amarok'
+        icon.name: 'media-show-active-track-amarok'
         enabled: elisa.mediaPlayList ? elisa.mediaPlayList.tracksCount > 0 : false
         onTriggered: {
             playListView.positionViewAtIndex(elisa.mediaPlayList.currentTrackRow, ListView.Contain)
             playListView.currentIndex = elisa.mediaPlayList.currentTrackRow
             playListView.currentItem.forceActiveFocus()
         }
     }
 
-    Controls1.Action {
+    Action {
         id: loadPlaylist
         text: i18nc("Load a playlist file", "Load Playlist...")
-        iconName: 'document-open'
+        icon.name: 'document-open'
         onTriggered:
         {
             fileDialog.fileMode = PlatformDialog.FileDialog.OpenFile
             fileDialog.file = ''
             fileDialog.open()
         }
     }
 
-    Controls1.Action {
+    Action {
         id: savePlaylist
         text: i18nc("Save a playlist file", "Save Playlist...")
-        iconName: 'document-save'
+        icon.name: 'document-save'
         enabled: elisa.mediaPlayList ? elisa.mediaPlayList.tracksCount > 0 : false
         onTriggered:
         {
@@ -125,25 +124,29 @@
                 },
 
                 // Toolbar buttons
-                Controls1.ToolButton {
+                FlatButtonWithToolTip {
                     action: showCurrentTrack
-                    Keys.onReturnPressed: action.trigger()
-                    Accessible.onPressAction: action.trigger()
+
+                    icon.height: elisaTheme.smallControlButtonSize
+                    icon.width: elisaTheme.smallControlButtonSize
                 },
-                Controls1.ToolButton {
+                FlatButtonWithToolTip {
                     action: savePlaylist
-                    Keys.onReturnPressed: action.trigger()
-                    Accessible.onPressAction: action.trigger()
+
+                    icon.height: elisaTheme.smallControlButtonSize
+                    icon.width: elisaTheme.smallControlButtonSize
                 },
-                Controls1.ToolButton {
+                FlatButtonWithToolTip {
                     action: loadPlaylist
-                    Keys.onReturnPressed: action.trigger()
-                    Accessible.onPressAction: action.trigger()
+
+                    icon.height: elisaTheme.smallControlButtonSize
+                    icon.width: elisaTheme.smallControlButtonSize
                 },
-                Controls1.ToolButton {
+                FlatButtonWithToolTip {
                     action: clearPlayList
-                    Keys.onReturnPressed: action.trigger()
-                    Accessible.onPressAction: action.trigger()
+
+                    icon.height: elisaTheme.smallControlButtonSize
+                    icon.width: elisaTheme.smallControlButtonSize
                 }
             ]
         }