benini · ukscid · Apr 3, 2026 · Apr 3, 2026 · Apr 3, 2026 · Apr 3, 2026
diff --git a/img/icons_dark/tb_BD_Autoplay.png b/img/icons_dark/tb_BD_Autoplay.png
diff --git a/img/icons_dark/tb_BD_Back.png b/img/icons_dark/tb_BD_Back.png
diff --git a/img/icons_dark/tb_BD_BackStart.png b/img/icons_dark/tb_BD_BackStart.png
diff --git a/img/icons_dark/tb_BD_BackToMainline.png b/img/icons_dark/tb_BD_BackToMainline.png
diff --git a/img/buttons/tb_BD_Coords.png → img/icons_dark/tb_BD_Coords.png b/img/buttons/tb_BD_Coords.png → img/icons_dark/tb_BD_Coords.png
diff --git a/img/icons_dark/tb_BD_End.png b/img/icons_dark/tb_BD_End.png
diff --git a/img/icons_dark/tb_BD_Flip.png b/img/icons_dark/tb_BD_Flip.png
diff --git a/img/icons_dark/tb_BD_Forward.png b/img/icons_dark/tb_BD_Forward.png
diff --git a/img/icons_dark/tb_BD_ForwardEnd.png b/img/icons_dark/tb_BD_ForwardEnd.png
diff --git a/img/buttons/tb_BD_Material.png → img/icons_dark/tb_BD_Material.png b/img/buttons/tb_BD_Material.png → img/icons_dark/tb_BD_Material.png
diff --git a/img/icons_dark/tb_BD_NewMainline.png b/img/icons_dark/tb_BD_NewMainline.png
diff --git a/img/icons_dark/tb_BD_NewVar.png b/img/icons_dark/tb_BD_NewVar.png
diff --git a/img/icons_dark/tb_BD_Redo.png b/img/icons_dark/tb_BD_Redo.png
diff --git a/img/icons_dark/tb_BD_Replace.png b/img/icons_dark/tb_BD_Replace.png
diff --git a/img/icons_dark/tb_BD_Save.png b/img/icons_dark/tb_BD_Save.png
diff --git a/img/icons_dark/tb_BD_SaveAs.png b/img/icons_dark/tb_BD_SaveAs.png
diff --git a/img/icons_dark/tb_BD_Scorebar.png b/img/icons_dark/tb_BD_Scorebar.png
diff --git a/img/icons_dark/tb_BD_SelectMarker.png b/img/icons_dark/tb_BD_SelectMarker.png
diff --git a/img/buttons/tb_BD_SetupBoard.png → img/icons_dark/tb_BD_SetupBoard.png b/img/buttons/tb_BD_SetupBoard.png → img/icons_dark/tb_BD_SetupBoard.png
diff --git a/img/icons_dark/tb_BD_Start.png b/img/icons_dark/tb_BD_Start.png
diff --git a/img/icons_dark/tb_BD_Undo.png b/img/icons_dark/tb_BD_Undo.png
diff --git a/img/icons_dark/tb_BD_VarDelete.png b/img/icons_dark/tb_BD_VarDelete.png
diff --git a/img/icons_dark/tb_BD_VarLeave.png b/img/icons_dark/tb_BD_VarLeave.png
diff --git a/img/icons_dark/tb_BD_VarPromote.png b/img/icons_dark/tb_BD_VarPromote.png
diff --git a/img/icons_dark/tb_BD_exitvar.png b/img/icons_dark/tb_BD_exitvar.png
diff --git a/img/icons_dark/tb_addallvars.png b/img/icons_dark/tb_addallvars.png
diff --git a/img/icons_dark/tb_addmove.png b/img/icons_dark/tb_addmove.png
diff --git a/img/icons_dark/tb_addvar.png b/img/icons_dark/tb_addvar.png
diff --git a/img/icons_dark/tb_annotate.png b/img/icons_dark/tb_annotate.png
diff --git a/img/icons_dark/tb_annotate_on.png b/img/icons_dark/tb_annotate_on.png
diff --git a/img/icons_dark/tb_bkm.png b/img/icons_dark/tb_bkm.png
diff --git a/img/icons_dark/tb_boardsearch.png b/img/icons_dark/tb_boardsearch.png
diff --git a/img/icons_dark/tb_closedb.png b/img/icons_dark/tb_closedb.png
diff --git a/img/icons_dark/tb_config.png b/img/icons_dark/tb_config.png
diff --git a/img/icons_dark/tb_copy.png b/img/icons_dark/tb_copy.png
diff --git a/img/icons_dark/tb_cpu.png b/img/icons_dark/tb_cpu.png
diff --git a/img/icons_dark/tb_cpu_hi.png b/img/icons_dark/tb_cpu_hi.png
diff --git a/img/icons_dark/tb_cross.png b/img/icons_dark/tb_cross.png
diff --git a/img/icons_dark/tb_crosstab.png b/img/icons_dark/tb_crosstab.png
diff --git a/img/icons_dark/tb_cut.png b/img/icons_dark/tb_cut.png
diff --git a/img/icons_dark/tb_eco.png b/img/icons_dark/tb_eco.png
diff --git a/img/icons_dark/tb_eng_addbestmove.png b/img/icons_dark/tb_eng_addbestmove.png
diff --git a/img/icons_dark/tb_eng_addlines.png b/img/icons_dark/tb_eng_addlines.png
diff --git a/img/icons_dark/tb_eng_config.png b/img/icons_dark/tb_eng_config.png
diff --git a/img/buttons/tb_eng_connecting.png → img/icons_dark/tb_eng_connecting.png b/img/buttons/tb_eng_connecting.png → img/icons_dark/tb_eng_connecting.png
diff --git a/img/buttons/tb_eng_error.png → img/icons_dark/tb_eng_error.png b/img/buttons/tb_eng_error.png → img/icons_dark/tb_eng_error.png
diff --git a/img/icons_dark/tb_eng_lock.png b/img/icons_dark/tb_eng_lock.png
diff --git a/img/icons_dark/tb_eng_off.png b/img/icons_dark/tb_eng_off.png
diff --git a/img/buttons/tb_eng_ok.png → img/icons_dark/tb_eng_ok.png b/img/buttons/tb_eng_ok.png → img/icons_dark/tb_eng_ok.png
diff --git a/img/icons_dark/tb_eng_on.png b/img/icons_dark/tb_eng_on.png
diff --git a/img/icons_dark/tb_engine.png b/img/icons_dark/tb_engine.png
diff --git a/img/icons_dark/tb_engineinfo.png b/img/icons_dark/tb_engineinfo.png
diff --git a/img/icons_dark/tb_finder.png b/img/icons_dark/tb_finder.png
diff --git a/img/icons_dark/tb_finish_off.png b/img/icons_dark/tb_finish_off.png
diff --git a/img/icons_dark/tb_finish_on.png b/img/icons_dark/tb_finish_on.png
diff --git a/img/icons_dark/tb_glist.png b/img/icons_dark/tb_glist.png
diff --git a/img/icons_dark/tb_gnext.png b/img/icons_dark/tb_gnext.png
diff --git a/img/icons_dark/tb_gprev.png b/img/icons_dark/tb_gprev.png
diff --git a/img/icons_dark/tb_headersearch.png b/img/icons_dark/tb_headersearch.png
diff --git a/img/icons_dark/tb_help.png b/img/icons_dark/tb_help.png
diff --git a/img/icons_dark/tb_lockengine.png b/img/icons_dark/tb_lockengine.png
diff --git a/img/icons_dark/tb_maint.png b/img/icons_dark/tb_maint.png
diff --git a/img/icons_dark/tb_materialsearch.png b/img/icons_dark/tb_materialsearch.png
diff --git a/img/icons_dark/tb_newdb.png b/img/icons_dark/tb_newdb.png
diff --git a/img/icons_dark/tb_newgame.png b/img/icons_dark/tb_newgame.png
diff --git a/img/icons_dark/tb_open.png b/img/icons_dark/tb_open.png
diff --git a/img/icons_dark/tb_paste.png b/img/icons_dark/tb_paste.png
diff --git a/img/icons_dark/tb_pgn.png b/img/icons_dark/tb_pgn.png
diff --git a/img/icons_dark/tb_save.png b/img/icons_dark/tb_save.png
diff --git a/img/icons_dark/tb_switcher.png b/img/icons_dark/tb_switcher.png
diff --git a/img/icons_dark/tb_tick.png b/img/icons_dark/tb_tick.png
diff --git a/img/icons_dark/tb_tmt.png b/img/icons_dark/tb_tmt.png
diff --git a/img/icons_dark/tb_training.png b/img/icons_dark/tb_training.png
diff --git a/img/icons_dark/tb_tree.png b/img/icons_dark/tb_tree.png
diff --git a/img/buttons/tb_update.png → img/icons_dark/tb_update.png b/img/buttons/tb_update.png → img/icons_dark/tb_update.png
diff --git a/img/icons_dark/tb_updir.png b/img/icons_dark/tb_updir.png
diff --git a/img/buttons/tb_BD_Autoplay.png → img/icons_light/tb_BD_Autoplay.png b/img/buttons/tb_BD_Autoplay.png → img/icons_light/tb_BD_Autoplay.png
diff --git a/img/buttons/tb_BD_Back.png → img/icons_light/tb_BD_Back.png b/img/buttons/tb_BD_Back.png → img/icons_light/tb_BD_Back.png
diff --git a/img/buttons/tb_BD_BackStart.png → img/icons_light/tb_BD_BackStart.png b/img/buttons/tb_BD_BackStart.png → img/icons_light/tb_BD_BackStart.png
diff --git a/img/buttons/tb_BD_BackToMainline.png → img/icons_light/tb_BD_BackToMainline.png b/img/buttons/tb_BD_BackToMainline.png → img/icons_light/tb_BD_BackToMainline.png
diff --git a/img/icons_light/tb_BD_Coords.png b/img/icons_light/tb_BD_Coords.png
diff --git a/img/buttons/tb_BD_End.png → img/icons_light/tb_BD_End.png b/img/buttons/tb_BD_End.png → img/icons_light/tb_BD_End.png
diff --git a/img/buttons/tb_BD_Flip.png → img/icons_light/tb_BD_Flip.png b/img/buttons/tb_BD_Flip.png → img/icons_light/tb_BD_Flip.png
diff --git a/img/buttons/tb_BD_Forward.png → img/icons_light/tb_BD_Forward.png b/img/buttons/tb_BD_Forward.png → img/icons_light/tb_BD_Forward.png
diff --git a/img/buttons/tb_BD_ForwardEnd.png → img/icons_light/tb_BD_ForwardEnd.png b/img/buttons/tb_BD_ForwardEnd.png → img/icons_light/tb_BD_ForwardEnd.png
diff --git a/img/icons_light/tb_BD_Material.png b/img/icons_light/tb_BD_Material.png
diff --git a/img/buttons/tb_BD_NewMainline.png → img/icons_light/tb_BD_NewMainline.png b/img/buttons/tb_BD_NewMainline.png → img/icons_light/tb_BD_NewMainline.png
diff --git a/img/buttons/tb_BD_NewVar.png → img/icons_light/tb_BD_NewVar.png b/img/buttons/tb_BD_NewVar.png → img/icons_light/tb_BD_NewVar.png
diff --git a/img/buttons/tb_BD_Redo.png → img/icons_light/tb_BD_Redo.png b/img/buttons/tb_BD_Redo.png → img/icons_light/tb_BD_Redo.png
diff --git a/img/buttons/tb_BD_Replace.png → img/icons_light/tb_BD_Replace.png b/img/buttons/tb_BD_Replace.png → img/icons_light/tb_BD_Replace.png
diff --git a/img/buttons/tb_BD_Save.png → img/icons_light/tb_BD_Save.png b/img/buttons/tb_BD_Save.png → img/icons_light/tb_BD_Save.png
diff --git a/img/buttons/tb_BD_SaveAs.png → img/icons_light/tb_BD_SaveAs.png b/img/buttons/tb_BD_SaveAs.png → img/icons_light/tb_BD_SaveAs.png
diff --git a/img/buttons/tb_BD_Scorebar.png → img/icons_light/tb_BD_Scorebar.png b/img/buttons/tb_BD_Scorebar.png → img/icons_light/tb_BD_Scorebar.png
diff --git a/img/buttons/tb_BD_SelectMarker.png → img/icons_light/tb_BD_SelectMarker.png b/img/buttons/tb_BD_SelectMarker.png → img/icons_light/tb_BD_SelectMarker.png
diff --git a/img/icons_light/tb_BD_SetupBoard.png b/img/icons_light/tb_BD_SetupBoard.png
diff --git a/img/buttons/tb_BD_Start.png → img/icons_light/tb_BD_Start.png b/img/buttons/tb_BD_Start.png → img/icons_light/tb_BD_Start.png
diff --git a/img/buttons/tb_BD_Undo.png → img/icons_light/tb_BD_Undo.png b/img/buttons/tb_BD_Undo.png → img/icons_light/tb_BD_Undo.png
diff --git a/img/buttons/tb_BD_VarDelete.png → img/icons_light/tb_BD_VarDelete.png b/img/buttons/tb_BD_VarDelete.png → img/icons_light/tb_BD_VarDelete.png
diff --git a/img/buttons/tb_BD_VarLeave.png → img/icons_light/tb_BD_VarLeave.png b/img/buttons/tb_BD_VarLeave.png → img/icons_light/tb_BD_VarLeave.png
diff --git a/img/buttons/tb_BD_VarPromote.png → img/icons_light/tb_BD_VarPromote.png b/img/buttons/tb_BD_VarPromote.png → img/icons_light/tb_BD_VarPromote.png
diff --git a/img/buttons/tb_BD_exitvar.png → img/icons_light/tb_BD_exitvar.png b/img/buttons/tb_BD_exitvar.png → img/icons_light/tb_BD_exitvar.png
diff --git a/img/buttons/tb_addallvars.png → img/icons_light/tb_addallvars.png b/img/buttons/tb_addallvars.png → img/icons_light/tb_addallvars.png
diff --git a/img/buttons/tb_addmove.png → img/icons_light/tb_addmove.png b/img/buttons/tb_addmove.png → img/icons_light/tb_addmove.png
diff --git a/img/buttons/tb_addvar.png → img/icons_light/tb_addvar.png b/img/buttons/tb_addvar.png → img/icons_light/tb_addvar.png
diff --git a/img/buttons/tb_annotate.png → img/icons_light/tb_annotate.png b/img/buttons/tb_annotate.png → img/icons_light/tb_annotate.png
diff --git a/img/buttons/tb_annotate_on.png → img/icons_light/tb_annotate_on.png b/img/buttons/tb_annotate_on.png → img/icons_light/tb_annotate_on.png
diff --git a/img/buttons/tb_bkm.png → img/icons_light/tb_bkm.png b/img/buttons/tb_bkm.png → img/icons_light/tb_bkm.png
diff --git a/img/buttons/tb_boardsearch.png → img/icons_light/tb_boardsearch.png b/img/buttons/tb_boardsearch.png → img/icons_light/tb_boardsearch.png
diff --git a/img/buttons/tb_closedb.png → img/icons_light/tb_closedb.png b/img/buttons/tb_closedb.png → img/icons_light/tb_closedb.png
diff --git a/img/buttons/tb_config.png → img/icons_light/tb_config.png b/img/buttons/tb_config.png → img/icons_light/tb_config.png
diff --git a/img/buttons/tb_copy.png → img/icons_light/tb_copy.png b/img/buttons/tb_copy.png → img/icons_light/tb_copy.png
diff --git a/img/buttons/tb_cpu.png → img/icons_light/tb_cpu.png b/img/buttons/tb_cpu.png → img/icons_light/tb_cpu.png
diff --git a/img/buttons/tb_cpu_hi.png → img/icons_light/tb_cpu_hi.png b/img/buttons/tb_cpu_hi.png → img/icons_light/tb_cpu_hi.png
diff --git a/img/buttons/tb_cross.png → img/icons_light/tb_cross.png b/img/buttons/tb_cross.png → img/icons_light/tb_cross.png
diff --git a/img/buttons/tb_crosstab.png → img/icons_light/tb_crosstab.png b/img/buttons/tb_crosstab.png → img/icons_light/tb_crosstab.png
diff --git a/img/buttons/tb_cut.png → img/icons_light/tb_cut.png b/img/buttons/tb_cut.png → img/icons_light/tb_cut.png
diff --git a/img/buttons/tb_eco.png → img/icons_light/tb_eco.png b/img/buttons/tb_eco.png → img/icons_light/tb_eco.png
diff --git a/img/buttons/tb_eng_addbestmove.png → img/icons_light/tb_eng_addbestmove.png b/img/buttons/tb_eng_addbestmove.png → img/icons_light/tb_eng_addbestmove.png
diff --git a/img/buttons/tb_eng_addlines.png → img/icons_light/tb_eng_addlines.png b/img/buttons/tb_eng_addlines.png → img/icons_light/tb_eng_addlines.png
diff --git a/img/buttons/tb_eng_config.png → img/icons_light/tb_eng_config.png b/img/buttons/tb_eng_config.png → img/icons_light/tb_eng_config.png
diff --git a/img/icons_light/tb_eng_connecting.png b/img/icons_light/tb_eng_connecting.png
diff --git a/img/icons_light/tb_eng_error.png b/img/icons_light/tb_eng_error.png
diff --git a/img/buttons/tb_eng_lock.png → img/icons_light/tb_eng_lock.png b/img/buttons/tb_eng_lock.png → img/icons_light/tb_eng_lock.png
diff --git a/img/buttons/tb_eng_off.png → img/icons_light/tb_eng_off.png b/img/buttons/tb_eng_off.png → img/icons_light/tb_eng_off.png
diff --git a/img/icons_light/tb_eng_ok.png b/img/icons_light/tb_eng_ok.png
diff --git a/img/buttons/tb_eng_on.png → img/icons_light/tb_eng_on.png b/img/buttons/tb_eng_on.png → img/icons_light/tb_eng_on.png
diff --git a/img/buttons/tb_engine.png → img/icons_light/tb_engine.png b/img/buttons/tb_engine.png → img/icons_light/tb_engine.png
diff --git a/img/buttons/tb_engineinfo.png → img/icons_light/tb_engineinfo.png b/img/buttons/tb_engineinfo.png → img/icons_light/tb_engineinfo.png
diff --git a/img/buttons/tb_finder.png → img/icons_light/tb_finder.png b/img/buttons/tb_finder.png → img/icons_light/tb_finder.png
diff --git a/img/buttons/tb_finish_off.png → img/icons_light/tb_finish_off.png b/img/buttons/tb_finish_off.png → img/icons_light/tb_finish_off.png
diff --git a/img/buttons/tb_finish_on.png → img/icons_light/tb_finish_on.png b/img/buttons/tb_finish_on.png → img/icons_light/tb_finish_on.png
diff --git a/img/buttons/tb_glist.png → img/icons_light/tb_glist.png b/img/buttons/tb_glist.png → img/icons_light/tb_glist.png
diff --git a/img/buttons/tb_gnext.png → img/icons_light/tb_gnext.png b/img/buttons/tb_gnext.png → img/icons_light/tb_gnext.png
diff --git a/img/buttons/tb_gprev.png → img/icons_light/tb_gprev.png b/img/buttons/tb_gprev.png → img/icons_light/tb_gprev.png
diff --git a/img/buttons/tb_headersearch.png → img/icons_light/tb_headersearch.png b/img/buttons/tb_headersearch.png → img/icons_light/tb_headersearch.png
diff --git a/img/buttons/tb_help.png → img/icons_light/tb_help.png b/img/buttons/tb_help.png → img/icons_light/tb_help.png
diff --git a/img/buttons/tb_lockengine.png → img/icons_light/tb_lockengine.png b/img/buttons/tb_lockengine.png → img/icons_light/tb_lockengine.png
diff --git a/img/buttons/tb_maint.png → img/icons_light/tb_maint.png b/img/buttons/tb_maint.png → img/icons_light/tb_maint.png
diff --git a/img/buttons/tb_materialsearch.png → img/icons_light/tb_materialsearch.png b/img/buttons/tb_materialsearch.png → img/icons_light/tb_materialsearch.png
diff --git a/img/buttons/tb_newdb.png → img/icons_light/tb_newdb.png b/img/buttons/tb_newdb.png → img/icons_light/tb_newdb.png
diff --git a/img/buttons/tb_newgame.png → img/icons_light/tb_newgame.png b/img/buttons/tb_newgame.png → img/icons_light/tb_newgame.png
diff --git a/img/buttons/tb_open.png → img/icons_light/tb_open.png b/img/buttons/tb_open.png → img/icons_light/tb_open.png
diff --git a/img/buttons/tb_paste.png → img/icons_light/tb_paste.png b/img/buttons/tb_paste.png → img/icons_light/tb_paste.png
diff --git a/img/buttons/tb_pgn.png → img/icons_light/tb_pgn.png b/img/buttons/tb_pgn.png → img/icons_light/tb_pgn.png
diff --git a/img/buttons/tb_save.png → img/icons_light/tb_save.png b/img/buttons/tb_save.png → img/icons_light/tb_save.png
diff --git a/img/buttons/tb_switcher.png → img/icons_light/tb_switcher.png b/img/buttons/tb_switcher.png → img/icons_light/tb_switcher.png
diff --git a/img/buttons/tb_tick.png → img/icons_light/tb_tick.png b/img/buttons/tb_tick.png → img/icons_light/tb_tick.png
diff --git a/img/buttons/tb_tmt.png → img/icons_light/tb_tmt.png b/img/buttons/tb_tmt.png → img/icons_light/tb_tmt.png
diff --git a/img/buttons/tb_training.png → img/icons_light/tb_training.png b/img/buttons/tb_training.png → img/icons_light/tb_training.png
diff --git a/img/buttons/tb_tree.png → img/icons_light/tb_tree.png b/img/buttons/tb_tree.png → img/icons_light/tb_tree.png
diff --git a/img/icons_light/tb_update.png b/img/icons_light/tb_update.png
diff --git a/img/buttons/tb_updir.png → img/icons_light/tb_updir.png b/img/buttons/tb_updir.png → img/icons_light/tb_updir.png
diff --git a/tcl/board.tcl b/tcl/board.tcl
@@ -536,10 +536,10 @@ proc ::board::addInfoBar {w varname} {
   $w.bar.info.t tag bind click <Any-Enter> "$w.bar.info.t configure -cursor hand2"
   $w.bar.info.t tag bind click <Any-Leave> "$w.bar.info.t configure -cursor {}"
   grid propagate $w.bar.info 0
-  ttk::button $w.bar.leavevar -image tb_BD_BackStart -style Toolbutton
-  ttk::button $w.bar.back -image tb_BD_Back -style Toolbutton
-  ttk::button $w.bar.forward -image tb_BD_Forward -style Toolbutton
-  ttk::button $w.bar.endvar -image tb_BD_ForwardEnd -style Toolbutton
+  ttk::button $w.bar.leavevar -image ::icon::tb_BD_BackStart -style Toolbutton
+  ttk::button $w.bar.back -image ::icon::tb_BD_Back -style Toolbutton
+  ttk::button $w.bar.forward -image ::icon::tb_BD_Forward -style Toolbutton
+  ttk::button $w.bar.endvar -image ::icon::tb_BD_ForwardEnd -style Toolbutton
   set menu [::board::newToolBar_ $w $varname]
   ttk::button $w.bar.cmd -image tb_BD_ShowToolbar -style Toolbutton \
     -command "::board::updateToolBar_ $menu $varname $w.bar.cmd"
@@ -742,28 +742,28 @@ proc ::board::newToolBar_ {{w} {varname}} {
   global "$varname"
 
   set m [menu $w.menu_back]
-  $m add command -label "  [tr BackToMainline]" -image tb_BD_BackToMainline -compound left
-  $m add command -label "  [tr EditDelete]" -image tb_BD_VarDelete -compound left
-  $m add command -label "  [tr LeaveVariant]" -image tb_BD_VarLeave -compound left
-  $m add command -label "  [tr GameStart]" -image tb_BD_Start -compound left -accelerator "<home>"
+  $m add command -label "  [tr BackToMainline]" -image ::icon::tb_BD_BackToMainline -compound left
+  $m add command -label "  [tr EditDelete]" -image ::icon::tb_BD_VarDelete -compound left
+  $m add command -label "  [tr LeaveVariant]" -image ::icon::tb_BD_VarLeave -compound left
+  $m add command -label "  [tr GameStart]" -image ::icon::tb_BD_Start -compound left -accelerator "<home>"
   ::bind $w.bar.back <ButtonRelease-$::MB3> "::board::updateToolBar_ $m $varname %W"
 
   set m [menu $w.menu_forw]
-  $m add command -label "  [tr Autoplay]" -image tb_BD_Autoplay -compound left
-  $m add command -label "  [tr GameEnd]" -image tb_BD_End -compound left -accelerator "<end>"
+  $m add command -label "  [tr Autoplay]" -image ::icon::tb_BD_Autoplay -compound left
+  $m add command -label "  [tr GameEnd]" -image ::icon::tb_BD_End -compound left -accelerator "<end>"
   ::bind $w.bar.forward <ButtonRelease-$::MB3> "::board::updateToolBar_ $m $varname %W"
 
   set m [menu $w.menu]
-  $m add command -label "  [tr EditSetup]" -image tb_BD_SetupBoard -compound left
-  $m add command -label "  [tr IERotate]" -image tb_BD_Flip -compound left
-  $m add command -label "  [tr SelectMarker]" -image tb_BD_SelectMarker -compound left
-  $m add command -label "  [tr ShowHideMaterial]" -image tb_BD_Material -compound left
-  $m add command -label "  [tr ShowHideEvalBar]" -image tb_BD_Scorebar -compound left
+  $m add command -label "  [tr EditSetup]" -image ::icon::tb_BD_SetupBoard -compound left
+  $m add command -label "  [tr IERotate]" -image ::icon::tb_BD_Flip -compound left
+  $m add command -label "  [tr SelectMarker]" -image ::icon::tb_BD_SelectMarker -compound left
+  $m add command -label "  [tr ShowHideMaterial]" -image ::icon::tb_BD_Material -compound left
+  $m add command -label "  [tr ShowHideEvalBar]" -image ::icon::tb_BD_Scorebar -compound left
   $m add command -label "  [tr ConfigureScid]" -image tb_BD_Layout -compound left
 
-  set ${varname}(tb_BD_Flip) "::board::flip $w"
-  set ${varname}(tb_BD_Material) "::board::toggleMaterial $w"
-  set ${varname}(tb_BD_Scorebar) "::board::toggleEvalBar $w"
+  set ${varname}(::icon::tb_BD_Flip) "::board::flip $w"
+  set ${varname}(::icon::tb_BD_Material) "::board::toggleMaterial $w"
+  set ${varname}(::icon::tb_BD_Scorebar) "::board::toggleEvalBar $w"
   set ${varname}(tb_BD_Layout) {::preferences::Open toggle}
 
   return $m

diff --git a/tcl/edit.tcl b/tcl/edit.tcl
@@ -71,7 +71,7 @@ proc setupBoard {} {
   }
   set ::setupBoardFlipped [main_isFlipped]
   ::board::flip .setup.l.bd $::setupBoardFlipped
-  ttk::checkbutton $w.pieces.rotate -text $::tr(Rotate) -image tb_BD_Flip -compound left \
+  ttk::checkbutton $w.pieces.rotate -text $::tr(Rotate) -image ::icon::tb_BD_Flip -compound left \
       -variable ::setupBoardFlipped -command {
     set ::setupBd  [string reverse $::setupBd]
     set ::setupFen [makeSetupFen]

diff --git a/tcl/file/finder.tcl b/tcl/file/finder.tcl
@@ -43,7 +43,7 @@ proc ::file::finder::Open {} {
   # use ttk instead of tk_optionbutton, but use the menu
   ttk::menubutton $w.d.mbn -text $::file::finder::data(dir) -menu $::file::finder::data(menu)
 
-  ttk::button $w.d.up -image tb_updir -command {::file::finder::Refresh ..}
+  ttk::button $w.d.up -image ::icon::tb_updir -command {::file::finder::Refresh ..}
   ttk::button $w.d.help -image tb_help_small -command {helpWindow Finder}
   pack $w.d.label -side left
   pack $w.d.help $w.d.up -side right -padx "5 0"

diff --git a/tcl/game.tcl b/tcl/game.tcl
@@ -247,7 +247,7 @@ proc ::game::ConfirmDiscard {} {
     destroy .confirmDiscard
   }
 
-  ttk::button $w.saveBtn -text [tr SaveAndContinue] -image tb_BD_Save -compound left -command {
+  ttk::button $w.saveBtn -text [tr SaveAndContinue] -image ::icon::tb_BD_Save -compound left -command {
     set gnum [sc_game number]
     if {[catch {sc_game save $gnum $::curr_db}]} {
       ERROR::MessageBox
@@ -258,7 +258,7 @@ proc ::game::ConfirmDiscard {} {
     destroy .confirmDiscard
   }
 
-  ttk::button $w.clipbaseBtn -text [tr EditCopy] -image tb_BD_SaveAs -compound left -command {
+  ttk::button $w.clipbaseBtn -text [tr EditCopy] -image ::icon::tb_BD_SaveAs -compound left -command {
     if {[catch {sc_game save 0 $::clipbase_db}]} {
       ERROR::MessageBox
       set ::game::answer 0
@@ -269,7 +269,7 @@ proc ::game::ConfirmDiscard {} {
     destroy .confirmDiscard
   }
 
-  ttk::button $w.discardBtn -text [tr DiscardChangesAndContinue] -image tb_BD_VarDelete   -compound left -command {
+  ttk::button $w.discardBtn -text [tr DiscardChangesAndContinue] -image ::icon::tb_BD_VarDelete   -compound left -command {
     set ::game::answer 3
     destroy .confirmDiscard
   }

diff --git a/tcl/help/help.tcl b/tcl/help/help.tcl
@@ -2336,17 +2336,17 @@ set helpText(TreeMasks) {<h1>Masks for Trees</h1>
   are mainly meant to handle opening repertoires. The available options
   are:
      <ul>
-     <li> <img tb_tick> Include line in repertoire</li>
-     <li> <img tb_cross> Exclude line from repertoire</li>
+     <li> <img ::icon::tb_tick> Include line in repertoire</li>
+     <li> <img ::icon::tb_cross> Exclude line from repertoire</li>
      <li> <img tb_mainline> Main Line</li>
      <li> <img tb_bkm> Bookmark</li>
      <li> <img tb_white> White</li>
      <li> <img tb_black> Black</li>
      <li> <img tb_new> New line</li>
      <li> <img tb_rfilter> To be verified by further analysis</li>
      <li> <img tb_msearch> To train</li>
-     <li> <img tb_help_small> Dubious line</li>
-     <li> <img tb_cut> To remove</li>
+     <li> <img ::icon::tb_help_small> Dubious line</li>
+     <li> <img ::icon::tb_cut> To remove</li>
      </ul>
 	  To remove a marker just select the item <menu>No marker</menu>.
   </li>
@@ -2799,7 +2799,7 @@ set helpText(Analysis) {<h1>The Analysis window</h1>
   </p>
   <p>
   Additional information can be accessed using the <button
-  tb_engineinfo> button. A new line will be added to the status area
+  ::icon::tb_engineinfo> button. A new line will be added to the status area
   showing the current move analysed, the number of tablebase hits, a
   more exact number of nodes analysed per second, the watermark of the
   engines hash and the current cpu load. Usually, this information is
@@ -2831,19 +2831,19 @@ set helpText(Analysis) {<h1>The Analysis window</h1>
   this mode only the current evaluation is shown in the status line.
   <p>
   To add the best move chosen by the engine as a new move in the current
-  game, press the <b>Add move</b> button <button tb_addmove>. If the
+  game, press the <b>Add move</b> button <button ::icon::tb_addmove>. If the
   whole main line of the engine should be added just use the <b>Add
-  Variation</b> button <button tb_addvar>. In case an engine offers
+  Variation</b> button <button ::icon::tb_addvar>. In case an engine offers
   the <term>Multi-PV</term> mode, using the <b>Add all Variations</b>
-  button (<button tb_addallvars>) can be used to add all principal
+  button (<button ::icon::tb_addallvars>) can be used to add all principal
   variations to the game. The insertion of variations from the
   analysis window will also add the name of the engine as a comment to
   the game.
   </p>
   <p>
   To temporarily interrupt the calculation process one can use the
-  stop engine button (<button tb_eng_off>). Once pressed, this button
-  changes to the start engine button (<button tb_eng_on>) which will
+  stop engine button (<button ::icon::tb_eng_off>). Once pressed, this button
+  changes to the start engine button (<button ::icon::tb_eng_on>) which will
   restart the engines analysis. Note, however, that most engines will
   restart the whole analysis again, forgetting all results that where
   achieved in an earlier run. Only few engines are able to reuse the
@@ -2855,14 +2855,14 @@ set helpText(Analysis) {<h1>The Analysis window</h1>
   <p>
   To set an engine to analyse a position in the background while
   other functions of Scid are used one can <term>lock the
-  position</term> using the <button tb_lockengine> button. Scid now
+  position</term> using the <button ::icon::tb_lockengine> button. Scid now
   stops to send any changes of the main board to the engine, and the
   engine stays calculating the position.
   </p>
   <p>
   To finish the current game by the engine ("shoot out" or "demo" mode)
-  one can use the finish game button <button tb_finish_off>. To indicate
-  the shootout mode this button turns to <button tb_finish_on>. This
+  one can use the finish game button <button ::icon::tb_finish_off>. To indicate
+  the shootout mode this button turns to <button ::icon::tb_finish_on>. This
   function is only available for the first analysis engine.
   </p>
 
@@ -2940,13 +2940,13 @@ set helpText(Analysis) {<h1>The Analysis window</h1>
 
   <h3><a Annotate>Annotating a game</h3>
   <p>
-  The <b>Add variation</b> button (<button tb_addvar> or <button
-  tb_addallvars>)in the analysis window adds the current score and
+  The <b>Add variation</b> button (<button ::icon::tb_addvar> or <button
+  ::icon::tb_addallvars>)in the analysis window adds the current score and
   best line of play as a new variation in the game.
   </p>
   <p>
   You can do this automatically for a number of moves (annotating the
-  game) by pressing the <b>Annotate</b> button, <button tb_annotate>.
+  game) by pressing the <b>Annotate</b> button, <button ::icon::tb_annotate>.
   Besides, the engines best lines also <a Moves Informant>Informant</a>
   style evaluation symbols are added in this process.  First, the
   parameters for automatic annotations have to be set:
@@ -3033,7 +3033,7 @@ set helpText(Analysis) {<h1>The Analysis window</h1>
   <p>
   If an engine is using too much CPU time and affecting the use of Scid
   or other applications, turning on the <b>Low CPU priority</b> button
-  <button tb_cpu> may help; it gives the engine a low priority for CPU
+  <button ::icon::tb_cpu> may help; it gives the engine a low priority for CPU
   scheduling. On Windows, engines are run on low priority by default.
   </p>
   <p>
@@ -4911,7 +4911,7 @@ set helpText(Novag) {<h1>Connecting the Novag Citrine Chess board</h1>
    <p>
    Once the proper port is set, choose Tools / Connect Hardware /
    Connect Novag Citrine to hook up the board, or just click the
-   hardware connection button <button tb_eng_disconnected>. This
+   hardware connection button <button ::icon::tb_eng_disconnected>. This
    button also shows the <a HardwareStatus> status of the
    connection.</a>
 
@@ -5035,17 +5035,17 @@ set helpText(HardwareStatus) {<h1>Status of External Hardware</h1>
    the status of the external hardware it shows different icons:
    </p>
    <ul>
-   <li><button tb_eng_disconnected>
+   <li><button ::icon::tb_eng_disconnected>
    This is the normal state after program startup and shows that no
    external hardware is active at the moment. Pressing the button will
    hook up the configured hardware.
    </li>
-   <li><button tb_eng_connecting>
+   <li><button ::icon::tb_eng_connecting>
    Scid started the communication with the external hardware,
    initialisation is in progress. Depending on the driver and hardware
    connected, it may take some seconds for things to settle.
    </li>
-   <li><button tb_eng_error>
+   <li><button ::icon::tb_eng_error>
    While communicating withe the external hardware some error
    occurred. Usual sources of problems are e.g. another program
    accessing the external hardware, the hardware is not connected to
@@ -5056,7 +5056,7 @@ set helpText(HardwareStatus) {<h1>Status of External Hardware</h1>
    this case. Pressing the button will try again to hook up the
    configured hardware.
    </li>
-   <li><button tb_eng_ok>
+   <li><button ::icon::tb_eng_ok>
    The communication is established, the device is ready and can be
    used for move input. Pressing the button will disconnect the
    external hardware.