diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index b51d4159d9..57c08ca9d6 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -116,10 +116,10 @@ QtObject {
                     Rectangle {
                         id: underline;
 
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                        anchors.horizontalCenter: parent.horizontalCenter
                         anchors.bottom: parent.bottom
-                        height: UM.Theme.getSize("sidebar_header_highlight").height
+                        width: Theme.getSize("topbar_button").width
+                        height: Theme.getSize("sidebar_header_highlight").height
                         color: control.checked ? UM.Theme.getColor("sidebar_header_highlight") : UM.Theme.getColor("sidebar_header_highlight_hover")
                         visible: control.hovered || control.checked
                     }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 1f5b231d27..6d666b6413 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -297,6 +297,7 @@
         "button_icon": [2.5, 2.5],
         "button_lining": [0, 0],
 
+        "topbar_logo_right_margin": [3, 0],
         "topbar_button": [8, 4],
         "topbar_button_icon": [3.125, 2.5],