Replaced some icons and did some changes to the templates

Cleaned up