Last round of changes. The icons are now all given heterogenous names.