Updated icon set and positioning