Working on icon
Merged R.java, hopefully