Fixed mapping multiple icons