#417 - Initial refactor of Icon to use AUIL
#417 - Cleaning