added dynamic icons

Closes #735
Closes #751