Revert "more ICONS & misc fixes"

This reverts commit 6bb8bd6418288b2a1270a3f1d8bb60ee4bbdd865.
Revert "fix SUBJ OPT on aux"

This reverts commit 3dd3fe30a5ea21927221780476d9737e2986d19a.