Major icon overhaul