Fixed icons during setup

Fixes #1228