diff --git a/cvpcb/class_DisplayFootprintsFrame.cpp b/cvpcb/class_DisplayFootprintsFrame.cpp
index d3b2f5344a..285727ac9c 100644
--- a/cvpcb/class_DisplayFootprintsFrame.cpp
+++ b/cvpcb/class_DisplayFootprintsFrame.cpp
@@ -183,11 +183,11 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateOptToolbar()
 
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_INCH, wxEmptyString,
                                KiBitmap( unit_inch_xpm ),
-                               _( "Units in inches" ), wxITEM_CHECK );
+                               _( "Set units to inches" ), wxITEM_CHECK );
 
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_MM, wxEmptyString,
                                KiBitmap( unit_mm_xpm ),
-                               _( "Units in millimeters" ), wxITEM_CHECK );
+                               _( "Set units to millimeters" ), wxITEM_CHECK );
 
 #ifndef __APPLE__
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxEmptyString,
diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp
index 3c9cc0a3fb..0688558f3f 100644
--- a/eeschema/menubar_libedit.cpp
+++ b/eeschema/menubar_libedit.cpp
@@ -65,7 +65,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
     // Select current library
     AddMenuItem( fileMenu,
                  ID_LIBEDIT_SELECT_CURRENT_LIB,
-                 _( "&Current Library" ),
+                 _( "Select &Current Library" ),
                  _( "Select working library" ),
                  KiBitmap( library_xpm ) );
     fileMenu->AppendSeparator();
diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp
index 383d670ea9..5ec4c638a1 100644
--- a/eeschema/tool_lib.cpp
+++ b/eeschema/tool_lib.cpp
@@ -232,11 +232,12 @@ void LIB_EDIT_FRAME::CreateOptionToolbar()
                                _( "Turn grid off" ), wxITEM_CHECK );
 
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_INCH, wxEmptyString,
-                               KiBitmap( unit_inch_xpm ), _( "Units in inches" ), wxITEM_CHECK );
+                               KiBitmap( unit_inch_xpm ), _( "Set units to inches" ),
+                               wxITEM_CHECK );
 
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_MM, wxEmptyString,
                                KiBitmap( unit_mm_xpm ),
-                               _( "Units in millimeters" ), wxITEM_CHECK );
+                               _( "Set units to millimeters" ), wxITEM_CHECK );
 
 #ifndef __APPLE__
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxEmptyString,
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index e7cd9460e5..f8ae92102a 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -262,14 +262,14 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
     fileMenu->AppendSeparator();
     AddMenuItem( fileMenu,
                  ID_SAVE_AND_ZIP_FILES,
-                 _( "&Archive" ),
+                 _( "&Archive Current Project" ),
                  _( "Archive project files in zip archive" ),
                  KiBitmap( zip_xpm ) );
 
     // Unarchive
     AddMenuItem( fileMenu,
                  ID_READ_ZIP_ARCHIVE,
-                 _( "&Unarchive" ),
+                 _( "&Unarchive Project" ),
                  _( "Unarchive project files from zip file" ),
                  KiBitmap( unzip_xpm ) );
 
diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp
index 842a5550e5..d545044c7a 100644
--- a/pcbnew/tool_modedit.cpp
+++ b/pcbnew/tool_modedit.cpp
@@ -216,11 +216,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateOptToolbar()
 
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_INCH, wxEmptyString,
                                KiBitmap( unit_inch_xpm ),
-                               _( "Units in inches" ), wxITEM_CHECK );
+                               _( "Set units to inches" ), wxITEM_CHECK );
 
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_MM, wxEmptyString,
                                KiBitmap( unit_mm_xpm ),
-                               _( "Units in millimeters" ), wxITEM_CHECK );
+                               _( "Set units to millimeters" ), wxITEM_CHECK );
 
 #ifndef __APPLE__
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxEmptyString,
diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp
index c28a1ffc0e..513129872b 100644
--- a/pcbnew/tool_pcb.cpp
+++ b/pcbnew/tool_pcb.cpp
@@ -338,10 +338,10 @@ void PCB_EDIT_FRAME::ReCreateOptToolbar()
                                _( "Display polar coordinates" ), wxITEM_CHECK );
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_INCH, wxEmptyString,
                                KiBitmap( unit_inch_xpm ),
-                               _( "Units in inches" ), wxITEM_CHECK );
+                               _( "Set units to inches" ), wxITEM_CHECK );
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_MM, wxEmptyString,
                                KiBitmap( unit_mm_xpm ),
-                               _( "Units in millimeters" ), wxITEM_CHECK );
+                               _( "Set units to millimeters" ), wxITEM_CHECK );
 
 #ifndef __APPLE__
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxEmptyString,