Icon reorganization

Should we do it? @samanpwbb @yhahn @jfirebaugh