Icons

@ecgreb two commits from yesterday ended up doing bad things. This is the last commit about icons I  promise!