Switch to new smart iconic icons