Icon color changes ans small layout optimization