Icon refactoring, fix #273
input refactoring
Merge branch 'icon-refactoring' into rc-0.4.0
Merge branch 'input-refactoring' into rc-0.4.0