Unifing the list of icons; fixes