Added custom icons and other work