Builder fixed to support icons. closes #125