not satisfied with new icons, rollback