Hide icons, couple of other small fixes