Icons, fixes and others