diff --git a/pcbnew/tools/drawing_stackup_table_tool.cpp b/pcbnew/tools/drawing_stackup_table_tool.cpp
index 789aae7bcd..cff8c95b91 100644
--- a/pcbnew/tools/drawing_stackup_table_tool.cpp
+++ b/pcbnew/tools/drawing_stackup_table_tool.cpp
@@ -38,6 +38,8 @@
 #include <fp_shape.h>
 #include <pcb_text.h>
 #include <kicad_string.h>
+#include <wx/utils.h>
+
 
 using SCOPED_DRAW_MODE = SCOPED_SET_RESET<DRAWING_TOOL::MODE>;
 
@@ -494,7 +496,6 @@ std::vector<BOARD_ITEM*> DRAWING_TOOL::DrawBoardCharacteristics(
     return objects;
 }
 
-#include <wx/utils.h>
 
 int DRAWING_TOOL::InteractivePlaceWithPreview( const TOOL_EVENT& aEvent, std::vector<BOARD_ITEM*> aItems,
         std::vector<BOARD_ITEM*> aPreview, LSET* aLayers )
diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp
index 56ba3e763f..7a4ef08984 100644
--- a/pcbnew/tools/pcb_actions.cpp
+++ b/pcbnew/tools/pcb_actions.cpp
@@ -118,12 +118,16 @@ TOOL_ACTION PCB_ACTIONS::drawArc( "pcbnew.InteractiveDrawing.arc",
         BITMAPS::add_arc, AF_ACTIVATE );
 
 TOOL_ACTION PCB_ACTIONS::placeCharacteristics( "pcbnew.InteractiveDrawing.placeCharacteristics",
-        AS_GLOBAL, 0, " ", _( "Add Board Characteristics" ), _( "Add Board Characteristics" ),
-        BITMAPS::INVALID_BITMAP, AF_ACTIVATE );
+        AS_GLOBAL, 0,  LEGACY_HK_NAME( "Add Board Characteristics" ),
+        _( "Add Board Characteristics" ),
+        _( "Add a board characteristics table on a graphic layer" ),
+        BITMAPS::config, AF_ACTIVATE );
 
 TOOL_ACTION PCB_ACTIONS::placeStackup( "pcbnew.InteractiveDrawing.placeStackup", AS_GLOBAL, 0,
-        " ", _( "Add Stackup Table" ), _( "Add Stackup Table" ),
-        BITMAPS::INVALID_BITMAP, AF_ACTIVATE );
+        LEGACY_HK_NAME( "Add Stackup Table" ),
+        _( "Add Stackup Table" ),
+        _( "Add a board stackup table on a graphic layer" ),
+        BITMAPS::layers_manager, AF_ACTIVATE );
 
 TOOL_ACTION PCB_ACTIONS::placeText( "pcbnew.InteractiveDrawing.text",
         AS_GLOBAL,