final version with icons