DSSSM-341 #time 8m Restructuring the classes for the template layout icons