And move ToolBoxButtonSize->ImageType mapping code to a
common place.

Change-Id: If158f4b6f2750054fcf64491c2941706e7d3a329