make types toplevel
massive refactoring of how icon decorations work