diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index a6c271fb14..c6df3c0966 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -209,6 +209,8 @@ void KICAD_MANAGER_FRAME::RecreateLauncher()
         m_launcher = new ACTION_TOOLBAR( this, ID_H_TOOLBAR, wxDefaultPosition, wxDefaultSize,
                                          KICAD_AUI_TB_STYLE | wxAUI_TB_HORZ_LAYOUT );
 
+    // Add tools. Note these KICAD_MANAGER_ACTIONS are defined with a bitmap
+    // suitable for menus. The icans will be changed later.
     m_launcher->Add( KICAD_MANAGER_ACTIONS::editSchematic );
     m_launcher->Add( KICAD_MANAGER_ACTIONS::editSymbols );
 
@@ -222,6 +224,24 @@ void KICAD_MANAGER_FRAME::RecreateLauncher()
     m_launcher->Add( KICAD_MANAGER_ACTIONS::showCalculator );
     m_launcher->Add( KICAD_MANAGER_ACTIONS::editWorksheet );
 
+    // Now stt big icons for these tools:
+    m_launcher->SetToolBitmap( KICAD_MANAGER_ACTIONS::editSchematic,
+                               KiScaledBitmap( icon_eeschema_xpm, this ) );
+    m_launcher->SetToolBitmap( KICAD_MANAGER_ACTIONS::editSymbols,
+                               KiScaledBitmap( icon_libedit_xpm, this ) );
+    m_launcher->SetToolBitmap( KICAD_MANAGER_ACTIONS::editPCB,
+                               KiScaledBitmap( icon_pcbnew_xpm, this ) );
+    m_launcher->SetToolBitmap( KICAD_MANAGER_ACTIONS::editFootprints,
+                               KiScaledBitmap( icon_modedit_xpm, this ) );
+    m_launcher->SetToolBitmap( KICAD_MANAGER_ACTIONS::viewGerbers,
+                               KiScaledBitmap( icon_gerbview_xpm, this ) );
+    m_launcher->SetToolBitmap( KICAD_MANAGER_ACTIONS::convertImage,
+                               KiScaledBitmap( icon_bitmap2component_xpm, this ) );
+    m_launcher->SetToolBitmap( KICAD_MANAGER_ACTIONS::showCalculator,
+                               KiScaledBitmap( icon_pcbcalculator_xpm, this ) );
+    m_launcher->SetToolBitmap( KICAD_MANAGER_ACTIONS::editWorksheet,
+                               KiScaledBitmap( icon_pagelayout_editor_xpm, this ) );
+
     // Create mlauncher
     m_launcher->Realize();
 }
diff --git a/kicad/tools/kicad_manager_actions.cpp b/kicad/tools/kicad_manager_actions.cpp
index f4bcf695f4..90e6e94d1a 100644
--- a/kicad/tools/kicad_manager_actions.cpp
+++ b/kicad/tools/kicad_manager_actions.cpp
@@ -56,49 +56,49 @@ TOOL_ACTION KICAD_MANAGER_ACTIONS::editSchematic( "kicad.Control.editSchematic",
         AS_GLOBAL,
         MD_CTRL + 'E', LEGACY_HK_NAME( "Run Eeschema" ),
         _( "Edit Schematic" ), _( "Edit Schematic" ),
-        icon_eeschema_xpm, AF_NONE, (void*) FRAME_SCH );
+        eeschema_xpm, AF_NONE, (void*) FRAME_SCH );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::editSymbols( "kicad.Control.editSymbols",
         AS_GLOBAL,
         MD_CTRL + 'L', LEGACY_HK_NAME( "Run LibEdit" ),
         _( "Edit Schematic Symbols" ), _( "Edit Schematic Symbols" ),
-        icon_libedit_xpm, AF_NONE, (void*) FRAME_SCH_LIB_EDITOR );
+        libedit_xpm, AF_NONE, (void*) FRAME_SCH_LIB_EDITOR );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::editPCB( "kicad.Control.editPCB",
         AS_GLOBAL,
         MD_CTRL + 'P', LEGACY_HK_NAME( "Run Pcbnew" ),
         _( "Edit PCB" ), _( "Edit PCB" ),
-        icon_pcbnew_xpm, AF_NONE, (void*) FRAME_PCB );
+        pcbnew_xpm, AF_NONE, (void*) FRAME_PCB );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::editFootprints( "kicad.Control.editFootprints",
         AS_GLOBAL,
         MD_CTRL + 'F', LEGACY_HK_NAME( "Run FpEditor" ),
         _( "Edit PCB Footprints" ), _( "Edit PCB Footprints" ),
-        icon_modedit_xpm, AF_NONE, (void*) FRAME_PCB_MODULE_EDITOR );
+        module_editor_xpm, AF_NONE, (void*) FRAME_PCB_MODULE_EDITOR );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::viewGerbers( "kicad.Control.viewGerbers",
         AS_GLOBAL,
         MD_CTRL + 'G', LEGACY_HK_NAME( "Run Gerbview" ),
         _( "View Gerber Files" ), _( "View Gerber Files" ),
-        icon_gerbview_xpm );
+        icon_gerbview_small_xpm );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::convertImage( "kicad.Control.convertImage",
         AS_GLOBAL,
         MD_CTRL + 'B', LEGACY_HK_NAME( "Run Bitmap2Component" ),
         _( "Convert Image" ), _( "Convert bitmap images to schematic or PCB components" ),
-        icon_bitmap2component_xpm );
+        bitmap2component_xpm );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::showCalculator( "kicad.Control.showCalculator",
         AS_GLOBAL,
         MD_CTRL + 'A', LEGACY_HK_NAME( "Run PcbCalculator" ),
         _( "Calculator Tools" ), _( "Run component calculations, track width calculations, etc." ),
-        icon_pcbcalculator_xpm );
+        calculator_xpm );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::editWorksheet( "kicad.Control.editWorksheet",
         AS_GLOBAL,
         MD_CTRL + 'Y', LEGACY_HK_NAME( "Run PlEditor" ),
         _( "Edit Worksheet" ), _( "Edit worksheet graphics and text" ),
-        icon_pagelayout_editor_xpm );
+        pagelayout_load_xpm );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::openTextEditor( "kicad.Control.openTextEditor",
         AS_GLOBAL,