Overhaul of icons