Dev/ref#92

Addition of icons per type + templates cleanup