diff --git a/eeschema/libedit/menubar_libedit.cpp b/eeschema/libedit/menubar_libedit.cpp
index 84d0a62b05..3432ea4191 100644
--- a/eeschema/libedit/menubar_libedit.cpp
+++ b/eeschema/libedit/menubar_libedit.cpp
@@ -106,24 +106,31 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
                  _( "Import a symbol to the current library" ),
                  KiBitmap( import_part_xpm ) );
 
-    AddMenuItem( fileMenu,
+    // Export submenu
+    wxMenu* submenuExport = new wxMenu();
+
+    AddMenuItem( submenuExport,
                  ID_LIBEDIT_EXPORT_PART,
-                 _( "&Export Symbol..." ),
+                 _( "S&ymbol..." ),
                  _( "Create a library file containing only the current symbol" ),
                  KiBitmap( export_part_xpm ) );
 
-    AddMenuItem( fileMenu,
+    AddMenuItem( submenuExport,
                  ID_LIBEDIT_GEN_PNG_FILE,
-                 _( "Export View as PNG..." ),
+                 _( "View as &PNG..." ),
                  _( "Create a PNG file from the current view" ),
                  KiBitmap( plot_xpm ) );
 
-    AddMenuItem( fileMenu,
+    AddMenuItem( submenuExport,
                  ID_LIBEDIT_GEN_SVG_FILE,
-                 _( "Export Symbol as SVG..." ),
+                 _( "Symbol as S&VG..." ),
                  _( "Create a SVG file from the current symbol" ),
                  KiBitmap( plot_svg_xpm ) );
 
+    AddMenuItem( fileMenu, submenuExport, ID_GEN_EXPORT_FILE, _( "E&xport" ),
+                 _( "Export files" ),
+                 KiBitmap( export_xpm ) );
+
     fileMenu->AppendSeparator();
 
     AddMenuItem( fileMenu,
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 220246ee17..53da4516e1 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -420,7 +420,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
                  _( "Export drawings to clipboard" ),
                  KiBitmap( copy_xpm ) );
 
-    AddMenuItem( aParentMenu, ID_GET_NETLIST, _( "Export &Netlist..." ),
+    AddMenuItem( submenuExport, ID_GET_NETLIST, _( "&Netlist..." ),
                  _( "Export netlist file" ),
                  KiBitmap( netlist_xpm ) );
 
diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp
index f10ad7498c..0743786ab3 100644
--- a/pcbnew/menubar_footprint_editor.cpp
+++ b/pcbnew/menubar_footprint_editor.cpp
@@ -97,21 +97,38 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
 
     fileMenu->AppendSeparator();
 
-    AddMenuItem( fileMenu, ID_MODEDIT_IMPORT_PART,
-                 _( "Import Footprint from &KiCad File..." ),
-                 _( "Import a footprint from an existing footprint file" ),
+    wxMenu* submenuImport = new wxMenu();
+
+    AddMenuItem( submenuImport, ID_MODEDIT_IMPORT_PART,
+                 _( "&Footprint..." ),
+                 _( "Import a footprint from file" ),
                  KiBitmap( import_module_xpm ) );
 
-    AddMenuItem( fileMenu, ID_GEN_IMPORT_GRAPHICS_FILE,
-                 _( "Import Outlines from &DXF or SVG File..." ),
-                 _( "Import 2D Drawing DXF or SVG file to Footprint Editor on Drawings layer" ),
+    AddMenuItem( submenuImport, ID_GEN_IMPORT_GRAPHICS_FILE,
+                 _( "&Graphics..." ),
+                 _( "Import 2D Drawing file to Footprint Editor on Drawings layer" ),
                  KiBitmap( import_xpm ) );
 
-    AddMenuItem( fileMenu, ID_MODEDIT_EXPORT_PART,
-                 _( "&Export Footprint..." ),
+    AddMenuItem( fileMenu, submenuImport,
+                 ID_GEN_IMPORT_FILE, _( "&Import" ),
+                 _( "Import files" ), KiBitmap( import_xpm ) );
+
+    wxMenu* submenuExport = new wxMenu();
+
+    AddMenuItem( submenuExport, ID_MODEDIT_EXPORT_PART,
+                 _( "&Footprint..." ),
                  _( "Export current footprint to a file" ),
                  KiBitmap( export_module_xpm ) );
 
+    AddMenuItem( submenuExport, ID_MODEDIT_SAVE_PNG,
+                 _( "View as &PNG..." ),
+                 _( "Create a PNG file from the current view" ),
+                 KiBitmap( plot_xpm ) );
+
+    AddMenuItem( fileMenu, submenuExport,
+                 ID_GEN_EXPORT_FILE, _( "&Export" ),
+                 _( "Export files" ), KiBitmap( export_xpm ) );
+
     fileMenu->AppendSeparator();
 
     // Print
@@ -122,14 +139,6 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
 
     fileMenu->AppendSeparator();
 
-    AddMenuItem( fileMenu,
-                 ID_MODEDIT_SAVE_PNG,
-                 _( "Export View as PN&G..." ),
-                 _( "Create a PNG file from the current view" ),
-                 KiBitmap( plot_xpm ) );
-
-    fileMenu->AppendSeparator();
-
     // Close editor
     AddMenuItem( fileMenu, wxID_EXIT,
                  _( "&Exit" ),