make some headers not SYSTEM headers
added new icon set (for the case name will be 'catch')
names