Add resources for number icons
Code refactoring