Update expand collapse to use icons