fixing up icon-* loose ends