diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 1521c38eaa..a1540c22ab 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -17,7 +17,6 @@ Cura.MachineAction
     UM.I18nCatalog { id: catalog; name: "cura" }
 
     anchors.fill: parent
-    anchors.margins: UM.Theme.getSize("default_margin").width
 
     property var extrudersModel: Cura.ExtrudersModel {}
 
@@ -49,37 +48,26 @@ Cura.MachineAction
         }
     }
 
-    Rectangle
+    Cura.RoundedRectangle
     {
-        anchors.fill: parent
-        border.color: tabBar.visible ? UM.Theme.getColor("lining") : "transparent"
+        anchors
+        {
+            top: tabBar.bottom
+            topMargin: -UM.Theme.getSize("default_lining").height
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+        cornerSide: Cura.RoundedRectangle.Direction.Down
+        border.color: UM.Theme.getColor("lining")
         border.width: UM.Theme.getSize("default_lining").width
         radius: UM.Theme.getSize("default_radius").width
-
-        UM.TabRow
-        {
-            id: tabBar
-            width: parent.width
-
-            Repeater
-            {
-                model: tabNameModel
-                delegate: Cura.TabButton
-                {
-                    text: model.name
-                }
-            }
-        }
-
+        color: UM.Theme.getColor("main_background")
         StackLayout
         {
             id: tabStack
-            anchors.top: tabBar.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
+            anchors.fill: parent
 
-            width: parent.width
             currentIndex: tabBar.currentIndex
 
             MachineSettingsPrinterTab
@@ -99,4 +87,17 @@ Cura.MachineAction
             }
         }
     }
+    UM.TabRow
+    {
+        id: tabBar
+        width: parent.width
+        Repeater
+        {
+            model: tabNameModel
+            delegate: UM.TabRowButton
+            {
+                text: model.name
+            }
+        }
+    }
 }
diff --git a/resources/qml/Widgets/TabButton.qml b/resources/qml/Widgets/TabButton.qml
deleted file mode 100644
index 86d1180abf..0000000000
--- a/resources/qml/Widgets/TabButton.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2019 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.10
-import QtQuick.Controls 2.3
-
-import UM 1.3 as UM
-import Cura 1.1 as Cura
-
-
-//
-// This is the default Cura Tab button which is a plaintext label.
-//
-UM.TabRowButton
-{
-    id: tabButton
-    text: model.name
-
-    contentItem: Label
-    {
-        anchors.centerIn: tabButton
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        text: tabButton.text
-        font: tabButton.checked ? UM.Theme.getFont("medium_bold") : UM.Theme.getFont("medium")
-        renderType: Text.NativeRendering
-    }
-}