More fixes and new icons for areas