diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index ec25eb8abb..90d1d549e2 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -79,7 +79,7 @@ Item
     {
         id: showTroubleShootingAction
         onTriggered: Qt.openUrlExternally("https://ultimaker.com/en/troubleshooting?utm_source=cura&utm_medium=software&utm_campaign=dropdown-troubleshooting")
-        text: catalog.i18nc("@action:inmenu", "Show Online Troubleshooting Guide")
+        text: catalog.i18nc("@action:inmenu", "Show Online Troubleshooting")
     }
 
     Action
diff --git a/resources/qml/MainWindow/ApplicationMenu.qml b/resources/qml/MainWindow/ApplicationMenu.qml
index bf3781331a..3598447d88 100644
--- a/resources/qml/MainWindow/ApplicationMenu.qml
+++ b/resources/qml/MainWindow/ApplicationMenu.qml
@@ -34,14 +34,16 @@ Item
             {
                 text: menuBarItem.text.replace(new RegExp("&([A-Za-z])"), function (match, character)
                 {
-                    return `<u>${character}</u>`;
+                    return `<u>${character}</u>`
                 })
                 horizontalAlignment: Text.AlignLeft
                 verticalAlignment: Text.AlignVCenter
             }
-
+            leftPadding: UM.Theme.getSize("default_margin").width
+            rightPadding: UM.Theme.getSize("default_margin").width
             background: Rectangle
             {
+
                 color: menuBarItem.highlighted ? UM.Theme.getColor("background_2") : "transparent"
             }
         }
diff --git a/resources/qml/Widgets/MenuSeparator.qml b/resources/qml/Widgets/MenuSeparator.qml
index ad79fccd6d..b39f958c69 100644
--- a/resources/qml/Widgets/MenuSeparator.qml
+++ b/resources/qml/Widgets/MenuSeparator.qml
@@ -18,4 +18,5 @@ MenuSeparator
         implicitHeight: UM.Theme.getSize("default_lining").height
         color: UM.Theme.getColor("setting_control_border")
     }
+    height: visible ? implicitHeight: 0
 }
\ No newline at end of file