Make ItemDelegate and its subtypes handle icons consistently

Icons shouldn't be part of the indicator as none of the upstream styles
do this. Furthermore, the sizing of icons should be done through
`icon.{width,height}` properties.