diff --git a/plugins/Marketplace/resources/qml/ManagePackagesButton.qml b/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
index 8d64b27609..0dc33d62f3 100644
--- a/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
+++ b/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
@@ -7,18 +7,21 @@ import Cura 1.6 as Cura
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 
-Button
+TabButton
 {
     id: root
-    width: UM.Theme.getSize("button_icon").width
+    width: UM.Theme.getSize("button_icon").width+UM.Theme.getSize("narrow_margin").width
     height: UM.Theme.getSize("button_icon").height
     hoverEnabled: true
-    property color backgroundColor: hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
+    property color inactiveBackgroundColor : hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("detail_background")
+    property color activeBackgroundColor : UM.Theme.getColor("main_background")
+    leftInset: UM.Theme.getSize("narrow_margin").width
 
     background: Rectangle
     {
-        color: backgroundColor
-        border.color: transparent
+        color: parent.checked ? activeBackgroundColor : inactiveBackgroundColor
+        border.color: parent.checked ? UM.Theme.getColor("detail_background") : "transparent"
+        border.width: UM.Theme.getSize("thick_lining").width
         radius: Math.round(width * 0.5)
     }
 
@@ -39,7 +42,8 @@ Button
   
         color: UM.Theme.getColor("icon")
         source: UM.Theme.getIcon("Settings")
-        anchors.centerIn: parent
-
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.horizontalCenterOffset: Math.round(UM.Theme.getSize("narrow_margin").width /2) 
+        anchors.verticalCenter: parent.verticalCenter
     }
 }
diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml
index 93d616209b..e18adf51f2 100644
--- a/plugins/Marketplace/resources/qml/Marketplace.qml
+++ b/plugins/Marketplace/resources/qml/Marketplace.qml
@@ -75,24 +75,11 @@ Window
                 Layout.preferredWidth: parent.width
                 Layout.preferredHeight: childrenRect.height
 
-                ManagePackagesButton
-                {
-                    id: managePackagesButton
-
-                    anchors.right: parent.right
-                    anchors.rightMargin: UM.Theme.getSize("default_margin").width
-
-                    onClicked:
-                    {
-                        content.source = "ManagedPackages.qml"
-                    }
-                }
-
                 // Page selection.
                 TabBar
                 {
                     id: pageSelectionTabBar
-                    anchors.right: managePackagesButton.left
+                    anchors.right: parent.right
                     anchors.rightMargin: UM.Theme.getSize("default_margin").width
                     height: UM.Theme.getSize("button_icon").height
                     spacing: 0
@@ -109,6 +96,10 @@ Window
                         text: catalog.i18nc("@button", "Materials")
                         onClicked: content.source = "Materials.qml"
                     }
+                    ManagePackagesButton
+                    {
+                        onClicked: content.source = "ManagedPackages.qml"
+                    }
                 }
             }
 
diff --git a/plugins/Marketplace/resources/qml/PackageTypeTab.qml b/plugins/Marketplace/resources/qml/PackageTypeTab.qml
index 0520b74fb6..79eaa9a16c 100644
--- a/plugins/Marketplace/resources/qml/PackageTypeTab.qml
+++ b/plugins/Marketplace/resources/qml/PackageTypeTab.qml
@@ -9,6 +9,7 @@ TabButton
 {
     property string pageTitle
     padding: UM.Theme.getSize("narrow_margin").width
+    horizontalPadding: UM.Theme.getSize("default_margin").width
     hoverEnabled: true
     property color inactiveBackgroundColor : hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("detail_background")
     property color activeBackgroundColor : UM.Theme.getColor("main_background")