WIP -- icon overlay issue
WIP -- add images