icons selected, dimen added, refactoring