Fix stuff and add icon