several changs to orders and icons