Client side: Fixed after layout change [Issue #79]
Refactoring action to create icon in template [Closed #72]