Improved color sampling, changed icons.