icons + adaptor improvements