Revert "Revert "fix SUBJ OPT on aux""

This reverts commit a9e2444984b2ccf33e8b58abd7f479bb2031df9f.
Revert "Revert "more ICONS & misc fixes""

This reverts commit c105b3e21065108b092d51c2860ff9a1a8b5bab4.