Get rid of duplicate and unused icons

Change-Id: I7a5c4821dcb888a63aae7e33c41846fb68c443f8