fixing botched merge
icons, grouped options, etc