Map and icon fixes

Minor fixes