diff --git a/app/gui/AppView.qml b/app/gui/AppView.qml
index f724f768..ae5e612e 100644
--- a/app/gui/AppView.qml
+++ b/app/gui/AppView.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
+import QtQuick.Controls.Material 2.2
 
 import AppModel 1.0
 import ComputerManager 1.0
@@ -121,15 +122,15 @@ CenteredGridView {
             anchors.fill: appIcon
 
             sourceComponent: Item {
-                ToolButton {
+                RoundButton {
                     anchors.horizontalCenterOffset: appIcon.isPlaceholder ? -47 : 0
                     anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : -60
                     anchors.centerIn: parent
-                    implicitWidth: 125
-                    implicitHeight: 125
+                    implicitWidth: 85
+                    implicitHeight: 85
 
                     Image {
-                        source: "qrc:/res/baseline-play_circle_filled_white-48px.svg"
+                        source: "qrc:/res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg"
                         anchors.centerIn: parent
                         sourceSize {
                             width: 75
@@ -145,17 +146,19 @@ CenteredGridView {
                     ToolTip.delay: 1000
                     ToolTip.timeout: 3000
                     ToolTip.visible: hovered
+
+                    Material.background: "#D0808080"
                 }
 
-                ToolButton {
+                RoundButton {
                     anchors.horizontalCenterOffset: appIcon.isPlaceholder ? 47 : 0
                     anchors.verticalCenterOffset: appIcon.isPlaceholder ? -75 : 60
                     anchors.centerIn: parent
-                    implicitWidth: 125
-                    implicitHeight: 125
+                    implicitWidth: 85
+                    implicitHeight: 85
 
                     Image {
-                        source: "qrc:/res/baseline-cancel-24px.svg"
+                        source: "qrc:/res/stop_FILL1_wght700_GRAD200_opsz48.svg"
                         anchors.centerIn: parent
                         sourceSize {
                             width: 75
@@ -171,6 +174,8 @@ CenteredGridView {
                     ToolTip.delay: 1000
                     ToolTip.timeout: 3000
                     ToolTip.visible: hovered
+
+                    Material.background: "#D0808080"
                 }
             }
         }
diff --git a/app/res/baseline-cancel-24px.svg b/app/res/baseline-cancel-24px.svg
deleted file mode 100644
index 3d7a7504..00000000
--- a/app/res/baseline-cancel-24px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#fff"><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
\ No newline at end of file
diff --git a/app/res/baseline-play_circle_filled_white-48px.svg b/app/res/baseline-play_circle_filled_white-48px.svg
deleted file mode 100644
index af0834e8..00000000
--- a/app/res/baseline-play_circle_filled_white-48px.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48" fill="#fff">
-    <path d="M0 0h48v48H0z" fill="none"/>
-    <path d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm-4 29V15l12 9-12 9z"/>
-</svg>
diff --git a/app/res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg b/app/res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg
new file mode 100644
index 00000000..b630b2fc
--- /dev/null
+++ b/app/res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48" fill="#FFFFFF"><path d="M370-206q-26 14-49 1t-23-40v-477q0-26 23-39t49 1l372 239q23 14 23 38.5T742-445L370-206Z"/></svg>
\ No newline at end of file
diff --git a/app/res/stop_FILL1_wght700_GRAD200_opsz48.svg b/app/res/stop_FILL1_wght700_GRAD200_opsz48.svg
new file mode 100644
index 00000000..a0c0a048
--- /dev/null
+++ b/app/res/stop_FILL1_wght700_GRAD200_opsz48.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48" fill="#FFFFFF"><path d="M309-218q-38.425 0-64.712-26.288Q218-270.575 218-309v-342q0-38.838 26.288-65.419Q270.575-743 309-743h342q38.838 0 65.419 26.581Q743-689.838 743-651v342q0 38.425-26.581 64.712Q689.838-218 651-218H309Z"/></svg>
\ No newline at end of file
diff --git a/app/resources.qrc b/app/resources.qrc
index d6196621..fa2220b7 100644
--- a/app/resources.qrc
+++ b/app/resources.qrc
@@ -4,9 +4,9 @@
         <file>res/desktop_windows-48px.svg</file>
         <file>res/ic_add_to_queue_white_48px.svg</file>
         <file>res/baseline-lock-24px.svg</file>
-        <file>res/baseline-play_circle_filled_white-48px.svg</file>
+        <file>res/play_arrow_FILL1_wght700_GRAD200_opsz48.svg</file>
         <file>res/baseline-warning-24px.svg</file>
-        <file>res/baseline-cancel-24px.svg</file>
+        <file>res/stop_FILL1_wght700_GRAD200_opsz48.svg</file>
         <file>res/no_app_image.png</file>
         <file>res/settings.svg</file>
         <file>res/arrow_left.svg</file>