2.0 -> 2.4 icon fixes