Fixed icon position and other small tweaks