Image/Icon cleanup. Config for amazon beta