Lots icons cleanup