Fix several icon references.
Fix option types specs.