Use icon rather than text for blocks.

Updated tests.

Fixes #92.