added generic icon, map selector