diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py
index fd56c101a0..58c00850cb 100644
--- a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py
+++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py
@@ -28,7 +28,7 @@ class FirmwareUpdateCheckerMessage(Message):
                           "[no_icon]",
                           "[no_description]",
                           button_style = Message.ActionButtonStyle.LINK,
-                          button_align = Message.ActionButtonStyle.BUTTON_ALIGN_LEFT)
+                          button_align = Message.ActionButtonAlignment.ALIGN_LEFT)
 
     def getMachineId(self) -> int:
         return self._machine_id
diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml
index 6406e83efe..e4e2aedb8a 100644
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@@ -48,12 +48,13 @@ Button
     contentItem: Row
     {
         spacing: UM.Theme.getSize("narrow_margin").width
+        height: button.height
         //Left side icon. Only displayed if !isIconOnRightSide.
         UM.RecolorImage
         {
             id: buttonIconLeft
             source: ""
-            height: UM.Theme.getSize("action_button_icon").height
+            height: visible ? UM.Theme.getSize("action_button_icon").height : 0
             width: visible ? height : 0
             sourceSize.width: width
             sourceSize.height: height
@@ -70,9 +71,11 @@ Button
             font: UM.Theme.getFont("medium")
             visible: text != ""
             renderType: Text.NativeRendering
+            height: parent.height
             anchors.verticalCenter: parent.verticalCenter
             width: fixedWidthMode ? button.width - button.leftPadding - button.rightPadding : undefined
             horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
             elide: Text.ElideRight
         }
 
@@ -81,7 +84,7 @@ Button
         {
             id: buttonIconRight
             source: buttonIconLeft.source
-            height: UM.Theme.getSize("action_button_icon").height
+            height: visible ? UM.Theme.getSize("action_button_icon").height : 0
             width: visible ? height : 0
             sourceSize.width: width
             sourceSize.height: height
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index f3d2e7295a..98356181cb 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -373,6 +373,24 @@ UM.MainWindow
                     bottom: parent.bottom
                     bottomMargin:  UM.Theme.getSize("default_margin").height
                 }
+
+                primaryButton: Component
+                {
+                    Cura.PrimaryButton
+                    {
+                        text: model.name
+                        height: UM.Theme.getSize("message_action_button").height
+                    }
+                }
+
+                secondaryButton: Component
+                {
+                    Cura.SecondaryButton
+                    {
+                        text: model.name
+                        height: UM.Theme.getSize("message_action_button").height
+                    }
+                }
             }
         }
 
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 3d3bbba0a8..4a984a9252 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -320,17 +320,9 @@
         "tooltip_text": [255, 255, 255, 255],
 
         "message_background": [255, 255, 255, 255],
-        "message_shadow": [0, 0, 0, 120],
         "message_border": [192, 193, 194, 255],
-        "message_text": [0, 0, 0, 255],
         "message_close": [102, 102, 102, 255],
         "message_close_hover": [8, 7, 63, 255],
-        "message_button": [38, 113, 231, 255],
-        "message_button_hover": [81, 145, 247, 255],
-        "message_button_active": [38, 113, 231, 255],
-        "message_button_text": [255, 255, 255, 255],
-        "message_button_text_hover": [255, 255, 255, 255],
-        "message_button_text_active": [255, 255, 255, 255],
         "message_progressbar_background": [245, 245, 245, 255],
         "message_progressbar_control": [50, 130, 255, 255],
 
@@ -512,7 +504,7 @@
         "button_icon": [2.5, 2.5],
         "button_lining": [0, 0],
 
-        "action_button": [15.0, 3.0],
+        "action_button": [15.0, 2.5],
         "action_button_icon": [1.0, 1.0],
         "action_button_radius": [0.15, 0.15],
 
@@ -568,12 +560,8 @@
 
         "message": [30.0, 5.0],
         "message_close": [1, 1],
-        "message_button": [6.0, 1.8],
-        "message_shadow": [0, 0],
-        "message_margin": [0, 1.0],
-        "message_inner_margin": [1.5, 1.5],
         "message_radius": [0.25, 0.25],
-        "message_button_radius": [0.15, 0.15],
+        "message_action_button": [0, 2.0],
 
         "infill_button_margin": [0.5, 0.5],