* Added icon detection/selectoion based on OTP service