Move unused icons to extra_icons