diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp
index 492cb86601..9dca1812b2 100644
--- a/eeschema/tools/ee_actions.cpp
+++ b/eeschema/tools/ee_actions.cpp
@@ -436,8 +436,7 @@ TOOL_ACTION EE_ACTIONS::updateSymbol( "eeschema.InteractiveEdit.updateSymbol",
 
 TOOL_ACTION EE_ACTIONS::assignNetclass( "eeschema.InteractiveEdit.assignNetclass",
         AS_GLOBAL, 0, "",
-        _( "Assign Netclass..." ), _( "Assign a netclass to the net of the selected wire" ),
-        list_nets_xpm );
+        _( "Assign Netclass..." ), _( "Assign a netclass to the net of the selected wire" ) );
 
 TOOL_ACTION EE_ACTIONS::toggleDeMorgan( "eeschema.InteractiveEdit.toggleDeMorgan",
         AS_GLOBAL, 0, "",
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index a8db92466f..33ab9e1c0c 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -78,6 +78,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
     cond.Enable( FILE_HISTORY::FileHistoryNotEmpty( fileHistory ) );
     RegisterUIUpdateHandler( item->GetId(), cond );
 
+    fileMenu->AppendSeparator();
     fileMenu->Add( KICAD_MANAGER_ACTIONS::closeProject );
 
     fileMenu->AppendSeparator();
@@ -202,7 +203,6 @@ void KICAD_MANAGER_FRAME::RecreateBaseHToolbar()
 
     // New
     m_mainToolBar->Add( KICAD_MANAGER_ACTIONS::newProject );
-    m_mainToolBar->Add( KICAD_MANAGER_ACTIONS::newFromTemplate );
     m_mainToolBar->Add( KICAD_MANAGER_ACTIONS::openProject );
 
     m_mainToolBar->AddScaledSeparator( this );