Replaced the @s with proper indicator icons