diff --git a/app/qml/MainWindow/Dashboard/WidgetGrid.qml b/app/qml/MainWindow/Dashboard/WidgetGrid.qml
index c0eca90b..1dad8fb0 100644
--- a/app/qml/MainWindow/Dashboard/WidgetGrid.qml
+++ b/app/qml/MainWindow/Dashboard/WidgetGrid.qml
@@ -66,7 +66,7 @@ Widgets.Pane {
     Rectangle {
       z: 2
       id: header
-      height: visible ? 64 : 0
+      height: actionsLayout.implicitHeight + 12
       visible: Cpp_UI_Dashboard.actionCount > 0
       color: Cpp_ThemeManager.colors["groupbox_background"]
       anchors {
@@ -76,6 +76,7 @@ Widgets.Pane {
       }
 
       RowLayout {
+        id: actionsLayout
         spacing: 4
 
         anchors {
@@ -90,11 +91,11 @@ Widgets.Pane {
           delegate: Widgets.BigButton {
             icon.width: 24
             icon.height: 24
+            toolbarButton: false
             Layout.alignment: Qt.AlignVCenter
             text: Cpp_UI_Dashboard.actionTitles[index]
             icon.source: Cpp_UI_Dashboard.actionIcons[index]
             onClicked: Cpp_UI_Dashboard.activateAction(index)
-            palette.buttonText: Cpp_ThemeManager.colors["button_text"]
           }
         }
 
diff --git a/app/qml/ProjectEditor/Views/ActionView.qml b/app/qml/ProjectEditor/Views/ActionView.qml
index dd78b166..002ea037 100644
--- a/app/qml/ProjectEditor/Views/ActionView.qml
+++ b/app/qml/ProjectEditor/Views/ActionView.qml
@@ -101,9 +101,9 @@ Widgets.Pane {
         //
         Widgets.BigButton {
           iconSize: 24
+          toolbarButton: false
           text: qsTr("Change Icon")
           Layout.alignment: Qt.AlignVCenter
-          palette.buttonText: Cpp_ThemeManager.colors["button_text"]
           icon.source: "qrc:/rcc/actions/" + Cpp_JSON_ProjectModel.actionIcon + ".svg"
           onClicked: {
             actionIconPicker.selectedIcon = Cpp_JSON_ProjectModel.actionIcon
@@ -123,10 +123,10 @@ Widgets.Pane {
         //
         Widgets.BigButton {
           iconSize: 24
+          toolbarButton: false
           text: qsTr("Duplicate")
           Layout.alignment: Qt.AlignVCenter
           onClicked: Cpp_JSON_ProjectModel.duplicateCurrentAction()
-          palette.buttonText: Cpp_ThemeManager.colors["button_text"]
           icon.source: "qrc:/rcc/icons/project-editor/actions/duplicate.svg"
         }
 
@@ -136,9 +136,9 @@ Widgets.Pane {
         Widgets.BigButton {
           iconSize: 24
           text: qsTr("Delete")
+          toolbarButton: false
           Layout.alignment: Qt.AlignVCenter
           onClicked: Cpp_JSON_ProjectModel.deleteCurrentAction()
-          palette.buttonText: Cpp_ThemeManager.colors["button_text"]
           icon.source: "qrc:/rcc/icons/project-editor/actions/delete.svg"
         }
       }