Fix bug causing wrong icon to be shown