work to fit to capability requirements on 2.4 + changing icons