More fixes and new icons.