added a IconSwitchBuilder class
Issue#4 and Issue#5 should be fixed with this commit...