diff --git a/plugins/Marketplace/resources/qml/ManagePackagesButton.qml b/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
index 4a734f45ba..31b97d89ed 100644
--- a/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
+++ b/plugins/Marketplace/resources/qml/ManagePackagesButton.qml
@@ -10,18 +10,17 @@ import QtQuick.Controls 2.15
 Button
 {
     id: root
-    width: childrenRect.width
-    height: childrenRect.height
-
+    width: UM.Theme.getSize("button_icon").width
+    height: UM.Theme.getSize("button_icon").height
     hoverEnabled: true
-    property color borderColor: hovered ? UM.Theme.getColor("primary") : "transparent"
     property color backgroundColor: hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
 
     background: Rectangle
     {
         color: backgroundColor
-        border.color: borderColor
-        border.width: UM.Theme.getSize("default_lining").width
+        border.color: transparent
+        radius: Math.round(width * 0.5)
+
     }
 
     Cura.ToolTip
@@ -38,8 +37,10 @@ Button
 
         width: UM.Theme.getSize("section_icon").width
         height: UM.Theme.getSize("section_icon").height
-
+  
         color: UM.Theme.getColor("icon")
         source: UM.Theme.getIcon("Settings")
+        anchors.centerIn: parent
+
     }
 }
diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml
index 4f36de01d0..430c237252 100644
--- a/plugins/Marketplace/resources/qml/Marketplace.qml
+++ b/plugins/Marketplace/resources/qml/Marketplace.qml
@@ -94,18 +94,20 @@ Window
                     id: pageSelectionTabBar
                     anchors.right: managePackagesButton.left
                     anchors.rightMargin: UM.Theme.getSize("default_margin").width
-
+                    height: UM.Theme.getSize("button_icon").height
                     spacing: 0
 
                     PackageTypeTab
                     {
                         width: implicitWidth
+                        padding: UM.Theme.getSize("default_margin").width/2
                         text: catalog.i18nc("@button", "Plugins")
                         onClicked: content.source = "Plugins.qml"
                     }
                     PackageTypeTab
                     {
                         width: implicitWidth
+                        padding: Math.round(UM.Theme.getSize("default_margin").width / 2)
                         text: catalog.i18nc("@button", "Materials")
                         onClicked: content.source = "Materials.qml"
                     }