More amenities, icon corrections