little changes with icons, custom label