Don't show border around icon type.
Merge branch 'master'