Icons will be dynamically populated

Its a very nice improvement of the code, now the code is much lighter..
:)