Small fixes and icon updates