Moving subtype icon selector; tweaking fe edit icon
Merge branch 'humbucker' of github.com:blueriver/MuraCMS into humbucker