diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml
index ec0cfe16d1..eb4f150f86 100644
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@@ -54,7 +54,7 @@ Item
     Action
     {
         id: undoAction;
-        text: catalog.i18nc("@action:inmenu","&Undo");
+        text: catalog.i18nc("@action:inmenu menubar:edit","&Undo");
         iconName: "edit-undo";
         shortcut: StandardKey.Undo;
     }
@@ -62,7 +62,7 @@ Item
     Action
     {
         id: redoAction;
-        text: catalog.i18nc("@action:inmenu","&Redo");
+        text: catalog.i18nc("@action:inmenu menubar:edit","&Redo");
         iconName: "edit-redo";
         shortcut: StandardKey.Redo;
     }
@@ -70,7 +70,7 @@ Item
     Action
     {
         id: quitAction;
-        text: catalog.i18nc("@action:inmenu","&Quit");
+        text: catalog.i18nc("@action:inmenu menubar:file","&Quit");
         iconName: "application-exit";
         shortcut: StandardKey.Quit;
     }
@@ -78,55 +78,55 @@ Item
     Action
     {
         id: preferencesAction;
-        text: catalog.i18nc("@action:inmenu","&Preferences...");
+        text: catalog.i18nc("@action:inmenu menubar:settings","&Preferences...");
         iconName: "configure";
     }
 
     Action
     {
         id: addMachineAction;
-        text: catalog.i18nc("@action:inmenu","&Add Printer...");
+        text: catalog.i18nc("@action:inmenu menubar:printer","&Add Printer...");
     }
 
     Action
     {
         id: settingsAction;
-        text: catalog.i18nc("@action:inmenu","Manage Pr&inters...");
+        text: catalog.i18nc("@action:inmenu menubar:printer","Manage Pr&inters...");
         iconName: "configure";
     }
 
     Action
     {
         id: manageProfilesAction;
-        text: catalog.i18nc("@action:inmenu","Manage Profiles...");
+        text: catalog.i18nc("@action:inmenu menubar:profile","Manage Profiles...");
         iconName: "configure";
     }
 
     Action
     {
         id: documentationAction;
-        text: catalog.i18nc("@action:inmenu","Show Online &Documentation");
+        text: catalog.i18nc("@action:inmenu menubar:help","Show Online &Documentation");
         iconName: "help-contents";
         shortcut: StandardKey.Help;
     }
 
     Action {
         id: reportBugAction;
-        text: catalog.i18nc("@action:inmenu","Report a &Bug");
+        text: catalog.i18nc("@action:inmenu menubar:help","Report a &Bug");
         iconName: "tools-report-bug";
     }
 
     Action
     {
         id: aboutAction;
-        text: catalog.i18nc("@action:inmenu","&About...");
+        text: catalog.i18nc("@action:inmenu menubar:help","&About...");
         iconName: "help-about";
     }
 
     Action
     {
         id: deleteSelectionAction;
-        text: catalog.i18nc("@action:inmenu","Delete &Selection");
+        text: catalog.i18nc("@action:inmenu menubar:edit","Delete &Selection");
         iconName: "edit-delete";
         shortcut: StandardKey.Delete;
     }
@@ -147,7 +147,7 @@ Item
     Action
     {
         id: groupObjectsAction
-        text: catalog.i18nc("@action:inmenu","&Group Objects");
+        text: catalog.i18nc("@action:inmenu menubar:edit","&Group Objects");
         enabled: UM.Scene.numObjectsSelected > 1 ? true: false
         iconName: "object-group"
     }
@@ -155,7 +155,7 @@ Item
     Action
     {
         id: unGroupObjectsAction
-        text: catalog.i18nc("@action:inmenu","Ungroup Objects");
+        text: catalog.i18nc("@action:inmenu menubar:edit","Ungroup Objects");
         enabled: UM.Scene.isGroupSelected
         iconName: "object-ungroup"
     }
@@ -163,7 +163,7 @@ Item
     Action
     {
         id: mergeObjectsAction
-        text: catalog.i18nc("@action:inmenu","&Merge Objects");
+        text: catalog.i18nc("@action:inmenu menubar:edit","&Merge Objects");
         enabled: UM.Scene.numObjectsSelected > 1 ? true: false
         iconName: "merge";
     }
@@ -178,7 +178,7 @@ Item
     Action
     {
         id: deleteAllAction;
-        text: catalog.i18nc("@action:inmenu","&Clear Build Platform");
+        text: catalog.i18nc("@action:inmenu menubar:edit","&Clear Build Platform");
         iconName: "edit-delete";
         shortcut: "Ctrl+D";
     }
@@ -186,26 +186,26 @@ Item
     Action
     {
         id: reloadAllAction;
-        text: catalog.i18nc("@action:inmenu","Re&load All Objects");
+        text: catalog.i18nc("@action:inmenu menubar:file","Re&load All Objects");
         iconName: "document-revert";
     }
 
     Action
     {
         id: resetAllTranslationAction;
-        text: catalog.i18nc("@action:inmenu","Reset All Object Positions");
+        text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Object Positions");
     }
 
     Action
     {
         id: resetAllAction;
-        text: catalog.i18nc("@action:inmenu","Reset All Object &Transformations");
+        text: catalog.i18nc("@action:inmenu menubar:edit","Reset All Object &Transformations");
     }
 
     Action
     {
         id: openAction;
-        text: catalog.i18nc("@action:inmenu","&Open File...");
+        text: catalog.i18nc("@action:inmenu menubar:file","&Open File...");
         iconName: "document-open";
         shortcut: StandardKey.Open;
     }
@@ -213,7 +213,7 @@ Item
     Action
     {
         id: showEngineLogAction;
-        text: catalog.i18nc("@action:inmenu","Show Engine &Log...");
+        text: catalog.i18nc("@action:inmenu menubar:help","Show Engine &Log...");
         iconName: "view-list-text";
         shortcut: StandardKey.WhatsThis;
     }
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 7668509eee..f3ea4b1289 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -44,7 +44,7 @@ UM.MainWindow
             {
                 id: fileMenu
                 //: File menu
-                title: catalog.i18nc("@title:menu","&File");
+                title: catalog.i18nc("@title:menu menubar:toplevel","&File");
 
                 MenuItem {
                     action: actions.open;
@@ -53,7 +53,7 @@ UM.MainWindow
                 Menu
                 {
                     id: recentFilesMenu;
-                    title: catalog.i18nc("@title:menu", "Open &Recent")
+                    title: catalog.i18nc("@title:menu menubar:file", "Open &Recent")
                     iconName: "document-open-recent";
 
                     enabled: Printer.recentFiles.length > 0;
@@ -82,7 +82,7 @@ UM.MainWindow
 
                 MenuItem
                 {
-                    text: catalog.i18nc("@action:inmenu", "&Save Selection to File");
+                    text: catalog.i18nc("@action:inmenu menubar:file", "&Save Selection to File");
                     enabled: UM.Selection.hasSelection;
                     iconName: "document-save-as";
                     onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", Printer.jobName);
@@ -90,7 +90,7 @@ UM.MainWindow
                 Menu
                 {
                     id: saveAllMenu
-                    title: catalog.i18nc("@title:menu","Save &All")
+                    title: catalog.i18nc("@title:menu menubar:file","Save &All")
                     iconName: "document-save-all";
                     enabled: devicesModel.rowCount() > 0 && UM.Backend.progress > 0.99;
 
@@ -118,7 +118,7 @@ UM.MainWindow
             Menu
             {
                 //: Edit menu
-                title: catalog.i18nc("@title:menu","&Edit");
+                title: catalog.i18nc("@title:menu menubar:toplevel","&Edit");
 
                 MenuItem { action: actions.undo; }
                 MenuItem { action: actions.redo; }
@@ -135,7 +135,7 @@ UM.MainWindow
 
             Menu
             {
-                title: catalog.i18nc("@title:menu","&View");
+                title: catalog.i18nc("@title:menu menubar:toplevel","&View");
                 id: top_view_menu
                 Instantiator 
                 {
@@ -157,7 +157,7 @@ UM.MainWindow
             {
                 id: machineMenu;
                 //: Machine menu
-                title: catalog.i18nc("@title:menu","&Printer");
+                title: catalog.i18nc("@title:menu menubar:toplevel","&Printer");
 
                 Instantiator
                 {
@@ -203,7 +203,7 @@ UM.MainWindow
             Menu
             {
                 id: profileMenu
-                title: catalog.i18nc("@title:menu", "P&rofile")
+                title: catalog.i18nc("@title:menu menubar:toplevel", "P&rofile")
 
                 Instantiator
                 {
@@ -230,7 +230,7 @@ UM.MainWindow
             {
                 id: extension_menu
                 //: Extensions menu
-                title: catalog.i18nc("@title:menu","E&xtensions");
+                title: catalog.i18nc("@title:menu menubar:toplevel","E&xtensions");
 
                 Instantiator 
                 {
@@ -263,7 +263,7 @@ UM.MainWindow
             Menu
             {
                 //: Settings menu
-                title: catalog.i18nc("@title:menu","&Settings");
+                title: catalog.i18nc("@title:menu menubar:toplevel","&Settings");
 
                 MenuItem { action: actions.preferences; }
             }
@@ -271,7 +271,7 @@ UM.MainWindow
             Menu
             {
                 //: Help menu
-                title: catalog.i18nc("@title:menu","&Help");
+                title: catalog.i18nc("@title:menu menubar:toplevel","&Help");
 
                 MenuItem { action: actions.showEngineLog; }
                 MenuItem { action: actions.documentation; }