misc changes with type-selection icons and default text