Map fixes, custom show icons