diff --git a/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchButton.qml b/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchButton.qml
index a7f1bb072e3e9..3057ff4614b91 100644
--- a/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchButton.qml
+++ b/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchButton.qml
@@ -38,8 +38,10 @@ FlatRadioButton {
 
     signal closeRequested()
 
+    readonly property real actualHeight: 34
+
     implicitWidth: Math.min(200, implicitContentWidth)
-    implicitHeight: ListView.view.height
+    implicitHeight: actualHeight + 1 // For separator
 
     padding: 0
 
@@ -48,6 +50,7 @@ FlatRadioButton {
         spacing: 4
 
         StyledTextLabel {
+            id: titleLabel
             Layout.alignment: Qt.AlignLeft
             Layout.fillWidth: root.implicitContentWidth > 200
             Layout.preferredWidth: implicitWidth
@@ -55,6 +58,7 @@ FlatRadioButton {
 
             horizontalAlignment: Text.AlignLeft
 
+            font: ui.theme.bodyFont
             text: (root.needSave ? "*" : "") + root.text
         }
 
@@ -95,15 +99,6 @@ FlatRadioButton {
 
         color: ui.theme.backgroundSecondaryColor
 
-        Rectangle {
-            id: backgroundInner
-            anchors.fill: parent
-
-            visible: false
-            color: "white"
-            opacity: 0.05
-        }
-
         NavigationFocusBorder {
             navigationCtrl: root.navigation
             drawOutsideParent: false
@@ -145,12 +140,12 @@ FlatRadioButton {
 
                 PropertyChanges {
                     target: background
-                    color: ui.theme.popupBackgroundColor
+                    color: ui.theme.backgroundPrimaryColor
                 }
 
                 PropertyChanges {
-                    target: backgroundInner
-                    visible: true
+                    target: titleLabel
+                    font: ui.theme.bodyBoldFont
                 }
             },
 
@@ -160,17 +155,7 @@ FlatRadioButton {
 
                 PropertyChanges {
                     target: background
-                    color: Utils.colorWithAlpha(ui.theme.buttonColor, ui.theme.buttonOpacityHover)
-                }
-            },
-
-            State {
-                name: "PRESSED"
-                when: root.pressed
-
-                PropertyChanges {
-                    target: background
-                    color: Utils.colorWithAlpha(ui.theme.buttonColor, ui.theme.buttonOpacityHit)
+                    color: Utils.colorWithAlpha(ui.theme.backgroundPrimaryColor, ui.theme.buttonOpacityHover)
                 }
             }
         ]
diff --git a/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchPanel.qml b/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchPanel.qml
index 0950dc911b140..5a62e073e01a4 100644
--- a/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchPanel.qml
+++ b/src/notation/qml/MuseScore/NotationScene/internal/NotationSwitchPanel.qml
@@ -30,7 +30,7 @@ import MuseScore.NotationScene 1.0
 Rectangle {
     id: root
 
-    height: 26
+    height: 34
     visible: notationsView.count > 0
     color: ui.theme.backgroundSecondaryColor