Added icons, not used yet
Changes in template