Improved icons layout